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 1C0CC1581C1 for ; Fri, 5 Jul 2024 13:17:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 617C02BC020; Fri, 5 Jul 2024 13:17:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A7B52BC020 for ; Fri, 5 Jul 2024 13:17:00 +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 60F8F33BF29 for ; Fri, 5 Jul 2024 13:16:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B18313A1 for ; Fri, 5 Jul 2024 13:16:56 +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: <1720185349.34eccab8e4f02db922e8ff0915c79db5ef36c960.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/sonnet/files/, kde-frameworks/sonnet/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/sonnet/files/sonnet-6.3.0-cmake.patch kde-frameworks/sonnet/sonnet-6.3.0.ebuild X-VCS-Directories: kde-frameworks/sonnet/ kde-frameworks/sonnet/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 34eccab8e4f02db922e8ff0915c79db5ef36c960 X-VCS-Branch: master Date: Fri, 5 Jul 2024 13:16:56 +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: 2fa2a414-8354-4631-8321-b4707e2592f3 X-Archives-Hash: 9f8defabe90d0cad3847e7209bcfd86b commit: 34eccab8e4f02db922e8ff0915c79db5ef36c960 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jul 5 13:09:11 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jul 5 13:15:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34eccab8 kde-frameworks/sonnet: Fix build with USE=-qml Pending upstream MR: https://invent.kde.org/frameworks/sonnet/-/merge_requests/108 Closes: https://bugs.gentoo.org/935488 Signed-off-by: Andreas Sturmlechner gentoo.org> .../sonnet/files/sonnet-6.3.0-cmake.patch | 42 ++++++++++++++++++++++ kde-frameworks/sonnet/sonnet-6.3.0.ebuild | 3 ++ 2 files changed, 45 insertions(+) diff --git a/kde-frameworks/sonnet/files/sonnet-6.3.0-cmake.patch b/kde-frameworks/sonnet/files/sonnet-6.3.0-cmake.patch new file mode 100644 index 000000000000..b218b5618339 --- /dev/null +++ b/kde-frameworks/sonnet/files/sonnet-6.3.0-cmake.patch @@ -0,0 +1,42 @@ +From 7ee068b3da7e8b60a6c0a5c95b9026ef2c82ebb7 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Fri, 5 Jul 2024 15:03:09 +0200 +Subject: [PATCH] Fix SONNET_USE_QML=OFF by moving ECMQmlModule behind the + conditional + +Otherwise we still end up with + +> -- Could NOT find Qt6Qml (missing: Qt6Qml_DIR) + +and finally + +> Failed setting up ECMQmlModule + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3427bb12..892f77d7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,7 +22,6 @@ include(ECMSetupVersion) + include(ECMGenerateHeaders) + include(ECMGenerateQmlTypes) + include(ECMFindQmlModule) +-include(ECMQmlModule) + include(ECMDeprecationSettings) + include(ECMAddQch) + include(ECMPoQmTools) +@@ -39,6 +38,7 @@ if(SONNET_USE_WIDGETS) + endif() + + if(SONNET_USE_QML) ++ include(ECMQmlModule) + find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Quick) + endif() + +-- +2.45.2 + diff --git a/kde-frameworks/sonnet/sonnet-6.3.0.ebuild b/kde-frameworks/sonnet/sonnet-6.3.0.ebuild index ce1b9390145e..91f260142222 100644 --- a/kde-frameworks/sonnet/sonnet-6.3.0.ebuild +++ b/kde-frameworks/sonnet/sonnet-6.3.0.ebuild @@ -22,6 +22,9 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" +# Pending: https://invent.kde.org/frameworks/sonnet/-/merge_requests/108 +PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 935488 + CMAKE_SKIP_TESTS=( # bug 779994 sonnet-test_autodetect