[gentoo-commits] repo/gentoo:master commit in: dev-debug/apitrace/, dev-debug/apitrace/files/

[gentoo-commits] repo/gentoo:master commit in: dev-debug/apitrace/, dev-debug/apitrace/files/

[Sam James]

commit:     17a37d4490b443f50c05ca6c35a530af4319d194
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Wed Aug 21 12:57:48 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 15:39:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a37d44

dev-debug/apitrace: 9.0-r5 Fix compilation on GCC 15

Closes: https://bugs.gentoo.org/937722
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38271
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-debug/apitrace/apitrace-9.0-r5.ebuild          |  1 +
 .../files/apitrace-9.0-include-cstdint.patch       | 37 ++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/dev-debug/apitrace/apitrace-9.0-r5.ebuild b/dev-debug/apitrace/apitrace-9.0-r5.ebuild
index f15cf68d8fc9..c66387dc172f 100644
--- a/dev-debug/apitrace/apitrace-9.0-r5.ebuild
+++ b/dev-debug/apitrace/apitrace-9.0-r5.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-brotli-unbundle.patch
 	"${FILESDIR}"/${P}-libc-dlopen-glibc-2.34.patch
 	"${FILESDIR}"/${P}-pkgconfig-waffle.patch
+	"${FILESDIR}/${PN}-9.0-include-cstdint.patch"
 )
 
 src_prepare() {

diff --git a/dev-debug/apitrace/files/apitrace-9.0-include-cstdint.patch b/dev-debug/apitrace/files/apitrace-9.0-include-cstdint.patch
new file mode 100644
index 000000000000..45f7f2bd0f81
--- /dev/null
+++ b/dev-debug/apitrace/files/apitrace-9.0-include-cstdint.patch
@@ -0,0 +1,37 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Wed, 21 Aug 2024 14:53:50 +0200
+Subject: [PATCH] apitrace: Explicitly include <cstdint>
+
+GCC 15 will no longer include it by default, resulting in build failures in projects that do not explicitly include it.
+
+Error:
+apitrace-9.0/retrace/metric_writer.cpp: In static member function ‘static void ProfilerQuery::writeMetricEntryCallback(Metric*, int, void*, int, void*)’:
+apitrace-9.0/retrace/metric_writer.cpp:50:70: error: ‘uint64_t’ does not name a type
+50 |         case CNT_NUM_UINT64: std::cout << "\t" <<
+*(reinterpret_cast<uint64_t*>(data)); break;
+|
+^~~~~~~~
+apitrace-9.0/retrace/metric_writer.cpp:29:1: note: ‘uint64_t’ is defined in header ‘<cstdint>’; this is probably fixable by adding ‘#include <cstdint>’
+   28 | #include "metric_writer.hpp"
+  +++ |+#include <cstdint>
+   29 |
+apitrace-9.0/retrace/metric_writer.cpp:50:78: error: expected ‘>’ before ‘*’ token
+50 |         case CNT_NUM_UINT64: std::cout << "\t" <<
+*(reinterpret_cast<uint64_t*>(data)); break;
+|
+^
+
+See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html
+See-also: https://bugs.gentoo.org/937722
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/retrace/metric_writer.cpp
++++ b/retrace/metric_writer.cpp
+@@ -24,6 +24,7 @@
+  **************************************************************************/
+ 
+ #include <iostream>
++#include <cstdint>
+ 
+ #include "metric_writer.hpp"
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-debug/apitrace/, dev-debug/apitrace/files/

[Sam James]

commit:     78b2a3cd052fc4cdd7201c540203dcaa5fd9c3c5
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Tue Mar 25 12:52:55 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <negril.nx+gentoo <AT> gmail.com> for finding conflict.

Closes: https://bugs.gentoo.org/951977
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/41279
Signed-off-by: Sam James <sam <AT> 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