Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Seafile update
@ 2021-04-20 12:25 lonwillett
  2021-04-20 14:12 ` [PR PATCH] [Updated] " lonwillett
                   ` (22 more replies)
  0 siblings, 23 replies; 24+ messages in thread
From: lonwillett @ 2021-04-20 12:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 746 bytes --]

There is a new pull request by lonwillett against master on the void-packages repository

https://github.com/lonwillett/void-packages seafile-update
https://github.com/void-linux/void-packages/pull/30384

Seafile update

#### General
- [ X] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR



A patch file from https://github.com/void-linux/void-packages/pull/30384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-seafile-update-30384.patch --]
[-- Type: text/x-diff, Size: 14150 bytes --]

From 1e235d074f8af90087e9a49485f3443b86d09456 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:14:36 +0200
Subject: [PATCH 1/5] libsearpc: update to 3.2.0.20200318

Update to 3.2.0.20200318 (i.e. 3.2-latest).

Remove patch to support python3.

Add patch to support include of header file within extern "C".
---
 .../patches/001-python3-support.patch         | 114 ------------------
 .../patches/01-glib-include-kludge.patch      |  20 +++
 srcpkgs/libsearpc/template                    |  13 +-
 3 files changed, 28 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/libsearpc/patches/001-python3-support.patch
 create mode 100644 srcpkgs/libsearpc/patches/01-glib-include-kludge.patch

diff --git a/srcpkgs/libsearpc/patches/001-python3-support.patch b/srcpkgs/libsearpc/patches/001-python3-support.patch
deleted file mode 100644
index 7b4ae20c2819..000000000000
--- a/srcpkgs/libsearpc/patches/001-python3-support.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-upstream: yes
-
-From b0079d2a0c3ce0cb4698a162498b108244726912 Mon Sep 17 00:00:00 2001
-From: Xiangyue Cai <caixiangyue007@gmail.com>
-Date: Mon, 8 Jun 2020 15:09:06 +0800
-Subject: [PATCH] configure with python3 (#53)
-
-* configure with python3
-
-* remove future
----
- configure.ac              | 2 +-
- pysearpc/client.py        | 1 -
- pysearpc/named_pipe.py    | 3 ---
- pysearpc/pygencode.py     | 3 ---
- pysearpc/server.py        | 2 --
- pysearpc/test_pysearpc.py | 1 -
- pysearpc/transport.py     | 2 --
- pysearpc/utils.py         | 1 -
- 8 files changed, 1 insertion(+), 14 deletions(-)
-
-diff --git configure.ac configure.ac
-index 53d7438..9c2159a 100644
---- configure.ac
-+++ configure.ac
-@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED])
- AC_SUBST(JANSSON_CFLAGS)
- AC_SUBST(JANSSON_LIBS)
- 
--AM_PATH_PYTHON([2.4])
-+AM_PATH_PYTHON([3.5])
- if test "$bwin32" = true; then
-    if test x$PYTHON_DIR != x; then
-    # set pyexecdir to somewhere like /c/Python26/Lib/site-packages
-diff --git pysearpc/client.py pysearpc/client.py
-index 20e5535..3650cb1 100644
---- pysearpc/client.py
-+++ pysearpc/client.py
-@@ -1,4 +1,3 @@
--from builtins import object
- import json
- from .common import SearpcError
- 
-diff --git pysearpc/named_pipe.py pysearpc/named_pipe.py
-index a0ca619..73df576 100644
---- pysearpc/named_pipe.py
-+++ pysearpc/named_pipe.py
-@@ -2,9 +2,6 @@
- RPC client/server implementation based on named pipe transport.
- """
- 
--from future import standard_library
--standard_library.install_aliases()
--from builtins import object
- import json
- import logging
- import os
-diff --git pysearpc/pygencode.py pysearpc/pygencode.py
-index 62a635b..8c718ce 100644
---- pysearpc/pygencode.py
-+++ pysearpc/pygencode.py
-@@ -1,8 +1,5 @@
- #!/usr/bin/python
- 
--
--from __future__ import print_function
--from builtins import str
- import string
- import sys
- 
-diff --git pysearpc/server.py pysearpc/server.py
-index a7ec7be..94d9bac 100644
---- pysearpc/server.py
-+++ pysearpc/server.py
-@@ -1,5 +1,3 @@
--from builtins import str
--from builtins import object
- import json
- 
- from .common import SearpcError
-diff --git pysearpc/test_pysearpc.py pysearpc/test_pysearpc.py
-index a9c6f8b..64a455d 100755
---- pysearpc/test_pysearpc.py
-+++ pysearpc/test_pysearpc.py
-@@ -1,7 +1,6 @@
- #!/usr/bin/env python
- #coding: UTF-8
- 
--from builtins import object
- import json
- import logging
- import os
-diff --git pysearpc/transport.py pysearpc/transport.py
-index 3c6e821..3deb42c 100644
---- pysearpc/transport.py
-+++ pysearpc/transport.py
-@@ -1,5 +1,3 @@
--
--from builtins import object
- class SearpcTransport(object):
-     """
-     A transport is repsonsible to send the serialized request to the
-diff --git pysearpc/utils.py pysearpc/utils.py
-index 2aeda93..451ad4e 100644
---- pysearpc/utils.py
-+++ pysearpc/utils.py
-@@ -1,4 +1,3 @@
--from builtins import bytes
- import os
- import socket
- 
--- 
-2.30.0
-
diff --git a/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch
new file mode 100644
index 000000000000..8064ee3aeb5d
--- /dev/null
+++ b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch
@@ -0,0 +1,20 @@
+  Seafile sources sometimes include searpc-client.h an extern "C" block,
+  and recent versions of glib.h don't tolerate that. This is the easy fix,
+  until such time as the source is fixed upstream.
+--- lib/searpc-client.h~	2020-06-18 05:23:11.000000000 +0200
++++ 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 <glib.h>
+ #include <glib-object.h>
++#ifdef __cplusplus
++}
++#endif
+ #include <jansson.h>
+ 
+ #ifndef DFT_DOMAIN
diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template
index 02273e1ef58d..22fbb7987d06 100644
--- a/srcpkgs/libsearpc/template
+++ b/srcpkgs/libsearpc/template
@@ -1,18 +1,21 @@
 # Template file for 'libsearpc'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=libsearpc
-version=3.2.0
-revision=4
+# 3.2-latest (as of 2021-04-10)
+version=3.2.0.20200318
+revision=1
+_gitrev=50ff08b03c7cec8e10b35ba438633b9fe08a8d90
+wrksrc="${pkgname}-${_gitrev}"
 build_style=gnu-configure
-configure_args="PYTHON=python3 --disable-static --disable-compile-demo"
+configure_args="--with-python3 --disable-static --disable-compile-demo"
 hostmakedepends="automake libtool pkg-config python3 glib-devel"
 makedepends="libglib-devel jansson-devel"
 short_desc="Seafile RPC library"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later, Apache-2.0"
 homepage="https://seafile.com"
