From 0cac62642d210fe43fdbb794d6d2db537478ff17e74a48c3155c2bd491ee161b Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 7 Feb 2023 23:22:59 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/heaptrack?expand=0&rev=34 --- ...ild-with-gcc-13-by-including-cstdint.patch | 29 +++++++++++++++++++ heaptrack.changes | 6 ++++ heaptrack.spec | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 0001-Fix-build-with-gcc-13-by-including-cstdint.patch diff --git a/0001-Fix-build-with-gcc-13-by-including-cstdint.patch b/0001-Fix-build-with-gcc-13-by-including-cstdint.patch new file mode 100644 index 0000000..a4cc8f6 --- /dev/null +++ b/0001-Fix-build-with-gcc-13-by-including-cstdint.patch @@ -0,0 +1,29 @@ +From 315aa7116d588f92b67c4bb84e1549529cb2fca0 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Mon, 23 Jan 2023 23:44:09 +0100 +Subject: [PATCH] Fix build with gcc 13 by including + +Like other versions before, gcc 13 moved some includes around and as a +result 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 + #include + #include + +-- +2.39.1 + diff --git a/heaptrack.changes b/heaptrack.changes index 83c7efa..d2c88bd 100644 --- a/heaptrack.changes +++ b/heaptrack.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 7 23:22:36 UTC 2023 - Christophe Marin + +- Add GCC 13 compatibility patch: + * 0001-Fix-build-with-gcc-13-by-including-cstdint.patch + ------------------------------------------------------------------- Sun Nov 27 08:15:26 UTC 2022 - Christophe Giboudeaux diff --git a/heaptrack.spec b/heaptrack.spec index 7117ced..7c85d5e 100644 --- a/heaptrack.spec +++ b/heaptrack.spec @@ -29,6 +29,8 @@ 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 BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: libboost_container-devel From 095f03549e5c95db6ebb607af30ff64defee26b321a24335cc6d96e5db9c62bb Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 7 Feb 2023 23:25:55 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/heaptrack?expand=0&rev=35 --- 0001-Add-missing-include.patch | 27 +++++++++++++++++++++++++++ heaptrack.changes | 3 ++- heaptrack.spec | 2 ++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0001-Add-missing-include.patch diff --git a/0001-Add-missing-include.patch b/0001-Add-missing-include.patch new file mode 100644 index 0000000..826eeef --- /dev/null +++ b/0001-Add-missing-include.patch @@ -0,0 +1,27 @@ +From de3174aa1d1293636079473ff693d9a274a093a9 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Fri, 16 Dec 2022 00:01:15 +0100 +Subject: [PATCH] Add missing include + +This fixes the build with boost 1.81.0. 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 + ++#include ++ + #include "treemodel.h" + + struct HistogramColumn +-- +2.39.1 + diff --git a/heaptrack.changes b/heaptrack.changes index d2c88bd..b5d8f6b 100644 --- a/heaptrack.changes +++ b/heaptrack.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- Tue Feb 7 23:22:36 UTC 2023 - Christophe Marin -- Add GCC 13 compatibility patch: +- 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 diff --git a/heaptrack.spec b/heaptrack.spec index 7c85d5e..94f2456 100644 --- a/heaptrack.spec +++ b/heaptrack.spec @@ -31,6 +31,8 @@ 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