* [gentoo-commits] repo/proj/guru:master commit in: app-backup/timeshift/, app-backup/timeshift/files/
@ 2021-02-09 14:46 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2021-02-09 14:46 UTC (permalink / raw
To: gentoo-commits
commit: fd07a5e2e3e735d74d182c3fd614ca72c4db5891
Author: Ross Charles Campbell <rossbridger.cc <AT> gmail <DOT> com>
AuthorDate: Mon Feb 8 00:51:15 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Feb 8 00:52:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fd07a5e2
app-backup/timeshift: new package
Closes: https://github.com/gentoo/gentoo/pull/12530
Closes: https://bugs.gentoo.org/690258
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ross Charles Campbell <rossbridger.cc <AT> gmail.com>
app-backup/timeshift/Manifest | 1 +
.../files/timeshift-20.11.1-fix-xapp-2.0.patch | 275 +++++++++++++++++++++
app-backup/timeshift/metadata.xml | 19 ++
app-backup/timeshift/timeshift-20.11.1.ebuild | 44 ++++
4 files changed, 339 insertions(+)
diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest
new file mode 100644
index 00000000..d059f3dd
--- /dev/null
+++ b/app-backup/timeshift/Manifest
@@ -0,0 +1 @@
+DIST timeshift-20.11.1.tar.gz 1401165 BLAKE2B dd51a352d030a2fb8fff2d430365d18f9dcf45c3ebdc3e367849c37b98140da7618426ecd9c268a87e3cd916822446fed861305c99a7b760539f32dd6be9402f SHA512 f16de664a052e15a60da5efdc925097cd09081f9a9983ef1e092674a3fee14681271d2053a04250736a4e33d4a65d30ce5a9454b45a96f0dd05d38465f967862
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
new file mode 100644
index 00000000..4cfa91f6
--- /dev/null
+++ b/app-backup/timeshift/files/timeshift-20.11.1-fix-xapp-2.0.patch
@@ -0,0 +1,275 @@
+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/metadata.xml b/app-backup/timeshift/metadata.xml
new file mode 100644
index 00000000..78eb91da
--- /dev/null
+++ b/app-backup/timeshift/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>rossbridger.cc@gmail.com</email>
+ <name>Ross Charles Campbell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">teejee2008/timeshift</remote-id>
+ </upstream>
+ <longdescription lang="en">
+ Timeshift for Linux is an application that provides functionality similar to
+ the System Restore feature in Windows and the Time Machine tool in Mac OS.
+
+ Timeshift protects your system by taking incremental snapshots of the file
+ system at regular intervals. These snapshots can be restored at a later date
+ to undo all changes to the system.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-backup/timeshift/timeshift-20.11.1.ebuild b/app-backup/timeshift/timeshift-20.11.1.ebuild
new file mode 100644
index 00000000..b5b563c7
--- /dev/null
+++ b/app-backup/timeshift/timeshift-20.11.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.40"
+inherit vala xdg
+
+DESCRIPTION="A system restore utility for Linux"
+HOMEPAGE="https://github.com/teejee2008/timeshift"
+SRC_URI="https://github.com/teejee2008/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" )
+
+DEPEND="
+ dev-libs/json-glib
+ dev-libs/libgee
+ dev-util/desktop-file-utils
+ net-libs/libsoup
+ net-misc/rsync
+ sys-process/cronie
+ x11-libs/gtk+:3
+ x11-libs/xapps
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ $(vala_depend)
+ net-misc/rsync
+ sys-apps/diffutils
+ sys-apps/coreutils
+ sys-fs/btrfs-progs
+ >=x11-libs/vte-0.60.3[vala]
+"
+
+src_prepare() {
+# sed -i -e "s:--thread:& Core/AppExcludeEntry.vala:" "src/makefile"
+ sed -i -e "s:valac:valac-$(vala_best_api_version):" "src/makefile"
+ vala_src_prepare
+ default
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-backup/timeshift/, app-backup/timeshift/files/
@ 2021-09-30 19:39 Arthur Zamarin
0 siblings, 0 replies; 3+ messages in thread
From: Arthur Zamarin @ 2021-09-30 19:39 UTC (permalink / raw
To: gentoo-commits
commit: 954ab4ad5ccb7f579176d22066f5a540d0059f05
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Thu Sep 30 18:44:53 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 18:51:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=954ab4ad
app-backup/timeshift: fixed https://bugs.gentoo.org/794637
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
.../files/timeshift-20.11.1-fix-util-linux-update.patch | 15 +++++++++++++++
app-backup/timeshift/timeshift-20.11.1.ebuild | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000000000..0206b9096
--- /dev/null
+++ b/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch
@@ -0,0 +1,15 @@
+--- 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/timeshift-20.11.1.ebuild b/app-backup/timeshift/timeshift-20.11.1.ebuild
index 4e65c8893..5d88a64b2 100644
--- a/app-backup/timeshift/timeshift-20.11.1.ebuild
+++ b/app-backup/timeshift/timeshift-20.11.1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" )
+PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" "${FILESDIR}/${P}-fix-util-linux-update.patch" )
DEPEND="
dev-libs/json-glib
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-backup/timeshift/, app-backup/timeshift/files/
@ 2022-10-17 11:26 Haelwenn Monnier
0 siblings, 0 replies; 3+ messages in thread
From: Haelwenn Monnier @ 2022-10-17 11:26 UTC (permalink / raw
To: gentoo-commits
commit: 3570dabdbd5bd7ae274bce0734724de758930453
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Thu Oct 13 09:20:57 2022 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Thu Oct 13 09:21:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3570dabd
app-backup/timeshift: version bump to 22.06.5
added IUSE="gtk" and patched make-file. Without USE="gtk" only console app is built and installed.
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
app-backup/timeshift/Manifest | 1 +
.../files/timeshift-22.06.5-build-system.patch | 75 ++++++++++++++++++++++
app-backup/timeshift/timeshift-22.06.5.ebuild | 75 ++++++++++++++++++++++
3 files changed, 151 insertions(+)
diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest
index b883bc2eb..0e051a4ab 100644
--- a/app-backup/timeshift/Manifest
+++ b/app-backup/timeshift/Manifest
@@ -1,2 +1,3 @@
DIST timeshift-21.09.1.tar.gz 1401994 BLAKE2B 5b1b3650fadb02745150d8996b46b53be473c66c73d4f5209c4f8634f58c4019905524516089b9f2a77b3bf1dcc49ee4db5ac9cbd2c1419683ead01e2e36b4e7 SHA512 0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b
DIST timeshift-22.06.1-r1.tar.gz 1429399 BLAKE2B 90dcfa50bccedcca07044b6e42cb41773aa9d53f42855e3bfdb28140b8fd4359283225928e1c598116feab301baa6b42aebade2bb4f107eed1d82412d52a9639 SHA512 eb245c358ff2ba8e3b3c367dd0ebe69a3b450ca7bd31f5bd2fd9d5b2281f39ce90e3086c1649f73a8b240c7a05cd308534abc88085653d5bc7b244ba2d9a2ef7
+DIST timeshift-22.06.5.tar.gz 1494015 BLAKE2B 915bfabf78a6ad8b7212dc1c47b9a31467a3f38b7890e5a958d007e2ac8e5b6f226cffe693bc618fce56fb2dbbb951df1bd4e988052320b1dd98bb1953ce85c7 SHA512 6a24b7164f522e443bd1cc0646b867eeebf7ecb4bfb2948701a7b72571bd1f83fc8f372d82b7422ed86fd246291b76cf7061e347dc61132cc809163cd38e7756
diff --git a/app-backup/timeshift/files/timeshift-22.06.5-build-system.patch b/app-backup/timeshift/files/timeshift-22.06.5-build-system.patch
new file mode 100644
index 000000000..14ae2ea3b
--- /dev/null
+++ b/app-backup/timeshift/files/timeshift-22.06.5-build-system.patch
@@ -0,0 +1,75 @@
+diff --git a/src/makefile b/src/makefile
+index 5a35a7a..985b16f 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="-O3" ${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="-O3" ${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}
+@@ -95,11 +97,13 @@ install:
+ mkdir -p "$(DESTDIR)$(sharedir)/pixmaps"
+
+ # binary
+- install -m 0755 ${app_name} "$(DESTDIR)$(bindir)"
+- install -m 0755 ${app_name}-gtk "$(DESTDIR)$(bindir)"
++ install -m 0755 ${app_name} "$(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/timeshift-22.06.5.ebuild b/app-backup/timeshift/timeshift-22.06.5.ebuild
new file mode 100644
index 000000000..4055bcb37
--- /dev/null
+++ b/app-backup/timeshift/timeshift-22.06.5.ebuild
@@ -0,0 +1,75 @@
+# 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.06.5-build-system.patch )
+
+src_prepare() {
+ default
+ vala_setup
+}
+
+src_compile() {
+ tc-export CC
+ if use gtk; then
+ emake all
+ else
+ emake app-console
+ 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() {
+ 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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-17 11:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-30 19:39 [gentoo-commits] repo/proj/guru:master commit in: app-backup/timeshift/, app-backup/timeshift/files/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2022-10-17 11:26 Haelwenn Monnier
2021-02-09 14:46 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox