Fri Dec 13 10:42:37 2019 UTC ()
libXpm: update to 3.5.13.

Lest we be accused that users have to wait many years to get fixes out,
let's quickly release the branch before the calendar turns over over again
so it's just some years. The actual fixes here are some found by static
analysers, and a build fix for Windows (which, curiously, is dated to 2012
so clearly we're at the top of the game here). Nothing overly exciting, but
covscan, parfait, etc. should be a bit happier now.

Alan Coopersmith (3):
      After fdopen(), use fclose() instead of close() in error path
      Update README for gitlab migration
      Update configure.ac bug URL for gitlab migration

Benjamin Tissoires (1):
      parse: simplify error paths in xpmParseColors()

Dave Bodenstab (1):
      Windows build fixes

Emil Velikov (1):
      autogen.sh: use quoted string variables

Fabrice Fontaine (1):
      Allow usage when fork() is not available

Mihail Konev (1):
      autogen: add default patch prefix

Peter Hutterer (3):
      autogen.sh: use exec instead of waiting for configure to finish
      parse: avoid memleak on error with STRLCAT/STRLCPY
      libXpm 3.5.13


(wiz)
diff -r1.18 -r1.19 pkgsrc/x11/libXpm/Makefile
diff -r1.8 -r1.9 pkgsrc/x11/libXpm/distinfo
cvs diff -r1.18 -r1.19 pkgsrc/x11/libXpm/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libXpm/Makefile 2018/03/07 11:57:36 1.18
+++ pkgsrc/x11/libXpm/Makefile 2019/12/13 10:42:36 1.19
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.18 2018/03/07 11:57:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2019/12/13 10:42:36 wiz Exp $
2 2
3DISTNAME= libXpm-3.5.12 3DISTNAME= libXpm-3.5.13
4PKGREVISION= 1 
5CATEGORIES= graphics x11 4CATEGORIES= graphics x11
6MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 5MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 9HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= X PixMap Library from modular Xorg X11 10COMMENT= X PixMap Library from modular Xorg X11
12 11
13CONFLICTS+= xpm-[0-9]* 12CONFLICTS+= xpm-[0-9]*
14 13
15USE_LIBTOOL= yes 14USE_LIBTOOL= yes
16USE_TOOLS+= pkg-config xgettext 15USE_TOOLS+= pkg-config xgettext
17PKGCONFIG_OVERRIDE+= xpm.pc.in 16PKGCONFIG_OVERRIDE+= xpm.pc.in
@@ -20,30 +19,30 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1 @@ -20,30 +19,30 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1
20 19
21# Don't allow the configure script to find libintl.so or else the resulting 20# Don't allow the configure script to find libintl.so or else the resulting
22# libXpm will be linked against it, which is not necessary. Instead, just 21# libXpm will be linked against it, which is not necessary. Instead, just
23# pass down INTLLIBS in the build environment for use by the [cs]xpm 22# pass down INTLLIBS in the build environment for use by the [cs]xpm
24# Makefiles. 23# Makefiles.
25# 24#
26CONFIGURE_ENV+= ac_cv_search_gettext=no 25CONFIGURE_ENV+= ac_cv_search_gettext=no
27MAKE_ENV+= INTLLIBS=${BUILDLINK_LDADD.gettext:Q} 26MAKE_ENV+= INTLLIBS=${BUILDLINK_LDADD.gettext:Q}
28 27
29.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
30 29
31.if ${X11_TYPE} == "native" 30.if ${X11_TYPE} == "native"
32XPM_CFLAGS= -I${X11BASE}/include 31XPM_CFLAGS= -I${X11BASE}/include
33XPM_LIBS= -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lX11 32XPM_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lX11
34 33
35SXPM_CFLAGS= -I${X11BASE}/include 34SXPM_CFLAGS= -I${X11BASE}/include
36SXPM_LIBS= -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lXt -lXext 35SXPM_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lXt -lXext
37 36
38CONFIGURE_ARGS+= XPM_CFLAGS=${XPM_CFLAGS:Q} \ 37CONFIGURE_ARGS+= XPM_CFLAGS=${XPM_CFLAGS:Q} \
39 XPM_LIBS=${XPM_LIBS:Q} \ 38 XPM_LIBS=${XPM_LIBS:Q} \
40 SXPM_CFLAGS=${SXPM_CFLAGS:Q} \ 39 SXPM_CFLAGS=${SXPM_CFLAGS:Q} \
41 SXPM_LIBS=${SXPM_LIBS:Q} 40 SXPM_LIBS=${SXPM_LIBS:Q}
42.endif 41.endif
43 42
44.include "../../meta-pkgs/modular-xorg/hacks.mk" 43.include "../../meta-pkgs/modular-xorg/hacks.mk"
45 44
46.include "../../devel/gettext-lib/buildlink3.mk" 45.include "../../devel/gettext-lib/buildlink3.mk"
47.include "../../x11/libX11/buildlink3.mk" 46.include "../../x11/libX11/buildlink3.mk"
48.include "../../x11/libXext/buildlink3.mk" 47.include "../../x11/libXext/buildlink3.mk"
49.include "../../x11/libXt/buildlink3.mk" 48.include "../../x11/libXt/buildlink3.mk"
cvs diff -r1.8 -r1.9 pkgsrc/x11/libXpm/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/libXpm/distinfo 2016/12/15 23:02:51 1.8
+++ pkgsrc/x11/libXpm/distinfo 2019/12/13 10:42:36 1.9
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.8 2016/12/15 23:02:51 wiz Exp $ 1$NetBSD: distinfo,v 1.9 2019/12/13 10:42:36 wiz Exp $
2 2
3SHA1 (libXpm-3.5.12.tar.bz2) = 4e22fefe61714209539b08051b5287bcd9ecfd04 3SHA1 (libXpm-3.5.13.tar.bz2) = 38b1a2728adb49f4e255aba1530f51789815ffc4
4RMD160 (libXpm-3.5.12.tar.bz2) = 0b61fc21d24077c3afa72d1ec76512273cb116a9 4RMD160 (libXpm-3.5.13.tar.bz2) = 6554f024ec432e163f5bc71fddf0fdfbbb85b5ab
5SHA512 (libXpm-3.5.12.tar.bz2) = a5707d5f758d577414101b0723af334fc8ac223e5b9f869994765735e1cbd8dafed48ea2851ebc479fecaf84381bfd5fbef842ec971a487f7fa9e77d54d3a17e 5SHA512 (libXpm-3.5.13.tar.bz2) = 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5
6Size (libXpm-3.5.12.tar.bz2) = 430736 bytes 6Size (libXpm-3.5.13.tar.bz2) = 463251 bytes
7SHA1 (patch-aa) = c3def60e8162eb5d48056cd27154648eb6ba5e02 7SHA1 (patch-aa) = c3def60e8162eb5d48056cd27154648eb6ba5e02
8SHA1 (patch-ab) = faaefb61693805272bd4cccc1301c6e3edd14919 8SHA1 (patch-ab) = faaefb61693805272bd4cccc1301c6e3edd14919
9SHA1 (patch-ac) = 9226dce77b0a7d9c792d9465727423581db7f01e 9SHA1 (patch-ac) = 9226dce77b0a7d9c792d9465727423581db7f01e