* [gentoo-commits] repo/gentoo:master commit in: dev-debug/apitrace/, dev-debug/apitrace/files/
@ 2024-08-25 15:41 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-08-25 15:41 UTC (permalink / raw
To: gentoo-commits
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"
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-debug/apitrace/, dev-debug/apitrace/files/
@ 2025-03-25 13:51 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-03-25 13:51 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-debug/apitrace/, dev-debug/apitrace/files/
@ 2025-06-07 16:12 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2025-06-07 16:12 UTC (permalink / raw
To: gentoo-commits
commit: 84702d1150f55f69ddd4a3d9e6e21464a5359b50
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Sat Jun 7 10:06:01 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 7 16:11:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84702d11
dev-debug/apitrace: bump cmake_min_required
backport patch from upstream to set compatibility with cmake-4
refresh status of patches
Closes: https://bugs.gentoo.org/957273
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/42483
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-debug/apitrace/apitrace-12.0.ebuild | 6 ++++--
.../files/apitrace-12.0-bump_cmake_min.patch | 24 ++++++++++++++++++++++
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/dev-debug/apitrace/apitrace-12.0.ebuild b/dev-debug/apitrace/apitrace-12.0.ebuild
index 416ec38f9794..16c4f03c4605 100644
--- a/dev-debug/apitrace/apitrace-12.0.ebuild
+++ b/dev-debug/apitrace/apitrace-12.0.ebuild
@@ -39,13 +39,15 @@ 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
+
# merged, to be removed for the next version
+ "${FILESDIR}"/${PN}-9.0-pkgconfig-waffle.patch
"${FILESDIR}"/${PN}-12.0-include-stdint.patch
+ "${FILESDIR}"/${PN}-12.0-no_qtnetwork.patch
+ "${FILESDIR}"/${PN}-12.0-bump_cmake_min.patch
)
src_prepare() {
diff --git a/dev-debug/apitrace/files/apitrace-12.0-bump_cmake_min.patch b/dev-debug/apitrace/files/apitrace-12.0-bump_cmake_min.patch
new file mode 100644
index 000000000000..9ea7db8d15f9
--- /dev/null
+++ b/dev-debug/apitrace/files/apitrace-12.0-bump_cmake_min.patch
@@ -0,0 +1,24 @@
+bump cmake_min_required for cmake-4 compatibility
+https://github.com/apitrace/apitrace/commit/fd643354337000c4d1b4497e1ac2fec381202d40
+From fd643354337000c4d1b4497e1ac2fec381202d40 Mon Sep 17 00:00:00 2001
+From: Jose Fonseca <jose.fonseca@broadcom.com>
+Date: Thu, 6 Mar 2025 16:13:30 +0000
+Subject: [PATCH] Bump cmake_minimum_required.
+
+---
+ thirdparty/libbacktrace.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/thirdparty/libbacktrace.cmake b/thirdparty/libbacktrace.cmake
+index c3d81d975..0e7b4ce51 100644
+--- a/thirdparty/libbacktrace.cmake
++++ b/thirdparty/libbacktrace.cmake
+@@ -29,7 +29,7 @@
+ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ # POSSIBILITY OF SUCH DAMAGE. */
+
+-cmake_minimum_required (VERSION 3.1)
++cmake_minimum_required (VERSION 3.5)
+
+ project (libbacktrace)
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-debug/apitrace/, dev-debug/apitrace/files/
@ 2025-08-29 7:23 Petr Vaněk
0 siblings, 0 replies; 4+ messages in thread
From: Petr Vaněk @ 2025-08-29 7:23 UTC (permalink / raw
To: gentoo-commits
commit: 07d4397223a6b7440b660ffa55b862f508d8ca26
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 29 07:21:13 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Fri Aug 29 07:21:13 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d43972
dev-debug/apitrace: drop 12.0
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
dev-debug/apitrace/Manifest | 2 -
dev-debug/apitrace/apitrace-12.0.ebuild | 117 ---------------------
.../files/apitrace-12.0-bump_cmake_min.patch | 24 -----
.../apitrace/files/apitrace-12.0-find_snappy.patch | 14 ---
.../apitrace/files/apitrace-12.0-fix_qt6.9.patch | 31 ------
.../files/apitrace-12.0-include-stdint.patch | 25 -----
.../files/apitrace-12.0-no_qtnetwork.patch | 25 -----
dev-debug/apitrace/files/apitrace-12.0-tests.patch | 21 ----
.../files/apitrace-9.0-pkgconfig-waffle.patch | 14 ---
9 files changed, 273 deletions(-)
diff --git a/dev-debug/apitrace/Manifest b/dev-debug/apitrace/Manifest
index 12f3fc17deec..269c07922d3e 100644
--- a/dev-debug/apitrace/Manifest
+++ b/dev-debug/apitrace/Manifest
@@ -1,4 +1,2 @@
-DIST apitrace-12.0-libbacktrace-8602fda64e78f1f46563220f2ee9f7e70819c51d.tar.gz 666166 BLAKE2B 1b35e0dafe31bc5d4fcc826f87f2e8200c27a4194719ee22d278b25fe081ec604e579aee72ebd7ea6d401b1a5bbc4b496b1083e3d761117bc3ccf23aabe046eb SHA512 8f303ff11250cbc644c91a07a55ffb1c6d52ca5eb76e3ea9405645bdd00715a25f57d1f39c7af16efbbe5b008ec76890f7fb3bca95eb89e7cd9a55c14a211643
-DIST apitrace-12.0.tar.gz 2273615 BLAKE2B a58f4d7bc607858e3080d56c739da356c169b25c139ca253f0b15d248a850ede54179776a500321f15e5f389271ad69f5c8c8dec47e0d0b3d4ae9afcea8bda41 SHA512 2af33aec39f43556765455662c69ee22bf3ff5d5fe8b0ca58fe3d555ab1571eab5ddbd4f0011b0c1669043314c8d5166b886ac2825f85d74ebadd9f848598698
DIST apitrace-13.0-libbacktrace-d4bdca038e8685af3043683a881af37489fc1827.tar.gz 683938 BLAKE2B b9cf6ac161ac3babd769acefaf73567a196ffac5658c18cf0cb0f5b5ff153f074e9ac58b7caf08d5ec0bafe2170ced6c96483ddc01f1d4d2713fd90292b6f993 SHA512 d0ff3edd37d40cfe2f0615c8369992a02e9bb579694806bf8faf8c942b25367bdf74cd73f07affbaa2decf27130f49d1663553102e7bc205fc4cd49c72ea15ef
DIST apitrace-13.0.tar.gz 2274587 BLAKE2B 5d28db7a5ee0f4798c14c017c2b35294e1758490b0b277b8011eff0405124f23e71c571cf41613326d47736ec5173b8db8d2dfe16610db29c2339b09ca4632bc SHA512 8a8c5b69722cc2eca8ff3e0b30282b0c134f03a55a6a2383750d9842015e3b3cf6265b8831245aa686e806796cb9a52685a41c1d212f6c9fbb0ae5e3c1b066cf
diff --git a/dev-debug/apitrace/apitrace-12.0.ebuild b/dev-debug/apitrace/apitrace-12.0.ebuild
deleted file mode 100644
index e1834260bc15..000000000000
--- a/dev-debug/apitrace/apitrace-12.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-inherit cmake-multilib multilib optfeature python-single-r1
-
-DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace"
-BACKTRACE_COMMIT="8602fda64e78f1f46563220f2ee9f7e70819c51d"
-SRC_URI="
- https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/ianlancetaylor/libbacktrace/archive/${BACKTRACE_COMMIT}.tar.gz
- -> ${P}-libbacktrace-${BACKTRACE_COMMIT}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gui test X"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="${PYTHON_DEPS}
- app-arch/brotli:=[${MULTILIB_USEDEP}]
- app-arch/snappy:=[${MULTILIB_USEDEP}]
- media-libs/libpng:0=
- media-libs/waffle[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- gui? ( dev-qt/qtbase:6[-gles2-only,gui,widgets] )
- X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- virtual/pkgconfig
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9.0-disable-multiarch.patch
- "${FILESDIR}"/${PN}-12.0-unbundle.patch
-
- # merged, to be removed for the next version
- "${FILESDIR}"/${PN}-9.0-pkgconfig-waffle.patch
- "${FILESDIR}"/${PN}-12.0-include-stdint.patch
- "${FILESDIR}"/${PN}-12.0-no_qtnetwork.patch
- "${FILESDIR}"/${PN}-12.0-bump_cmake_min.patch
- "${FILESDIR}"/${PN}-12.0-find_snappy.patch
- "${FILESDIR}"/${PN}-12.0-tests.patch
- "${FILESDIR}"/${PN}-12.0-fix_qt6.9.patch
-)
-
-src_prepare() {
- sed -e "s:0.0-unknown:${PV}:" -i cmake/GenerateVersion.cmake || die
-
- # still 3rd libs: khronos, crc32c and md5-compat
- rm -r $(find thirdparty -mindepth 1 -maxdepth 1 \
- ! -name crc32c \
- ! -name khronos \
- ! -name md5 \
- ! -name support \
- -type d -print) || die
-
- mv "${WORKDIR}"/libbacktrace-${BACKTRACE_COMMIT} thirdparty/libbacktrace || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- my_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
- -DENABLE_X11=$(usex X)
- -DENABLE_EGL=ON
- -DENABLE_CLI=ON
- -DENABLE_GUI=$(multilib_native_usex gui)
- -DENABLE_QT6=$(multilib_native_usex gui)
- -DENABLE_STATIC_SNAPPY=OFF
- -DENABLE_WAFFLE=ON
- -DPython3_EXECUTABLE="${PYTHON}"
- )
- cmake_src_configure
- }
-
- multilib_foreach_abi my_configure
-}
-
-src_install() {
- MULTILIB_CHOST_TOOLS=(
- /usr/bin/apitrace$(get_exeext)
- /usr/bin/eglretrace$(get_exeext)
- /usr/bin/gltrim$(get_exeext)
- )
- use X && MULTILIB_CHOST_TOOLS+=( /usr/bin/glretrace$(get_exeext) )
-
- cmake-multilib_src_install
-
- make_libegl_symlinks() {
- dosym egltrace.so /usr/$(get_libdir)/${PN}/wrappers/libEGL.so
- dosym egltrace.so /usr/$(get_libdir)/${PN}/wrappers/libEGL.so.1
- }
- multilib_foreach_abi make_libegl_symlinks
-
- make_libgl_symlinks() {
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
- dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
- }
- use X && multilib_foreach_abi make_libgl_symlinks
-}
-
-pkg_postinst() {
- optfeature "retracediff.py: side by side retracing" "dev-python/pillow" "dev-python/numpy"
- optfeature "snapdiff.py: image comparison scripts" "dev-python/pillow"
-}
diff --git a/dev-debug/apitrace/files/apitrace-12.0-bump_cmake_min.patch b/dev-debug/apitrace/files/apitrace-12.0-bump_cmake_min.patch
deleted file mode 100644
index 9ea7db8d15f9..000000000000
--- a/dev-debug/apitrace/files/apitrace-12.0-bump_cmake_min.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-bump cmake_min_required for cmake-4 compatibility
-https://github.com/apitrace/apitrace/commit/fd643354337000c4d1b4497e1ac2fec381202d40
-From fd643354337000c4d1b4497e1ac2fec381202d40 Mon Sep 17 00:00:00 2001
-From: Jose Fonseca <jose.fonseca@broadcom.com>
-Date: Thu, 6 Mar 2025 16:13:30 +0000
-Subject: [PATCH] Bump cmake_minimum_required.
-
----
- thirdparty/libbacktrace.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/thirdparty/libbacktrace.cmake b/thirdparty/libbacktrace.cmake
-index c3d81d975..0e7b4ce51 100644
---- a/thirdparty/libbacktrace.cmake
-+++ b/thirdparty/libbacktrace.cmake
-@@ -29,7 +29,7 @@
- # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- # POSSIBILITY OF SUCH DAMAGE. */
-
--cmake_minimum_required (VERSION 3.1)
-+cmake_minimum_required (VERSION 3.5)
-
- project (libbacktrace)
-
diff --git a/dev-debug/apitrace/files/apitrace-12.0-find_snappy.patch b/dev-debug/apitrace/files/apitrace-12.0-find_snappy.patch
deleted file mode 100644
index 38ca46dff40e..000000000000
--- a/dev-debug/apitrace/files/apitrace-12.0-find_snappy.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
diff --git a/dev-debug/apitrace/files/apitrace-12.0-fix_qt6.9.patch b/dev-debug/apitrace/files/apitrace-12.0-fix_qt6.9.patch
deleted file mode 100644
index aaf1faf7c0c8..000000000000
--- a/dev-debug/apitrace/files/apitrace-12.0-fix_qt6.9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/apitrace/apitrace/pull/950.patch
-From 3f7f0ad7781b3200377eea7257c786317b22fb26 Mon Sep 17 00:00:00 2001
-From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
-Date: Thu, 12 Jun 2025 04:48:21 +0200
-Subject: [PATCH] fix qt-6.9
-
-> gui/qubjson.cpp: In function QString readChar(QDataStream&):
-> gui/qubjson.cpp:151:19:
-> error: no matching function for call to QChar::QChar(qint8&)
-> 151 | return QChar(c);
-
-implicit conversions are disabled for QChar::QChar with qt-6.9
-
-Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
----
- gui/qubjson.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gui/qubjson.cpp b/gui/qubjson.cpp
-index 63a2424ac..096ed7eac 100644
---- a/gui/qubjson.cpp
-+++ b/gui/qubjson.cpp
-@@ -148,7 +148,7 @@ readChar(QDataStream &stream)
- qint8 c;
- stream >> c;
- Q_ASSERT(c >= 0);
-- return QChar(c);
-+ return QChar(static_cast<char>(c));
- }
-
-
diff --git a/dev-debug/apitrace/files/apitrace-12.0-include-stdint.patch b/dev-debug/apitrace/files/apitrace-12.0-include-stdint.patch
deleted file mode 100644
index 0a663e712d1b..000000000000
--- a/dev-debug/apitrace/files/apitrace-12.0-include-stdint.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/apitrace/apitrace/pull/941.patch
-diff --git a/frametrim/ft_dependecyobject.hpp b/frametrim/ft_dependecyobject.hpp
-index 2cd0b76879..0f17b601a3 100644
---- a/frametrim/ft_dependecyobject.hpp
-+++ b/frametrim/ft_dependecyobject.hpp
-@@ -28,6 +28,7 @@
- #pragma once
-
- #include "ft_tracecall.hpp"
-+#include <stdint.h>
-
- namespace frametrim {
-
-diff --git a/retrace/metric_writer.cpp b/retrace/metric_writer.cpp
-index e923ed1d3b..4e4ce74833 100644
---- a/retrace/metric_writer.cpp
-+++ b/retrace/metric_writer.cpp
-@@ -24,6 +24,7 @@
- **************************************************************************/
-
- #include <iostream>
-+#include <stdint.h>
-
- #include "metric_writer.hpp"
-
diff --git a/dev-debug/apitrace/files/apitrace-12.0-no_qtnetwork.patch b/dev-debug/apitrace/files/apitrace-12.0-no_qtnetwork.patch
deleted file mode 100644
index 39a07eaf182c..000000000000
--- a/dev-debug/apitrace/files/apitrace-12.0-no_qtnetwork.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 34123b3..9d4aefb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -182,7 +182,7 @@ if (ENABLE_GUI)
- cmake_policy (SET CMP0020 NEW)
- endif()
- if (ENABLE_QT6)
-- find_package (Qt6 COMPONENTS Widgets Network ${REQUIRE_GUI})
-+ find_package (Qt6 COMPONENTS Widgets ${REQUIRE_GUI})
- else ()
- find_package (Qt5 5.15 COMPONENTS Widgets Network ${REQUIRE_GUI})
- endif ()
-diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
-index 99ae918..afb740c 100644
---- a/gui/CMakeLists.txt
-+++ b/gui/CMakeLists.txt
-@@ -99,7 +99,6 @@ add_executable (qapitrace ${qapitrace_SRCS} ${qapitrace_UIS_H})
-
- target_link_libraries (qapitrace
- Qt::Widgets
-- Qt::Network
- qubjson
- image
- common
diff --git a/dev-debug/apitrace/files/apitrace-12.0-tests.patch b/dev-debug/apitrace/files/apitrace-12.0-tests.patch
deleted file mode 100644
index 8d4a18533635..000000000000
--- a/dev-debug/apitrace/files/apitrace-12.0-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index 34eb7f7..7ca30a1 100644
---- a/thirdparty/CMakeLists.txt
-+++ b/thirdparty/CMakeLists.txt
-@@ -59,10 +59,12 @@ if (CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF")
- include_with_scope (libbacktrace.cmake)
- endif ()
-
--# We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt
--if (NOT GTEST_FOUND)
-- message (STATUS "Using bundled GTest")
-- include_with_scope (gtest.cmake)
-+if (BUILD_TESTING)
-+ # We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt
-+ if (NOT GTEST_FOUND)
-+ message (STATUS "Using bundled GTest")
-+ include_with_scope (gtest.cmake)
-+ endif ()
- endif ()
-
- if (MSVC)
diff --git a/dev-debug/apitrace/files/apitrace-9.0-pkgconfig-waffle.patch b/dev-debug/apitrace/files/apitrace-9.0-pkgconfig-waffle.patch
deleted file mode 100644
index 6d0450886672..000000000000
--- a/dev-debug/apitrace/files/apitrace-9.0-pkgconfig-waffle.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-waffle's upstream intentionally does not ship cmake files anymore
-(just a quick fix that works for us, there may be more to consider)
-
-https://bugs.gentoo.org/901365
-https://gitlab.freedesktop.org/mesa/waffle/-/issues/74
-https://gitlab.freedesktop.org/mesa/waffle/-/commit/a16983fea590491727c8119256c7b938fe1f9d10
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -195,3 +195,4 @@
- # Use Waffle for eglretrace
-- find_package (Waffle REQUIRED)
-+ find_package(PkgConfig REQUIRED)
-+ pkg_check_modules(Waffle REQUIRED waffle-1)
- endif ()
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-08-29 7:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-25 15:41 [gentoo-commits] repo/gentoo:master commit in: dev-debug/apitrace/, dev-debug/apitrace/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-03-25 13:51 Sam James
2025-06-07 16:12 Andreas Sturmlechner
2025-08-29 7:23 Petr Vaněk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox