CVS commit: pkgsrc/print/gutenprint-lib

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Mar 12 22:46:21 UTC 2025

Modified Files:
        pkgsrc/print/gutenprint-lib: Makefile PLIST distinfo options.mk
        pkgsrc/print/gutenprint-lib/patches: patch-configure

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

Packaging changes:

  - Disable gimp option, because it's gimp2, and I've switched to
    gimp3.  I expect that most people wanting to use gutenprint have
    switched also.  (If this upsets you and you want it to be
    different, I am happy to relinquish MATINTAINERship.)

  - Drop gutenprint51 previous packagepath; 2008 was a long time ago
    and it's now just noise.

Upstream NEWS:

  0) Support for running on MacOS has been deprecated.  Unless someone
     steps up to maintain the MacOS port, there will be no MacOS
     builds for this (or any future) Gutenprint release.

  1) Support for the following Dye-sublimation & thermal printers
     has been added:

     Canon SELPHY CP1500
     DNP DS480
     DNP DS680
     HiTi P461 Prinhome
     HiTi P510K / P510L / P510S / P510SI
     HiTi P518A / P518S (EXPERIMENTAL)
     HiTi P728L (EXPERIMENTAL)
     Joyspace U826 / SwiftFoto KSF-10R
     Mitsubishi CP-W5000 series
     Mitsubishi CP-D90DW-SL
     Olmec OP1000
     Sony UP-CX1
     Sont UP-D711MD
     Sony UP-971AD
     Sony UP-991AD (EXPERIMENTAL)

  2) The following printers have received significant bugfixes or
     major enhancements:

     Canon SELPHY CP790
     DNP DS620
     DNP DS820
     Fujifilm ASK-2500
     HiTi P520L
     HiTi P525L
     HiTi P720L
     HiTi P750L (EXPERIMENTAL)
     Kodak 605
     Kodak 8800 / 9810
     Kodak 8810
     Mitsubishi CP-D70/D707 series
     Mitsubishi CP-K60 series
     Mitsubishi CP-M1 & CP-M15 series
     Nidec Copal DPB-7000

  3) Added CUPS Command filter support for most dyesub models.  This allows
     querying printer status and media information at any time.

  4) Added support for the following inkjet printer models:

     Epson SureLab D700
     Fujifilm DX100

  5) Added support for the following laser printer models:

     Sharp MX-2600N


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/print/gutenprint-lib/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/print/gutenprint-lib/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/print/gutenprint-lib/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/gutenprint-lib/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/gutenprint-lib/patches/patch-configure

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.133 pkgsrc/print/gutenprint-lib/Makefile:1.134
--- pkgsrc/print/gutenprint-lib/Makefile:1.133  Mon Jan  6 21:49:24 2025
+++ pkgsrc/print/gutenprint-lib/Makefile        Wed Mar 12 22:46:21 2025
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.133 2025/01/06 21:49:24 ktnb Exp $
+# $NetBSD: Makefile,v 1.134 2025/03/12 22:46:21 gdt Exp $
 
 INSTALLVERSION=        5.3
-VERSION=       ${INSTALLVERSION}.4
+VERSION=       ${INSTALLVERSION}.5
+# Upstream and Pkgsrc RC indicators
 #VERSION_RCU=  -pre1
 #VERSION_RCP=  a1
 DISTNAME=      gutenprint-${VERSION}${VERSION_RCU}
 PKGNAME=       gutenprint-lib-${VERSION}${VERSION_RCP}
-PKGREVISION=   7
 #PKGREVISION=  0
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
@@ -18,8 +18,6 @@ HOMEPAGE=     http://gutenprint.sourceforge.
 
 LICENSE=       gnu-gpl-v2
 
-PREV_PKGPATH=  print/gutenprint51-lib
-
 PLIST_SUBST+=          INSTALLVERSION=${INSTALLVERSION}
 PRINT_PLIST_AWK+=      { gsub("gutenprint/${INSTALLVERSION}", \
                                "gutenprint/$${INSTALLVERSION}") }

Index: pkgsrc/print/gutenprint-lib/PLIST
diff -u pkgsrc/print/gutenprint-lib/PLIST:1.22 pkgsrc/print/gutenprint-lib/PLIST:1.23
--- pkgsrc/print/gutenprint-lib/PLIST:1.22      Thu Jul 11 18:41:05 2024
+++ pkgsrc/print/gutenprint-lib/PLIST   Wed Mar 12 22:46:21 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2024/07/11 18:41:05 gdt Exp $
+@comment $NetBSD: PLIST,v 1.23 2025/03/12 22:46:21 gdt Exp $
 bin/cups-calibrate
 bin/escputil
 bin/testpattern
