Attachment 168735 Details for Bug 208345 – patch2

[patch] patch2

cups-filters.patch (text/plain), 8.89 KB, created by Tijl Coosemans on 2016-03-28 19:19:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2016-03-28 19:19:25 UTC

Size: 8.89 KB

patch

obsolete

>Index: print/cups-filters/Makefile
>===================================================================
>--- print/cups-filters/Makefile	(revision 411991)
>+++ print/cups-filters/Makefile	(working copy)
>@@ -2,21 +2,16 @@
> 
> PORTNAME=	cups-filters
> PORTVERSION=	1.8.2
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	print
> MASTER_SITES=	http://www.openprinting.org/download/cups-filters/
> 
> MAINTAINER=	cyberbotx@cyberbotx.com
>-COMMENT=	Backends, filters and other software (was part of the core CUPS)
>+COMMENT=	Additional backends, filters and other software for CUPS
> 
>-BUILD_DEPENDS=	pdftops:${PORTSDIR}/graphics/poppler-utils
>-RUN_DEPENDS=	pdftops:${PORTSDIR}/graphics/poppler-utils
>-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
>-		libpng.so:${PORTSDIR}/graphics/png \
>-		libijs.so:${PORTSDIR}/print/libijs \
>+LIB_DEPENDS=	libijs.so:${PORTSDIR}/print/libijs \
> 		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
> 		libqpdf.so:${PORTSDIR}/print/qpdf \
>-		libdbus-1.so:${PORTSDIR}/devel/dbus \
> 		libcupsimage.so:${PORTSDIR}/print/cups \
> 		libfreetype.so:${PORTSDIR}/print/freetype2 \
> 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
>@@ -24,7 +19,7 @@ LIB_DEPENDS=	libtiff.so:${PORTSDIR}/grap
> 
> CONFLICTS=	cups-pstoraster-[0-9]* foomatic-filters-[0-9]*
> 
>-USES=		compiler:c++11-lib cpe ghostscript gmake jpeg libtool pathfix \
>+USES=		compiler:c++11-lib cpe gmake gnome libtool pathfix \
> 		pkgconfig shebangfix tar:xz
> CPE_VENDOR=	linuxfoundation
> SHEBANG_FILES=	filter/braille/drivers/generic/brftoembosser.in \
>@@ -36,25 +31,80 @@ SHEBANG_FILES=	filter/braille/drivers/ge
> USE_GNOME=	glib20
> USE_RC_SUBR=	cups_browsed
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-shell=/bin/sh ZLIB_CFLAGS=" " ZLIB_LIBS="-lz"
>+CONFIGURE_ARGS=	--disable-silent-rules --with-shell=/bin/sh \
>+		ZLIB_CFLAGS=" " ZLIB_LIBS="-lz"
> INSTALL_TARGET=	install-strip
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
> USE_LDCONFIG=	yes
> 
>-OPTIONS_DEFINE=	AVAHI DOCS
>-OPTIONS_DEFAULT=AVAHI
>+OPTIONS_DEFINE=			BRAILLE COLORD DOCS GHOSTSCRIPT IMAGEFILTERS
>+OPTIONS_GROUP=			CUPS_BROWSED
>+OPTIONS_GROUP_CUPS_BROWSED=	AVAHI LDAP
>+OPTIONS_SINGLE=			PDFTOPS_RENDERER
>+OPTIONS_SINGLE_PDFTOPS_RENDERER=GS HYBRID PDFTOPS
>+OPTIONS_DEFAULT=		AVAHI COLORD GHOSTSCRIPT HYBRID IMAGEFILTERS
>+OPTIONS_SUB=			yes
> 
>-AVAHI_CONFIGURE_ENABLE=	avahi
>-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
>-AVAHI_SUB_LIST=		AVAHI_DAEMON=avahi_daemon
>-AVAHI_SUB_LIST_OFF=	AVAHI_DAEMON=
>+BRAILLE_CONFIGURE_ENABLE=	braille
>+BRAILLE_DESC=			Braille embosser support
>+BRAILLE_LIB_DEPENDS=		liblouis.so:${PORTSDIR}/devel/liblouis \
>+#				liblouisutdml.so:${PORTSDIR}/devel/liblouisutdml
>+BRAILLE_RUN_DEPENDS=		convert:${PORTSDIR}/graphics/ImageMagick \
>+				pdftotext:${PORTSDIR}/graphics/poppler-utils \
>+				bash:${PORTSDIR}/shells/bash
>+
>+COLORD_CONFIGURE_ENABLE=	dbus
>+COLORD_LIB_DEPENDS=		libdbus-1.so:${PORTSDIR}/devel/dbus
>+COLORD_RUN_DEPENDS=		colord>0:${PORTSDIR}/graphics/colord
>+
>+GHOSTSCRIPT_CONFIGURE_ENABLE=	ghostscript
>+GHOSTSCRIPT_DESC=		PDF/PostScript filter for non-PostScript printers
>+GHOSTSCRIPT_USES=		ghostscript
>+
>+IMAGEFILTERS_CONFIGURE_ENABLE=	imagefilters
>+IMAGEFILTERS_CONFIGURE_WITH=	jpeg png tiff
>+IMAGEFILTERS_DESC=		Support printing image files
>+IMAGEFILTERS_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
>+				libpng.so:${PORTSDIR}/graphics/png
>+IMAGEFILTERS_USES=		jpeg
>+
>+# cups-browsed(8) options
>+
>+AVAHI_CONFIGURE_ENABLE=		avahi
>+AVAHI_CONFIGURE_OFF=		--with-browseremoteprotocols=cups
>+AVAHI_CONFIGURE_ON=		--with-browseremoteprotocols="dnssd cups"
>+AVAHI_LIB_DEPENDS=		libavahi-client.so:${PORTSDIR}/net/avahi-app
>+AVAHI_SUB_LIST=			AVAHI_DAEMON=avahi_daemon
>+AVAHI_SUB_LIST_OFF=		AVAHI_DAEMON=
>+
>+CUPS_BROWSED_DESC=		cups-browsed(8) options
>+
>+LDAP_CONFIGURE_ENABLE=		ldap
>+LDAP_USE=			OPENLDAP=yes
>+
>+# Default PDF-to-PostScript renderer
>+
>+GS_CONFIGURE_ON=		--with-pdftops=gs
>+GS_DESC=			Ghostscript gs(1)
>+GS_IMPLIES=			GHOSTSCRIPT
>+
>+HYBRID_BUILD_DEPENDS=		pdftops:${PORTSDIR}/graphics/poppler-utils
>+HYBRID_RUN_DEPENDS=		pdftops:${PORTSDIR}/graphics/poppler-utils
>+HYBRID_CONFIGURE_ON=		--with-pdftops=hybrid
>+HYBRID_DESC=			Ghostscript or Poppler depending on printer
>+HYBRID_IMPLIES=			GHOSTSCRIPT
>+
>+PDFTOPS_BUILD_DEPENDS=		pdftops:${PORTSDIR}/graphics/poppler-utils
>+PDFTOPS_RUN_DEPENDS=		pdftops:${PORTSDIR}/graphics/poppler-utils
>+PDFTOPS_CONFIGURE_ON=		--with-pdftops=pdftops
>+PDFTOPS_DESC=			Poppler pdftops(1)
>+
>+PDFTOPS_RENDERER_DESC=		Default PDF-to-PostScript renderer
> 
> post-patch:
> 	@${REINPLACE_CMD} 's:-std=c++0x:-std=c++11:' ${WRKSRC}/Makefile.in
>-	@${REINPLACE_CMD} 's|/usr/share/liblouis|${LOCALBASE}/share/liblouis|' \
>-		${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
> 		-e 's|README.gz|README|' \
> 		${WRKSRC}/utils/cups-browsed.8 \
>Index: print/cups-filters/pkg-plist
>===================================================================
>--- print/cups-filters/pkg-plist	(revision 411991)
>+++ print/cups-filters/pkg-plist	(working copy)
>@@ -27,19 +27,19 @@ libexec/cups/backend/implicitclass
> libexec/cups/backend/parallel
> libexec/cups/backend/serial
> libexec/cups/filter/bannertopdf
>-libexec/cups/filter/brftoembosser
>+%%BRAILLE%%libexec/cups/filter/brftoembosser
> libexec/cups/filter/commandtoescpx
> libexec/cups/filter/commandtopclx
> libexec/cups/filter/foomatic-rip
>-libexec/cups/filter/gstopxl
>-libexec/cups/filter/gstoraster
>-libexec/cups/filter/imagetobrf
>-libexec/cups/filter/imagetopdf
>-libexec/cups/filter/imagetops
>-libexec/cups/filter/imagetoraster
>-libexec/cups/filter/imagetoubrl
>-libexec/cups/filter/imageubrltoindexv3
>-libexec/cups/filter/imageubrltoindexv4
>+%%GHOSTSCRIPT%%libexec/cups/filter/gstopxl
>+%%GHOSTSCRIPT%%libexec/cups/filter/gstoraster
>+%%BRAILLE%%libexec/cups/filter/imagetobrf
>+%%IMAGEFILTERS%%libexec/cups/filter/imagetopdf
>+%%IMAGEFILTERS%%libexec/cups/filter/imagetops
>+%%IMAGEFILTERS%%libexec/cups/filter/imagetoraster
>+%%BRAILLE%%libexec/cups/filter/imagetoubrl
>+%%BRAILLE%%libexec/cups/filter/imageubrltoindexv3
>+%%BRAILLE%%libexec/cups/filter/imageubrltoindexv4
> libexec/cups/filter/pdftoijs
> libexec/cups/filter/pdftoopvp
> libexec/cups/filter/pdftopdf
>@@ -50,10 +50,10 @@ libexec/cups/filter/rastertoescpx
> libexec/cups/filter/rastertopclx
> libexec/cups/filter/rastertopdf
> libexec/cups/filter/sys5ippprinter
>-libexec/cups/filter/textbrftoindexv3
>-libexec/cups/filter/textbrftoindexv4
>+%%BRAILLE%%libexec/cups/filter/textbrftoindexv3
>+%%BRAILLE%%libexec/cups/filter/textbrftoindexv4
> libexec/cups/filter/textonly
>-libexec/cups/filter/texttobrf
>+%%BRAILLE%%libexec/cups/filter/texttobrf
> libexec/cups/filter/texttopdf
> libexec/cups/filter/texttops
> libexec/cups/filter/urftopdf
>@@ -68,10 +68,10 @@ share/cups/banners/secret
> share/cups/banners/standard
> share/cups/banners/topsecret
> share/cups/banners/unclassified
>-share/cups/braille/cups-braille.sh
>-share/cups/braille/index.sh
>-share/cups/braille/indexv3.sh
>-share/cups/braille/indexv4.sh
>+%%BRAILLE%%share/cups/braille/cups-braille.sh
>+%%BRAILLE%%share/cups/braille/index.sh
>+%%BRAILLE%%share/cups/braille/indexv3.sh
>+%%BRAILLE%%share/cups/braille/indexv4.sh
> share/cups/charsets/pdf.utf-8
> share/cups/charsets/pdf.utf-8.heavy
> share/cups/charsets/pdf.utf-8.simple
>@@ -89,24 +89,24 @@ share/cups/data/testprint
> share/cups/data/topsecret.pdf
> share/cups/data/unclassified.pdf
> share/cups/drv/cupsfilters.drv
>-share/cups/drv/generic-brf.drv
>-share/cups/drv/indexv3.drv
>-share/cups/drv/indexv4.drv
>-share/cups/mime/braille.convs
>-share/cups/mime/braille.types
>+%%BRAILLE%%share/cups/drv/generic-brf.drv
>+%%BRAILLE%%share/cups/drv/indexv3.drv
>+%%BRAILLE%%share/cups/drv/indexv4.drv
>+%%BRAILLE%%share/cups/mime/braille.convs
>+%%BRAILLE%%share/cups/mime/braille.types
> share/cups/mime/cupsfilters.convs
> share/cups/mime/cupsfilters.types
>-share/cups/ppdc/braille.defs
>+%%BRAILLE%%share/cups/ppdc/braille.defs
> share/cups/ppdc/escp.h
>-share/cups/ppdc/fr-braille.po
>-share/cups/ppdc/imagemagick.defs
>-share/cups/ppdc/index.defs
>-share/cups/ppdc/liblouis.defs
>-share/cups/ppdc/liblouis1.defs
>-share/cups/ppdc/liblouis2.defs
>-share/cups/ppdc/liblouis3.defs
>-share/cups/ppdc/liblouis4.defs
>-share/cups/ppdc/media-braille.defs
>+%%BRAILLE%%share/cups/ppdc/fr-braille.po
>+%%BRAILLE%%share/cups/ppdc/imagemagick.defs
>+%%BRAILLE%%share/cups/ppdc/index.defs
>+%%BRAILLE%%share/cups/ppdc/liblouis.defs
>+%%BRAILLE%%share/cups/ppdc/liblouis1.defs
>+%%BRAILLE%%share/cups/ppdc/liblouis2.defs
>+%%BRAILLE%%share/cups/ppdc/liblouis3.defs
>+%%BRAILLE%%share/cups/ppdc/liblouis4.defs
>+%%BRAILLE%%share/cups/ppdc/media-braille.defs
> share/cups/ppdc/pcl.h
> %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
> %%PORTDOCS%%%%DOCSDIR%%/COPYING
>@@ -118,6 +118,6 @@ share/ppd/cupsfilters/Generic-PDF_Printe
> share/ppd/cupsfilters/HP-Color_LaserJet_CM3530_MFP-PDF.ppd
> share/ppd/cupsfilters/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd
> share/ppd/cupsfilters/Ricoh-PDF_Printer-PDF.ppd
>-share/ppd/cupsfilters/pxlcolor.ppd
>-share/ppd/cupsfilters/pxlmono.ppd
>+%%GHOSTSCRIPT%%share/ppd/cupsfilters/pxlcolor.ppd
>+%%GHOSTSCRIPT%%share/ppd/cupsfilters/pxlmono.ppd
> share/ppd/cupsfilters/textonly.ppd

Actions: View | Diff

Attachments on bug 208345: 168710 | 168735