shishi: 1.0.2 -> 1.0.3

Changelog: https://lists.gnu.org/archive/html/info-gnu/2022-08/msg00003.html

fixes pkgsMusl.shishi
This commit is contained in:
Yureka
2025-08-28 15:30:33 +02:00
committed by Alyssa Ross
parent f198a954a6
commit 1aa6bb53f4
3 changed files with 2 additions and 54 deletions
+2 -8
View File
@@ -25,21 +25,15 @@ let
in
stdenv.mkDerivation rec {
pname = "shishi";
version = "1.0.2";
version = "1.0.3";
src = fetchurl {
url = "mirror://gnu/shishi/shishi-${version}.tar.gz";
sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d";
hash = "sha256-lXmP/RLdAaT4jgMR7gPKSibly05ekFmkDk/E2fKRfpI=";
};
separateDebugInfo = true;
# Fixes support for gcrypt 1.6+
patches = [
./gcrypt-fix.patch
./freebsd-unistd.patch
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libgcrypt
-12
View File
@@ -1,12 +0,0 @@
diff --git a/gl/unistd.in.h b/gl/unistd.in.h
index 2ea9af4..ed58960 100644
--- a/gl/unistd.in.h
+++ b/gl/unistd.in.h
@@ -116,6 +116,7 @@
# include <getopt.h>
#endif
+#include "config.h"
_GL_INLINE_HEADER_BEGIN
#ifndef _GL_UNISTD_INLINE
# define _GL_UNISTD_INLINE _GL_INLINE
-34
View File
@@ -1,34 +0,0 @@
diff --git a/configure b/configure
index c9a442b..a596bfe 100755
--- a/configure
+++ b/configure
@@ -24491,12 +24491,6 @@ else
/* end confdefs.h. */
#include <gcrypt.h>
-/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
- will fail on startup if we don't have 1.4.4 or later, so
- test for it early. */
-#if !defined GCRY_MODULE_ID_USER
-error too old libgcrypt
-#endif
int
main ()
diff --git a/gl/m4/gc.m4 b/gl/m4/gc.m4
index b352e33..4bab9f4 100644
--- a/gl/m4/gc.m4
+++ b/gl/m4/gc.m4
@@ -12,12 +12,6 @@ AC_DEFUN([gl_GC],
if test "$libgcrypt" != no; then
AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [
#include <gcrypt.h>
-/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
- will fail on startup if we don't have 1.4.4 or later, so
- test for it early. */
-#if !defined GCRY_MODULE_ID_USER
-error too old libgcrypt
-#endif
])
fi
])