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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DCDDB15808C for ; Sun, 3 Apr 2022 09:34:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79005E07EA; Sun, 3 Apr 2022 09:34:57 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADAADE0802 for ; Sun, 3 Apr 2022 09:34:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9347934145B for ; Sun, 3 Apr 2022 09:34:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E453336B for ; Sun, 3 Apr 2022 09:34:53 +0000 (UTC) From: "Matthew Smith" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Smith" Message-ID: <1648978451.795880dba3bdad1a6832ab4efa735cf4de2bc8d7.matthew@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/seafile-client/files/, net-misc/seafile-client/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/seafile-client/Manifest net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch net-misc/seafile-client/seafile-client-8.0.6.ebuild X-VCS-Directories: net-misc/seafile-client/files/ net-misc/seafile-client/ X-VCS-Committer: matthew X-VCS-Committer-Name: Matthew Smith X-VCS-Revision: 795880dba3bdad1a6832ab4efa735cf4de2bc8d7 X-VCS-Branch: master Date: Sun, 3 Apr 2022 09:34:53 +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: 2592e6ef-204a-4d9f-8ab8-a03cd70ebeff X-Archives-Hash: 479573a345810f2c8e8512f1f6139ffb commit: 795880dba3bdad1a6832ab4efa735cf4de2bc8d7 Author: Quentin Retornaz retornaz com> AuthorDate: Sun Mar 13 23:48:44 2022 +0000 Commit: Matthew Smith gentoo org> CommitDate: Sun Apr 3 09:34:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=795880db net-misc/seafile-client: version bump to 8.0.6 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Quentin Retornaz retornaz.com> Closes: https://github.com/gentoo/gentoo/pull/24544 Signed-off-by: Matthew Smith gentoo.org> net-misc/seafile-client/Manifest | 1 + .../files/seafile-client-8.0.6-select-qt5.patch | 18 ++++++++ .../seafile-client/seafile-client-8.0.6.ebuild | 52 ++++++++++++++++++++++ 3 files changed, 71 insertions(+) diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest index 9ae4e6c5ac20..9246cda413fc 100644 --- a/net-misc/seafile-client/Manifest +++ b/net-misc/seafile-client/Manifest @@ -3,3 +3,4 @@ DIST seafile-client-8.0.2.tar.gz 11694494 BLAKE2B 7230b17e9b85a990b87b9fae7d2d7b DIST seafile-client-8.0.3.tar.gz 11694141 BLAKE2B 03a30d824ebe45a58a93baf127714b119c73254cdbc3f13f5cc81807dbf7ebfc333a2e1c36a325728d1bc60fa3392eb7c7eb6ea7d978808200abe2e93c63cc72 SHA512 944751e84b5336d07c0a24a69c10ef4e5a84b133c22d148226bceee9ae8f989c45de28950c0a16fb66eb9a5aa43ff83a21c5b0979e5421763383b93acdde5aff DIST seafile-client-8.0.4.tar.gz 11701804 BLAKE2B 4d1647a4c783be634eca79ff3ca0713888c38222c1c571f11393a4cc6067073c4ac2a41256a678482c8e66c16cc88dc04883f432d81e374a06264650fe198ade SHA512 eb9afa97f02cfd6054dab34c0ce7e268b8faca49d364d0051358c3f69ae4c8b4e130025891a4c99e4d6cd5abe6b617ea23bcc0d6f2b07ea438debf9899b6d406 DIST seafile-client-8.0.5.tar.gz 11701650 BLAKE2B c9c436f53cf7effa6c2e1cdbb09f5cffd53f7ef8fa6f6b12bb92c0d3c2e54b38858c95a3ab4c511d16774a973c8c2a7e66842825e9535d1332e8589dc201d22a SHA512 1f3eb643dce980a1aa0ff71e0ecca83b3db0848f9983bf7782adae6d181ddc28454a6cd75ebfcf439c17eb2008a5e0d4a684e5cee60fe7b83297e9fce1fcfec9 +DIST seafile-client-8.0.6.tar.gz 11702726 BLAKE2B bcba073b9ec17c33f653ae89e518f30f96ec8f9bdb780a9e06ae75d565c223c6b0505fd1ec9475b66bcd8d26f84846a99968fc006514d1eccb4a72b8600f0ae4 SHA512 fceb272fa521a7343609285ff5b299f66886b2ea53a1395178c3f05313e9439853422de65d20902669034c4edacdf32eb5674e16e64218b0444221c77cd4256c 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 000000000000..8b8e6d55aa08 --- /dev/null +++ b/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1c4a444..aae406c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -133,11 +133,8 @@ 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}") + 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}'" diff --git a/net-misc/seafile-client/seafile-client-8.0.6.ebuild b/net-misc/seafile-client/seafile-client-8.0.6.ebuild new file mode 100644 index 000000000000..19c6f924fba8 --- /dev/null +++ b/net-misc/seafile-client/seafile-client-8.0.6.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 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="1fb9ddd71fbf6f0252509aced527be459e240366" + +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 + ~net-misc/seafile-${PV} + sys-libs/zlib + virtual/opengl + 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" +) + +S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" + +src_configure() { + local mycmakeargs=( + -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" + -DBUILD_TESTING="$(usex test)" + ) + cmake_src_configure +}