diff options
-rwxr-xr-x | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 7 | ||||
-rw-r--r-- | update_error_constants_check.patch | 15 |
3 files changed, 24 insertions, 2 deletions
@@ -1,7 +1,7 @@ pkgbase = freefilesync pkgdesc = Backup software to synchronize files and folders pkgver = 10.19 - pkgrel = 1 + pkgrel = 2 url = https://freefilesync.org arch = i686 arch = x86_64 @@ -15,6 +15,7 @@ pkgbase = freefilesync source = revert_xdg_config_path.patch source = revert_bulk_append.patch source = revert_linkflags.patch + source = update_error_constants_check.patch source = FreeFileSync.desktop source = RealTimeSync.desktop source = dlagent @@ -22,6 +23,7 @@ pkgbase = freefilesync sha256sums = bd2b786be724818cf232129ecd432f305a5fdecc298a3e503a1e9182cad6a707 sha256sums = 2ea1f157ab31feb18b0d8ac117a1820174a4b2b9bdaee2027c1fbc2c287e1caa sha256sums = d3dedc100163ce00ae5889a6039a1fff11ae32b676ae5e83ae9182509f80638d + sha256sums = 3c5d7c7ffad0a261c08a8728ff341f31d567aa50fc5e5c84dece38dfcf9150c7 sha256sums = 590d87707240529ca893199f852143f5d7c7266cb050e37e615900b013ac3d51 sha256sums = 82439b4b81b0a72652befad9b9db52ffbc0180f307c92205aa5ab344f9f82830 sha256sums = 1649e7ea66235c6f82daf9beb6b61b7765df54e9ef70f7f6fc1283f5c2b1e54a @@ -6,7 +6,7 @@ pkgname=freefilesync pkgver=10.19 -pkgrel=1 +pkgrel=2 pkgdesc="Backup software to synchronize files and folders" arch=('i686' 'x86_64') url="https://freefilesync.org" @@ -18,6 +18,7 @@ source=( revert_xdg_config_path.patch revert_bulk_append.patch revert_linkflags.patch + update_error_constants_check.patch FreeFileSync.desktop RealTimeSync.desktop dlagent @@ -27,6 +28,7 @@ sha256sums=('843b56667188c43bbc0622e51b63f9d904ced09dd7921d3afb9c431c4e1f73d5' 'bd2b786be724818cf232129ecd432f305a5fdecc298a3e503a1e9182cad6a707' '2ea1f157ab31feb18b0d8ac117a1820174a4b2b9bdaee2027c1fbc2c287e1caa' 'd3dedc100163ce00ae5889a6039a1fff11ae32b676ae5e83ae9182509f80638d' + '3c5d7c7ffad0a261c08a8728ff341f31d567aa50fc5e5c84dece38dfcf9150c7' '590d87707240529ca893199f852143f5d7c7266cb050e37e615900b013ac3d51' '82439b4b81b0a72652befad9b9db52ffbc0180f307c92205aa5ab344f9f82830' '1649e7ea66235c6f82daf9beb6b61b7765df54e9ef70f7f6fc1283f5c2b1e54a') @@ -51,6 +53,9 @@ prepare() { # inlining of constants not present in libssh2's distributed headers sed -i 's/MAX_SFTP_READ_SIZE/30000/g' FreeFileSync/Source/afs/sftp.cpp sed -i 's/MAX_SFTP_OUTGOING_SIZE/30000/g' FreeFileSync/Source/afs/sftp.cpp + +# Update constants check for newer errors + patch --binary -p1 -i update_error_constants_check.patch } build() { diff --git a/update_error_constants_check.patch b/update_error_constants_check.patch new file mode 100644 index 000000000000..0cd456da04a4 --- /dev/null +++ b/update_error_constants_check.patch @@ -0,0 +1,15 @@ +diff -r -u a/FreeFileSync/Source/afs/libcurl/curl_wrap.h b/FreeFileSync/Source/afs/libcurl/curl_wrap.h
+--- a/FreeFileSync/Source/afs/libcurl/curl_wrap.h 2019-12-27 11:41:59.000000000 +0100
++++ b/FreeFileSync/Source/afs/libcurl/curl_wrap.h 2020-01-20 21:20:38.940897042 +0100
+@@ -122,9 +122,10 @@
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP2_STREAM);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_RECURSIVE_API_CALL);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR);
++ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
+ }
+- static_assert(CURL_LAST == CURLE_AUTH_ERROR + 1);
++ static_assert(CURL_LAST == CURLE_HTTP3 + 1);
+
+ return replaceCpy<std::wstring>(L"Curl status %x.", L"%x", numberTo<std::wstring>(static_cast<int>(sc)));
+ }
|