From e734137f664ebaf81ebbade899c31371b86ee7cf Mon Sep 17 00:00:00 2001 From: yopito Date: Tue, 23 Aug 2022 17:39:20 +0200 Subject: [PATCH 1/3] libsearpc: update to 3.2.20220425 --- .../patches/01-glib-include-kludge.patch | 21 ------------------- srcpkgs/libsearpc/template | 10 ++++----- 2 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/libsearpc/patches/01-glib-include-kludge.patch diff --git a/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch deleted file mode 100644 index 58b766a0ecf4..000000000000 --- a/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch +++ /dev/null @@ -1,21 +0,0 @@ - Recent versions of glib don't work inside an extern "C" block, but some seafile sources - include searpc-client.h inside one. See https://github.com/haiwen/libsearpc/pull/57. - - This is the easy fix, needed until upstream fixes the problem. ---- a/lib/searpc-client.h~ 2020-06-18 05:23:11.000000000 +0200 -+++ b/lib/searpc-client.h 2021-04-10 15:48:09.994005146 +0200 -@@ -7,8 +7,14 @@ - #define LIBSEARPC_API - #endif - -+#ifdef __cplusplus -+extern "C++" { -+#endif - #include - #include -+#ifdef __cplusplus -+} -+#endif - #include - - #ifndef DFT_DOMAIN diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template index 66e769c177a4..4541581e7737 100644 --- a/srcpkgs/libsearpc/template +++ b/srcpkgs/libsearpc/template @@ -1,10 +1,10 @@ # Template file for 'libsearpc' # WARNING: upstream sometimes retag source. Wait for official announcement pkgname=libsearpc -# 3.2-latest (as of 2021-04-10) -version=3.2.0.20200318 -revision=2 -_gitrev=50ff08b03c7cec8e10b35ba438633b9fe08a8d90 +# floating tag 3.2-latest +version=3.2.0.20220405 +revision=1 +_gitrev=54145b03f4240222e336a9a2f402e93facefde65 wrksrc="${pkgname}-${_gitrev}" build_style=gnu-configure configure_args="--with-python3 --disable-static --disable-compile-demo" @@ -15,7 +15,7 @@ maintainer="yopito " license="LGPL-3.0-or-later, Apache-2.0" homepage="https://seafile.com" distfiles="https://github.com/haiwen/libsearpc/archive/${_gitrev}.tar.gz" -checksum=2a58894cefbc1d7398581fc58103261688c93a9cf63f11afc5e92142ed948c00 +checksum=401c736be7bb8c6b116a85bd5af36431046c7dd4b6392d5006f917c7fd1d2132 python_version=3 pre_configure() { From 3c228160d2b3cc79864a7c5a673a7478341a811c Mon Sep 17 00:00:00 2001 From: yopito Date: Tue, 23 Aug 2022 17:49:26 +0200 Subject: [PATCH 2/3] seafile-libclient: update to 8.0.8 --- srcpkgs/seafile-libclient/template | 5 ++--- srcpkgs/seafile-libclient/update | 10 ++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template index ac6f9f48038e..468be3483129 100644 --- a/srcpkgs/seafile-libclient/template +++ b/srcpkgs/seafile-libclient/template @@ -1,7 +1,6 @@ # Template file for 'seafile-libclient' -# WARNING: upstream sometimes retag source. Wait for official announcement pkgname=seafile-libclient -version=8.0.4 +version=8.0.8 revision=1 _distname="${pkgname/-libclient/}" wrksrc="${_distname}-${version}" @@ -15,7 +14,7 @@ maintainer="yopito " license="GPL-2.0-or-later" # Has openssl exception not yet present on SPDX homepage="https://seafile.com" distfiles="https://github.com/haiwen/seafile/archive/v${version}.tar.gz" -checksum=1c17cf589a2093f8d5423e56b2f6a098fdd44e8b7b9ffb62846270458aa0d197 +checksum=02f8cb53f061d9d85752d476e72fa64835d5bab66d1fbcb240d22bc41428847b pre_configure() { ./autogen.sh diff --git a/srcpkgs/seafile-libclient/update b/srcpkgs/seafile-libclient/update index a26f83a4fe01..67643cc107c9 100644 --- a/srcpkgs/seafile-libclient/update +++ b/srcpkgs/seafile-libclient/update @@ -1,4 +1,6 @@ -# upstream sometimes retag source -# use upstream's Ubuntu focal repo to detect new version. -site='https://linux-clients.seafile.com/seafile-deb/focal/pool/main/s/seafile-daemon/' -pattern='seafile-daemon_\K[\d.]+(?=_amd64.deb)' +# upstream sometimes retag source, so rely on windows client availabiliy +# to detect new version (upstream's deb packages are not always up to date). +# this is an heuristic, but seafile-libclient and seafile-client-qt are +# bumped often in a coordinated manner. +site=https://download.seadrive.org/ +pattern='seafile-\K[\d.]+(?=-en.msi)' From 77e301e0f14691586d1ad81b9d7e3613e2622539 Mon Sep 17 00:00:00 2001 From: yopito Date: Tue, 23 Aug 2022 17:58:50 +0200 Subject: [PATCH 3/3] seafile-client-qt: update to 8.0.8 --- srcpkgs/seafile-client-qt/template | 6 +++--- srcpkgs/seafile-client-qt/update | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template index dda60ee90a8b..295d48e8658f 100644 --- a/srcpkgs/seafile-client-qt/template +++ b/srcpkgs/seafile-client-qt/template @@ -1,6 +1,6 @@ # Template file for 'seafile-client-qt' pkgname=seafile-client-qt -version=8.0.3 +version=8.0.8 revision=1 _sourcename="seafile-client" wrksrc="${_sourcename}-${version}" @@ -14,7 +14,7 @@ maintainer="yopito " license="Apache-2.0" homepage="https://seafile.com" distfiles="https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz" -checksum=37241cddcfd0bbf46c41f346458fd93a27bec9879d3fd461145b24e8aa2405fb +checksum=4490128f7f8a1691d43fb9d3152b7a842af3542332b2a43e346f1c62ab2c37bc build_options="shibboleth" desc_option_shibboleth="Build with Shibboleth support" @@ -35,7 +35,7 @@ pre_configure() { # append '-ltfs' argument on link via cmake (macro TARGET_LINK_LIBRARIES) # "LDFLAGS=-lfts" does not work, its prepends it (useless) # XXX prefer patch on CMakeLists.txt ? - sed -i -e 's,\(\${EXTRA_LIBS}\)$,\1 -lfts,' ${wrksrc}/CMakeLists.txt + vsed -i -e 's,\(\${EXTRA_LIBS}\)$,\1 -lfts,' ${wrksrc}/CMakeLists.txt ;; esac } diff --git a/srcpkgs/seafile-client-qt/update b/srcpkgs/seafile-client-qt/update index 7c03301dc426..10fc3b1f3a50 100644 --- a/srcpkgs/seafile-client-qt/update +++ b/srcpkgs/seafile-client-qt/update @@ -1,4 +1,4 @@ -# upstream sometimes retag source -# use upstream's Ubuntu focal repo to detect new version. -site='https://linux-clients.seafile.com/seafile-deb/focal/pool/main/s/seafile-gui/' -pattern='seafile-gui_\K[\d.]+(?=_amd64.deb)' +# upstream sometimes retag source, so rely on windows client availabiliy +# to detect new version (upstream's deb packages are not always up to date). +site=https://download.seadrive.org/ +pattern='seafile-\K[\d.]+(?=-en.msi)'