CVS commit: pkgsrc/x11/libXpm

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Apr 17 21:09:49 UTC 2023

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

Log Message:
libXpm: update to 3.5.16.

Alan Coopersmith (11):
      test: skip compressed file tests when --disable-open-zfile is used
      gitlab CI: build with each of --enable-open-zfile & --disable-open-zfile
      configure: correct error message to suggest --disable-open-zfile
      open-zfile: Make compress & uncompress commands optional
      Require LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL
      XpmCreateDataFromXpmImage: Fix misleading indentation
      parse.c: Wrap FREE_CIDX definition in do { ... } while(0)
      parse.c: remove unused function xstrlcpy()
      test: Use PACKAGE_BUGREPORT instead of hard-coded URL's
      test: Add simple test cases for functions in src/rgb.c
      xpmReadRgbNames: constify filename argument

Matt Turner (1):
      libXpm 3.5.16

Peter Hutterer (1):
      Fix a memleak in ParsePixels error code path


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/libXpm/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/libXpm/distinfo
cvs rdiff -u -r1.5 -r1.6 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.30 pkgsrc/x11/libXpm/Makefile:1.31
--- pkgsrc/x11/libXpm/Makefile:1.30     Thu Mar  2 07:52:30 2023
+++ pkgsrc/x11/libXpm/Makefile  Mon Apr 17 21:09:49 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2023/03/02 07:52:30 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2023/04/17 21:09:49 wiz Exp $
 
-DISTNAME=              libXpm-3.5.15
+DISTNAME=              libXpm-3.5.16
 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.13 pkgsrc/x11/libXpm/distinfo:1.14
--- pkgsrc/x11/libXpm/distinfo:1.13     Tue Jan 17 18:42:39 2023
+++ pkgsrc/x11/libXpm/distinfo  Mon Apr 17 21:09:49 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2023/01/17 18:42:39 wiz Exp $
+$NetBSD: distinfo,v 1.14 2023/04/17 21:09:49 wiz Exp $
 
-BLAKE2s (libXpm-3.5.15.tar.xz) = 2896625c9d2daab1248b8bcd5d16fd432dc5487758253b4f1d5d7e512d35d014
-SHA512 (libXpm-3.5.15.tar.xz) = 955d716fcea2c9d868ab941c56f017b39bfa0f47fd2904e9b04c6a9be17f23f8b8c906da9c90a89a789f1f399d419641705ff5b6f9921820e34d4807c7a1992f
-Size (libXpm-3.5.15.tar.xz) = 459140 bytes
-SHA1 (patch-aa) = 9e7998ac85cc62746ad9da279b9702774b73012f
+BLAKE2s (libXpm-3.5.16.tar.xz) = 557ac1f86292738c632171c21cacb2bfb2b31f2f6bd9517438101cab10c673d9
+SHA512 (libXpm-3.5.16.tar.xz) = ee564311f8c1c9c08ed1035d55c287ecf7c20c6fee09ad448acfab59f38fd1ef381d4a24b4af2b581f3033730eebc7c690918e52ba706de689d1ef11085edac2
+Size (libXpm-3.5.16.tar.xz) = 469020 bytes
+SHA1 (patch-aa) = 4cfa0ddc7f802916363901226f3c60e7f686b616
 SHA1 (patch-ab) = faaefb61693805272bd4cccc1301c6e3edd14919
 SHA1 (patch-ac) = 9226dce77b0a7d9c792d9465727423581db7f01e

Index: pkgsrc/x11/libXpm/patches/patch-aa
diff -u pkgsrc/x11/libXpm/patches/patch-aa:1.5 pkgsrc/x11/libXpm/patches/patch-aa:1.6
--- pkgsrc/x11/libXpm/patches/patch-aa:1.5      Tue Jan 17 18:42:39 2023
+++ pkgsrc/x11/libXpm/patches/patch-aa  Mon Apr 17 21:09:49 2023
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.5 2023/01/17 18:42:39 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2023/04/17 21:09:49 wiz Exp $
 
---- configure.orig     2023-01-17 16:32:44.000000000 +0000
+--- configure.orig     2023-04-17 20:13:03.000000000 +0000
 +++ configure
-@@ -18589,6 +18589,10 @@ else
- $as_echo "$LOCALEDIR" >&6; }
+@@ -19582,6 +19582,10 @@ else
+ 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.5 2023/01/17 18:42
 +USE_GETTEXT=yes
  if test "x$USE_GETTEXT" = "xyes" ; then
  
- $as_echo "#define USE_GETTEXT 1" >>confdefs.h
+ printf "%s\n" "#define USE_GETTEXT 1" >>confdefs.h