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 D92C5158041 for ; Fri, 5 Apr 2024 16:50:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C76E5E2A04; Fri, 5 Apr 2024 16:50:05 +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 A713DE2A04 for ; Fri, 5 Apr 2024 16:50:05 +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 C065B3430C2 for ; Fri, 5 Apr 2024 16:50:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B2A515B1 for ; Fri, 5 Apr 2024 16:50:03 +0000 (UTC) From: "orbea" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "orbea" Message-ID: <1712335705.85847c4bc13681bc6822ede9aab31d63c38bc225.orbea@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtbase/, dev-qt/qtbase/files/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-qt/qtbase/files/qtbase-6.6.3-pkgconf-deps.patch dev-qt/qtbase/files/qtbase-6.7.0-qspan-ifdef.patch dev-qt/qtbase/qtbase-6.6.3-r1.ebuild dev-qt/qtbase/qtbase-6.6.3.ebuild dev-qt/qtbase/qtbase-6.7.0-r1.ebuild dev-qt/qtbase/qtbase-6.7.0.ebuild X-VCS-Directories: dev-qt/qtbase/ dev-qt/qtbase/files/ X-VCS-Committer: orbea X-VCS-Committer-Name: orbea X-VCS-Revision: 85847c4bc13681bc6822ede9aab31d63c38bc225 X-VCS-Branch: master Date: Fri, 5 Apr 2024 16:50:03 +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: 5ec8dc44-9411-4702-8091-a67be0423eb8 X-Archives-Hash: 6923a1b4daf3f6e1bf8cff2c40fbf3b7 commit: 85847c4bc13681bc6822ede9aab31d63c38bc225 Author: orbea riseup net> AuthorDate: Fri Apr 5 16:48:25 2024 +0000 Commit: orbea riseup net> CommitDate: Fri Apr 5 16:48:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=85847c4b dev-qt/qtbase: add 6.6.3-r1, 6.7.0-r1, drop 6.6.3, 6.7.0 Signed-off-by: orbea riseup.net> .../qtbase/files/qtbase-6.6.3-pkgconf-deps.patch | 35 ++++++++++++++++++++++ dev-qt/qtbase/files/qtbase-6.7.0-qspan-ifdef.patch | 29 ++++++++++++++++++ ...{qtbase-6.6.3.ebuild => qtbase-6.6.3-r1.ebuild} | 1 + ...{qtbase-6.7.0.ebuild => qtbase-6.7.0-r1.ebuild} | 2 ++ 4 files changed, 67 insertions(+) diff --git a/dev-qt/qtbase/files/qtbase-6.6.3-pkgconf-deps.patch b/dev-qt/qtbase/files/qtbase-6.6.3-pkgconf-deps.patch new file mode 100644 index 0000000..965dade --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.6.3-pkgconf-deps.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/928299 +https://bugreports.qt.io/browse/QTBUG-124135 +https://codereview.qt-project.org/c/qt/qtbase/+/553372 +From: Alexey Edelev +Date: Fri, 05 Apr 2024 14:50:37 +0200 +Subject: [PATCH] Prefer the versioned targets over the namespaceless one when collecting deps + +Change the way we collect dependencies in __qt_internal_walk_libs. +Prefer the versioned Qt targets over the namespaceless. This fixes the +generating of the pkg-config configs. + +Pick-to: 6.5 6.6 6.7 +Task-number: QTBUG-124135 +Change-Id: I660376e122a99b5bc0874f2bc6ccd4d80c9ad453 +--- a/cmake/QtPublicWalkLibsHelpers.cmake ++++ b/cmake/QtPublicWalkLibsHelpers.cmake +@@ -184,13 +184,13 @@ + if(lib_target MATCHES "^::@") + continue() + elseif(TARGET ${lib_target}) +- if ("${lib_target}" MATCHES "^Qt::(.*)") +- # If both, Qt::Foo and Foo targets exist, prefer the target name without ++ if(NOT "${lib_target}" MATCHES "^(Qt|${QT_CMAKE_EXPORT_NAMESPACE})::.+") ++ # If both, Qt::Foo and Foo targets exist, prefer the target name with versioned + # namespace. Which one is preferred doesn't really matter. This code exists to + # avoid ending up with both, Qt::Foo and Foo in our dependencies. +- set(namespaceless_lib_target "${CMAKE_MATCH_1}") +- if(TARGET "${namespaceless_lib_target}") +- set(lib_target ${namespaceless_lib_target}) ++ set(versioned_qt_target "${QT_CMAKE_EXPORT_NAMESPACE}::${lib_target}") ++ if(TARGET "${versioned_qt_target}") ++ set(lib_target ${versioned_qt_target}) + endif() + endif() + get_target_property(lib_target_type ${lib_target} TYPE) diff --git a/dev-qt/qtbase/files/qtbase-6.7.0-qspan-ifdef.patch b/dev-qt/qtbase/files/qtbase-6.7.0-qspan-ifdef.patch new file mode 100644 index 0000000..4c2a37c --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.7.0-qspan-ifdef.patch @@ -0,0 +1,29 @@ +https://bugreports.qt.io/browse/QTBUG-123937 +From 6810220218cbbf2854ecdedb291f7e4a84b31e54 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Wed, 3 Apr 2024 00:47:01 +0200 +Subject: [PATCH] Use ifdef instead of if for __cpp_lib_span + +Like the other times it's used in this file + +This is causing compilation errors in projects that use -Werror=undef + +Fixes: QTBUG-123937 +Change-Id: I0cdd2910755dc9079890011dd8dbc27a6e64793e +Reviewed-by: Thiago Macieira +(cherry picked from commit 699ddcb15b5e981d32ea65d1c1a12f8fa0b06e0d) +Reviewed-by: Qt Cherry-pick Bot +--- a/src/corelib/tools/qspan.h ++++ b/src/corelib/tools/qspan.h +@@ -297,7 +297,7 @@ public: + : QSpanBase(il.begin(), il.size()) + {} + +-#if __cpp_lib_span ++#ifdef __cpp_lib_span + template = true> + Q_IMPLICIT constexpr QSpanBase(std::span other) noexcept + : QSpanBase(other.data(), other.size()) +-- +2.44.0 + diff --git a/dev-qt/qtbase/qtbase-6.6.3.ebuild b/dev-qt/qtbase/qtbase-6.6.3-r1.ebuild similarity index 99% rename from dev-qt/qtbase/qtbase-6.6.3.ebuild rename to dev-qt/qtbase/qtbase-6.6.3-r1.ebuild index 8b6f0aa..ffc9fda 100644 --- a/dev-qt/qtbase/qtbase-6.6.3.ebuild +++ b/dev-qt/qtbase/qtbase-6.6.3-r1.ebuild @@ -139,6 +139,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch + "${FILESDIR}"/${PN}-6.6.3-pkgconf-deps.patch ) src_prepare() { diff --git a/dev-qt/qtbase/qtbase-6.7.0.ebuild b/dev-qt/qtbase/qtbase-6.7.0-r1.ebuild similarity index 99% rename from dev-qt/qtbase/qtbase-6.7.0.ebuild rename to dev-qt/qtbase/qtbase-6.7.0-r1.ebuild index 9c6fc62..11d620d 100644 --- a/dev-qt/qtbase/qtbase-6.7.0.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.0-r1.ebuild @@ -140,6 +140,8 @@ PATCHES=( "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch + "${FILESDIR}"/${PN}-6.6.3-pkgconf-deps.patch + "${FILESDIR}"/${PN}-6.7.0-qspan-ifdef.patch ) src_prepare() {