-distfiles="https://github.com/haiwen/libsearpc/archive/v${version}.tar.gz"
-checksum=cd00197fcc40b45b1d5e892b2d08dfa5947f737e0d80f3ef26419334e75b0bff
+distfiles="https://github.com/haiwen/libsearpc/archive/${_gitrev}.tar.gz"
+checksum=2a58894cefbc1d7398581fc58103261688c93a9cf63f11afc5e92142ed948c00
 python_version=3
 
 pre_configure() {

From 1003eae3684002a17b1c402f4135d1dd7e227d61 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:17:49 +0200
Subject: [PATCH 2/5] seafile-libclient: update to 8.0.2

---
 srcpkgs/seafile-libclient/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index db394362f188..36358c4a7bc5 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -1,8 +1,8 @@
 # Template file for 'seafile-libclient'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
-version=7.0.10
-revision=2
+version=8.0.2
+revision=1
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 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=9ac0a1c25e6f2bf874b5b080a165319f29cb3d03f044da8db8aed8412c8b4f45
+checksum=acfb77993887221d93b9f413f1726805133fe8cb32420c61aaa6c9e7a48e0e0d
 
 pre_configure() {
 	./autogen.sh

From 68ef407098a7496847d7a5500ad7bcbf053d08d3 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:19:17 +0200
Subject: [PATCH 3/5] seafile-client-qt: update to 8.0.2

Remove libressl patch.
---
 srcpkgs/seafile-client-qt/patches/libressl.patch | 11 -----------
 srcpkgs/seafile-client-qt/template               |  4 ++--
 srcpkgs/seafile-client-qt/update                 |  6 ++----
 3 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/seafile-client-qt/patches/libressl.patch

diff --git a/srcpkgs/seafile-client-qt/patches/libressl.patch b/srcpkgs/seafile-client-qt/patches/libressl.patch
deleted file mode 100644
index 1774719fa34a..000000000000
--- a/srcpkgs/seafile-client-qt/patches/libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/utils/rsa.cpp.orig
-+++ src/utils/rsa.cpp
-@@ -13,7 +13,7 @@
- 
- /* Forward compatibility functions if libssl < 1.1.0. */
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template
index c0a475106e45..76b9a41fe45a 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=7.0.10
+version=8.0.2
 revision=1
 _sourcename="seafile-client"
 wrksrc="${_sourcename}-${version}"
@@ -14,7 +14,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="Apache-2.0"
 homepage="https://seafile.com"
 distfiles="https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"
-checksum=3b373e13fd56fd1cb768db598302f19669919194a3d2a54b0eb929ff04310333
+checksum=a6be7e55236cd4fb6028259ab5f35163ce044811f45b6008f280d42f5cee9f8d
 
 build_options="shibboleth"
 desc_option_shibboleth="Build with Shibboleth support"
diff --git a/srcpkgs/seafile-client-qt/update b/srcpkgs/seafile-client-qt/update
index 8a583259f495..fef3fa14f156 100644
--- a/srcpkgs/seafile-client-qt/update
+++ b/srcpkgs/seafile-client-qt/update
@@ -1,4 +1,2 @@
-# upstream sometimes retag source until official announcement.
-# rely on windows client availabiliy to detect new version.
-site=https://download.seadrive.org/
-pattern='<Key>seafile-\K[\d.]+(?=-en.msi</Key>)'
+site=https://github.com/haiwen/seafile-client/releases
+pattern='tags/v\K[\d.]+(?=.tar.gz)'

From 0b56d49c3c63f7d21d5780a1ac779bb8fd97c995 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:21:11 +0200
Subject: [PATCH 4/5] New package: seadrive-daemon-2.0.10

---
 srcpkgs/seadrive-daemon/template | 20 ++++++++++++++++++++
 srcpkgs/seadrive-daemon/update   |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 srcpkgs/seadrive-daemon/template
 create mode 100644 srcpkgs/seadrive-daemon/update

diff --git a/srcpkgs/seadrive-daemon/template b/srcpkgs/seadrive-daemon/template
new file mode 100644
index 000000000000..a61c24b73fbe
--- /dev/null
+++ b/srcpkgs/seadrive-daemon/template
@@ -0,0 +1,20 @@
+# Template file for 'seadrive-daemon'
+pkgname=seadrive-daemon
+version=2.0.10
+revision=1
+_distname="seadrive-fuse"
+wrksrc="${_distname}-${version}"
+build_style=gnu-configure
+hostmakedepends="autoconf automake libtool intltool vala pkg-config python3"
+makedepends="libevent-devel libcurl-devel gtk+-devel libuuid-devel sqlite-devel jansson-devel openssl-devel libsearpc-devel fuse-devel"
+short_desc="Seafile drive daemon (fuse interface)"
+maintainer="Lon Willett <xgit@lonw.net>"
+license="GPL-3.0-or-later"
+homepage="https://seafile.com"
+distfiles="https://github.com/haiwen/${_distname}/archive/v${version}.tar.gz"
+checksum=d476f1f95b8a13d49881cb004921dad2bbc32e61d431d810873a2882daebbe91
+python_version=3
+
+pre_configure() {
+	./autogen.sh
+}
diff --git a/srcpkgs/seadrive-daemon/update b/srcpkgs/seadrive-daemon/update
new file mode 100644
index 000000000000..1ab833abe936
--- /dev/null
+++ b/srcpkgs/seadrive-daemon/update
@@ -0,0 +1,2 @@
+site=https://github.com/haiwen/seadrive-fuse/releases
+pattern='tags/v\K[\d.]+(?=.tar.gz)'

From 1395595282a6bd110e4fec83d9a0b9c26c66660e Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:22:03 +0200
Subject: [PATCH 5/5] New package: seadrive-gui-2.0.10

---
 srcpkgs/seadrive-gui/template | 40 +++++++++++++++++++++++++++++++++++
 srcpkgs/seadrive-gui/update   |  6 ++++++
 2 files changed, 46 insertions(+)
 create mode 100644 srcpkgs/seadrive-gui/template
 create mode 100644 srcpkgs/seadrive-gui/update

diff --git a/srcpkgs/seadrive-gui/template b/srcpkgs/seadrive-gui/template
new file mode 100644
index 000000000000..62ece7c34a16
--- /dev/null
+++ b/srcpkgs/seadrive-gui/template
@@ -0,0 +1,40 @@
+# Template file for 'seadrive-gui'
+pkgname=seadrive-gui
+version=2.0.10
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr"
+hostmakedepends="autoconf automake libtool intltool vala pkg-config"
+# python3?
+makedepends="libevent-devel libcurl-devel gtk+-devel libuuid-devel sqlite-devel jansson-devel openssl-devel libsearpc-devel qt5-devel qt5-tools-devel qt5-webengine-devel qt5-webchannel-devel qt5-declarative-devel qt5-location-devel"
+depends="seadrive-daemon>=${version}"
+short_desc="Seafile drive client (qt5 gui)"
+maintainer="Lon Willett <xgit@lonw.net>"
+license="Apache-2.0"
+homepage="https://seafile.com"
+distfiles="https://github.com/haiwen/${pkgname}/archive/v${version}.tar.gz"
+checksum=e9dc3e3bf7d18f3931a57faa528fa469a9d54f158d8247c96126509981c240c8
+
+case "$XBPS_TARGET_MACHINE" in
+	*-musl)	# need fts implementation
+		makedepends+=" musl-fts-devel" ;;
+esac
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-qmake qt5-host-tools"
+fi
+
+pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			# 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
+			;;
+	esac
+}
+
+post_install() {
+	vdoc README.md
+}
diff --git a/srcpkgs/seadrive-gui/update b/srcpkgs/seadrive-gui/update
new file mode 100644
index 000000000000..349fe1e0d932
--- /dev/null
+++ b/srcpkgs/seadrive-gui/update
@@ -0,0 +1,6 @@
+# Build instructions for linux (as of 2021-04-20) say to use the same
+# version of seadrive-gui as for seadrive-daemon (seadrive-fuse).
+# This is not a good approach, but I see no better option than to stick
+# with it.
+site=https://github.com/haiwen/seadrive-fuse/releases
+pattern='tags/v\K[\d.]+(?=.tar.gz)'

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] Seafile update
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
@ 2021-04-20 14:12 ` lonwillett
  2021-04-23 22:52 ` yopito
                   ` (21 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: lonwillett @ 2021-04-20 14:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 751 bytes --]

There is an updated pull request by lonwillett against master on the void-packages repository

https://github.com/lonwillett/void-packages seafile-update
https://github.com/void-linux/void-packages/pull/30384

Seafile update

#### General
- [ X] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR



A patch file from https://github.com/void-linux/void-packages/pull/30384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-seafile-update-30384.patch --]
[-- Type: text/x-diff, Size: 14796 bytes --]

From 1e235d074f8af90087e9a49485f3443b86d09456 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:14:36 +0200
Subject: [PATCH 1/5] libsearpc: update to 3.2.0.20200318

Update to 3.2.0.20200318 (i.e. 3.2-latest).

Remove patch to support python3.

Add patch to support include of header file within extern "C".
---
 .../patches/001-python3-support.patch         | 114 ------------------
 .../patches/01-glib-include-kludge.patch      |  20 +++
 srcpkgs/libsearpc/template                    |  13 +-
 3 files changed, 28 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/libsearpc/patches/001-python3-support.patch
 create mode 100644 srcpkgs/libsearpc/patches/01-glib-include-kludge.patch

diff --git a/srcpkgs/libsearpc/patches/001-python3-support.patch b/srcpkgs/libsearpc/patches/001-python3-support.patch
deleted file mode 100644
index 7b4ae20c2819..000000000000
--- a/srcpkgs/libsearpc/patches/001-python3-support.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-upstream: yes
-
-From b0079d2a0c3ce0cb4698a162498b108244726912 Mon Sep 17 00:00:00 2001
-From: Xiangyue Cai <caixiangyue007@gmail.com>
-Date: Mon, 8 Jun 2020 15:09:06 +0800
-Subject: [PATCH] configure with python3 (#53)
-
-* configure with python3
-
-* remove future
----
- configure.ac              | 2 +-
- pysearpc/client.py        | 1 -
- pysearpc/named_pipe.py    | 3 ---
- pysearpc/pygencode.py     | 3 ---
- pysearpc/server.py        | 2 --
- pysearpc/test_pysearpc.py | 1 -
- pysearpc/transport.py     | 2 --
- pysearpc/utils.py         | 1 -
- 8 files changed, 1 insertion(+), 14 deletions(-)
-
-diff --git configure.ac configure.ac
-index 53d7438..9c2159a 100644
---- configure.ac
-+++ configure.ac
-@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED])
- AC_SUBST(JANSSON_CFLAGS)
- AC_SUBST(JANSSON_LIBS)
- 
--AM_PATH_PYTHON([2.4])
-+AM_PATH_PYTHON([3.5])
- if test "$bwin32" = true; then
-    if test x$PYTHON_DIR != x; then
-    # set pyexecdir to somewhere like /c/Python26/Lib/site-packages
-diff --git pysearpc/client.py pysearpc/client.py
-index 20e5535..3650cb1 100644
---- pysearpc/client.py
-+++ pysearpc/client.py
-@@ -1,4 +1,3 @@
--from builtins import object
- import json
- from .common import SearpcError
- 
-diff --git pysearpc/named_pipe.py pysearpc/named_pipe.py
-index a0ca619..73df576 100644
---- pysearpc/named_pipe.py
-+++ pysearpc/named_pipe.py
-@@ -2,9 +2,6 @@
- RPC client/server implementation based on named pipe transport.
- """
- 
--from future import standard_library
--standard_library.install_aliases()
--from builtins import object
- import json
- import logging
- import os
-diff --git pysearpc/pygencode.py pysearpc/pygencode.py
-index 62a635b..8c718ce 100644
---- pysearpc/pygencode.py
-+++ pysearpc/pygencode.py
-@@ -1,8 +1,5 @@
- #!/usr/bin/python
- 
--
--from __future__ import print_function
--from builtins import str
- import string
- import sys
- 
-diff --git pysearpc/server.py pysearpc/server.py
-index a7ec7be..94d9bac 100644
---- pysearpc/server.py
-+++ pysearpc/server.py
-@@ -1,5 +1,3 @@
--from builtins import str
--from builtins import object
- import json
- 
- from .common import SearpcError
-diff --git pysearpc/test_pysearpc.py pysearpc/test_pysearpc.py
-index a9c6f8b..64a455d 100755
---- pysearpc/test_pysearpc.py
-+++ pysearpc/test_pysearpc.py
-@@ -1,7 +1,6 @@
- #!/usr/bin/env python
- #coding: UTF-8
- 
--from builtins import object
- import json
- import logging
- import os
-diff --git pysearpc/transport.py pysearpc/transport.py
-index 3c6e821..3deb42c 100644
---- pysearpc/transport.py
-+++ pysearpc/transport.py
-@@ -1,5 +1,3 @@
--
--from builtins import object
- class SearpcTransport(object):
-     """
-     A transport is repsonsible to send the serialized request to the
-diff --git pysearpc/utils.py pysearpc/utils.py
-index 2aeda93..451ad4e 100644
---- pysearpc/utils.py
-+++ pysearpc/utils.py
-@@ -1,4 +1,3 @@
--from builtins import bytes
- import os
- import socket
- 
--- 
-2.30.0
-
diff --git a/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch
new file mode 100644
index 000000000000..8064ee3aeb5d
--- /dev/null
+++ b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch
@@ -0,0 +1,20 @@
+  Seafile sources sometimes include searpc-client.h an extern "C" block,
+  and recent versions of glib.h don't tolerate that. This is the easy fix,
+  until such time as the source is fixed upstream.
+--- lib/searpc-client.h~	2020-06-18 05:23:11.000000000 +0200
++++ 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 <glib.h>
+ #include <glib-object.h>
++#ifdef __cplusplus
++}
++#endif
+ #include <jansson.h>
+ 
+ #ifndef DFT_DOMAIN
diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template
index 02273e1ef58d..22fbb7987d06 100644
--- a/srcpkgs/libsearpc/template
+++ b/srcpkgs/libsearpc/template
@@ -1,18 +1,21 @@
 # Template file for 'libsearpc'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=libsearpc
-version=3.2.0
-revision=4
+# 3.2-latest (as of 2021-04-10)
+version=3.2.0.20200318
+revision=1
+_gitrev=50ff08b03c7cec8e10b35ba438633b9fe08a8d90
+wrksrc="${pkgname}-${_gitrev}"
 build_style=gnu-configure
-configure_args="PYTHON=python3 --disable-static --disable-compile-demo"
+configure_args="--with-python3 --disable-static --disable-compile-demo"
 hostmakedepends="automake libtool pkg-config python3 glib-devel"
 makedepends="libglib-devel jansson-devel"
 short_desc="Seafile RPC library"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later, Apache-2.0"
 homepage="https://seafile.com"
-distfiles="https://github.com/haiwen/libsearpc/archive/v${version}.tar.gz"
-checksum=cd00197fcc40b45b1d5e892b2d08dfa5947f737e0d80f3ef26419334e75b0bff
+distfiles="https://github.com/haiwen/libsearpc/archive/${_gitrev}.tar.gz"
+checksum=2a58894cefbc1d7398581fc58103261688c93a9cf63f11afc5e92142ed948c00
 python_version=3
 
 pre_configure() {

From ee6d9c2f24738c1d4a77d2c1d25b07d293946405 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:17:49 +0200
Subject: [PATCH 2/5] seafile-libclient: update to 8.0.1

---
 srcpkgs/seafile-libclient/template | 6 +++---
 srcpkgs/seafile-libclient/update   | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/seafile-libclient/update

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index db394362f188..5a462985b88d 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -1,8 +1,8 @@
 # Template file for 'seafile-libclient'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
-version=7.0.10
-revision=2
+version=8.0.1
+revision=1
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 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=9ac0a1c25e6f2bf874b5b080a165319f29cb3d03f044da8db8aed8412c8b4f45
+checksum=117e686301f32e91d46b16453c43eb959cbd818f8c28ee3a594705bd103e59b9
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/seafile-libclient/update b/srcpkgs/seafile-libclient/update
new file mode 100644
index 000000000000..0e3392c2cad0
--- /dev/null
+++ b/srcpkgs/seafile-libclient/update
@@ -0,0 +1,4 @@
+# upstream sometimes retag source
+# use 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)'

From 1b221b5003bba39f1ce73e22c937323ad9efdb7a Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:19:17 +0200
Subject: [PATCH 3/5] seafile-client-qt: update to 8.0.1

Remove libressl patch.
---
 srcpkgs/seafile-client-qt/patches/libressl.patch | 11 -----------
 srcpkgs/seafile-client-qt/template               |  4 ++--
 srcpkgs/seafile-client-qt/update                 |  8 ++++----
 3 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/seafile-client-qt/patches/libressl.patch

diff --git a/srcpkgs/seafile-client-qt/patches/libressl.patch b/srcpkgs/seafile-client-qt/patches/libressl.patch
deleted file mode 100644
index 1774719fa34a..000000000000
--- a/srcpkgs/seafile-client-qt/patches/libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/utils/rsa.cpp.orig
-+++ src/utils/rsa.cpp
-@@ -13,7 +13,7 @@
- 
- /* Forward compatibility functions if libssl < 1.1.0. */
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template
index c0a475106e45..b2e16639780a 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=7.0.10
+version=8.0.1
 revision=1
 _sourcename="seafile-client"
 wrksrc="${_sourcename}-${version}"
@@ -14,7 +14,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="Apache-2.0"
 homepage="https://seafile.com"
 distfiles="https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"
-checksum=3b373e13fd56fd1cb768db598302f19669919194a3d2a54b0eb929ff04310333
+checksum=49bd391549b54f1cf043026862e765c8c27e84be07835c8ffc21d81570968367
 
 build_options="shibboleth"
 desc_option_shibboleth="Build with Shibboleth support"
diff --git a/srcpkgs/seafile-client-qt/update b/srcpkgs/seafile-client-qt/update
index 8a583259f495..31d02e1d2c35 100644
--- a/srcpkgs/seafile-client-qt/update
+++ b/srcpkgs/seafile-client-qt/update
@@ -1,4 +1,4 @@
-# upstream sometimes retag source until official announcement.
-# rely on windows client availabiliy to detect new version.
-site=https://download.seadrive.org/
-pattern='<Key>seafile-\K[\d.]+(?=-en.msi</Key>)'
+# upstream sometimes retag source
+# use 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)'

From 1d5e36fb6794740993ab946f5d82d3fb5dbb9e0d Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:21:11 +0200
Subject: [PATCH 4/5] New package: seadrive-daemon-2.0.10

---
 srcpkgs/seadrive-daemon/template | 20 ++++++++++++++++++++
 srcpkgs/seadrive-daemon/update   |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 srcpkgs/seadrive-daemon/template
 create mode 100644 srcpkgs/seadrive-daemon/update

diff --git a/srcpkgs/seadrive-daemon/template b/srcpkgs/seadrive-daemon/template
new file mode 100644
index 000000000000..a61c24b73fbe
--- /dev/null
+++ b/srcpkgs/seadrive-daemon/template
@@ -0,0 +1,20 @@
+# Template file for 'seadrive-daemon'
+pkgname=seadrive-daemon
+version=2.0.10
+revision=1
+_distname="seadrive-fuse"
+wrksrc="${_distname}-${version}"
+build_style=gnu-configure
+hostmakedepends="autoconf automake libtool intltool vala pkg-config python3"
+makedepends="libevent-devel libcurl-devel gtk+-devel libuuid-devel sqlite-devel jansson-devel openssl-devel libsearpc-devel fuse-devel"
+short_desc="Seafile drive daemon (fuse interface)"
+maintainer="Lon Willett <xgit@lonw.net>"
+license="GPL-3.0-or-later"
+homepage="https://seafile.com"
+distfiles="https://github.com/haiwen/${_distname}/archive/v${version}.tar.gz"
+checksum=d476f1f95b8a13d49881cb004921dad2bbc32e61d431d810873a2882daebbe91
+python_version=3
+
+pre_configure() {
+	./autogen.sh
+}
diff --git a/srcpkgs/seadrive-daemon/update b/srcpkgs/seadrive-daemon/update
new file mode 100644
index 000000000000..1ab833abe936
--- /dev/null
+++ b/srcpkgs/seadrive-daemon/update
@@ -0,0 +1,2 @@
+site=https://github.com/haiwen/seadrive-fuse/releases
+pattern='tags/v\K[\d.]+(?=.tar.gz)'

From 37a13ec50cc08ffdd3245eab8a8c40b7529aec45 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:22:03 +0200
Subject: [PATCH 5/5] New package: seadrive-gui-2.0.10

---
 srcpkgs/seadrive-gui/template | 40 +++++++++++++++++++++++++++++++++++
 srcpkgs/seadrive-gui/update   |  6 ++++++
 2 files changed, 46 insertions(+)
 create mode 100644 srcpkgs/seadrive-gui/template
 create mode 100644 srcpkgs/seadrive-gui/update

diff --git a/srcpkgs/seadrive-gui/template b/srcpkgs/seadrive-gui/template
new file mode 100644
index 000000000000..62ece7c34a16
--- /dev/null
+++ b/srcpkgs/seadrive-gui/template
@@ -0,0 +1,40 @@
+# Template file for 'seadrive-gui'
+pkgname=seadrive-gui
+version=2.0.10
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr"
+hostmakedepends="autoconf automake libtool intltool vala pkg-config"
+# python3?
+makedepends="libevent-devel libcurl-devel gtk+-devel libuuid-devel sqlite-devel jansson-devel openssl-devel libsearpc-devel qt5-devel qt5-tools-devel qt5-webengine-devel qt5-webchannel-devel qt5-declarative-devel qt5-location-devel"
+depends="seadrive-daemon>=${version}"
+short_desc="Seafile drive client (qt5 gui)"
+maintainer="Lon Willett <xgit@lonw.net>"
+license="Apache-2.0"
+homepage="https://seafile.com"
+distfiles="https://github.com/haiwen/${pkgname}/archive/v${version}.tar.gz"
+checksum=e9dc3e3bf7d18f3931a57faa528fa469a9d54f158d8247c96126509981c240c8
+
+case "$XBPS_TARGET_MACHINE" in
+	*-musl)	# need fts implementation
+		makedepends+=" musl-fts-devel" ;;
+esac
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-qmake qt5-host-tools"
+fi
+
+pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			# 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
+			;;
+	esac
+}
+
+post_install() {
+	vdoc README.md
+}
diff --git a/srcpkgs/seadrive-gui/update b/srcpkgs/seadrive-gui/update
new file mode 100644
index 000000000000..349fe1e0d932
--- /dev/null
+++ b/srcpkgs/seadrive-gui/update
@@ -0,0 +1,6 @@
+# Build instructions for linux (as of 2021-04-20) say to use the same
+# version of seadrive-gui as for seadrive-daemon (seadrive-fuse).
+# This is not a good approach, but I see no better option than to stick
+# with it.
+site=https://github.com/haiwen/seadrive-fuse/releases
+pattern='tags/v\K[\d.]+(?=.tar.gz)'

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: Seafile update
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
  2021-04-20 14:12 ` [PR PATCH] [Updated] " lonwillett
