From 299ed32396f6a156776f0e03086111eff38fec238faf13df043d03531046a6a7 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 2 Sep 2020 08:41:53 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/heaptrack?expand=0&rev=22 --- Fix-compile-on-32bit.patch | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 Fix-compile-on-32bit.patch diff --git a/Fix-compile-on-32bit.patch b/Fix-compile-on-32bit.patch deleted file mode 100644 index 859c82e..0000000 --- a/Fix-compile-on-32bit.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 76fd2e84ba133e96d2cfdf90cb715e66e923eb8f Mon Sep 17 00:00:00 2001 -From: Milian Wolff -Date: Thu, 17 May 2018 13:31:25 +0200 -Subject: Fix compile on 32bit - -BUG: 394330 ---- - src/util/linewriter.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/util/linewriter.h b/src/util/linewriter.h -index 73a7930..e895e87 100644 ---- a/src/util/linewriter.h -+++ b/src/util/linewriter.h -@@ -158,6 +158,11 @@ public: - return __builtin_clzl(V); - } - -+ inline static unsigned clz(long long unsigned V) -+ { -+ return __builtin_clzll(V); -+ } -+ - template - static char* writeHexNumber(char* buffer, V value) - { --- -cgit v0.11.2 - From 00c75ba266a944c06e34010319f5147a8c78c95c2bf64f3617454bbe2241cbd2 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 2 Sep 2020 08:42:44 +0000 Subject: [PATCH 2/3] Revert accidental change OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/heaptrack?expand=0&rev=23 --- Fix-compile-on-32bit.patch | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 Fix-compile-on-32bit.patch diff --git a/Fix-compile-on-32bit.patch b/Fix-compile-on-32bit.patch new file mode 100644 index 0000000..859c82e --- /dev/null +++ b/Fix-compile-on-32bit.patch @@ -0,0 +1,29 @@ +From 76fd2e84ba133e96d2cfdf90cb715e66e923eb8f Mon Sep 17 00:00:00 2001 +From: Milian Wolff +Date: Thu, 17 May 2018 13:31:25 +0200 +Subject: Fix compile on 32bit + +BUG: 394330 +--- + src/util/linewriter.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/util/linewriter.h b/src/util/linewriter.h +index 73a7930..e895e87 100644 +--- a/src/util/linewriter.h ++++ b/src/util/linewriter.h +@@ -158,6 +158,11 @@ public: + return __builtin_clzl(V); + } + ++ inline static unsigned clz(long long unsigned V) ++ { ++ return __builtin_clzll(V); ++ } ++ + template + static char* writeHexNumber(char* buffer, V value) + { +-- +cgit v0.11.2 + From 7f2d1c418afb288e3b2fcead8be91efbbfbeaf5049c78f31d40d1abae28c5ac3 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 5 Sep 2020 18:25:48 +0000 Subject: [PATCH 3/3] Accepting request 832517 from home:kfreitag:branches:KDE:Extra - Update to upstream version 1.2.0, a bugfix release. - Removed Fix-compile-on-32bit.patch as it was added upstream. OBS-URL: https://build.opensuse.org/request/show/832517 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/heaptrack?expand=0&rev=24 --- Fix-compile-on-32bit.patch | 29 ----------------------------- heaptrack-1.1.0.tar.xz | 3 --- heaptrack-1.2.0.tar.xz | 3 +++ heaptrack.changes | 6 ++++++ heaptrack.spec | 5 +---- 5 files changed, 10 insertions(+), 36 deletions(-) delete mode 100644 Fix-compile-on-32bit.patch delete mode 100644 heaptrack-1.1.0.tar.xz create mode 100644 heaptrack-1.2.0.tar.xz diff --git a/Fix-compile-on-32bit.patch b/Fix-compile-on-32bit.patch deleted file mode 100644 index 859c82e..0000000 --- a/Fix-compile-on-32bit.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 76fd2e84ba133e96d2cfdf90cb715e66e923eb8f Mon Sep 17 00:00:00 2001 -From: Milian Wolff -Date: Thu, 17 May 2018 13:31:25 +0200 -Subject: Fix compile on 32bit - -BUG: 394330 ---- - src/util/linewriter.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/util/linewriter.h b/src/util/linewriter.h -index 73a7930..e895e87 100644 ---- a/src/util/linewriter.h -+++ b/src/util/linewriter.h -@@ -158,6 +158,11 @@ public: - return __builtin_clzl(V); - } - -+ inline static unsigned clz(long long unsigned V) -+ { -+ return __builtin_clzll(V); -+ } -+ - template - static char* writeHexNumber(char* buffer, V value) - { --- -cgit v0.11.2 - diff --git a/heaptrack-1.1.0.tar.xz b/heaptrack-1.1.0.tar.xz deleted file mode 100644 index a9bdba1..0000000 --- a/heaptrack-1.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:120f8b276f772aa3409fc3d628dbe7c4fa9d0d98cd710982b6007e6113e13f3b -size 900460 diff --git a/heaptrack-1.2.0.tar.xz b/heaptrack-1.2.0.tar.xz new file mode 100644 index 0000000..7cbe43c --- /dev/null +++ b/heaptrack-1.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d494dff438aa0ae5d6bae286db14b0ac582604b8674f7a2adfb9fc19dfe62848 +size 1092272 diff --git a/heaptrack.changes b/heaptrack.changes index e8b470d..3503aee 100644 --- a/heaptrack.changes +++ b/heaptrack.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 5 16:11:52 UTC 2020 - Klaas Freitag + +- Update to upstream version 1.2.0, a bugfix release. +- Removed Fix-compile-on-32bit.patch as it was added upstream. + ------------------------------------------------------------------- Mon Aug 31 15:38:09 UTC 2020 - Christophe Giboudeaux diff --git a/heaptrack.spec b/heaptrack.spec index da108f4..964e411 100644 --- a/heaptrack.spec +++ b/heaptrack.spec @@ -19,15 +19,13 @@ %define kf5_version 5.26.0 %bcond_without lang Name: heaptrack -Version: 1.1.0 +Version: 1.2.0 Release: 0 Summary: Heap Memory Allocation Profiler License: LGPL-2.1-or-later Group: Development/Tools/Other URL: https://userbase.kde.org/Heaptrack Source0: https://download.kde.org/stable/heaptrack/%{version}/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -Patch0: Fix-compile-on-32bit.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: libboost_iostreams-devel @@ -77,7 +75,6 @@ A Qt5/KF5 based GUI for Heaptrack. %prep %setup -q -%autopatch -p1 # Disable building tests, they're not used and post-build-checks trips over it sed -i"" '/add_subdirectory(tests)/d' CMakeLists.txt