From 616fae4658d0e57a992f2284d09901afff068b0f Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Tue, 24 Sep 2019 09:27:43 +0200 Subject: libraries/cuneiform: Patch from Debian to avoid strings.h collision. Signed-off-by: Matteo Bernardini --- libraries/cuneiform/cuneiform.SlackBuild | 5 +++++ libraries/cuneiform/strings.patch | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 libraries/cuneiform/strings.patch (limited to 'libraries/cuneiform') diff --git a/libraries/cuneiform/cuneiform.SlackBuild b/libraries/cuneiform/cuneiform.SlackBuild index 10103d58f8..5425c70faa 100644 --- a/libraries/cuneiform/cuneiform.SlackBuild +++ b/libraries/cuneiform/cuneiform.SlackBuild @@ -53,6 +53,11 @@ find -L . \ sed -i 's/\r//g' cuneiform_src/Addfiles/license.txt +# Thanks to Debian +patch -p1 < $CWD/strings.patch +# Thanks to ARCH Linux +patch -p1 < $CWD/cuneiform-gcc.patch + mkdir build cd build cmake \ diff --git a/libraries/cuneiform/strings.patch b/libraries/cuneiform/strings.patch new file mode 100644 index 0000000000..d7b585eab7 --- /dev/null +++ b/libraries/cuneiform/strings.patch @@ -0,0 +1,19 @@ +Author: Andreas Beckmann +Description: avoid strings.h collision + +--- a/cuneiform_src/Kern/hhh/tigerh/h/strings.h ++++ b/cuneiform_src/Kern/hhh/tigerh/h/strings.h +@@ -75,6 +75,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * * + ***************************************************************************/ + ++#include_next ++#if 0 + # ifndef __STRINGS_H_INCLUDE + # define __STRINGS_H_INCLUDE + +@@ -154,3 +156,4 @@ extern STRING *pStringsListEnd; + extern STRING *pStringsUpList; + extern STRING *pStringsDownList; + # endif ++#endif -- cgit v1.2.3