diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-09-07 20:16:26 -0400 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-09-07 20:16:26 -0400 |
| commit | f754b2ab6c2ba2ca5485e4ae2702e026604100fd (patch) | |
| tree | d64e1e3852d894734099245bf4f6f6154da01266 /freefilesync/ffs_distro_fedora.patch | |
| parent | ffs 11.25 dpkg, and rpm initial work (diff) | |
| download | stackrpms-f754b2ab6c2ba2ca5485e4ae2702e026604100fd.tar.gz stackrpms-f754b2ab6c2ba2ca5485e4ae2702e026604100fd.tar.bz2 stackrpms-f754b2ab6c2ba2ca5485e4ae2702e026604100fd.zip | |
ffs 11.25 rpm rc1
Diffstat (limited to 'freefilesync/ffs_distro_fedora.patch')
| -rw-r--r-- | freefilesync/ffs_distro_fedora.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/freefilesync/ffs_distro_fedora.patch b/freefilesync/ffs_distro_fedora.patch index 2694274..78502ab 100644 --- a/freefilesync/ffs_distro_fedora.patch +++ b/freefilesync/ffs_distro_fedora.patch @@ -19,11 +19,10 @@ diff -Naur 10.13-0/FreeFileSync/Source/ffs_paths.cpp 10.13-1/FreeFileSync/Source diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/Makefile 11.4-1/FreeFileSync/Source/Makefile --- 11.25-0/FreeFileSync/Source/Makefile 2022-09-07 14:54:31.444628869 -0400 +++ 11.25-1/FreeFileSync/Source/Makefile 2022-09-07 16:33:08.295327455 -0400 -@@ -1,11 +1,12 @@ +@@ -1,11 +1,11 @@ CXX ?= g++ -exeName = FreeFileSync_$(shell arch) +exeName = FreeFileSync -+CXX=g++-12 CXXFLAGS += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ @@ -34,7 +33,7 @@ diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/Makefil CXXFLAGS += `pkg-config --cflags openssl` -@@ -17,9 +18,17 @@ +@@ -17,9 +18,10 @@ CXXFLAGS += `pkg-config --cflags libssh2` LDFLAGS += `pkg-config --libs libssh2` @@ -47,14 +46,13 @@ diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/Makefil #support for SELinux (optional) SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES) -diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/RealTimeSync/Makefile 11.4-1/FreeFileSync/Source/RealTimeSync/Makefile +diff -Naur 11.25-0/FreeFileSync/Source/RealTimeSync/Makefile 11.25-1/FreeFileSync/Source/RealTimeSync/Makefile --- 11.25-0/FreeFileSync/Source/RealTimeSync/Makefile 2022-09-07 14:54:31.524629769 -0400 -+++ 11.25-1/FreeFileSync/Source/RealTimeSync/Makefile 2022-09-07 16:33:08.299327501 -0400 -@@ -1,16 +1,18 @@ ++++ 11.25-1/FreeFileSync/Source/RealTimeSync/Makefile 2022-09-07 19:33:38.512766244 -0400 +@@ -1,16 +1,17 @@ CXX ?= g++ -exeName = RealTimeSync_$(shell arch) +exeName = RealTimeSync -+CXX=g++-12 CXXFLAGS += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ @@ -66,7 +64,7 @@ diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/RealTim #Gtk - support "no button border" -CXXFLAGS += `pkg-config --cflags gtk+-2.0` +CXXFLAGS += `pkg-config --cflags gtk+-3.0` -+LDFLAGS += `pkg-config --libs gtk+-3.0` ++LDFLAGS += `pkg-config --libs gtk+-3.0` #treat as system headers so that warnings are hidden: -CXXFLAGS += -isystem/usr/include/gtk-2.0 +CXXFLAGS += -isystem/usr/include/gtk-3.0 |