summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--freefilesync/debian/_service2
-rw-r--r--freefilesync/debian/changelog20
-rw-r--r--freefilesync/debian/control2
-rw-r--r--freefilesync/debian/freefilesync+stackrpms.dsc2
-rw-r--r--freefilesync/debian/patches/ffs_desktop_notifications.patch12
-rw-r--r--freefilesync/debian/patches/ffs_devuan.patch15
-rw-r--r--freefilesync/debian/patches/ffs_gcc.patch8
-rw-r--r--freefilesync/debian/patches/ffs_no_check_updates.patch106
-rw-r--r--freefilesync/debian/patches/ffs_traditional_view.patch10
-rw-r--r--freefilesync/debian/patches/revert_buggy_gtk3_change_in_12.1.patch7
10 files changed, 102 insertions, 82 deletions
diff --git a/freefilesync/debian/_service b/freefilesync/debian/_service
index 5f3089a..0f767e1 100644
--- a/freefilesync/debian/_service
+++ b/freefilesync/debian/_service
@@ -14,7 +14,7 @@
<service name="tar_scm">
<param name="scm">git</param>
<param name="url">https://gitlab.com/opensource-tracking/FreeFileSync.git</param>
- <param name="revision">12.4</param>
+ <param name="revision">12.5</param>
<param name="version">_none_</param>
</service>
<service name="recompress">
diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog
index 6479e02..f690594 100644
--- a/freefilesync/debian/changelog
+++ b/freefilesync/debian/changelog
@@ -1,3 +1,23 @@
+freefilesync (12.5-100+stackrpms) obs; urgency=low
+
+ * Upstream updates
+ * Merge logs of individual steps (comparison, manual operation, sync)
+ * Show total percentage in progress dialog header
+ * Log and report errors during cleanup or exception handling
+ * Skip folder traversal if existence check fails for other side of the
+ pair
+ * Automatically adapt batch options to prevent hanging a
+ non-interactive process (Windows)
+ * Support path lists for external applications: %item_paths%,
+ %local_paths%, %item_names%, %parent_paths%
+ * Create directory lock files with hidden attribute
+ * Don't clear other side when right-clicking file selection
+ * Fixed passive FTP when using different IP than control connection
+ * Work around FTP servers silently renaming unsupported characters of
+ temporary file
+
+ -- B. Stack <bgstack15@gmail.com> Mon, 24 Jul 2023 15:12:39 -0400
+
freefilesync (12.4-100+stackrpms) obs; urgency=low
* Upstream updates
diff --git a/freefilesync/debian/control b/freefilesync/debian/control
index 627cfb2..ee7ec1f 100644
--- a/freefilesync/debian/control
+++ b/freefilesync/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>=12~),
g++-12,
libbrotli-dev,
libcurl4-openssl-dev (>=7.83.1-1+b1),
- libglibmm-2.4-dev,
+ libglibmm-2.4-dev | glibmm24-devel,
libssh2-1-dev (>=1.10.0-3+b1),
libssl-dev (>=3.0.3-5),
wx3.2-headers,
diff --git a/freefilesync/debian/freefilesync+stackrpms.dsc b/freefilesync/debian/freefilesync+stackrpms.dsc
index 1a75d77..547a532 100644
--- a/freefilesync/debian/freefilesync+stackrpms.dsc
+++ b/freefilesync/debian/freefilesync+stackrpms.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
Source: freefilesync
Binary: freefilesync
Architecture: any
-Version: 12.4-100+stackrpms
+Version: 12.5-100+stackrpms
Maintainer: B. Stack <bgstack15@gmail.com>
Homepage: https://freefilesync.org/
Standards-Version: 4.1.4
diff --git a/freefilesync/debian/patches/ffs_desktop_notifications.patch b/freefilesync/debian/patches/ffs_desktop_notifications.patch
index b660044..a262682 100644
--- a/freefilesync/debian/patches/ffs_desktop_notifications.patch
+++ b/freefilesync/debian/patches/ffs_desktop_notifications.patch
@@ -1,5 +1,5 @@
-Version: 12.1
-Date: 2023-02-21
+Version: 12.5
+Date: 2023-07-25
Author: bgstack15
Message: Add support for building with desktop notification support.
--- a/FreeFileSync/Source/Makefile
@@ -8,7 +8,7 @@ Message: Add support for building with desktop notification support.
#treat as system headers so that warnings are hidden:
CXXFLAGS += -isystem/usr/include/gtk-3.0
-+with_notifications ?= NO
++with_notifications ?= YES
+ifeq ($(with_notifications),YES)
+# package libglibmm-2.4-dev or glibmm24-devel
+cxxFlags += `pkg-config --cflags giomm-2.4` -Dwith_notifications
@@ -20,7 +20,7 @@ Message: Add support for building with desktop notification support.
ifeq ($(SELINUX_EXISTING),YES)
--- a/FreeFileSync/Source/ui/progress_indicator.cpp
+++ b/FreeFileSync/Source/ui/progress_indicator.cpp
-@@ -30,6 +30,9 @@
+@@ -29,6 +29,9 @@
#include "../icon_buffer.h"
#include "../base/speed_test.h"
@@ -30,8 +30,8 @@ Message: Add support for building with desktop notification support.
using namespace zen;
using namespace fff;
-@@ -1368,6 +1371,22 @@ void SyncProgressDialogImpl<TopLevelDial
- pnl_.m_staticTextPhase->SetLabelText(getSyncResultLabel(syncResult));
+@@ -1439,6 +1442,22 @@ void SyncProgressDialogImpl<TopLevelDial
+
//pnl_.m_bitmapStatus->SetToolTip(); -> redundant
+#ifdef with_notifications
diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
index a24c41e..1973b60 100644
--- a/freefilesync/debian/patches/ffs_devuan.patch
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -1,11 +1,11 @@
Author: bgstack15
Source: Original research
-Last-Modified: 2023-02-21
-Last-Version: 12.1
+Last-Modified: 2023-07-24
+Last-Version: 12.5
Message: Main patch to compile on Devuan.
--- a/FreeFileSync/Source/ffs_paths.cpp
+++ b/FreeFileSync/Source/ffs_paths.cpp
-@@ -49,7 +49,7 @@ Zstring fff::getInstallDirPath()
+@@ -55,7 +55,7 @@ Zstring fff::getInstallDirPath()
Zstring fff::getResourceDirPath()
{
@@ -21,13 +21,12 @@ Message: Main patch to compile on Devuan.
-exeName = FreeFileSync_$(shell arch)
+exeName = FreeFileSync
- CXXFLAGS += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
+ CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
-Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
-- -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
-+ -O3 -DNDEBUG `wx-config --version=3.2 --cxxflags --debug=no` -pthread
+ -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
-LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread
-+LDFLAGS += -s -no-pie `wx-config --version=3.2 --libs std, aui, richtext --debug=no` -pthread -lz
++LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -lz
CXXFLAGS += `pkg-config --cflags openssl`
@@ -71,7 +70,7 @@ Message: Main patch to compile on Devuan.
-exeName = RealTimeSync_$(shell arch)
+exeName = RealTimeSync
- CXXFLAGS += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
+ CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
-Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
-O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
diff --git a/freefilesync/debian/patches/ffs_gcc.patch b/freefilesync/debian/patches/ffs_gcc.patch
index 21a338d..0f7329c 100644
--- a/freefilesync/debian/patches/ffs_gcc.patch
+++ b/freefilesync/debian/patches/ffs_gcc.patch
@@ -1,5 +1,5 @@
-Date: 2022-09-07
-Version: 11.25
+Date: 2023-07-24
+Version: 12.5
Message: Parameterize the C++ compiler invocation, and use g++-12
Author: bgstack15
--- a/FreeFileSync/Source/Makefile
@@ -9,7 +9,7 @@ Author: bgstack15
exeName = FreeFileSync
+CXX=g++-12
- CXXFLAGS += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
+ CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
-Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
--- a/FreeFileSync/Source/RealTimeSync/Makefile
+++ b/FreeFileSync/Source/RealTimeSync/Makefile
@@ -18,5 +18,5 @@ Author: bgstack15
exeName = RealTimeSync
+CXX=g++-12
- CXXFLAGS += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
+ CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
-Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch
index 97802be..b268332 100644
--- a/freefilesync/debian/patches/ffs_no_check_updates.patch
+++ b/freefilesync/debian/patches/ffs_no_check_updates.patch
@@ -1,65 +1,65 @@
-Version: 12.3
-Date: 2023-05-19
+Version: 12.5
+Date: 2023-07-24
Author: bgstack15
Message: This is a major rewrite of the ffs_no_check_updates patch from before 11.10 which disabled only a few technical www interactions. This current version completely deletes all logic associated with checking the version of the program.
--- a/FreeFileSync/Source/ui/gui_generated.cpp
+++ b/FreeFileSync/Source/ui/gui_generated.cpp
@@ -110,15 +110,6 @@ MainDialogGenerated::MainDialogGenerated
- m_menuHelp->AppendSeparator();
+ m_menuHelp->AppendSeparator();
-- m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ), wxEmptyString, wxITEM_NORMAL );
-- m_menuHelp->Append( m_menuItemCheckVersionNow );
+- m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ) , wxEmptyString, wxITEM_NORMAL );
+- m_menuHelp->Append( m_menuItemCheckVersionNow );
-
-- m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ), wxEmptyString, wxITEM_CHECK );
-- m_menuHelp->Append( m_menuItemCheckVersionAuto );
-- m_menuItemCheckVersionAuto->Check( true );
+- m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ) , wxEmptyString, wxITEM_CHECK );
+- m_menuHelp->Append( m_menuItemCheckVersionAuto );
+- m_menuItemCheckVersionAuto->Check( true );
-
-- m_menuHelp->AppendSeparator();
+- m_menuHelp->AppendSeparator();
-
- m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
- m_menuHelp->Append( m_menuItemAbout );
+ m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
+ m_menuHelp->Append( m_menuItemAbout );
@@ -1129,8 +1120,6 @@ MainDialogGenerated::MainDialogGenerated
- m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId());
- m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId());
- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId());
-- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId());
-- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId());
- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId());
- m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompare ), NULL, this );
- m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
+ m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId());
+ m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId());
+ m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId());
+- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId());
+- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId());
+ m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId());
+ m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompare ), NULL, this );
+ m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
--- a/FreeFileSync/Source/ui/gui_generated.h
+++ b/FreeFileSync/Source/ui/gui_generated.h
-@@ -96,8 +96,6 @@ protected:
- wxMenuItem* m_menuItemShowOverview;
- wxMenu* m_menuHelp;
- wxMenuItem* m_menuItemHelp;
-- wxMenuItem* m_menuItemCheckVersionNow;
-- wxMenuItem* m_menuItemCheckVersionAuto;
- wxMenuItem* m_menuItemAbout;
- wxBoxSizer* bSizerPanelHolder;
- wxPanel* m_panelTopButtons;
-@@ -234,8 +232,6 @@ protected:
- virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
- virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
- virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); }
-- virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
-- virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); }
- virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); }
- virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); }
- virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
+@@ -96,8 +96,6 @@ class MainDialogGenerated : public wxFra
+ wxMenuItem* m_menuItemShowOverview;
+ wxMenu* m_menuHelp;
+ wxMenuItem* m_menuItemHelp;
+- wxMenuItem* m_menuItemCheckVersionNow;
+- wxMenuItem* m_menuItemCheckVersionAuto;
+ wxMenuItem* m_menuItemAbout;
+ wxBoxSizer* bSizerPanelHolder;
+ wxPanel* m_panelTopButtons;
+@@ -234,8 +232,6 @@ class MainDialogGenerated : public wxFra
+ virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
+ virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
+ virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); }
+- virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
+- virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); }
+ virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); }
+ virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); }
+ virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
--- a/FreeFileSync/Source/ui/main_dlg.cpp
+++ b/FreeFileSync/Source/ui/main_dlg.cpp
-@@ -31,7 +31,6 @@
+@@ -32,7 +32,6 @@
#include <wx+/window_tools.h>
#include <wx+/image_resources.h>
#include "cfg_grid.h"
-#include "version_check.h"
#include "gui_status_handler.h"
#include "small_dlgs.h"
- #include "progress_indicator.h"
-@@ -844,7 +843,6 @@ imgFileManagerSmall_([]
+ #include "rename_dlg.h"
+@@ -854,7 +853,6 @@ imgFileManagerSmall_([]
setImage(*m_menuItemHelp, loadImage("help", getDefaultMenuIconSize()));
setImage(*m_menuItemAbout, loadImage("about", getDefaultMenuIconSize()));
@@ -67,7 +67,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
fixMenuIcons(*m_menuFile);
fixMenuIcons(*m_menuActions);
-@@ -944,9 +942,6 @@ imgFileManagerSmall_([]
+@@ -954,9 +952,6 @@ imgFileManagerSmall_([]
//mainly to update row label sizes...
updateGui();
@@ -77,7 +77,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
//asynchronous call to wxWindow::Dimensions(): fix superfluous frame on right and bottom when FFS is started in fullscreen mode
Bind(wxEVT_IDLE, &MainDialog::onLayoutWindowAsync, this);
wxCommandEvent evtDummy; //call once before onLayoutWindowAsync()
-@@ -1139,8 +1134,6 @@ void MainDialog::setGlobalCfgOnInit(cons
+@@ -1181,8 +1176,6 @@ void MainDialog::setGlobalCfgOnInit(cons
auiMgr_.GetPane(m_panelSearch).Hide(); //no need to show it on startup
auiMgr_.GetPane(m_panelLog ).Hide(); //
@@ -86,7 +86,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
auiMgr_.Update();
}
-@@ -5917,72 +5910,6 @@ void MainDialog::onMenuExportFileList(wx
+@@ -6191,72 +6184,6 @@ void MainDialog::onMenuExportFileList(wx
}
}
@@ -111,7 +111,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
- flashStatusInfo(_("Searching for program updates..."));
- //synchronous update check is sufficient here:
- automaticUpdateCheckEval(*this, globalCfg_.lastUpdateCheck, globalCfg_.lastOnlineVersion,
-- automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare(*this).get()).get());
+- automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare(*this).ref()).ref());
- }
-}
-
@@ -141,13 +141,13 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
- {
- flashStatusInfo(_("Searching for program updates..."));
-
-- std::shared_ptr<const UpdateCheckResultPrep> resultPrep = automaticUpdateCheckPrepare(*this); //run on main thread:
+- SharedRef<const UpdateCheckResultPrep> resultPrep = automaticUpdateCheckPrepare(*this); //run on main thread:
-
-- guiQueue_.processAsync([resultPrep] { return automaticUpdateCheckRunAsync(resultPrep.get()); }, //run on worker thread: (long-running part of the check)
-- [this, showNewVersionReminder] (std::shared_ptr<const UpdateCheckResult>&& resultAsync)
+- guiQueue_.processAsync([resultPrep] { return automaticUpdateCheckRunAsync(resultPrep.ref()); }, //run on worker thread: (long-running part of the check)
+- [this, showNewVersionReminder] (SharedRef<const UpdateCheckResult>&& resultAsync)
- {
- automaticUpdateCheckEval(*this, globalCfg_.lastUpdateCheck, globalCfg_.lastOnlineVersion,
-- resultAsync.get()); //run on main thread:
+- resultAsync.ref()); //run on main thread:
- showNewVersionReminder();
- });
- }
@@ -161,7 +161,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
//execute just once per startup!
--- a/FreeFileSync/Source/ui/main_dlg.h
+++ b/FreeFileSync/Source/ui/main_dlg.h
-@@ -273,8 +273,6 @@ private:
+@@ -276,8 +276,6 @@ private:
void onMenuExportFileList (wxCommandEvent& event) override;
void onMenuResetLayout (wxCommandEvent& event) override { resetLayout(); }
void onMenuFindItem (wxCommandEvent& event) override { showFindPanel(true /*show*/); } //CTRL + F
@@ -263,9 +263,9 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
std::vector<std::pair<std::string, std::string>> postParameters;
--- a/FreeFileSync/Source/ui/version_check.h
+++ b/FreeFileSync/Source/ui/version_check.h
-@@ -32,9 +32,6 @@ std::shared_ptr<const UpdateCheckResult>
- void automaticUpdateCheckEval(wxWindow& parent, time_t& lastUpdateCheck, std::string& lastOnlineVersion,
- const UpdateCheckResult* asyncResult);
+@@ -32,9 +32,6 @@ zen::SharedRef<const UpdateCheckResult>
+ //run on main thread:
+ void automaticUpdateCheckEval(wxWindow& parent, time_t& lastUpdateCheck, std::string& lastOnlineVersion, const UpdateCheckResult& result);
//----------------------------------------------------------------------------
-//call from main thread:
-void checkForUpdateNow(wxWindow& parent, std::string& lastOnlineVersion);
@@ -275,7 +275,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
#endif //VERSION_CHECK_H_324872374893274983275
--- a/FreeFileSync/Source/Makefile
+++ b/FreeFileSync/Source/Makefile
-@@ -78,7 +78,6 @@ cppFiles+=ui/small_dlgs.cpp
+@@ -80,7 +80,6 @@ cppFiles+=ui/small_dlgs.cpp
cppFiles+=ui/sync_cfg.cpp
cppFiles+=ui/tray_icon.cpp
cppFiles+=ui/triple_splitter.cpp
diff --git a/freefilesync/debian/patches/ffs_traditional_view.patch b/freefilesync/debian/patches/ffs_traditional_view.patch
index bbb36f9..633a00d 100644
--- a/freefilesync/debian/patches/ffs_traditional_view.patch
+++ b/freefilesync/debian/patches/ffs_traditional_view.patch
@@ -1,5 +1,5 @@
-Version: 12.3
-Date: 2023-05-19
+Version: 12.5
+Date: 2023-07-24
Author: bgstack15@gmail.com
Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVersion" About dialog
--- a/FreeFileSync/Source/ui/file_grid.cpp
@@ -178,7 +178,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
- wxDCPenChanger dummy(dc, wxPen(getColorGridLine(), fastFromDIP(1)));
+ wxDCPenChanger dummy(dc, wxPen(getColorGridLine(), lineWidth));
- dc.DrawLine(rectGroupItems.GetTopLeft(), rectGroupItems.GetBottomLeft() + wxPoint(0, 1)); //draws half-open range!
+ dc.DrawLine(rectGroupItems.GetTopLeft(), rectGroupItems.GetBottomLeft() + wxPoint(0, 1)); //doesn't draw last pixel!
- rectGroupItems.x += fastFromDIP(1);
- rectGroupItems.width -= fastFromDIP(1);
@@ -251,7 +251,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
const ItemPathFormat defaultItemPathFormatLeftGrid = ItemPathFormat::relative;
--- a/FreeFileSync/Source/ui/main_dlg.cpp
+++ b/FreeFileSync/Source/ui/main_dlg.cpp
-@@ -449,7 +449,6 @@ void MainDialog::create(const Zstring& g
+@@ -459,7 +459,6 @@ void MainDialog::create(const Zstring& g
//showAboutDialog(mainDlg); => dialog centered incorrectly (Centos)
//mainDlg->CallAfter([mainDlg] { showAboutDialog(mainDlg); }); => dialog centered incorrectly (Windows, Centos)
@@ -259,7 +259,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
}
-@@ -2780,6 +2779,8 @@ void MainDialog::onGridLabelContextRim(G
+@@ -2962,6 +2961,8 @@ void MainDialog::onGridLabelContextRim(G
addFormatEntry(_("Item name" ), ItemPathFormat::name);
addFormatEntry(_("Relative path"), ItemPathFormat::relative);
addFormatEntry(_("Full path" ), ItemPathFormat::full);
diff --git a/freefilesync/debian/patches/revert_buggy_gtk3_change_in_12.1.patch b/freefilesync/debian/patches/revert_buggy_gtk3_change_in_12.1.patch
index c4a8feb..aa1ff07 100644
--- a/freefilesync/debian/patches/revert_buggy_gtk3_change_in_12.1.patch
+++ b/freefilesync/debian/patches/revert_buggy_gtk3_change_in_12.1.patch
@@ -8,7 +8,8 @@ Author: Fab Stz <fabstz-it@yahoo.fr>
Origin: self
Bug: https://freefilesync.org/forum/viewtopic.php?t=10103
Forwarded: https://freefilesync.org/forum/viewtopic.php?t=10103
-Last-Update: 2023-03-19
+Last-Update: 2023-07-24
+Version: 12.5
--- a/FreeFileSync/Source/ui/abstract_folder_picker.cpp
+++ b/FreeFileSync/Source/ui/abstract_folder_picker.cpp
@@ -52,8 +53,8 @@ Last-Update: 2023-03-19
}
-@@ -923,10 +920,6 @@ syncStat_(&syncStat)
- //make sure that standard height matches ProcessPhase::comparingContent statistics layout (== largest)
+@@ -924,10 +921,6 @@ syncStat_(&syncStat)
+ //make sure that standard height matches ProcessPhase::binaryCompare statistics layout (== largest)
this->GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize()
-#ifdef __WXGTK3__
bgstack15