[gentoo-commits] repo/gentoo:master commit in: dev-util/heaptrack/, dev-util/heaptrack/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/heaptrack/, dev-util/heaptrack/files/

[Andreas Sturmlechner]

commit:     2df53de7655592e1345c4c47194a75e3cdf7fd51
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 20 11:04:42 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 12:41:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df53de7

dev-util/heaptrack: Fix cmake with IUSE=-gui

Closes: https://bugs.gentoo.org/829606
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../heaptrack/files/heaptrack-1.3.0-cmake.patch    | 58 ++++++++++++++++++++++
 dev-util/heaptrack/heaptrack-1.3.0.ebuild          |  2 +
 2 files changed, 60 insertions(+)

diff --git a/dev-util/heaptrack/files/heaptrack-1.3.0-cmake.patch b/dev-util/heaptrack/files/heaptrack-1.3.0-cmake.patch
new file mode 100644
index 000000000000..fe4cfd6fed93
--- /dev/null
+++ b/dev-util/heaptrack/files/heaptrack-1.3.0-cmake.patch
@@ -0,0 +1,58 @@
+From 24d593624a41488416116057fc36e9962a548477 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 20 Dec 2021 11:43:26 +0100
+Subject: [PATCH] Let releaseme know to skip po install
+
+Since KF5I18n is optional AND dependent on HEAPTRACK_BUILD_GUI, we
+have to call ki18n_install(po) conditionally on our own and in
+addition tell releaseme not to touch CMakeLists.txt to do the same.
+
+Otherwise releaseme adds the following code unconditionally at the
+end of the file:
+
+    find_package(KF5I18n CONFIG REQUIRED)
+    ki18n_install(po)
+
+ki18n_install checks for existence of po subdir and returns silently
+if none found, so it is safe for git sources too.
+
+* asturmlechner 2021-12-20: Modified for 1.3.0 release.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt             | 4 ++++
+ src/analyze/CMakeLists.txt | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4ccfc88..06c43cf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -169,7 +169,8 @@
+ add_subdirectory(src)
+ add_subdirectory(tests)
+ 
+-feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++# Let releaseme know about this:
++# SKIP_PO_INSTALL
++# (KF5I18n is optional in src/analyze/CMakeLists.txt...)
+ 
+-find_package(KF5I18n CONFIG REQUIRED)
+-ki18n_install(po)
++feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+diff --git a/src/analyze/CMakeLists.txt b/src/analyze/CMakeLists.txt
+index 592f337..763c671 100644
+--- a/src/analyze/CMakeLists.txt
++++ b/src/analyze/CMakeLists.txt
+@@ -41,6 +41,9 @@ if(HEAPTRACK_BUILD_GUI)
+             find_package(KF5 ${REQUIRED_IN_APPIMAGE} COMPONENTS CoreAddons I18n ItemModels ThreadWeaver ConfigWidgets KIO IconThemes)
+             find_package(KChart ${REQUIRED_IN_APPIMAGE} "2.6.0")
+             set_package_properties(KChart PROPERTIES TYPE RECOMMENDED PURPOSE "Required for the heaptrack_gui executable. Get it from the kdiagram module.")
++        if(KF5I18n_FOUND)
++            ki18n_install(../../po)
++        endif()
+     endif()
+ endif()
+ 
+-- 
+2.34.1

