summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-02-15 19:45:00 -0500
committerB Stack <bgstack15@gmail.com>2020-02-15 19:45:00 -0500
commit3d209807735b32f7dbc97a4ff60d73e0007f5c1d (patch)
tree7bf79d23abc3e3090139e4edd98cebcd64d5bd84 /freefilesync/debian/patches
parentfreefilesync dpkg rc1 for gtk2 (diff)
downloadstackrpms-3d209807735b32f7dbc97a4ff60d73e0007f5c1d.tar.gz
stackrpms-3d209807735b32f7dbc97a4ff60d73e0007f5c1d.tar.bz2
stackrpms-3d209807735b32f7dbc97a4ff60d73e0007f5c1d.zip
freefilesync gtk3 dpkg rc1
And now include the dsc file for easier osc operation
Diffstat (limited to 'freefilesync/debian/patches')
-rw-r--r--freefilesync/debian/patches/ffs_10.20.patch14
-rw-r--r--freefilesync/debian/patches/ffs_devuan.patch10
-rw-r--r--freefilesync/debian/patches/ffs_devuan_gtk3.patch12
-rw-r--r--freefilesync/debian/patches/series5
4 files changed, 9 insertions, 32 deletions
diff --git a/freefilesync/debian/patches/ffs_10.20.patch b/freefilesync/debian/patches/ffs_10.20.patch
deleted file mode 100644
index 8369e30..0000000
--- a/freefilesync/debian/patches/ffs_10.20.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Message: To make FreeFileSync 10.20 compile. Looks like some includes were omitted by upstream.
-Date: 2020-02-15 20:00
-diff -Naur /usr/src/freefilesync/10.20-0/FreeFileSync/Source/base/log_file.cpp /usr/src/freefilesync/10.20-1/FreeFileSync/Source/base/log_file.cpp
---- 10.20-0/FreeFileSync/Source/base/log_file.cpp 2020-02-15 14:50:08.340617412 -0500
-+++ 10.20-1/FreeFileSync/Source/base/log_file.cpp 2020-02-15 15:01:36.687166993 -0500
-@@ -9,6 +9,8 @@
- #include <wx/datetime.h>
- #include "ffs_paths.h"
- #include "../afs/concrete.h"
-+#include "../../../zen/system.h"
-+#include "../../../zen/http.h"
-
- using namespace zen;
- using namespace fff;
diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
index 4ad070c..f2290bd 100644
--- a/freefilesync/debian/patches/ffs_devuan.patch
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -1,6 +1,6 @@
Author: B Stack
Source: Original research
-Date: 2019-11-21
+Last date modified: 2020-02-15
Message: Main patch to compile on Devuan.
diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/base/ffs_paths.cpp 10.18-1/FreeFileSync/Source/base/ffs_paths.cpp
--- 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 2019-06-14 20:23:07.615661499 -0400
@@ -31,14 +31,6 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou
CXXFLAGS += `pkg-config --cflags openssl`
-@@ -84,6 +85,7 @@
- CPP_FILES+=../../zen/file_io.cpp
- CPP_FILES+=../../zen/file_traverser.cpp
- CPP_FILES+=../../zen/http.cpp
-+CPP_FILES+=../../zen/system.cpp
- CPP_FILES+=../../zen/zstring.cpp
- CPP_FILES+=../../zen/format_unit.cpp
- CPP_FILES+=../../zen/legacy_compiler.cpp
diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp
--- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp 2019-12-27 07:56:06.714625467 -0500
+++ 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp 2019-12-27 08:56:49.251467477 -0500
diff --git a/freefilesync/debian/patches/ffs_devuan_gtk3.patch b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
index 0838fbd..1f87d9a 100644
--- a/freefilesync/debian/patches/ffs_devuan_gtk3.patch
+++ b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
@@ -19,13 +19,14 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou
#support for SELinux (optional)
SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/RealTimeSync/Makefile 10.18-1/FreeFileSync/Source/RealTimeSync/Makefile
---- 10.20-0/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 11:45:58.241515736 -0500
-+++ 10.20-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 15:48:17.922847426 -0500
-@@ -8,8 +8,9 @@
+--- 10.20-0a/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 17:30:56.738835393 -0500
++++ 10.20-2/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 19:09:17.460124615 -0500
+@@ -7,9 +7,10 @@
+ LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread
#Gtk - support "no button border"
- CXXFLAGS += `pkg-config --cflags gtk+-2.0`
+-CXXFLAGS += `pkg-config --cflags gtk+-2.0`
++CXXFLAGS += `pkg-config --cflags gtk+-3.0`
+LINKFLAGS += `pkg-config --libs gtk+-3.0`
#treat as system headers so that warnings are hidden:
-CXXFLAGS += -isystem/usr/include/gtk-2.0
@@ -33,7 +34,6 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou
CPP_FILES=
CPP_FILES+=application.cpp
-
diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/wx+/dc.h 10.18-1/wx+/dc.h
--- 10.18-0/wx+/dc.h 2019-11-21 08:24:23.967769384 -0500
+++ 10.18-1/wx+/dc.h 2019-11-21 09:42:12.779786504 -0500
diff --git a/freefilesync/debian/patches/series b/freefilesync/debian/patches/series
index f61c180..da9adb8 100644
--- a/freefilesync/debian/patches/series
+++ b/freefilesync/debian/patches/series
@@ -1,10 +1,9 @@
ffs_allow_parallel_ops.patch
ffs_devuan.patch
-# can be either gtk2 or gtk3
-ffs_devuan_gtk2.patch
+# gtk3 for obs, gtk2 for albion
+ffs_devuan_gtk3.patch
ffs_no_check_updates.patch
ffs_no_wx311.patch
ffs_sftp.patch
ffs_libssh2.patch
ffs_curl.patch
-ffs_10.20.patch
bgstack15