forked from pool/FreeFileSync
Accepting request 1066553 from network
OBS-URL: https://build.opensuse.org/request/show/1066553 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/FreeFileSync?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2785f6448f
@ -1,28 +1,28 @@
|
||||
diff -Naur FreeFileSync_11.29_Source_orig/FreeFileSync/Source/ui/gui_generated.cpp FreeFileSync_11.29_Source/FreeFileSync/Source/ui/gui_generated.cpp
|
||||
--- FreeFileSync_11.29_Source_orig/FreeFileSync/Source/ui/gui_generated.cpp 2022-12-16 20:32:32.000000000 +0100
|
||||
+++ FreeFileSync_11.29_Source/FreeFileSync/Source/ui/gui_generated.cpp 2022-12-25 16:40:47.704967137 +0100
|
||||
diff -ru FreeFileSync_12.0_Source_orig/FreeFileSync/Source/ui/gui_generated.cpp FreeFileSync_12.0_Source/FreeFileSync/Source/ui/gui_generated.cpp
|
||||
--- FreeFileSync_12.0_Source_orig/FreeFileSync/Source/ui/gui_generated.cpp 2023-01-21 14:57:15.000000000 +0100
|
||||
+++ FreeFileSync_12.0_Source/FreeFileSync/Source/ui/gui_generated.cpp 2023-02-17 09:08:45.564309679 +0100
|
||||
@@ -108,13 +108,14 @@
|
||||
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();
|
||||
+ // disable update/auto update actions for packaged version (they are only hidden, to not break any code and keep the patch small)
|
||||
+ //m_menuHelp->AppendSeparator();
|
||||
- m_menuHelp->AppendSeparator();
|
||||
+ // disable update/auto update actions for packaged version (they are only hidden, to not break any code and keep the patch small)
|
||||
+ //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_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ) , wxEmptyString, wxITEM_CHECK );
|
||||
- m_menuHelp->Append( m_menuItemCheckVersionAuto );
|
||||
+ //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_menuHelp->Append( m_menuItemCheckVersionAuto );
|
||||
m_menuItemCheckVersionAuto->Check( true );
|
||||
|
||||
m_menuHelp->AppendSeparator();
|
||||
diff -Naur FreeFileSync_11.29_Source_orig/FreeFileSync/Source/ui/main_dlg.cpp FreeFileSync_11.29_Source/FreeFileSync/Source/ui/main_dlg.cpp
|
||||
--- FreeFileSync_11.29_Source_orig/FreeFileSync/Source/ui/main_dlg.cpp 2022-12-16 20:32:32.000000000 +0100
|
||||
+++ FreeFileSync_11.29_Source/FreeFileSync/Source/ui/main_dlg.cpp 2022-12-25 16:41:36.056820006 +0100
|
||||
@@ -929,7 +929,7 @@
|
||||
m_menuHelp->AppendSeparator();
|
||||
diff -ru FreeFileSync_12.0_Source_orig/FreeFileSync/Source/ui/main_dlg.cpp FreeFileSync_12.0_Source/FreeFileSync/Source/ui/main_dlg.cpp
|
||||
--- FreeFileSync_12.0_Source_orig/FreeFileSync/Source/ui/main_dlg.cpp 2023-01-21 14:57:15.000000000 +0100
|
||||
+++ FreeFileSync_12.0_Source/FreeFileSync/Source/ui/main_dlg.cpp 2023-02-17 09:09:13.844462713 +0100
|
||||
@@ -935,7 +935,7 @@
|
||||
updateGui();
|
||||
|
||||
//register regular check for update on next idle event
|
||||
@ -31,16 +31,15 @@ diff -Naur FreeFileSync_11.29_Source_orig/FreeFileSync/Source/ui/main_dlg.cpp Fr
|
||||
|
||||
//asynchronous call to wxWindow::Layout(): fix superfluous frame on right and bottom when FFS is started in fullscreen mode
|
||||
Bind(wxEVT_IDLE, &MainDialog::onLayoutWindowAsync, this);
|
||||
diff -Naur FreeFileSync_11.29_Source_orig/FreeFileSync/Source/ui/version_check.cpp FreeFileSync_11.29_Source/FreeFileSync/Source/ui/version_check.cpp
|
||||
--- FreeFileSync_11.29_Source_orig/FreeFileSync/Source/ui/version_check.cpp 2022-12-16 20:32:32.000000000 +0100
|
||||
+++ FreeFileSync_11.29_Source/FreeFileSync/Source/ui/version_check.cpp 2022-12-25 16:42:36.580635844 +0100
|
||||
@@ -83,7 +83,9 @@
|
||||
diff -ru FreeFileSync_12.0_Source_orig/FreeFileSync/Source/ui/version_check.cpp FreeFileSync_12.0_Source/FreeFileSync/Source/ui/version_check.cpp
|
||||
--- FreeFileSync_12.0_Source_orig/FreeFileSync/Source/ui/version_check.cpp 2023-01-21 14:57:15.000000000 +0100
|
||||
+++ FreeFileSync_12.0_Source/FreeFileSync/Source/ui/version_check.cpp 2023-02-17 09:09:31.128556241 +0100
|
||||
@@ -83,7 +83,8 @@
|
||||
return false;
|
||||
|
||||
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 false;
|
||||
}
|
||||
|
||||
|
||||
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 17 08:10:43 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
|
||||
|
||||
- Update to 12.0:
|
||||
* Don't save password and show prompt instead for (S)FTP
|
||||
* Fast path check failure on access errors
|
||||
* Support PuTTY private key file version 3
|
||||
* Respect timeout during SFTP connect
|
||||
* Removed 20-sec timeout while checking directory existence
|
||||
* Avoid hitting (S)FTP connection limit for non-uniform configs
|
||||
* Fixed middle grid tooltip icon not always showing (Linux)
|
||||
* Optimized file accesses when checking file path existence
|
||||
* Fixed overview navigation marker not always showing on main grid
|
||||
* Clear all grid selections after view filter toggle
|
||||
* Fixed mouse selection starting on folder group
|
||||
* Don't require sudo during non-root installation (Linux)
|
||||
* Stricter type checking when deleting file/folder/symlinks
|
||||
* Succinct error messages when path component is not existing
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 11 14:48:04 UTC 2023 - Jannik Seiler <seil0@mosad.xyz>
|
||||
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
|
||||
Name: FreeFileSync
|
||||
Version: 11.29
|
||||
Version: 12.0
|
||||
Release: 0
|
||||
Summary: Backup software to synchronize files and folders
|
||||
License: GPL-3.0-or-later
|
||||
Group: Productivity/Networking/System
|
||||
URL: https://www.freefilesync.org/
|
||||
Source0: %{name}_%{version}_Source.zip
|
||||
Source0: https://freefilesync.org/download/FreeFileSync_%{version}_Source.zip
|
||||
Source1: %{name}.desktop
|
||||
Source2: %{name}.png
|
||||
Source3: RealTimeSync.desktop
|
||||
@ -33,14 +33,20 @@ Patch1: FreeFileSync-resources.patch
|
||||
Patch2: FreeFileSync-icon-loader.patch
|
||||
Patch3: FreeFileSync-disable-in-app-updates.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: libcurl-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
BuildRequires: libssh2-devel
|
||||
BuildRequires: libstdc++6 >= 10.0.0
|
||||
BuildRequires: unzip
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: wxGTK3-3_2-devel >= 3.1.4
|
||||
BuildRequires: wxGTK3-3_2-devel >= 3.1.6
|
||||
|
||||
%description
|
||||
FreeFileSync is a software that helps synchronizing files
|
||||
@ -66,9 +72,13 @@ mkdir FreeFileSync/Build/Bin
|
||||
%build
|
||||
export TMPDIR=/tmp # necessary since 11.0
|
||||
export CXXFLAGS="%{optflags}"
|
||||
export CC="gcc"
|
||||
export CXX="g++"
|
||||
|
||||
%if 0%{?suse_version} < 1590
|
||||
export CC="gcc-12"
|
||||
export CXX="g++-12"
|
||||
%else
|
||||
export CC="gcc"
|
||||
export CXX="g++"
|
||||
%endif
|
||||
%make_build -C %{name}/Source exeName=FreeFileSync
|
||||
%make_build -C %{name}/Source/RealTimeSync exeName=RealTimeSync
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:36007cddca37748117770d26e998e96b29dece15785fd1afd99906b62fdb2065
|
||||
size 2663556
|
||||
3
FreeFileSync_12.0_Source.zip
Normal file
3
FreeFileSync_12.0_Source.zip
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5502232854bdd50e30ffbfbd0a5f4dc584ee243f6065b76dab4226a6822e4e86
|
||||
size 2685086
|
||||
Loading…
Reference in New Issue
Block a user