From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A9D951382C5 for ; Sun, 2 May 2021 15:28:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB809E0933; Sun, 2 May 2021 15:28:21 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFF03E0933 for ; Sun, 2 May 2021 15:28:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 384E5335C06 for ; Sun, 2 May 2021 15:28:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6E4A736 for ; Sun, 2 May 2021 15:28:17 +0000 (UTC) From: "Quentin Retornaz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Quentin Retornaz" Message-ID: <1619969262.9c81ec5abbcd59821bc1b0f55ac4d2af37c32403.quentin@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: net-misc/seafile-client/files/, net-misc/seafile-client/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: net-misc/seafile-client/Manifest net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch net-misc/seafile-client/files/seafile-client-select-qt5.patch net-misc/seafile-client/metadata.xml net-misc/seafile-client/seafile-client-8.0.1-r2.ebuild net-misc/seafile-client/seafile-client-8.0.2.ebuild X-VCS-Directories: net-misc/seafile-client/files/ net-misc/seafile-client/ X-VCS-Committer: quentin X-VCS-Committer-Name: Quentin Retornaz X-VCS-Revision: 9c81ec5abbcd59821bc1b0f55ac4d2af37c32403 X-VCS-Branch: master Date: Sun, 2 May 2021 15:28:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 20a5d7ac-0854-43eb-b673-5bbc2e7acb09 X-Archives-Hash: 95d2b00c4e150d4537390e3d77a0f41b commit: 9c81ec5abbcd59821bc1b0f55ac4d2af37c32403 Author: Quentin Retornaz retornaz com> AuthorDate: Sun May 2 15:27:42 2021 +0000 Commit: Quentin Retornaz retornaz com> CommitDate: Sun May 2 15:27:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=9c81ec5a net-misc/seafile-client: version bump to 8.0.2 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Quentin Retornaz retornaz.com> net-misc/seafile-client/Manifest | 2 + .../files/seafile-client-7.0.9-libressl.patch | 14 +++++ .../files/seafile-client-7.0.9-qt-5.15.patch | 37 ++++++++++++++ .../files/seafile-client-8.0.1-glib-2.68.0.patch | 12 +++++ .../files/seafile-client-select-qt5.patch | 18 +++++++ net-misc/seafile-client/metadata.xml | 18 +++++++ .../seafile-client/seafile-client-8.0.1-r2.ebuild | 55 ++++++++++++++++++++ .../seafile-client/seafile-client-8.0.2.ebuild | 59 ++++++++++++++++++++++ 8 files changed, 215 insertions(+) diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest new file mode 100644 index 0000000..43d5a11 --- /dev/null +++ b/net-misc/seafile-client/Manifest @@ -0,0 +1,2 @@ +DIST seafile-client-8.0.1.tar.gz 11679293 BLAKE2B 52ad28fb316d99240692883218e626a8ca33f8265d62dadfc2eed400c889d47e9aa7887ea6c6fd994596537a5db163b334fb72c791b38529f7219c5a25c813d3 SHA512 ca5dd5a6b27316e1f6fb670e3286d24015d99391c0e1447e2ed42f3d4f72769d6a3dda78bc388ad8d303d4ab1167e4e50844574ecd6f61149b1966e99a3a7719 +DIST seafile-client-8.0.2.tar.gz 11694494 BLAKE2B 7230b17e9b85a990b87b9fae7d2d7bfc3a388ae82a777b3fa3abf8a2e88bb3ad6d73c8ff60aef34587ced6665594a71c0020c90065f6bd4fcaac79e15b41f923 SHA512 f66ea240816ec09b56bf3b121947a26bfbafeacd34c1cdb77f8244c713f0aea3f920c6eb6c3cf161034001a7d8ddb451e507acfb6f97e21ac5ebbb792da7ebf4 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 0000000..d7fdc22 --- /dev/null +++ b/net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch @@ -0,0 +1,14 @@ +Upstream pull request: https://github.com/haiwen/seafile-client/pull/1314 +diff --git a/src/utils/rsa.cpp b/src/utils/rsa.cpp +index 350b790..513733d 100644 +--- a/src/utils/rsa.cpp ++++ b/src/utils/rsa.cpp +@@ -13,7 +13,7 @@ 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 0000000..ef9c2f7 --- /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.1-glib-2.68.0.patch b/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch new file mode 100644 index 0000000..9b2dd42 --- /dev/null +++ b/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fbf1d2f..05e8d4d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,7 @@ SET(SEAFILE_CLIENT_VERSION_MINOR 0) + SET(SEAFILE_CLIENT_VERSION_PATCH 1) + SET(PROJECT_VERSION "${SEAFILE_CLIENT_VERSION_MAJOR}.${SEAFILE_CLIENT_VERSION_MINOR}.${SEAFILE_CLIENT_VERSION_PATCH}") + ADD_DEFINITIONS(-DSEAFILE_CLIENT_VERSION=${PROJECT_VERSION}) ++ADD_DEFINITIONS(-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26) + INCLUDE(FindPkgConfig) + + ## Build crash repoter on release build as default diff --git a/net-misc/seafile-client/files/seafile-client-select-qt5.patch b/net-misc/seafile-client/files/seafile-client-select-qt5.patch new file mode 100644 index 0000000..ed48dcf --- /dev/null +++ b/net-misc/seafile-client/files/seafile-client-select-qt5.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4261fba..24fbbda 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -158,11 +158,8 @@ SET(QT_VERSION_MAJOR 5) + # have to keep using QtWebKit on windows because QtWebEngine can't be + # compiled in msys2/mingw (QtWebEnigne is based on chrome, which has to be + # compiled with MSVC.) +-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("qt5 version: ${DETECTED_QT_VERSION}") + IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0) + ADD_DEFINITIONS(-DSEAFILE_USE_WEBKIT) diff --git a/net-misc/seafile-client/metadata.xml b/net-misc/seafile-client/metadata.xml new file mode 100644 index 0000000..c37a654 --- /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.1-r2.ebuild b/net-misc/seafile-client/seafile-client-8.0.1-r2.ebuild new file mode 100644 index 0000000..5abc392 --- /dev/null +++ b/net-misc/seafile-client/seafile-client-8.0.1-r2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg-utils + +DESCRIPTION="Seafile desktop client" +HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" +SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.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/jansson + dev-libs/libevent + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-libs/openssl:= + net-libs/libsearpc + ~net-misc/seafile-${PV} + shibboleth? ( dev-qt/qtwebengine:5[widgets] )" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 )" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( + "${FILESDIR}/${PN}-select-qt5.patch" + "${FILESDIR}/${PN}-7.0.9-libressl.patch" + "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" + "${FILESDIR}/${P}-glib-2.68.0.patch" +) + +src_configure() { + local mycmakeargs=( + -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" + -DBUILD_TESTING="$(usex test)" + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/net-misc/seafile-client/seafile-client-8.0.2.ebuild b/net-misc/seafile-client/seafile-client-8.0.2.ebuild new file mode 100644 index 0000000..0bd2995 --- /dev/null +++ b/net-misc/seafile-client/seafile-client-8.0.2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +RELEASE_COMMIT="837be8efd5cab4aea8fc1138ab91e93539a4e010" + +inherit cmake xdg-utils + +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/jansson + dev-libs/libevent + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-libs/openssl:= + net-libs/libsearpc + ~net-misc/seafile-${PV} + shibboleth? ( dev-qt/qtwebengine:5[widgets] )" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 )" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( + "${FILESDIR}/${PN}-select-qt5.patch" + "${FILESDIR}/${PN}-7.0.9-libressl.patch" + "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" + "${FILESDIR}/${PN}-8.0.1-glib-2.68.0.patch" +) + +S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" + +src_configure() { + local mycmakeargs=( + -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" + -DBUILD_TESTING="$(usex test)" + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +}