From 1cce3ce6e10a6e7b55f0decc17d98466614580dee89a453147e166ae316d488b Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Sun, 23 Apr 2017 14:24:32 +0000 Subject: [PATCH] Accepting request 489379 from home:tglatt:branches:network Newest version (9.0) OBS-URL: https://build.opensuse.org/request/show/489379 OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=20 --- FreeFileSync-makefile.patch | 16 -------- FreeFileSync.spec | 25 +++++++----- FreeFileSync_8.5_Source.zip | 3 -- FreeFileSync_9.0_Source.zip | 3 ++ freefilesync-build.patch | 79 +++++++++++++++++++++++++++++++++++++ zenXml_2.1-stripped.zip | 3 -- 6 files changed, 98 insertions(+), 31 deletions(-) delete mode 100644 FreeFileSync-makefile.patch delete mode 100644 FreeFileSync_8.5_Source.zip create mode 100644 FreeFileSync_9.0_Source.zip create mode 100644 freefilesync-build.patch delete mode 100644 zenXml_2.1-stripped.zip diff --git a/FreeFileSync-makefile.patch b/FreeFileSync-makefile.patch deleted file mode 100644 index 3c79183..0000000 --- a/FreeFileSync-makefile.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Pdpru FreeFileSync.orig/FreeFileSync/Source/Makefile FreeFileSync/FreeFileSync/Source/Makefile ---- FreeFileSync.orig/FreeFileSync/Source/Makefile 2015-11-02 13:29:48.000000000 +0100 -+++ FreeFileSync/FreeFileSync/Source/Makefile 2016-03-19 15:56:36.756289044 +0100 -@@ -113,9 +113,10 @@ install: - mkdir -p $(APPSHAREDIR) - cp -R ../Build/Languages/ \ - ../Build/Help/ \ -- ../Build/Sync_Complete.wav \ -+ ../Build/ding.wav \ -+ ../Build/gong.wav \ -+ ../Build/harp.wav \ - ../Build/Resources.zip \ -- ../Build/styles.gtk_rc \ - $(APPSHAREDIR) - - mkdir -p $(DOCSHAREDIR) diff --git a/FreeFileSync.spec b/FreeFileSync.spec index 157ab95..81ce488 100644 --- a/FreeFileSync.spec +++ b/FreeFileSync.spec @@ -17,7 +17,7 @@ Name: FreeFileSync Summary: Free backup software to synchronize files and folders -Version: 8.5 +Version: 9.0 Release: 1 License: GPL-3.0+ Group: Productivity/Networking/System @@ -27,11 +27,10 @@ Source1: %{name}.desktop Source2: %{name}.png Source3: RealTimeSync.desktop Source4: RealTimeSync.png -Source5: zenXml_2.1-stripped.zip -#Patch0: %%{name}-makefile.patch +Patch0: freefilesync-build.patch +# Patch created thanks to doubledodge https://www.freefilesync.org/forum/viewtopic.php?t=4288 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: unzip -BuildRequires: dos2unix BuildRequires: boost-devel >= 1.54 BuildRequires: wxWidgets-3_0-devel BuildRequires: update-desktop-files @@ -59,9 +58,9 @@ Usually this command line will trigger a FreeFileSync batch job. %prep %setup -T -b 0 -c %{name}-%{version} -%setup -T -a 5 -c %{name}-%{version} -D -#%%patch0 -p1 -dos2unix LICENSE +%patch0 -p1 +sed -i 's/\r$//' License.txt +chmod -x License.txt %build # @@ -77,6 +76,7 @@ pushd %{name}/Source sed -i -e 's:g++:g++-5:g' Makefile sed -i -e 's:CXXFLAGS =:CXXFLAGS +=:g' Makefile %endif +#export CXXFLAGS="-include 'zen/warn_static.h'" make %{?_smp_mflags} BUILD=FreeFileSync popd pushd %{name}/Source/RealTimeSync @@ -96,6 +96,13 @@ pushd %{name}/Source/RealTimeSync popd # del unneeded changelog.gz rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name} +chmod -x ${RPM_BUILD_ROOT}%{_datadir}/%{name}/Languages/*.lng +sed -i 's/\r$//' ${RPM_BUILD_ROOT}%{_datadir}/%{name}/Languages/*.lng +chmod -x ${RPM_BUILD_ROOT}%{_datadir}/%{name}/Help/html/*.html +chmod -x ${RPM_BUILD_ROOT}%{_datadir}/%{name}/Help/html/*.css +chmod -x ${RPM_BUILD_ROOT}%{_datadir}/%{name}/Help/FreeFileSync.hh* +chmod -x ${RPM_BUILD_ROOT}%{_datadir}/%{name}/Resources.zip + # desktop mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps install -p %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ @@ -114,7 +121,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc LICENSE +%doc License.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop @@ -122,7 +129,7 @@ rm -rf %{buildroot} %files -n RealtimeSync %defattr(-,root,root,-) -%doc LICENSE +%doc License.txt %{_bindir}/RealTimeSync %{_datadir}/applications/RealTimeSync.desktop %{_datadir}/pixmaps/RealTimeSync.png diff --git a/FreeFileSync_8.5_Source.zip b/FreeFileSync_8.5_Source.zip deleted file mode 100644 index a4075d8..0000000 --- a/FreeFileSync_8.5_Source.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f18629275a1ff8cd41f5dd029cd46ac5b547a79ac7ac03d494418bc99dc6266 -size 3002316 diff --git a/FreeFileSync_9.0_Source.zip b/FreeFileSync_9.0_Source.zip new file mode 100644 index 0000000..186cd17 --- /dev/null +++ b/FreeFileSync_9.0_Source.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da0def7d27bbb4ae53de1a9ff6e408a6395a75220447e813fe6294808af2a956 +size 2873901 diff --git a/freefilesync-build.patch b/freefilesync-build.patch new file mode 100644 index 0000000..f2623a9 --- /dev/null +++ b/freefilesync-build.patch @@ -0,0 +1,79 @@ +diff -Naur FreeFileSync_9.0_Source-orig/FreeFileSync/Source/fs/abstract.h FreeFileSync_9.0_Source/FreeFileSync/Source/fs/abstract.h +--- FreeFileSync_9.0_Source-orig/FreeFileSync/Source/fs/abstract.h 2017-04-16 18:56:17.000000000 +0200 ++++ FreeFileSync_9.0_Source/FreeFileSync/Source/fs/abstract.h 2017-04-19 16:25:52.184158538 +0200 +@@ -12,6 +12,7 @@ + #include + #include + #include //InputStream/OutputStream support buffered stream concept ++#include + #include "../lib/icon_holder.h" + + +diff -Naur FreeFileSync_9.0_Source-orig/FreeFileSync/Source/Makefile FreeFileSync_9.0_Source/FreeFileSync/Source/Makefile +--- FreeFileSync_9.0_Source-orig/FreeFileSync/Source/Makefile 2017-04-16 18:56:15.000000000 +0200 ++++ FreeFileSync_9.0_Source/FreeFileSync/Source/Makefile 2017-04-19 17:12:02.789678576 +0200 +@@ -121,5 +121,5 @@ + $(APPSHAREDIR) + + mkdir -p $(DOCSHAREDIR) +- cp ../Build/Changelog.txt $(DOCSHAREDIR)/changelog ++ cp ../../Changelog.txt $(DOCSHAREDIR)/changelog + gzip $(DOCSHAREDIR)/changelog +diff -Naur FreeFileSync_9.0_Source-orig/FreeFileSync/Source/ui/main_dlg.cpp FreeFileSync_9.0_Source/FreeFileSync/Source/ui/main_dlg.cpp +--- FreeFileSync_9.0_Source-orig/FreeFileSync/Source/ui/main_dlg.cpp 2017-04-16 18:56:17.000000000 +0200 ++++ FreeFileSync_9.0_Source/FreeFileSync/Source/ui/main_dlg.cpp 2017-04-19 17:02:44.045305760 +0200 +@@ -956,7 +956,7 @@ + history.resize(globalSettings.gui.cfgFileHistMax); + + globalSettings.gui.cfgFileHistory = history; +- globalSettings.gui.cfgFileHistFirstItemPos = m_listBoxHistory->GetTopItem(); ++ // globalSettings.gui.cfgFileHistFirstItemPos = m_listBoxHistory->GetTopItem(); + //-------------------------------------------------------------------------------- + globalSettings.gui.lastUsedConfigFiles.clear(); + for (const Zstring& cfgFilePath : activeConfigFiles) +@@ -4767,13 +4767,13 @@ + + m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg.gui.lastUpdateCheck)); + +- if (shouldRunPeriodicUpdateCheck(globalCfg.gui.lastUpdateCheck)) ++ /*if (shouldRunPeriodicUpdateCheck(globalCfg.gui.lastUpdateCheck)) + { + flashStatusInformation(_("Searching for program updates...")); + //synchronous update check is sufficient here: + periodicUpdateCheckEval(this, globalCfg.gui.lastUpdateCheck, globalCfg.gui.lastOnlineVersion, + periodicUpdateCheckRunAsync(periodicUpdateCheckPrepare().get()).get()); +- } ++ }*/ + } + + +@@ -4782,7 +4782,7 @@ + //execute just once per startup! + Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this); + +- if (shouldRunPeriodicUpdateCheck(globalCfg.gui.lastUpdateCheck)) ++ /*if (shouldRunPeriodicUpdateCheck(globalCfg.gui.lastUpdateCheck)) + { + flashStatusInformation(_("Searching for program updates...")); + +@@ -4794,7 +4794,7 @@ + periodicUpdateCheckEval(this, globalCfg.gui.lastUpdateCheck, globalCfg.gui.lastOnlineVersion, + resultAsync.get()); //run on main thread: + }); +- } ++ }*/ + } + + +diff -Naur FreeFileSync_9.0_Source-orig/zen/file_access.cpp FreeFileSync_9.0_Source/zen/file_access.cpp +--- FreeFileSync_9.0_Source-orig/zen/file_access.cpp 2017-04-16 18:56:16.000000000 +0200 ++++ FreeFileSync_9.0_Source/zen/file_access.cpp 2017-04-19 16:45:51.042780882 +0200 +@@ -385,7 +385,7 @@ + + } + +-warn_static("remove after test") ++//warn_static("remove after test") + void zen::setFileTime(const Zstring& filePath, int64_t modTime, ProcSymlink procSl) //throw FileError + { + struct ::timespec writeTime = {}; diff --git a/zenXml_2.1-stripped.zip b/zenXml_2.1-stripped.zip deleted file mode 100644 index 0864e47..0000000 --- a/zenXml_2.1-stripped.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58bdc8ec8a5cf691f0e51b6cf5d81740b5b9088b855357b7185a689d19a63621 -size 19161