From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1270860-garchives=archives.gentoo.org@lists.gentoo.org> 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 9301C1382C5 for <garchives@archives.gentoo.org>; Wed, 14 Apr 2021 06:54:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1645E0B93; Wed, 14 Apr 2021 06:54:27 +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 B1D73E0B92 for <gentoo-commits@lists.gentoo.org>; Wed, 14 Apr 2021 06:54:27 +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 6CB5133BE0A for <gentoo-commits@lists.gentoo.org>; Wed, 14 Apr 2021 06:54:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E4D79648 for <gentoo-commits@lists.gentoo.org>; Wed, 14 Apr 2021 06:54:24 +0000 (UTC) From: "Jimi Huotari" <chiitoo@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" <chiitoo@gentoo.org> Message-ID: <1618300344.b58c4def05ffeb42c562268ae6fbab70817fb820.chiitoo@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: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: b58c4def05ffeb42c562268ae6fbab70817fb820 X-VCS-Branch: master Date: Wed, 14 Apr 2021 06:54:24 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 67cdee58-cab4-4c5a-86d4-9dcb1210ce4d X-Archives-Hash: e7de95fc421fa98a71185173461c9abf commit: b58c4def05ffeb42c562268ae6fbab70817fb820 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Sun Apr 11 16:43:51 2021 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Tue Apr 13 07:52:24 2021 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b58c4def qt5-build.eclass: switch sources to KDE upstream for 5.15 live builds The KDE community has started [1] maintaining a repository with patches for the open-source Qt 5.15 branch. 1. https://mail.kde.org/pipermail/distributions/2021-April/000984.html Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> eclass/qt5-build.eclass | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index e33511bb..de7a371c 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -67,10 +67,11 @@ QT5_MINOR_VERSION=$(ver_cut 2) readonly QT5_MINOR_VERSION case ${PV} in - 5.??.9999) - # git stable branch + 5.15.9999) + # KDE upstream for 5.15 patches + HOMEPAGE+=" https://invent.kde.org/qt/qt/" QT5_BUILD_TYPE="live" - EGIT_BRANCH=${PV%.9999} + EGIT_BRANCH="kde/5.15" ;; *_alpha*|*_beta*|*_rc*) # development release @@ -89,10 +90,8 @@ case ${PV} in esac readonly QT5_BUILD_TYPE -EGIT_REPO_URI=( - "https://code.qt.io/qt/${QT5_MODULE}.git" - "https://github.com/qt/${QT5_MODULE}.git" -) +EGIT_REPO_URI=( "https://invent.kde.org/qt/qt/${QT5_MODULE}.git" ) + [[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3 # @ECLASS-VARIABLE: QT5_BUILD_DIR