diff options
| author |   Matteo Bernardini <ponce@slackbuilds.org> | 2019-09-24 09:27:43 +0200 |
|---|---|---|
| committer |   Robby Workman <rworkman@slackbuilds.org> | 2021-04-17 23:17:44 -0500 |
| commit | 616fae4658d0e57a992f2284d09901afff068b0f (patch) | |
| tree | 04cc4b7f9aca8e6a075e5ed3f4b8158731dc8283 /libraries/cuneiform | |
| parent | 9bf81be0c6c7f1cb17a8f5fd8476b6aeb9dc5258 (diff) | |
| download | slackbuilds-616fae4658d0e57a992f2284d09901afff068b0f.tar.gz slackbuilds-616fae4658d0e57a992f2284d09901afff068b0f.tar.xz | |
libraries/cuneiform: Patch from Debian to avoid strings.h collision.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'libraries/cuneiform')
| -rw-r--r-- | libraries/cuneiform/cuneiform.SlackBuild | 5 | ||||
| -rw-r--r-- | libraries/cuneiform/strings.patch | 19 |
2 files changed, 24 insertions, 0 deletions
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 <anbe@debian.org> +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 <strings.h> ++#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 |