SHA256
1
0
forked from pool/heaptrack

Accepting request 1063700 from KDE:Extra

- Add GCC 13 and boost 1.81 compatibility patches:
  * 0001-Fix-build-with-gcc-13-by-including-cstdint.patch
  * 0001-Add-missing-include.patch

OBS-URL: https://build.opensuse.org/request/show/1063700
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/heaptrack?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger 2023-02-08 16:20:13 +00:00 committed by Git OBS Bridge
commit 0894c742c7
4 changed files with 67 additions and 0 deletions

View File

@ -0,0 +1,27 @@
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.
---
src/analyze/gui/histogrammodel.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/analyze/gui/histogrammodel.h b/src/analyze/gui/histogrammodel.h
index df11fa3..49b9a4e 100644
--- 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
--
2.39.1

View File

@ -0,0 +1,29 @@
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
---
src/util/linereader.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/util/linereader.h b/src/util/linereader.h
index 18ec165..a8af47c 100644
--- 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>
--
2.39.1

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Feb 7 23:22:36 UTC 2023 - Christophe Marin <christophe@krop.fr>
- Add GCC 13 and boost 1.81 compatibility patches:
* 0001-Fix-build-with-gcc-13-by-including-cstdint.patch
* 0001-Add-missing-include.patch
-------------------------------------------------------------------
Sun Nov 27 08:15:26 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -29,6 +29,10 @@ Source0: https://download.kde.org/stable/heaptrack/%{version}/%{name}-%{v
Source1: https://download.kde.org/stable/heaptrack/%{version}/%{name}-%{version}.tar.xz.sig
Source2: heaptrack.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch0: 0001-Fix-build-with-gcc-13-by-including-cstdint.patch
# PATCH-FIX-UPSTREAM
Patch1: 0001-Add-missing-include.patch
BuildRequires: extra-cmake-modules
BuildRequires: kf5-filesystem
BuildRequires: libboost_container-devel