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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7486A1580FD for ; Fri, 27 Dec 2024 21:45:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA722E07C5; Fri, 27 Dec 2024 21:45:32 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 41FFAE07C5 for ; Fri, 27 Dec 2024 21:45:32 +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 C78DD335C0F for ; Fri, 27 Dec 2024 21:45:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 363AAAF5 for ; Fri, 27 Dec 2024 21:45:28 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1735335909.8b89d304c6654d162619cb514aa62e4fd0962e3e.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwayland/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwayland/qtwayland-6.8.1.ebuild dev-qt/qtwayland/qtwayland-6.8.9999.ebuild dev-qt/qtwayland/qtwayland-6.9.9999.ebuild dev-qt/qtwayland/qtwayland-6.9999.ebuild X-VCS-Directories: dev-qt/qtwayland/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 8b89d304c6654d162619cb514aa62e4fd0962e3e X-VCS-Branch: master Date: Fri, 27 Dec 2024 21:45:28 +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: b1f7a36b-08af-4cca-b315-6d9ccd01aa47 X-Archives-Hash: 316c47a39836690cff7dc5499db0bb5e commit: 8b89d304c6654d162619cb514aa62e4fd0962e3e Author: Ionen Wolkens gentoo org> AuthorDate: Fri Dec 27 21:41:14 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Dec 27 21:45:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b89d304 dev-qt/qtwayland: potentially fix downgrade edge case (qt6) Albeit overall downgrading Qt is hardly supported and unlikely to be smooth either way, esp. if revdeps have arleady been built against the newer version given backward compat is not guaranteed. Just repeat the find_package line rather than do extra conditionals, it'll repeat the argument but it's simpler/readable. Closes: https://bugs.gentoo.org/947049 Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtwayland/qtwayland-6.8.1.ebuild | 1 + dev-qt/qtwayland/qtwayland-6.8.9999.ebuild | 1 + dev-qt/qtwayland/qtwayland-6.9.9999.ebuild | 1 + dev-qt/qtwayland/qtwayland-6.9999.ebuild | 1 + 4 files changed, 4 insertions(+) diff --git a/dev-qt/qtwayland/qtwayland-6.8.1.ebuild b/dev-qt/qtwayland/qtwayland-6.8.1.ebuild index 7354b8e1d011..fba61eb81b67 100644 --- a/dev-qt/qtwayland/qtwayland-6.8.1.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.8.1.ebuild @@ -54,6 +54,7 @@ PATCHES=( src_configure() { local mycmakeargs=( + $(cmake_use_find_package compositor Qt6Quick) $(cmake_use_find_package qml Qt6Quick) $(qt_feature compositor wayland_server) $(qt_feature gnome wayland_decoration_adwaita) diff --git a/dev-qt/qtwayland/qtwayland-6.8.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.8.9999.ebuild index 677184ab5edf..0d3aa128524d 100644 --- a/dev-qt/qtwayland/qtwayland-6.8.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.8.9999.ebuild @@ -53,6 +53,7 @@ PATCHES=( src_configure() { local mycmakeargs=( + $(cmake_use_find_package compositor Qt6Quick) $(cmake_use_find_package qml Qt6Quick) $(qt_feature compositor wayland_server) $(qt_feature gnome wayland_decoration_adwaita) diff --git a/dev-qt/qtwayland/qtwayland-6.9.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.9.9999.ebuild index 2da37b7b546c..65f970f02e04 100644 --- a/dev-qt/qtwayland/qtwayland-6.9.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.9.9999.ebuild @@ -49,6 +49,7 @@ CMAKE_SKIP_TESTS=( src_configure() { local mycmakeargs=( + $(cmake_use_find_package compositor Qt6Quick) $(cmake_use_find_package qml Qt6Quick) $(qt_feature compositor wayland_server) $(qt_feature gnome wayland_decoration_adwaita) diff --git a/dev-qt/qtwayland/qtwayland-6.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.9999.ebuild index 2da37b7b546c..65f970f02e04 100644 --- a/dev-qt/qtwayland/qtwayland-6.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.9999.ebuild @@ -49,6 +49,7 @@ CMAKE_SKIP_TESTS=( src_configure() { local mycmakeargs=( + $(cmake_use_find_package compositor Qt6Quick) $(cmake_use_find_package qml Qt6Quick) $(qt_feature compositor wayland_server) $(qt_feature gnome wayland_decoration_adwaita)