From 6162e0998912e3581bc7279b1ccdab856e057bc7 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 17 Dec 2022 17:37:47 +0000
Subject: app-backup/timeshift : version bump

---
 .../files/timeshift-22.06.1-makefile.patch         | 53 ----------------
 .../files/timeshift-22.11.1-build-system.patch     | 73 ++++++++++++++++++++++
 2 files changed, 73 insertions(+), 53 deletions(-)
 delete mode 100644 app-backup/timeshift/files/timeshift-22.06.1-makefile.patch
 create mode 100644 app-backup/timeshift/files/timeshift-22.11.1-build-system.patch

(limited to 'app-backup/timeshift/files')

diff --git a/app-backup/timeshift/files/timeshift-22.06.1-makefile.patch b/app-backup/timeshift/files/timeshift-22.06.1-makefile.patch
deleted file mode 100644
index 3343bc24..00000000
--- a/app-backup/timeshift/files/timeshift-22.06.1-makefile.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/src/makefile
-+++ b/src/makefile
-@@ -1,6 +1,6 @@
- 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)))
- 
- prefix=/usr
-@@ -50,8 +50,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 +61,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 +71,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}
-@@ -115,7 +114,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/*
--- 
-2.35.1
-
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
new file mode 100644
index 00000000..cac54b28
--- /dev/null
+++ b/app-backup/timeshift/files/timeshift-22.11.1-build-system.patch
@@ -0,0 +1,73 @@
+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/*
-- 
cgit v1.2.3