From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 255AB1581EE for ; Tue, 25 Mar 2025 13:51:35 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 0ABFA343246 for ; Tue, 25 Mar 2025 13:51:35 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 03A2E110296; Tue, 25 Mar 2025 13:51:34 +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 bobolink.gentoo.org (Postfix) with ESMTPS id EC44B110296 for ; Tue, 25 Mar 2025 13:51:33 +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 87CF13431D7 for ; Tue, 25 Mar 2025 13:51:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A98861936 for ; Tue, 25 Mar 2025 13:51:31 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1742910659.78b2a3cd052fc4cdd7201c540203dcaa5fd9c3c5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-debug/apitrace/, dev-debug/apitrace/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-debug/apitrace/apitrace-12.0.ebuild dev-debug/apitrace/files/apitrace-12.0-find_snappy.patch X-VCS-Directories: dev-debug/apitrace/ dev-debug/apitrace/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 78b2a3cd052fc4cdd7201c540203dcaa5fd9c3c5 X-VCS-Branch: master Date: Tue, 25 Mar 2025 13:51:31 +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: 1602d746-3c69-44c3-93f0-a2e3ccd1b58d X-Archives-Hash: c4e8ba5515b082f53f99f41091adfb54 commit: 78b2a3cd052fc4cdd7201c540203dcaa5fd9c3c5 Author: Nicolas PARLANT parhuet fr> AuthorDate: Tue Mar 25 12:52:55 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 25 13:50:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b2a3cd dev-debug/apitrace: fix snappy detection Use config mode for find_package(Snappy) to prevent conflict with /usr/lib64/cmake/Qt6/FindSnappy.cmake provided by qtwebengine Thanks to Paul Zander gmail.com> for finding conflict. Closes: https://bugs.gentoo.org/951977 Signed-off-by: Nicolas PARLANT parhuet.fr> Closes: https://github.com/gentoo/gentoo/pull/41279 Signed-off-by: Sam James gentoo.org> dev-debug/apitrace/apitrace-12.0.ebuild | 1 + dev-debug/apitrace/files/apitrace-12.0-find_snappy.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dev-debug/apitrace/apitrace-12.0.ebuild b/dev-debug/apitrace/apitrace-12.0.ebuild index a42ec871ba6a..416ec38f9794 100644 --- a/dev-debug/apitrace/apitrace-12.0.ebuild +++ b/dev-debug/apitrace/apitrace-12.0.ebuild @@ -40,6 +40,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-9.0-disable-multiarch.patch "${FILESDIR}"/${PN}-9.0-pkgconfig-waffle.patch + "${FILESDIR}"/${PN}-12.0-find_snappy.patch "${FILESDIR}"/${PN}-12.0-no_qtnetwork.patch "${FILESDIR}"/${PN}-12.0-tests.patch "${FILESDIR}"/${PN}-12.0-unbundle.patch diff --git a/dev-debug/apitrace/files/apitrace-12.0-find_snappy.patch b/dev-debug/apitrace/files/apitrace-12.0-find_snappy.patch new file mode 100644 index 000000000000..38ca46dff40e --- /dev/null +++ b/dev-debug/apitrace/files/apitrace-12.0-find_snappy.patch @@ -0,0 +1,14 @@ +Use config mode to prevent conflict with /usr/lib64/cmake/Qt6/FindSnappy.cmake (qtwebengine) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 34123b3..eef8a38 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -535,7 +535,7 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/compat) + if (NOT WIN32 AND NOT ENABLE_STATIC_EXE) + + if (NOT ENABLE_STATIC_SNAPPY) +- find_package (Snappy) ++ find_package (Snappy CONFIG) + endif () + + # zlib 1.2.4-1.2.5 made it impossible to read the last block of incomplete