app-backup/timeshift : revision bump

5 files changed, 142 insertions, 5 deletions

diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest
deleted file mode 100644
index 76edf8aa..00000000
--- a/app-backup/timeshift/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST timeshift-22.11.1-r1.tar.gz 1490993 BLAKE2B ddee86cada8cb9982725c754977f96d260b161a15a12086fcd325d9da9789b6600a3d99d44d8c6fbe60ed39187c93f3bfde62dc889c2217219a44121d831f58f SHA512 cd5226e2400743ce0c1da077103caeb61f320c73e5fb409f57c0f10bba5c06893bcc0e5e588fb03b397ffbd76bb43498f18e70e5964947ad950d4edfe1dd6967
diff --git a/app-backup/timeshift/files/timeshift-22.11.1-glib-deprecations.patch b/app-backup/timeshift/files/timeshift-22.11.1-glib-deprecations.patch
new file mode 100644
index 00000000..1e0efd63
--- /dev/null
+++ b/app-backup/timeshift/files/timeshift-22.11.1-glib-deprecations.patch
@@ -0,0 +1,135 @@
+diff --git a/src/Core/Main.vala b/src/Core/Main.vala
+index 9ee386b..b4b9b96 100644
+--- a/src/Core/Main.vala
++++ b/src/Core/Main.vala
+@@ -1742,7 +1742,7 @@ public class Main : GLib.Object{
+ 		try {
+ 			thread_delete_running = true;
+ 			thread_delete_success = false;
+-			Thread.create<void> (delete_thread, true);
++			new Thread<void>.try ("delete", () => {delete_thread();});
+ 
+ 			//new Thread<bool> ("", delete_thread);
+ 
+@@ -2226,13 +2226,13 @@ public class Main : GLib.Object{
+ 			thr_success = false;
+ 			
+ 			if (btrfs_mode){
+-				Thread.create<bool> (restore_execute_btrfs, true);
++				new Thread<bool>.try ("restore-execute-btrfs", () => {restore_execute_btrfs(); return true;});
+ 			}
+ 			else{
+-				Thread.create<bool> (restore_execute_rsync, true);
++				new Thread<bool>.try ("restore-execute-rsync", () => {restore_execute_rsync(); return true;});
+ 			}
+ 		}
+-		catch (ThreadError e) {
++		catch (Error e) {
+ 			thread_restore_running = false;
+ 			thr_success = false;
+ 			log_error (e.message);
+@@ -3842,8 +3842,8 @@ public class Main : GLib.Object{
+ 		try {
+ 			thread_estimate_running = true;
+ 			thr_success = false;
+-			Thread.create<void> (estimate_system_size_thread, true);
+-		} catch (ThreadError e) {
++			new Thread<void>.try ("estimate-system-size", () => {estimate_system_size_thread();});
++		} catch (Error e) {
+ 			thread_estimate_running = false;
+ 			thr_success = false;
+ 			log_error (e.message);
+@@ -3964,8 +3964,8 @@ public class Main : GLib.Object{
+ 		try {
+ 			thread_subvol_info_running = true;
+ 			thread_subvol_info_success = false;
+-			Thread.create<void> (query_subvolume_info_thread, true);
+-		} catch (ThreadError e) {
++			new Thread<void>.try ("query-subvolume-info", () => {query_subvolume_info_thread();});
++		} catch (Error e) {
+ 			thread_subvol_info_running = false;
+ 			thread_subvol_info_success = false;
+ 			log_error (e.message);
+diff --git a/src/Core/SnapshotRepo.vala b/src/Core/SnapshotRepo.vala
+index 12351b2..955c9df 100644
+--- a/src/Core/SnapshotRepo.vala
++++ b/src/Core/SnapshotRepo.vala
+@@ -865,8 +865,8 @@ public class SnapshotRepo : GLib.Object{
+ 		try {
+ 			thr_running = true;
+ 			thr_success = false;
+-			Thread.create<void> (delete_directory_thread, true);
+-		} catch (ThreadError e) {
++			new Thread<void>.try ("delete-directory", () => {delete_directory_thread();});
++		} catch (Error e) {
+ 			thr_running = false;
+ 			thr_success = false;
+ 			log_error (e.message);
+diff --git a/src/Gtk/BackupBox.vala b/src/Gtk/BackupBox.vala
+index daa7cef..ad00a10 100644
+--- a/src/Gtk/BackupBox.vala
++++ b/src/Gtk/BackupBox.vala
+@@ -179,7 +179,7 @@ class BackupBox : Gtk.Box{
+ 
+ 		try {
+ 			thread_is_running = true;
+-			Thread.create<void> (take_snapshot_thread, true);
++			new Thread<void>.try ("snapshot-taker", () => {take_snapshot_thread();});
+ 		}
+ 		catch (Error e) {
+ 			log_error (e.message);
+diff --git a/src/Gtk/EstimateBox.vala b/src/Gtk/EstimateBox.vala
+index efdfaf7..f006e4a 100644
+--- a/src/Gtk/EstimateBox.vala
++++ b/src/Gtk/EstimateBox.vala
+@@ -93,9 +93,9 @@ class EstimateBox : Gtk.Box{
+ 			
+ 			try {
+ 				thread_is_running = true;
+-				Thread.create<void> (estimate_system_size_thread, true);
++				new Thread<void>.try ("estimate-system-size", () => {estimate_system_size_thread();});
+ 			}
+-			catch (ThreadError e) {
++			catch (Error e) {
+ 				thread_is_running = false;
+ 				log_error (e.message);
+ 			}
+diff --git a/src/Gtk/RestoreBox.vala b/src/Gtk/RestoreBox.vala
+index 4d483b0..9871dd0 100644
+--- a/src/Gtk/RestoreBox.vala
++++ b/src/Gtk/RestoreBox.vala
+@@ -192,7 +192,7 @@ class RestoreBox : Gtk.Box{
+ 		
+ 		try {
+ 			thread_is_running = true;
+-			Thread.create<void> (restore_thread, true);
++			new Thread<void>.try ("restore", () => {restore_thread();});
+ 		}
+ 		catch (Error e) {
+ 			log_error (e.message);
+diff --git a/src/Gtk/RsyncLogBox.vala b/src/Gtk/RsyncLogBox.vala
+index 4006a04..a38b361 100644
+--- a/src/Gtk/RsyncLogBox.vala
++++ b/src/Gtk/RsyncLogBox.vala
+@@ -164,7 +164,7 @@ public class RsyncLogBox : Gtk.Box {
+ 
+ 		try {
+ 			thread_is_running = true;
+-			Thread.create<void> (parse_log_file_thread, true);
++			new Thread<void>.try ("log-file-parser", () => {parse_log_file_thread();});
+ 		}
+ 		catch (Error e) {
+ 			log_error (e.message);
+diff --git a/src/Utility/FileItem.vala b/src/Utility/FileItem.vala
+index 0d2c8bb..dd517c0 100644
+--- a/src/Utility/FileItem.vala
++++ b/src/Utility/FileItem.vala
+@@ -182,7 +182,7 @@ public class FileItem : GLib.Object,Gee.Comparable<FileItem> {
+ 				}
+ 
+ 				// modified
+-				this.modified = (new DateTime.from_timeval_utc(info.get_modification_time())).to_local();
++				this.modified = info.get_modification_date_time().to_local();
+ 
+ 				// owner_user
+ 				this.owner_user = info.get_attribute_string(FileAttribute.OWNER_USER);
diff --git a/app-backup/timeshift/timeshift-22.11.1-r1.ebuild b/app-backup/timeshift/timeshift-22.11.1-r2.ebuild
index d3aa93cf..7482e365 100644
--- a/app-backup/timeshift/timeshift-22.11.1-r1.ebuild
+++ b/app-backup/timeshift/timeshift-22.11.1-r2.ebuild
@@ -38,7 +38,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-22.11.1-build-system.patch )
+PATCHES=( 
+	"${FILESDIR}"/"${P}"-build-system.patch 
+	"${FILESDIR}"/"${P}"-glib-deprecations.patch
+)
 
 src_prepare() {
 	default
diff --git a/metadata/md5-cache/app-backup/timeshift-22.11.1-r1 b/metadata/md5-cache/app-backup/timeshift-22.11.1-r2
index 83cf83d9..06d48521 100644
--- a/metadata/md5-cache/app-backup/timeshift-22.11.1-r1
+++ b/metadata/md5-cache/app-backup/timeshift-22.11.1-r2
@@ -11,6 +11,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/json-glib >=dev-libs/libgee-0.18.0:= net-libs/libsoup:2.4 media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango >=x11-libs/xapp-1.0.4 x11-libs/vte:2.91[vala] net-misc/rsync virtual/cron
 SLOT=0
-SRC_URI=https://github.com/linuxmint/timeshift/archive/22.11.1.tar.gz -> timeshift-22.11.1-r1.tar.gz
+SRC_URI=https://github.com/linuxmint/timeshift/archive/22.11.1.tar.gz -> timeshift-22.11.1-r2.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vala	1343f639cc74d2aa8b36fc08677da58d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f79698a3f02266af668f342ce3fd4378
+_md5_=4aca574b6d0c8950d350655b7e97c040
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index d3598e3c..e2863047 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -3,7 +3,7 @@ app-admin/calamares 3.2.44.3-r3: Distribution-independent installer framework
 app-admin/opensnitch 1.5.2-r1: Desktop application firewall
 app-admin/vasile 2.1812.2: Versatile Advanced Script for ISO and Latest Enchantments
 app-arch/unp 2.0_pre9-r1: Script for unpacking various file formats
-app-backup/timeshift 22.11.1-r1: A system restore utility for Linux
+app-backup/timeshift 22.11.1-r2: A system restore utility for Linux
 app-emulation/steam 1.0.0.71-r2: Digital distribution client bootstrap package
 app-emulation/virtualbox-modules 7.0.6: Kernel Modules for Virtualbox
 app-misc/calamares-config-redcore 1.314.1337-r3: Redcore Linux Calamares modules config