remove arch to exe names to fix symlinks in bindir [release 13.6-2mamba;Sat Jun 01 2024]

This commit is contained in:
Silvan Calarco 2024-06-01 23:15:02 +02:00
parent d85e30a99f
commit a41c0843a3
4 changed files with 27 additions and 7 deletions

View File

@ -0,0 +1,14 @@
--- FreeFileSync-13.6/libcurl/curl_wrap.cpp.orig 2024-06-01 12:44:04.908233411 +0200
+++ FreeFileSync-13.6/libcurl/curl_wrap.cpp 2024-06-01 12:46:58.101643783 +0200
@@ -402,9 +402,10 @@
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CLIENTCERT);
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNRECOVERABLE_POLL);
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_LARGE);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_ECH_REQUIRED);
ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
}
- static_assert(CURL_LAST == CURLE_TOO_LARGE + 1);
+ //static_assert(CURL_LAST == CURLE_TOO_LARGE + 1);
return replaceCpy<std::wstring>(L"Curl status %x", L"%x", numberTo<std::wstring>(static_cast<int>(sc)));
}

View File

@ -2,7 +2,7 @@
Comment= Comment=
Exec=FreeFileSync Exec=FreeFileSync
GenericName=Folder Comparison and Synchronization GenericName=Folder Comparison and Synchronization
Icon=/usr/share/pixmaps/ffsicon.png Icon=/usr/share/pixmaps/FreeFileSync.png
Name=FreeFileSync Name=FreeFileSync
NoDisplay=false NoDisplay=false
StartupNotify=true StartupNotify=true

View File

@ -1,6 +1,6 @@
Name: freefilesync Name: freefilesync
Version: 13.6 Version: 13.6
Release: 1mamba Release: 2mamba
Summary: A software that helps you synchronize files and synchronize folders Summary: A software that helps you synchronize files and synchronize folders
Group: Graphical Desktop/Applications/Utilities Group: Graphical Desktop/Applications/Utilities
Vendor: openmamba Vendor: openmamba
@ -12,6 +12,7 @@ Source1: freefilesync.desktop
Source2: ffsicon.png Source2: ffsicon.png
Source3: realtimesync.desktop Source3: realtimesync.desktop
Source4: rtsicon.png Source4: rtsicon.png
Patch0: freefilesync-13.6-curl-8.8.0.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -46,13 +47,15 @@ sed -i 's|-2|-3|' FreeFileSync/Source/{Makefile,RealTimeSync/Makefile}
sed -i 's| -s | |' FreeFileSync/Source/{Makefile,RealTimeSync/Makefile} sed -i 's| -s | |' FreeFileSync/Source/{Makefile,RealTimeSync/Makefile}
sed -i 's|#error|//#error|' FreeFileSync/Source/{application.cpp,RealTimeSync/application.cpp} zen/{string_tools.h,globals.h} sed -i 's|#error|//#error|' FreeFileSync/Source/{application.cpp,RealTimeSync/application.cpp} zen/{string_tools.h,globals.h}
sed -i 's|::g_object_ref|g_object_ref|' FreeFileSync/Source/base/icon_loader.cpp sed -i 's|::g_object_ref|g_object_ref|' FreeFileSync/Source/base/icon_loader.cpp
sed -i '/animalImg/s/^/\/\//' FreeFileSync/Source/ui/small_dlgs.cpp
%patch 0 -p1
%build %build
export CXXFLAGS="%{optflags} -DMAX_SFTP_READ_SIZE=30000 -DMAX_SFTP_OUTGOING_SIZE=30000" export CXXFLAGS="%{optflags} -DMAX_SFTP_READ_SIZE=30000 -DMAX_SFTP_OUTGOING_SIZE=30000"
export LDFLAGS="%{optflags} `pkg-config --libs gtk+-3.0` -lz" export LDFLAGS="%{optflags} `pkg-config --libs gtk+-3.0` -lz"
%make -C FreeFileSync/Source %make -C FreeFileSync/Source exeName=FreeFileSync
%make -C FreeFileSync/Source/RealTimeSync %make -C FreeFileSync/Source/RealTimeSync exeName=RealTimeSync
%install %install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@ -86,6 +89,9 @@ install -Dm644 %{SOURCE3} %{buildroot}%{_datadir}/applications/RealTimeSync.desk
%doc License.txt %doc License.txt
%changelog %changelog
* Sat Jun 01 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 13.6-2mamba
- remove arch to exe names to fix symlinks in bindir
* Mon May 13 2024 Automatic Build System <autodist@openmamba.org> 13.6-1mamba * Mon May 13 2024 Automatic Build System <autodist@openmamba.org> 13.6-1mamba
- automatic version update by autodist - automatic version update by autodist

View File

@ -1,9 +1,9 @@
[Desktop Entry] [Desktop Entry]
Comment= Comment=
Exec=RealtimeSync Exec=RealTimeSync
GenericName=Automated Synchronization GenericName=Automated Synchronization
Icon=/usr/share/pixmaps/rtsicon.png Icon=/usr/share/pixmaps/RealTimeSync.png
Name=RealtimeSync Name=RealTimeSync
NoDisplay=false NoDisplay=false
StartupNotify=true StartupNotify=true
Categories=GTK;Application;Utility; Categories=GTK;Application;Utility;