diff options
| -rw-r--r-- | freefilesync/README.md | 17 | ||||
| -rw-r--r-- | freefilesync/ffs_el.patch | 18 | ||||
| -rw-r--r-- | freefilesync/ffs_fedora.patch | 18 | ||||
| -rw-r--r-- | freefilesync/ffs_no_wx311.patch | 11 | ||||
| -rw-r--r-- | freefilesync/freefilesync.spec | 7 |
5 files changed, 38 insertions, 33 deletions
diff --git a/freefilesync/README.md b/freefilesync/README.md index 1c47327..de7b573 100644 --- a/freefilesync/README.md +++ b/freefilesync/README.md @@ -9,13 +9,16 @@ Fedora, CentOS, and Devuan do not package FreeFileSync. I maintained a separate # Reverse dependency matrix Distro | FreeFileSync version -------------- | -------------------- -CentOS 7 | 10.16 -CentOS 8 | 10.17 -Fedora 29 | 10.17 -Fedora 30 | 10.17 -Fedora 31 | 10.17 -Fedora Rawhide | 10.17 -Devuan Ceres | 10.17 +CentOS 7 | 10.19 +CentOS 8 | 10.19 +Fedora 29 | 10.19 +Fedora 30 | 10.19 +Fedora 31 | 10.19 +Fedora Rawhide | 10.19 +Devuan Ceres | 10.19 + +# Additional info +Devuan upstream recently dropped gtk2 packages required for building FreeFileSync. This means that OBS can only build the gtk3 version, which has some serious stability problems. My local gtk2 build is much more stable but depends on my local devuan-archive repo. # Differences from upstream None diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch index d3849f3..64fdb03 100644 --- a/freefilesync/ffs_el.patch +++ b/freefilesync/ffs_el.patch @@ -75,17 +75,17 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/RealTim #treat as system headers so that warnings are hidden: CXXFLAGS += -isystem/usr/include/gtk-2.0 -diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp ---- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp 2019-04-12 07:59:45.318160616 -0400 -+++ 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp 2019-04-12 10:19:57.228913439 -0400 -@@ -115,6 +115,8 @@ - L" x64"; +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 +@@ -95,6 +95,8 @@ + build += L"64 Bit"; #endif -+ build += -+ L" for CentOS 7"; - - GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize() ++ build += L" for CentOS 7/Fedora 29"; ++ + build += SPACED_BULLET; + build += formatTime<wxString>(FORMAT_DATE, getCompileTime()); diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/wx+/app_main.h 10.11-1/wx+/app_main.h --- 10.11-0/wx+/app_main.h 2019-04-12 07:59:44.936143019 -0400 diff --git a/freefilesync/ffs_fedora.patch b/freefilesync/ffs_fedora.patch index 12346fb..546661b 100644 --- a/freefilesync/ffs_fedora.patch +++ b/freefilesync/ffs_fedora.patch @@ -74,15 +74,15 @@ diff -Naur 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 10.11-1/FreeFileSyn #treat as system headers so that warnings are hidden: CXXFLAGS += -isystem/usr/include/gtk-2.0 -diff -Naur 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp ---- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp 2019-04-12 07:59:45.318160616 -0400 -+++ 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp 2019-04-12 08:27:24.421735762 -0400 -@@ -115,6 +115,8 @@ - L" x64"; +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 +@@ -95,6 +95,8 @@ + build += L"64 Bit"; #endif -+ build += -+ L" for Fedora"; - - GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize() ++ build += L" for Devuan"; ++ + build += SPACED_BULLET; + build += formatTime<wxString>(FORMAT_DATE, getCompileTime()); diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch index 92b5372..204740d 100644 --- a/freefilesync/ffs_no_wx311.patch +++ b/freefilesync/ffs_no_wx311.patch @@ -1,13 +1,12 @@ 2019-08-15 just compile. -diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp ---- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 2018-08-07 05:03:34.000000000 -0400 -+++ 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp 2018-08-08 19:16:54.026727623 -0400 -@@ -984,7 +984,8 @@ +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.3-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:41:43.498308243 -0500 +@@ -1546,7 +1546,7 @@ //setMainInstructionFont(*m_staticTextMain); - m_bitmapActivation->SetBitmap(getResourceImage(L"website")); + m_bitmapActivation->SetBitmap(getResourceImage(L"internet")); - m_textCtrlOfflineActivationKey->ForceUpper(); -+ // Fedora 27 does not have wxWidgets 3.1.1 yet. https://github.com/wxWidgets/wxWidgets/commit/69b66e9e2e2b8e49e3816acdde079686ce9b0da1 + //m_textCtrlOfflineActivationKey->ForceUpper(); m_textCtrlLastError ->ChangeValue(lastErrorMsg); diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 3ed654a..85cb94a 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -18,8 +18,8 @@ %define libssh2_name libssh2-%{name} %endif Name: freefilesync -Version: 10.18 -Release: 2%{?dist} +Version: 10.19 +Release: 1%{?dist} Summary: A file synchronization utility Group: Applications/File @@ -202,6 +202,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog +* Thu Dec 27 2019 B Stack <bgstack15@gmail.com> - 10.19-1 +- version bump + * Thu Nov 21 2019 B Stack <bgstack15@gmail.com> - 10.18-2 - el and fc29 reverted to devtoolset-7, -std=c++17, and some older internal logic |