CVS commit: pkgsrc/x11/libXpm

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Oct 16 20:45:04 UTC 2026

Modified Files:
        pkgsrc/x11/libXpm: Makefile distinfo
        pkgsrc/x11/libXpm/patches: patch-aa

Log Message:
libXpm: update to 3.5.20.

Alan Coopersmith (1):
      libXpm 3.5.20

Olivier Fourdan (3):
      ParsePixels: reject zero-dimension XPM images
      Revert "ParsePixels: reject zero-dimension XPM images"
      ParsePixels: reject zero-dimension XPM images


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/x11/libXpm/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/libXpm/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libXpm/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/libXpm/Makefile
diff -u pkgsrc/x11/libXpm/Makefile:1.34 pkgsrc/x11/libXpm/Makefile:1.35
--- pkgsrc/x11/libXpm/Makefile:1.34     Tue Apr 21 13:41:32 2026
+++ pkgsrc/x11/libXpm/Makefile  Fri Oct 16 20:45:04 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2026/04/21 13:41:32 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2026/10/16 20:45:04 wiz Exp $
 
-DISTNAME=              libXpm-3.5.19
+DISTNAME=              libXpm-3.5.20
 CATEGORIES=            x11 graphics
 MASTER_SITES=          ${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=          .tar.xz

Index: pkgsrc/x11/libXpm/distinfo
diff -u pkgsrc/x11/libXpm/distinfo:1.17 pkgsrc/x11/libXpm/distinfo:1.18
--- pkgsrc/x11/libXpm/distinfo:1.17     Tue Apr 21 13:41:32 2026
+++ pkgsrc/x11/libXpm/distinfo  Fri Oct 16 20:45:04 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2026/04/21 13:41:32 wiz Exp $
+$NetBSD: distinfo,v 1.18 2026/10/16 20:45:04 wiz Exp $
 
-BLAKE2s (libXpm-3.5.19.tar.xz) = 14f436b55f7dfa5aea71161cc0fba40347121079eefbb20804dcd87f95b078f3
-SHA512 (libXpm-3.5.19.tar.xz) = dd95a70af0ac2fb0f5876e69ad19b38128c5add94b00238ee41a22634aa4dc56b22c1b47c4baa6a1ab549308d11b302c250b405322da8a64ea24441a065fbada
-Size (libXpm-3.5.19.tar.xz) = 468388 bytes
-SHA1 (patch-aa) = 4cfa0ddc7f802916363901226f3c60e7f686b616
+BLAKE2s (libXpm-3.5.20.tar.xz) = b6bd492efc089bd0e35d09ef012664bb773091e09414151e296148df8b0458c7
+SHA512 (libXpm-3.5.20.tar.xz) = 389f1f3a228d9953587f707b6be455dceebc28e7ff181f01fc9089ea2b6fe67d09f0aaef7d18eaf292bab1c7a7baf10f25928006a272c5d8f3b021d0a82f4225
+Size (libXpm-3.5.20.tar.xz) = 473428 bytes
+SHA1 (patch-aa) = 156be57bdc8353c792cdc2a456d599bd8599bed1
 SHA1 (patch-ab) = faaefb61693805272bd4cccc1301c6e3edd14919
 SHA1 (patch-ac) = 9226dce77b0a7d9c792d9465727423581db7f01e

Index: pkgsrc/x11/libXpm/patches/patch-aa
diff -u pkgsrc/x11/libXpm/patches/patch-aa:1.6 pkgsrc/x11/libXpm/patches/patch-aa:1.7
--- pkgsrc/x11/libXpm/patches/patch-aa:1.6      Mon Apr 17 21:09:49 2023
+++ pkgsrc/x11/libXpm/patches/patch-aa  Fri Oct 16 20:45:04 2026
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.6 2023/04/17 21:09:49 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2026/10/16 20:45:04 wiz Exp $
 
---- configure.orig     2023-04-17 20:13:03.000000000 +0000
+--- configure.orig     2026-10-16 20:08:46.000000000 +0000
 +++ configure
-@@ -19582,6 +19582,10 @@ else
- printf "%s\n" "$LOCALEDIR" >&6; }
+@@ -21149,6 +21149,10 @@ fi
+ printf '%s\n' "$LOCALEDIR" >&6; }
  fi
  
 +# For pkgsrc, always set USE_GETTEXT=yes because it is used by [cs]xpm.
@@ -12,4 +12,4 @@ $NetBSD: patch-aa,v 1.6 2023/04/17 21:09
 +USE_GETTEXT=yes
  if test "x$USE_GETTEXT" = "xyes" ; then
  
- printf "%s\n" "#define USE_GETTEXT 1" >>confdefs.h
+ printf '%s\n' "#define USE_GETTEXT 1" >>confdefs.h