From 549dd22b067fa361b445eb8261a2b79839787696 Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 7 May 2024 12:24:00 +0800 Subject: [PATCH] fix: zsync2 (#1170) * chore(rebuild): zsync2 Signed-off-by: madomado * bump: zsync2 * bump commit to head * disable -Wincompatible-pointer-types Signed-off-by: madomado --------- Signed-off-by: madomado --- anda/lib/zsync2/update.rhai | 4 ++++ anda/lib/zsync2/zsync2.spec | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 anda/lib/zsync2/update.rhai diff --git a/anda/lib/zsync2/update.rhai b/anda/lib/zsync2/update.rhai new file mode 100644 index 0000000000..6ab9f4746e --- /dev/null +++ b/anda/lib/zsync2/update.rhai @@ -0,0 +1,4 @@ +rpm.global("ver", gh("AppImageCommunity/zsync2")); +if rpm.changed() { + rpm.global("git_commit", gh_commit("AppImageCommunity/zsync2")); +} diff --git a/anda/lib/zsync2/zsync2.spec b/anda/lib/zsync2/zsync2.spec index ea8d0c5147..5d9b970f72 100644 --- a/anda/lib/zsync2/zsync2.spec +++ b/anda/lib/zsync2/zsync2.spec @@ -1,8 +1,9 @@ -%global git_commit 1608115705047d6826bcd7b35a6988deaf3dbfec +%global git_commit 87fb5a0f3c14d3cf35aa6547cc60d099c89ca532 %global commit_short %(c=%{git_commit}; echo ${c:0:7}) -%global libver 2.0.0-alpha-1-20220304.git%{commit_short} +%global ver 2.0.0-alpha-1-20230304 +%global libver %ver.git%{commit_short} # replace - with ~ %global libver_format %(v=%{libver}; sed 's/-/~/g' <<< $v) @@ -17,7 +18,6 @@ License: Artistic-2.0 URL: https://github.com/AppImageCommunity/zsync2 #Source0: %%{url}/archive/refs/%%{libver}.tar.gz Source0: %{url}/archive/%{git_commit}.tar.gz -Patch0: https://github.com/AppImageCommunity/zsync2/commit/e57e1fce68194fa920542fd334488de5123e4832.patch BuildRequires: make BuildRequires: cmake3 @@ -47,6 +47,7 @@ developing applications that use %{name}. %autosetup -n zsync2-%{git_commit} -p1 %build +export CFLAGS="$CFLAGS -Wno-incompatible-pointer-types" %cmake -DCPR_FORCE_USE_SYSTEM_CURL=ON \ -DUSE_SYSTEM_CURL=ON \ -DUSE_SYSTEM_CPR=ON