From 61ce5a5aac7c9b1a5ddd64817798e79c81b10a16 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Tue, 25 Jul 2023 10:06:50 -0400 Subject: ffs 12.5 rc1 --- freefilesync/debian/patches/ffs_devuan.patch | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'freefilesync/debian/patches/ffs_devuan.patch') diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch index a24c41e..1973b60 100644 --- a/freefilesync/debian/patches/ffs_devuan.patch +++ b/freefilesync/debian/patches/ffs_devuan.patch @@ -1,11 +1,11 @@ Author: bgstack15 Source: Original research -Last-Modified: 2023-02-21 -Last-Version: 12.1 +Last-Modified: 2023-07-24 +Last-Version: 12.5 Message: Main patch to compile on Devuan. --- a/FreeFileSync/Source/ffs_paths.cpp +++ b/FreeFileSync/Source/ffs_paths.cpp -@@ -49,7 +49,7 @@ Zstring fff::getInstallDirPath() +@@ -55,7 +55,7 @@ Zstring fff::getInstallDirPath() Zstring fff::getResourceDirPath() { @@ -21,13 +21,12 @@ Message: Main patch to compile on Devuan. -exeName = FreeFileSync_$(shell arch) +exeName = FreeFileSync - CXXFLAGS += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ + CXXFLAGS += -std=c++23 -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 \ -- -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread -+ -O3 -DNDEBUG `wx-config --version=3.2 --cxxflags --debug=no` -pthread + -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread -LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -+LDFLAGS += -s -no-pie `wx-config --version=3.2 --libs std, aui, richtext --debug=no` -pthread -lz ++LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -lz CXXFLAGS += `pkg-config --cflags openssl` @@ -71,7 +70,7 @@ Message: Main patch to compile on Devuan. -exeName = RealTimeSync_$(shell arch) +exeName = RealTimeSync - CXXFLAGS += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ + CXXFLAGS += -std=c++23 -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 \ -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread -- cgit