rpm/FreeFileSync
SHA256
1
0
Fork 0
forked from pool/FreeFileSync
Code Pull Requests Activity

- Add FreeFileSync-remove_ifdef_exceptions.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=74
This commit is contained in:
Paolo Stivanin 2023-11-06 09:32:03 +00:00 committed by Git OBS Bridge
parent 5040b543c9
commit abe3926a10
5 changed files with 62 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
FreeFileSync-disable-in-app-updates.patch
View File

@ -1,23 +1,23 @@
diff -ru a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp
--- a/FreeFileSync/Source/ui/gui_generated.cpp 2023-09-13 12:16:12.000000000 +0200
+++ b/FreeFileSync/Source/ui/gui_generated.cpp 2023-09-21 10:05:00.360102541 +0200
diff -ru orig/FreeFileSync/Source/ui/gui_generated.cpp mod/FreeFileSync/Source/ui/gui_generated.cpp
--- orig/FreeFileSync/Source/ui/gui_generated.cpp 2023-10-23 19:11:01.000000000 +0200
+++ mod/FreeFileSync/Source/ui/gui_generated.cpp 2023-11-06 08:14:50.253320546 +0100
@@ -108,10 +108,10 @@
m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
m_menuHelp->Append( m_menuItemHelp );
m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
m_menuHelp->Append( m_menuItemHelp );
- m_menuHelp->AppendSeparator();
+ //m_menuHelp->AppendSeparator();
- 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_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_menuHelp->Append( m_menuItemCheckVersionNow );
m_menuHelp->AppendSeparator();
m_menuHelp->AppendSeparator();
diff -ru a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp
--- a/FreeFileSync/Source/ui/main_dlg.cpp 2023-09-13 12:16:12.000000000 +0200
+++ b/FreeFileSync/Source/ui/main_dlg.cpp 2023-09-21 10:05:32.806975589 +0200
@@ -962,7 +962,7 @@
diff -ru orig/FreeFileSync/Source/ui/main_dlg.cpp mod/FreeFileSync/Source/ui/main_dlg.cpp
--- orig/FreeFileSync/Source/ui/main_dlg.cpp 2023-10-23 19:11:01.000000000 +0200
+++ mod/FreeFileSync/Source/ui/main_dlg.cpp 2023-11-06 08:15:07.343421717 +0100
@@ -972,7 +972,7 @@
updateGui();
//register regular check for update on next idle event
@ -26,15 +26,15 @@ diff -ru a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg
//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);
diff -ru a/FreeFileSync/Source/ui/version_check.cpp b/FreeFileSync/Source/ui/version_check.cpp
--- a/FreeFileSync/Source/ui/version_check.cpp 2023-09-13 12:16:13.000000000 +0200
+++ b/FreeFileSync/Source/ui/version_check.cpp 2023-09-21 10:06:09.283874265 +0200
@@ -58,7 +58,8 @@
diff -ru orig/FreeFileSync/Source/ui/version_check.cpp mod/FreeFileSync/Source/ui/version_check.cpp
--- orig/FreeFileSync/Source/ui/version_check.cpp 2023-10-23 19:11:01.000000000 +0200
+++ mod/FreeFileSync/Source/ui/version_check.cpp 2023-11-06 08:15:30.556892464 +0100
@@ -47,7 +47,8 @@
bool fff::automaticUpdateCheckDue(time_t lastUpdateCheck)
{
const time_t now = std::time(nullptr);
- return std::abs(now - lastUpdateCheck) >= 7 * 24 * 3600; //check weekly
+ //return std::abs(now - lastUpdateCheck) >= 7 * 24 * 3600; //check weekly
- return numeric::dist(now, lastUpdateCheck) >= 7 * 24 * 3600; //check weekly
+ //return numeric::dist(now, lastUpdateCheck) >= 7 * 24 * 3600; //check weekly
+ return false;
}

26
FreeFileSync-remove_ifdef_exceptions.patch Normal file
View File

