From 6e8925f78b631e337784c7904d22e93ca37643e6 Mon Sep 17 00:00:00 2001 From: B Stack Date: Sun, 12 May 2019 21:52:38 -0400 Subject: WIP: freefilesync 10.12 rpm and dpkg rc1 --- freefilesync/debian/changelog | 14 ++++++++ freefilesync/debian/patches/ffs_libssh2.patch | 8 ++--- freefilesync/debian/patches/ffs_no_wx311.patch | 2 +- freefilesync/debian/patches/ffs_sftp.patch | 8 +++-- freefilesync/debian/rules | 50 +++++++++++++------------- 5 files changed, 48 insertions(+), 34 deletions(-) (limited to 'freefilesync/debian') 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 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(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo(".config")) + "FreeFileSync"; } - #ifdef __GNUC__ + std::call_once(onceFlagCreateCfgPath, [&] 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/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 -- cgit