@@ -40,6 +40,7 @@ lib/pkgconfig/gutenprint.pc
 ${PLIST.gimp}lib/pkgconfig/gutenprintui2.pc
 libexec/cups/driver/gutenprint.${INSTALLVERSION}
 libexec/cups/filter/commandtocanon
+libexec/cups/filter/commandtodyesub
 libexec/cups/filter/commandtoepson
 libexec/cups/filter/rastertogutenprint.${INSTALLVERSION}
 man/man1/escputil.1
@@ -86,6 +87,7 @@ share/gutenprint/${INSTALLVERSION}/xml/e
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_gen2.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_pigment.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_d6s.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k34.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3v.xml
@@ -93,6 +95,8 @@ share/gutenprint/${INSTALLVERSION}/xml/e
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3v10a.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3v10b.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3v4.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_t913x_ce.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_t913x_se.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/standard.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/standard_gen0.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/sx445.xml
@@ -107,6 +111,7 @@ share/gutenprint/${INSTALLVERSION}/xml/e
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cd_cutter_roll_feed.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cd_roll_feed.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cutter_roll_feed.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cutter_roll_only.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/default-duplex.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/default.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/pro3880.xml
@@ -154,11 +159,14 @@ share/gutenprint/${INSTALLVERSION}/xml/e
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_gen2.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_pigment.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_d6s.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_k3.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_k3v.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_k3v10.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_k3v10a.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_k3v10b.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_t913x_ce.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_t913x_se.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/r800.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/standard.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/standard_gen0.xml
@@ -186,6 +194,8 @@ share/gutenprint/${INSTALLVERSION}/xml/e
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_ultrachrome_k3v10_base.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_ultrachrome_k3v10a.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_ultrachrome_k3v10b.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_ultrachrome_t913x_ce.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_ultrachrome_t913x_se.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_x000.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_x500.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/base/pro_x600.xml
@@ -241,6 +251,9 @@ share/gutenprint/${INSTALLVERSION}/xml/e
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_133.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_134.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_135.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_136.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_137.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_138.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_14.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_15.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_16.xml
@@ -336,6 +349,7 @@ share/gutenprint/${INSTALLVERSION}/xml/e
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/picturemate.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/prox900.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/standard.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/surelab.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/v2880.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/wf40.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/resolutions/c8x.xml
@@ -371,6 +385,24 @@ share/gutenprint/doc/README
 share/gutenprint/doc/gutenprint-users-manual.odt
 share/gutenprint/doc/gutenprint-users-manual.pdf
 share/gutenprint/doc/gutenprint.pdf
+share/gutenprint/doc/reference-html/a2128.html
+share/gutenprint/doc/reference-html/book1.html
+share/gutenprint/doc/reference-html/c1723.html
+share/gutenprint/doc/reference-html/c193.html
+share/gutenprint/doc/reference-html/c1974.html
+share/gutenprint/doc/reference-html/c199.html
+share/gutenprint/doc/reference-html/c38.html
+share/gutenprint/doc/reference-html/c463.html
+share/gutenprint/doc/reference-html/c47.html
+share/gutenprint/doc/reference-html/f14.html
+share/gutenprint/doc/reference-html/ln10.html
+share/gutenprint/doc/reference-html/x1675.html
+share/gutenprint/doc/reference-html/x1740.html
+share/gutenprint/doc/reference-html/x2159.html
+share/gutenprint/doc/reference-html/x270.html
+share/gutenprint/doc/reference-html/x66.html
+share/gutenprint/doc/reference-html/x78.html
+share/gutenprint/doc/reference-html/x961.html
 share/gutenprint/samples/colorbars4.png
 share/gutenprint/samples/colorsweep.png
 share/gutenprint/samples/extended.sample
@@ -400,10 +432,14 @@ share/locale/hr/LC_MESSAGES/gutenprint.m
 share/locale/hr/gutenprint_hr.po
 share/locale/hu/LC_MESSAGES/gutenprint.mo
 share/locale/hu/gutenprint_hu.po
+share/locale/is/LC_MESSAGES/gutenprint.mo
+share/locale/is/gutenprint_is.po
 share/locale/it/LC_MESSAGES/gutenprint.mo
 share/locale/it/gutenprint_it.po
 share/locale/ja/LC_MESSAGES/gutenprint.mo
 share/locale/ja/gutenprint_ja.po
