commit: 77750b4a40fa93b7db7fb576e4fbc26545e3c41b
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Thu Oct 7 20:46:57 2021 +0000
Commit: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
CommitDate: Thu Oct 7 20:53:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=77750b4a
app-backup/timeshift: bump to 21.09.1
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
app-backup/timeshift/Manifest | 2 +-
.../timeshift-20.11.1-fix-util-linux-update.patch | 15 --
.../files/timeshift-20.11.1-fix-xapp-2.0.patch | 275 ---------------------
...ift-20.11.1.ebuild => timeshift-21.09.1.ebuild} | 2 +-
4 files changed, 2 insertions(+), 292 deletions(-)
diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest
index d059f3dd8..82532a5c6 100644
--- a/app-backup/timeshift/Manifest
+++ b/app-backup/timeshift/Manifest
@@ -1 +1 @@
-DIST timeshift-20.11.1.tar.gz 1401165 BLAKE2B
dd51a352d030a2fb8fff2d430365d18f9dcf45c3ebdc3e367849c37b98140da7618426ecd9c268a87e3cd916822446fed861305c99a7b760539f32dd6be9402f
SHA512
f16de664a052e15a60da5efdc925097cd09081f9a9983ef1e092674a3fee14681271d2053a04250736a4e33d4a65d30ce5a9454b45a96f0dd05d38465f967862
+DIST timeshift-21.09.1.tar.gz 1401994 BLAKE2B
5b1b3650fadb02745150d8996b46b53be473c66c73d4f5209c4f8634f58c4019905524516089b9f2a77b3bf1dcc49ee4db5ac9cbd2c1419683ead01e2e36b4e7
SHA512
0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b
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
deleted file mode 100644
index 0206b9096..000000000
--- a/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/Utility/Device.vala
-+++ b/src/Utility/Device.vala
-@@ -428,10 +428,10 @@ public class Device : GLib.Object{
-
- try{
- if (lsblk_is_ancient){
-- rex = new Regex("""NAME="(.*)"
KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)"
MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)"
MAJ:MIN="([0-9:]+)"""");
-+ rex = new Regex("""NAME="(.*)"
KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)"
MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)"
MAJ[_:]MIN="([0-9:]+)"""");
- }
- else{
-- 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="(.*)"""");
-+ 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="(.*)"""");
- }
-
- if (rex.match (line, 0, out match)){
diff --git a/app-backup/timeshift/files/timeshift-20.11.1-fix-xapp-2.0.patch
b/app-backup/timeshift/files/timeshift-20.11.1-fix-xapp-2.0.patch
deleted file mode 100644
index 4cfa91f6b..000000000
--- a/app-backup/timeshift/files/timeshift-20.11.1-fix-xapp-2.0.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-diff --git a/src/Gtk/BackupBox.vala b/src/Gtk/BackupBox.vala
-old mode 100644
-new mode 100755
-index 3b0a855..4926503
---- a/src/Gtk/BackupBox.vala
-+++ b/src/Gtk/BackupBox.vala
-@@ -64,7 +64,7 @@ class BackupBox : Gtk.Box{
- log_debug("BackupBox: BackupBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/BackupDeviceBox.vala b/src/Gtk/BackupDeviceBox.vala
-index 1bdde5a..ead9371 100644
---- a/src/Gtk/BackupDeviceBox.vala
-+++ b/src/Gtk/BackupDeviceBox.vala
-@@ -46,7 +46,7 @@ class BackupDeviceBox : Gtk.Box{
- log_debug("BackupDeviceBox: BackupDeviceBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/BackupFinishBox.vala b/src/Gtk/BackupFinishBox.vala
-index 1b57759..0343be5 100644
---- a/src/Gtk/BackupFinishBox.vala
-+++ b/src/Gtk/BackupFinishBox.vala
-@@ -42,7 +42,7 @@ class BackupFinishBox : Gtk.Box{
- log_debug("BackupFinishBox: BackupFinishBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/BootOptionsBox.vala b/src/Gtk/BootOptionsBox.vala
-index 5c96443..6e66372 100644
---- a/src/Gtk/BootOptionsBox.vala
-+++ b/src/Gtk/BootOptionsBox.vala
-@@ -47,7 +47,7 @@ class BootOptionsBox : Gtk.Box{
- log_debug("BootOptionsBox: BootOptionsBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/DeleteBox.vala b/src/Gtk/DeleteBox.vala
-index 7cbc7d4..c824bbd 100644
---- a/src/Gtk/DeleteBox.vala
-+++ b/src/Gtk/DeleteBox.vala
-@@ -50,7 +50,7 @@ class DeleteBox : Gtk.Box{
- log_debug("DeleteBox: DeleteBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/DeleteFinishBox.vala b/src/Gtk/DeleteFinishBox.vala
-index ab9a6d0..db99034 100644
---- a/src/Gtk/DeleteFinishBox.vala
-+++ b/src/Gtk/DeleteFinishBox.vala
-@@ -42,7 +42,7 @@ class DeleteFinishBox : Gtk.Box{
- log_debug("DeleteFinishBox: DeleteFinishBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/EstimateBox.vala b/src/Gtk/EstimateBox.vala
-index 858545b..efdfaf7 100644
---- a/src/Gtk/EstimateBox.vala
-+++ b/src/Gtk/EstimateBox.vala
-@@ -48,7 +48,7 @@ class EstimateBox : Gtk.Box{
- log_debug("EstimateBox: EstimateBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/ExcludeAppsBox.vala b/src/Gtk/ExcludeAppsBox.vala
-index 6d96fcb..2d26f74 100644
---- a/src/Gtk/ExcludeAppsBox.vala
-+++ b/src/Gtk/ExcludeAppsBox.vala
-@@ -41,7 +41,7 @@ class ExcludeAppsBox : Gtk.Box{
- log_debug("ExcludeAppsBox: ExcludeAppsBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/ExcludeBox.vala b/src/Gtk/ExcludeBox.vala
-index ac70bcf..0cdddbf 100644
---- a/src/Gtk/ExcludeBox.vala
-+++ b/src/Gtk/ExcludeBox.vala
-@@ -44,7 +44,7 @@ class ExcludeBox : Gtk.Box{
- log_debug("ExcludeBox: ExcludeBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/FinishBox.vala b/src/Gtk/FinishBox.vala
-index be10612..10a2d5e 100644
---- a/src/Gtk/FinishBox.vala
-+++ b/src/Gtk/FinishBox.vala
-@@ -45,7 +45,7 @@ class FinishBox : Gtk.Box{
- log_debug("FinishBox: FinishBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
- show_notes = _show_notes;
-diff --git a/src/Gtk/MiscBox.vala b/src/Gtk/MiscBox.vala
-index 91295ca..4f48f83 100644
---- a/src/Gtk/MiscBox.vala
-+++ b/src/Gtk/MiscBox.vala
-@@ -46,7 +46,7 @@ class MiscBox : Gtk.Box{
- log_debug("MiscBox: MiscBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/RestoreBox.vala b/src/Gtk/RestoreBox.vala
-index 3d9289d..4d483b0 100644
---- a/src/Gtk/RestoreBox.vala
-+++ b/src/Gtk/RestoreBox.vala
-@@ -65,7 +65,7 @@ class RestoreBox : Gtk.Box{
- log_debug("RestoreBox: RestoreBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/RestoreDeviceBox.vala b/src/Gtk/RestoreDeviceBox.vala
-index 3a21930..431cb07 100644
---- a/src/Gtk/RestoreDeviceBox.vala
-+++ b/src/Gtk/RestoreDeviceBox.vala
-@@ -51,7 +51,7 @@ class RestoreDeviceBox : Gtk.Box{
- log_debug("RestoreDeviceBox: RestoreDeviceBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/RestoreExcludeBox.vala b/src/Gtk/RestoreExcludeBox.vala
-index 67e781a..65cc655 100644
---- a/src/Gtk/RestoreExcludeBox.vala
-+++ b/src/Gtk/RestoreExcludeBox.vala
-@@ -46,7 +46,7 @@ class RestoreExcludeBox : Gtk.Box{
- log_debug("RestoreExcludeBox: RestoreExcludeBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/RestoreFinishBox.vala b/src/Gtk/RestoreFinishBox.vala
-index 30d5690..1bb0bac 100644
---- a/src/Gtk/RestoreFinishBox.vala
-+++ b/src/Gtk/RestoreFinishBox.vala
-@@ -42,7 +42,7 @@ class RestoreFinishBox : Gtk.Box{
- log_debug("RestoreFinishBox: RestoreFinishBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/RestoreSummaryBox.vala b/src/Gtk/RestoreSummaryBox.vala
-index 6cf87c7..ca25b3c 100644
---- a/src/Gtk/RestoreSummaryBox.vala
-+++ b/src/Gtk/RestoreSummaryBox.vala
-@@ -44,7 +44,7 @@ class RestoreSummaryBox : Gtk.Box{
- log_debug("RestoreSummaryBox: RestoreSummaryBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/RsyncLogBox.vala b/src/Gtk/RsyncLogBox.vala
-index 2d1394e..4006a04 100644
---- a/src/Gtk/RsyncLogBox.vala
-+++ b/src/Gtk/RsyncLogBox.vala
-@@ -69,7 +69,7 @@ public class RsyncLogBox : Gtk.Box {
-
- public RsyncLogBox(Gtk.Window _window) {
-
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
-
- this.margin = 6;
-
-diff --git a/src/Gtk/ScheduleBox.vala b/src/Gtk/ScheduleBox.vala
-index b59cfbb..39f33fc 100644
---- a/src/Gtk/ScheduleBox.vala
-+++ b/src/Gtk/ScheduleBox.vala
-@@ -50,7 +50,7 @@ class ScheduleBox : Gtk.Box{
- log_debug("ScheduleBox: ScheduleBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/SnapshotBackendBox.vala b/src/Gtk/SnapshotBackendBox.vala
-index c725ad7..09bbd0f 100755
---- a/src/Gtk/SnapshotBackendBox.vala
-+++ b/src/Gtk/SnapshotBackendBox.vala
-@@ -46,7 +46,7 @@ class SnapshotBackendBox : Gtk.Box{
- log_debug("SnapshotBackendBox: SnapshotBackendBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
-diff --git a/src/Gtk/SnapshotListBox.vala b/src/Gtk/SnapshotListBox.vala
-index 4d6e9f1..4cef400 100644
---- a/src/Gtk/SnapshotListBox.vala
-+++ b/src/Gtk/SnapshotListBox.vala
-@@ -63,7 +63,7 @@ class SnapshotListBox : Gtk.Box{
- log_debug("SnapshotListBox: SnapshotListBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 6;
-
-diff --git a/src/Gtk/UsersBox.vala b/src/Gtk/UsersBox.vala
-index 2d2a63e..dbcc719 100644
---- a/src/Gtk/UsersBox.vala
-+++ b/src/Gtk/UsersBox.vala
-@@ -49,7 +49,7 @@ class UsersBox : Gtk.Box{
- log_debug("UsersBox: UsersBox()");
-
- //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
-- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); //
work-around
-+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6);
// work-around
- parent_window = _parent_window;
- margin = 12;
-
diff --git a/app-backup/timeshift/timeshift-20.11.1.ebuild
b/app-backup/timeshift/timeshift-21.09.1.ebuild
similarity index 90%
rename from app-backup/timeshift/timeshift-20.11.1.ebuild
rename to app-backup/timeshift/timeshift-21.09.1.ebuild
index 5d88a64b2..867c24750 100644
--- a/app-backup/timeshift/timeshift-20.11.1.ebuild
+++ b/app-backup/timeshift/timeshift-21.09.1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch"
"${FILESDIR}/${P}-fix-util-linux-update.patch" )
+#PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch"
"${FILESDIR}/${P}-fix-util-linux-update.patch" )
DEPEND="
dev-libs/json-glib
