From e7d1fca56e9878d4f7e70ad1b8678e913a4b2316 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 18 Apr 2026 21:57:26 +0100 Subject: [PATCH] netpbm: 11.13.3 -> 11.14.0 --- pkgs/by-name/ne/netpbm/c23.patch | 63 ------------------------------ pkgs/by-name/ne/netpbm/package.nix | 11 ++---- 2 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 pkgs/by-name/ne/netpbm/c23.patch diff --git a/pkgs/by-name/ne/netpbm/c23.patch b/pkgs/by-name/ne/netpbm/c23.patch deleted file mode 100644 index c7712f0ba230..000000000000 --- a/pkgs/by-name/ne/netpbm/c23.patch +++ /dev/null @@ -1,63 +0,0 @@ -From cde10364f1b59098fa2fbcacbdba88c7bbab4848 Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Sun, 22 Feb 2026 12:06:15 +0100 -Subject: [PATCH] Remove function declarators without prototypes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -These are no longer valid in C23 — they prototype the function as -taking no arguments, and now cause compilation errors when building -for non-Glibc systems. - -getenv is part of the C standard, so should be universally present, -and getopt is part of POSIX, so conflicting prototypes should be a -thing of the past. Similar changes have been made in upstream gnulib. ---- - converter/other/fiasco/getopt.c | 3 +-- - converter/other/fiasco/getopt.h | 7 ------- - 2 files changed, 1 insertion(+), 9 deletions(-) - -diff --git a/converter/other/fiasco/getopt.c b/converter/other/fiasco/getopt.c -index 65c206c3..565fac28 100644 ---- a/converter/other/fiasco/getopt.c -+++ b/converter/other/fiasco/getopt.c -@@ -44,6 +44,7 @@ - - #include - #include -+#include - - /* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself. This code is part of the GNU C -@@ -203,8 +204,6 @@ static char *posixly_correct; - /* Avoid depending on library functions or files - whose names are inconsistent. */ - --char *getenv (); -- - static char * - my_index (str, chr) - const char *str; -diff --git a/converter/other/fiasco/getopt.h b/converter/other/fiasco/getopt.h -index 3c735e3d..08138da4 100644 ---- a/converter/other/fiasco/getopt.h -+++ b/converter/other/fiasco/getopt.h -@@ -95,14 +95,7 @@ struct option - #define optional_argument 2 - - #if defined (__STDC__) && __STDC__ --#ifdef __GNU_LIBRARY__ --/* Many other libraries have conflicting prototypes for getopt, with -- differences in the consts, in stdlib.h. To avoid compilation -- errors, only prototype getopt for the GNU C library. */ - extern int getopt (int argc, char *const *argv, const char *shortopts); --#else /* not __GNU_LIBRARY__ */ --extern int getopt (); --#endif /* __GNU_LIBRARY__ */ - extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *longopts, int *longind); - extern int getopt_long_only (int argc, char *const *argv, --- -2.52.0 - diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix index f7841cfe54bf..0b6ea0555c86 100644 --- a/pkgs/by-name/ne/netpbm/package.nix +++ b/pkgs/by-name/ne/netpbm/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.13.3"; + version = "11.14.0"; outputs = [ "bin" @@ -31,15 +31,10 @@ stdenv.mkDerivation (finalAttrs: { src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "5164"; - sha256 = "sha256-3teRW9oucwv0+V+eyLVvh8Y2NtrFoyIt1JWoC2gyVgM="; + rev = "5182"; + sha256 = "sha256-VbVN08WVXQYXlEBK1yIKj5aIWWaBhim4rQc68ViA/vA="; }; - patches = [ - # Sent to maintainer 2026-02-22. - ./c23.patch - ]; - nativeBuildInputs = [ pkg-config flex