summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--freefilesync/debian/changelog14
-rw-r--r--freefilesync/debian/patches/ffs_libssh2.patch8
-rw-r--r--freefilesync/debian/patches/ffs_no_wx311.patch2
-rw-r--r--freefilesync/debian/patches/ffs_old_libcurl.patch13
-rw-r--r--freefilesync/debian/patches/ffs_sftp.patch8
-rw-r--r--freefilesync/debian/patches/series1
-rwxr-xr-xfreefilesync/debian/rules50
-rw-r--r--freefilesync/ffs_fedora.patch6
-rw-r--r--freefilesync/ffs_libssh2.patch8
-rw-r--r--freefilesync/ffs_no_wx311.patch2
-rw-r--r--freefilesync/ffs_sftp.patch6
-rw-r--r--freefilesync/freefilesync.spec28
-rw-r--r--freefilesync/freefilesync.xml18
-rw-r--r--waterfox/waterfox-mozconfig2
-rw-r--r--waterfox/waterfox.spec23
15 files changed, 108 insertions, 81 deletions
diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog
index c3ee4a9..8fab084 100644
--- a/freefilesync/debian/changelog
+++ b/freefilesync/debian/changelog
@@ -1,3 +1,17 @@
+freefilesync (10.12-1+devuan) manual; urgency=low
+
+ * Show sync start time and date in progress dialog title
+ * Added duration of comparison to log
+ * Show all total times in full HH:MM:SS format
+ * Added sync start time to log file header
+ * Add Windows Defender exclusions to fix CURLE_OPERATION_TIMEDOUT
+ * New RealTimeSync option to hide console window
+ * Support launching through symlink (Windows)
+ * Dropped support for Windows XP, Server 2003, and Vista
+ * Reduced installation size by 25%
+
+ -- B Stack <bgstack15@gmail.com> Sun, 13 May 2019 21:51:30 -0500
+
freefilesync (10.11-1+devuan) manual; urgency=low
* Last FreeFileSync version supporting Windows XP and Vista
diff --git a/freefilesync/debian/patches/ffs_libssh2.patch b/freefilesync/debian/patches/ffs_libssh2.patch
index 81287a3..4fc1497 100644
--- a/freefilesync/debian/patches/ffs_libssh2.patch
+++ b/freefilesync/debian/patches/ffs_libssh2.patch
@@ -3,11 +3,11 @@ Author: Simon Brulhart
Message: libssh2 v1.8.0 does not yet implement LIBSSH2_SFTP_DEFAULT_MODE, revert to previous impl.
Method:
- sed -e 's/LIBSSH2_SFTP_DEFAULT_MODE/LIBSSH2_SFTP_S_IRWXU | LIBSSH2_SFTP_S_IRWXG | LIBSSH2_SFTP_S_IRWXO/g' -i 'FreeFileSync/Source/fs/sftp.cpp'
+ sed -e 's/LIBSSH2_SFTP_DEFAULT_MODE/LIBSSH2_SFTP_S_IRWXU | LIBSSH2_SFTP_S_IRWXG | LIBSSH2_SFTP_S_IRWXO/g' -i 'FreeFileSync/Source/afs/sftp.cpp'
-diff -x '*.swp' -x .git -Naur 10.10-0/FreeFileSync/Source/fs/sftp.cpp 10.10-1/FreeFileSync/Source/fs/sftp.cpp
---- 10.10-0/FreeFileSync/Source/fs/sftp.cpp 2019-03-12 08:09:58.465098982 -0400
-+++ 10.10-1/FreeFileSync/Source/fs/sftp.cpp 2019-03-12 08:27:05.718963710 -0400
+diff -x '*.swp' -x .git -Naur 10.10-0/FreeFileSync/Source/afs/sftp.cpp 10.10-1/FreeFileSync/Source/afs/sftp.cpp
+--- 10.10-0/FreeFileSync/Source/afs/sftp.cpp 2019-03-12 08:09:58.465098982 -0400
++++ 10.10-1/FreeFileSync/Source/afs/sftp.cpp 2019-03-12 08:27:05.718963710 -0400
@@ -1657,8 +1657,8 @@
runSftpCommand(login_, L"libssh2_sftp_mkdir", //throw SysError
[&](const SshSession::Details& sd) //noexcept!
diff --git a/freefilesync/debian/patches/ffs_no_wx311.patch b/freefilesync/debian/patches/ffs_no_wx311.patch
index 78ac2a5..871e083 100644
--- a/freefilesync/debian/patches/ffs_no_wx311.patch
+++ b/freefilesync/debian/patches/ffs_no_wx311.patch
@@ -41,4 +41,4 @@ diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Sou
+ cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo<Zstring>(".config")) + "FreeFileSync";
}
- #ifdef __GNUC__
+ std::call_once(onceFlagCreateCfgPath, [&]
diff --git a/freefilesync/debian/patches/ffs_old_libcurl.patch b/freefilesync/debian/patches/ffs_old_libcurl.patch
deleted file mode 100644
index e13f1bb..0000000
--- a/freefilesync/debian/patches/ffs_old_libcurl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream uses a libcurl more current than Fedora 29.
-diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h 10.9-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h
---- 10.9-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h 2019-02-10 16:42:29.124040824 -0500
-+++ 10.9-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h 2019-02-10 20:57:30.758315345 -0500
-@@ -75,7 +75,7 @@
- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION);
- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50);
-- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
-+ //ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51);
- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PEER_FAILED_VERIFICATION);
- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING);
- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND);
diff --git a/freefilesync/debian/patches/ffs_sftp.patch b/freefilesync/debian/patches/ffs_sftp.patch
index 34dc9ad..c526a22 100644
--- a/freefilesync/debian/patches/ffs_sftp.patch
+++ b/freefilesync/debian/patches/ffs_sftp.patch
@@ -1,6 +1,8 @@
-diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/fs/sftp.cpp 10.9-1/FreeFileSync/Source/fs/sftp.cpp
---- 10.9-0/FreeFileSync/Source/fs/sftp.cpp 2019-02-10 16:42:29.139040980 -0500
-+++ 10.9-1/FreeFileSync/Source/fs/sftp.cpp 2019-02-10 21:28:00.030732089 -0500
+The upstream author observed that some of the values he uses are not in the libssh2 public headers. I don't know where he uses them from, but I had to replace them here to get this to compile.
+https://github.com/libssh2/libssh2/issues/90
+diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/afs/sftp.cpp 10.9-1/FreeFileSync/Source/afs/sftp.cpp
+--- 10.9-0/FreeFileSync/Source/afs/sftp.cpp 2019-02-10 16:42:29.139040980 -0500
++++ 10.9-1/FreeFileSync/Source/afs/sftp.cpp 2019-02-10 21:28:00.030732089 -0500
@@ -56,9 +56,10 @@
//attention: if operation fails due to time out, e.g. file copy, the cleanup code may hang, too => total delay = 2 x time out interval
diff --git a/freefilesync/debian/patches/series b/freefilesync/debian/patches/series
index bca1534..54052a9 100644
--- a/freefilesync/debian/patches/series
+++ b/freefilesync/debian/patches/series
@@ -2,6 +2,5 @@ ffs_allow_parallel_ops.patch
ffs_devuan.patch
ffs_no_check_updates.patch
ffs_no_wx311.patch
-ffs_old_libcurl.patch
ffs_sftp.patch
ffs_libssh2.patch
diff --git a/freefilesync/debian/rules b/freefilesync/debian/rules
index b606a69..6feb0f5 100755
--- a/freefilesync/debian/rules
+++ b/freefilesync/debian/rules
@@ -35,12 +35,10 @@ override_dh_auto_install:
#dh_auto_install --sourcedirectory=FreeFileSync/Source/RealTimeSync
install -d ${buildroot}${_bindir} ${buildroot}${_datadir}/${appname}
install -Dm 0755 -t ${buildroot}${_bindir} ${debuildappdir}/Build/Bin/${pkgname} ${debuildappdir}/Build/Bin/${prog2name}
- cp -pr ${debuildappdir}/Build/Languages ${buildroot}${_datadir}/${appname}
- install -Dm 0644 ${debuildappdir}/Build/ding.wav ${debuildappdir}/Build/gong.wav ${debuildappdir}/Build/harp.wav ${debuildappdir}/Build/Resources.zip ${debuildappdir}/Build/styles.gtk_rc ${buildroot}${_datadir}/${appname}
+ cp -pr ${debuildappdir}/Build/Languages ${debuildappdir}/Build/Misc ${buildroot}${_datadir}/${appname}
# make extra sure the files are not marked with executable
find ${debuildappdir}/share/${pkgname} -type f -exec chmod -x '{}' \; || :
- #find %{buildroot}%{_datadir}/%{pkgname} -type f -exec chmod -x '{}' \; || :
# desktop files
:
@@ -52,10 +50,10 @@ override_dh_auto_install:
# none
# mimetypes
- # none
+ # handled by dpkg already
# icons
- unzip ${pkgname}/Build/Resources.zip ${pkgname}.png ${prog2name}.png file_batch.png
+ unzip ${pkgname}/Build/Misc/Icons.zip file_batch.png
mkdir -p ${buildroot}${_datadir}/icons/hicolor/16x16/apps
mkdir -p ${buildroot}${_datadir}/icons/hicolor/32x32/apps
mkdir -p ${buildroot}${_datadir}/icons/hicolor/48x48/apps
@@ -66,29 +64,29 @@ override_dh_auto_install:
mkdir -p ${buildroot}${_datadir}/icons/hicolor/48x48/mimetypes
mkdir -p ${buildroot}${_datadir}/icons/hicolor/64x64/mimetypes
mkdir -p ${buildroot}${_datadir}/icons/hicolor/128x128/mimetypes
- convert ${pkgname}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/apps/${pkgname}.png
- convert ${pkgname}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/apps/${pkgname}.png
- convert ${pkgname}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/apps/${pkgname}.png
- convert ${pkgname}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/apps/${pkgname}.png
- convert ${pkgname}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/apps/${pkgname}.png
- convert ${pkgname}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/mimetypes/application-x-freefilesync-ffs.png
- convert ${pkgname}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/mimetypes/application-x-freefilesync-ffs.png
- convert ${pkgname}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/mimetypes/application-x-freefilesync-ffs.png
- convert ${pkgname}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/mimetypes/application-x-freefilesync-ffs.png
- convert ${pkgname}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/mimetypes/application-x-freefilesync-ffs.png
- convert ${prog2name}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/apps/${prog2name}.png
- convert ${prog2name}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/apps/${prog2name}.png
- convert ${prog2name}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/apps/${prog2name}.png
- convert ${prog2name}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/apps/${prog2name}.png
- convert ${prog2name}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/apps/${prog2name}.png
- convert ${prog2name}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/mimetypes/application-x-freefilesync-real.png
- convert ${prog2name}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/mimetypes/application-x-freefilesync-real.png
- convert ${prog2name}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/mimetypes/application-x-freefilesync-real.png
- convert ${prog2name}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/mimetypes/application-x-freefilesync-real.png
- convert ${prog2name}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/mimetypes/application-x-freefilesync-real.png
+ convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/apps/${pkgname}.png
+ convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/apps/${pkgname}.png
+ convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/apps/${pkgname}.png
+ convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/apps/${pkgname}.png
+ convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/apps/${pkgname}.png
+ convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/mimetypes/application-x-freefilesync-ffs.png
+ convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/mimetypes/application-x-freefilesync-ffs.png
+ convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/mimetypes/application-x-freefilesync-ffs.png
+ convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/mimetypes/application-x-freefilesync-ffs.png
+ convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/mimetypes/application-x-freefilesync-ffs.png
+ convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/apps/${prog2name}.png
+ convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/apps/${prog2name}.png
+ convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/apps/${prog2name}.png
+ convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/apps/${prog2name}.png
+ convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/apps/${prog2name}.png
+ convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/mimetypes/application-x-freefilesync-real.png
+ convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/mimetypes/application-x-freefilesync-real.png
+ convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/mimetypes/application-x-freefilesync-real.png
+ convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/mimetypes/application-x-freefilesync-real.png
+ convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/mimetypes/application-x-freefilesync-real.png
convert file_batch.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/mimetypes/application-x-freefilesync-batch.png
convert file_batch.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/mimetypes/application-x-freefilesync-batch.png
convert file_batch.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/mimetypes/application-x-freefilesync-batch.png
convert file_batch.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/mimetypes/application-x-freefilesync-batch.png
convert file_batch.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/mimetypes/application-x-freefilesync-batch.png
- rm -f ${pkgname}.png ${prog2name}.png file_batch.png
+ rm -f file_batch.png
diff --git a/freefilesync/ffs_fedora.patch b/freefilesync/ffs_fedora.patch
index c1cf61e..debe6a6 100644
--- a/freefilesync/ffs_fedora.patch
+++ b/freefilesync/ffs_fedora.patch
@@ -11,9 +11,9 @@ diff -Naur 10.11-0/FreeFileSync/Source/base/ffs_paths.cpp 10.11-1/FreeFileSync/S
//else //use OS' standard paths
// return appendSeparator(utfTo<Zstring>(wxStandardPathsBase::Get().GetResourcesDir()));
}
-diff -Naur 10.11-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h 10.11-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h
---- 10.11-0/FreeFileSync/Source/fs/libcurl/curl_wrap.h 2019-04-12 07:59:45.130151956 -0400
-+++ 10.11-1/FreeFileSync/Source/fs/libcurl/curl_wrap.h 2019-04-12 08:27:24.423735854 -0400
+diff -Naur 10.11-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 10.11-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h
+--- 10.11-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 2019-04-12 07:59:45.130151956 -0400
++++ 10.11-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h 2019-04-12 08:27:24.423735854 -0400
@@ -75,7 +75,7 @@
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNKNOWN_OPTION);
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
diff --git a/freefilesync/ffs_libssh2.patch b/freefilesync/ffs_libssh2.patch
index 81287a3..4fc1497 100644
--- a/freefilesync/ffs_libssh2.patch
+++ b/freefilesync/ffs_libssh2.patch
@@ -3,11 +3,11 @@ Author: Simon Brulhart
Message: libssh2 v1.8.0 does not yet implement LIBSSH2_SFTP_DEFAULT_MODE, revert to previous impl.
Method:
- sed -e 's/LIBSSH2_SFTP_DEFAULT_MODE/LIBSSH2_SFTP_S_IRWXU | LIBSSH2_SFTP_S_IRWXG | LIBSSH2_SFTP_S_IRWXO/g' -i 'FreeFileSync/Source/fs/sftp.cpp'
+ sed -e 's/LIBSSH2_SFTP_DEFAULT_MODE/LIBSSH2_SFTP_S_IRWXU | LIBSSH2_SFTP_S_IRWXG | LIBSSH2_SFTP_S_IRWXO/g' -i 'FreeFileSync/Source/afs/sftp.cpp'
-diff -x '*.swp' -x .git -Naur 10.10-0/FreeFileSync/Source/fs/sftp.cpp 10.10-1/FreeFileSync/Source/fs/sftp.cpp
---- 10.10-0/FreeFileSync/Source/fs/sftp.cpp 2019-03-12 08:09:58.465098982 -0400
-+++ 10.10-1/FreeFileSync/Source/fs/sftp.cpp 2019-03-12 08:27:05.718963710 -0400
+diff -x '*.swp' -x .git -Naur 10.10-0/FreeFileSync/Source/afs/sftp.cpp 10.10-1/FreeFileSync/Source/afs/sftp.cpp
+--- 10.10-0/FreeFileSync/Source/afs/sftp.cpp 2019-03-12 08:09:58.465098982 -0400
++++ 10.10-1/FreeFileSync/Source/afs/sftp.cpp 2019-03-12 08:27:05.718963710 -0400
@@ -1657,8 +1657,8 @@
runSftpCommand(login_, L"libssh2_sftp_mkdir", //throw SysError
[&](const SshSession::Details& sd) //noexcept!
diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch
index 78ac2a5..871e083 100644
--- a/freefilesync/ffs_no_wx311.patch
+++ b/freefilesync/ffs_no_wx311.patch
@@ -41,4 +41,4 @@ diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Sou
+ cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo<Zstring>(".config")) + "FreeFileSync";
}
- #ifdef __GNUC__
+ std::call_once(onceFlagCreateCfgPath, [&]
diff --git a/freefilesync/ffs_sftp.patch b/freefilesync/ffs_sftp.patch
index 056cf91..c526a22 100644
--- a/freefilesync/ffs_sftp.patch
+++ b/freefilesync/ffs_sftp.patch
@@ -1,8 +1,8 @@
The upstream author observed that some of the values he uses are not in the libssh2 public headers. I don't know where he uses them from, but I had to replace them here to get this to compile.
https://github.com/libssh2/libssh2/issues/90
-diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/fs/sftp.cpp 10.9-1/FreeFileSync/Source/fs/sftp.cpp
---- 10.9-0/FreeFileSync/Source/fs/sftp.cpp 2019-02-10 16:42:29.139040980 -0500
-+++ 10.9-1/FreeFileSync/Source/fs/sftp.cpp 2019-02-10 21:28:00.030732089 -0500
+diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/afs/sftp.cpp 10.9-1/FreeFileSync/Source/afs/sftp.cpp
+--- 10.9-0/FreeFileSync/Source/afs/sftp.cpp 2019-02-10 16:42:29.139040980 -0500
++++ 10.9-1/FreeFileSync/Source/afs/sftp.cpp 2019-02-10 21:28:00.030732089 -0500
@@ -56,9 +56,10 @@
//attention: if operation fails due to time out, e.g. file copy, the cleanup code may hang, too => total delay = 2 x time out interval
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec
index 7c45e91..fb7c4a3 100644
--- a/freefilesync/freefilesync.spec
+++ b/freefilesync/freefilesync.spec
@@ -14,7 +14,7 @@
%define min_openssl >= 1.1.0h
%endif
Name: freefilesync
-Version: 10.11
+Version: 10.12
Release: 1%{?dist}
Summary: A file synchronization utility
@@ -26,6 +26,7 @@ URL: http://www.freefilesync.org/
Source0: https://gitlab.com/opensource-tracking/%{pkgname}/-/archive/%{version}/%{pkgname}-%{version}.tar.gz
Source1: %{pkgname}.desktop
Source2: %{prog2name}.desktop
+Source3: %{name}.xml
Patch0: ffs_allow_parallel_ops.patch
Patch1: ffs_no_check_updates.patch
Patch2: ffs_no_wx311.patch
@@ -59,6 +60,9 @@ BuildRequires: openssl-devel
%endif
Requires: hicolor-icon-theme
Requires: xdg-utils
+Provides: mimehandler(application/x-freefilesync-ffs)
+Provides: mimehandler(application/x-freefilesync-real)
+Provides: mimehandler(application/x-freefilesync-batch)
%description
FreeFileSync is a free Open Source software that helps you synchronize
@@ -113,8 +117,7 @@ EOF
pushd %{pkgname}/Build
install -d %{buildroot}%{_bindir} %{buildroot}%{_datadir}/%{name}
install -Dm 0755 -t %{buildroot}%{_bindir} Bin/%{pkgname} Bin/%{prog2name}
-cp -pr Languages %{buildroot}%{_datadir}/%{name}
-install -Dm 0644 ding.wav gong.wav harp.wav Resources.zip styles.gtk_rc %{buildroot}%{_datadir}/%{name}
+cp -pr Languages Misc %{buildroot}%{_datadir}/%{name}
popd
%endif
@@ -133,18 +136,20 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
# none
# mimetypes
-# none
+install -d %{buildroot}%{_datadir}/mime/packages
+install -Dm 0644 -t %{buildroot}%{_datadir}/mime/packages %{SOURCE3}
# icons
-unzip %{pkgname}/Build/Resources.zip %{pkgname}.png %{prog2name}.png
+unzip %{pkgname}/Build/Misc/Icons.zip file_batch.png
for res in 16 22 24 32 48 64 96 128 256 ;do
dir=%{buildroot}%{_datadir}/icons/hicolor/${res}x${res}/apps
- mkdir -p ${dir}
+ mkdir -p ${dir} ${dir}/../mimetypes
for icon in %{pkgname} %{prog2name} ;do
- convert ${icon}.png -filter Lanczos -resize ${res}x${res} \
+ convert %{pkgname}/Build/Misc/${icon}.png -filter Lanczos -resize ${res}x${res} \
${dir}/${icon}.png
done
+ convert file_batch.png -filter Lanczos -resize ${res}x${res} ${dir}/../mimetypes/application-x-freefilesync-batch.png
done
%clean
@@ -170,6 +175,7 @@ fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 || :
%files
%license %attr(444, -, -) License.txt
@@ -177,11 +183,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/%{pkgname}
%{_bindir}/%{prog2name}
%{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*x*/apps/*.png
+%{_datadir}/icons/hicolor/*x*/*/*.png
+%{_datadir}/mime/packages/*
%{_datadir}/%{name}
%ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml
%changelog
+* Sun May 12 2019 B Stack <bgstack15@gmail.com> - 10.12-1
+- version bump
+- improve icons used from upstream, to match dpkg
+- add mimetypes, to match dpkg
+
* Fri Apr 12 2019 B Stack <bgstack15@gmail.com> - 10.11-1
- version bump
diff --git a/freefilesync/freefilesync.xml b/freefilesync/freefilesync.xml
new file mode 100644
index 0000000..d54523f
--- /dev/null
+++ b/freefilesync/freefilesync.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-freefilesync-ffs">
+ <comment>FreeFileSync configuration file</comment>
+ <comment xml:lang="fr">Fichier de configuration FreeFileSync</comment>
+ <glob pattern="*.ffs_gui"/>
+ </mime-type>
+ <mime-type type="application/x-freefilesync-real">
+ <comment>RealTimeSync configuration file</comment>
+ <comment xml:lang="fr">Fichier de configuration RealTimeSync</comment>
+ <glob pattern="*.ffs_real"/>
+ </mime-type>
+ <mime-type type="application/x-freefilesync-batch">
+ <comment>FreeFileSync batch file</comment>
+ <comment xml:lang="fr">Fichier de batch FreeFileSync</comment>
+ <glob pattern="*.ffs_batch"/>
+ </mime-type>
+</mime-info>
diff --git a/waterfox/waterfox-mozconfig b/waterfox/waterfox-mozconfig
index f362cbc..df66111 100644
--- a/waterfox/waterfox-mozconfig
+++ b/waterfox/waterfox-mozconfig
@@ -35,8 +35,6 @@ ac_add_options --disable-profiling
ac_add_options --disable-signmar
ac_add_options --disable-verify-mar
-ac_add_options --disable-rust-simd
-
ac_add_options --with-app-name=waterfox
ac_add_options --with-app-basename=Waterfox
ac_add_options --with-branding=browser/branding/unofficial
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index 775293f..c14f518 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -1,6 +1,6 @@
-%global commit eeb3b0b1fd0e42ea902f3f3731f1265597e6627d
+%global commit cd00fc4ae708bccfc6bebeaedf803845ec9b5e20
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20190411
+%global date 20190416
%global with_snapshot 1
%global freebsd_rev 480450
@@ -157,8 +157,8 @@ BuildRequires: %{scl_buildreq}
Summary: Waterfox Web browser
Name: waterfox
-Version: 56.2.8
-Release: 12%{?gver}%{?dist}
+Version: 56.2.9
+Release: 11%{?gver}%{?dist}
URL: https://www.waterfoxproject.org
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -304,8 +304,8 @@ BuildRequires: pkgconfig(icu-i18n)
BuildRequires: yasm
BuildRequires: llvm
BuildRequires: llvm-devel
-BuildRequires: clang
%if 0%{?build_with_clang}
+BuildRequires: clang
BuildRequires: clang-libs
BuildRequires: lld
BuildRequires: libstdc++-static
@@ -632,8 +632,10 @@ echo "ac_add_options --disable-ion" >> .mozconfig
%if 0%{?build_with_pinned_rust}
echo "ac_add_options --enable-stylo=build" >> .mozconfig
+echo "ac_add_options --enable-rust-simd" >> .mozconfig
%else
echo "ac_add_options --disable-stylo" >> .mozconfig
+echo "ac_add_options --disable-rust-simd" >> .mozconfig
%endif
# Remove executable bit to make brp-mangle-shebangs happy.
@@ -643,7 +645,6 @@ chmod -x third_party/rust/itertools/src/lib.rs
#---------------------------------------------------------------------
%build
-
%if 0%{?system_sqlite}
# Do not proceed with build if the sqlite require would be broken:
# make sure the minimum requirement is non-empty, ...
@@ -717,7 +718,7 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-O2//' -e 's/-O3//')
export MOZ_DEBUG_FLAGS=" "
%endif
%if 0%{?build_with_lto}
-MOZ_OPT_FLAGS="$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-O2/-O3/' -e 's/-g/-g1/')"
+MOZ_OPT_FLAGS="$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-O2/-O3/' -e 's/ -g\b/ -g1/')"
%if 0%{?build_with_clang}
RPM_FLTO_FLAGS="-flto=thin -Wl,--thinlto-jobs=$RPM_NCPUS"
%else
@@ -727,14 +728,14 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS $RPM_FLTO_FLAGS"
MOZ_LINK_FLAGS="$MOZ_OPT_FLAGS"
%endif
%ifarch s390
-MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-g/-g1/')
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/ -g\b/ -g1/')
# If MOZ_DEBUG_FLAGS is empty, waterfox's build will default it to "-g" which
# overrides the -g1 from line above and breaks building on s390
# (OOM when linking, rhbz#1238225)
export MOZ_DEBUG_FLAGS=" "
%endif
%ifarch %{arm}
-MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-g/-g0/')
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/ -g\b/-g0 /')
export MOZ_DEBUG_FLAGS=" "
%endif
%if !0%{?build_with_clang}
@@ -1075,10 +1076,8 @@ fi
#---------------------------------------------------------------------
%changelog
-* Mon Apr 23 2019 B Stack <bgstack15@gmail.com> - 56.2.8-12.20190411giteeb3b0b
+* Thu May 09 2019 B Stack <bgstack15@gmail.com> - 56.2.9-11.20190416gitcd00fc4
- add el7 support, which uses provided libs for the most part, and disables lto
-
-* Mon Apr 15 2019 B Stack <bgstack15@gmail.com> - 56.2.8.1-4.20190411giteeb3b0b
- repackage for stackrpms
* Fri Apr 12 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.8-2.20190411giteeb3b0b
bgstack15