| 1 |
commit: 954ab4ad5ccb7f579176d22066f5a540d0059f05 |
| 2 |
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de> |
| 3 |
AuthorDate: Thu Sep 30 18:44:53 2021 +0000 |
| 4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 30 18:51:15 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=954ab4ad |
| 7 |
|
| 8 |
app-backup/timeshift: fixed https://bugs.gentoo.org/794637 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 11 |
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de> |
| 12 |
|
| 13 |
.../files/timeshift-20.11.1-fix-util-linux-update.patch | 15 +++++++++++++++ |
| 14 |
app-backup/timeshift/timeshift-20.11.1.ebuild | 2 +- |
| 15 |
2 files changed, 16 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch b/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000..0206b9096 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch |
| 22 |
@@ -0,0 +1,15 @@ |
| 23 |
+--- a/src/Utility/Device.vala |
| 24 |
++++ b/src/Utility/Device.vala |
| 25 |
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{ |
| 26 |
+ |
| 27 |
+ try{ |
| 28 |
+ if (lsblk_is_ancient){ |
| 29 |
+- rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)""""); |
| 30 |
++ rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)""""); |
| 31 |
+ } |
| 32 |
+ else{ |
| 33 |
+- rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)""""); |
| 34 |
++ rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)""""); |
| 35 |
+ } |
| 36 |
+ |
| 37 |
+ if (rex.match (line, 0, out match)){ |
| 38 |
|
| 39 |
diff --git a/app-backup/timeshift/timeshift-20.11.1.ebuild b/app-backup/timeshift/timeshift-20.11.1.ebuild |
| 40 |
index 4e65c8893..5d88a64b2 100644 |
| 41 |
--- a/app-backup/timeshift/timeshift-20.11.1.ebuild |
| 42 |
+++ b/app-backup/timeshift/timeshift-20.11.1.ebuild |
| 43 |
@@ -14,7 +14,7 @@ SLOT="0" |
| 44 |
KEYWORDS="~amd64 ~x86" |
| 45 |
IUSE="" |
| 46 |
|
| 47 |
-PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" ) |
| 48 |
+PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" "${FILESDIR}/${P}-fix-util-linux-update.patch" ) |
| 49 |
|
| 50 |
DEPEND=" |
| 51 |
dev-libs/json-glib |
Archives