@ -0,0 +1,26 @@
diff -ru orig/FreeFileSync/Source/application.cpp mod/FreeFileSync/Source/application.cpp
--- orig/FreeFileSync/Source/application.cpp 2023-10-23 19:11:01.000000000 +0200
+++ mod/FreeFileSync/Source/application.cpp 2023-11-06 08:28:37.761541047 +0100
@@ -245,9 +245,6 @@
{
try
{
-#if wxUSE_EXCEPTIONS
-#error why is wxWidgets uncaught exception handling enabled!?
-#endif
[[maybe_unused]] const int rc = wxApp::OnRun();
}
catch (const std::bad_alloc& e) //the only kind of exception we don't want crash dumps for
diff -ru orig/FreeFileSync/Source/RealTimeSync/application.cpp mod/FreeFileSync/Source/RealTimeSync/application.cpp
--- orig/FreeFileSync/Source/RealTimeSync/application.cpp 2023-10-23 19:11:01.000000000 +0200
+++ mod/FreeFileSync/Source/RealTimeSync/application.cpp 2023-11-06 10:00:53.809721258 +0100
@@ -211,9 +211,6 @@
{
try
{
-#if wxUSE_EXCEPTIONS
-#error why is wxWidgets uncaught exception handling enabled!?
-#endif
[[maybe_unused]] const int rc = wxApp::OnRun();
}
catch (const std::bad_alloc& e) //the only kind of exception we don't want crash dumps for

8
FreeFileSync-resources.patch
View File

@ -1,8 +1,8 @@
Index: FreeFileSync-12.4/FreeFileSync/Source/ffs_paths.cpp
Index: FreeFileSync-13.1/FreeFileSync/Source/ffs_paths.cpp
===================================================================
--- FreeFileSync-12.4.orig/FreeFileSync/Source/ffs_paths.cpp
+++ FreeFileSync-12.4/FreeFileSync/Source/ffs_paths.cpp
@@ -55,7 +55,8 @@ Zstring fff::getInstallDirPath()
--- FreeFileSync-13.1.orig/FreeFileSync/Source/ffs_paths.cpp
+++ FreeFileSync-13.1/FreeFileSync/Source/ffs_paths.cpp
@@ -54,7 +54,8 @@ Zstring fff::getInstallDirPath()
Zstring fff::getResourceDirPath()
{

1
FreeFileSync.changes
View File

@ -7,6 +7,7 @@ Mon Nov 6 07:08:54 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
* Remove leading/trailing space during manual file rename
* Set environment variable "DISPLAY=:0" if missing (Linux)
* Support dropping ffs_gui/ffs_real config on RealTimeSync directory input field
- Add FreeFileSync-remove_ifdef_exceptions.patch
-------------------------------------------------------------------
Thu Sep 21 08:01:13 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>

23
FreeFileSync.spec
View File

@ -16,6 +16,10 @@
#
%if 0%{?suse_version} && 0%{?suse_version} < 1590
%global force_gcc_version 12
%endif
Name: FreeFileSync
Version: 13.1
Release: 0
@ -33,21 +37,18 @@ Patch0: FreeFileSync-build.patch
Patch1: FreeFileSync-resources.patch
Patch2: FreeFileSync-icon-loader.patch
Patch3: FreeFileSync-disable-in-app-updates.patch
Patch4: FreeFileSync-remove_ifdef_exceptions.patch
BuildRequires: boost-devel >= 1.54
# FFS requires C++23, so we need, at least, GCC and libstdc++6 >= 12
%if 0%{?suse_version} < 1590
BuildRequires: gcc12-c++
BuildRequires: libstdc++6 >= 12
%else
BuildRequires: gcc-c++
%endif
BuildRequires: gcc%{?force_gcc_version}-c++ >= 12
BuildRequires: libcurl-devel
BuildRequires: libopenssl-devel
BuildRequires: libssh2-devel
BuildRequires: libstdc++6 >= 10.0.0
BuildRequires: libstdc++6 >= 12
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: wxGTK3-3_2-devel >= 3.1.6
BuildRequires: zlib-devel
%description
FreeFileSync is a software that helps synchronizing files
@ -72,12 +73,8 @@ mkdir FreeFileSync/Build/Bin
%build
export TMPDIR=/tmp # necessary since 11.0
%if 0%{?suse_version} < 1590
export CC="gcc-12"
export CXX="g++-12"
%else
export CC="gcc"
export CXX="g++"
%if 0%{?force_gcc_version}
export CXX="g++-%{?force_gcc_version}"
%endif
%make_build -C %{name}/Source exeName=FreeFileSync
%make_build -C %{name}/Source/RealTimeSync exeName=RealTimeSync