diff options
Diffstat (limited to 'freefilesync')
| -rw-r--r-- | freefilesync/debian/changelog | 2 | ||||
| -rw-r--r-- | freefilesync/debian/control | 7 | ||||
| -rw-r--r-- | freefilesync/debian/freefilesync+devuan.dsc | 2 | ||||
| -rw-r--r-- | freefilesync/debian/patches/ffs_devuan.patch | 5 | ||||
| -rw-r--r-- | freefilesync/debian/patches/ffs_devuan_gtk3.patch | 6 | ||||
| -rw-r--r-- | freefilesync/debian/patches/series | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog index 1cc6d48..1d9d768 100644 --- a/freefilesync/debian/changelog +++ b/freefilesync/debian/changelog @@ -12,6 +12,8 @@ freefilesync (11.26-1+devuan) obs; urgency=low * Fixed normalizing strings with broken UTF encoding * Fixed sound playback not working (Linux) * Don't allow creating file names ending with dot character (Windows) + * Dpkg updates + * Use wx3.2 now! This has been a huge pain point for a long time. -- B. Stack <bgstack15@gmail.com> Tue, 11 Oct 2022 11:06:58 -0400 diff --git a/freefilesync/debian/control b/freefilesync/debian/control index 9baed3d..627cfb2 100644 --- a/freefilesync/debian/control +++ b/freefilesync/debian/control @@ -10,13 +10,10 @@ Build-Depends: debhelper (>=12~), libglibmm-2.4-dev, libssh2-1-dev (>=1.10.0-3+b1), libssl-dev (>=3.0.3-5), - wx3.0-headers, + wx3.2-headers, unzip, -# gtk3 version, and these must be removed for gtk2 build -# install with sudo apt-get install libwxbase3.0-dev=3.0.4+dfsg-15 libwxbase3.0-0v5=3.0.4+dfsg-15 wx3.0-headers=3.0.4+dfsg-15 libgtk-3-dev libwxgtk3.0-gtk3-dev -# which will remove libwxbase3.0-dev=3.0.4+dfsg-14 libgtk-3-dev, - libwxgtk3.0-gtk3-dev, + libwxgtk3.2-dev, Standards-Version: 4.1.4 Homepage: https://freefilesync.org/ diff --git a/freefilesync/debian/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+devuan.dsc index c7f1603..c620300 100644 --- a/freefilesync/debian/freefilesync+devuan.dsc +++ b/freefilesync/debian/freefilesync+devuan.dsc @@ -6,7 +6,7 @@ Version: 11.26-1+devuan Maintainer: B. Stack <bgstack15@gmail.com> Homepage: https://freefilesync.org/ Standards-Version: 4.1.4 -Build-Depends: debhelper (>= 12~), g++-12, imagemagick, libbrotli-dev, libcurl4-openssl-dev (>= 7.83.1-1+b1), libglibmm-2.4-dev, libssh2-1-dev (>= 1.10.0-3+b1), libssl-dev (>= 3.0.3-5), wx3.0-headers, unzip, libgtk-3-dev, libwxgtk3.0-gtk3-dev, libfontconfig-dev +Build-Depends: debhelper (>= 12~), g++-12, imagemagick, libbrotli-dev, libcurl4-openssl-dev (>= 7.83.1-1+b1), libglibmm-2.4-dev, libssh2-1-dev (>= 1.10.0-3+b1), libssl-dev (>= 3.0.3-5), wx3.2-headers, unzip, libgtk-3-dev, libwxgtk3.2-dev, libfontconfig-dev Package-List: freefilesync deb utils optional arch=any Files: diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch index d51f2fc..6db7b9d 100644 --- a/freefilesync/debian/patches/ffs_devuan.patch +++ b/freefilesync/debian/patches/ffs_devuan.patch @@ -23,10 +23,11 @@ Message: Main patch to compile on Devuan. 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 \ - -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread +- -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread ++ -O3 -DNDEBUG `wx-config --version=3.2 --cxxflags --debug=no` -pthread -LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -+LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -lz ++LDFLAGS += -s -no-pie `wx-config --version=3.2 --libs std, aui, richtext --debug=no` -pthread -lz CXXFLAGS += `pkg-config --cflags openssl` diff --git a/freefilesync/debian/patches/ffs_devuan_gtk3.patch b/freefilesync/debian/patches/ffs_devuan_gtk3.patch index 9020da4..c78eb28 100644 --- a/freefilesync/debian/patches/ffs_devuan_gtk3.patch +++ b/freefilesync/debian/patches/ffs_devuan_gtk3.patch @@ -1,7 +1,7 @@ -Author: B Stack +Author: bgstack15 Source: Original research -Version: 11.25 -Date: 2020-09-07 +Version: 11.26 +Date: 2022-10-11 Message: Main patch to compile on Devuan using GTK3. --- a/FreeFileSync/Source/Makefile +++ b/FreeFileSync/Source/Makefile diff --git a/freefilesync/debian/patches/series b/freefilesync/debian/patches/series index 206af1e..500443c 100644 --- a/freefilesync/debian/patches/series +++ b/freefilesync/debian/patches/series @@ -2,11 +2,11 @@ ffs_allow_parallel_ops.patch ffs_devuan.patch ffs_devuan_gtk3.patch ffs_no_check_updates.patch -ffs_no_wx311.patch +#ffs_no_wx311.patch ffs_sftp.patch ffs_libssh2.patch #ffs_curl.patch -revert_zenju_aggressive_upstreamisms.patch +#revert_zenju_aggressive_upstreamisms.patch ffs_gcc.patch ffs_traditional_view.patch ffs_desktop_notifications.patch |