From 95b8f5c8172e3311b7af1ebfa9febfa8b17e0965 Mon Sep 17 00:00:00 2001 From: krop <> Date: Feb 22 2023 14:32:38 +0000 Subject: Update heaptrack to version 1.4.0 / rev 11 via SR 1067140 https://build.opensuse.org/request/show/1067140 by user krop + dimstar_suse - Add upstream change: * 0001-Return-early-when-__libc_dlopen_mode-is-detected.patch - Define _filter_GLIBC_PRIVATE to fix installation on Leap --- diff --git a/packages/h/heaptrack/.files b/packages/h/heaptrack/.files index 1fcf5fd..a47d542 100644 Binary files a/packages/h/heaptrack/.files and b/packages/h/heaptrack/.files differ diff --git a/packages/h/heaptrack/.rev b/packages/h/heaptrack/.rev index 1942689..b23bb5c 100644 --- a/packages/h/heaptrack/.rev +++ b/packages/h/heaptrack/.rev @@ -97,4 +97,14 @@ * 0001-Add-missing-include.patch 1063700 + + 8d275b8dff49e2be5162ab9c7def33eb + 1.4.0 + + dimstar_suse + - Add upstream change: + * 0001-Return-early-when-__libc_dlopen_mode-is-detected.patch +- Define _filter_GLIBC_PRIVATE to fix installation on Leap + 1067140 + diff --git a/packages/h/heaptrack/0001-Return-early-when-__libc_dlopen_mode-is-detected.patch b/packages/h/heaptrack/0001-Return-early-when-__libc_dlopen_mode-is-detected.patch new file mode 100644 index 0000000..16d079c --- /dev/null +++ b/packages/h/heaptrack/0001-Return-early-when-__libc_dlopen_mode-is-detected.patch @@ -0,0 +1,24 @@ +From 161bd9f7f352cbc24f36e37f9686d18f5d40c268 Mon Sep 17 00:00:00 2001 +From: Milian Wolff +Date: Mon, 11 Jul 2022 15:54:56 +0200 +Subject: [PATCH] Return early when __libc_dlopen_mode is detected + +--- + src/track/heaptrack_env.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/track/heaptrack_env.cpp b/src/track/heaptrack_env.cpp +index b48e384..36da2ff 100644 +--- a/src/track/heaptrack_env.cpp ++++ b/src/track/heaptrack_env.cpp +@@ -26,6 +26,7 @@ void dlopenLine(const char* lib) + if (&__libc_dlopen_mode) { + // __libc_dlopen_mode was available directly in glibc before libdl got merged into it + fprintf(stdout, "__libc_dlopen_mode(\"%s\", 0x80000000 | 0x002)\n", lib); ++ return; + } + + #ifdef __USE_GNU +-- +2.39.2 + diff --git a/packages/h/heaptrack/heaptrack.changes b/packages/h/heaptrack/heaptrack.changes index 3a30d99..6a1220a 100644 --- a/packages/h/heaptrack/heaptrack.changes +++ b/packages/h/heaptrack/heaptrack.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 22 10:57:50 UTC 2023 - Christophe Marin + +- Add upstream change: + * 0001-Return-early-when-__libc_dlopen_mode-is-detected.patch +- Define _filter_GLIBC_PRIVATE to fix installation on Leap + +------------------------------------------------------------------- Tue Feb 7 23:22:36 UTC 2023 - Christophe Marin - Add GCC 13 and boost 1.81 compatibility patches: diff --git a/packages/h/heaptrack/heaptrack.spec b/packages/h/heaptrack/heaptrack.spec index 0ce6b58..0489bfe 100644 --- a/packages/h/heaptrack/heaptrack.spec +++ b/packages/h/heaptrack/heaptrack.spec @@ -17,6 +17,8 @@ %define kf5_version 5.26.0 +# Needed for Leap see boo#468748 +%define _filter_GLIBC_PRIVATE 1 %bcond_without released Name: heaptrack Version: 1.4.0 @@ -33,6 +35,8 @@ Source2: heaptrack.keyring Patch0: 0001-Fix-build-with-gcc-13-by-including-cstdint.patch # PATCH-FIX-UPSTREAM Patch1: 0001-Add-missing-include.patch +# PATCH-FIX-UPSTREAM +Patch2: 0001-Return-early-when-__libc_dlopen_mode-is-detected.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: libboost_container-devel