diff options
Diffstat (limited to 'app-backup/timeshift')
| -rw-r--r-- | app-backup/timeshift/Manifest | 2 | ||||
| -rw-r--r-- | app-backup/timeshift/files/timeshift-22.11.1-build-system.patch | 73 | ||||
| -rw-r--r-- | app-backup/timeshift/files/timeshift-22.11.1-glib-deprecations.patch | 135 | ||||
| -rw-r--r-- | app-backup/timeshift/timeshift-22.11.1-r2.ebuild | 87 | ||||
| -rw-r--r-- | app-backup/timeshift/timeshift-24.06.3.ebuild | 49 |
5 files changed, 50 insertions, 296 deletions
diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest index 1cbb6dc1..d5eb8e38 100644 --- a/app-backup/timeshift/Manifest +++ b/app-backup/timeshift/Manifest @@ -1 +1 @@ -DIST timeshift-22.11.1-r2.tar.gz 1490993 BLAKE2B ddee86cada8cb9982725c754977f96d260b161a15a12086fcd325d9da9789b6600a3d99d44d8c6fbe60ed39187c93f3bfde62dc889c2217219a44121d831f58f SHA512 cd5226e2400743ce0c1da077103caeb61f320c73e5fb409f57c0f10bba5c06893bcc0e5e588fb03b397ffbd76bb43498f18e70e5964947ad950d4edfe1dd6967 +DIST timeshift-24.06.3.tar.gz 1626536 BLAKE2B 1db6f0d2d251d6a309451c4ad5741d8cd112b51837ea8b046c1f19bd47ae54e10ce35af3e3779b838b676a5611f3f72d43373db02f7471fcb752ba1942093e58 SHA512 c2746bd64b158f60117f2d464d17ef70255f36958b94b82297efe0f7e3501c840bf962aed9e9615abb394ef928c5bebdd563194ec3b875775b10f9990aabbdee diff --git a/app-backup/timeshift/files/timeshift-22.11.1-build-system.patch b/app-backup/timeshift/files/timeshift-22.11.1-build-system.patch deleted file mode 100644 index cac54b28..00000000 --- a/app-backup/timeshift/files/timeshift-22.11.1-build-system.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/src/makefile b/src/makefile -index 0f61c35..add4dc2 100644 ---- a/src/makefile -+++ b/src/makefile -@@ -1,8 +1,11 @@ - SHELL=/bin/bash --CFLAGS=--std=c99 --EXECUTABLES = find msgmerge msgfmt install rm mkdir cp chmod valac -+CFLAGS+= --std=c99 -+EXECUTABLES = find msgmerge msgfmt install rm mkdir cp chmod $(VALAC) - CHECKEXECS := $(foreach exec,$(EXECUTABLES), $(if $(shell which $(exec)),,$(error No $(exec) found, install it))) - -+INSTALL_GTK ?= true -+INSTALL_CONSOLE ?= true -+ - prefix=/usr - sysconfdir=/etc - appconfdir=$(sysconfdir)/timeshift -@@ -50,8 +53,8 @@ all: app-gtk app-console - app-gtk: - - #timeshift-gtk -- valac -X -D'GETTEXT_PACKAGE="${app_name}"' \ -- --Xcc="-lm" --Xcc="-Os" ${symbols} \ -+ $(VALAC) -v -X -D'GETTEXT_PACKAGE="${app_name}"' \ -+ --cc="$(CC)" $(foreach flag, $(CFLAGS) $(LDFLAGS), -X $(flag)) --Xcc="-lm" ${symbols} \ - Core/*.vala Gtk/*.vala Utility/*.vala Utility/Gtk/*.vala \ - -o ${app_name}-gtk \ - --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix \ -@@ -61,8 +64,8 @@ app-gtk: - app-console: - - #timeshift -- valac -X -D'GETTEXT_PACKAGE="${app_name}"' \ -- --Xcc="-lm" --Xcc="-Os" ${symbols} \ -+ $(VALAC) -v -X -D'GETTEXT_PACKAGE="${app_name}"' \ -+ --cc="$(CC)" $(foreach flag, $(CFLAGS) $(LDFLAGS), -X $(flag)) --Xcc="-lm" ${symbols} \ - Core/*.vala Utility/*.vala Utility/Gtk/*.vala Console/*.vala \ - -o ${app_name} \ - --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix \ -@@ -71,7 +74,6 @@ app-console: - - manpage: - ./${app_name} --help > ../man/${app_name}.1 -- gzip -f ../man/${app_name}.1 - - clean: - rm -rfv ../release/{source,i386,amd64,armel,armhf} -@@ -96,10 +98,12 @@ install: - - # binary - install -m 0755 ${app_name} "$(DESTDIR)$(bindir)" -- install -m 0755 ${app_name}-gtk "$(DESTDIR)$(bindir)" -+ @if test "$(INSTALL_GTK)" = true; then \ -+ install -m 0755 ${app_name}-gtk "$(DESTDIR)$(bindir)"; \ -+ install -m 0755 ${app_name}-launcher "$(DESTDIR)$(bindir)"; \ -+ fi - #install -m 0755 ${app_name}-uninstall "$(DESTDIR)$(bindir)" -- install -m 0755 ${app_name}-launcher "$(DESTDIR)$(bindir)" -- -+ - # shared files - cp -dpr --no-preserve=ownership -t "$(DESTDIR)$(sharedir)/${app_name}" ./share/${app_name}/* - find $(DESTDIR)$(sharedir)/${app_name} -type d -exec chmod 755 {} \+ -@@ -115,7 +119,7 @@ install: - install -m 0644 ../files/${app_name}.json "$(DESTDIR)$(appconfdir)/default.json" - - # man page -- install -m 0644 ../man/${app_name}.1.gz "$(DESTDIR)$(man1dir)/${app_name}.1.gz" -+ install -m 0644 ../man/${app_name}.1 "$(DESTDIR)$(man1dir)/${app_name}.1" - - # app icons - cp -dpr --no-preserve=ownership -t "$(DESTDIR)$(sharedir)/icons" ./share/icons/* 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 deleted file mode 100644 index 1e0efd63..00000000 --- a/app-backup/timeshift/files/timeshift-22.11.1-glib-deprecations.patch +++ /dev/null @@ -1,135 +0,0 @@ -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-r2.ebuild b/app-backup/timeshift/timeshift-22.11.1-r2.ebuild deleted file mode 100644 index 7482e365..00000000 --- a/app-backup/timeshift/timeshift-22.11.1-r2.ebuild +++ /dev/null @@ -1,87 +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}"/"${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 <pascal.jaeger@leimstift.de> (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-24.06.3.ebuild b/app-backup/timeshift/timeshift-24.06.3.ebuild new file mode 100644 index 00000000..7732a9f9 --- /dev/null +++ b/app-backup/timeshift/timeshift-24.06.3.ebuild @@ -0,0 +1,49 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature meson 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="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + dev-libs/glib:2 + dev-libs/gobject-introspection + x11-libs/gtk+:3 + dev-libs/json-glib + x11-libs/vte:2.91[vala] + >=dev-libs/libgee-0.18.0:= + >=x11-libs/xapp-1.0.4[vala(+)] + x11-libs/cairo + x11-libs/gdk-pixbuf:2 +" +RDEPEND="${DEPEND} + virtual/cron +" +BDEPEND=" + $(vala_depend) + virtual/pkgconfig + sys-apps/help2man +" + +src_prepare() { + default + vala_setup +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "btrfs support" sys-fs/btrfs-progs + optfeature "rsync support" net-misc/rsync +} + +pkg_postrm() { + xdg_pkg_postrm +} |