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

Accepting request 1088077 from network

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1088077
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/FreeFileSync?expand=0&rev=15
This commit is contained in:
Dominique Leuenberger 2023-05-21 17:08:53 +00:00 committed by Git OBS Bridge
commit fd3676f1ac
10 changed files with 76 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -21,3 +21,5 @@
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text
## Specific LFS patterns
Animal.dat filter=lfs diff=lfs merge=lfs -text

3
Animal.dat Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0495439697cadbc2005407ecd6ae261d749f6f43711a8769b6f8725a64f773c9
size 112431

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

@ -1,28 +1,28 @@
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
diff -ru a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp
--- a/FreeFileSync/Source/ui/gui_generated.cpp 2023-05-17 09:16:56.000000000 +0200
+++ b/FreeFileSync/Source/ui/gui_generated.cpp 2023-05-20 15:07:59.726152996 +0200
@@ -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 -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 @@
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-05-17 09:16:56.000000000 +0200
+++ b/FreeFileSync/Source/ui/main_dlg.cpp 2023-05-20 15:08:30.462446500 +0200
@@ -944,7 +944,7 @@
updateGui();
//register regular check for update on next idle event
@ -31,10 +31,10 @@ diff -ru FreeFileSync_12.0_Source_orig/FreeFileSync/Source/ui/main_dlg.cpp FreeF
//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 -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 @@
diff -ru a/FreeFileSync/Source/ui/version_check.cpp b/FreeFileSync/Source/ui/version_check.cpp
--- a/FreeFileSync/Source/ui/version_check.cpp 2023-05-17 09:16:56.000000000 +0200
+++ b/FreeFileSync/Source/ui/version_check.cpp 2023-05-20 15:09:02.438749959 +0200
@@ -85,7 +85,8 @@
return false;
const time_t now = std::time(nullptr);

9
FreeFileSync-icon-loader.patch
View File

@ -1,7 +1,8 @@
diff -Naur FreeFileSync_11.23_Source_orig/FreeFileSync/Source/base/icon_loader.cpp FreeFileSync_11.23_Source/FreeFileSync/Source/base/icon_loader.cpp
--- FreeFileSync_11.23_Source_orig/FreeFileSync/Source/base/icon_loader.cpp 2022-07-23 15:18:28.000000000 +0200
+++ FreeFileSync_11.23_Source/FreeFileSync/Source/base/icon_loader.cpp 2022-08-26 15:59:38.453852879 +0200
@@ -227,7 +227,7 @@
Index: FreeFileSync-12.3/FreeFileSync/Source/base/icon_loader.cpp
===================================================================
--- FreeFileSync-12.3.orig/FreeFileSync/Source/base/icon_loader.cpp
+++ FreeFileSync-12.3/FreeFileSync/Source/base/icon_loader.cpp
@@ -227,7 +227,7 @@ FileIconHolder fff::getFileIcon(const Zs
//the remaining icon types won't block!
assert(GDK_IS_PIXBUF(gicon) || G_IS_THEMED_ICON(gicon) || G_IS_EMBLEMED_ICON(gicon));

31
FreeFileSync.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Sat May 20 13:03:18 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
- Update to 12.3:
* Add custom notes to sync configurations
* Highlight comparison and sync buttons
* Show sync stats in config panel tool tip
* Update config panel sync info even if cancelled
* Support FTP listing format missing owner/group
* Fixed "Class not registered" error during installation
* Propagate process priority of launcher executable
* Fixed config panel metadata being reset after renaming
* Fixed config panel keyboard cursor after deletion/rename
* Improved small icon resolution for high-DPI monitors
- Update icons to be 128x128
- Add missing Animals.dat file
- Drop FreeFileSync-fix-error.patch
-------------------------------------------------------------------
Tue May 9 14:32:29 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
- Update to 12.2:
* Fixed temporary access error when creating multiple folders in parallel
* Log failure to copy folder attributes as warning only
* Enable UTF-8, even if FTP server does not advertize in FEAT (vsftpd)
* Fixed drag and drop for non-ASCII folders (macOS)
* Explicitly detect MTP path without existence check
* Fixed crash when parsing SFTP package from stream
* Fixed missing COM initialization for MTP path parsing
- Add FreeFileSync-fix-error.patch to fix build with gcc13.
-------------------------------------------------------------------
Fri Feb 17 08:10:43 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>

4
FreeFileSync.png
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0b7fca63bbc35aa4baf2b7bb70ad1bba6c45c5a1099d40de39b45696237c0647
size 2154
oid sha256:31df3fa1f1310de14bbd379f891d4f8ed2df5b0d68913eb52c88b3be682933fb
size 12078

9
FreeFileSync.spec
View File

@ -17,7 +17,7 @@
Name: FreeFileSync
Version: 12.0
Version: 12.3
Release: 0
Summary: Backup software to synchronize files and folders
License: GPL-3.0-or-later
@ -28,6 +28,7 @@ Source1: %{name}.desktop
Source2: %{name}.png
Source3: RealTimeSync.desktop
Source4: RealTimeSync.png
Source5: Animal.dat
Patch0: FreeFileSync-build.patch
Patch1: FreeFileSync-resources.patch
Patch2: FreeFileSync-icon-loader.patch
@ -71,7 +72,6 @@ mkdir FreeFileSync/Build/Bin
%build
export TMPDIR=/tmp # necessary since 11.0
export CXXFLAGS="%{optflags}"
%if 0%{?suse_version} < 1590
export CC="gcc-12"
export CXX="g++-12"
@ -89,15 +89,14 @@ mkdir -p %{buildroot}%{_bindir}
install -t %{buildroot}%{_bindir} Bin/%{name}
mkdir -p %{buildroot}%{_datadir}/%{name}
cp -rT Resources %{buildroot}%{_datadir}/%{name}
cp -rT Resources %{buildroot}%{_datadir}/%{name}
install -Dm 0644 %SOURCE5 %{buildroot}%{_datadir}/%{name}
find "%{buildroot}%{_datadir}/%{name}" -type f -print0 | xargs -0 chmod 644
#%%make_install
# RealTimeSync
mkdir -p %{buildroot}%{_bindir}
install -t %{buildroot}%{_bindir} Bin/RealTimeSync
#%%make_install
popd
# desktop

3
FreeFileSync_12.0_Source.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5502232854bdd50e30ffbfbd0a5f4dc584ee243f6065b76dab4226a6822e4e86
size 2685086

3
FreeFileSync_12.3_Source.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b3a8cd5aaaab88bfde3c509442f2de3713631f3fa765ebc3db1d64930d600c4f
size 2708077

4
RealTimeSync.png
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:46ab2d44276f9299862db284780b3646d95230889cb2ac43e1667b53a588c783
size 2604
oid sha256:f28042587dbe99cf5d6bef2c1be4b026488e418e4ba8332b3016d246b7053a4e
size 11335