From 68101e6fb4d6f5688178b4a77fc0bba12b3f2044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Wed, 15 Nov 2023 21:40:41 +0100 Subject: groups.d/251.native_packages_lib.group: libgcrypt: v1.10.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups.d/251.native_packages_lib.group | 4 ++-- patches/libgcrypt-1.10.2_pre.local.patch | 12 ------------ patches/libgcrypt-1.10.3_pre.local.patch | 12 ++++++++++++ 3 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 patches/libgcrypt-1.10.2_pre.local.patch create mode 100644 patches/libgcrypt-1.10.3_pre.local.patch diff --git a/groups.d/251.native_packages_lib.group b/groups.d/251.native_packages_lib.group index 54775805..4eae423e 100644 --- a/groups.d/251.native_packages_lib.group +++ b/groups.d/251.native_packages_lib.group @@ -143,8 +143,8 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf sdl2_net twolame wolfssl"; : ${PKG_LIBGLOB_URLS_GIT:=libglob=https://github.com/void-linux/libglob.git@master}; : ${PKG_LIBGLOB_BUILD_DIR:=libglob}; : ${PKG_LIBGCRYPT_DEPENDS:="libgpg_error"}; -: ${PKG_LIBGCRYPT_SHA256SUM:=3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03}; -: ${PKG_LIBGCRYPT_VERSION:=1.10.2}; +: ${PKG_LIBGCRYPT_SHA256SUM:=8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa}; +: ${PKG_LIBGCRYPT_VERSION:=1.10.3}; : ${PKG_LIBGCRYPT_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${PKG_LIBGCRYPT_VERSION}.tar.bz2}; : ${PKG_LIBGCRYPT_CONFIG_CACHE_EXTRA:=" gcry_cv_broken_visibility_attribute=no diff --git a/patches/libgcrypt-1.10.2_pre.local.patch b/patches/libgcrypt-1.10.2_pre.local.patch deleted file mode 100644 index f6ff4bf9..00000000 --- a/patches/libgcrypt-1.10.2_pre.local.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru libgcrypt-1.10.2.orig/configure libgcrypt-1.10.2/configure ---- libgcrypt-1.10.2.orig/configure 2023-04-06 21:07:18.000000000 +0200 -+++ libgcrypt-1.10.2/configure 2023-08-24 17:01:02.087595041 +0200 -@@ -15552,7 +15552,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPG Error - version >= $min_gpg_error_version" >&5 - $as_echo_n "checking for GPG Error - version >= $min_gpg_error_version... " >&6; } - if test $ok = yes; then -- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags` -+ GPG_ERROR_CFLAGS=`` - GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs` - if test -z "$GPGRT_CONFIG"; then - GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null` diff --git a/patches/libgcrypt-1.10.3_pre.local.patch b/patches/libgcrypt-1.10.3_pre.local.patch new file mode 100644 index 00000000..f6ff4bf9 --- /dev/null +++ b/patches/libgcrypt-1.10.3_pre.local.patch @@ -0,0 +1,12 @@ +diff -ru libgcrypt-1.10.2.orig/configure libgcrypt-1.10.2/configure +--- libgcrypt-1.10.2.orig/configure 2023-04-06 21:07:18.000000000 +0200 ++++ libgcrypt-1.10.2/configure 2023-08-24 17:01:02.087595041 +0200 +@@ -15552,7 +15552,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPG Error - version >= $min_gpg_error_version" >&5 + $as_echo_n "checking for GPG Error - version >= $min_gpg_error_version... " >&6; } + if test $ok = yes; then +- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags` ++ GPG_ERROR_CFLAGS=`` + GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs` + if test -z "$GPGRT_CONFIG"; then + GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null` -- cgit v1.2.3