@ 2021-04-23 22:52 ` yopito
  2021-04-23 22:56 ` yopito
                   ` (20 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: yopito @ 2021-04-23 22:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 375 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#issuecomment-825981324

Comment:
hello, as usual with this upstream, "release" status is unclear ...
For instance : https://www.seafile.com/en/download/ still states 8.0.1 as **beta** release.
In this other hand, Update Windows channel spots 8.0.1 so ...
Comments ?

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: Seafile update
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
  2021-04-20 14:12 ` [PR PATCH] [Updated] " lonwillett
  2021-04-23 22:52 ` yopito
@ 2021-04-23 22:56 ` yopito
  2021-04-24  7:03 ` lonwillett
                   ` (19 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: yopito @ 2021-04-23 22:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 243 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#issuecomment-825982663

Comment:
Apart from this, you shoud split into 2 PR: one for seafile update, another for new seadrive package(s)

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: Seafile update
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (2 preceding siblings ...)
  2021-04-23 22:56 ` yopito
@ 2021-04-24  7:03 ` lonwillett
  2021-04-24  7:22 ` lonwillett
                   ` (18 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: lonwillett @ 2021-04-24  7:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 481 bytes --]

New comment by lonwillett on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#issuecomment-826047144

Comment:
Re: versions
They do seem to be a bit inconsistent, but both this table: [https://cloud.seatable.io/dtable/external-links/a85d4221e41344c19566/?tid=YzYy&vid=pO5i](url) and the linux repositories say that 8.0.1 is the current version. I decided to follow the officially supported linux repository versions (also in the "update" files).


^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: Seafile update
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (3 preceding siblings ...)
  2021-04-24  7:03 ` lonwillett
@ 2021-04-24  7:22 ` lonwillett
  2021-04-24 14:10 ` yopito
                   ` (17 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: lonwillett @ 2021-04-24  7:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 762 bytes --]

New comment by lonwillett on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#issuecomment-826049182

Comment:
Re: multiple PRs

I can split this into two or three PRs, but note that the first commit is a dependency of the others. So I am not clear on how to do this.

e.g. The "right" way to do this would be two PRs, both of which include the first commit (libsearpc update). But does this work? Is having the same commit in two PRs going to make something unhappy?

Other approaches will break the CI system, at least temporarily. I could submit the update PR, wait until it is accepted and built, and then submit the new seadrive packages, but it seems rather the long way around...

Can you tell me what I should do?

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: Seafile update
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (4 preceding siblings ...)
  2021-04-24  7:22 ` lonwillett
@ 2021-04-24 14:10 ` yopito
  2021-04-24 14:49 ` [PR PATCH] [Updated] " lonwillett
                   ` (16 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: yopito @ 2021-04-24 14:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 646 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#issuecomment-826098907

Comment:
Please don't mix package update and unrelated new packages in the same PR.
This make review much easier : focus on one subject at a time.
So 1st PR for seafile-client update, 2nd for new packages seafile-drive.

seafile-drive PR: don't include libsearpc update (if already in 1st PR). Also manually notice within PR's description "depends on PR XXX (seafile-client update)".
So yes, this one won't be mergeable until 1st is merged.
You can also wait that 1st is get merged before opening the 2nd.



^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] Seafile update
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (5 preceding siblings ...)
  2021-04-24 14:10 ` yopito
@ 2021-04-24 14:49 ` lonwillett
  2021-04-24 15:53 ` [PR PATCH] [Updated] seafile-{client-qt,libclient}: update to 8.0.1 lonwillett
                   ` (15 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: lonwillett @ 2021-04-24 14:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 751 bytes --]

There is an updated pull request by lonwillett against master on the void-packages repository

https://github.com/lonwillett/void-packages seafile-update
https://github.com/void-linux/void-packages/pull/30384

Seafile update

#### General
- [ X] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR



A patch file from https://github.com/void-linux/void-packages/pull/30384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-seafile-update-30384.patch --]
[-- Type: text/x-diff, Size: 10541 bytes --]

From 1e235d074f8af90087e9a49485f3443b86d09456 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:14:36 +0200
Subject: [PATCH 1/3] libsearpc: update to 3.2.0.20200318

Update to 3.2.0.20200318 (i.e. 3.2-latest).

Remove patch to support python3.

Add patch to support include of header file within extern "C".
---
 .../patches/001-python3-support.patch         | 114 ------------------
 .../patches/01-glib-include-kludge.patch      |  20 +++
 srcpkgs/libsearpc/template                    |  13 +-
 3 files changed, 28 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/libsearpc/patches/001-python3-support.patch
 create mode 100644 srcpkgs/libsearpc/patches/01-glib-include-kludge.patch

diff --git a/srcpkgs/libsearpc/patches/001-python3-support.patch b/srcpkgs/libsearpc/patches/001-python3-support.patch
deleted file mode 100644
index 7b4ae20c2819..000000000000
--- a/srcpkgs/libsearpc/patches/001-python3-support.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-upstream: yes
-
-From b0079d2a0c3ce0cb4698a162498b108244726912 Mon Sep 17 00:00:00 2001
-From: Xiangyue Cai <caixiangyue007@gmail.com>
-Date: Mon, 8 Jun 2020 15:09:06 +0800
-Subject: [PATCH] configure with python3 (#53)
-
-* configure with python3
-
-* remove future
----
- configure.ac              | 2 +-
- pysearpc/client.py        | 1 -
- pysearpc/named_pipe.py    | 3 ---
- pysearpc/pygencode.py     | 3 ---
- pysearpc/server.py        | 2 --
- pysearpc/test_pysearpc.py | 1 -
- pysearpc/transport.py     | 2 --
- pysearpc/utils.py         | 1 -
- 8 files changed, 1 insertion(+), 14 deletions(-)
-
-diff --git configure.ac configure.ac
-index 53d7438..9c2159a 100644
---- configure.ac
-+++ configure.ac
-@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED])
- AC_SUBST(JANSSON_CFLAGS)
- AC_SUBST(JANSSON_LIBS)
- 
--AM_PATH_PYTHON([2.4])
-+AM_PATH_PYTHON([3.5])
- if test "$bwin32" = true; then
-    if test x$PYTHON_DIR != x; then
-    # set pyexecdir to somewhere like /c/Python26/Lib/site-packages
-diff --git pysearpc/client.py pysearpc/client.py
-index 20e5535..3650cb1 100644
---- pysearpc/client.py
-+++ pysearpc/client.py
-@@ -1,4 +1,3 @@
--from builtins import object
- import json
- from .common import SearpcError
- 
-diff --git pysearpc/named_pipe.py pysearpc/named_pipe.py
-index a0ca619..73df576 100644
---- pysearpc/named_pipe.py
-+++ pysearpc/named_pipe.py
-@@ -2,9 +2,6 @@
- RPC client/server implementation based on named pipe transport.
- """
- 
--from future import standard_library
--standard_library.install_aliases()
--from builtins import object
- import json
- import logging
- import os
-diff --git pysearpc/pygencode.py pysearpc/pygencode.py
-index 62a635b..8c718ce 100644
---- pysearpc/pygencode.py
-+++ pysearpc/pygencode.py
-@@ -1,8 +1,5 @@
- #!/usr/bin/python
- 
--
--from __future__ import print_function
--from builtins import str
- import string
- import sys
- 
-diff --git pysearpc/server.py pysearpc/server.py
-index a7ec7be..94d9bac 100644
---- pysearpc/server.py
-+++ pysearpc/server.py
-@@ -1,5 +1,3 @@
--from builtins import str
--from builtins import object
- import json
- 
- from .common import SearpcError
-diff --git pysearpc/test_pysearpc.py pysearpc/test_pysearpc.py
-index a9c6f8b..64a455d 100755
---- pysearpc/test_pysearpc.py
-+++ pysearpc/test_pysearpc.py
-@@ -1,7 +1,6 @@
- #!/usr/bin/env python
- #coding: UTF-8
- 
--from builtins import object
- import json
- import logging
- import os
-diff --git pysearpc/transport.py pysearpc/transport.py
-index 3c6e821..3deb42c 100644
---- pysearpc/transport.py
-+++ pysearpc/transport.py
-@@ -1,5 +1,3 @@
--
--from builtins import object
- class SearpcTransport(object):
-     """
-     A transport is repsonsible to send the serialized request to the
-diff --git pysearpc/utils.py pysearpc/utils.py
-index 2aeda93..451ad4e 100644
---- pysearpc/utils.py
-+++ pysearpc/utils.py
-@@ -1,4 +1,3 @@
--from builtins import bytes
- import os
- import socket
- 
--- 
-2.30.0
-
diff --git a/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch
new file mode 100644
index 000000000000..8064ee3aeb5d
--- /dev/null
+++ b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch
@@ -0,0 +1,20 @@
+  Seafile sources sometimes include searpc-client.h an extern "C" block,
+  and recent versions of glib.h don't tolerate that. This is the easy fix,
+  until such time as the source is fixed upstream.
+--- lib/searpc-client.h~	2020-06-18 05:23:11.000000000 +0200
++++ 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 <glib.h>
+ #include <glib-object.h>
++#ifdef __cplusplus
++}
++#endif
+ #include <jansson.h>
+ 
+ #ifndef DFT_DOMAIN
diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template
index 02273e1ef58d..22fbb7987d06 100644
--- a/srcpkgs/libsearpc/template
+++ b/srcpkgs/libsearpc/template
@@ -1,18 +1,21 @@
 # Template file for 'libsearpc'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=libsearpc
