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 0713C15808B for ; Sat, 12 Mar 2022 13:54:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 444C7E0919; Sat, 12 Mar 2022 13:54:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 23787E0919 for ; Sat, 12 Mar 2022 13:54:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F35BD342E29 for ; Sat, 12 Mar 2022 13:54:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FEFD2B0 for ; Sat, 12 Mar 2022 13:54:51 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1647093265.f8f26d895d3323cc99f02128d6cb6d08f9a06bdc.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f8f26d895d3323cc99f02128d6cb6d08f9a06bdc X-VCS-Branch: master Date: Sat, 12 Mar 2022 13:54:51 +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: 8784a4f7-c52e-4315-9e09-c67b35009d75 X-Archives-Hash: 6afc0cf9ddf831bcaa578516c7ac3557 commit: f8f26d895d3323cc99f02128d6cb6d08f9a06bdc Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 6 18:30:30 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 12 13:54:25 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f8f26d89 qt5-build.eclass: Add support for Qt 5.15.3 (and future) tarballs KDE Qt5PatchCollection patches will be applied on top of v5.15.3-lts-lgpl Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 757afa85..8242db0b 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -30,6 +30,20 @@ if [[ ${PV} == *9999* ]]; then fi readonly QT5_BUILD_TYPE +# @ECLASS-VARIABLE: QT5_KDEPATCHSET_REV +# @DEFAULT_UNSET +# @PRE_INHERIT +# @DESCRIPTION: +# Downstream generated patchset revision pulled from KDE's Qt5PatchCollection, +# with the patchset having been generated in the following way from upstream's +# qt module git repository: +# @CODE +# git format-patch v${PV}-lts-lgpl..origin/gentoo-kde/${PV} \ +# -o ${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV} +# @CODE +# Used for SRC_URI and applied in src_prepare. +# Must be set before inheriting the eclass. + # @ECLASS-VARIABLE: QT5_MODULE # @PRE_INHERIT # @DESCRIPTION: @@ -48,7 +62,6 @@ readonly QT5_PV # @DESCRIPTION: # The upstream package name of the module this package belongs to. # Used for SRC_URI and S. -_QT5_P=${QT5_MODULE}-everywhere-src-${PV} # @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS # @DEFAULT_UNSET @@ -83,15 +96,25 @@ _QT5_P=${QT5_MODULE}-everywhere-src-${PV} inherit estack flag-o-matic toolchain-funcs virtualx if [[ ${PN} != qtwebengine ]]; then - if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then - # KDE Qt5PatchCollection - inherit kde.org - else - # official stable release - HOMEPAGE="https://www.qt.io/" - SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${_QT5_P}.tar.xz" - S=${WORKDIR}/${_QT5_P} - fi + case ${PV} in + 5.15.2* | *9999 ) + # kde/5.15 branch or Qt5PatchCollection based on Qt 5.15.2 + # (using KDE_ORG_COMMIT) + inherit kde.org + ;; + 5.15.[3-9]* ) + # official stable release + _QT5_P=${QT5_MODULE}-everywhere-opensource-src-${PV} + HOMEPAGE="https://www.qt.io/" + SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${_QT5_P}.tar.xz" + # KDE Qt5PatchCollection on top of tag v${PV}-lts-lgpl + if [[ -n ${QT5_KDEPATCHSET_REV} ]]; then + HOMEPAGE+=" https://invent.kde.org/qt/qt/${QT5_MODULE} https://community.kde.org/Qt5PatchCollection" + SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV}.tar.xz" + fi + S="${WORKDIR}"/${_QT5_P/opensource-} + ;; + esac fi # @ECLASS-VARIABLE: QT5_BUILD_DIR @@ -163,6 +186,8 @@ qt5-build_src_prepare() { sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die fi + [[ -n ${QT5_KDEPATCHSET_REV} ]] && eapply "${WORKDIR}/${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV}" + default }