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 8680713933E for ; Wed, 14 Jul 2021 13:24:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0684E09E6; Wed, 14 Jul 2021 13:24:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 9F323E09E5 for ; Wed, 14 Jul 2021 13:24:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 34E65342BA4 for ; Wed, 14 Jul 2021 13:24:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8754B7C7 for ; Wed, 14 Jul 2021 13:24:06 +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: <1626268178.922b678e0d4a69689b0ad3bc007752aec15c4d04.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: 922b678e0d4a69689b0ad3bc007752aec15c4d04 X-VCS-Branch: master Date: Wed, 14 Jul 2021 13:24:06 +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: fcf3cd9c-90d1-4747-ae2a-cb7248185b14 X-Archives-Hash: b7cda2b9c5ad18cbf46ca8a1b6c3d2d1 commit: 922b678e0d4a69689b0ad3bc007752aec15c4d04 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 8 19:47:48 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jul 14 13:09:38 2021 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=922b678e qt5-build.eclass: Use kde.org eclass for snapshots and live ebuilds - Drop unused src_unpack phase - Snapshots are identified by having KDE_ORG_COMMIT set pre-inherit - All live ebuilds and snapshots except qtwebengine inherit kde.org.eclass - SRC_URI, src_unpack handling is done by kde.org.eclass for them Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 54 ++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index a2fb90b5..a42fbce9 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -76,26 +76,17 @@ _QT5_P=${QT5_MODULE}-everywhere-src-${PV} inherit estack flag-o-matic toolchain-funcs virtualx -HOMEPAGE="https://www.qt.io/" -LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" -SLOT=5/$(ver_cut 1-2) - -case ${PV} in - 5.15.9999) - # KDE upstream for 5.15 patches - HOMEPAGE+=" https://invent.kde.org/qt/qt/" - EGIT_BRANCH="kde/5.15" - ;; - *) +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} - ;; -esac - -EGIT_REPO_URI=( "https://invent.kde.org/qt/qt/${QT5_MODULE}.git" ) - -[[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3 + fi +fi # @ECLASS-VARIABLE: QT5_BUILD_DIR # @OUTPUT_VARIABLE @@ -103,6 +94,8 @@ EGIT_REPO_URI=( "https://invent.kde.org/qt/qt/${QT5_MODULE}.git" ) # Build directory for out-of-source builds. : ${QT5_BUILD_DIR:=${S}_build} +LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" +SLOT=5/$(ver_cut 1-2) IUSE="debug test" if [[ ${QT5_BUILD_TYPE} == release ]]; then @@ -121,17 +114,7 @@ fi ###### Phase functions ###### -EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm - -# @FUNCTION: qt5-build_src_unpack -# @DESCRIPTION: -# Unpacks the sources. -qt5-build_src_unpack() { - case ${QT5_BUILD_TYPE} in - live) git-r3_src_unpack ;& - release) default ;; - esac -} +EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm # @FUNCTION: qt5-build_src_prepare # @DESCRIPTION: @@ -139,6 +122,15 @@ qt5-build_src_unpack() { qt5-build_src_prepare() { qt5_prepare_env + if [[ -n ${KDE_ORG_COMMIT} ]]; then + # Upstream bumped version in 5.15 branch after 5.15.2 release but their + # 5.15.3 release is closed and this will never be more than a Qt 5.15.2 + # with patches on top. + einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}" + sed -e "/^MODULE_VERSION/s/5\.15\.3/5\.15\.2/" -i .qmake.conf || die + mkdir -p .git || die # need to fake a git repository for configure + fi + if [[ ${QT5_MODULE} == qtbase ]]; then qt5_symlink_tools_to_build_dir @@ -637,9 +629,11 @@ qt5_base_configure() { # a forwarding header is no longer created since 5.8, causing the system # config to always be used. bug 599636 - # ${S}/include does not exist in live sources + # ${S}/include does not exist in live sources or kde.org snapshots local basedir="${S}/" - [[ ${QT5_BUILD_TYPE} == live ]] && basedir="" + if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then + basedir="" + fi cp src/corelib/global/qconfig.h "${basedir}"include/QtCore/ || die popd >/dev/null || die