summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/ffs_devuan_gtk3.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-03-18 14:19:01 -0400
committerB Stack <bgstack15@gmail.com>2020-03-18 14:19:01 -0400
commit1414e80d503bfe32fae8aad9eb52af32fe58d721 (patch)
tree3ded8403fffdaac2ee3ebcbaf4e9f78cd1223581 /freefilesync/debian/patches/ffs_devuan_gtk3.patch
parentWIP: freefilesync 10.21-2+devuan (diff)
downloadstackrpms-1414e80d503bfe32fae8aad9eb52af32fe58d721.tar.gz
stackrpms-1414e80d503bfe32fae8aad9eb52af32fe58d721.tar.bz2
stackrpms-1414e80d503bfe32fae8aad9eb52af32fe58d721.zip
add ability to control -pie from d/r
Diffstat (limited to 'freefilesync/debian/patches/ffs_devuan_gtk3.patch')
-rw-r--r--freefilesync/debian/patches/ffs_devuan_gtk3.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/freefilesync/debian/patches/ffs_devuan_gtk3.patch b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
index 1f87d9a..4f41d7a 100644
--- a/freefilesync/debian/patches/ffs_devuan_gtk3.patch
+++ b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
@@ -1,7 +1,7 @@
Author: B Stack
Source: Original research
-Date: 2019-11-21
-Message: Main patch to compile on Devuan.
+Date: 2020-03-18
+Message: Main patch to compile on Devuan using GTK3. BROKEN for FreeFileSync 10.21!
This reintroduces the gtk-3 usage, because Debian/Devuan stopped packaging libwxgtk3.0-dev (which used gtk2) and only does libwxgtk3.0-gtk3-dev. However, by reintroducing the gtk3, it brings back the old gtk3 instability from my previous packaging effort: https://freefilesync.org/forum/viewtopic.php?t=4918. /mnt/public/packages/old/freefilesync/freefilesync-9.7-1.master.tgz. Upstream never replied, but did note in the source that gtk3 is inherently unstable.
diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/Makefile 10.18-1/FreeFileSync/Source/Makefile
--- 10.11-0/FreeFileSync/Source/Makefile 2019-04-12 08:05:57.000000000 -0400
@@ -19,10 +19,11 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou
#support for SELinux (optional)
SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
---- 10.20-0a/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 17:30:56.738835393 -0500
-+++ 10.20-2/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 19:09:17.460124615 -0500
+diff -x '*.rej' -x '*.swp' -x '*.orig' -Naur 10.21-1/FreeFileSync/Source/RealTimeSync/Makefile 10.21-2/FreeFileSync/Source/RealTimeSync/Makefile
+--- 10.21-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-03-18 13:12:18.404217783 -0400
++++ 10.21-2/FreeFileSync/Source/RealTimeSync/Makefile 2020-03-18 13:12:46.528533268 -0400
@@ -7,9 +7,10 @@
- LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread
+ LINKFLAGS += -s `wx-config --libs std, aui --debug=no` -lz -pthread
#Gtk - support "no button border"
-CXXFLAGS += `pkg-config --cflags gtk+-2.0`
bgstack15