Update to gutenprint-5.3.4.

with cluebat from robert@

print/gutenprint/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.53 2019/11/17 20:05:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.54 2021/01/24 16:08:23 ajacoutot Exp $
 
 COMMENT=		high quality print drivers for foomatic and CUPS
 
-V=			5.3.3
+V=			5.3.4
 DISTNAME=		gutenprint-${V}
 
 MAJOR_V=		${V:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,9 +21,9 @@ MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 # GPLv2
 PERMIT_PACKAGE=	Yes
 
-WANTLIB += avahi-client avahi-common c cups curses dbus-1 ffi
-WANTLIB += gmp gnutls hogweed iconv idn2 intl m nettle p11-kit
-WANTLIB += pthread readline tasn1 unistring usb-1.0 z
+WANTLIB += avahi-client avahi-common c cups curses dbus-1 gmp
+WANTLIB += gnutls hogweed iconv idn2 intl m nettle p11-kit pthread
+WANTLIB += readline tasn1 unistring usb-1.0 z
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 
@@ -38,8 +38,7 @@ RUN_DEPENDS +=		print/cups-filters
 USE_GMAKE=		Yes
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--enable-static \
-			--enable-cups-ppds-at-top-level \
+CONFIGURE_ARGS=		--enable-cups-ppds-at-top-level \
 			--disable-translated-cups-ppds \
 			--disable-libgutenprintui2 \
 			--with-cups=${LOCALBASE} \
@@ -56,6 +55,9 @@ FAKE_FLAGS=		cups_conf_serverroot=${PREFIX}/share/examples/gutenprint
 
 DEBUG_PACKAGES=		${BUILD_PACKAGES}
 
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/src/gutenprintui2/plist.c
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc
 	mv ${PREFIX}/share/gutenprint/doc \

print/gutenprint/distinfo

@@ -1,2 +1,2 @@
-SHA256 (gutenprint-5.3.3.tar.xz) = cnnsvI5n0YWMU8sk5CPqG+mOIUhyAGt55uA2UN1UoHI=
-SIZE (gutenprint-5.3.3.tar.xz) = 5050624
+SHA256 (gutenprint-5.3.4.tar.xz) = 20SnAdK45qiTHIPOwGyRImviZtI+XBidIKOd0XXyAjs=
+SIZE (gutenprint-5.3.4.tar.xz) = 5341824

print/gutenprint/patches/patch-configure

@@ -1,10 +1,22 @@
-$OpenBSD: patch-configure,v 1.12 2019/11/17 20:05:49 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.13 2021/01/24 16:08:23 ajacoutot Exp $
+
+Don't set POSIX_C_SOURCE, this interferes with BSD_VISIBLE;
+see patch-src_escputil_escputil_c
 
 Don't enforce compiler optimizations.
 
 Index: configure
 --- configure.orig
 +++ configure
+@@ -18629,7 +18629,7 @@ _ACEOF
+ 
+ if test x$ac_compiler_gnu = "xyes"; then
+ 
+-  for stp_ac_arg in -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=131072 -Wformat -Werror=format-security -D_POSIX_C_SOURCE=200809L -std=c99 ; do
++  for stp_ac_arg in -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=131072 -Wformat -Werror=format-security -std=c99 ; do
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports ${stp_ac_arg}" >&5
+ $as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
 @@ -18731,7 +18731,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
  
    else

print/gutenprint/patches/patch-src_cups_backend_common_h

@@ -1,11 +1,11 @@
-$OpenBSD: patch-src_cups_backend_common_h,v 1.2 2018/04/11 07:41:51 ajacoutot Exp $
+$OpenBSD: patch-src_cups_backend_common_h,v 1.3 2021/01/24 16:08:23 ajacoutot Exp $
 
 Index: src/cups/backend_common.h
 --- src/cups/backend_common.h.orig
 +++ src/cups/backend_common.h
-@@ -39,6 +39,16 @@
- #include <libusb.h>
- #include <arpa/inet.h>
+@@ -44,6 +44,16 @@
+ #include <config.h>
+ #endif
  
 +#ifndef __BYTE_ORDER
 +#define __BYTE_ORDER _BYTE_ORDER

print/gutenprint/patches/patch-src_escputil_escputil_c

@@ -0,0 +1,35 @@
+$OpenBSD: patch-src_escputil_escputil_c,v 1.1 2021/01/24 16:08:23 ajacoutot Exp $
+
+escputil.c:350:15: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]
+              printf(_("You may only specify one printer or raw device."));
+                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../../include/gutenprint/gutenprint-intl-internal.h:58:21: note: expanded from macro '_'
+#  define _(String) dgettext (PACKAGE, String)
+                    ^~~~~~~~~~~~~~~~~~~~~~~~~~
+escputil.c:350:15: note: treat the string as an argument to avoid this
+              printf(_("You may only specify one printer or raw device."));
+                     ^
+                     "%s", 
+../../include/gutenprint/gutenprint-intl-internal.h:58:21: note: expanded from macro '_'
+#  define _(String) dgettext (PACKAGE, String)
+                    ^
+
+Index: src/escputil/escputil.c
+--- src/escputil/escputil.c.orig
++++ src/escputil/escputil.c
+@@ -22,6 +22,7 @@
+ #include <config.h>
+ #endif
+ #include <gutenprint/gutenprint.h>
++#include <gutenprint/gutenprint-intl-internal.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <string.h>
+@@ -52,7 +53,6 @@
+ #ifdef HAVE_READLINE_HISTORY_H
+ #include <readline/history.h>
+ #endif
+-#include <gutenprint/gutenprint-intl-internal.h>
+ #include "d4lib.h"
+ 
+ void do_align(void);

print/gutenprint/patches/patch-src_gutenprintui2_plist_c

@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_gutenprintui2_plist_c,v 1.5 2021/01/24 16:08:23 ajacoutot Exp $
+
+Index: src/gutenprintui2/plist.c
+--- src/gutenprintui2/plist.c.orig
++++ src/gutenprintui2/plist.c
+@@ -95,7 +95,7 @@ static const print_system_t default_printing_system =
+ static print_system_t known_printing_systems[] =
+ {
+   { "CUPS", N_("CUPS"), "lp -s", "-d", "-oraw", "/usr/sbin/cupsd",
+-    "/usr/bin/lpstat -v | awk '/^device for /i {sub(\":\", \"\", $3); print $3}'",
++    "${LOCALBASE}/bin/lpstat -v | awk '/^device for /i {sub(\":\", \"\", $3); print $3}'",
+     "-n" },
+   { "SysV", N_("System V lp"), "lp -s", "-d", "-oraw", "/usr/bin/lp",
+     "/usr/bin/lpstat -v | awk '/^device for /i {sub(\":\", \"\", $3); print $3}'",

print/gutenprint/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2019/11/17 20:05:49 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.10 2021/01/24 16:08:23 ajacoutot Exp $
 @conflict foomatic-db-gutenprint-<5.2.4p1
 @conflict foomatic-db-gutenprint-*
 @pkgpath print/gutenprint,-foomatic
@@ -424,6 +424,8 @@ share/locale/fr/LC_MESSAGES/gutenprint.mo
 share/locale/fr/gutenprint_fr.po
 share/locale/gl/LC_MESSAGES/gutenprint.mo
 share/locale/gl/gutenprint_gl.po
+share/locale/hr/LC_MESSAGES/gutenprint.mo
+share/locale/hr/gutenprint_hr.po
 share/locale/hu/LC_MESSAGES/gutenprint.mo
 share/locale/hu/gutenprint_hu.po
 share/locale/it/LC_MESSAGES/gutenprint.mo