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 245FB158094 for ; Fri, 22 Jul 2022 14:24:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40DFCE0B46; Fri, 22 Jul 2022 14:24:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 86B3DE0B46 for ; Fri, 22 Jul 2022 14:24:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 564593410CC for ; Fri, 22 Jul 2022 14:24:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7EAD2326 for ; Fri, 22 Jul 2022 14:24:02 +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: <1658499784.5af0627f94f7f9088def4f47b9737bddd51e43b4.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild games-emulation/dolphin/dolphin-9999.ebuild X-VCS-Directories: games-emulation/dolphin/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 5af0627f94f7f9088def4f47b9737bddd51e43b4 X-VCS-Branch: master Date: Fri, 22 Jul 2022 14:24:02 +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: 1567ba03-5f62-43a4-a6ca-42b3c4c05773 X-Archives-Hash: 91b2713cb364590b2481434d2a547dc5 commit: 5af0627f94f7f9088def4f47b9737bddd51e43b4 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Jul 22 14:12:41 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Jul 22 14:23:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af0627f games-emulation/dolphin: disable qt6 automagic In advance before Qt6 is in tree, works fine with 6 but don't want it to be automagic without proper dependency checks. Was hoping for a non-sed way to handle this but due to the method used we can't use DISABLE_FIND_PACKAGE and such, maybe there is some variable that'd work but well. It may make sense to just drop Qt5 support in a future snapshot given 6 is the upstream preference. Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild | 3 +++ games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild | 3 +++ games-emulation/dolphin/dolphin-9999.ebuild | 3 +++ 3 files changed, 9 insertions(+) diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild index 33218b7db9b5..6ff4a8dd29b9 100644 --- a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild +++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild @@ -129,6 +129,9 @@ src_prepare() { # Remove dirty suffix: needed for netplay sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die + + # Force Qt5 rather than automagic until support is properly handled here + sed -i -e '/NAMES Qt6 COMP/d' Source/Core/DolphinQt/CMakeLists.txt || die } src_configure() { diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild b/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild index abcdeec7c45b..5d4b0219d150 100644 --- a/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild +++ b/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild @@ -147,6 +147,9 @@ src_prepare() { # Remove dirty suffix: needed for netplay sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die + + # Force Qt5 rather than automagic until support is properly handled here + sed -i -e '/NAMES Qt6 COMP/d' Source/Core/DolphinQt/CMakeLists.txt || die } src_configure() { diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index d888afe15b4d..ebe6fb575460 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -145,6 +145,9 @@ src_prepare() { # Remove dirty suffix: needed for netplay sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die + + # Force Qt5 rather than automagic until support is properly handled here + sed -i -e '/NAMES Qt6 COMP/d' Source/Core/DolphinQt/CMakeLists.txt || die } src_configure() {