summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/ffs_devuan.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-08-19 02:06:04 +0000
committerB Stack <bgstack15@gmail.com>2019-08-19 02:06:04 +0000
commit57bf044aff03b2c87aeea8cb80a2c742765e633b (patch)
treea1f59e61c791294bd3c0894868d19f62f2d9f93f /freefilesync/debian/patches/ffs_devuan.patch
parentMerge branch 'palemoon-bump' into 'master' (diff)
parentfreefilesync 10.15 rpm rc1 (diff)
downloadstackrpms-57bf044aff03b2c87aeea8cb80a2c742765e633b.tar.gz
stackrpms-57bf044aff03b2c87aeea8cb80a2c742765e633b.tar.bz2
stackrpms-57bf044aff03b2c87aeea8cb80a2c742765e633b.zip
Merge branch 'freefilesync-bump' into 'master'
freefilesync 10.15 See merge request bgstack15/stackrpms!79
Diffstat (limited to 'freefilesync/debian/patches/ffs_devuan.patch')
-rw-r--r--freefilesync/debian/patches/ffs_devuan.patch16
1 files changed, 14 insertions, 2 deletions
diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
index b757e8b..a71649d 100644
--- a/freefilesync/debian/patches/ffs_devuan.patch
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -27,10 +27,18 @@ diff -Naur -x '*.orig' -x '*.rej' 10.11-0/FreeFileSync/Source/Makefile 10.11-1/F
CXXFLAGS += `pkg-config --cflags openssl`
+@@ -17,6 +17,7 @@ CXXFLAGS += `pkg-config --cflags libssh2`
+ LINKFLAGS += `pkg-config --libs libssh2`
+
+ CXXFLAGS += `pkg-config --cflags gtk+-2.0`
++LINKFLAGS += `pkg-config --libs gtk+-2.0`
+ #treat as system headers so that warnings are hidden:
+ CXXFLAGS += -isystem/usr/include/gtk-2.0
+
diff -Naur -x '*.orig' -x '*.rej' 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 10.11-1/FreeFileSync/Source/RealTimeSync/Makefile
--- 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 2019-04-12 08:05:57.000000000 -0400
-+++ 10.11-1/FreeFileSync/Source/RealTimeSync/Makefile 2019-04-12 13:59:53.934551753 -0400
-@@ -1,10 +1,10 @@
++++ 10.15-1/FreeFileSync/Source/RealTimeSync/Makefile 2019-08-15 13:59:53.934551753 -0400
+@@ -1,13 +1,14 @@
-EXENAME = RealTimeSync_$(shell arch)
+EXENAME = RealTimeSync
@@ -43,6 +51,10 @@ diff -Naur -x '*.orig' -x '*.rej' 10.11-0/FreeFileSync/Source/RealTimeSync/Makef
#Gtk - support "no button border"
CXXFLAGS += `pkg-config --cflags gtk+-2.0`
++LINKFLAGS += `pkg-config --libs gtk+-2.0`
+ #treat as system headers so that warnings are hidden:
+ CXXFLAGS += -isystem/usr/include/gtk-2.0
+
diff -Naur -x '*.orig' -x '*.rej' 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp
--- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp 2019-04-12 08:05:57.000000000 -0400
+++ 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp 2019-04-12 13:58:55.050550183 -0400
bgstack15