public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/heaptrack/, dev-util/heaptrack/files/
Date: Thu, 22 Dec 2022 02:30:33 +0000 (UTC)	[thread overview]
Message-ID: <1671676116.ac7a50dc4fbb1de933dbc6bbcb26694995cd629b.sam@gentoo> (raw)

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


             reply	other threads:[~2022-12-22  2:30 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-22  2:30 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-01-26  7:15 [gentoo-commits] repo/gentoo:master commit in: dev-util/heaptrack/, dev-util/heaptrack/files/ Sam James
2021-12-20 12:42 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1671676116.ac7a50dc4fbb1de933dbc6bbcb26694995cd629b.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox