CVS commit: pkgsrc/print/gutenprint-lib

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Jul 11 18:41:06 UTC 2024

Modified Files:
        pkgsrc/print/gutenprint-lib: Makefile PLIST distinfo
        pkgsrc/print/gutenprint-lib/patches: patch-configure
Removed Files:
        pkgsrc/print/gutenprint-lib/patches: patch-scripts_gversion
            patch-scripts_gversion.in patch-scripts_snapstamp

Log Message:
print/gutenprint-lib: Update to 5.3.4

This update was delayed by debugging problems caused by upstream using
a POSIX visibility define, which breaks <netinet/ip.h> on NetBSD and
macOS.  Now, that define is patched out.  Apparently it is needed for
strdup on some GNU/Linux systems, so those may be troubled.  Upstream
is working on 5.3.5, and the issue has already been reported.

Drop several bashism remediation patches now fixed upstream.

Upstream NEWS summary:

  1) Gutenprint (any release) does not currently work on MacOS 10.15
     (Catalina).  We do not as of this time have a fix in hand; if you
     want to use Gutenprint, you should stick with 10.14 (Mojave) or
     below.

  2) A long-standing gamma correction bug affecting all dye-sublimation
     printers has been corrected, resulting in visibly improved contrast,
     tonal range, and color fidelity.  However, users upgrading from older
     versions can continue using the old gamma behaviour, by setting the
     "StpLegacyDyesubGamma" option to "true"

  3) Support for the following dye sublimcation printers has been added:

     Citizen CX-02W
     Citizen CZ-01
     DNP QW410
     HiTi P520L
     HiTi P525L
     HiTi P720L (EXPERIMENTAL)
     HiTi P750L (EXPERIMENTAL)
     Kodak 6900 (EXPERIMENTAL)
     Mitsubishi CP30D series
     Mitsubishi CP-D70DW-S
     Mitsubishi CP-M1 & CP-M15 series
     Stryker SDP1000

  4) Significant bugfixes or major enhancements to 10 printers.

     Note that for the Mitsubishi CP-D90 series, when upgrading from a
     prior release, you will need to remove and re-create your printer
     queue for printing to function properly.

  5) Add duplex support for some Epson Style Office printers, and support for one such printer.

  6) Corrected bugs in some Canon printers.

  7) Corrected margins for many Brother laster printers.


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 pkgsrc/print/gutenprint-lib/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/print/gutenprint-lib/PLIST
cvs rdiff -u -r1.28 -r1.29 pkgsrc/print/gutenprint-lib/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/gutenprint-lib/patches/patch-configure
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion \
    pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion.in \
    pkgsrc/print/gutenprint-lib/patches/patch-scripts_snapstamp

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

Modified files:

Index: pkgsrc/print/gutenprint-lib/Makefile
diff -u pkgsrc/print/gutenprint-lib/Makefile:1.125 pkgsrc/print/gutenprint-lib/Makefile:1.126
--- pkgsrc/print/gutenprint-lib/Makefile:1.125  Wed May 29 16:34:10 2024
+++ pkgsrc/print/gutenprint-lib/Makefile        Thu Jul 11 18:41:05 2024
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.125 2024/05/29 16:34:10 adam Exp $
+# $NetBSD: Makefile,v 1.126 2024/07/11 18:41:05 gdt Exp $
 
 INSTALLVERSION=        5.3
-VERSION=       ${INSTALLVERSION}.3
-DISTNAME=      gutenprint-${VERSION}
-PKGNAME=       gutenprint-lib-${VERSION}
-PKGREVISION=   31
+VERSION=       ${INSTALLVERSION}.4
+#VERSION_RCU=  -pre1
+#VERSION_RCP=  a1
+DISTNAME=      gutenprint-${VERSION}${VERSION_RCU}
+PKGNAME=       gutenprint-lib-${VERSION}${VERSION_RCP}
+#PKGREVISION=  0
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 EXTRACT_SUFX=  .tar.xz
@@ -27,7 +29,8 @@ USE_TOOLS+=           gmake lex pkg-config perl:r
 USE_PKGLOCALEDIR=      YES
 USE_LIBTOOL=           YES
 
-USE_LANGUAGES+=                c99
+USE_LANGUAGES+=                c
+USE_CC_FEATURES+=      gnu11
 
 GNU_CONFIGURE=         YES
 

Index: pkgsrc/print/gutenprint-lib/PLIST
diff -u pkgsrc/print/gutenprint-lib/PLIST:1.21 pkgsrc/print/gutenprint-lib/PLIST:1.22
--- pkgsrc/print/gutenprint-lib/PLIST:1.21      Mon Oct 26 10:57:15 2020
+++ pkgsrc/print/gutenprint-lib/PLIST   Thu Jul 11 18:41:05 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2020/10/26 10:57:15 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.22 2024/07/11 18:41:05 gdt Exp $
 bin/cups-calibrate
 bin/escputil
 bin/testpattern