diff --git a/dev-util/heaptrack/heaptrack-1.3.0.ebuild b/dev-util/heaptrack/heaptrack-1.3.0.ebuild
index 415f90a3f430..bca3728eeba1 100644
--- a/dev-util/heaptrack/heaptrack-1.3.0.ebuild
+++ b/dev-util/heaptrack/heaptrack-1.3.0.ebuild
@@ -44,6 +44,8 @@ BDEPEND="
 	gui? ( kde-frameworks/extra-cmake-modules:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 829606
+
 src_prepare() {
 	cmake_src_prepare
 	rm -rf 3rdparty/boost-zstd || die # ensure no bundling

[gentoo-commits] repo/gentoo:master commit in: dev-util/heaptrack/, dev-util/heaptrack/files/

[Sam James]

commit:     ac7a50dc4fbb1de933dbc6bbcb26694995cd629b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 02:28:36 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 02:28:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac7a50dc

dev-util/heaptrack: fix build w/ boost 1.81

Closes: https://bugs.gentoo.org/887033
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/heaptrack-1.4.0-boost-1.81.patch         | 23 ++++++++++++++++++++++
 dev-util/heaptrack/heaptrack-1.4.0.ebuild          |  4 ++++
 2 files changed, 27 insertions(+)

diff --git a/dev-util/heaptrack/files/heaptrack-1.4.0-boost-1.81.patch b/dev-util/heaptrack/files/heaptrack-1.4.0-boost-1.81.patch
new file mode 100644
index 000000000000..564f0925a9be
--- /dev/null
+++ b/dev-util/heaptrack/files/heaptrack-1.4.0-boost-1.81.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/887033
+https://invent.kde.org/sdk/heaptrack/-/commit/de3174aa1d1293636079473ff693d9a274a093a9
+
+From de3174aa1d1293636079473ff693d9a274a093a9 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+Date: Fri, 16 Dec 2022 00:01:15 +0100
+Subject: [PATCH] Add missing include
+
+This fixes the build with boost 1.81.0. <array> was included by one of
+the boost headers, however, it's no longer included as of Boost 1.81.0.
+--- a/src/analyze/gui/histogrammodel.h
++++ b/src/analyze/gui/histogrammodel.h
+@@ -9,6 +9,8 @@
+ 
+ #include <QAbstractTableModel>
+ 
++#include <array>
++
+ #include "treemodel.h"
+ 
+ struct HistogramColumn
+-- 
+GitLab

diff --git a/dev-util/heaptrack/heaptrack-1.4.0.ebuild b/dev-util/heaptrack/heaptrack-1.4.0.ebuild
index fd9b0ba63961..29eec26eb107 100644
--- a/dev-util/heaptrack/heaptrack-1.4.0.ebuild
+++ b/dev-util/heaptrack/heaptrack-1.4.0.ebuild
@@ -44,6 +44,10 @@ BDEPEND="
 	gui? ( kde-frameworks/extra-cmake-modules:5 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-boost-1.81.patch # bug #887033, in master
+)
+
 src_prepare() {
 	cmake_src_prepare
 	rm -rf 3rdparty/boost-zstd || die # ensure no bundling

[gentoo-commits] repo/gentoo:master commit in: dev-util/heaptrack/, dev-util/heaptrack/files/

[Sam James]

commit:     1081e019e0dd2d41ad2d9832e7a7e0209865cbca
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 07:10:36 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 07:14:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1081e019

dev-util/heaptrack: fix build w/ gcc 13

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../heaptrack/files/heaptrack-1.4.0-gcc-13.patch   | 22 ++++++++++++++++++++++
 dev-util/heaptrack/heaptrack-1.4.0.ebuild          |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/dev-util/heaptrack/files/heaptrack-1.4.0-gcc-13.patch b/dev-util/heaptrack/files/heaptrack-1.4.0-gcc-13.patch
new file mode 100644
index 000000000000..706d479f5275
--- /dev/null
+++ b/dev-util/heaptrack/files/heaptrack-1.4.0-gcc-13.patch
@@ -0,0 +1,22 @@
+https://invent.kde.org/sdk/heaptrack/-/commit/315aa7116d588f92b67c4bb84e1549529cb2fca0
+
+From 315aa7116d588f92b67c4bb84e1549529cb2fca0 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+Date: Mon, 23 Jan 2023 23:44:09 +0100
+Subject: [PATCH] Fix build with gcc 13 by including <cstdint>
+
+Like other versions before, gcc 13 moved some includes around and as a
+result <cstdint> is no longer transitively included [1]. Explicitly include
+it for uint{32,64}_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+--- a/src/util/linereader.h
++++ b/src/util/linereader.h
+@@ -7,6 +7,7 @@
+ #ifndef LINEREADER_H
+ #define LINEREADER_H
+ 
++#include <cstdint>
+ #include <istream>
+ #include <string>
+ 

diff --git a/dev-util/heaptrack/heaptrack-1.4.0.ebuild b/dev-util/heaptrack/heaptrack-1.4.0.ebuild
index 29eec26eb107..01e625807144 100644
--- a/dev-util/heaptrack/heaptrack-1.4.0.ebuild
+++ b/dev-util/heaptrack/heaptrack-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -46,6 +46,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-boost-1.81.patch # bug #887033, in master
+	"${FILESDIR}"/${P}-gcc-13.patch # in master
 )
 
 src_prepare() {