+share/locale/ka/LC_MESSAGES/gutenprint.mo
+share/locale/ka/gutenprint_ka.po
 share/locale/nb/LC_MESSAGES/gutenprint.mo
 share/locale/nb/gutenprint_nb.po
 share/locale/nl/LC_MESSAGES/gutenprint.mo
@@ -412,6 +448,8 @@ share/locale/pl/LC_MESSAGES/gutenprint.m
 share/locale/pl/gutenprint_pl.po
 share/locale/pt/LC_MESSAGES/gutenprint.mo
 share/locale/pt/gutenprint_pt.po
+share/locale/ro/LC_MESSAGES/gutenprint.mo
+share/locale/ro/gutenprint_ro.po
 share/locale/ru/LC_MESSAGES/gutenprint.mo
 share/locale/ru/gutenprint_ru.po
 share/locale/sk/LC_MESSAGES/gutenprint.mo

Index: pkgsrc/print/gutenprint-lib/distinfo
diff -u pkgsrc/print/gutenprint-lib/distinfo:1.29 pkgsrc/print/gutenprint-lib/distinfo:1.30
--- pkgsrc/print/gutenprint-lib/distinfo:1.29   Thu Jul 11 18:41:05 2024
+++ pkgsrc/print/gutenprint-lib/distinfo        Wed Mar 12 22:46:21 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.29 2024/07/11 18:41:05 gdt Exp $
+$NetBSD: distinfo,v 1.30 2025/03/12 22:46:21 gdt Exp $
 
-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
+BLAKE2s (gutenprint-5.3.5.tar.xz) = 842bc06ab45b107603b2f10f23ab609d74767ce821bb7b72123d3b413ea96bd9
+SHA512 (gutenprint-5.3.5.tar.xz) = 18ac06e77fef012650515db0fa551f68c93941250e5f254d71381f20822d7682eae148142ad1bb650440c6b790f90daf9801b742f20dd081a05076d81275ba7c
+Size (gutenprint-5.3.5.tar.xz) = 5667532 bytes
 SHA1 (patch-aa) = 711c925b330a4c4f960439a1722251a4f022ac9f
-SHA1 (patch-configure) = bacc4bbb0dc48674157a889e2eb47c1af8951642
+SHA1 (patch-configure) = 6435ea0ce4c028fddafd510bef5fdeed9ac11e4e

Index: pkgsrc/print/gutenprint-lib/options.mk
diff -u pkgsrc/print/gutenprint-lib/options.mk:1.1 pkgsrc/print/gutenprint-lib/options.mk:1.2
--- pkgsrc/print/gutenprint-lib/options.mk:1.1  Mon Oct 26 10:57:15 2020
+++ pkgsrc/print/gutenprint-lib/options.mk      Wed Mar 12 22:46:21 2025
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2020/10/26 10:57:15 triaxx Exp $
+# $NetBSD: options.mk,v 1.2 2025/03/12 22:46:21 gdt Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gutenprint
 PKG_SUPPORTED_OPTIONS= gimp
-PKG_SUGGESTED_OPTIONS= gimp
+PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/print/gutenprint-lib/patches/patch-configure
diff -u pkgsrc/print/gutenprint-lib/patches/patch-configure:1.2 pkgsrc/print/gutenprint-lib/patches/patch-configure:1.3
--- pkgsrc/print/gutenprint-lib/patches/patch-configure:1.2     Thu Jul 11 18:41:05 2024
+++ pkgsrc/print/gutenprint-lib/patches/patch-configure Wed Mar 12 22:46:21 2025
@@ -1,18 +1,18 @@
-$NetBSD: patch-configure,v 1.2 2024/07/11 18:41:05 gdt Exp $
+$NetBSD: patch-configure,v 1.3 2025/03/12 22:46:21 gdt Exp $
 
 Don't set _POSIX_C_SOURCE, because visibility defines hide other
 things, and it breaks NetBSD's <netinet/ip.h>, and also on macOS.
 
-Reported upstream by email 20240710
+Reported upstream by email 20240710, 20250312.
 
---- configure.orig     2020-12-07 02:16:32.000000000 +0000
+--- configure.orig     2025-03-12 19:27:58.000000000 +0000
 +++ configure
-@@ -18629,7 +18629,7 @@ _ACEOF
+@@ -20636,7 +20636,7 @@ fi
  
- if test x$ac_compiler_gnu = "xyes"; then
+ # C99 + POSIX extras
  
--  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
+-  for stp_ac_arg in -D_POSIX_C_SOURCE=200809L -std=c99 ; do
++  for stp_ac_arg in -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; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports ${stp_ac_arg}" >&5
+ printf %s "checking if ${CC} supports ${stp_ac_arg}... " >&6; }