diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-12-17 17:37:47 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-17 17:37:47 +0000 |
| commit | 6162e0998912e3581bc7279b1ccdab856e057bc7 (patch) | |
| tree | f4548a30d7e2fa340a9e33fafb42279a7c193b2b /app-backup/timeshift/files | |
| parent | fe70132259f6f9ad49ddfb55e98d2df21aea27f5 (diff) | |
app-backup/timeshift : version bump
Diffstat (limited to 'app-backup/timeshift/files')
| -rw-r--r-- | app-backup/timeshift/files/timeshift-22.11.1-build-system.patch (renamed from app-backup/timeshift/files/timeshift-22.06.1-makefile.patch) | 44 |
1 files changed, 32 insertions, 12 deletions
diff --git a/app-backup/timeshift/files/timeshift-22.06.1-makefile.patch b/app-backup/timeshift/files/timeshift-22.11.1-build-system.patch index 3343bc24..cac54b28 100644 --- a/app-backup/timeshift/files/timeshift-22.06.1-makefile.patch +++ b/app-backup/timeshift/files/timeshift-22.11.1-build-system.patch @@ -1,37 +1,44 @@ +diff --git a/src/makefile b/src/makefile +index 0f61c35..add4dc2 100644 --- a/src/makefile +++ b/src/makefile -@@ -1,6 +1,6 @@ +@@ -1,8 +1,11 @@ SHELL=/bin/bash -CFLAGS=--std=c99 -EXECUTABLES = find msgmerge msgfmt install rm mkdir cp chmod valac -+CFLAGS += --std=c99 ++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 -@@ -50,8 +50,8 @@ all: app-gtk app-console + 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} \ +- --Xcc="-lm" --Xcc="-Os" ${symbols} \ + $(VALAC) -v -X -D'GETTEXT_PACKAGE="${app_name}"' \ -+ --cc=$(CC) $(foreach flag, $(CFLAGS) $(LDFLAGS), -X $(flag)) --Xcc="-lm" ${symbols} \ ++ --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: +@@ -61,8 +64,8 @@ app-gtk: app-console: #timeshift - valac -X -D'GETTEXT_PACKAGE="${app_name}"' \ -- --Xcc="-lm" --Xcc="-O3" ${symbols} \ +- --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 +71,6 @@ app-console: +@@ -71,7 +74,6 @@ app-console: manpage: ./${app_name} --help > ../man/${app_name}.1 @@ -39,7 +46,23 @@ clean: rm -rfv ../release/{source,i386,amd64,armel,armhf} -@@ -115,7 +114,7 @@ install: +@@ -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 @@ -48,6 +71,3 @@ # app icons cp -dpr --no-preserve=ownership -t "$(DESTDIR)$(sharedir)/icons" ./share/icons/* --- -2.35.1 - |