diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-04-13 19:44:43 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-04-14 08:59:45 +0200 |
| commit | 07d5f96c9f36945db509f6f360a81aca06c3ddad (patch) | |
| tree | d4ab7592a48320eccf30820ca46d0cdc0c288bc3 /source/n/libgpg-error | |
| parent | 0be8c4f3725261a2db58f6fb2454330f5c831075 (diff) | |
| download | current-07d5f96c9f36945db509f6f360a81aca06c3ddad.tar.gz | |
Sat Apr 13 19:44:43 UTC 201920190413194443
l/imagemagick-6.9.10_40-x86_64-1.txz: Upgraded.
l/opus-1.3.1-x86_64-1.txz: Upgraded.
n/libqmi-1.22.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n/libgpg-error')
| -rwxr-xr-x | source/n/libgpg-error/libgpg-error.SlackBuild | 5 | ||||
| -rw-r--r-- | source/n/libgpg-error/libgpg-error.gawk5.diff | 49 |
2 files changed, 53 insertions, 1 deletions
diff --git a/source/n/libgpg-error/libgpg-error.SlackBuild b/source/n/libgpg-error/libgpg-error.SlackBuild index 87caab51..af89d645 100755 --- a/source/n/libgpg-error/libgpg-error.SlackBuild +++ b/source/n/libgpg-error/libgpg-error.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2006, 2009 Robby Workman, Northport, AL, USA -# Copyright 2007, 2008, 2009, 2010, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010, 2015, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -77,6 +77,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# 'namespace' is a builtin in gawk5, so change it to 'libgpg_error_namespace': +zcat $CWD/libgpg-error.gawk5.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/n/libgpg-error/libgpg-error.gawk5.diff b/source/n/libgpg-error/libgpg-error.gawk5.diff new file mode 100644 index 00000000..d8842db4 --- /dev/null +++ b/source/n/libgpg-error/libgpg-error.gawk5.diff @@ -0,0 +1,49 @@ +--- ./src/Makefile.in.orig 2019-03-19 03:58:04.000000000 -0500 ++++ ./src/Makefile.in 2019-04-13 13:58:45.614800729 -0500 +@@ -1615,7 +1615,7 @@ + + errnos-sym.h: Makefile mkstrtable.awk errnos.in + $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ +- -v prefix=GPG_ERR_ -v namespace=errnos_ \ ++ -v prefix=GPG_ERR_ -v libgpg_error_namespace=errnos_ \ + $(srcdir)/errnos.in >$@ + + mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile +--- ./src/mkstrtable.awk.orig 2013-03-15 14:24:25.000000000 -0500 ++++ ./src/mkstrtable.awk 2019-04-13 13:57:47.141800103 -0500 +@@ -77,7 +77,7 @@ + # + # The variable prefix can be used to prepend a string to each message. + # +-# The variable namespace can be used to prepend a string to each ++# The variable libgpg_error_namespace can be used to prepend a string to each + # variable and macro name. + + BEGIN { +@@ -102,7 +102,7 @@ + print "/* The purpose of this complex string table is to produce"; + print " optimal code with a minimum of relocations. */"; + print ""; +- print "static const char " namespace "msgstr[] = "; ++ print "static const char " libgpg_error_namespace "msgstr[] = "; + header = 0; + } + else +@@ -150,7 +150,7 @@ + else + print " gettext_noop (\"" last_msgstr "\");"; + print ""; +- print "static const int " namespace "msgidx[] ="; ++ print "static const int " libgpg_error_namespace "msgidx[] ="; + print " {"; + for (i = 0; i < coded_msgs; i++) + print " " pos[i] ","; +@@ -158,7 +158,7 @@ + print " };"; + print ""; + print "static GPG_ERR_INLINE int"; +- print namespace "msgidxof (int code)"; ++ print libgpg_error_namespace "msgidxof (int code)"; + print "{"; + print " return (0 ? 0"; + |