pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/print/cups-base
Module Name: pkgsrc
Committed By: prlw1
Date: Wed Jan 29 22:56:50 UTC 2020
Modified Files:
pkgsrc/print/cups-base: Makefile distinfo
pkgsrc/print/cups-base/patches: patch-airprint-scheduler_printers.c
Log Message:
Remove part of airprint scheduler printers patch as per
https://github.com/apple/cups/issues/5641
OK Till Kamppeter
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/print/cups-base/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/print/cups-base/distinfo
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/print/cups-base/patches/patch-airprint-scheduler_printers.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/print/cups-base/Makefile
diff -u pkgsrc/print/cups-base/Makefile:1.26 pkgsrc/print/cups-base/Makefile:1.27
--- pkgsrc/print/cups-base/Makefile:1.26 Sun Nov 17 21:22:03 2019
+++ pkgsrc/print/cups-base/Makefile Wed Jan 29 22:56:50 2020
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2019/11/17 21:22:03 leot Exp $
+# $NetBSD: Makefile,v 1.27 2020/01/29 22:56:50 prlw1 Exp $
.include "../../print/cups/Makefile.common"
DISTNAME= cups-${CUPS_VERS}-source
PKGNAME= cups-base-${CUPS_VERS}
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/}
Index: pkgsrc/print/cups-base/distinfo
diff -u pkgsrc/print/cups-base/distinfo:1.17 pkgsrc/print/cups-base/distinfo:1.18
--- pkgsrc/print/cups-base/distinfo:1.17 Thu Jan 2 15:21:32 2020
+++ pkgsrc/print/cups-base/distinfo Wed Jan 29 22:56:50 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2020/01/02 15:21:32 leot Exp $
+$NetBSD: distinfo,v 1.18 2020/01/29 22:56:50 prlw1 Exp $
SHA1 (cups-2.3.1-source.tar.gz) = 8377dadf3d6c5500d13be153d32cb8c1fc0b956c
RMD160 (cups-2.3.1-source.tar.gz) = f59f1d0aa7d3dffd821f2332ec7f1777f3f54fc8
@@ -10,7 +10,7 @@ SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8f
SHA1 (patch-airprint-conf_mime.convs.in) = 413a5ef448ab42858db804cfbfc1b8ff5b6bbf77
SHA1 (patch-airprint-scheduler_conf.c) = 504e752c1699049cdbe11d8b04814670ddda81d4
SHA1 (patch-airprint-scheduler_dirsvc.c) = bef4ea8e898dffc67c4866baa701e12570eb6fca
-SHA1 (patch-airprint-scheduler_printers.c) = 1794cd3ea6a32ce6376aa86e89f945de036036eb
+SHA1 (patch-airprint-scheduler_printers.c) = 027b9b1515ba0fc472f6d3c5308d35849ac5ae3b
SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f
SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a
SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0
Index: pkgsrc/print/cups-base/patches/patch-airprint-scheduler_printers.c
diff -u pkgsrc/print/cups-base/patches/patch-airprint-scheduler_printers.c:1.2 pkgsrc/print/cups-base/patches/patch-airprint-scheduler_printers.c:1.3
--- pkgsrc/print/cups-base/patches/patch-airprint-scheduler_printers.c:1.2 Sun Nov 17 21:22:03 2019
+++ pkgsrc/print/cups-base/patches/patch-airprint-scheduler_printers.c Wed Jan 29 22:56:50 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-airprint-scheduler_printers.c,v 1.2 2019/11/17 21:22:03 leot Exp $
+$NetBSD: patch-airprint-scheduler_printers.c,v 1.3 2020/01/29 22:56:50 prlw1 Exp $
From debian:
From 7147c814439aafb26ff0262a7d6b8ef56d20969f Mon Sep 17 00:00:00 2001
@@ -12,6 +12,9 @@ is supported
Bug-Upstream: https://www.cups.org/str.php?L4428
Last-Update: 2015-02-10
Patch-Name: pwg-raster-attributes.patch
+
+First two hunks of that patch are no longer needed:
+https://github.com/apple/cups/issues/5641
---
scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 76 insertions(+), 1 deletion(-)
@@ -20,99 +23,6 @@ diff --git a/scheduler/printers.c b/sche
index bb99907ad..a0ebcbd3e 100644
--- scheduler/printers.c.orig 2019-11-17 12:21:47.966025953 +0000
+++ scheduler/printers.c
-@@ -2249,9 +2249,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
- cupsd_location_t *auth; /* Pointer to authentication element */
- const char *auth_supported; /* Authentication supported */
- ipp_t *oldattrs; /* Old printer attributes */
-- ipp_attribute_t *attr; /* Attribute data */
-+ ipp_attribute_t *attr, *attr2; /* Attribute data */
- char *name, /* Current user/group name */
- *filter; /* Current filter */
-+ mime_type_t *type;
-
-
- /*
-@@ -2584,6 +2585,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
-
- add_printer_formats(p);
-
-+ /*
-+ * Add "pwg-raster-document-xxx-supported" attributes if PWG Raster input
-+ * is supported
-+ */
-+ for (type = (mime_type_t *)cupsArrayFirst(p->filetypes);
-+ type;
-+ type = (mime_type_t *)cupsArrayNext(p->filetypes))
-+ {
-+ if (!_cups_strcasecmp(type->super, "image"))
-+ {
-+ if (!_cups_strcasecmp(type->type, "pwg-raster"))
-+ {
-+ if (p->ppd_attrs != NULL &&
-+ (attr = ippFindAttribute(p->ppd_attrs,
-+ "printer-resolution-supported",
-+ IPP_TAG_ZERO)) != NULL)
-+ {
-+ attr2 = ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
-+ "pwg-raster-document-resolution-supported",
-+ attr->num_values, IPP_RES_PER_INCH,
-+ NULL, NULL);
-+ for (i = 0; i < attr->num_values; i ++)
-+ {
-+ attr2->values[i].resolution.xres =
-+ attr->values[i].resolution.xres;
-+ attr2->values[i].resolution.yres =
-+ attr->values[i].resolution.yres;
-+ attr2->values[i].resolution.units = IPP_RES_PER_INCH;
-+ }
-+ }
-+ else
-+ {
-+ static const int pwg_raster_document_resolution_supported[] =
-+ {
-+ 300,
-+ 600,
-+ 1200
-+ };
-+ ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
-+ "pwg-raster-document-resolution-supported",
-+ (int)(sizeof(pwg_raster_document_resolution_supported) /
-+ sizeof(pwg_raster_document_resolution_supported[0])),
-+ IPP_RES_PER_INCH,
-+ pwg_raster_document_resolution_supported,
-+ pwg_raster_document_resolution_supported);
-+ }
-+ ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
-+ "pwg-raster-document-sheet-back", NULL, "normal");
-+ static const char * const pwg_raster_document_type_supported[] =
-+ {
-+ "adobergb-8",
-+ "adobergb-16",
-+ "black-1",
-+ "black-8",
-+ "black-16",
-+ "cmyk-8",
-+ "cmyk-16",
-+ "rgb-8",
-+ "rgb-16",
-+ "sgray-1",
-+ "sgray-8",
-+ "sgray-16",
-+ "srgb-8",
-+ "srgb-16"
-+ };
-+ ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
-+ "pwg-raster-document-type-supported",
-+ (int)(sizeof(pwg_raster_document_type_supported) /
-+ sizeof(pwg_raster_document_type_supported[0])), NULL,
-+ pwg_raster_document_type_supported);
-+ }
-+ }
-+ }
-+
- /*
- * Add name-default attributes...
- */
@@ -3731,7 +3806,9 @@ add_printer_formats(cupsd_printer_t *p)
}
else if (!_cups_strcasecmp(type->super, "image"))
Home |
Main Index |
Thread Index |
Old Index