diff options
| -rw-r--r-- | freefilesync/debian/README.Debian | 7 | ||||
| -rw-r--r-- | freefilesync/debian/changelog | 16 | ||||
| -rw-r--r-- | freefilesync/debian/patches/ffs_devuan.patch | 16 | ||||
| -rw-r--r-- | freefilesync/debian/patches/ffs_no_check_updates.patch | 2 | ||||
| -rw-r--r-- | freefilesync/debian/patches/ffs_no_wx311.patch | 30 |
5 files changed, 65 insertions, 6 deletions
diff --git a/freefilesync/debian/README.Debian b/freefilesync/debian/README.Debian index 622ce41..a4595af 100644 --- a/freefilesync/debian/README.Debian +++ b/freefilesync/debian/README.Debian @@ -1,5 +1,6 @@ -freefilesync for Devuan +freefilesync (10.15-1+devuan) -Initial devuan release. + * Revert the removal of gtk+-2.0 in LINKFLAGS. How does upstream link this application, exactly? + * Revert some probably-wxGTK 3.1.1 minor functionality to old logic, to get it to compile. - -- B Stack <bgstack15@gmail.com> Tue, 29 Jan 2019 09:20:41 -0500 + -- B Stack <bgstack15@gmail.com> Thu, 15 Aug 2019 21:56:04 -0400 diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog index c27332a..0d7d367 100644 --- a/freefilesync/debian/changelog +++ b/freefilesync/debian/changelog @@ -1,3 +1,19 @@ +freefilesync (10.15-1+devuan) obs; urgency=low + + * Redesigned progress indicator stats + * Fixed crash when progress dialog is closed right before showing error + * Consider fail-safe file copy when creating sync.ffs_db files + * Prepare support for GTK3 GUI framework (Linux) + * Support sound output via SDL (Linux) + * Shrink standard system icons if needed (Linux) + * Add Windows Defender exclusions asynchronously + * Fixed main dialog out-of-screen position on startup (macOS) + * Activated CDN for all web accesses + * Redirect error dialog to stderr during sound playback (Linux) + * Updated translation files + + -- B Stack <bgstack15@gmail.com> Thu, 15 Aug 2019 21:56:04 -0400 + freefilesync (10.14-2+devuan) manual; urgency=low * Completely disable the update-check diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch index b757e8b..a71649d 100644 --- a/freefilesync/debian/patches/ffs_devuan.patch +++ b/freefilesync/debian/patches/ffs_devuan.patch @@ -27,10 +27,18 @@ diff -Naur -x '*.orig' -x '*.rej' 10.11-0/FreeFileSync/Source/Makefile 10.11-1/F CXXFLAGS += `pkg-config --cflags openssl` +@@ -17,6 +17,7 @@ CXXFLAGS += `pkg-config --cflags libssh2` + LINKFLAGS += `pkg-config --libs libssh2` + + CXXFLAGS += `pkg-config --cflags gtk+-2.0` ++LINKFLAGS += `pkg-config --libs gtk+-2.0` + #treat as system headers so that warnings are hidden: + CXXFLAGS += -isystem/usr/include/gtk-2.0 + diff -Naur -x '*.orig' -x '*.rej' 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 10.11-1/FreeFileSync/Source/RealTimeSync/Makefile --- 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 2019-04-12 08:05:57.000000000 -0400 -+++ 10.11-1/FreeFileSync/Source/RealTimeSync/Makefile 2019-04-12 13:59:53.934551753 -0400 -@@ -1,10 +1,10 @@ ++++ 10.15-1/FreeFileSync/Source/RealTimeSync/Makefile 2019-08-15 13:59:53.934551753 -0400 +@@ -1,13 +1,14 @@ -EXENAME = RealTimeSync_$(shell arch) +EXENAME = RealTimeSync @@ -43,6 +51,10 @@ diff -Naur -x '*.orig' -x '*.rej' 10.11-0/FreeFileSync/Source/RealTimeSync/Makef #Gtk - support "no button border" CXXFLAGS += `pkg-config --cflags gtk+-2.0` ++LINKFLAGS += `pkg-config --libs gtk+-2.0` + #treat as system headers so that warnings are hidden: + CXXFLAGS += -isystem/usr/include/gtk-2.0 + diff -Naur -x '*.orig' -x '*.rej' 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 08:05:57.000000000 -0400 +++ 10.11-1/FreeFileSync/Source/ui/small_dlgs.cpp 2019-04-12 13:58:55.050550183 -0400 diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch index c11bf3a..4e56d19 100644 --- a/freefilesync/debian/patches/ffs_no_check_updates.patch +++ b/freefilesync/debian/patches/ffs_no_check_updates.patch @@ -77,7 +77,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1 + //if (haveNewerVersionOnline(onlineVersion)) + // showUpdateAvailableDialog(parent, onlineVersion); + //else - showNotificationDialog(parent, DialogInfoType::INFO, PopupDialogCfg(). + showNotificationDialog(parent, DialogInfoType::info, PopupDialogCfg(). setIcon(getResourceImage(L"update_check")). setTitle(_("Check for Program Updates")). - setMainInstructions(_("FreeFileSync is up to date."))); diff --git a/freefilesync/debian/patches/ffs_no_wx311.patch b/freefilesync/debian/patches/ffs_no_wx311.patch index a1ff0e4..e6069d4 100644 --- a/freefilesync/debian/patches/ffs_no_wx311.patch +++ b/freefilesync/debian/patches/ffs_no_wx311.patch @@ -1,3 +1,4 @@ +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 @@ -40,3 +41,32 @@ diff -Naur 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 10.13-1/FreeFileSync/S std::call_once(onceFlagCreateCfgPath, [&] +diff --git a/FreeFileSync/Source/ui/command_box.cpp b/FreeFileSync/Source/ui/command_box.cpp +index 6e769bb..ce6110b 100644 +--- a/FreeFileSync/Source/ui/command_box.cpp ++++ b/FreeFileSync/Source/ui/command_box.cpp +@@ -130,7 +130,9 @@ void CommandBox::setValueAndUpdateList(const wxString& value) + + //this->Clear(); -> NO! emits yet another wxEVT_COMMAND_TEXT_UPDATED!!! + wxItemContainer::Clear(); //suffices to clear the selection items only! +- this->Append(items); ++ for (const wxString& item : items) ++ this->Append(item); ++ + + //this->SetSelection(wxNOT_FOUND); //don't select anything + ChangeValue(value); //preserve main text! +diff --git a/FreeFileSync/Source/ui/folder_history_box.cpp b/FreeFileSync/Source/ui/folder_history_box.cpp +index 2b824b1..a17ea2f 100644 +--- a/FreeFileSync/Source/ui/folder_history_box.cpp ++++ b/FreeFileSync/Source/ui/folder_history_box.cpp +@@ -90,7 +90,8 @@ void FolderHistoryBox::setValueAndUpdateList(const wxString& folderPathPhrase) + + //this->Clear(); -> NO! emits yet another wxEVT_COMMAND_TEXT_UPDATED!!! + wxItemContainer::Clear(); //suffices to clear the selection items only! +- this->Append(dirList); ++ for (const wxString& dir : dirList) ++ this->Append(dir); + + //this->SetSelection(wxNOT_FOUND); //don't select anything + ChangeValue(folderPathPhrase); //preserve main text! |