@@ -396,6 +396,8 @@ share/locale/fr/LC_MESSAGES/gutenprint.m
 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
@@ -428,4 +430,3 @@ share/locale/zh_CN/LC_MESSAGES/gutenprin
 share/locale/zh_CN/gutenprint_zh_CN.po
 share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
 share/locale/zh_TW/gutenprint_zh_TW.po
-@pkgdir share/gutenprint/doc/reference-html

Index: pkgsrc/print/gutenprint-lib/distinfo
diff -u pkgsrc/print/gutenprint-lib/distinfo:1.28 pkgsrc/print/gutenprint-lib/distinfo:1.29
--- pkgsrc/print/gutenprint-lib/distinfo:1.28   Tue Oct 26 11:12:07 2021
+++ pkgsrc/print/gutenprint-lib/distinfo        Thu Jul 11 18:41:05 2024
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.28 2021/10/26 11:12:07 nia Exp $
+$NetBSD: distinfo,v 1.29 2024/07/11 18:41:05 gdt Exp $
 
-BLAKE2s (gutenprint-5.3.3.tar.xz) = ef8c34ee2f9ca4fb68fe2cde87da2e7cf4413b1d994db56386c3e910b2995ea2
-SHA512 (gutenprint-5.3.3.tar.xz) = d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead72f49ecd10537cf967251bacf7ca7da29fb8dceecc7eebd55ed021f2594ff9fb6509bab543fab1dc8d6
-Size (gutenprint-5.3.3.tar.xz) = 5050624 bytes
+BLAKE2s (gutenprint-5.3.4.tar.xz) = 03eca9899751df886a60f1699d259868183c3c30af11e2836decf670f2369383
+SHA512 (gutenprint-5.3.4.tar.xz) = 63de0b62edbe255a7efaaeab1dcd22577b7b46d7e0e48441b79977f19e76bf3862e4e8e18c55dd1f2e7392d555f9e8ee875ea53b90c689852d2343491a8fbcc8
+Size (gutenprint-5.3.4.tar.xz) = 5341824 bytes
 SHA1 (patch-aa) = 711c925b330a4c4f960439a1722251a4f022ac9f
-SHA1 (patch-configure) = 92bf9185fc7fbadd05e1c8e4f59209d0de574dc8
-SHA1 (patch-scripts_gversion) = 117b9daa6b4807e1de73ae3711ea0101b2e3d738
-SHA1 (patch-scripts_gversion.in) = 03e74de2a33561125bc63912534cabf37d3ce5a7
-SHA1 (patch-scripts_snapstamp) = f910a3be5d07f438a12169e2d7cd63ee93889fa8
+SHA1 (patch-configure) = bacc4bbb0dc48674157a889e2eb47c1af8951642

Index: pkgsrc/print/gutenprint-lib/patches/patch-configure
diff -u pkgsrc/print/gutenprint-lib/patches/patch-configure:1.1 pkgsrc/print/gutenprint-lib/patches/patch-configure:1.2
--- pkgsrc/print/gutenprint-lib/patches/patch-configure:1.1     Fri Oct 11 23:47:42 2019
+++ pkgsrc/print/gutenprint-lib/patches/patch-configure Thu Jul 11 18:41:05 2024
@@ -1,26 +1,18 @@
-$NetBSD: patch-configure,v 1.1 2019/10/11 23:47:42 gdt Exp $
+$NetBSD: patch-configure,v 1.2 2024/07/11 18:41:05 gdt Exp $
 
-Remediate bashism.
+Don't set _POSIX_C_SOURCE, because visibility defines hide other
+things, and it breaks NetBSD's <netinet/ip.h>, and also on macOS.
 
-Not yet filed upstream.
+Reported upstream by email 20240710
 
---- configure.orig     2019-08-25 15:14:21.000000000 +0000
+--- configure.orig     2020-12-07 02:16:32.000000000 +0000
 +++ configure
-@@ -12747,7 +12747,7 @@ if test "${with_cups+set}" = set; then :
-   withval=$with_cups; case "${withval}" in
+@@ -18629,7 +18629,7 @@ _ACEOF
  
-     yes)
--         if test "$FOUND_CUPS_CONFIG" == "yes" ; then
-+         if test "$FOUND_CUPS_CONFIG" = "yes" ; then
-          BUILD_CUPS="yes"
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-@@ -12776,7 +12776,7 @@ else
-              fi
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_CUPS}" >&5
- $as_echo "${BUILD_CUPS}" >&6; } ;
--     if test "$FOUND_CUPS_CONFIG" == "yes" ; then
-+     if test "$FOUND_CUPS_CONFIG" = "yes" ; then
-        cups_prefix="${prefix}"
-        BUILD_CUPS="yes"
-      else
+ 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; }