-version=3.2.0
-revision=4
+# 3.2-latest (as of 2021-04-10)
+version=3.2.0.20200318
+revision=1
+_gitrev=50ff08b03c7cec8e10b35ba438633b9fe08a8d90
+wrksrc="${pkgname}-${_gitrev}"
 build_style=gnu-configure
-configure_args="PYTHON=python3 --disable-static --disable-compile-demo"
+configure_args="--with-python3 --disable-static --disable-compile-demo"
 hostmakedepends="automake libtool pkg-config python3 glib-devel"
 makedepends="libglib-devel jansson-devel"
 short_desc="Seafile RPC library"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later, Apache-2.0"
 homepage="https://seafile.com"
-distfiles="https://github.com/haiwen/libsearpc/archive/v${version}.tar.gz"
-checksum=cd00197fcc40b45b1d5e892b2d08dfa5947f737e0d80f3ef26419334e75b0bff
+distfiles="https://github.com/haiwen/libsearpc/archive/${_gitrev}.tar.gz"
+checksum=2a58894cefbc1d7398581fc58103261688c93a9cf63f11afc5e92142ed948c00
 python_version=3
 
 pre_configure() {

From ee6d9c2f24738c1d4a77d2c1d25b07d293946405 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:17:49 +0200
Subject: [PATCH 2/3] seafile-libclient: update to 8.0.1

---
 srcpkgs/seafile-libclient/template | 6 +++---
 srcpkgs/seafile-libclient/update   | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/seafile-libclient/update

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index db394362f188..5a462985b88d 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -1,8 +1,8 @@
 # Template file for 'seafile-libclient'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
-version=7.0.10
-revision=2
+version=8.0.1
+revision=1
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 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=9ac0a1c25e6f2bf874b5b080a165319f29cb3d03f044da8db8aed8412c8b4f45
+checksum=117e686301f32e91d46b16453c43eb959cbd818f8c28ee3a594705bd103e59b9
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/seafile-libclient/update b/srcpkgs/seafile-libclient/update
new file mode 100644
index 000000000000..0e3392c2cad0
--- /dev/null
+++ b/srcpkgs/seafile-libclient/update
@@ -0,0 +1,4 @@
+# upstream sometimes retag source
+# use 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)'

From 1b221b5003bba39f1ce73e22c937323ad9efdb7a Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:19:17 +0200
Subject: [PATCH 3/3] seafile-client-qt: update to 8.0.1

Remove libressl patch.
---
 srcpkgs/seafile-client-qt/patches/libressl.patch | 11 -----------
 srcpkgs/seafile-client-qt/template               |  4 ++--
 srcpkgs/seafile-client-qt/update                 |  8 ++++----
 3 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/seafile-client-qt/patches/libressl.patch

diff --git a/srcpkgs/seafile-client-qt/patches/libressl.patch b/srcpkgs/seafile-client-qt/patches/libressl.patch
deleted file mode 100644
index 1774719fa34a..000000000000
--- a/srcpkgs/seafile-client-qt/patches/libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/utils/rsa.cpp.orig
-+++ src/utils/rsa.cpp
-@@ -13,7 +13,7 @@
- 
- /* Forward compatibility functions if libssl < 1.1.0. */
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template
index c0a475106e45..b2e16639780a 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=7.0.10
+version=8.0.1
 revision=1
 _sourcename="seafile-client"
 wrksrc="${_sourcename}-${version}"
@@ -14,7 +14,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="Apache-2.0"
 homepage="https://seafile.com"
 distfiles="https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"
-checksum=3b373e13fd56fd1cb768db598302f19669919194a3d2a54b0eb929ff04310333
+checksum=49bd391549b54f1cf043026862e765c8c27e84be07835c8ffc21d81570968367
 
 build_options="shibboleth"
 desc_option_shibboleth="Build with Shibboleth support"
diff --git a/srcpkgs/seafile-client-qt/update b/srcpkgs/seafile-client-qt/update
index 8a583259f495..31d02e1d2c35 100644
--- a/srcpkgs/seafile-client-qt/update
+++ b/srcpkgs/seafile-client-qt/update
@@ -1,4 +1,4 @@
-# upstream sometimes retag source until official announcement.
-# rely on windows client availabiliy to detect new version.
-site=https://download.seadrive.org/
-pattern='<Key>seafile-\K[\d.]+(?=-en.msi</Key>)'
+# upstream sometimes retag source
+# use 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)'

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (6 preceding siblings ...)
  2021-04-24 14:49 ` [PR PATCH] [Updated] " lonwillett
@ 2021-04-24 15:53 ` lonwillett
  2021-04-24 22:09 ` [PR REVIEW] " yopito
                   ` (14 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: lonwillett @ 2021-04-24 15:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 783 bytes --]

There is an updated pull request by lonwillett against master on the void-packages repository

https://github.com/lonwillett/void-packages seafile-update
https://github.com/void-linux/void-packages/pull/30384

seafile-{client-qt,libclient}: update to 8.0.1

#### General
- [ X] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR



A patch file from https://github.com/void-linux/void-packages/pull/30384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-seafile-update-30384.patch --]
[-- Type: text/x-diff, Size: 11006 bytes --]

From 1e235d074f8af90087e9a49485f3443b86d09456 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:14:36 +0200
Subject: [PATCH 1/3] libsearpc: update to 3.2.0.20200318

Update to 3.2.0.20200318 (i.e. 3.2-latest).

Remove patch to support python3.

Add patch to support include of header file within extern "C".
---
 .../patches/001-python3-support.patch         | 114 ------------------
 .../patches/01-glib-include-kludge.patch      |  20 +++
 srcpkgs/libsearpc/template                    |  13 +-
 3 files changed, 28 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/libsearpc/patches/001-python3-support.patch
 create mode 100644 srcpkgs/libsearpc/patches/01-glib-include-kludge.patch

diff --git a/srcpkgs/libsearpc/patches/001-python3-support.patch b/srcpkgs/libsearpc/patches/001-python3-support.patch
deleted file mode 100644
index 7b4ae20c2819..000000000000
--- a/srcpkgs/libsearpc/patches/001-python3-support.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-upstream: yes
-
-From b0079d2a0c3ce0cb4698a162498b108244726912 Mon Sep 17 00:00:00 2001
-From: Xiangyue Cai <caixiangyue007@gmail.com>
-Date: Mon, 8 Jun 2020 15:09:06 +0800
-Subject: [PATCH] configure with python3 (#53)
-
-* configure with python3
-
-* remove future
----
- configure.ac              | 2 +-
- pysearpc/client.py        | 1 -
- pysearpc/named_pipe.py    | 3 ---
- pysearpc/pygencode.py     | 3 ---
- pysearpc/server.py        | 2 --
- pysearpc/test_pysearpc.py | 1 -
- pysearpc/transport.py     | 2 --
- pysearpc/utils.py         | 1 -
- 8 files changed, 1 insertion(+), 14 deletions(-)
-
-diff --git configure.ac configure.ac
-index 53d7438..9c2159a 100644
---- configure.ac
-+++ configure.ac
-@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED])
- AC_SUBST(JANSSON_CFLAGS)
- AC_SUBST(JANSSON_LIBS)
- 
--AM_PATH_PYTHON([2.4])
-+AM_PATH_PYTHON([3.5])
- if test "$bwin32" = true; then
-    if test x$PYTHON_DIR != x; then
-    # set pyexecdir to somewhere like /c/Python26/Lib/site-packages
-diff --git pysearpc/client.py pysearpc/client.py
-index 20e5535..3650cb1 100644
---- pysearpc/client.py
-+++ pysearpc/client.py
-@@ -1,4 +1,3 @@
--from builtins import object
- import json
- from .common import SearpcError
- 
-diff --git pysearpc/named_pipe.py pysearpc/named_pipe.py
-index a0ca619..73df576 100644
---- pysearpc/named_pipe.py
-+++ pysearpc/named_pipe.py
-@@ -2,9 +2,6 @@
- RPC client/server implementation based on named pipe transport.
- """
- 
--from future import standard_library
--standard_library.install_aliases()
--from builtins import object
- import json
- import logging
- import os
-diff --git pysearpc/pygencode.py pysearpc/pygencode.py
-index 62a635b..8c718ce 100644
---- pysearpc/pygencode.py
-+++ pysearpc/pygencode.py
-@@ -1,8 +1,5 @@
- #!/usr/bin/python
- 
--
--from __future__ import print_function
--from builtins import str
- import string
- import sys
- 
-diff --git pysearpc/server.py pysearpc/server.py
-index a7ec7be..94d9bac 100644
---- pysearpc/server.py
-+++ pysearpc/server.py
-@@ -1,5 +1,3 @@
--from builtins import str
--from builtins import object
- import json
- 
- from .common import SearpcError
-diff --git pysearpc/test_pysearpc.py pysearpc/test_pysearpc.py
-index a9c6f8b..64a455d 100755
---- pysearpc/test_pysearpc.py
-+++ pysearpc/test_pysearpc.py
-@@ -1,7 +1,6 @@
- #!/usr/bin/env python
- #coding: UTF-8
- 
--from builtins import object
- import json
- import logging
- import os
-diff --git pysearpc/transport.py pysearpc/transport.py
-index 3c6e821..3deb42c 100644
---- pysearpc/transport.py
-+++ pysearpc/transport.py
-@@ -1,5 +1,3 @@
--
--from builtins import object
- class SearpcTransport(object):
-     """
-     A transport is repsonsible to send the serialized request to the
-diff --git pysearpc/utils.py pysearpc/utils.py
-index 2aeda93..451ad4e 100644
---- pysearpc/utils.py
-+++ pysearpc/utils.py
-@@ -1,4 +1,3 @@
--from builtins import bytes
- import os
- import socket
- 
--- 
-2.30.0
-
diff --git a/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch
new file mode 100644
index 000000000000..8064ee3aeb5d
--- /dev/null
+++ b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch
@@ -0,0 +1,20 @@
+  Seafile sources sometimes include searpc-client.h an extern "C" block,
+  and recent versions of glib.h don't tolerate that. This is the easy fix,
+  until such time as the source is fixed upstream.
+--- lib/searpc-client.h~	2020-06-18 05:23:11.000000000 +0200
++++ 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 <glib.h>
+ #include <glib-object.h>
++#ifdef __cplusplus
++}
++#endif
+ #include <jansson.h>
+ 
+ #ifndef DFT_DOMAIN
diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template
index 02273e1ef58d..22fbb7987d06 100644
--- a/srcpkgs/libsearpc/template
+++ b/srcpkgs/libsearpc/template
@@ -1,18 +1,21 @@
 # Template file for 'libsearpc'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=libsearpc
