diff options
-rw-r--r-- | groups.d/251.native_packages_lib.d/libgpg_error.package | 6 | ||||
-rw-r--r-- | patches/libgpg_error-1.41_pre.local.patch | 36 | ||||
-rw-r--r-- | patches/libgpg_error-1.55.local.patch (renamed from patches/libgpg_error-1.41.local.patch) | 0 | ||||
-rw-r--r-- | patches/libgpg_error-1.55_pre.local.patch | 35 |
4 files changed, 38 insertions, 39 deletions
diff --git a/groups.d/251.native_packages_lib.d/libgpg_error.package b/groups.d/251.native_packages_lib.d/libgpg_error.package index 122c3d9d..cbd1cf17 100644 --- a/groups.d/251.native_packages_lib.d/libgpg_error.package +++ b/groups.d/251.native_packages_lib.d/libgpg_error.package @@ -1,7 +1,7 @@ -: ${PKG_LIBGPG_ERROR_SHA256SUM:=64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742}; -: ${PKG_LIBGPG_ERROR_VERSION:=1.41}; +: ${PKG_LIBGPG_ERROR_SHA256SUM:=95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78}; +: ${PKG_LIBGPG_ERROR_VERSION:=1.55}; : ${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_CONFIGURE_ARGS_EXTRA:="--disable-tests --disable-install-gpg-error-config"}; : ${PKG_LIBGPG_ERROR_IN_TREE:=1}; ex_pkg_register "libgpg_error" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages"; diff --git a/patches/libgpg_error-1.41_pre.local.patch b/patches/libgpg_error-1.41_pre.local.patch deleted file mode 100644 index f499a5e7..00000000 --- a/patches/libgpg_error-1.41_pre.local.patch +++ /dev/null @@ -1,36 +0,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.55.local.patch index 5da8699e..5da8699e 100644 --- a/patches/libgpg_error-1.41.local.patch +++ b/patches/libgpg_error-1.55.local.patch diff --git a/patches/libgpg_error-1.55_pre.local.patch b/patches/libgpg_error-1.55_pre.local.patch new file mode 100644 index 00000000..2199a900 --- /dev/null +++ b/patches/libgpg_error-1.55_pre.local.patch @@ -0,0 +1,35 @@ +diff -ru libgpg-error-1.55.orig/configure libgpg-error-1.55/configure +--- libgpg-error-1.55.orig/configure 2025-04-24 16:13:09.000000000 +0200 ++++ libgpg-error-1.55/configure 2025-05-01 12:58:03.282492116 +0200 +@@ -19908,19 +19908,6 @@ + fi + ;; + esac +-case "$libdir" in +- /usr/lib|/usr/lib64|/lib|/lib64) ;; +- '${exec_prefix}/lib'|'${exec_prefix}/lib64') +- 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 + + + +diff -ru libgpg-error-1.55.orig/src/Makefile.in libgpg-error-1.55/src/Makefile.in +--- libgpg-error-1.55.orig/src/Makefile.in 2025-04-24 16:13:09.000000000 +0200 ++++ libgpg-error-1.55/src/Makefile.in 2025-05-01 13:02:33.363492167 +0200 +@@ -575,7 +575,7 @@ + nodist_include_HEADERS = gpg-error.h gpgrt.h + @INSTALL_GPG_ERROR_CONFIG_FALSE@bin_SCRIPTS = gpgrt-config + @INSTALL_GPG_ERROR_CONFIG_TRUE@bin_SCRIPTS = gpgrt-config gpg-error-config +-@INSTALL_GPG_ERROR_CONFIG_FALSE@noinst_SCRIPTS = gpg-error-config ++@INSTALL_GPG_ERROR_CONFIG_FALSE@noinst_SCRIPTS = + m4datadir = $(datadir)/aclocal + m4data_DATA = gpg-error.m4 gpgrt.m4 + pkgconfigdir = $(libdir)/pkgconfig |