From ac06c461c99f36486c782018ba0646fa068974c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Wed, 6 Jan 2021 21:12:22 +0100 Subject: groups/251.native_packages_lib.group: libgpg_error: bump to v1.41 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lucio Andrés Illanes Albornoz --- groups/251.native_packages_lib.group | 4 +- patches/libgpg_error-1.36.local.patch | 54 --------- patches/libgpg_error-1.36_pre.local.patch | 193 ------------------------------ patches/libgpg_error-1.41.local.patch | 54 +++++++++ patches/libgpg_error-1.41_pre.local.patch | 36 ++++++ 5 files changed, 92 insertions(+), 249 deletions(-) delete mode 100644 patches/libgpg_error-1.36.local.patch delete mode 100644 patches/libgpg_error-1.36_pre.local.patch create mode 100644 patches/libgpg_error-1.41.local.patch create mode 100644 patches/libgpg_error-1.41_pre.local.patch diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index f009ab11..27f8c887 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -93,8 +93,8 @@ libxslt libz libzip lzo sdl1 sdl1_net sdl1_image sdl2 sdl2_image sdl2_ttf wolfss : ${PKG_LIBGCRYPT_VERSION:=1.8.7}; : ${PKG_LIBGCRYPT_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${PKG_LIBGCRYPT_VERSION}.tar.bz2}; : ${PKG_LIBGCRYPT_CONFIGURE_ARGS_EXTRA:=--with-libgpg-error-prefix=${PREFIX_NATIVE} --disable-asm --disable-padlock-support --disable-aesni-support --disable-pclmul-support --disable-sse41-support --disable-drng-support --disable-avx-support --disable-avx2-support --disable-amd64-as-feature-detection}; -: ${PKG_LIBGPG_ERROR_SHA256SUM:=babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c}; -: ${PKG_LIBGPG_ERROR_VERSION:=1.36}; +: ${PKG_LIBGPG_ERROR_SHA256SUM:=64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742}; +: ${PKG_LIBGPG_ERROR_VERSION:=1.41}; : ${PKG_LIBGPG_ERROR_URL:=https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${PKG_LIBGPG_ERROR_VERSION}.tar.bz2}; : ${PKG_LIBGPG_ERROR_FORCE_AUTORECONF:=1}; : ${PKG_LIBGPG_ERROR_IN_TREE:=1}; diff --git a/patches/libgpg_error-1.36.local.patch b/patches/libgpg_error-1.36.local.patch deleted file mode 100644 index 5da8699e..00000000 --- a/patches/libgpg_error-1.36.local.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- libgpg-error-1.25/src/syscfg/lock-obj-pub.i686-nt64-midipix.h.orig 2016-12-17 21:12:38.401523100 +0100 -+++ libgpg-error-1.25/src/syscfg/lock-obj-pub.i686-nt64-midipix.h 2016-12-17 21:12:38.401523100 +0100 -@@ -0,0 +1,23 @@ -+## lock-obj-pub.i686-pc-linux-gnu.h -+## File created by gen-posix-lock-obj - DO NOT EDIT -+## To be included by mkheader into gpg-error.h -+ -+typedef struct -+{ -+ long _vers; -+ union { -+ volatile char _priv[24]; -+ long _x_align; -+ long *_xp_align; -+ } u; -+} gpgrt_lock_t; -+ -+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0}}} -+## -+## Local Variables: -+## mode: c -+## buffer-read-only: t -+## End: -+## ---- libgpg-error-1.25/src/syscfg/lock-obj-pub.x86_64-nt64-midipix.h.orig 2016-12-17 21:12:38.401523100 +0100 -+++ libgpg-error-1.25/src/syscfg/lock-obj-pub.x86_64-nt64-midipix.h 2016-12-17 21:12:38.401523100 +0100 -@@ -0,0 +1,25 @@ -+## lock-obj-pub.x86_64-pc-linux-musl.h -+## File created by gen-posix-lock-obj - DO NOT EDIT -+## To be included by mkheader into gpg-error.h -+ -+typedef struct -+{ -+ long _vers; -+ union { -+ volatile char _priv[40]; -+ long _x_align; -+ long *_xp_align; -+ } u; -+} gpgrt_lock_t; -+ -+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0}}} -+## -+## Local Variables: -+## mode: c -+## buffer-read-only: t -+## End: -+## diff --git a/patches/libgpg_error-1.36_pre.local.patch b/patches/libgpg_error-1.36_pre.local.patch deleted file mode 100644 index da2dbf99..00000000 --- a/patches/libgpg_error-1.36_pre.local.patch +++ /dev/null @@ -1,193 +0,0 @@ -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk -index ae29043..9a1fc18 100644 ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/Makefile.am b/src/Makefile.am -index ce1b882..f2590cb 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile - - 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 pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - -diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk -index 46d436c..e9c857c 100644 ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk -index a771a73..4578e29 100644 ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk -index ea58503..188f7a4 100644 ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk -index f79df66..15b1aad 100644 ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk -index c9de9c1..285e45f 100644 ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -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 pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - 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 " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - --- -2.11.0 -diff -ru a/configure.ac b/configure.ac ---- a/configure.ac 2019-03-19 04:56:05.000000000 -0400 -+++ b/configure.ac 2020-03-11 12:27:31.000000000 -0400 -@@ -549,19 +549,19 @@ - fi - ;; - esac --case "$libdir" in -- /usr/lib|/usr/lib64|/lib|/lib64) ;; -- '${exec_prefix}/lib') -- if test "$exec_prefix" = "NONE"; then -- if test "$prefix" != / -a "$prefix" != /usr; then -- GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" -- fi -- elif test "$exec_prefix" != / -a "$exec_prefix" != /usr; then -- GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" -- fi -- ;; -- *) GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ;; --esac -+#case "$libdir" in -+# /usr/lib|/usr/lib64|/lib|/lib64) ;; -+# '${exec_prefix}/lib') -+# if test "$exec_prefix" = "NONE"; then -+# if test "$prefix" != / -a "$prefix" != /usr; then -+# GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" -+# fi -+# elif test "$exec_prefix" != / -a "$exec_prefix" != /usr; then -+# GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" -+# fi -+# ;; -+# *) GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ;; -+#esac - - AC_SUBST(GPG_ERROR_CONFIG_LIBS) - AC_SUBST(GPG_ERROR_CONFIG_CFLAGS) diff --git a/patches/libgpg_error-1.41.local.patch b/patches/libgpg_error-1.41.local.patch new file mode 100644 index 00000000..5da8699e --- /dev/null +++ b/patches/libgpg_error-1.41.local.patch @@ -0,0 +1,54 @@ +--- libgpg-error-1.25/src/syscfg/lock-obj-pub.i686-nt64-midipix.h.orig 2016-12-17 21:12:38.401523100 +0100 ++++ libgpg-error-1.25/src/syscfg/lock-obj-pub.i686-nt64-midipix.h 2016-12-17 21:12:38.401523100 +0100 +@@ -0,0 +1,23 @@ ++## lock-obj-pub.i686-pc-linux-gnu.h ++## File created by gen-posix-lock-obj - DO NOT EDIT ++## To be included by mkheader into gpg-error.h ++ ++typedef struct ++{ ++ long _vers; ++ union { ++ volatile char _priv[24]; ++ long _x_align; ++ long *_xp_align; ++ } u; ++} gpgrt_lock_t; ++ ++#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0}}} ++## ++## Local Variables: ++## mode: c ++## buffer-read-only: t ++## End: ++## +--- libgpg-error-1.25/src/syscfg/lock-obj-pub.x86_64-nt64-midipix.h.orig 2016-12-17 21:12:38.401523100 +0100 ++++ libgpg-error-1.25/src/syscfg/lock-obj-pub.x86_64-nt64-midipix.h 2016-12-17 21:12:38.401523100 +0100 +@@ -0,0 +1,25 @@ ++## lock-obj-pub.x86_64-pc-linux-musl.h ++## File created by gen-posix-lock-obj - DO NOT EDIT ++## To be included by mkheader into gpg-error.h ++ ++typedef struct ++{ ++ long _vers; ++ union { ++ volatile char _priv[40]; ++ long _x_align; ++ long *_xp_align; ++ } u; ++} gpgrt_lock_t; ++ ++#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0}}} ++## ++## Local Variables: ++## mode: c ++## buffer-read-only: t ++## End: ++## diff --git a/patches/libgpg_error-1.41_pre.local.patch b/patches/libgpg_error-1.41_pre.local.patch new file mode 100644 index 00000000..f499a5e7 --- /dev/null +++ b/patches/libgpg_error-1.41_pre.local.patch @@ -0,0 +1,36 @@ +diff -ru a/configure.ac b/configure.ac +--- a/configure.ac 2019-03-19 04:56:05.000000000 -0400 ++++ b/configure.ac 2020-03-11 12:27:31.000000000 -0400 +@@ -549,19 +549,19 @@ + fi + ;; + esac +-case "$libdir" in +- /usr/lib|/usr/lib64|/lib|/lib64) ;; +- '${exec_prefix}/lib') +- if test "$exec_prefix" = "NONE"; then +- if test "$prefix" != / -a "$prefix" != /usr; then +- GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" +- fi +- elif test "$exec_prefix" != / -a "$exec_prefix" != /usr; then +- GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" +- fi +- ;; +- *) GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ;; +-esac ++#case "$libdir" in ++# /usr/lib|/usr/lib64|/lib|/lib64) ;; ++# '${exec_prefix}/lib') ++# if test "$exec_prefix" = "NONE"; then ++# if test "$prefix" != / -a "$prefix" != /usr; then ++# GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ++# fi ++# elif test "$exec_prefix" != / -a "$exec_prefix" != /usr; then ++# GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ++# fi ++# ;; ++# *) GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ;; ++#esac + + AC_SUBST(GPG_ERROR_CONFIG_LIBS) + AC_SUBST(GPG_ERROR_CONFIG_CFLAGS) -- cgit v1.2.3