diff options
| -rw-r--r-- | freefilesync/ffs_fedora.patch | 12 | ||||
| -rw-r--r-- | freefilesync/ffs_makefile.patch (renamed from freefilesync/ffs_include_lz.patch) | 8 | ||||
| -rw-r--r-- | freefilesync/ffs_no_user_manual.patch | 12 | ||||
| -rw-r--r-- | freefilesync/ffs_no_wx311.patch | 17 | ||||
| -rw-r--r-- | freefilesync/freefilesync.spec | 11 |
5 files changed, 43 insertions, 17 deletions
diff --git a/freefilesync/ffs_fedora.patch b/freefilesync/ffs_fedora.patch index 9a62974..eda1c16 100644 --- a/freefilesync/ffs_fedora.patch +++ b/freefilesync/ffs_fedora.patch @@ -10,3 +10,15 @@ diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 1 GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize() +diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp +--- 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-13 06:58:40.771249592 -0500 ++++ 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-16 21:34:30.341077845 -0500 +@@ -66,7 +66,7 @@ + ZEN_ON_SCOPE_EXIT(wxTheApp->SetAppName(appName)); + + //if (isPortableVersion()) +- return appendSeparator(getExeFolderParentPath()); ++ return appendSeparator(getExeFolderParentPath()) + appendSeparator("share") + appendSeparator("FreeFileSync"); + //else //use OS' standard paths + // return appendSeparator(utfTo<Zstring>(wxStandardPathsBase::Get().GetResourcesDir())); + } diff --git a/freefilesync/ffs_include_lz.patch b/freefilesync/ffs_makefile.patch index d647fd7..b3ff7ff 100644 --- a/freefilesync/ffs_include_lz.patch +++ b/freefilesync/ffs_makefile.patch @@ -10,6 +10,14 @@ diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/Makefile 10.3-2/Fre #Gtk - support recycler/icon loading/no button border/grid scrolling CXXFLAGS += `pkg-config --cflags gtk+-2.0` +@@ -101,6 +101,7 @@ + all: ../Build/Bin/$(APPNAME) + + ../Build/Bin/$(APPNAME): $(OBJ_FILES) ++ mkdir -p ../Build/Bin + g++ -o $@ $^ $(LINKFLAGS) + + ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : % diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/RealTimeSync/Makefile 10.3-2/FreeFileSync/Source/RealTimeSync/Makefile --- 10.3-0/FreeFileSync/Source/RealTimeSync/Makefile 2018-08-07 05:03:33.000000000 -0400 +++ 10.3-2/FreeFileSync/Source/RealTimeSync/Makefile 2018-08-15 22:25:15.968461418 -0400 diff --git a/freefilesync/ffs_no_user_manual.patch b/freefilesync/ffs_no_user_manual.patch deleted file mode 100644 index 97dde3c..0000000 --- a/freefilesync/ffs_no_user_manual.patch +++ /dev/null @@ -1,12 +0,0 @@ -# upstream project did not include user manual in release. -diff -Naur -x '*.orig' -x '*.rej' 10.5-0/FreeFileSync/Source/Makefile 10.5-1/FreeFileSync/Source/Makefile ---- 10.5-0/FreeFileSync/Source/Makefile 2018-10-16 22:14:04.472035798 -0400 -+++ 10.5-1/FreeFileSync/Source/Makefile 2018-10-16 22:17:45.141649203 -0400 -@@ -121,7 +121,6 @@ - ../Build/gong.wav \ - ../Build/harp.wav \ - ../Build/Resources.zip \ -- "../Build/User Manual.pdf" \ - $(APPSHAREDIR) - - mkdir -p $(DOCSHAREDIR) diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch index 04df827..78ac2a5 100644 --- a/freefilesync/ffs_no_wx311.patch +++ b/freefilesync/ffs_no_wx311.patch @@ -25,3 +25,20 @@ diff -Naur -x '*.orig' -x '*.rej' 10.3-0/wx+/grid.cpp 10.3-2/wx+/grid.cpp toScroll += scrollSpeed * deltaSecs; } else +diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp +--- 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-13 06:58:40.771249592 -0500 ++++ 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp 2018-11-14 21:39:14.715702415 -0500 +@@ -85,8 +85,11 @@ + else //OS standard path (XDG layout): ~/.config/FreeFileSync + { + //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag +- wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG); +- cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync"; ++ ++ // Fedora 28 does not have wxGTK 3.1.1 yet. ++ // So subsitute a hard-coded name instead of requesting file layout of XDG ++ //wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG); ++ cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo<Zstring>(".config")) + "FreeFileSync"; + } + + #ifdef __GNUC__ diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index a1d0059..c2d548d 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -2,8 +2,8 @@ %global prog2name RealTimeSync %global dummy_package 0 Name: freefilesync -Version: 10.5 -Release: 1%{?dist} +Version: 10.6 +Release: 3%{?dist} Summary: A file synchronization utility Group: Applications/File @@ -14,11 +14,10 @@ URL: http://www.freefilesync.org/ Source0: https://gitlab.com/opensource-tracking/%{pkgname}/-/archive/%{version}/%{pkgname}-%{version}.tar.gz Source1: %{pkgname}.desktop Source2: %{prog2name}.desktop -Patch0: ffs_include_lz.patch +Patch0: ffs_makefile.patch Patch1: ffs_no_check_updates.patch Patch2: ffs_no_wx311.patch Patch3: ffs_fedora.patch -Patch4: ffs_no_user_manual.patch Packager: B Stack <bgstack15@gmail.com> BuildRequires: boost-devel @@ -49,7 +48,6 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 # custom build parameters for packaging application in rpm %{__sed} \ @@ -134,6 +132,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %ghost %config %attr(666, -, -) %{_datadir}/%{pkgname}/GlobalSettings.xml %changelog +* Fri Nov 16 2018 B Stack <bgstack15@gmail.com> - 10.6-3 +- version bump + * Tue Oct 16 2018 B Stack <bgstack15@gmail.com> - 10.5-1 - version bump |