From 4182642f65c04cecb6202e4698285f0670d44c07 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 31 Mar 2023 23:30:39 +0100 Subject: app-backup/timeshift : revision bump --- app-backup/timeshift/Manifest | 1 - .../timeshift-22.11.1-glib-deprecations.patch | 135 +++++++++++++++++++++ app-backup/timeshift/timeshift-22.11.1-r1.ebuild | 84 ------------- app-backup/timeshift/timeshift-22.11.1-r2.ebuild | 87 +++++++++++++ 4 files changed, 222 insertions(+), 85 deletions(-) delete mode 100644 app-backup/timeshift/Manifest create mode 100644 app-backup/timeshift/files/timeshift-22.11.1-glib-deprecations.patch delete mode 100644 app-backup/timeshift/timeshift-22.11.1-r1.ebuild create mode 100644 app-backup/timeshift/timeshift-22.11.1-r2.ebuild (limited to 'app-backup/timeshift') 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 (delete_thread, true); ++ new Thread.try ("delete", () => {delete_thread();}); + + //new Thread ("", delete_thread); + +@@ -2226,13 +2226,13 @@ public class Main : GLib.Object{ + thr_success = false; + + if (btrfs_mode){ +- Thread.create (restore_execute_btrfs, true); ++ new Thread.try ("restore-execute-btrfs", () => {restore_execute_btrfs(); return true;}); + } + else{ +- Thread.create (restore_execute_rsync, true); ++ new Thread.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 (estimate_system_size_thread, true); +- } catch (ThreadError e) { ++ new Thread.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 (query_subvolume_info_thread, true); +- } catch (ThreadError e) { ++ new Thread.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 (delete_directory_thread, true); +- } catch (ThreadError e) { ++ new Thread.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 (take_snapshot_thread, true); ++ new Thread.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 (estimate_system_size_thread, true); ++ new Thread.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 (restore_thread, true); ++ new Thread.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 (parse_log_file_thread, true); ++ new Thread.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 { + } + + // 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-r1.ebuild deleted file mode 100644 index d3aa93cf..00000000 --- a/app-backup/timeshift/timeshift-22.11.1-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 2019-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit optfeature toolchain-funcs vala xdg - -DESCRIPTION="A system restore utility for Linux" -HOMEPAGE="https://github.com/linuxmint/timeshift" -SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${PF}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk" - -DEPEND=" - 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] -" -RDEPEND="${DEPEND} - net-misc/rsync - virtual/cron -" -BDEPEND=" - $(vala_depend) - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}"/${PN}-22.11.1-build-system.patch ) - -src_prepare() { - default - vala_setup -} - -src_compile() { - tc-export CC - if use gtk; then - # can't use all jobs here, fails to compile because some files getting removed - # during compilation, which are missing afterwards. - # https://bugs.gentoo.org/883157 - # Pascal Jäger (2022-11-26) - emake -j1 - else - emake app-console -j1 - fi - emake manpage -} - -src_install() { - if use gtk; then - emake INSTALL_GTK=true prefix="${EPREFIX}"/usr sysconfdir="${EPREFIX}"/etc install DESTDIR="${D}" - else - emake INSTALL_GTK=false prefix="${EPREFIX}"/usr sysconfdir="${EPREFIX}"/etc install DESTDIR="${D}" - fi - einstalldocs -} - -pkg_postinst() { - xdg_pkg_postinst - if ! use gtk; then - elog "" - elog "Installed timeshift without gtk GUI." - elog "If you need the gtk GUI emerge timeshift" - elog "with USE=\"gtk\"" - fi - optfeature "btrfs support" sys-fs/btrfs-progs -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/app-backup/timeshift/timeshift-22.11.1-r2.ebuild b/app-backup/timeshift/timeshift-22.11.1-r2.ebuild new file mode 100644 index 00000000..7482e365 --- /dev/null +++ b/app-backup/timeshift/timeshift-22.11.1-r2.ebuild @@ -0,0 +1,87 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature toolchain-funcs vala xdg + +DESCRIPTION="A system restore utility for Linux" +HOMEPAGE="https://github.com/linuxmint/timeshift" +SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${PF}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk" + +DEPEND=" + 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] +" +RDEPEND="${DEPEND} + net-misc/rsync + virtual/cron +" +BDEPEND=" + $(vala_depend) + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/"${P}"-build-system.patch + "${FILESDIR}"/"${P}"-glib-deprecations.patch +) + +src_prepare() { + default + vala_setup +} + +src_compile() { + tc-export CC + if use gtk; then + # can't use all jobs here, fails to compile because some files getting removed + # during compilation, which are missing afterwards. + # https://bugs.gentoo.org/883157 + # Pascal Jäger (2022-11-26) + emake -j1 + else + emake app-console -j1 + fi + emake manpage +} + +src_install() { + if use gtk; then + emake INSTALL_GTK=true prefix="${EPREFIX}"/usr sysconfdir="${EPREFIX}"/etc install DESTDIR="${D}" + else + emake INSTALL_GTK=false prefix="${EPREFIX}"/usr sysconfdir="${EPREFIX}"/etc install DESTDIR="${D}" + fi + einstalldocs +} + +pkg_postinst() { + xdg_pkg_postinst + if ! use gtk; then + elog "" + elog "Installed timeshift without gtk GUI." + elog "If you need the gtk GUI emerge timeshift" + elog "with USE=\"gtk\"" + fi + optfeature "btrfs support" sys-fs/btrfs-progs +} + +pkg_postrm() { + xdg_pkg_postrm +} -- cgit v1.2.3