From 51c121ad81997ad6d5f031237edf4c761a3d7103 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 10 Mar 2013 08:17:53 +0000 Subject: [PATCH] Update to cups-filters-1.0.30. --- print/cups-filters/Makefile | 16 +++++++++------- print/cups-filters/distinfo | 4 ++-- .../patch-filter_pdftoopvp_OPVPOutputDev_cxx | 16 ---------------- .../patches/patch-filter_pdftoopvp_oprs_OPRS_cxx | 16 ---------------- .../patches/patch-utils_cups-browsed_c | 14 ++++++++++++++ print/cups-filters/pkg/PLIST | 7 ++++++- 6 files changed, 31 insertions(+), 42 deletions(-) delete mode 100644 print/cups-filters/patches/patch-filter_pdftoopvp_OPVPOutputDev_cxx delete mode 100644 print/cups-filters/patches/patch-filter_pdftoopvp_oprs_OPRS_cxx create mode 100644 print/cups-filters/patches/patch-utils_cups-browsed_c diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index 0552fd6a0b3..c0bafbb58cf 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.9 2013/02/07 19:13:49 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.10 2013/03/10 08:17:53 ajacoutot Exp $ # XXX remove @exec-update when we branch 5.4-current COMMENT= OpenPrinting CUPS filters -DISTNAME= cups-filters-1.0.29 +DISTNAME= cups-filters-1.0.30 CATEGORIES= print SHARED_LIBS += cupsfilters 0.0 # 1.0 @@ -20,10 +20,10 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += asn1 avahi-client avahi-common c crypto cups cupsimage -WANTLIB += dbus-1 expat fontconfig freetype gssapi iconv ijs intl -WANTLIB += jpeg krb5 lcms2 m openjpeg pcre png poppler pthread -WANTLIB += qpdf ssl stdc++ tiff z +WANTLIB += asn1 avahi-client avahi-common avahi-glib c crypto +WANTLIB += cups cupsimage dbus-1 expat fontconfig freetype glib-2.0 +WANTLIB += gssapi iconv ijs intl jpeg krb5 lcms2 m openjpeg pcre +WANTLIB += png poppler pthread qpdf ssl stdc++ tiff z MASTER_SITES= http://www.openprinting.org/download/cups-filters/ @@ -49,7 +49,8 @@ USE_LIBTOOL= Yes MAKE_FLAGS= DLOPEN_LIBS="" -FAKE_FLAGS= pkgfontconfigdir=${PREFIX}/share/examples/cups-filters +FAKE_FLAGS= pkgfontconfigdir=${PREFIX}/share/examples/cups-filters \ + pkgcupsserverrootdir=${PREFIX}/share/examples/cups-filters/cups CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include \ @@ -58,6 +59,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include \ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ + --with-browseremoteprotocols=DNSSD,CUPS \ --with-test-font-path=${X11BASE}/lib/X11/fonts/TTF/DejaVuSans.ttf \ --with-acroread-path=${LOCALBASE}/bin/acroread \ --with-gs-path=${LOCALBASE}/bin/gs \ diff --git a/print/cups-filters/distinfo b/print/cups-filters/distinfo index 280f6c2e108..e66dade65e4 100644 --- a/print/cups-filters/distinfo +++ b/print/cups-filters/distinfo @@ -1,2 +1,2 @@ -SHA256 (cups-filters-1.0.29.tar.gz) = 5mJUNzqftGKZedVAnOKneWr5S0k7MehzTBaV36Jsg04= -SIZE (cups-filters-1.0.29.tar.gz) = 1284589 +SHA256 (cups-filters-1.0.30.tar.gz) = 8AQVnJyXM761JHBE0DqxstpTvfU5jDZ1SlaRT5qIWP4= +SIZE (cups-filters-1.0.30.tar.gz) = 1295076 diff --git a/print/cups-filters/patches/patch-filter_pdftoopvp_OPVPOutputDev_cxx b/print/cups-filters/patches/patch-filter_pdftoopvp_OPVPOutputDev_cxx deleted file mode 100644 index 88adbcaafb0..00000000000 --- a/print/cups-filters/patches/patch-filter_pdftoopvp_OPVPOutputDev_cxx +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-filter_pdftoopvp_OPVPOutputDev_cxx,v 1.1 2013/01/21 19:08:49 kili Exp $ - -Fix build with poppler-0.22. A similar fix was already in the snapshot -of january 19th and will probably be included in cups-filters-1.0.30. - ---- filter/pdftoopvp/OPVPOutputDev.cxx.orig Fri Jul 20 10:22:23 2012 -+++ filter/pdftoopvp/OPVPOutputDev.cxx Sat Jan 19 10:54:05 2013 -@@ -1805,7 +1805,7 @@ void OPVPOutputDev::drawSoftMaskedImage(GfxState *stat - maskColor[0] = 0; - maskSplash->clear(maskColor); - maskSplash->drawImage(&imageSrc, &imgMaskData, -- splashModeMono8, gFalse, maskWidth, maskHeight, mat); -+ splashModeMono8, gFalse, maskWidth, maskHeight, mat, gFalse); - delete imgMaskData.imgStr; - maskStr->close(); - gfree(imgMaskData.lookup); diff --git a/print/cups-filters/patches/patch-filter_pdftoopvp_oprs_OPRS_cxx b/print/cups-filters/patches/patch-filter_pdftoopvp_oprs_OPRS_cxx deleted file mode 100644 index 9f322a40b17..00000000000 --- a/print/cups-filters/patches/patch-filter_pdftoopvp_oprs_OPRS_cxx +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-filter_pdftoopvp_oprs_OPRS_cxx,v 1.5 2013/01/21 19:08:49 kili Exp $ - -Fix build with poppler-0.22. A similar fix was already in the snapshot -of january 19th and will probably be included in cups-filters-1.0.30. - ---- filter/pdftoopvp/oprs/OPRS.cxx.orig Mon Sep 10 21:52:00 2012 -+++ filter/pdftoopvp/oprs/OPRS.cxx Sat Jan 19 10:52:40 2013 -@@ -235,7 +235,7 @@ SplashError OPRS::drawImage(SplashImageSource src, voi - SplashColorMode srcMode, GBool srcAlpha, - int w, int h, SplashCoord *mat) { - if (rasterMode) { -- return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); -+ return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat, gFalse); - } else { - return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); - } diff --git a/print/cups-filters/patches/patch-utils_cups-browsed_c b/print/cups-filters/patches/patch-utils_cups-browsed_c new file mode 100644 index 00000000000..eeededd9af9 --- /dev/null +++ b/print/cups-filters/patches/patch-utils_cups-browsed_c @@ -0,0 +1,14 @@ +$OpenBSD: patch-utils_cups-browsed_c,v 1.1 2013/03/10 08:17:53 ajacoutot Exp $ + +https://bugs.linuxfoundation.org/show_bug.cgi?id=1103 + +--- utils/cups-browsed.c.orig Sun Mar 10 08:54:33 2013 ++++ utils/cups-browsed.c Sun Mar 10 08:54:56 2013 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/print/cups-filters/pkg/PLIST b/print/cups-filters/pkg/PLIST index 9de47970a09..c9d29189799 100644 --- a/print/cups-filters/pkg/PLIST +++ b/print/cups-filters/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2013/02/02 08:55:12 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.6 2013/03/10 08:17:53 ajacoutot Exp $ @conflict cups-<1.6.0 @exec-update [ -h ${SYSCONFDIR}/fonts/conf.d/99-pdftoopvp.conf ] && rm -f ${SYSCONFDIR}/fonts/conf.d/99-pdftoopvp.conf || true @bin bin/ttfread @@ -69,6 +69,11 @@ share/doc/cups-filters/README share/examples/cups-filters/ share/examples/cups-filters/99pdftoopvp.conf @sample ${SYSCONFDIR}/fonts/conf.d/99-pdftoopvp.conf +share/examples/cups-filters/cups/ +@mode 0644 +share/examples/cups-filters/cups/cups-browsed.conf +@sample ${SYSCONFDIR}/cups/cups-browsed.conf +@mode share/ppd/ share/ppd/cupsfilters/ share/ppd/cupsfilters/Generic-PDF_Printer-PDF.ppd