pool/dpkg
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- use-clamp-from-C-STD-library.patch: removed, upstreamed

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=83
This commit is contained in:
Adam Majer 2021-06-08 12:56:50 +00:00 committed by Git OBS Bridge
parent 28727f17d6
commit 2e6429b69d
3 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dpkg.changes
View File

@ -1,8 +1,7 @@
-------------------------------------------------------------------
Tue Jun 8 11:37:06 UTC 2021 - Adam Majer <adam.majer@suse.de>
- use-clamp-from-C-STD-library.patch: actually remove the clamp
macro instead of using fragile preprocessor patches
- use-clamp-from-C-STD-library.patch: removed, upstreamed
-------------------------------------------------------------------
Thu Apr 29 08:28:48 UTC 2021 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>

3
dpkg.spec
View File

@ -30,8 +30,6 @@ Patch1: update-alternatives-suse.patch
# PATCH-FIX-SUSE: tar of Leap 42.{2,3} does not recognize --sort=name, --clamp-mtime options
Patch2: drop-tar-option.patch
Patch3: ncurses-fix.patch
# PATCH-FIX-OPENSUSE: Use clamp from C++ STD library.
Patch4: use-clamp-from-C-STD-library.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@ -91,7 +89,6 @@ Libraries and header files for dpkg.
%patch2 -p1
%endif
%patch3 -p1
%patch4 -p1
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects

36
use-clamp-from-C-STD-library.patch
View File

@ -1,36 +0,0 @@
From 43bf69b419bcfc0c601015d753b921b6849bae06 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Fri, 23 Apr 2021 11:03:59 +0200
Subject: [PATCH] Use clamp from C++ STD library.
---
lib/dpkg/macros.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: dpkg-1.20.9/lib/dpkg/macros.h
===================================================================
--- dpkg-1.20.9.orig/lib/dpkg/macros.h
+++ dpkg-1.20.9/lib/dpkg/macros.h
@@ -144,22 +144,6 @@
#endif
#endif
-/**
- * @def clamp
- *
- * Returns a normalized value within the low and high limits.
- *
- * @param v The value to clamp.
- * @param l The low limit.
- * @param h The high limit.
- */
-/* For C++ use native implementations from STL or similar. */
-#ifndef __cplusplus
-#ifndef clamp
-#define clamp(v, l, h) ((v) > (h) ? (h) : ((v) < (l) ? (l) : (v)))
-#endif
-#endif
-
/** @} */
#endif /* LIBDPKG_MACROS_H */