diff options
Diffstat (limited to 'freefilesync')
| -rw-r--r-- | freefilesync/01_no_check_updates.patch | 24 | ||||
| -rw-r--r-- | freefilesync/04_revert_zenju_aggressive_upstreamisms.patch | 44 | ||||
| -rw-r--r-- | freefilesync/debian/_service (renamed from freefilesync/_service) | 2 | ||||
| -rw-r--r-- | freefilesync/debian/changelog | 29 | ||||
| -rw-r--r-- | freefilesync/debian/freefilesync+devuan.dsc | 2 | ||||
| -rw-r--r-- | freefilesync/debian/patches/ffs_desktop_notifications.patch | 20 | ||||
| -rw-r--r-- | freefilesync/debian/patches/ffs_devuan.patch | 37 | ||||
| -rw-r--r-- | freefilesync/debian/patches/ffs_devuan_gtk3.patch | 43 | ||||
| -rw-r--r-- | freefilesync/debian/patches/ffs_gcc.patch | 53 | ||||
| -rw-r--r-- | freefilesync/debian/patches/ffs_no_check_updates.patch | 24 | ||||
| -rw-r--r-- | freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch | 44 | ||||
| -rw-r--r-- | freefilesync/ffs_desktop_notifications.patch | 20 | ||||
| -rw-r--r-- | freefilesync/ffs_distro_fedora.patch | 61 | ||||
| -rw-r--r-- | freefilesync/freefilesync.spec | 5 |
14 files changed, 196 insertions, 212 deletions
diff --git a/freefilesync/01_no_check_updates.patch b/freefilesync/01_no_check_updates.patch index c3e5d55..956b476 100644 --- a/freefilesync/01_no_check_updates.patch +++ b/freefilesync/01_no_check_updates.patch @@ -1,5 +1,5 @@ -Version: 11.23 -Date: 2022-08-03 +Version: 11.25 +Date: 2022-09-07 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 @@ -20,15 +20,15 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1 m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL ); m_menuHelp->Append( m_menuItemAbout ); -@@ -1131,8 +1122,6 @@ MainDialogGenerated::MainDialogGenerated +@@ -1132,8 +1123,6 @@ 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_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this ); - m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this ); + m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompare ), NULL, this ); + m_buttonCompare->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this ); --- a/FreeFileSync/Source/ui/gui_generated.h +++ b/FreeFileSync/Source/ui/gui_generated.h @@ -96,8 +96,6 @@ protected: @@ -170,9 +170,9 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1 void onMenuAbout (wxCommandEvent& event) override; void onShowHelp (wxCommandEvent& event) override { wxLaunchDefaultBrowser(L"https://freefilesync.org/manual.php?topic=freefilesync"); } void onMenuQuit (wxCommandEvent& event) override { Close(); } ---- a/FreeFileSync/Source/ui/version_check.cpp -+++ b/FreeFileSync/Source/ui/version_check.cpp -@@ -73,6 +73,8 @@ time_t getVersionCheckCurrentTime() +--- 11.25-0/FreeFileSync/Source/ui/version_check.cpp 2022-09-07 14:54:31.556630130 -0400 ++++ 11.25-1/FreeFileSync/Source/ui/version_check.cpp 2022-09-07 15:24:11.648682649 -0400 +@@ -79,6 +79,8 @@ bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck) { @@ -181,7 +181,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1 if (lastUpdateCheck == getVersionCheckInactiveId()) return false; -@@ -151,8 +153,7 @@ void showUpdateAvailableDialog(wxWindow* +@@ -168,8 +170,7 @@ std::wstring updateDetailsMsg; try { @@ -191,7 +191,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1 } catch (const SysError& e) { updateDetailsMsg = _("Failed to retrieve update information.") + + L"\n\n" + e.toString(); } -@@ -175,8 +176,8 @@ void showUpdateAvailableDialog(wxWindow* +@@ -191,8 +192,8 @@ std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError { @@ -202,7 +202,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1 if (response.empty() || !std::all_of(response.begin(), response.end(), [](char c) { return isDigit(c) || c == FFS_VERSION_SEPARATOR; }) || -@@ -223,58 +224,6 @@ void fff::disableUpdateCheck(time_t& las +@@ -239,58 +240,6 @@ } @@ -233,7 +233,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1 - setDetailInstructions(e.toString()), _("&Check"), _("&Retry"))) - { - case ConfirmationButton2::accept: -- wxLaunchDefaultBrowser(L"https://freefilesync.org/get_latest.php"); +- openBrowserForDownload(&parent); - break; - case ConfirmationButton2::accept2: //retry - checkForUpdateNow(parent, lastOnlineVersion); //note: retry via recursion!!! diff --git a/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch b/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch index 8231585..afa3b72 100644 --- a/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch @@ -1,6 +1,6 @@ Message: Some of these can be traced back to version 10.23 which was the last to not use <unordered_map> -Date: 2022-08-03 -Version: 11.23 +Date: 2022-09-07 +Version: 11.25 Author: bgstack15 diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/wx+/choice_enum.h --- 10.24-0/wx+/choice_enum.h 2020-05-17 18:30:59.441499418 -0400 @@ -260,10 +260,9 @@ diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/toggle_button.h 11.1-2/wx+/toggle_bu Version: 11.1 Message: Had to revert gui_status_handler.cpp and .h entirely to version 11.0 to avoid the wx 3.1.4-isms here. diff --git a/FreeFileSync/Source/ui/gui_status_handler.cpp b/FreeFileSync/Source/ui/gui_status_handler.cpp -index 3cb6aaaa..9484af2c 100644 ---- a/FreeFileSync/Source/ui/gui_status_handler.cpp -+++ b/FreeFileSync/Source/ui/gui_status_handler.cpp -@@ -43,8 +43,8 @@ StatusHandlerTemporaryPanel::StatusHandlerTemporaryPanel(MainDialog& dlg, +--- 11.25-0/FreeFileSync/Source/ui/gui_status_handler.cpp 2022-09-07 14:54:31.552630085 -0400 ++++ 11.25-1/FreeFileSync/Source/ui/gui_status_handler.cpp 2022-09-07 16:32:17.114749584 -0400 +@@ -44,8 +44,8 @@ mainDlg_.Update(); //don't wait until idle event! //register keys @@ -274,7 +273,7 @@ index 3cb6aaaa..9484af2c 100644 } -@@ -128,9 +128,8 @@ StatusHandlerTemporaryPanel::~StatusHandlerTemporaryPanel() +@@ -129,9 +129,8 @@ mainDlg_.auiMgr_.Update(); //unregister keys @@ -286,7 +285,7 @@ index 3cb6aaaa..9484af2c 100644 mainDlg_.compareStatus_->teardown(); -@@ -314,20 +313,20 @@ void StatusHandlerTemporaryPanel::forceUiUpdateNoThrow() +@@ -324,7 +323,7 @@ } @@ -295,13 +294,7 @@ index 3cb6aaaa..9484af2c 100644 { const int keyCode = event.GetKeyCode(); if (keyCode == WXK_ESCAPE) - { - wxCommandEvent dummy; -- onAbortCompare(dummy); -+ OnAbortCompare(dummy); - } - - event.Skip(); +@@ -334,7 +333,7 @@ } @@ -352,18 +345,17 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-1/wx+/no_flicker.h 11.4-2/wx+ return bmpSquare; }; pnl_.m_bitmapGraphKeyBytes->SetBitmap(generateSquareBitmap(getColorBytes(), getColorBytesRim())); ---- 11.22-0/wx+/rtl.h 2022-06-26 12:01:15.642291514 -0400 -+++ 11.22-1/wx+/rtl.h 2022-06-26 12:58:17.248838575 -0400 -@@ -69,9 +69,6 @@ - if (!buffer || buffer->GetSize() != rect.GetSize()) //[!] since we do a mirror, width needs to match exactly! - buffer.emplace(rect.GetSize()); - -- if (buffer->GetScaleFactor() != dc.GetContentScaleFactor()) //needed here? -- buffer->SetScaleFactor(dc.GetContentScaleFactor()); // -- - wxMemoryDC memDc(*buffer); //copies scale factor from wxBitmap - memDc.Blit(wxPoint(0, 0), rect.GetSize(), &dc, rect.GetTopLeft()); //blit in: background is mirrored due to memDc, dc having different layout direction! +--- 11.25-0/wx+/rtl.h 2022-09-07 14:54:31.712631887 -0400 ++++ 11.25-1/wx+/rtl.h 2022-09-07 15:57:01.638891035 -0400 +@@ -70,8 +70,6 @@ + if (!buffer || buffer->GetSize() != rect.GetSize()) //[!] since we do a mirror, width needs to match exactly! + buffer.emplace(rect.GetSize()); + +- if (buffer->GetScaleFactor() != dc.GetContentScaleFactor()) //needed here? +- buffer->SetScaleFactor(dc.GetContentScaleFactor()); // + wxMemoryDC memDc(*buffer); //copies scale factor from wxBitmap + memDc.Blit(wxPoint(0, 0), rect.GetSize(), &dc, rect.GetTopLeft()); //blit in: background is mirrored due to memDc, dc having different layout direction! --- 11.22-0/FreeFileSync/Source/ui/main_dlg.cpp 2022-06-26 12:01:15.634291415 -0400 +++ 11.22-1/FreeFileSync/Source/ui/main_dlg.cpp 2022-06-26 14:44:38.556188935 -0400 @@ -3595,7 +3590,6 @@ diff --git a/freefilesync/_service b/freefilesync/debian/_service index cfb2e24..baf2e98 100644 --- a/freefilesync/_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">11.23</param> + <param name="revision">11.25</param> <param name="version">_none_</param> </service> <service name="recompress"> diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog index f214da9..95f9be8 100644 --- a/freefilesync/debian/changelog +++ b/freefilesync/debian/changelog @@ -1,3 +1,32 @@ +freefilesync (11.25-1+devuan) obs; urgency=medium + + * Upstream updates + * Fixed crash when normalizing Unicode non-characters + * Fixed crash when accesssing Google Drive + * Fixed regession for decomposed Unicode comparison + * Fixed "exit code 106: --sign is required" error on macOS + * Reset icon cache after each comparison + * Dpkg updates + * Upstream uses a few minor improvements from our patches! + + -- B. Stack <bgstack15@gmail.com> Wed, 07 Sep 2022 17:00:02 -0400 + +freefilesync (11.24-1+devuan) UNRELEASED; urgency=medium + + * Upstream updates + * Enhanced filter syntax to match files only (append ':') + * Fixed "Some files will be synchronized as part of multiple base + folders": no more false-positives + * Detect full path filter items and convert to relative path + * Auto-detect FTP server character encoding (UTF8 or ANSI) + * Cancel grid selection via Escape key or second mouse button + * Apply conflict preview limit accross all folder pairs + * Require config type and file extension to match + * Fixed view filter panel vertical layout + * Strict validation of UTF encoding + + -- B. Stack <bgstack15@gmail.com> Wed, 07 Sep 2022 16:59:55 -400 + freefilesync (11.23-1+devuan) obs; urgency=medium * Upstream updates diff --git a/freefilesync/debian/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+devuan.dsc index 27e0c6f..aa2ca30 100644 --- a/freefilesync/debian/freefilesync+devuan.dsc +++ b/freefilesync/debian/freefilesync+devuan.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: freefilesync Binary: freefilesync Architecture: any -Version: 11.23-1+devuan +Version: 11.25-1+devuan 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 2dd257e..5989a9c 100644 --- a/freefilesync/debian/patches/ffs_desktop_notifications.patch +++ b/freefilesync/debian/patches/ffs_desktop_notifications.patch @@ -1,13 +1,12 @@ -Version: 11.17 -Date: 2022-02-06 +Version: 11.25 +Date: 2022-09-14 Author: bgstack15 Message: Add support for building with desktop notification support. -diff -aur 11.9-1/FreeFileSync/Source/Makefile 11.9-2/FreeFileSync/Source/Makefile ---- 11.9-1/FreeFileSync/Source/Makefile 2021-05-06 16:24:53.987902373 -0400 -+++ 11.9-2/FreeFileSync/Source/Makefile 2021-05-06 17:09:31.512474440 -0400 -@@ -21,6 +22,13 @@ +--- a/FreeFileSync/Source/Makefile ++++ b/FreeFileSync/Source/Makefile +@@ -23,6 +23,13 @@ LDFLAGS += `pkg-config --libs gtk+-3 #treat as system headers so that warnings are hidden: - cxxFlags += -isystem/usr/include/gtk-3.0 + CXXFLAGS += -isystem/usr/include/gtk-3.0 +with_notifications ?= NO +ifeq ($(with_notifications),YES) @@ -19,9 +18,8 @@ diff -aur 11.9-1/FreeFileSync/Source/Makefile 11.9-2/FreeFileSync/Source/Makefil #support for SELinux (optional) SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES) ifeq ($(SELINUX_EXISTING),YES) -diff -aur 11.9-1/FreeFileSync/Source/ui/progress_indicator.cpp 11.9-2/FreeFileSync/Source/ui/progress_indicator.cpp ---- 11.17-0/FreeFileSync/Source/ui/progress_indicator.cpp 2022-02-06 16:30:56.883997654 -0500 -+++ 11.17-1/FreeFileSync/Source/ui/progress_indicator.cpp 2022-02-06 17:05:57.763911330 -0500 +--- a/FreeFileSync/Source/ui/progress_indicator.cpp ++++ b/FreeFileSync/Source/ui/progress_indicator.cpp @@ -31,6 +31,9 @@ #include "../icon_buffer.h" #include "../base/speed_test.h" @@ -32,7 +30,7 @@ diff -aur 11.9-1/FreeFileSync/Source/ui/progress_indicator.cpp 11.9-2/FreeFileSy using namespace zen; using namespace fff; -@@ -1372,6 +1375,22 @@ +@@ -1377,6 +1380,22 @@ void SyncProgressDialogImpl<TopLevelDial pnl_.m_staticTextPhase->SetLabelText(getSyncResultLabel(syncResult)); //pnl_.m_bitmapStatus->SetToolTip(); -> redundant diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch index de2bd20..fce3138 100644 --- a/freefilesync/debian/patches/ffs_devuan.patch +++ b/freefilesync/debian/patches/ffs_devuan.patch @@ -1,7 +1,7 @@ Author: bgstack15 Source: Original research -Last-Modified: 2022-08-03 -Last-Version: 11.23 +Last-Modified: 2022-09-07 +Last-Version: 11.25 Message: Main patch to compile on Devuan. --- a/FreeFileSync/Source/ffs_paths.cpp +++ b/FreeFileSync/Source/ffs_paths.cpp @@ -14,22 +14,22 @@ Message: Main patch to compile on Devuan. } ---- a/FreeFileSync/Source/Makefile -+++ b/FreeFileSync/Source/Makefile -@@ -1,10 +1,10 @@ +--- 11.25-0/FreeFileSync/Source/Makefile 2022-09-07 14:54:31.444628869 -0400 ++++ 11.25-1/FreeFileSync/Source/Makefile 2022-09-07 15:15:48.735015001 -0400 +@@ -1,11 +1,11 @@ + CXX ?= g++ -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++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ + CXXFLAGS += -std=c++2b -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 --linkFlags = -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -+linkFlags += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -lz -pthread +-LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread ++LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -lz - cxxFlags += `pkg-config --cflags openssl` + CXXFLAGS += `pkg-config --cflags openssl` --- a/FreeFileSync/Source/ui/small_dlgs.cpp +++ b/FreeFileSync/Source/ui/small_dlgs.cpp @@ -89,6 +89,8 @@ AboutDlg::AboutDlg(wxWindow* parent) : A @@ -63,19 +63,20 @@ Message: Main patch to compile on Devuan. m_staticTextDonate->Show(); m_staticTextDonate->Wrap(textWidth - 10 /*left gap*/); //wrap *after* changing font size ---- a/FreeFileSync/Source/RealTimeSync/Makefile -+++ b/FreeFileSync/Source/RealTimeSync/Makefile -@@ -1,10 +1,10 @@ +--- 11.25-0/FreeFileSync/Source/RealTimeSync/Makefile 2022-09-07 14:54:31.524629769 -0400 ++++ 11.25-1/FreeFileSync/Source/RealTimeSync/Makefile 2022-09-07 15:16:18.479350210 -0400 +@@ -1,11 +1,11 @@ + CXX ?= g++ -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++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ + CXXFLAGS += -std=c++2b -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 --linkFlags = -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -+linkFlags += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -lz -pthread +-LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread ++LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -lz #Gtk - support "no button border" - cxxFlags += `pkg-config --cflags gtk+-2.0` + CXXFLAGS += `pkg-config --cflags gtk+-2.0` + diff --git a/freefilesync/debian/patches/ffs_devuan_gtk3.patch b/freefilesync/debian/patches/ffs_devuan_gtk3.patch index 6548568..9020da4 100644 --- a/freefilesync/debian/patches/ffs_devuan_gtk3.patch +++ b/freefilesync/debian/patches/ffs_devuan_gtk3.patch @@ -1,36 +1,35 @@ Author: B Stack Source: Original research -Date: 2020-08-31 +Version: 11.25 +Date: 2020-09-07 Message: Main patch to compile on Devuan using GTK3. -diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/Makefile 10.18-1/FreeFileSync/Source/Makefile ---- 10.11-0/FreeFileSync/Source/Makefile 2019-04-12 08:05:57.000000000 -0400 -+++ 10.18-1/FreeFileSync/Source/Makefile 2019-11-21 09:42:57.408243242 -0500 -@@ -16,9 +16,10 @@ - cxxFlags += `pkg-config --cflags libssh2` - linkFlags += `pkg-config --libs libssh2` +--- a/FreeFileSync/Source/Makefile ++++ b/FreeFileSync/Source/Makefile +@@ -17,9 +17,10 @@ LDFLAGS += `pkg-config --libs libcurl` + CXXFLAGS += `pkg-config --cflags libssh2` + LDFLAGS += `pkg-config --libs libssh2` --cxxFlags += `pkg-config --cflags gtk+-2.0` -+cxxFlags += `pkg-config --cflags gtk+-3.0` -+linkFlags += `pkg-config --libs gtk+-3.0` +-CXXFLAGS += `pkg-config --cflags gtk+-2.0` ++CXXFLAGS += `pkg-config --cflags gtk+-3.0` ++LDFLAGS += `pkg-config --libs gtk+-3.0` #treat as system headers so that warnings are hidden: --cxxFlags += -isystem/usr/include/gtk-2.0 -+cxxFlags += -isystem/usr/include/gtk-3.0 +-CXXFLAGS += -isystem/usr/include/gtk-2.0 ++CXXFLAGS += -isystem/usr/include/gtk-3.0 #support for SELinux (optional) SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES) -diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/RealTimeSync/Makefile 10.24-1/FreeFileSync/Source/RealTimeSync/Makefile ---- 10.24-0/FreeFileSync/Source/RealTimeSync/Makefile 2020-05-17 18:30:59.289498093 -0400 -+++ 10.24-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-05-17 19:32:59.791394275 -0400 -@@ -7,9 +7,10 @@ - linkFlags += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -lz -pthread +--- a/FreeFileSync/Source/RealTimeSync/Makefile ++++ b/FreeFileSync/Source/RealTimeSync/Makefile +@@ -8,9 +8,10 @@ CXXFLAGS += -std=c++2b -pipe -DWXINTL_NO + LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -lz #Gtk - support "no button border" --cxxFlags += `pkg-config --cflags gtk+-2.0` -+cxxFlags += `pkg-config --cflags gtk+-3.0` -+linkFlags += `pkg-config --libs gtk+-3.0` +-CXXFLAGS += `pkg-config --cflags gtk+-2.0` ++CXXFLAGS += `pkg-config --cflags gtk+-3.0` ++LDFLAGS += `pkg-config --libs gtk+-3.0` #treat as system headers so that warnings are hidden: --cxxFlags += -isystem/usr/include/gtk-2.0 -+cxxFlags += -isystem/usr/include/gtk-3.0 +-CXXFLAGS += -isystem/usr/include/gtk-2.0 ++CXXFLAGS += -isystem/usr/include/gtk-3.0 cppFiles= cppFiles+=application.cpp diff --git a/freefilesync/debian/patches/ffs_gcc.patch b/freefilesync/debian/patches/ffs_gcc.patch index e5a5a96..21a338d 100644 --- a/freefilesync/debian/patches/ffs_gcc.patch +++ b/freefilesync/debian/patches/ffs_gcc.patch @@ -1,51 +1,22 @@ -Date: 2022-05-24 -Version: 11.21 +Date: 2022-09-07 +Version: 11.25 Message: Parameterize the C++ compiler invocation, and use g++-12 Author: bgstack15 -diff -aur 11.2-1/FreeFileSync/Source/Makefile 11.2-2/FreeFileSync/Source/Makefile ---- 11.2-1/FreeFileSync/Source/Makefile 2020-10-02 14:59:35.816639878 -0400 -+++ 11.2-2/FreeFileSync/Source/Makefile 2020-10-02 14:59:54.220866929 -0400 -@@ -1,4 +1,5 @@ +--- a/FreeFileSync/Source/Makefile ++++ b/FreeFileSync/Source/Makefile +@@ -1,5 +1,6 @@ + CXX ?= g++ 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++2b -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 \ -@@ -115,11 +116,11 @@ - - ../Build/Bin/$(exeName): $(objFiles) - mkdir -p $(dir $@) -- g++ -o $@ $^ $(linkFlags) -+ $(CXX) -o $@ $^ $(linkFlags) - - $(tmpPath)/ffs/src/%.o : % - mkdir -p $(dir $@) -- g++ $(cxxFlags) -c $< -o $@ -+ $(CXX) $(cxxFlags) -c $< -o $@ - - clean: - rm -rf $(tmpPath) -diff -aur 11.2-1/FreeFileSync/Source/RealTimeSync/Makefile 11.2-2/FreeFileSync/Source/RealTimeSync/Makefile ---- 11.2-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-10-02 14:59:35.820639928 -0400 -+++ 11.2-2/FreeFileSync/Source/RealTimeSync/Makefile 2020-10-02 14:59:54.220866929 -0400 -@@ -1,4 +1,5 @@ +--- a/FreeFileSync/Source/RealTimeSync/Makefile ++++ b/FreeFileSync/Source/RealTimeSync/Makefile +@@ -1,5 +1,6 @@ + CXX ?= g++ 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++2b -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 \ -@@ -54,11 +55,11 @@ - - ../../Build/Bin/$(exeName): $(objFiles) - mkdir -p $(dir $@) -- g++ -o $@ $^ $(linkFlags) -+ $(CXX) -o $@ $^ $(linkFlags) - - $(tmpPath)/ffs/src/rts/%.o : % - mkdir -p $(dir $@) -- g++ $(cxxFlags) -c $< -o $@ -+ $(CXX) $(cxxFlags) -c $< -o $@ - - clean: - rm -rf $(tmpPath) - diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch index c3e5d55..956b476 100644 --- a/freefilesync/debian/patches/ffs_no_check_updates.patch +++ b/freefilesync/debian/patches/ffs_no_check_updates.patch @@ -1,5 +1,5 @@ -Version: 11.23 -Date: 2022-08-03 +Version: 11.25 +Date: 2022-09-07 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 @@ -20,15 +20,15 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1 m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL ); m_menuHelp->Append( m_menuItemAbout ); -@@ -1131,8 +1122,6 @@ MainDialogGenerated::MainDialogGenerated +@@ -1132,8 +1123,6 @@ 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_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this ); - m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this ); + m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompare ), NULL, this ); + m_buttonCompare->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this ); --- a/FreeFileSync/Source/ui/gui_generated.h +++ b/FreeFileSync/Source/ui/gui_generated.h @@ -96,8 +96,6 @@ protected: @@ -170,9 +170,9 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1 void onMenuAbout (wxCommandEvent& event) override; void onShowHelp (wxCommandEvent& event) override { wxLaunchDefaultBrowser(L"https://freefilesync.org/manual.php?topic=freefilesync"); } void onMenuQuit (wxCommandEvent& event) override { Close(); } ---- a/FreeFileSync/Source/ui/version_check.cpp -+++ b/FreeFileSync/Source/ui/version_check.cpp -@@ -73,6 +73,8 @@ time_t getVersionCheckCurrentTime() +--- 11.25-0/FreeFileSync/Source/ui/version_check.cpp 2022-09-07 14:54:31.556630130 -0400 ++++ 11.25-1/FreeFileSync/Source/ui/version_check.cpp 2022-09-07 15:24:11.648682649 -0400 +@@ -79,6 +79,8 @@ bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck) { @@ -181,7 +181,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1 if (lastUpdateCheck == getVersionCheckInactiveId()) return false; -@@ -151,8 +153,7 @@ void showUpdateAvailableDialog(wxWindow* +@@ -168,8 +170,7 @@ std::wstring updateDetailsMsg; try { @@ -191,7 +191,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1 } catch (const SysError& e) { updateDetailsMsg = _("Failed to retrieve update information.") + + L"\n\n" + e.toString(); } -@@ -175,8 +176,8 @@ void showUpdateAvailableDialog(wxWindow* +@@ -191,8 +192,8 @@ std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError { @@ -202,7 +202,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1 if (response.empty() || !std::all_of(response.begin(), response.end(), [](char c) { return isDigit(c) || c == FFS_VERSION_SEPARATOR; }) || -@@ -223,58 +224,6 @@ void fff::disableUpdateCheck(time_t& las +@@ -239,58 +240,6 @@ } @@ -233,7 +233,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1 - setDetailInstructions(e.toString()), _("&Check"), _("&Retry"))) - { - case ConfirmationButton2::accept: -- wxLaunchDefaultBrowser(L"https://freefilesync.org/get_latest.php"); +- openBrowserForDownload(&parent); - break; - case ConfirmationButton2::accept2: //retry - checkForUpdateNow(parent, lastOnlineVersion); //note: retry via recursion!!! diff --git a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch index 8231585..afa3b72 100644 --- a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch @@ -1,6 +1,6 @@ Message: Some of these can be traced back to version 10.23 which was the last to not use <unordered_map> -Date: 2022-08-03 -Version: 11.23 +Date: 2022-09-07 +Version: 11.25 Author: bgstack15 diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/wx+/choice_enum.h --- 10.24-0/wx+/choice_enum.h 2020-05-17 18:30:59.441499418 -0400 @@ -260,10 +260,9 @@ diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/toggle_button.h 11.1-2/wx+/toggle_bu Version: 11.1 Message: Had to revert gui_status_handler.cpp and .h entirely to version 11.0 to avoid the wx 3.1.4-isms here. diff --git a/FreeFileSync/Source/ui/gui_status_handler.cpp b/FreeFileSync/Source/ui/gui_status_handler.cpp -index 3cb6aaaa..9484af2c 100644 ---- a/FreeFileSync/Source/ui/gui_status_handler.cpp -+++ b/FreeFileSync/Source/ui/gui_status_handler.cpp -@@ -43,8 +43,8 @@ StatusHandlerTemporaryPanel::StatusHandlerTemporaryPanel(MainDialog& dlg, +--- 11.25-0/FreeFileSync/Source/ui/gui_status_handler.cpp 2022-09-07 14:54:31.552630085 -0400 ++++ 11.25-1/FreeFileSync/Source/ui/gui_status_handler.cpp 2022-09-07 16:32:17.114749584 -0400 +@@ -44,8 +44,8 @@ mainDlg_.Update(); //don't wait until idle event! //register keys @@ -274,7 +273,7 @@ index 3cb6aaaa..9484af2c 100644 } -@@ -128,9 +128,8 @@ StatusHandlerTemporaryPanel::~StatusHandlerTemporaryPanel() +@@ -129,9 +129,8 @@ mainDlg_.auiMgr_.Update(); //unregister keys @@ -286,7 +285,7 @@ index 3cb6aaaa..9484af2c 100644 mainDlg_.compareStatus_->teardown(); -@@ -314,20 +313,20 @@ void StatusHandlerTemporaryPanel::forceUiUpdateNoThrow() +@@ -324,7 +323,7 @@ } @@ -295,13 +294,7 @@ index 3cb6aaaa..9484af2c 100644 { const int keyCode = event.GetKeyCode(); if (keyCode == WXK_ESCAPE) - { - wxCommandEvent dummy; -- onAbortCompare(dummy); -+ OnAbortCompare(dummy); - } - - event.Skip(); +@@ -334,7 +333,7 @@ } @@ -352,18 +345,17 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-1/wx+/no_flicker.h 11.4-2/wx+ return bmpSquare; }; pnl_.m_bitmapGraphKeyBytes->SetBitmap(generateSquareBitmap(getColorBytes(), getColorBytesRim())); ---- 11.22-0/wx+/rtl.h 2022-06-26 12:01:15.642291514 -0400 -+++ 11.22-1/wx+/rtl.h 2022-06-26 12:58:17.248838575 -0400 -@@ -69,9 +69,6 @@ - if (!buffer || buffer->GetSize() != rect.GetSize()) //[!] since we do a mirror, width needs to match exactly! - buffer.emplace(rect.GetSize()); - -- if (buffer->GetScaleFactor() != dc.GetContentScaleFactor()) //needed here? -- buffer->SetScaleFactor(dc.GetContentScaleFactor()); // -- - wxMemoryDC memDc(*buffer); //copies scale factor from wxBitmap - memDc.Blit(wxPoint(0, 0), rect.GetSize(), &dc, rect.GetTopLeft()); //blit in: background is mirrored due to memDc, dc having different layout direction! +--- 11.25-0/wx+/rtl.h 2022-09-07 14:54:31.712631887 -0400 ++++ 11.25-1/wx+/rtl.h 2022-09-07 15:57:01.638891035 -0400 +@@ -70,8 +70,6 @@ + if (!buffer || buffer->GetSize() != rect.GetSize()) //[!] since we do a mirror, width needs to match exactly! + buffer.emplace(rect.GetSize()); + +- if (buffer->GetScaleFactor() != dc.GetContentScaleFactor()) //needed here? +- buffer->SetScaleFactor(dc.GetContentScaleFactor()); // + wxMemoryDC memDc(*buffer); //copies scale factor from wxBitmap + memDc.Blit(wxPoint(0, 0), rect.GetSize(), &dc, rect.GetTopLeft()); //blit in: background is mirrored due to memDc, dc having different layout direction! --- 11.22-0/FreeFileSync/Source/ui/main_dlg.cpp 2022-06-26 12:01:15.634291415 -0400 +++ 11.22-1/FreeFileSync/Source/ui/main_dlg.cpp 2022-06-26 14:44:38.556188935 -0400 @@ -3595,7 +3590,6 @@ diff --git a/freefilesync/ffs_desktop_notifications.patch b/freefilesync/ffs_desktop_notifications.patch index 2dd257e..5989a9c 100644 --- a/freefilesync/ffs_desktop_notifications.patch +++ b/freefilesync/ffs_desktop_notifications.patch @@ -1,13 +1,12 @@ -Version: 11.17 -Date: 2022-02-06 +Version: 11.25 +Date: 2022-09-14 Author: bgstack15 Message: Add support for building with desktop notification support. -diff -aur 11.9-1/FreeFileSync/Source/Makefile 11.9-2/FreeFileSync/Source/Makefile ---- 11.9-1/FreeFileSync/Source/Makefile 2021-05-06 16:24:53.987902373 -0400 -+++ 11.9-2/FreeFileSync/Source/Makefile 2021-05-06 17:09:31.512474440 -0400 -@@ -21,6 +22,13 @@ +--- a/FreeFileSync/Source/Makefile ++++ b/FreeFileSync/Source/Makefile +@@ -23,6 +23,13 @@ LDFLAGS += `pkg-config --libs gtk+-3 #treat as system headers so that warnings are hidden: - cxxFlags += -isystem/usr/include/gtk-3.0 + CXXFLAGS += -isystem/usr/include/gtk-3.0 +with_notifications ?= NO +ifeq ($(with_notifications),YES) @@ -19,9 +18,8 @@ diff -aur 11.9-1/FreeFileSync/Source/Makefile 11.9-2/FreeFileSync/Source/Makefil #support for SELinux (optional) SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES) ifeq ($(SELINUX_EXISTING),YES) -diff -aur 11.9-1/FreeFileSync/Source/ui/progress_indicator.cpp 11.9-2/FreeFileSync/Source/ui/progress_indicator.cpp ---- 11.17-0/FreeFileSync/Source/ui/progress_indicator.cpp 2022-02-06 16:30:56.883997654 -0500 -+++ 11.17-1/FreeFileSync/Source/ui/progress_indicator.cpp 2022-02-06 17:05:57.763911330 -0500 +--- a/FreeFileSync/Source/ui/progress_indicator.cpp ++++ b/FreeFileSync/Source/ui/progress_indicator.cpp @@ -31,6 +31,9 @@ #include "../icon_buffer.h" #include "../base/speed_test.h" @@ -32,7 +30,7 @@ diff -aur 11.9-1/FreeFileSync/Source/ui/progress_indicator.cpp 11.9-2/FreeFileSy using namespace zen; using namespace fff; -@@ -1372,6 +1375,22 @@ +@@ -1377,6 +1380,22 @@ void SyncProgressDialogImpl<TopLevelDial pnl_.m_staticTextPhase->SetLabelText(getSyncResultLabel(syncResult)); //pnl_.m_bitmapStatus->SetToolTip(); -> redundant diff --git a/freefilesync/ffs_distro_fedora.patch b/freefilesync/ffs_distro_fedora.patch index 0b39561..78502ab 100644 --- a/freefilesync/ffs_distro_fedora.patch +++ b/freefilesync/ffs_distro_fedora.patch @@ -1,6 +1,7 @@ Author: bgstack15 Source: Original research -Last-Modified: 2022-05-22 +Last-Modified: 2022-09-07 +Last-Version: 11.25 Message: Main patch to compile on Fedora History: ffs_fedora 2020-07-22 now uses gtk3 diff -Naur 10.13-0/FreeFileSync/Source/ffs_paths.cpp 10.13-1/FreeFileSync/Source/ffs_paths.cpp @@ -16,57 +17,57 @@ diff -Naur 10.13-0/FreeFileSync/Source/ffs_paths.cpp 10.13-1/FreeFileSync/Source diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/Makefile 11.4-1/FreeFileSync/Source/Makefile ---- 11.4-0/FreeFileSync/Source/Makefile 2020-12-08 20:49:38.675976861 -0500 -+++ 11.4-1/FreeFileSync/Source/Makefile 2020-12-08 21:01:57.174590803 -0500 -@@ -1,10 +1,10 @@ +--- 11.25-0/FreeFileSync/Source/Makefile 2022-09-07 14:54:31.444628869 -0400 ++++ 11.25-1/FreeFileSync/Source/Makefile 2022-09-07 16:33:08.295327455 -0400 +@@ -1,11 +1,11 @@ + CXX ?= g++ -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++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ + CXXFLAGS += -std=c++2b -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 --linkFlags = -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -+linkFlags += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -lz -pthread +-LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread ++LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -lz - cxxFlags += `pkg-config --cflags openssl` -@@ -16,9 +16,10 @@ - cxxFlags += `pkg-config --cflags libssh2` - linkFlags += `pkg-config --libs libssh2` + CXXFLAGS += `pkg-config --cflags openssl` +@@ -17,9 +18,10 @@ + CXXFLAGS += `pkg-config --cflags libssh2` + LDFLAGS += `pkg-config --libs libssh2` --cxxFlags += `pkg-config --cflags gtk+-2.0` -+cxxFlags += `pkg-config --cflags gtk+-3.0` -+linkFlags += `pkg-config --libs gtk+-3.0` +-CXXFLAGS += `pkg-config --cflags gtk+-2.0` ++CXXFLAGS += `pkg-config --cflags gtk+-3.0` ++LDFLAGS += `pkg-config --libs gtk+-3.0` #treat as system headers so that warnings are hidden: --cxxFlags += -isystem/usr/include/gtk-2.0 -+cxxFlags += -isystem/usr/include/gtk-3.0 +-CXXFLAGS += -isystem/usr/include/gtk-2.0 ++CXXFLAGS += -isystem/usr/include/gtk-3.0 #support for SELinux (optional) SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES) -diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/RealTimeSync/Makefile 11.4-1/FreeFileSync/Source/RealTimeSync/Makefile ---- 11.4-0/FreeFileSync/Source/RealTimeSync/Makefile 2020-12-08 20:49:38.675976861 -0500 -+++ 11.4-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-12-08 21:01:19.720188711 -0500 -@@ -1,15 +1,16 @@ +diff -Naur 11.25-0/FreeFileSync/Source/RealTimeSync/Makefile 11.25-1/FreeFileSync/Source/RealTimeSync/Makefile +--- 11.25-0/FreeFileSync/Source/RealTimeSync/Makefile 2022-09-07 14:54:31.524629769 -0400 ++++ 11.25-1/FreeFileSync/Source/RealTimeSync/Makefile 2022-09-07 19:33:38.512766244 -0400 +@@ -1,16 +1,17 @@ + CXX ?= g++ -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++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ + CXXFLAGS += -std=c++2b -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 --linkFlags = -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -+linkFlags += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -lz -pthread +-LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread ++LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread -lz #Gtk - support "no button border" --cxxFlags += `pkg-config --cflags gtk+-2.0` -+cxxFlags += `pkg-config --cflags gtk+-3.0` -+linkFlags += `pkg-config --libs gtk+-3.0` +-CXXFLAGS += `pkg-config --cflags gtk+-2.0` ++CXXFLAGS += `pkg-config --cflags gtk+-3.0` ++LDFLAGS += `pkg-config --libs gtk+-3.0` #treat as system headers so that warnings are hidden: --cxxFlags += -isystem/usr/include/gtk-2.0 -+cxxFlags += -isystem/usr/include/gtk-3.0 +-CXXFLAGS += -isystem/usr/include/gtk-2.0 ++CXXFLAGS += -isystem/usr/include/gtk-3.0 cppFiles= cppFiles+=application.cpp diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 8b27974..c46312f 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -36,7 +36,7 @@ %undefine _package_note_file %endif Name: freefilesync -Version: 11.23 +Version: 11.25 Release: 1%{?dist} Summary: A file synchronization utility @@ -269,6 +269,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog +* Wed Sep 07 2022 B. Stack <bgstack15@gmail.com> - 11.25-1 +- version bump + * Wed Aug 03 2022 B. Stack <bgstack15@gmail.com> - 11.23-1 - version bump |