From a5063cd4a9d2b98903334f0470bcc073136d378a Mon Sep 17 00:00:00 2001
From: Ørjan Malde <red@foxi.me>
Date: Nov 11 2020 21:37:09 +0000
Subject: groups/251.native_packages_lib.group: libassuan: bump to v2.5.4


Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>

---

diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index c0ef7af..eade0f1 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -28,8 +28,8 @@ libxslt libz libzip sdl1 sdl1_net sdl1_image sdl2 sdl2_image sdl2_ttf wolfssl")"
 : ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib};
 : ${PKG_LIBARCHIVE_LIBTOOL:=rdlibtool};
 : ${PKG_LIBASSUAN_DEPENDS:="libgpg_error"};
-: ${PKG_LIBASSUAN_SHA256SUM:=91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702};
-: ${PKG_LIBASSUAN_VERSION:=2.5.3};
+: ${PKG_LIBASSUAN_SHA256SUM:=c080ee96b3bd519edd696cfcebdecf19a3952189178db9887be713ccbcb5fbf0};
+: ${PKG_LIBASSUAN_VERSION:=2.5.4};
 : ${PKG_LIBASSUAN_URL:=https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${PKG_LIBASSUAN_VERSION}.tar.bz2};
 : ${PKG_LIBASSUAN_CONFIGURE_ARGS_EXTRA:=--with-libgpg-error-prefix=${PREFIX_NATIVE}};
 : ${PKG_LIBATOMIC_OPS_SHA256SUM:=587edf60817f56daf1e1ab38a4b3c729b8e846ff67b4f62a6157183708f099af};
diff --git a/patches/libassuan-2.5.3_pre.local.patch b/patches/libassuan-2.5.3_pre.local.patch
deleted file mode 100644
index d6529b8..0000000
--- a/patches/libassuan-2.5.3_pre.local.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru a/src/libassuan-config.in b/src/libassuan-config.in
---- a/src/libassuan-config.in	2018-10-25 05:20:28.000000000 -0400
-+++ b/src/libassuan-config.in	2020-03-11 18:47:54.410306584 -0400
-@@ -131,13 +131,5 @@
- fi
- 
- if test "$echo_libs" = "yes"; then
--    if test "@libdir@" != "/usr/lib" ; then
--      libdirs="-L@libdir@"
--      for i in $lib $extralibs ; do
--	if test "$i" = "-L@libdir@" ; then
--	  libdirs=""
--	fi
--      done
--    fi
-     echo $libdirs $lib $extralibs
- fi
diff --git a/patches/libassuan-2.5.4_pre.local.patch b/patches/libassuan-2.5.4_pre.local.patch
new file mode 100644
index 0000000..d6529b8
--- /dev/null
+++ b/patches/libassuan-2.5.4_pre.local.patch
@@ -0,0 +1,17 @@
+diff -ru a/src/libassuan-config.in b/src/libassuan-config.in
+--- a/src/libassuan-config.in	2018-10-25 05:20:28.000000000 -0400
++++ b/src/libassuan-config.in	2020-03-11 18:47:54.410306584 -0400
+@@ -131,13 +131,5 @@
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-    if test "@libdir@" != "/usr/lib" ; then
+-      libdirs="-L@libdir@"
+-      for i in $lib $extralibs ; do
+-	if test "$i" = "-L@libdir@" ; then
+-	  libdirs=""
+-	fi
+-      done
+-    fi
+     echo $libdirs $lib $extralibs
+ fi