-version=3.2.0
-revision=4
+# 3.2-latest (as of 2021-04-10)
+version=3.2.0.20200318
+revision=1
+_gitrev=50ff08b03c7cec8e10b35ba438633b9fe08a8d90
+wrksrc="${pkgname}-${_gitrev}"
 build_style=gnu-configure
-configure_args="PYTHON=python3 --disable-static --disable-compile-demo"
+configure_args="--with-python3 --disable-static --disable-compile-demo"
 hostmakedepends="automake libtool pkg-config python3 glib-devel"
 makedepends="libglib-devel jansson-devel"
 short_desc="Seafile RPC library"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later, Apache-2.0"
 homepage="https://seafile.com"
-distfiles="https://github.com/haiwen/libsearpc/archive/v${version}.tar.gz"
-checksum=cd00197fcc40b45b1d5e892b2d08dfa5947f737e0d80f3ef26419334e75b0bff
+distfiles="https://github.com/haiwen/libsearpc/archive/${_gitrev}.tar.gz"
+checksum=2a58894cefbc1d7398581fc58103261688c93a9cf63f11afc5e92142ed948c00
 python_version=3
 
 pre_configure() {

From ee6d9c2f24738c1d4a77d2c1d25b07d293946405 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:17:49 +0200
Subject: [PATCH 2/3] seafile-libclient: update to 8.0.1

---
 srcpkgs/seafile-libclient/template | 6 +++---
 srcpkgs/seafile-libclient/update   | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/seafile-libclient/update

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index db394362f188..5a462985b88d 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -1,8 +1,8 @@
 # Template file for 'seafile-libclient'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
-version=7.0.10
-revision=2
+version=8.0.1
+revision=1
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 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=9ac0a1c25e6f2bf874b5b080a165319f29cb3d03f044da8db8aed8412c8b4f45
+checksum=117e686301f32e91d46b16453c43eb959cbd818f8c28ee3a594705bd103e59b9
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/seafile-libclient/update b/srcpkgs/seafile-libclient/update
new file mode 100644
index 000000000000..0e3392c2cad0
--- /dev/null
+++ b/srcpkgs/seafile-libclient/update
@@ -0,0 +1,4 @@
+# upstream sometimes retag source
+# use 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)'

From 8edee9aa32e7b702ec445a3f813d05cebb16e64b Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:19:17 +0200
Subject: [PATCH 3/3] seafile-client-qt: update to 8.0.1

Remove libressl patch.

Add depend for patched libsearpc-devel.
---
 srcpkgs/seafile-client-qt/patches/libressl.patch | 11 -----------
 srcpkgs/seafile-client-qt/template               |  6 +++---
 srcpkgs/seafile-client-qt/update                 |  8 ++++----
 3 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/seafile-client-qt/patches/libressl.patch

diff --git a/srcpkgs/seafile-client-qt/patches/libressl.patch b/srcpkgs/seafile-client-qt/patches/libressl.patch
deleted file mode 100644
index 1774719fa34a..000000000000
--- a/srcpkgs/seafile-client-qt/patches/libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/utils/rsa.cpp.orig
-+++ src/utils/rsa.cpp
-@@ -13,7 +13,7 @@
- 
- /* Forward compatibility functions if libssl < 1.1.0. */
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template
index c0a475106e45..8d63b5259d52 100644
--- a/srcpkgs/seafile-client-qt/template
+++ b/srcpkgs/seafile-client-qt/template
@@ -1,20 +1,20 @@
 # Template file for 'seafile-client-qt'
 pkgname=seafile-client-qt
-version=7.0.10
+version=8.0.1
 revision=1
 _sourcename="seafile-client"
 wrksrc="${_sourcename}-${version}"
 build_style=cmake
 configure_args="$(vopt_if shibboleth '-DBUILD_SHIBBOLETH_SUPPORT=ON -DUSE_QT_WEBKIT=ON')"
 hostmakedepends="pkg-config"
-makedepends="qt5-tools-devel seafile-libclient-devel sqlite-devel libevent-devel
+makedepends="qt5-tools-devel seafile-libclient-devel sqlite-devel libevent-devel libsearpc-devel>=3.2.0.20200318
  $(vopt_if shibboleth 'qt5-webkit-devel')"
 short_desc="Cloud storage system - Qt graphical client"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="Apache-2.0"
 homepage="https://seafile.com"
 distfiles="https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"
-checksum=3b373e13fd56fd1cb768db598302f19669919194a3d2a54b0eb929ff04310333
+checksum=49bd391549b54f1cf043026862e765c8c27e84be07835c8ffc21d81570968367
 
 build_options="shibboleth"
 desc_option_shibboleth="Build with Shibboleth support"
diff --git a/srcpkgs/seafile-client-qt/update b/srcpkgs/seafile-client-qt/update
index 8a583259f495..31d02e1d2c35 100644
--- a/srcpkgs/seafile-client-qt/update
+++ b/srcpkgs/seafile-client-qt/update
@@ -1,4 +1,4 @@
-# upstream sometimes retag source until official announcement.
-# rely on windows client availabiliy to detect new version.
-site=https://download.seadrive.org/
-pattern='<Key>seafile-\K[\d.]+(?=-en.msi</Key>)'
+# upstream sometimes retag source
+# use 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)'

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (8 preceding siblings ...)
  2021-04-24 22:09 ` [PR REVIEW] " yopito
@ 2021-04-24 22:09 ` yopito
  2021-04-24 22:09 ` yopito
                   ` (12 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: yopito @ 2021-04-24 22:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#discussion_r619715282

Comment:
not that understandable.Furthermore, the patch content make me think the opposite ?

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (7 preceding siblings ...)
  2021-04-24 15:53 ` [PR PATCH] [Updated] seafile-{client-qt,libclient}: update to 8.0.1 lonwillett
@ 2021-04-24 22:09 ` yopito
  2021-04-24 22:09 ` yopito
                   ` (13 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: yopito @ 2021-04-24 22:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 271 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#discussion_r619715479

Comment:
`libsearpc-devel` dependancy is uneeded since provided via `seafile-libclient-devel`.
version's contrainst is uselees anyway

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (9 preceding siblings ...)
  2021-04-24 22:09 ` yopito
@ 2021-04-24 22:09 ` yopito
  2021-04-24 22:09 ` yopito
                   ` (11 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: yopito @ 2021-04-24 22:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 249 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#discussion_r619715779

Comment:
```suggestion
# use upstream's Ubuntu focal repo to detect new version.
```
(nice change by the way)

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (10 preceding siblings ...)
  2021-04-24 22:09 ` yopito
@ 2021-04-24 22:09 ` yopito
  2021-04-24 23:52 ` lonwillett
                   ` (10 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: yopito @ 2021-04-24 22:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#discussion_r619715851

Comment:
```suggestion
# use upstream's Ubuntu focal repo to detect new version.
```

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (11 preceding siblings ...)
  2021-04-24 22:09 ` yopito
@ 2021-04-24 23:52 ` lonwillett
  2021-04-24 23:52 ` lonwillett
                   ` (9 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: lonwillett @ 2021-04-24 23:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

New review comment by lonwillett on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#discussion_r619724687

Comment:
Oops. Typo. I'll rewrite, somewhat more clearly I hope.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (12 preceding siblings ...)
  2021-04-24 23:52 ` lonwillett
@ 2021-04-24 23:52 ` lonwillett
  2021-04-25  0:09 ` [PR PATCH] [Updated] " lonwillett
                   ` (8 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: lonwillett @ 2021-04-24 23:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 401 bytes --]

New review comment by lonwillett on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#discussion_r619724730

Comment:
The version constraint was added to prevent attempting to build against an older (unpatched) version of libsearpc, since such a build will fail. The seafile-libclient package will itself build without the patch. Should I remove this constraint anyway?

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (13 preceding siblings ...)
  2021-04-24 23:52 ` lonwillett
@ 2021-04-25  0:09 ` lonwillett
  2021-04-25  9:40 ` [PR REVIEW] " yopito
                   ` (7 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: lonwillett @ 2021-04-25  0:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 783 bytes --]

There is an updated pull request by lonwillett against master on the void-packages repository

https://github.com/lonwillett/void-packages seafile-update
https://github.com/void-linux/void-packages/pull/30384

seafile-{client-qt,libclient}: update to 8.0.1

#### General
- [ X] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR



A patch file from https://github.com/void-linux/void-packages/pull/30384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-seafile-update-30384.patch --]
[-- Type: text/x-diff, Size: 11249 bytes --]

From 6e1cf0d3f393432aa71ca1c6924e10bb2794c8e2 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:14:36 +0200
Subject: [PATCH 1/3] libsearpc: update to 3.2.0.20200318

Update to 3.2.0.20200318 (i.e. 3.2-latest).

Remove patch to support python3.

Add patch to support include of header file within extern "C".
---
 .../patches/001-python3-support.patch         | 114 ------------------
 .../patches/01-glib-include-kludge.patch      |  26 ++++
 srcpkgs/libsearpc/template                    |  13 +-
 3 files changed, 34 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/libsearpc/patches/001-python3-support.patch
 create mode 100644 srcpkgs/libsearpc/patches/01-glib-include-kludge.patch

diff --git a/srcpkgs/libsearpc/patches/001-python3-support.patch b/srcpkgs/libsearpc/patches/001-python3-support.patch
deleted file mode 100644
index 7b4ae20c2819..000000000000
--- a/srcpkgs/libsearpc/patches/001-python3-support.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-upstream: yes
-
-From b0079d2a0c3ce0cb4698a162498b108244726912 Mon Sep 17 00:00:00 2001
-From: Xiangyue Cai <caixiangyue007@gmail.com>
-Date: Mon, 8 Jun 2020 15:09:06 +0800
-Subject: [PATCH] configure with python3 (#53)
-
-* configure with python3
-
-* remove future
----
- configure.ac              | 2 +-
- pysearpc/client.py        | 1 -
- pysearpc/named_pipe.py    | 3 ---
- pysearpc/pygencode.py     | 3 ---
- pysearpc/server.py        | 2 --
- pysearpc/test_pysearpc.py | 1 -
- pysearpc/transport.py     | 2 --
- pysearpc/utils.py         | 1 -
- 8 files changed, 1 insertion(+), 14 deletions(-)
-
-diff --git configure.ac configure.ac
-index 53d7438..9c2159a 100644
---- configure.ac
-+++ configure.ac
-@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED])
- AC_SUBST(JANSSON_CFLAGS)
- AC_SUBST(JANSSON_LIBS)
- 
--AM_PATH_PYTHON([2.4])
-+AM_PATH_PYTHON([3.5])
- if test "$bwin32" = true; then
-    if test x$PYTHON_DIR != x; then
-    # set pyexecdir to somewhere like /c/Python26/Lib/site-packages
-diff --git pysearpc/client.py pysearpc/client.py
-index 20e5535..3650cb1 100644
---- pysearpc/client.py
-+++ pysearpc/client.py
-@@ -1,4 +1,3 @@
--from builtins import object
- import json
- from .common import SearpcError
- 
-diff --git pysearpc/named_pipe.py pysearpc/named_pipe.py
-index a0ca619..73df576 100644
---- pysearpc/named_pipe.py
-+++ pysearpc/named_pipe.py
-@@ -2,9 +2,6 @@
- RPC client/server implementation based on named pipe transport.
- """
- 
--from future import standard_library
--standard_library.install_aliases()
--from builtins import object
- import json
- import logging
- import os
-diff --git pysearpc/pygencode.py pysearpc/pygencode.py
-index 62a635b..8c718ce 100644
---- pysearpc/pygencode.py
-+++ pysearpc/pygencode.py
-@@ -1,8 +1,5 @@
- #!/usr/bin/python
- 
--
--from __future__ import print_function
--from builtins import str
- import string
- import sys
- 
-diff --git pysearpc/server.py pysearpc/server.py
-index a7ec7be..94d9bac 100644
---- pysearpc/server.py
-+++ pysearpc/server.py
-@@ -1,5 +1,3 @@
--from builtins import str
--from builtins import object
- import json
- 
- from .common import SearpcError
-diff --git pysearpc/test_pysearpc.py pysearpc/test_pysearpc.py
-index a9c6f8b..64a455d 100755
---- pysearpc/test_pysearpc.py
-+++ pysearpc/test_pysearpc.py
-@@ -1,7 +1,6 @@
- #!/usr/bin/env python
- #coding: UTF-8
- 
--from builtins import object
- import json
- import logging
- import os
-diff --git pysearpc/transport.py pysearpc/transport.py
-index 3c6e821..3deb42c 100644
---- pysearpc/transport.py
-+++ pysearpc/transport.py
-@@ -1,5 +1,3 @@
--
--from builtins import object
- class SearpcTransport(object):
-     """
-     A transport is repsonsible to send the serialized request to the
-diff --git pysearpc/utils.py pysearpc/utils.py
-index 2aeda93..451ad4e 100644
---- pysearpc/utils.py
-+++ pysearpc/utils.py
-@@ -1,4 +1,3 @@
--from builtins import bytes
- import os
- import socket
- 
--- 
-2.30.0
-
diff --git a/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch
new file mode 100644
index 000000000000..a08f97315c5d
--- /dev/null
+++ b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch
@@ -0,0 +1,26 @@
+  Seafile sources sometimes include searpc-client.h in an extern "C" block.
+  It then includes glib.h and glib-object.h, and recent versions of glib don't
+  work when included within extern "C".
+
+  This is the easy fix: wrap the include of glib headers in extern "C++" to undo
+  the extern "C".
+
+  Upstream is aware of the problem, and should have a fix soon, at which time this
+  kludge won't be needed anymore.
+--- lib/searpc-client.h~	2020-06-18 05:23:11.000000000 +0200
++++ 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 <glib.h>
+ #include <glib-object.h>
++#ifdef __cplusplus
++}
++#endif
+ #include <jansson.h>
+ 
+ #ifndef DFT_DOMAIN
diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template
index 02273e1ef58d..22fbb7987d06 100644
--- a/srcpkgs/libsearpc/template
+++ b/srcpkgs/libsearpc/template
@@ -1,18 +1,21 @@
 # Template file for 'libsearpc'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=libsearpc
-version=3.2.0
-revision=4
+# 3.2-latest (as of 2021-04-10)
+version=3.2.0.20200318
+revision=1
+_gitrev=50ff08b03c7cec8e10b35ba438633b9fe08a8d90
+wrksrc="${pkgname}-${_gitrev}"
 build_style=gnu-configure
-configure_args="PYTHON=python3 --disable-static --disable-compile-demo"
+configure_args="--with-python3 --disable-static --disable-compile-demo"
 hostmakedepends="automake libtool pkg-config python3 glib-devel"
 makedepends="libglib-devel jansson-devel"
 short_desc="Seafile RPC library"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later, Apache-2.0"
 homepage="https://seafile.com"
-distfiles="https://github.com/haiwen/libsearpc/archive/v${version}.tar.gz"
-checksum=cd00197fcc40b45b1d5e892b2d08dfa5947f737e0d80f3ef26419334e75b0bff
+distfiles="https://github.com/haiwen/libsearpc/archive/${_gitrev}.tar.gz"
+checksum=2a58894cefbc1d7398581fc58103261688c93a9cf63f11afc5e92142ed948c00
 python_version=3
 
 pre_configure() {

From 6c34ad5ad88dfba9a04ba8487f83231d9a3f362a Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:17:49 +0200
Subject: [PATCH 2/3] seafile-libclient: update to 8.0.1

---
 srcpkgs/seafile-libclient/template | 6 +++---
 srcpkgs/seafile-libclient/update   | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/seafile-libclient/update

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index db394362f188..5a462985b88d 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -1,8 +1,8 @@
 # Template file for 'seafile-libclient'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
-version=7.0.10
-revision=2
+version=8.0.1
+revision=1
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 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=9ac0a1c25e6f2bf874b5b080a165319f29cb3d03f044da8db8aed8412c8b4f45
+checksum=117e686301f32e91d46b16453c43eb959cbd818f8c28ee3a594705bd103e59b9
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/seafile-libclient/update b/srcpkgs/seafile-libclient/update
new file mode 100644
index 000000000000..a26f83a4fe01
--- /dev/null
+++ b/srcpkgs/seafile-libclient/update
@@ -0,0 +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-daemon/'
+pattern='seafile-daemon_\K[\d.]+(?=_amd64.deb)'

From a2473079c7c71a1437bfdb01795ec260c239f7f0 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:19:17 +0200
Subject: [PATCH 3/3] seafile-client-qt: update to 8.0.1

Remove libressl patch.

Add depend for patched libsearpc-devel.
---
 srcpkgs/seafile-client-qt/patches/libressl.patch | 11 -----------
 srcpkgs/seafile-client-qt/template               |  6 +++---
 srcpkgs/seafile-client-qt/update                 |  8 ++++----
 3 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/seafile-client-qt/patches/libressl.patch

diff --git a/srcpkgs/seafile-client-qt/patches/libressl.patch b/srcpkgs/seafile-client-qt/patches/libressl.patch
deleted file mode 100644
index 1774719fa34a..000000000000
--- a/srcpkgs/seafile-client-qt/patches/libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/utils/rsa.cpp.orig
-+++ src/utils/rsa.cpp
-@@ -13,7 +13,7 @@
- 
- /* Forward compatibility functions if libssl < 1.1.0. */
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template
index c0a475106e45..8d63b5259d52 100644
--- a/srcpkgs/seafile-client-qt/template
+++ b/srcpkgs/seafile-client-qt/template
@@ -1,20 +1,20 @@
 # Template file for 'seafile-client-qt'
 pkgname=seafile-client-qt
-version=7.0.10
+version=8.0.1
 revision=1
 _sourcename="seafile-client"
 wrksrc="${_sourcename}-${version}"
 build_style=cmake
 configure_args="$(vopt_if shibboleth '-DBUILD_SHIBBOLETH_SUPPORT=ON -DUSE_QT_WEBKIT=ON')"
 hostmakedepends="pkg-config"
-makedepends="qt5-tools-devel seafile-libclient-devel sqlite-devel libevent-devel
+makedepends="qt5-tools-devel seafile-libclient-devel sqlite-devel libevent-devel libsearpc-devel>=3.2.0.20200318
  $(vopt_if shibboleth 'qt5-webkit-devel')"
 short_desc="Cloud storage system - Qt graphical client"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="Apache-2.0"
 homepage="https://seafile.com"
 distfiles="https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"
-checksum=3b373e13fd56fd1cb768db598302f19669919194a3d2a54b0eb929ff04310333
+checksum=49bd391549b54f1cf043026862e765c8c27e84be07835c8ffc21d81570968367
 
 build_options="shibboleth"
 desc_option_shibboleth="Build with Shibboleth support"
diff --git a/srcpkgs/seafile-client-qt/update b/srcpkgs/seafile-client-qt/update
index 8a583259f495..7c03301dc426 100644
--- a/srcpkgs/seafile-client-qt/update
+++ b/srcpkgs/seafile-client-qt/update
@@ -1,4 +1,4 @@
-# upstream sometimes retag source until official announcement.
-# rely on windows client availabiliy to detect new version.
-site=https://download.seadrive.org/
-pattern='<Key>seafile-\K[\d.]+(?=-en.msi</Key>)'
+# 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)'

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (14 preceding siblings ...)
  2021-04-25  0:09 ` [PR PATCH] [Updated] " lonwillett
@ 2021-04-25  9:40 ` yopito
  2021-04-25 10:01 ` yopito
                   ` (6 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: yopito @ 2021-04-25  9:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#discussion_r619785252

Comment:
please point upstream's issue with a link if available, much more concise.
juste like `upstream issue: http://<the-url>` 

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (15 preceding siblings ...)
  2021-04-25  9:40 ` [PR REVIEW] " yopito
@ 2021-04-25 10:01 ` yopito
  2021-04-25 10:03 ` yopito
                   ` (5 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: yopito @ 2021-04-25 10:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1059 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#discussion_r619788021

Comment:
uneeded: runtime constraints are managed either on producing binary package (looks after common/shlibs) and while installing/upgrading.
Since your PR update libsearprc, package upgrade will find it (I've built all this PR locally **without** your constraint "`ibsearpc-devel>=3.2.0.20200318`"):
```
$ sudo xbps-install -Su --repo=/build/packages/hostdir/binpkgs/pr/30384.seafile.8.0.1
[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/musl/x86_64-musl-repodata' ...

Name              Action    Version           New version            Download size
libsearpc         update    3.2.0_4           3.2.0.20200318_1       - 
seafile-client-qt update    7.0.10_1          8.0.1_1                - 
seafile-libclient update    7.0.10_2          8.0.1_1                - 

Size required on disk:        4414KB
Space available on disk:      4998MB

Do you want to continue? [Y/n] 
```


^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (16 preceding siblings ...)
  2021-04-25 10:01 ` yopito
@ 2021-04-25 10:03 ` yopito
  2021-04-25 10:25 ` [PR REVIEW] " yopito
                   ` (4 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: yopito @ 2021-04-25 10:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#issuecomment-826296053

Comment:
BTW, basic runtime test is fine for me.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (17 preceding siblings ...)
  2021-04-25 10:03 ` yopito
@ 2021-04-25 10:25 ` yopito
  2021-04-25 10:28 ` [PR PATCH] [Updated] " lonwillett
                   ` (3 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: yopito @ 2021-04-25 10:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#discussion_r619788021

Comment:
uneeded: runtime constraints are managed either on producing binary package (looks after common/shlibs for lib) and while installing/upgrading.
Edit: about common/shlibs

Since your PR update libsearprc, package upgrade will find it.
Simulating (a kind of) what will happens once this PR merged and officially build: I've built all this PR locally **without** your constraint "`libsearpc-devel>=3.2.0.20200318`", so upgrade looks like:
Edit: reword to make me understandable
```
$ sudo xbps-install -Su --repo=/build/packages/hostdir/binpkgs/pr/30384.seafile.8.0.1
[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/musl/x86_64-musl-repodata' ...

Name              Action    Version           New version            Download size
libsearpc         update    3.2.0_4           3.2.0.20200318_1       - 
seafile-client-qt update    7.0.10_1          8.0.1_1                - 
seafile-libclient update    7.0.10_2          8.0.1_1                - 

Size required on disk:        4414KB
Space available on disk:      4998MB

Do you want to continue? [Y/n] 
```


^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (18 preceding siblings ...)
  2021-04-25 10:25 ` [PR REVIEW] " yopito
@ 2021-04-25 10:28 ` lonwillett
  2021-04-26 18:13 ` yopito
                   ` (2 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: lonwillett @ 2021-04-25 10:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 783 bytes --]

There is an updated pull request by lonwillett against master on the void-packages repository

https://github.com/lonwillett/void-packages seafile-update
https://github.com/void-linux/void-packages/pull/30384

seafile-{client-qt,libclient}: update to 8.0.1

#### General
- [ X] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR



A patch file from https://github.com/void-linux/void-packages/pull/30384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-seafile-update-30384.patch --]
[-- Type: text/x-diff, Size: 10609 bytes --]

From 5f3a0327a308449d5bd9d9e6723bb563c7be9af8 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:14:36 +0200
Subject: [PATCH 1/3] libsearpc: update to 3.2.0.20200318

Update to 3.2.0.20200318 (i.e. 3.2-latest).

Remove patch to support python3.

Add patch to support include of header file within extern "C".
---
 .../patches/001-python3-support.patch         | 114 ------------------
 .../patches/01-glib-include-kludge.patch      |  21 ++++
 srcpkgs/libsearpc/template                    |  13 +-
 3 files changed, 29 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/libsearpc/patches/001-python3-support.patch
 create mode 100644 srcpkgs/libsearpc/patches/01-glib-include-kludge.patch

diff --git a/srcpkgs/libsearpc/patches/001-python3-support.patch b/srcpkgs/libsearpc/patches/001-python3-support.patch
deleted file mode 100644
index 7b4ae20c2819..000000000000
--- a/srcpkgs/libsearpc/patches/001-python3-support.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-upstream: yes
-
-From b0079d2a0c3ce0cb4698a162498b108244726912 Mon Sep 17 00:00:00 2001
-From: Xiangyue Cai <caixiangyue007@gmail.com>
-Date: Mon, 8 Jun 2020 15:09:06 +0800
-Subject: [PATCH] configure with python3 (#53)
-
-* configure with python3
-
-* remove future
----
- configure.ac              | 2 +-
- pysearpc/client.py        | 1 -
- pysearpc/named_pipe.py    | 3 ---
- pysearpc/pygencode.py     | 3 ---
- pysearpc/server.py        | 2 --
- pysearpc/test_pysearpc.py | 1 -
- pysearpc/transport.py     | 2 --
- pysearpc/utils.py         | 1 -
- 8 files changed, 1 insertion(+), 14 deletions(-)
-
-diff --git configure.ac configure.ac
-index 53d7438..9c2159a 100644
---- configure.ac
-+++ configure.ac
-@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED])
- AC_SUBST(JANSSON_CFLAGS)
- AC_SUBST(JANSSON_LIBS)
- 
--AM_PATH_PYTHON([2.4])
-+AM_PATH_PYTHON([3.5])
- if test "$bwin32" = true; then
-    if test x$PYTHON_DIR != x; then
-    # set pyexecdir to somewhere like /c/Python26/Lib/site-packages
-diff --git pysearpc/client.py pysearpc/client.py
-index 20e5535..3650cb1 100644
---- pysearpc/client.py
-+++ pysearpc/client.py
-@@ -1,4 +1,3 @@
--from builtins import object
- import json
- from .common import SearpcError
- 
-diff --git pysearpc/named_pipe.py pysearpc/named_pipe.py
-index a0ca619..73df576 100644
---- pysearpc/named_pipe.py
-+++ pysearpc/named_pipe.py
-@@ -2,9 +2,6 @@
- RPC client/server implementation based on named pipe transport.
- """
- 
--from future import standard_library
--standard_library.install_aliases()
--from builtins import object
- import json
- import logging
- import os
-diff --git pysearpc/pygencode.py pysearpc/pygencode.py
-index 62a635b..8c718ce 100644
---- pysearpc/pygencode.py
-+++ pysearpc/pygencode.py
-@@ -1,8 +1,5 @@
- #!/usr/bin/python
- 
--
--from __future__ import print_function
--from builtins import str
- import string
- import sys
- 
-diff --git pysearpc/server.py pysearpc/server.py
-index a7ec7be..94d9bac 100644
---- pysearpc/server.py
-+++ pysearpc/server.py
-@@ -1,5 +1,3 @@
--from builtins import str
--from builtins import object
- import json
- 
- from .common import SearpcError
-diff --git pysearpc/test_pysearpc.py pysearpc/test_pysearpc.py
-index a9c6f8b..64a455d 100755
---- pysearpc/test_pysearpc.py
-+++ pysearpc/test_pysearpc.py
-@@ -1,7 +1,6 @@
- #!/usr/bin/env python
- #coding: UTF-8
- 
--from builtins import object
- import json
- import logging
- import os
-diff --git pysearpc/transport.py pysearpc/transport.py
-index 3c6e821..3deb42c 100644
---- pysearpc/transport.py
-+++ pysearpc/transport.py
-@@ -1,5 +1,3 @@
--
--from builtins import object
- class SearpcTransport(object):
-     """
-     A transport is repsonsible to send the serialized request to the
-diff --git pysearpc/utils.py pysearpc/utils.py
-index 2aeda93..451ad4e 100644
---- pysearpc/utils.py
-+++ pysearpc/utils.py
-@@ -1,4 +1,3 @@
--from builtins import bytes
- import os
- import socket
- 
--- 
-2.30.0
-
diff --git a/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch
new file mode 100644
index 000000000000..a899439cdfbd
--- /dev/null
+++ b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch
@@ -0,0 +1,21 @@
+  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.
+--- lib/searpc-client.h~	2020-06-18 05:23:11.000000000 +0200
++++ 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 <glib.h>
+ #include <glib-object.h>
++#ifdef __cplusplus
++}
++#endif
+ #include <jansson.h>
+ 
+ #ifndef DFT_DOMAIN
diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template
index 02273e1ef58d..22fbb7987d06 100644
--- a/srcpkgs/libsearpc/template
+++ b/srcpkgs/libsearpc/template
@@ -1,18 +1,21 @@
 # Template file for 'libsearpc'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=libsearpc
-version=3.2.0
-revision=4
+# 3.2-latest (as of 2021-04-10)
+version=3.2.0.20200318
+revision=1
+_gitrev=50ff08b03c7cec8e10b35ba438633b9fe08a8d90
+wrksrc="${pkgname}-${_gitrev}"
 build_style=gnu-configure
-configure_args="PYTHON=python3 --disable-static --disable-compile-demo"
+configure_args="--with-python3 --disable-static --disable-compile-demo"
 hostmakedepends="automake libtool pkg-config python3 glib-devel"
 makedepends="libglib-devel jansson-devel"
 short_desc="Seafile RPC library"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later, Apache-2.0"
 homepage="https://seafile.com"
-distfiles="https://github.com/haiwen/libsearpc/archive/v${version}.tar.gz"
-checksum=cd00197fcc40b45b1d5e892b2d08dfa5947f737e0d80f3ef26419334e75b0bff
+distfiles="https://github.com/haiwen/libsearpc/archive/${_gitrev}.tar.gz"
+checksum=2a58894cefbc1d7398581fc58103261688c93a9cf63f11afc5e92142ed948c00
 python_version=3
 
 pre_configure() {

From f121343988a5af25ff5dfe0086f19ce73dacb7a8 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:17:49 +0200
Subject: [PATCH 2/3] seafile-libclient: update to 8.0.1

---
 srcpkgs/seafile-libclient/template | 6 +++---
 srcpkgs/seafile-libclient/update   | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/seafile-libclient/update

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index db394362f188..5a462985b88d 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -1,8 +1,8 @@
 # Template file for 'seafile-libclient'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
-version=7.0.10
-revision=2
+version=8.0.1
+revision=1
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 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=9ac0a1c25e6f2bf874b5b080a165319f29cb3d03f044da8db8aed8412c8b4f45
+checksum=117e686301f32e91d46b16453c43eb959cbd818f8c28ee3a594705bd103e59b9
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/seafile-libclient/update b/srcpkgs/seafile-libclient/update
new file mode 100644
index 000000000000..a26f83a4fe01
--- /dev/null
+++ b/srcpkgs/seafile-libclient/update
@@ -0,0 +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-daemon/'
+pattern='seafile-daemon_\K[\d.]+(?=_amd64.deb)'

From 11fc504341f598f592fe8c4e15cb3b44746dd1ce Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:19:17 +0200
Subject: [PATCH 3/3] seafile-client-qt: update to 8.0.1

Remove libressl patch.
---
 srcpkgs/seafile-client-qt/patches/libressl.patch | 11 -----------
 srcpkgs/seafile-client-qt/template               |  4 ++--
 srcpkgs/seafile-client-qt/update                 |  8 ++++----
 3 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/seafile-client-qt/patches/libressl.patch

diff --git a/srcpkgs/seafile-client-qt/patches/libressl.patch b/srcpkgs/seafile-client-qt/patches/libressl.patch
deleted file mode 100644
index 1774719fa34a..000000000000
--- a/srcpkgs/seafile-client-qt/patches/libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/utils/rsa.cpp.orig
-+++ src/utils/rsa.cpp
-@@ -13,7 +13,7 @@
- 
- /* Forward compatibility functions if libssl < 1.1.0. */
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template
index c0a475106e45..b2e16639780a 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=7.0.10
+version=8.0.1
 revision=1
 _sourcename="seafile-client"
 wrksrc="${_sourcename}-${version}"
@@ -14,7 +14,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="Apache-2.0"
 homepage="https://seafile.com"
 distfiles="https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"
-checksum=3b373e13fd56fd1cb768db598302f19669919194a3d2a54b0eb929ff04310333
+checksum=49bd391549b54f1cf043026862e765c8c27e84be07835c8ffc21d81570968367
 
 build_options="shibboleth"
 desc_option_shibboleth="Build with Shibboleth support"
diff --git a/srcpkgs/seafile-client-qt/update b/srcpkgs/seafile-client-qt/update
index 8a583259f495..7c03301dc426 100644
--- a/srcpkgs/seafile-client-qt/update
+++ b/srcpkgs/seafile-client-qt/update
@@ -1,4 +1,4 @@
-# upstream sometimes retag source until official announcement.
-# rely on windows client availabiliy to detect new version.
-site=https://download.seadrive.org/
-pattern='<Key>seafile-\K[\d.]+(?=-en.msi</Key>)'
+# 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)'

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (19 preceding siblings ...)
  2021-04-25 10:28 ` [PR PATCH] [Updated] " lonwillett
@ 2021-04-26 18:13 ` yopito
  2021-04-26 19:12 ` ericonr
  2021-04-26 19:12 ` [PR PATCH] [Merged]: " ericonr
  22 siblings, 0 replies; 24+ messages in thread
From: yopito @ 2021-04-26 18:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#issuecomment-827045494

Comment:
@pkg-committers: fine for me.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (20 preceding siblings ...)
  2021-04-26 18:13 ` yopito
@ 2021-04-26 19:12 ` ericonr
  2021-04-26 19:12 ` [PR PATCH] [Merged]: " ericonr
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2021-04-26 19:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30384#issuecomment-827079766

Comment:
@yopito thanks for the review, and @lonwillett thanks for the update!

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Merged]: seafile-{client-qt,libclient}: update to 8.0.1
  2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
                   ` (21 preceding siblings ...)
  2021-04-26 19:12 ` ericonr
@ 2021-04-26 19:12 ` ericonr
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2021-04-26 19:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 614 bytes --]

There's a merged pull request on the void-packages repository

seafile-{client-qt,libclient}: update to 8.0.1
https://github.com/void-linux/void-packages/pull/30384

Description:

#### General
- [ X] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR



^ permalink raw reply	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2021-04-26 19:12 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-20 12:25 [PR PATCH] Seafile update lonwillett
2021-04-20 14:12 ` [PR PATCH] [Updated] " lonwillett
2021-04-23 22:52 ` yopito
2021-04-23 22:56 ` yopito
2021-04-24  7:03 ` lonwillett
2021-04-24  7:22 ` lonwillett
2021-04-24 14:10 ` yopito
2021-04-24 14:49 ` [PR PATCH] [Updated] " lonwillett
2021-04-24 15:53 ` [PR PATCH] [Updated] seafile-{client-qt,libclient}: update to 8.0.1 lonwillett
2021-04-24 22:09 ` [PR REVIEW] " yopito
2021-04-24 22:09 ` yopito
2021-04-24 22:09 ` yopito
2021-04-24 22:09 ` yopito
2021-04-24 23:52 ` lonwillett
2021-04-24 23:52 ` lonwillett
2021-04-25  0:09 ` [PR PATCH] [Updated] " lonwillett
2021-04-25  9:40 ` [PR REVIEW] " yopito
2021-04-25 10:01 ` yopito
2021-04-25 10:03 ` yopito
2021-04-25 10:25 ` [PR REVIEW] " yopito
2021-04-25 10:28 ` [PR PATCH] [Updated] " lonwillett
2021-04-26 18:13 ` yopito
2021-04-26 19:12 ` ericonr
2021-04-26 19:12 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).