diff options
author | B Stack <bgstack15@gmail.com> | 2020-05-21 03:11:11 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2020-05-21 03:11:11 +0000 |
commit | 3ecfbfaf641478dc1b84099f417cff764671a209 (patch) | |
tree | 7cacb13c6a30f2513ff55dc5743f7f1ccb50388a /freefilesync/debian/patches/ffs_devuan_gtk2.patch | |
parent | Merge branch 'palemoon-bump' into 'master' (diff) | |
parent | fix whitespace for no_eraseif patch (diff) | |
download | stackrpms-3ecfbfaf641478dc1b84099f417cff764671a209.tar.gz stackrpms-3ecfbfaf641478dc1b84099f417cff764671a209.tar.bz2 stackrpms-3ecfbfaf641478dc1b84099f417cff764671a209.zip |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 10.24
See merge request bgstack15/stackrpms!158
Diffstat (limited to 'freefilesync/debian/patches/ffs_devuan_gtk2.patch')
-rw-r--r-- | freefilesync/debian/patches/ffs_devuan_gtk2.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/freefilesync/debian/patches/ffs_devuan_gtk2.patch b/freefilesync/debian/patches/ffs_devuan_gtk2.patch index f3242b3..49a7c24 100644 --- a/freefilesync/debian/patches/ffs_devuan_gtk2.patch +++ b/freefilesync/debian/patches/ffs_devuan_gtk2.patch @@ -6,15 +6,15 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou --- 10.11-0/FreeFileSync/Source/Makefile 2019-04-12 08:05:57.000000000 -0400 +++ 10.18-2/FreeFileSync/Source/Makefile 2019-11-21 09:42:57.408243242 -0500 @@ -16,9 +16,10 @@ - CXXFLAGS += `pkg-config --cflags libssh2` - LINKFLAGS += `pkg-config --libs libssh2` + cxxFlags += `pkg-config --cflags libssh2` + linkFlags += `pkg-config --libs libssh2` --CXXFLAGS += `pkg-config --cflags gtk+-2.0` -+CXXFLAGS += `pkg-config --cflags gtk+-2.0` -+LINKFLAGS += `pkg-config --libs gtk+-2.0` +-cxxFlags += `pkg-config --cflags gtk+-2.0` ++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 -+CXXFLAGS += -isystem/usr/include/gtk-2.0 +-cxxFlags += -isystem/usr/include/gtk-2.0 ++cxxFlags += -isystem/usr/include/gtk-2.0 #support for SELinux (optional) SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES) @@ -24,8 +24,8 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou @@ -8,6 +8,7 @@ #Gtk - support "no button border" - CXXFLAGS += `pkg-config --cflags gtk+-2.0` -+LINKFLAGS += `pkg-config --libs gtk+-2.0` + 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 + cxxFlags += -isystem/usr/include/gtk-2.0 |