From 97fe0c95d8bfb7b0d2e8b03104afe9800448276d Mon Sep 17 00:00:00 2001 From: orbea Date: Sat, 8 Apr 2023 18:40:46 -0700 Subject: [PATCH] net-misc/seafile-client: New package Reverts b53527dc29b4d565d9d0f5512f6ab979030c21be Upstream-PR: https://github.com/haiwen/seafile-client/pull/1452 Signed-off-by: orbea --- net-misc/seafile-client/Manifest | 4 ++ .../files/seafile-client-7.0.9-libressl.patch | 28 ++++++++++ .../files/seafile-client-7.0.9-qt-5.15.patch | 37 ++++++++++++ .../seafile-client-8.0.6-select-qt5.patch | 23 ++++++++ net-misc/seafile-client/metadata.xml | 18 ++++++ .../seafile-client-8.0.10.ebuild | 56 +++++++++++++++++++ .../seafile-client-8.0.9.ebuild | 56 +++++++++++++++++++ .../seafile-client-9.0.0.ebuild | 56 +++++++++++++++++++ .../seafile-client-9.0.1.ebuild | 56 +++++++++++++++++++ 9 files changed, 334 insertions(+) create mode 100644 net-misc/seafile-client/Manifest create mode 100644 net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch create mode 100644 net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch create mode 100644 net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch create mode 100644 net-misc/seafile-client/metadata.xml create mode 100644 net-misc/seafile-client/seafile-client-8.0.10.ebuild create mode 100644 net-misc/seafile-client/seafile-client-8.0.9.ebuild create mode 100644 net-misc/seafile-client/seafile-client-9.0.0.ebuild create mode 100644 net-misc/seafile-client/seafile-client-9.0.1.ebuild diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest new file mode 100644 index 00000000..aa53a69d --- /dev/null +++ b/net-misc/seafile-client/Manifest @@ -0,0 +1,4 @@ +DIST seafile-client-8.0.10.tar.gz 11718520 BLAKE2B b8163085c9973df6965b194c964d2b326d4faea3191bf9b62a147bd0a49670f1eb3d0758fbe6f822f99f54c95c32717d9c3533cbc15e71cd8251c1c6ef67f662 SHA512 c4efb1698ed6dfbf3199e4e03293035c8052bd66632a1d04d9020bd226cce748fbcfc8d90c10284c9b1ee6bad20546263a9e09819fc420365625a2fbd4f4a697 +DIST seafile-client-8.0.9.tar.gz 11716754 BLAKE2B 2087d2b31ce4696fdaaaa723da7a353c54ebebef86c84b62146d806692066165d0499f5fd6d3be108130d28c297020eafc3497be03131c8a8751f34f33eece90 SHA512 d0b55883f8d00138c092309994047652c6a5aa8b66182f83b6c852f1721794d9d8125da5fba282e9efdb92a0a97a55ecd6e225ab6a7916718a05ea2b7f4bd944 +DIST seafile-client-9.0.0.tar.gz 11714587 BLAKE2B 3432c5b1a971b794379953392689a8451335b1e31a23d09a762b181d66d99a8ee1a2694bcd0cdeb31e2d3c5d98e11d582c9464c11e558c9febb894361dfebfce SHA512 42975fcae3691ffa69671e39c75af1dd863f43cbab65f2022f3c4ee72462c6725107bda77856d16caa4db1e9b5e81c45fe629ffe362a88bbfae8fef558118cae +DIST seafile-client-9.0.1.tar.gz 11713910 BLAKE2B 9a9cd710327a853295c6320a2c161b96d8a359cc9eea0272b65a9c0749c4c25f2f7287b8312d1dd11a7740145a036a596f48ccc1fae850447133ea67fa454a10 SHA512 27533dfdd3657470e3eb3f80814bec7a9ae9176978941651104a526630d70c4747d4e859c16f7af9a046d3a7ae4152e0ba17f11106aa34bb1f0cfd05cba44f88 diff --git a/net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch b/net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch new file mode 100644 index 00000000..73e1752d --- /dev/null +++ b/net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch @@ -0,0 +1,28 @@ +From b5b1719c5b69c5c9f2396782ced71523d013446d Mon Sep 17 00:00:00 2001 +From: orbea +Date: Sat, 8 Apr 2023 18:25:37 -0700 +Subject: [PATCH] rsa: Fix the build with libressl 3.7 + +Newer versions of libressl no longer need this legacy code path. + +Patch from OpenBSD: + +https://github.com/openbsd/ports/blob/26afb45924c9faa3bbd31e76a21130bbad474994/net/seafile/client/patches/patch-src_utils_rsa_cpp +--- + src/utils/rsa.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/utils/rsa.cpp b/src/utils/rsa.cpp +index 350b79012..943a55f3b 100644 +--- a/src/utils/rsa.cpp ++++ b/src/utils/rsa.cpp +@@ -13,7 +13,8 @@ namespace { + + /* 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/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch b/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch new file mode 100644 index 00000000..ef9c2f74 --- /dev/null +++ b/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch @@ -0,0 +1,37 @@ +https://github.com/haiwen/seafile-client/pull/1297 + +From 86ebea086c6b78738b3140c922c909331d2b9a94 Mon Sep 17 00:00:00 2001 +From: Joffrey +Date: Fri, 29 May 2020 15:59:11 +0000 +Subject: [PATCH] Fix build with Qt5 v5.15.0 + +--- + src/ui/events-list-view.cpp | 1 + + src/ui/private-share-dialog.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/ui/events-list-view.cpp b/src/ui/events-list-view.cpp +index b1d04abb..09536b9e 100644 +--- a/src/ui/events-list-view.cpp ++++ b/src/ui/events-list-view.cpp +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + #include +diff --git a/src/ui/private-share-dialog.cpp b/src/ui/private-share-dialog.cpp +index 511d476b..284cc043 100644 +--- a/src/ui/private-share-dialog.cpp ++++ b/src/ui/private-share-dialog.cpp +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.26.2 + diff --git a/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch b/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch new file mode 100644 index 00000000..4d3a3d17 --- /dev/null +++ b/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1c4a4447..5747df46 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -133,14 +133,12 @@ ENDIF() + #################### + ###### BEGIN: QT configuration + #################### +-FIND_PROGRAM(qmake_executable NAMES qmake qmake.exe) +-EXECUTE_PROCESS(COMMAND +- bash -c "${qmake_executable} --version | grep -iE '^using qt version [0-9.]+' | awk '{print $4}'" +- OUTPUT_VARIABLE DETECTED_QT_VERSION +- OUTPUT_STRIP_TRAILING_WHITESPACE) ++FIND_PACKAGE(Qt5Core) ++SET(DETECTED_QT_VERSION ${Qt5Core_VERSION}) + MESSAGE("Qt version: ${DETECTED_QT_VERSION}") ++GET_TARGET_PROPERTY(QMAKE_EXECUTABLE_PATH Qt5::qmake IMPORTED_LOCATION) + EXECUTE_PROCESS(COMMAND +- bash -c "qmake --version|grep -iE '^using qt version [0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'" ++ bash -c "${QMAKE_EXECUTABLE_PATH} --version|grep -iE '^using qt version [0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'" + OUTPUT_VARIABLE QT_VERSION_MAJOR + OUTPUT_STRIP_TRAILING_WHITESPACE) + MESSAGE("QT_VERSION_MAJOR: ${QT_VERSION_MAJOR}") diff --git a/net-misc/seafile-client/metadata.xml b/net-misc/seafile-client/metadata.xml new file mode 100644 index 00000000..652f773a --- /dev/null +++ b/net-misc/seafile-client/metadata.xml @@ -0,0 +1,18 @@ + + + + + gentoo@retornaz.com + Quentin Retornaz + + + proxy-maint@gentoo.org + Proxy Maintainers + + + Build support for Shibboleth single sign-on + + + haiwen/seafile-client + + diff --git a/net-misc/seafile-client/seafile-client-8.0.10.ebuild b/net-misc/seafile-client/seafile-client-8.0.10.ebuild new file mode 100644 index 00000000..d3d9068f --- /dev/null +++ b/net-misc/seafile-client/seafile-client-8.0.10.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Upstream is moving tags repeatedly, then we use commit hash. +RELEASE_COMMIT="342002ab35791d217b4e45a04ede7135f301a5a4" + +inherit xdg cmake + +DESCRIPTION="Seafile desktop client" +HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" +SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="shibboleth test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/jansson:= + dev-libs/openssl:= + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + >=net-libs/libsearpc-3.2.0_p1 + ~net-misc/seafile-${PV} + sys-libs/zlib + virtual/opengl + elibc_musl? ( sys-libs/fts-standalone ) + shibboleth? ( dev-qt/qtwebengine:5[widgets] )" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 )" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( + "${FILESDIR}/${PN}-8.0.6-select-qt5.patch" + "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" + "${FILESDIR}/${PN}-7.0.9-libressl.patch" +) + +S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" + +src_configure() { + local mycmakeargs=( + -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" + -DBUILD_TESTING="$(usex test)" + ) + # 863554 + use elibc_musl && mycmakeargs+=( -DCMAKE_CXX_STANDARD_LIBRARIES="-lfts" ) + cmake_src_configure +} diff --git a/net-misc/seafile-client/seafile-client-8.0.9.ebuild b/net-misc/seafile-client/seafile-client-8.0.9.ebuild new file mode 100644 index 00000000..7b9668c5 --- /dev/null +++ b/net-misc/seafile-client/seafile-client-8.0.9.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Upstream is moving tags repeatedly, then we use commit hash. +RELEASE_COMMIT="5701514e89114b97795d4cfcbc3b59a1fd2f91e8" + +inherit xdg cmake + +DESCRIPTION="Seafile desktop client" +HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" +SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="shibboleth test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/jansson:= + dev-libs/openssl:= + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + >=net-libs/libsearpc-3.2.0_p1 + ~net-misc/seafile-${PV} + sys-libs/zlib + virtual/opengl + elibc_musl? ( sys-libs/fts-standalone ) + shibboleth? ( dev-qt/qtwebengine:5[widgets] )" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 )" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( + "${FILESDIR}/${PN}-8.0.6-select-qt5.patch" + "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" + "${FILESDIR}/${PN}-7.0.9-libressl.patch" +) + +S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" + +src_configure() { + local mycmakeargs=( + -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" + -DBUILD_TESTING="$(usex test)" + ) + # 863554 + use elibc_musl && mycmakeargs+=( -DCMAKE_CXX_STANDARD_LIBRARIES="-lfts" ) + cmake_src_configure +} diff --git a/net-misc/seafile-client/seafile-client-9.0.0.ebuild b/net-misc/seafile-client/seafile-client-9.0.0.ebuild new file mode 100644 index 00000000..65c4e2d9 --- /dev/null +++ b/net-misc/seafile-client/seafile-client-9.0.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Upstream is moving tags repeatedly, then we use commit hash. +RELEASE_COMMIT="f8ee58c29d7cb73dd8eaff7aad79540ec7611bdd" + +inherit xdg cmake + +DESCRIPTION="Seafile desktop client" +HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" +SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="shibboleth test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/jansson:= + dev-libs/openssl:= + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + >=net-libs/libsearpc-3.2.0_p1 + ~net-misc/seafile-${PV} + sys-libs/zlib + virtual/opengl + elibc_musl? ( sys-libs/fts-standalone ) + shibboleth? ( dev-qt/qtwebengine:5[widgets] )" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 )" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( + "${FILESDIR}/${PN}-8.0.6-select-qt5.patch" + "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" + "${FILESDIR}/${PN}-7.0.9-libressl.patch" +) + +S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" + +src_configure() { + local mycmakeargs=( + -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" + -DBUILD_TESTING="$(usex test)" + ) + # 863554 + use elibc_musl && mycmakeargs+=( -DCMAKE_CXX_STANDARD_LIBRARIES="-lfts" ) + cmake_src_configure +} diff --git a/net-misc/seafile-client/seafile-client-9.0.1.ebuild b/net-misc/seafile-client/seafile-client-9.0.1.ebuild new file mode 100644 index 00000000..4206015b --- /dev/null +++ b/net-misc/seafile-client/seafile-client-9.0.1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Upstream is moving tags repeatedly, then we use commit hash. +RELEASE_COMMIT="c72a52f34fea1ed58c977121edafdaee5c2588dd" + +inherit xdg cmake + +DESCRIPTION="Seafile desktop client" +HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" +SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="shibboleth test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/jansson:= + dev-libs/openssl:= + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + >=net-libs/libsearpc-3.2.0_p1 + ~net-misc/seafile-${PV} + sys-libs/zlib + virtual/opengl + elibc_musl? ( sys-libs/fts-standalone ) + shibboleth? ( dev-qt/qtwebengine:5[widgets] )" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 )" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( + "${FILESDIR}/${PN}-8.0.6-select-qt5.patch" + "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" + "${FILESDIR}/${PN}-7.0.9-libressl.patch" +) + +S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" + +src_configure() { + local mycmakeargs=( + -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" + -DBUILD_TESTING="$(usex test)" + ) + # 863554 + use elibc_musl && mycmakeargs+=( -DCMAKE_CXX_STANDARD_LIBRARIES="-lfts" ) + cmake_src_configure +}