* [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/
@ 2016-02-11 2:22 Mike Frysinger
0 siblings, 0 replies; 11+ messages in thread
From: Mike Frysinger @ 2016-02-11 2:22 UTC (permalink / raw
To: gentoo-commits
commit: 75f35a8155a706cf370d89683c268d1b8246e425
Author: Brian Norris <briannorris <AT> chromium <DOT> org>
AuthorDate: Mon Feb 8 21:54:52 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 02:20:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f35a81
net-print/cups-filters: add --disable-{foomatic,ghostscript} support
Support a new USE flag to allow disabling ghostscript-based filters in a
CUPS installation. Requires patching in a new --disable-ghostscript
option to the configure script. Patch supplied in upstream bug:
https://bugs.linuxfoundation.org/show_bug.cgi?id=1342
Also support a proper configure flag for foomatic at the same time.
.../cups-filters/cups-filters-1.8.1-r1.ebuild | 22 ++-
...s-filters-1.8.1-allow-disable-ghostscript.patch | 187 +++++++++++++++++++++
2 files changed, 197 insertions(+), 12 deletions(-)
diff --git a/net-print/cups-filters/cups-filters-1.8.1-r1.ebuild b/net-print/cups-filters/cups-filters-1.8.1-r1.ebuild
index a7a1a9a..d6f6ef2 100644
--- a/net-print/cups-filters/cups-filters-1.8.1-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.8.1-r1.ebuild
@@ -21,10 +21,10 @@ HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf
LICENSE="MIT GPL-2"
SLOT="0"
-IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
+IUSE="dbus +foomatic jpeg perl png +postscript static-libs tiff zeroconf"
RDEPEND="
- >=app-text/ghostscript-gpl-9.09[cups]
+ postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
app-text/poppler:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
>=app-text/qpdf-3.0.2:=
media-libs/fontconfig
@@ -48,6 +48,7 @@ DEPEND="${RDEPEND}
src_prepare() {
base_src_prepare
+ epatch "${FILESDIR}/${P}-allow-disable-ghostscript.patch"
sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
eautoreconf
}
@@ -58,6 +59,8 @@ src_configure() {
$(use_enable dbus) \
$(use_enable zeroconf avahi) \
$(use_enable static-libs static) \
+ $(use_enable foomatic) \
+ $(use_enable postscript ghostscript) \
--with-fontdir="fonts/conf.avail" \
--with-pdftops=pdftops \
--enable-imagefilters \
@@ -90,9 +93,11 @@ src_install() {
popd > /dev/null
fi
- # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
- dosym gstoraster /usr/libexec/cups/filter/pstoraster
- dosym gstopxl /usr/libexec/cups/filter/pstopxl
+ if use ghostscript; then
+ # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+ dosym gstoraster /usr/libexec/cups/filter/pstoraster
+ dosym gstopxl /usr/libexec/cups/filter/pstopxl
+ fi
prune_libtool_files --all
@@ -103,13 +108,6 @@ src_install() {
sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
fi
- if ! use foomatic ; then
- # this needs an upstream solution / configure switch
- rm -v "${ED}/usr/bin/foomatic-rip" || die
- rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
- rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
- fi
-
doinitd "${T}"/cups-browsed
systemd_dounit "${S}/utils/cups-browsed.service"
}
diff --git a/net-print/cups-filters/files/cups-filters-1.8.1-allow-disable-ghostscript.patch b/net-print/cups-filters/files/cups-filters-1.8.1-allow-disable-ghostscript.patch
new file mode 100644
index 0000000..a9c63da
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.8.1-allow-disable-ghostscript.patch
@@ -0,0 +1,187 @@
+Allow disabling ghostscript and foomatic. Pulled from upstream bzr rev 7447:
+
+https://bugs.linuxfoundation.org/show_bug.cgi?id=1342
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -412,11 +412,14 @@ pdftopdf_LDADD = \
+ # Simple filter binaries
+ # ======================
+ pkgfilter_SCRIPTS = \
+- filter/gstopxl \
+ filter/imagetops \
+ filter/pstopdf \
+ filter/textonly \
+ filter/texttops
++if ENABLE_GHOSTSCRIPT
++pkgfilter_SCRIPTS += \
++ filter/gstopxl
++endif
+ if ENABLE_BRAILLE
+ nodist_pkgfilter_SCRIPTS = \
+ filter/braille/drivers/generic/brftoembosser \
+@@ -420,8 +423,6 @@ pdftopdf_LDADD = \
+ bannertopdf \
+ commandtoescpx \
+ commandtopclx \
+- foomatic-rip \
+- gstoraster \
+ pdftoijs \
+ sys5ippprinter \
+ pdftops \
+@@ -432,6 +433,14 @@ pkgfilter_PROGRAMS += \
+ texttopdf \
+ urftopdf \
+ rastertopdf
++if ENABLE_GHOSTSCRIPT
++pkgfilter_PROGRAMS += \
++ gstoraster
++endif
++if ENABLE_FOOMATIC
++pkgfilter_PROGRAMS += \
++ foomatic-rip
++endif
+ if ENABLE_IMAGEFILTERS
+ pkgfilter_PROGRAMS += \
+ imagetopdf \
+@@ -737,8 +746,11 @@ initrcdir = $(INITDDIR)
+ initrc_SCRIPTS = utils/cups-browsed
+ man_MANS = \
+ utils/cups-browsed.8 \
+- utils/cups-browsed.conf.5 \
++ utils/cups-browsed.conf.5
++if ENABLE_FOOMATIC
++man_MANS += \
+ filter/foomatic-rip/foomatic-rip.1
++endif
+ EXTRA_DIST += utils/cups-browsed.in \
+ $(man_MANS)
+ utils/org.cups.cupsd.Notifier.xml
+@@ -752,9 +764,12 @@ ppd_DATA = \
+ ppd/HP-Color_LaserJet_CM3530_MFP-PDF.ppd \
+ ppd/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd \
+ ppd/Ricoh-PDF_Printer-PDF.ppd \
+- ppd/pxlcolor.ppd \
+- ppd/pxlmono.ppd \
+ ppd/textonly.ppd
++if ENABLE_GHOSTSCRIPT
++ppd_DATA += \
++ ppd/pxlcolor.ppd \
++ ppd/pxlmono.ppd
++endif
+
+ EXTRA_DIST += $(ppd_DATA)
+
+@@ -782,7 +797,9 @@ distclean-local:
+ install-exec-hook:
+ $(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir)
++if ENABLE_FOOMATIC
+ $(LN_S) -f $(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
++endif
+ if ENABLE_BRAILLE
+ $(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl
+ $(LN_S) -f textbrftoindexv3 $(DESTDIR)$(pkgfilterdir)/textbrftoindexv4
+@@ -806,7 +823,9 @@ if RCLINKS
+ fi
+ endif
+ $(RM) $(DESTDIR)$(pkgcharsetdir)/pdf.utf-8
++if ENABLE_FOOMATIC
+ $(RM) $(DESTDIR)$(bindir)/foomatic-rip
++endif
+ if ENABLE_BRAILLE
+ $(RM) $(DESTDIR)$(pkgfilterdir)/imagetoubrl
+ $(RM) $(DESTDIR)$(pkgfilterdir)/textbrftoindexv4
+--- a/configure.ac
++++ b/configure.ac
+@@ -431,6 +431,11 @@ AS_IF([test x"$long_long_found" = "xyes"], [
+ # ================
+ # Check for pdf2ps
+ # ================
++AC_ARG_ENABLE([ghostscript],
++ [AS_HELP_STRING([--disable-ghostscript], [Disable filters using Ghostscript.])],
++ [enable_ghostscript="$enableval"],
++ [enable_ghostscript=yes]
++)
+ AC_ARG_WITH([pdftops],
+ [AS_HELP_STRING([--with-pdftops=value], [Set which pdftops to use (gs,pdftops,pdftocairo,acroread,hybrid).])],
+ [with_pdftops="$withval"],
+@@ -471,25 +476,35 @@ AS_CASE([x$with_pdftops_maxres],
+ [AC_MSG_ERROR([Unknown value of with-pdftops-maxres provided: $with_pdftops])]
+ )
+
+-AS_IF([test "x$with_gs_path" != "xsystem"], [
+- CUPS_GHOSTSCRIPT="$with_gs_path"
+-], [
+- AC_PATH_PROG(CUPS_GHOSTSCRIPT, [gs], [AC_MSG_ERROR([Required gs binary is missing. Please install ghostscript-gpl package.])])
+-])
+-AS_IF([test "x$CUPS_GHOSTSCRIPT" != "x"], [
+- AC_DEFINE([HAVE_GHOSTSCRIPT], [], [Define that we provide ghostscript binary])
+- AS_IF([test x"$with_pdftops" = xgs], [AC_DEFINE_UNQUOTED([CUPS_PDFTOPS_RENDERER], [GS], [Define default renderer])])
+-
+- AC_MSG_CHECKING(whether gs supports the ps2write device)
+- AS_IF([`$CUPS_GHOSTSCRIPT -h 2>&1 | grep -q ps2write`], [
+- AC_MSG_RESULT([yes])
+- AC_DEFINE([HAVE_GHOSTSCRIPT_PS2WRITE], [], [gs supports ps2write])
++CUPS_GHOSTSCRIPT=""
++AS_IF([test "x$enable_ghostscript" != "xyes"], [
++ AS_IF([test "x$with_gs_path" != "xsystem"], [
++ AC_MSG_ERROR([Cannot supply both --disable-ghostscript and --gs-path=])
+ ], [
+- AC_MSG_RESULT([no])
++ with_gs_path=""
+ ])
+ ], [
+- CUPS_GHOSTSCRIPT="gs"
++ AS_IF([test "x$with_gs_path" != "xsystem"], [
++ CUPS_GHOSTSCRIPT="$with_gs_path"
++ ], [
++ AC_PATH_PROG(CUPS_GHOSTSCRIPT, [gs], [AC_MSG_ERROR([Required gs binary is missing. Please install ghostscript-gpl package.])])
++ ])
++ AS_IF([test "x$CUPS_GHOSTSCRIPT" != "x"], [
++ AC_DEFINE([HAVE_GHOSTSCRIPT], [], [Define that we provide ghostscript binary])
++ AS_IF([test x"$with_pdftops" = xgs], [AC_DEFINE_UNQUOTED([CUPS_PDFTOPS_RENDERER], [GS], [Define default renderer])])
++
++ AC_MSG_CHECKING(whether gs supports the ps2write device)
++ AS_IF([`$CUPS_GHOSTSCRIPT -h 2>&1 | grep -q ps2write`], [
++ AC_MSG_RESULT([yes])
++ AC_DEFINE([HAVE_GHOSTSCRIPT_PS2WRITE], [], [gs supports ps2write])
++ ], [
++ AC_MSG_RESULT([no])
++ ])
++ ], [
++ CUPS_GHOSTSCRIPT="gs"
++ ])
+ ])
++AM_CONDITIONAL(ENABLE_GHOSTSCRIPT, test "x$enable_ghostscript" = xyes)
+
+ AS_IF([test "x$with_pdftops_path" != "xsystem"], [
+ CUPS_PDFTOPS="$with_pdftops_path"
+@@ -550,6 +565,16 @@ AC_DEFINE_UNQUOTED([CUPS_POPPLER_PDFTOCAIRO], "$CUPS_PDFTOCAIRO", [pdftocairo bi
+ AC_DEFINE_UNQUOTED([CUPS_ACROREAD], "$CUPS_ACROREAD", [acroread binary to use.])
+ AC_DEFINE_UNQUOTED([CUPS_PDFTOPS_MAX_RESOLUTION], [$CUPS_PDFTOPS_MAXRES], [max resolution used for pdftops when converting images])
+
++# ==================
++# Check for foomatic
++# ==================
++AC_ARG_ENABLE([foomatic],
++ [AS_HELP_STRING([--disable-foomatic], [Disable Foomatic-based filters.])],
++ [enable_foomatic="$enableval"],
++ [enable_foomatic=yes]
++)
++AM_CONDITIONAL([ENABLE_FOOMATIC], [test "x$enable_foomatic" = "xyes"])
++
+ # =============
+ # Check for php
+ # =============
+@@ -658,8 +683,10 @@ Environment settings:
+ Build configuration:
+ cups-config: ${with_cups_config}
+ font directory: ${sysconfdir}/${FONTDIR}
++ foomatic: ${enable_foomatic}
+ init directory: ${INITDDIR}
+ cups dom socket: ${CUPS_DEFAULT_DOMAINSOCKET}
++ ghostscript: ${enable_ghostscript}
+ gs-path: ${with_gs_path}
+ imagefilters: ${enable_imagefilters}
+ jpeg: ${with_jpeg}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/
@ 2016-03-23 6:29 Mike Frysinger
0 siblings, 0 replies; 11+ messages in thread
From: Mike Frysinger @ 2016-03-23 6:29 UTC (permalink / raw
To: gentoo-commits
commit: 60b83034240153d49d9e422a5ef8e4dce196be2f
Author: Brian Norris <briannorris <AT> chromium <DOT> org>
AuthorDate: Wed Mar 23 06:26:53 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 06:27:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b83034
net-print/cups-filters: add upstream fixes for USE=-postscript
When ghostscript is disabled, make sure we still don't require features
from it at configure & runtime.
.../cups-filters/cups-filters-1.8.2-r1.ebuild | 8 ++-
.../files/cups-filters-1.8.2-disable-ijs.patch | 68 ++++++++++++++++++++++
.../files/cups-filters-1.8.2-gstoraster.patch | 66 +++++++++++++++++++++
3 files changed, 141 insertions(+), 1 deletion(-)
diff --git a/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild b/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild
index 00d2626..844bf04 100644
--- a/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
GENTOO_DEPEND_ON_PERL=no
-inherit eutils perl-module systemd
+inherit eutils perl-module autotools systemd
if [[ "${PV}" == "9999" ]] ; then
inherit bzr
@@ -47,6 +47,12 @@ DEPEND="${RDEPEND}
dev-util/gdbus-codegen
"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-disable-ijs.patch #574992
+ epatch "${FILESDIR}"/${P}-gstoraster.patch
+ eautoreconf
+}
+
src_configure() {
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
diff --git a/net-print/cups-filters/files/cups-filters-1.8.2-disable-ijs.patch b/net-print/cups-filters/files/cups-filters-1.8.2-disable-ijs.patch
new file mode 100644
index 0000000..7167c9c
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.8.2-disable-ijs.patch
@@ -0,0 +1,68 @@
+ijs is part of the ghostscript package, so it needs to be dropped when we drop
+ghostscript (i.e., USE="-postscript"). Patch accepted here:
+
+https://bugs.linuxfoundation.org/show_bug.cgi?id=1345
+
+--- Makefile.am
++++ Makefile.am
+@@ -490,7 +490,6 @@
+ bannertopdf \
+ commandtoescpx \
+ commandtopclx \
+- pdftoijs \
+ sys5ippprinter \
+ pdftops \
+ pdftoraster \
+@@ -499,6 +498,10 @@
+ texttopdf \
+ urftopdf \
+ rastertopdf
++if ENABLE_IJS
++pkgfilter_PROGRAMS += \
++ pdftoijs
++endif
+ if ENABLE_GHOSTSCRIPT
+ pkgfilter_PROGRAMS += \
+ gstoraster
+@@ -846,9 +849,12 @@
+ ppd/Fuji_Xerox-DocuPrint_CM305_df-PDF.ppd \
+ ppd/Generic-PDF_Printer-PDF.ppd \
+ ppd/HP-Color_LaserJet_CM3530_MFP-PDF.ppd \
+- ppd/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd \
+ ppd/Ricoh-PDF_Printer-PDF.ppd \
+ ppd/textonly.ppd
++if ENABLE_IJS
++ppd_DATA += \
++ ppd/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd
++endif
+ if ENABLE_GHOSTSCRIPT
+ ppd_DATA += \
+ ppd/pxlcolor.ppd \
+
+--- configure.ac
++++ configure.ac
+@@ -443,7 +443,7 @@
+ ])
+ PKG_CHECK_MODULES([FREETYPE], [freetype2], [AC_DEFINE([HAVE_FREETYPE_H], [1], [Have FreeType2 include files])])
+ PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.0.0])
+-PKG_CHECK_MODULES([IJS], [ijs])
++PKG_CHECK_MODULES([IJS], [ijs], [have_ijs=yes], [have_ijs=no])
+ PKG_CHECK_MODULES([POPPLER], [poppler >= 0.18])
+ PKG_CHECK_MODULES([ZLIB], [zlib])
+ AC_DEFINE([HAVE_LIBZ], [], [Define that we use zlib])
+@@ -489,6 +489,15 @@
+ [enable_ghostscript="$enableval"],
+ [enable_ghostscript=yes]
+ )
++AC_ARG_ENABLE([ijs],
++ [AS_HELP_STRING([--disable-ijs], [Disable filters using IJS.])],
++ [enable_ijs="$enableval"],
++ [enable_ijs=yes]
++)
++AS_IF([test "x$enable_ijs" = "xyes" -a "x$have_ijs" != "xyes"], [
++ AC_MSG_ERROR([IJS not found, but requested.])
++])
++AM_CONDITIONAL(ENABLE_IJS, test "x$enable_ijs" = "xyes")
+ AC_ARG_WITH([pdftops],
+ [AS_HELP_STRING([--with-pdftops=value], [Set which pdftops to use (gs,pdftops,pdftocairo,acroread,hybrid).])],
+ [with_pdftops="$withval"],
diff --git a/net-print/cups-filters/files/cups-filters-1.8.2-gstoraster.patch b/net-print/cups-filters/files/cups-filters-1.8.2-gstoraster.patch
new file mode 100644
index 0000000..91fd49a
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.8.2-gstoraster.patch
@@ -0,0 +1,66 @@
+When we remove ghostscript-based filters, CUPS complains about a missing
+'gstoraster' filter, even if it doesn't need it. The fix is to drop the
+gstoraster rules from the MIME conversion rules. Patch accepted here:
+
+https://bugs.linuxfoundation.org/show_bug.cgi?id=1346
+
+--- COPYING 2016-01-21 14:50:23 +0000
++++ COPYING 2016-03-03 02:35:23 +0000
+@@ -103,7 +103,7 @@
+ 1993-2007, Easy Software Products
+ License: GPL-2
+
+-Files: mime/cupsfilters.convs*
++Files: mime/cupsfilters*.convs*
+ Copyright: 2007-2011, Apple Inc
+ 1997-2007, Easy Software Products
+ 2012-2016, Till Kamppeter
+
+--- Makefile.am 2016-03-03 02:39:23 +0000
++++ Makefile.am 2016-03-03 02:44:15 +0000
+@@ -292,6 +292,10 @@
+ pkgmime_DATA = \
+ mime/cupsfilters.convs \
+ mime/cupsfilters.types
++if ENABLE_GHOSTSCRIPT
++pkgmime_DATA += \
++ mime/cupsfilters-ghostscript.convs
++endif
+ if ENABLE_BRAILLE
+ pkgmime_DATA += \
+ mime/braille.convs \
+
+--- mime/cupsfilters-ghostscript.convs 1970-01-01 00:00:00 +0000
++++ mime/cupsfilters-ghostscript.convs 2016-03-03 02:31:30 +0000
+@@ -0,0 +1,19 @@
++#
++# MIME conversions file for OpenPrinting CUPS Filters.
++#
++# Copyright 2007-2011 by Apple Inc.
++# Copyright 1997-2007 by Easy Software Products.
++# Copyright 2012-2016 by Till Kamppeter.
++#
++# These coded instructions, statements, and computer programs are the
++# property of Apple Inc. and are protected by Federal copyright
++# law. Distribution and use rights are outlined in the file "COPYING"
++# which should have been included with this file.
++#
++
++#
++# Ghostscript-based filters...
++#
++
++application/vnd.cups-pdf application/vnd.cups-raster 99 gstoraster
++application/vnd.cups-postscript application/vnd.cups-raster 175 gstoraster
+
+--- mime/cupsfilters.convs 2016-01-21 14:50:23 +0000
++++ mime/cupsfilters.convs 2016-03-03 02:35:59 +0000
+@@ -83,8 +83,6 @@
+ # Raster filters...
+ #
+
+-application/vnd.cups-pdf application/vnd.cups-raster 99 gstoraster
+-application/vnd.cups-postscript application/vnd.cups-raster 175 gstoraster
+ application/vnd.cups-pdf application/vnd.cups-raster 100 pdftoraster
+ image/gif application/vnd.cups-raster 100 imagetoraster
+ image/png application/vnd.cups-raster 100 imagetoraster
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/
@ 2016-03-23 6:29 Mike Frysinger
0 siblings, 0 replies; 11+ messages in thread
From: Mike Frysinger @ 2016-03-23 6:29 UTC (permalink / raw
To: gentoo-commits
commit: 84cc842875931641ddd423925cf06e26c2db3545
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 06:29:15 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 06:29:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84cc8428
net-print/cups-filters: drop old <1.5.0 versions
net-print/cups-filters/Manifest | 1 -
net-print/cups-filters/cups-filters-1.0.71.ebuild | 122 ---------------------
.../files/cups-filters-1.0.53-uclibc.patch | 16 ---
.../files/cups-filters-1.0.65-poppler0310.patch | 65 -----------
.../files/cups-filters-1.0.71-poppler0340.patch | 38 -------
5 files changed, 242 deletions(-)
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index f37bd62..616bd64 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,4 +1,3 @@
-DIST cups-filters-1.0.71.tar.xz 1339116 SHA256 3180aa209c383402822e568ccef8e1ca43f51e30b3af2039c34ebae919a69c1f SHA512 dc243e88d535c8d7e7fd53074b1093a46fc22742504efa09096d2b216846df875e4d914f25d2f726034692538cfdf1b713bc1ef44d199003a21e242b99f44a01 WHIRLPOOL 4afc7079594563f57af81501192cc0cba19db6cd5c10a9544339858a343e245b485e528fbf80eecd711341b23b8321bde817c49db7ddd2f0b801da2b4b9c580d
DIST cups-filters-1.5.0.tar.xz 1375588 SHA256 f22a8864e8d5b693795605a31345c08cc68f85120ebde9a0aa7bc27639815932 SHA512 81574f8368aaef61aeee4369caa394f2c8cdc717b03687d8a17c7927892f07cff68f1efb8d674757cb97001b55fd58fa5c14784a510ce9d31e385b1a73cd18c7 WHIRLPOOL 4201d08a2bb76d349a6b9f7220eb48dea86bb81c0cedbe8dcb8796c49ce26f67f6a7c49677b4fc7b6f865eb20e3c806746f565668e9f9e1e3935630621d032cd
DIST cups-filters-1.6.0.tar.xz 1377952 SHA256 39e53db81df7aa951507c72ced52b9b0e9e4294c3f83e8b717fb42c03a557c97 SHA512 dd7671dbb13588829337e4ae4d533dc6c1e17f75ca240a6d43bb0a30a2453fffa9a1541d7b041024a6d4cbb939790802a8c3947cd319590fa37c7ce237232b9d WHIRLPOOL 297ec0aeebd336a583f410099711cd6449b7b765fb29099b1ba5fd2d6a4c5dd7fd2824eb7aa26ca59070d7b866a68966d609729a3f58c07e1e13011af7e7e33e
DIST cups-filters-1.8.1.tar.xz 1372152 SHA256 4e7d8953f910b7a992471d641590964c20f26da5d94c10de932dde4f5c03e91e SHA512 9b254dbcc90df335b8162495f5c2846f77c8006128458e54753877d0b5e6b1d696ae28378b4b9a8275626d7f537651e1cb55aac67588ee5fa319898912dd9e08 WHIRLPOOL 7a41fdeed84ee1f0f18aa201633ce5e77040499bf7a2ac5cf324f45876ca2a8072ddf5b947d8ac6526839bcd15c351324d556967d4e303d6b96aaf5bd44c2ed3
diff --git a/net-print/cups-filters/cups-filters-1.0.71.ebuild b/net-print/cups-filters/cups-filters-1.0.71.ebuild
deleted file mode 100644
index 8e6f1b4..0000000
--- a/net-print/cups-filters/cups-filters-1.0.71.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit base eutils perl-module autotools systemd
-
-if [[ "${PV}" == "9999" ]] ; then
- inherit bzr
- EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-else
- SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
-
-RDEPEND="
- >=app-text/ghostscript-gpl-9.09
- <app-text/poppler-0.35.0:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
- >=app-text/qpdf-3.0.2:=
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/lcms:2
- >=net-print/cups-1.7.3
- !<=net-print/cups-1.5.9999
- sys-devel/bc
- sys-libs/zlib
- dbus? ( sys-apps/dbus )
- foomatic? ( !net-print/foomatic-filters )
- jpeg? ( virtual/jpeg:0 )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- tiff? ( media-libs/tiff:0 )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.0.71-poppler0340.patch" )
-
-src_prepare() {
- base_src_prepare
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- $(use_enable dbus) \
- $(use_enable zeroconf avahi) \
- $(use_enable static-libs static) \
- --with-fontdir="fonts/conf.avail" \
- --with-pdftops=pdftops \
- --enable-imagefilters \
- $(use_with jpeg) \
- $(use_with png) \
- $(use_with tiff) \
- --with-rcdir=no \
- --with-browseremoteprotocols=DNSSD,CUPS \
- --without-php
-}
-
-src_compile() {
- MAKEOPTS=-j1 default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null
- fi
-}
-
-src_install() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_install
- perl_delete_localpod
- popd > /dev/null
- fi
-
- # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
- dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
- dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
-
- prune_libtool_files --all
-
- cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
-
- if ! use zeroconf ; then
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
- sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
- fi
-
- if ! use foomatic ; then
- # this needs an upstream solution / configure switch
- rm -v "${ED}/usr/bin/foomatic-rip" || die
- rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
- rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
- fi
-
- doinitd "${T}"/cups-browsed
- systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
- if ! use foomatic ; then
- ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
- ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
- fi
-}
diff --git a/net-print/cups-filters/files/cups-filters-1.0.53-uclibc.patch b/net-print/cups-filters/files/cups-filters-1.0.53-uclibc.patch
deleted file mode 100644
index 88e6c34..0000000
--- a/net-print/cups-filters/files/cups-filters-1.0.53-uclibc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- cups-filters-1.0.53/filter/foomatic-rip/foomaticrip.c
-+++ cups-filters-1.0.53-uclibc/filter/foomatic-rip/foomaticrip.c
-@@ -736,8 +736,13 @@ int main(int argc, char** argv)
- debug = 1;
-
- if (debug) {
-+#ifdef __UCLIBC__
-+ sprintf(tmp, "%s-log-XXXXXX", LOG_FILE);
-+ int fd = mkstemp (tmp);
-+#else
- sprintf(tmp, "%s-XXXXXX.log", LOG_FILE);
- int fd = mkstemps (tmp, 4);
-+#endif
- if (fd != -1)
- logh = fdopen(fd, "w");
- else
diff --git a/net-print/cups-filters/files/cups-filters-1.0.65-poppler0310.patch b/net-print/cups-filters/files/cups-filters-1.0.65-poppler0310.patch
deleted file mode 100644
index 569d835..0000000
--- a/net-print/cups-filters/files/cups-filters-1.0.65-poppler0310.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Source: http://www.linuxfromscratch.org/blfs/view/svn/pst/cups-filters.html
-
-Submitted By: Armin K. <krejzi at email dot com>
-Date: 2015-02-10
-Initial Package Version: 1.0.62
-Upstream Status: Submitted
-Origin: Self
-Description: Fixes building when using Poppler 0.31.x.
-
---- a/filter/pdftoijs.cxx 2013-12-10 22:20:15.000000000 +0100
-+++ b/filter/pdftoijs.cxx 2015-02-10 21:51:32.700190378 +0100
-@@ -436,7 +436,11 @@
- }
-
- out = new SplashOutputDev(cmode,rowpad/* row padding */,
-- reverseVideo,paperColor,gTrue,gFalse);
-+ reverseVideo,paperColor,gTrue
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR <= 30
-+ ,gFalse
-+#endif
-+ );
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
- out->startDoc(doc);
- #else
---- a/filter/pdftoopvp/OPVPOutputDev.cxx 2014-03-10 12:19:19.000000000 +0100
-+++ b/filter/pdftoopvp/OPVPOutputDev.cxx 2015-02-10 21:52:09.092847693 +0100
-@@ -278,7 +278,11 @@
- gFalse,
- gFalse,
- #endif
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR <= 30
- globalParams->getAntialias());
-+#else
-+ gFalse);
-+#endif
- for (i = 0; i < nT3Fonts; ++i) {
- delete t3FontCache[i];
- }
---- a/filter/pdftoopvp/pdftoopvp.cxx 2013-12-10 22:20:15.000000000 +0100
-+++ b/filter/pdftoopvp/pdftoopvp.cxx 2015-02-10 21:51:32.701190397 +0100
-@@ -614,7 +614,9 @@
- ok = gFalse;
- }
- }
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR <= 30
- globalParams->setAntialias("no");
-+#endif
- if (quiet) {
- globalParams->setErrQuiet(quiet);
- }
---- a/filter/pdftoraster.cxx 2014-09-26 18:23:04.000000000 +0200
-+++ b/filter/pdftoraster.cxx 2015-02-10 21:51:32.701190397 +0100
-@@ -2100,7 +2100,11 @@
- }
-
- out = new SplashOutputDev(cmode,rowpad/* row padding */,
-- gFalse,paperColor,gTrue,gFalse);
-+ gFalse,paperColor,gTrue
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR <= 30
-+ ,gFalse
-+#endif
-+ );
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
- out->startDoc(doc);
- #else
diff --git a/net-print/cups-filters/files/cups-filters-1.0.71-poppler0340.patch b/net-print/cups-filters/files/cups-filters-1.0.71-poppler0340.patch
deleted file mode 100644
index ac0cae3..0000000
--- a/net-print/cups-filters/files/cups-filters-1.0.71-poppler0340.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Hack to make this build against poppler-0.34. Just disables color management in some places.
-We should probably find a better solution. dilfridge@gentoo.org
-
-
-diff -ruN cups-filters-1.0.71.orig/filter/pdftoopvp/OPVPOutputDev.cxx cups-filters-1.0.71/filter/pdftoopvp/OPVPOutputDev.cxx
---- cups-filters-1.0.71.orig/filter/pdftoopvp/OPVPOutputDev.cxx 2015-06-26 17:45:26.000000000 +0200
-+++ cups-filters-1.0.71/filter/pdftoopvp/OPVPOutputDev.cxx 2015-07-14 19:02:51.666737621 +0200
-@@ -1812,9 +1812,15 @@
- maskSplash->drawImage(&imageSrc, &imgMaskData,
- splashModeMono8, gFalse, maskWidth, maskHeight, mat);
- #else
-+#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
- maskSplash->drawImage(&imageSrc, &imgMaskData,
- splashModeMono8, gFalse, maskWidth, maskHeight,
- mat,gFalse);
-+#else
-+ maskSplash->drawImage(&imageSrc, NULL, &imgMaskData,
-+ splashModeMono8, gFalse, maskWidth, maskHeight,
-+ mat,gFalse);
-+#endif
- #endif
- delete imgMaskData.imgStr;
- maskStr->close();
-diff -ruN cups-filters-1.0.71.orig/filter/pdftoopvp/oprs/OPRS.cxx cups-filters-1.0.71/filter/pdftoopvp/oprs/OPRS.cxx
---- cups-filters-1.0.71.orig/filter/pdftoopvp/oprs/OPRS.cxx 2015-06-26 17:45:26.000000000 +0200
-+++ cups-filters-1.0.71/filter/pdftoopvp/oprs/OPRS.cxx 2015-07-14 19:00:20.655740720 +0200
-@@ -241,7 +241,11 @@
- #if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
- return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
- #else
-+#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
- return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
-+#else
-+ return splash->drawImage(src,NULL,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
-+#endif
- #endif
- } else {
- return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/
@ 2016-03-27 19:59 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2016-03-27 19:59 UTC (permalink / raw
To: gentoo-commits
commit: f741a074aa96355505b511ee21e46bae0eefe234
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 19:58:21 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 19:59:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f741a074
net-print/cups-filters: Removed old.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-print/cups-filters/Manifest | 1 -
.../cups-filters/cups-filters-1.8.1-r1.ebuild | 120 -------------
net-print/cups-filters/cups-filters-1.8.1.ebuild | 118 -------------
net-print/cups-filters/cups-filters-1.8.2.ebuild | 115 -------------
...s-filters-1.8.1-allow-disable-ghostscript.patch | 187 ---------------------
5 files changed, 541 deletions(-)
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index afd3694..2616b22 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,5 +1,4 @@
DIST cups-filters-1.5.0.tar.xz 1375588 SHA256 f22a8864e8d5b693795605a31345c08cc68f85120ebde9a0aa7bc27639815932 SHA512 81574f8368aaef61aeee4369caa394f2c8cdc717b03687d8a17c7927892f07cff68f1efb8d674757cb97001b55fd58fa5c14784a510ce9d31e385b1a73cd18c7 WHIRLPOOL 4201d08a2bb76d349a6b9f7220eb48dea86bb81c0cedbe8dcb8796c49ce26f67f6a7c49677b4fc7b6f865eb20e3c806746f565668e9f9e1e3935630621d032cd
DIST cups-filters-1.6.0.tar.xz 1377952 SHA256 39e53db81df7aa951507c72ced52b9b0e9e4294c3f83e8b717fb42c03a557c97 SHA512 dd7671dbb13588829337e4ae4d533dc6c1e17f75ca240a6d43bb0a30a2453fffa9a1541d7b041024a6d4cbb939790802a8c3947cd319590fa37c7ce237232b9d WHIRLPOOL 297ec0aeebd336a583f410099711cd6449b7b765fb29099b1ba5fd2d6a4c5dd7fd2824eb7aa26ca59070d7b866a68966d609729a3f58c07e1e13011af7e7e33e
-DIST cups-filters-1.8.1.tar.xz 1372152 SHA256 4e7d8953f910b7a992471d641590964c20f26da5d94c10de932dde4f5c03e91e SHA512 9b254dbcc90df335b8162495f5c2846f77c8006128458e54753877d0b5e6b1d696ae28378b4b9a8275626d7f537651e1cb55aac67588ee5fa319898912dd9e08 WHIRLPOOL 7a41fdeed84ee1f0f18aa201633ce5e77040499bf7a2ac5cf324f45876ca2a8072ddf5b947d8ac6526839bcd15c351324d556967d4e303d6b96aaf5bd44c2ed3
DIST cups-filters-1.8.2.tar.xz 1372508 SHA256 06d1c2a65e45d92d0e2dc854d13161d01072094efe4fadc23319700c9a259c69 SHA512 71cd08b7955a334fa04834e99365ac8e83d34ba71a4de8a4a3e7cf7fd50768332d1a0588b963b9301f5a88170d3c700c36cf596a45497032202f3e5f18f93f2e WHIRLPOOL eae8c0c7ec83d131e91d89ace89ad12b76ac323e44f395e83cdb39340c9228a1e9436b2ccbe2c32ac02b2b868bce204a28f48261f71d8a2fccd4b7cfaff27814
DIST cups-filters-1.8.3.tar.xz 1373028 SHA256 e1e786f1fbcd3a203d87ebb4106a0ba8d579953cbe22056d12d4ee8143f5341a SHA512 5c3648670ae141038a373c4e800e81a7584759e3caf8c4e4468cb0da11c0ff521ac80678e603856c7209da6638673400305c38903cb27e3b4d792d17947e2af4 WHIRLPOOL 0c0ff9b767f35a61f4b9b2f57392d1a6afce35decf9216e77f7503b62bd67da0fa05f9ed507518599e03d27de50458823499989bf6bfd8d3a3da162292819157
diff --git a/net-print/cups-filters/cups-filters-1.8.1-r1.ebuild b/net-print/cups-filters/cups-filters-1.8.1-r1.ebuild
deleted file mode 100644
index d3761eb..0000000
--- a/net-print/cups-filters/cups-filters-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit eutils perl-module autotools systemd
-
-if [[ "${PV}" == "9999" ]] ; then
- inherit bzr
- EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-else
- SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap perl png +postscript static-libs tiff zeroconf"
-
-RDEPEND="
- postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
- >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
- >=app-text/qpdf-3.0.2:=
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/lcms:2
- >=net-print/cups-1.7.3
- !<=net-print/cups-1.5.9999
- sys-devel/bc
- sys-libs/zlib
- dbus? ( sys-apps/dbus )
- foomatic? ( !net-print/foomatic-filters )
- jpeg? ( virtual/jpeg:0 )
- ldap? ( net-nds/openldap )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- tiff? ( media-libs/tiff:0 )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
- dev-util/gdbus-codegen
-"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-allow-disable-ghostscript.patch"
- eautoreconf
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- $(use_enable dbus) \
- $(use_enable zeroconf avahi) \
- $(use_enable static-libs static) \
- $(use_enable foomatic) \
- $(use_enable ldap) \
- $(use_enable postscript ghostscript) \
- --with-fontdir="fonts/conf.avail" \
- --with-pdftops=pdftops \
- --enable-imagefilters \
- $(use_with jpeg) \
- $(use_with png) \
- $(use_with tiff) \
- --with-rcdir=no \
- --with-browseremoteprotocols=DNSSD,CUPS \
- --without-php
-}
-
-src_compile() {
- MAKEOPTS=-j1 default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null
- fi
-}
-
-src_install() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_install
- perl_delete_localpod
- popd > /dev/null
- fi
-
- if use postscript; then
- # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
- dosym gstoraster /usr/libexec/cups/filter/pstoraster
- dosym gstopxl /usr/libexec/cups/filter/pstopxl
- fi
-
- prune_libtool_files --all
-
- cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
-
- if ! use zeroconf ; then
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
- sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
- fi
-
- doinitd "${T}"/cups-browsed
- systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
- if ! use foomatic ; then
- ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
- ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
- fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.8.1.ebuild b/net-print/cups-filters/cups-filters-1.8.1.ebuild
deleted file mode 100644
index cec01c8..0000000
--- a/net-print/cups-filters/cups-filters-1.8.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit eutils perl-module systemd
-
-if [[ "${PV}" == "9999" ]] ; then
- inherit bzr
- EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-else
- SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap perl png static-libs tiff zeroconf"
-
-RDEPEND="
- >=app-text/ghostscript-gpl-9.09
- >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
- >=app-text/qpdf-3.0.2:=
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/lcms:2
- >=net-print/cups-1.7.3
- !<=net-print/cups-1.5.9999
- sys-devel/bc
- sys-libs/zlib
- dbus? ( sys-apps/dbus )
- foomatic? ( !net-print/foomatic-filters )
- jpeg? ( virtual/jpeg:0 )
- ldap? ( net-nds/openldap )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- tiff? ( media-libs/tiff:0 )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
- dev-util/gdbus-codegen
-"
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- $(use_enable dbus) \
- $(use_enable zeroconf avahi) \
- $(use_enable static-libs static) \
- $(use_enable ldap) \
- --with-fontdir="fonts/conf.avail" \
- --with-pdftops=pdftops \
- --enable-imagefilters \
- $(use_with jpeg) \
- $(use_with png) \
- $(use_with tiff) \
- --with-rcdir=no \
- --with-browseremoteprotocols=DNSSD,CUPS \
- --without-php
-}
-
-src_compile() {
- MAKEOPTS=-j1 default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null
- fi
-}
-
-src_install() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_install
- perl_delete_localpod
- popd > /dev/null
- fi
-
- # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
- dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
- dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
-
- prune_libtool_files --all
-
- cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
-
- if ! use zeroconf ; then
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
- sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
- fi
-
- if ! use foomatic ; then
- # this needs an upstream solution / configure switch
- rm -v "${ED}/usr/bin/foomatic-rip" || die
- rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
- rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
- fi
-
- doinitd "${T}"/cups-browsed
- systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
- if ! use foomatic ; then
- ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
- ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
- fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.8.2.ebuild b/net-print/cups-filters/cups-filters-1.8.2.ebuild
deleted file mode 100644
index cdb7a29..0000000
--- a/net-print/cups-filters/cups-filters-1.8.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit eutils perl-module systemd
-
-if [[ "${PV}" == "9999" ]] ; then
- inherit bzr
- EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-else
- SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap perl png +postscript static-libs tiff zeroconf"
-
-RDEPEND="
- postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
- >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
- >=app-text/qpdf-3.0.2:=
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/lcms:2
- >=net-print/cups-1.7.3
- !<=net-print/cups-1.5.9999
- sys-devel/bc
- sys-libs/zlib
- dbus? ( sys-apps/dbus )
- foomatic? ( !net-print/foomatic-filters )
- jpeg? ( virtual/jpeg:0 )
- ldap? ( net-nds/openldap )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- tiff? ( media-libs/tiff:0 )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
- dev-util/gdbus-codegen
-"
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- $(use_enable dbus) \
- $(use_enable zeroconf avahi) \
- $(use_enable static-libs static) \
- $(use_enable foomatic) \
- $(use_enable ldap) \
- $(use_enable postscript ghostscript) \
- --with-fontdir="fonts/conf.avail" \
- --with-pdftops=pdftops \
- --enable-imagefilters \
- $(use_with jpeg) \
- $(use_with png) \
- $(use_with tiff) \
- --with-rcdir=no \
- --with-browseremoteprotocols=DNSSD,CUPS \
- --without-php
-}
-
-src_compile() {
- MAKEOPTS=-j1 default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null
- fi
-}
-
-src_install() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_install
- perl_delete_localpod
- popd > /dev/null
- fi
-
- if use postscript; then
- # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
- dosym gstoraster /usr/libexec/cups/filter/pstoraster
- dosym gstopxl /usr/libexec/cups/filter/pstopxl
- fi
-
- prune_libtool_files --all
-
- cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
-
- if ! use zeroconf ; then
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
- sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
- fi
-
- doinitd "${T}"/cups-browsed
- systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
- if ! use foomatic ; then
- ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
- ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
- fi
-}
diff --git a/net-print/cups-filters/files/cups-filters-1.8.1-allow-disable-ghostscript.patch b/net-print/cups-filters/files/cups-filters-1.8.1-allow-disable-ghostscript.patch
deleted file mode 100644
index a9c63da..0000000
--- a/net-print/cups-filters/files/cups-filters-1.8.1-allow-disable-ghostscript.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-Allow disabling ghostscript and foomatic. Pulled from upstream bzr rev 7447:
-
-https://bugs.linuxfoundation.org/show_bug.cgi?id=1342
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -412,11 +412,14 @@ pdftopdf_LDADD = \
- # Simple filter binaries
- # ======================
- pkgfilter_SCRIPTS = \
-- filter/gstopxl \
- filter/imagetops \
- filter/pstopdf \
- filter/textonly \
- filter/texttops
-+if ENABLE_GHOSTSCRIPT
-+pkgfilter_SCRIPTS += \
-+ filter/gstopxl
-+endif
- if ENABLE_BRAILLE
- nodist_pkgfilter_SCRIPTS = \
- filter/braille/drivers/generic/brftoembosser \
-@@ -420,8 +423,6 @@ pdftopdf_LDADD = \
- bannertopdf \
- commandtoescpx \
- commandtopclx \
-- foomatic-rip \
-- gstoraster \
- pdftoijs \
- sys5ippprinter \
- pdftops \
-@@ -432,6 +433,14 @@ pkgfilter_PROGRAMS += \
- texttopdf \
- urftopdf \
- rastertopdf
-+if ENABLE_GHOSTSCRIPT
-+pkgfilter_PROGRAMS += \
-+ gstoraster
-+endif
-+if ENABLE_FOOMATIC
-+pkgfilter_PROGRAMS += \
-+ foomatic-rip
-+endif
- if ENABLE_IMAGEFILTERS
- pkgfilter_PROGRAMS += \
- imagetopdf \
-@@ -737,8 +746,11 @@ initrcdir = $(INITDDIR)
- initrc_SCRIPTS = utils/cups-browsed
- man_MANS = \
- utils/cups-browsed.8 \
-- utils/cups-browsed.conf.5 \
-+ utils/cups-browsed.conf.5
-+if ENABLE_FOOMATIC
-+man_MANS += \
- filter/foomatic-rip/foomatic-rip.1
-+endif
- EXTRA_DIST += utils/cups-browsed.in \
- $(man_MANS)
- utils/org.cups.cupsd.Notifier.xml
-@@ -752,9 +764,12 @@ ppd_DATA = \
- ppd/HP-Color_LaserJet_CM3530_MFP-PDF.ppd \
- ppd/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd \
- ppd/Ricoh-PDF_Printer-PDF.ppd \
-- ppd/pxlcolor.ppd \
-- ppd/pxlmono.ppd \
- ppd/textonly.ppd
-+if ENABLE_GHOSTSCRIPT
-+ppd_DATA += \
-+ ppd/pxlcolor.ppd \
-+ ppd/pxlmono.ppd
-+endif
-
- EXTRA_DIST += $(ppd_DATA)
-
-@@ -782,7 +797,9 @@ distclean-local:
- install-exec-hook:
- $(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
- $(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir)
-+if ENABLE_FOOMATIC
- $(LN_S) -f $(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
-+endif
- if ENABLE_BRAILLE
- $(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl
- $(LN_S) -f textbrftoindexv3 $(DESTDIR)$(pkgfilterdir)/textbrftoindexv4
-@@ -806,7 +823,9 @@ if RCLINKS
- fi
- endif
- $(RM) $(DESTDIR)$(pkgcharsetdir)/pdf.utf-8
-+if ENABLE_FOOMATIC
- $(RM) $(DESTDIR)$(bindir)/foomatic-rip
-+endif
- if ENABLE_BRAILLE
- $(RM) $(DESTDIR)$(pkgfilterdir)/imagetoubrl
- $(RM) $(DESTDIR)$(pkgfilterdir)/textbrftoindexv4
---- a/configure.ac
-+++ b/configure.ac
-@@ -431,6 +431,11 @@ AS_IF([test x"$long_long_found" = "xyes"], [
- # ================
- # Check for pdf2ps
- # ================
-+AC_ARG_ENABLE([ghostscript],
-+ [AS_HELP_STRING([--disable-ghostscript], [Disable filters using Ghostscript.])],
-+ [enable_ghostscript="$enableval"],
-+ [enable_ghostscript=yes]
-+)
- AC_ARG_WITH([pdftops],
- [AS_HELP_STRING([--with-pdftops=value], [Set which pdftops to use (gs,pdftops,pdftocairo,acroread,hybrid).])],
- [with_pdftops="$withval"],
-@@ -471,25 +476,35 @@ AS_CASE([x$with_pdftops_maxres],
- [AC_MSG_ERROR([Unknown value of with-pdftops-maxres provided: $with_pdftops])]
- )
-
--AS_IF([test "x$with_gs_path" != "xsystem"], [
-- CUPS_GHOSTSCRIPT="$with_gs_path"
--], [
-- AC_PATH_PROG(CUPS_GHOSTSCRIPT, [gs], [AC_MSG_ERROR([Required gs binary is missing. Please install ghostscript-gpl package.])])
--])
--AS_IF([test "x$CUPS_GHOSTSCRIPT" != "x"], [
-- AC_DEFINE([HAVE_GHOSTSCRIPT], [], [Define that we provide ghostscript binary])
-- AS_IF([test x"$with_pdftops" = xgs], [AC_DEFINE_UNQUOTED([CUPS_PDFTOPS_RENDERER], [GS], [Define default renderer])])
--
-- AC_MSG_CHECKING(whether gs supports the ps2write device)
-- AS_IF([`$CUPS_GHOSTSCRIPT -h 2>&1 | grep -q ps2write`], [
-- AC_MSG_RESULT([yes])
-- AC_DEFINE([HAVE_GHOSTSCRIPT_PS2WRITE], [], [gs supports ps2write])
-+CUPS_GHOSTSCRIPT=""
-+AS_IF([test "x$enable_ghostscript" != "xyes"], [
-+ AS_IF([test "x$with_gs_path" != "xsystem"], [
-+ AC_MSG_ERROR([Cannot supply both --disable-ghostscript and --gs-path=])
- ], [
-- AC_MSG_RESULT([no])
-+ with_gs_path=""
- ])
- ], [
-- CUPS_GHOSTSCRIPT="gs"
-+ AS_IF([test "x$with_gs_path" != "xsystem"], [
-+ CUPS_GHOSTSCRIPT="$with_gs_path"
-+ ], [
-+ AC_PATH_PROG(CUPS_GHOSTSCRIPT, [gs], [AC_MSG_ERROR([Required gs binary is missing. Please install ghostscript-gpl package.])])
-+ ])
-+ AS_IF([test "x$CUPS_GHOSTSCRIPT" != "x"], [
-+ AC_DEFINE([HAVE_GHOSTSCRIPT], [], [Define that we provide ghostscript binary])
-+ AS_IF([test x"$with_pdftops" = xgs], [AC_DEFINE_UNQUOTED([CUPS_PDFTOPS_RENDERER], [GS], [Define default renderer])])
-+
-+ AC_MSG_CHECKING(whether gs supports the ps2write device)
-+ AS_IF([`$CUPS_GHOSTSCRIPT -h 2>&1 | grep -q ps2write`], [
-+ AC_MSG_RESULT([yes])
-+ AC_DEFINE([HAVE_GHOSTSCRIPT_PS2WRITE], [], [gs supports ps2write])
-+ ], [
-+ AC_MSG_RESULT([no])
-+ ])
-+ ], [
-+ CUPS_GHOSTSCRIPT="gs"
-+ ])
- ])
-+AM_CONDITIONAL(ENABLE_GHOSTSCRIPT, test "x$enable_ghostscript" = xyes)
-
- AS_IF([test "x$with_pdftops_path" != "xsystem"], [
- CUPS_PDFTOPS="$with_pdftops_path"
-@@ -550,6 +565,16 @@ AC_DEFINE_UNQUOTED([CUPS_POPPLER_PDFTOCAIRO], "$CUPS_PDFTOCAIRO", [pdftocairo bi
- AC_DEFINE_UNQUOTED([CUPS_ACROREAD], "$CUPS_ACROREAD", [acroread binary to use.])
- AC_DEFINE_UNQUOTED([CUPS_PDFTOPS_MAX_RESOLUTION], [$CUPS_PDFTOPS_MAXRES], [max resolution used for pdftops when converting images])
-
-+# ==================
-+# Check for foomatic
-+# ==================
-+AC_ARG_ENABLE([foomatic],
-+ [AS_HELP_STRING([--disable-foomatic], [Disable Foomatic-based filters.])],
-+ [enable_foomatic="$enableval"],
-+ [enable_foomatic=yes]
-+)
-+AM_CONDITIONAL([ENABLE_FOOMATIC], [test "x$enable_foomatic" = "xyes"])
-+
- # =============
- # Check for php
- # =============
-@@ -658,8 +683,10 @@ Environment settings:
- Build configuration:
- cups-config: ${with_cups_config}
- font directory: ${sysconfdir}/${FONTDIR}
-+ foomatic: ${enable_foomatic}
- init directory: ${INITDDIR}
- cups dom socket: ${CUPS_DEFAULT_DOMAINSOCKET}
-+ ghostscript: ${enable_ghostscript}
- gs-path: ${with_gs_path}
- imagefilters: ${enable_imagefilters}
- jpeg: ${with_jpeg}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/
@ 2016-07-21 10:18 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2016-07-21 10:18 UTC (permalink / raw
To: gentoo-commits
commit: b6b7861dc6fa61d90afa99a3fdf66dc64048477e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 10:17:51 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 10:18:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6b7861d
net-print/cups-filters: Removed old.
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-print/cups-filters/Manifest | 2 -
net-print/cups-filters/cups-filters-1.6.0.ebuild | 118 -------------------
.../cups-filters/cups-filters-1.8.2-r1.ebuild | 125 ---------------------
net-print/cups-filters/cups-filters-9999.ebuild | 1 +
net-print/cups-filters/files/cups-browsed.service | 10 --
.../cups-filters-1.8.2-configure-PKG_CONFIG.patch | 107 ------------------
.../files/cups-filters-1.8.2-disable-ijs.patch | 68 -----------
.../files/cups-filters-1.8.2-gstoraster.patch | 66 -----------
8 files changed, 1 insertion(+), 496 deletions(-)
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 34c78ab..417130c 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,5 +1,3 @@
DIST cups-filters-1.10.0.tar.xz 1399652 SHA256 1f708a404164fb8eb341e5410e1b849b19cb47ce1bbe0d97c3673768db3401a1 SHA512 93517fe81552cac0f1414b04876db54bf94475d3ceb443c4e104e381ea5141296237576f543db0184794ade952a892a4fa6f312c4c8a4e5769827567eb181e2a WHIRLPOOL ad924de8719c807e78c6c6c7c4a561c2cee279d99a10530d4353aae0ef4e8723d4ce81dc881c7320f174ccf8e6a25491918fec4e7311d3bf49d02fbe9e623132
DIST cups-filters-1.5.0.tar.xz 1375588 SHA256 f22a8864e8d5b693795605a31345c08cc68f85120ebde9a0aa7bc27639815932 SHA512 81574f8368aaef61aeee4369caa394f2c8cdc717b03687d8a17c7927892f07cff68f1efb8d674757cb97001b55fd58fa5c14784a510ce9d31e385b1a73cd18c7 WHIRLPOOL 4201d08a2bb76d349a6b9f7220eb48dea86bb81c0cedbe8dcb8796c49ce26f67f6a7c49677b4fc7b6f865eb20e3c806746f565668e9f9e1e3935630621d032cd
-DIST cups-filters-1.6.0.tar.xz 1377952 SHA256 39e53db81df7aa951507c72ced52b9b0e9e4294c3f83e8b717fb42c03a557c97 SHA512 dd7671dbb13588829337e4ae4d533dc6c1e17f75ca240a6d43bb0a30a2453fffa9a1541d7b041024a6d4cbb939790802a8c3947cd319590fa37c7ce237232b9d WHIRLPOOL 297ec0aeebd336a583f410099711cd6449b7b765fb29099b1ba5fd2d6a4c5dd7fd2824eb7aa26ca59070d7b866a68966d609729a3f58c07e1e13011af7e7e33e
-DIST cups-filters-1.8.2.tar.xz 1372508 SHA256 06d1c2a65e45d92d0e2dc854d13161d01072094efe4fadc23319700c9a259c69 SHA512 71cd08b7955a334fa04834e99365ac8e83d34ba71a4de8a4a3e7cf7fd50768332d1a0588b963b9301f5a88170d3c700c36cf596a45497032202f3e5f18f93f2e WHIRLPOOL eae8c0c7ec83d131e91d89ace89ad12b76ac323e44f395e83cdb39340c9228a1e9436b2ccbe2c32ac02b2b868bce204a28f48261f71d8a2fccd4b7cfaff27814
DIST cups-filters-1.8.3.tar.xz 1373028 SHA256 e1e786f1fbcd3a203d87ebb4106a0ba8d579953cbe22056d12d4ee8143f5341a SHA512 5c3648670ae141038a373c4e800e81a7584759e3caf8c4e4468cb0da11c0ff521ac80678e603856c7209da6638673400305c38903cb27e3b4d792d17947e2af4 WHIRLPOOL 0c0ff9b767f35a61f4b9b2f57392d1a6afce35decf9216e77f7503b62bd67da0fa05f9ed507518599e03d27de50458823499989bf6bfd8d3a3da162292819157
diff --git a/net-print/cups-filters/cups-filters-1.6.0.ebuild b/net-print/cups-filters/cups-filters-1.6.0.ebuild
deleted file mode 100644
index 878e58d..0000000
--- a/net-print/cups-filters/cups-filters-1.6.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit eutils perl-module systemd
-
-if [[ "${PV}" == "9999" ]] ; then
- inherit bzr
- EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-else
- SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap perl png static-libs tiff zeroconf"
-
-RDEPEND="
- >=app-text/ghostscript-gpl-9.09
- >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
- >=app-text/qpdf-3.0.2:=
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/lcms:2
- >=net-print/cups-1.7.3
- !<=net-print/cups-1.5.9999
- sys-devel/bc
- sys-libs/zlib
- dbus? ( sys-apps/dbus )
- foomatic? ( !net-print/foomatic-filters )
- jpeg? ( virtual/jpeg:0 )
- ldap? ( net-nds/openldap )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- tiff? ( media-libs/tiff:0 )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
- dev-util/gdbus-codegen
-"
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- $(use_enable dbus) \
- $(use_enable zeroconf avahi) \
- $(use_enable static-libs static) \
- $(use_enable ldap) \
- --with-fontdir="fonts/conf.avail" \
- --with-pdftops=pdftops \
- --enable-imagefilters \
- $(use_with jpeg) \
- $(use_with png) \
- $(use_with tiff) \
- --with-rcdir=no \
- --with-browseremoteprotocols=DNSSD,CUPS \
- --without-php
-}
-
-src_compile() {
- MAKEOPTS=-j1 default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null
- fi
-}
-
-src_install() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_install
- perl_delete_localpod
- popd > /dev/null
- fi
-
- # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
- dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
- dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
-
- prune_libtool_files --all
-
- cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
-
- if ! use zeroconf ; then
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
- sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
- fi
-
- if ! use foomatic ; then
- # this needs an upstream solution / configure switch
- rm -v "${ED}/usr/bin/foomatic-rip" || die
- rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
- rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
- fi
-
- doinitd "${T}"/cups-browsed
- systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
- if ! use foomatic ; then
- ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
- ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
- fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild b/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild
deleted file mode 100644
index b8ea043..0000000
--- a/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit eutils perl-module autotools systemd
-
-if [[ "${PV}" == "9999" ]] ; then
- inherit bzr
- EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-else
- SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap perl png +postscript static-libs tiff zeroconf"
-
-RDEPEND="
- postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
- >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
- >=app-text/qpdf-3.0.2:=
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/lcms:2
- >=net-print/cups-1.7.3
- !<=net-print/cups-1.5.9999
- sys-devel/bc
- sys-libs/zlib
- dbus? ( sys-apps/dbus )
- foomatic? ( !net-print/foomatic-filters )
- jpeg? ( virtual/jpeg:0 )
- ldap? ( net-nds/openldap )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- tiff? ( media-libs/tiff:0 )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
- dev-util/gdbus-codegen
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-disable-ijs.patch #574992
- epatch "${FILESDIR}"/${P}-gstoraster.patch
- epatch "${FILESDIR}"/${P}-configure-PKG_CONFIG.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --localstatedir="${EPREFIX}"/var \
- --with-cups-rundir="${EPREFIX}"/run/cups \
- $(use_enable dbus) \
- $(use_enable zeroconf avahi) \
- $(use_enable static-libs static) \
- $(use_enable foomatic) \
- $(use_enable ldap) \
- $(use_enable postscript ghostscript) \
- $(use_enable postscript ijs) \
- --with-fontdir="fonts/conf.avail" \
- --with-pdftops=pdftops \
- --enable-imagefilters \
- $(use_with jpeg) \
- $(use_with png) \
- $(use_with tiff) \
- --with-rcdir=no \
- --with-browseremoteprotocols=DNSSD,CUPS \
- --without-php
-}
-
-src_compile() {
- MAKEOPTS=-j1 default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null
- fi
-}
-
-src_install() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_install
- perl_delete_localpod
- popd > /dev/null
- fi
-
- if use postscript; then
- # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
- dosym gstoraster /usr/libexec/cups/filter/pstoraster
- dosym gstopxl /usr/libexec/cups/filter/pstopxl
- fi
-
- prune_libtool_files --all
-
- cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
-
- if ! use zeroconf ; then
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
- sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
- fi
-
- doinitd "${T}"/cups-browsed
- systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
- if ! use foomatic ; then
- ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
- ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
- fi
-}
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 082d3ca..6f1b475 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -48,6 +48,7 @@ DEPEND="${RDEPEND}
"
src_prepare() {
+ default
eautoreconf
}
diff --git a/net-print/cups-filters/files/cups-browsed.service b/net-print/cups-filters/files/cups-browsed.service
deleted file mode 100644
index 144956c..0000000
--- a/net-print/cups-filters/files/cups-browsed.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Make remote CUPS printers available locally
-After=cups.service avahi-daemon.service
-Wants=cups.service avahi-daemon.service
-
-[Service]
-ExecStart=/usr/sbin/cups-browsed
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-print/cups-filters/files/cups-filters-1.8.2-configure-PKG_CONFIG.patch b/net-print/cups-filters/files/cups-filters-1.8.2-configure-PKG_CONFIG.patch
deleted file mode 100644
index 6263c4a..0000000
--- a/net-print/cups-filters/files/cups-filters-1.8.2-configure-PKG_CONFIG.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Use PKG_CHECK_MODULES() / $PKG_CONFIG
-
-Autotools docs suggest that the $PKG_CONFIG variable should be respected:
-
-https://autotools.io/pkgconfig/cross-compiling.html
-
-However, we aren't using the autotools macros properly, and we ignore
-$PKG_CONFIG for the most part. This causes problems for some cross-compilation
-environments which rely on it.
-
-This patch fixes up configure.ac to use PKG_CHECK_MODULES() for most things,
-and to appropriately use $PKG_CONFIG (instead of self-derived $PKGCONFIG) for
-the remainder.
-
-Reported (and accepted) here:
-
- https://bugs.linuxfoundation.org/show_bug.cgi?id=1347
-
----
-=== modified file 'configure.ac'
---- configure.ac 2016-03-03 19:46:43 +0000
-+++ configure.ac 2016-03-21 20:59:37 +0000
-@@ -249,9 +249,6 @@
- # Check for modules needed by utils/
- # ==================================
-
--dnl Check for pkg-config, which is used for some other tests later on...
--AC_PATH_PROG(PKGCONFIG, pkg-config)
--
- dnl Avahi for cups-browsed
- AVAHI_LIBS=""
- AVAHI_CFLAGS=""
-@@ -272,17 +269,9 @@
- [AS_HELP_STRING([--with-avahi-includes], [Set directory for Avahi includes])],
- AVAHI_CFLAGS="-I$withval $AVAHI_CFLAGS",)
-
--if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then
-- AC_MSG_CHECKING(for Avahi)
-- if $PKGCONFIG --exists avahi-client; then
-- AC_MSG_RESULT(yes)
-- AVAHI_CFLAGS="$AVAHI_CFLAGS `$PKGCONFIG --cflags avahi-client`"
-- AVAHI_LIBS="$AVAHI_LIBS `$PKGCONFIG --libs avahi-client`"
-- AC_DEFINE(HAVE_AVAHI, [], [Define if you have the avahi library])
-- else
-- AC_MSG_RESULT(no)
-- enable_avahi=no
-- fi
-+if test "x$enable_avahi" != xno; then
-+ PKG_CHECK_MODULES(AVAHI, avahi-client,
-+ [AC_DEFINE(HAVE_AVAHI, [], [Define if you have the avahi library])])
- fi
-
- AC_SUBST(AVAHI_LIBS)
-@@ -336,26 +325,18 @@
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
-
--if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then
-+if test x$enable_avahi != xno; then
- PKG_CHECK_MODULES(AVAHI_GLIB, [avahi-glib])
- fi
-
- AC_SUBST(AVAHI_GLIB_CFLAGS)
- AC_SUBST(AVAHI_GLIB_LIBS)
-
--GIO_CFLAGS=""
--GIO_LIBS=""
--if test "x$PKGCONFIG" != x; then
-- PKG_CHECK_MODULES(GIO, [gio-2.0])
--fi
-+PKG_CHECK_MODULES(GIO, [gio-2.0])
- AC_SUBST(GIO_CFLAGS)
- AC_SUBST(GIO_LIBS)
-
--GIO_UNIX_CFLAGS=""
--GIO_UNIX_LIBS=""
--if test "x$PKGCONFIG" != x; then
-- PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0])
--fi
-+PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0])
- AC_SUBST(GIO_UNIX_CFLAGS)
- AC_SUBST(GIO_UNIX_LIBS)
-
-@@ -715,17 +696,17 @@
- AC_ARG_ENABLE(braille, AS_HELP_STRING([--enable-braille],[enable Braille embosing filters, requires liblouis]),
- enable_braille=$enableval,enable_braille=yes)
- AC_MSG_CHECKING(for liblouis)
--if $PKGCONFIG --exists liblouis; then
-+PKG_CHECK_EXISTS([liblouis], [
- AC_MSG_RESULT(yes)
-- if test "x$PKGCONFIG" != x -a "x$enable_braille" = xyes; then
-- TABLESDIR=`$PKGCONFIG --variable=tablesdir liblouis`
-+ if test "x$enable_braille" = xyes; then
-+ TABLESDIR=`$PKG_CONFIG --variable=tablesdir liblouis`
- else
- TABLESDIR=/usr/share/liblouis/tables
- fi
--else
-+], [
- AC_MSG_RESULT(no)
- TABLESDIR=/usr/share/liblouis/tables
--fi
-+])
- AM_CONDITIONAL(ENABLE_BRAILLE, test "x$enable_braille" = xyes)
- AC_SUBST(TABLESDIR)
-
-
diff --git a/net-print/cups-filters/files/cups-filters-1.8.2-disable-ijs.patch b/net-print/cups-filters/files/cups-filters-1.8.2-disable-ijs.patch
deleted file mode 100644
index 7167c9c..0000000
--- a/net-print/cups-filters/files/cups-filters-1.8.2-disable-ijs.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-ijs is part of the ghostscript package, so it needs to be dropped when we drop
-ghostscript (i.e., USE="-postscript"). Patch accepted here:
-
-https://bugs.linuxfoundation.org/show_bug.cgi?id=1345
-
---- Makefile.am
-+++ Makefile.am
-@@ -490,7 +490,6 @@
- bannertopdf \
- commandtoescpx \
- commandtopclx \
-- pdftoijs \
- sys5ippprinter \
- pdftops \
- pdftoraster \
-@@ -499,6 +498,10 @@
- texttopdf \
- urftopdf \
- rastertopdf
-+if ENABLE_IJS
-+pkgfilter_PROGRAMS += \
-+ pdftoijs
-+endif
- if ENABLE_GHOSTSCRIPT
- pkgfilter_PROGRAMS += \
- gstoraster
-@@ -846,9 +849,12 @@
- ppd/Fuji_Xerox-DocuPrint_CM305_df-PDF.ppd \
- ppd/Generic-PDF_Printer-PDF.ppd \
- ppd/HP-Color_LaserJet_CM3530_MFP-PDF.ppd \
-- ppd/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd \
- ppd/Ricoh-PDF_Printer-PDF.ppd \
- ppd/textonly.ppd
-+if ENABLE_IJS
-+ppd_DATA += \
-+ ppd/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd
-+endif
- if ENABLE_GHOSTSCRIPT
- ppd_DATA += \
- ppd/pxlcolor.ppd \
-
---- configure.ac
-+++ configure.ac
-@@ -443,7 +443,7 @@
- ])
- PKG_CHECK_MODULES([FREETYPE], [freetype2], [AC_DEFINE([HAVE_FREETYPE_H], [1], [Have FreeType2 include files])])
- PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.0.0])
--PKG_CHECK_MODULES([IJS], [ijs])
-+PKG_CHECK_MODULES([IJS], [ijs], [have_ijs=yes], [have_ijs=no])
- PKG_CHECK_MODULES([POPPLER], [poppler >= 0.18])
- PKG_CHECK_MODULES([ZLIB], [zlib])
- AC_DEFINE([HAVE_LIBZ], [], [Define that we use zlib])
-@@ -489,6 +489,15 @@
- [enable_ghostscript="$enableval"],
- [enable_ghostscript=yes]
- )
-+AC_ARG_ENABLE([ijs],
-+ [AS_HELP_STRING([--disable-ijs], [Disable filters using IJS.])],
-+ [enable_ijs="$enableval"],
-+ [enable_ijs=yes]
-+)
-+AS_IF([test "x$enable_ijs" = "xyes" -a "x$have_ijs" != "xyes"], [
-+ AC_MSG_ERROR([IJS not found, but requested.])
-+])
-+AM_CONDITIONAL(ENABLE_IJS, test "x$enable_ijs" = "xyes")
- AC_ARG_WITH([pdftops],
- [AS_HELP_STRING([--with-pdftops=value], [Set which pdftops to use (gs,pdftops,pdftocairo,acroread,hybrid).])],
- [with_pdftops="$withval"],
diff --git a/net-print/cups-filters/files/cups-filters-1.8.2-gstoraster.patch b/net-print/cups-filters/files/cups-filters-1.8.2-gstoraster.patch
deleted file mode 100644
index 91fd49a..0000000
--- a/net-print/cups-filters/files/cups-filters-1.8.2-gstoraster.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-When we remove ghostscript-based filters, CUPS complains about a missing
-'gstoraster' filter, even if it doesn't need it. The fix is to drop the
-gstoraster rules from the MIME conversion rules. Patch accepted here:
-
-https://bugs.linuxfoundation.org/show_bug.cgi?id=1346
-
---- COPYING 2016-01-21 14:50:23 +0000
-+++ COPYING 2016-03-03 02:35:23 +0000
-@@ -103,7 +103,7 @@
- 1993-2007, Easy Software Products
- License: GPL-2
-
--Files: mime/cupsfilters.convs*
-+Files: mime/cupsfilters*.convs*
- Copyright: 2007-2011, Apple Inc
- 1997-2007, Easy Software Products
- 2012-2016, Till Kamppeter
-
---- Makefile.am 2016-03-03 02:39:23 +0000
-+++ Makefile.am 2016-03-03 02:44:15 +0000
-@@ -292,6 +292,10 @@
- pkgmime_DATA = \
- mime/cupsfilters.convs \
- mime/cupsfilters.types
-+if ENABLE_GHOSTSCRIPT
-+pkgmime_DATA += \
-+ mime/cupsfilters-ghostscript.convs
-+endif
- if ENABLE_BRAILLE
- pkgmime_DATA += \
- mime/braille.convs \
-
---- mime/cupsfilters-ghostscript.convs 1970-01-01 00:00:00 +0000
-+++ mime/cupsfilters-ghostscript.convs 2016-03-03 02:31:30 +0000
-@@ -0,0 +1,19 @@
-+#
-+# MIME conversions file for OpenPrinting CUPS Filters.
-+#
-+# Copyright 2007-2011 by Apple Inc.
-+# Copyright 1997-2007 by Easy Software Products.
-+# Copyright 2012-2016 by Till Kamppeter.
-+#
-+# These coded instructions, statements, and computer programs are the
-+# property of Apple Inc. and are protected by Federal copyright
-+# law. Distribution and use rights are outlined in the file "COPYING"
-+# which should have been included with this file.
-+#
-+
-+#
-+# Ghostscript-based filters...
-+#
-+
-+application/vnd.cups-pdf application/vnd.cups-raster 99 gstoraster
-+application/vnd.cups-postscript application/vnd.cups-raster 175 gstoraster
-
---- mime/cupsfilters.convs 2016-01-21 14:50:23 +0000
-+++ mime/cupsfilters.convs 2016-03-03 02:35:59 +0000
-@@ -83,8 +83,6 @@
- # Raster filters...
- #
-
--application/vnd.cups-pdf application/vnd.cups-raster 99 gstoraster
--application/vnd.cups-postscript application/vnd.cups-raster 175 gstoraster
- application/vnd.cups-pdf application/vnd.cups-raster 100 pdftoraster
- image/gif application/vnd.cups-raster 100 imagetoraster
- image/png application/vnd.cups-raster 100 imagetoraster
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/
@ 2017-10-18 11:19 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2017-10-18 11:19 UTC (permalink / raw
To: gentoo-commits
commit: 9534222100a4d225617bc6ddaaced39181814cc2
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 11:19:52 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 11:19:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95342221
net-print/cups-filters: Removed old.
Package-Manager: Portage-2.3.11, Repoman-2.3.3
net-print/cups-filters/Manifest | 1 -
net-print/cups-filters/cups-filters-1.5.0.ebuild | 117 -----------------------
net-print/cups-filters/files/cups-browsed.init.d | 20 ----
3 files changed, 138 deletions(-)
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 78305cff72d..fd81b96abf2 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -2,4 +2,3 @@ DIST cups-filters-1.13.5.tar.xz 1424764 SHA256 35db1c5821c9ff0e0fedcf87b3ae68a42
DIST cups-filters-1.16.4.tar.xz 1440964 SHA256 2642c6a3cbf10a38d91f20b7b292583d19acb64e786eb6513b7b45738a2e5aed SHA512 367c2c1d6755800b88f79808ef0c595aa80b080634299d015828bfb8f0e27085aa052c77e3f3f1645833340caca709bec8e00b46070ff4d13b9994fb1400da60 WHIRLPOOL 30f4e70770c60a743ca845e294e1bf79f3efa83e10f01398a0432461d31e59eac6568e6a302425250bd0417963e63b1ef208e35e5ddcf1a1f4125bdd80480324
DIST cups-filters-1.17.8.tar.xz 1455096 SHA256 9acefd72f8e6a6e5fb6e80d37aad8c712c326bf484afb735e8ff7d7b86975870 SHA512 01f4499fb1db456a1fb11b8e39b5de273229c7aa2f87d079e237501ccd70bf637ca5e15d19fb9f7930be700ab6958e1a597bda8d0970260b5e7577eb5447f797 WHIRLPOOL 2bfd485b053b33882cff8cff27b7db62a903be30f4597324326b8cf70d1e3ce75b1ee5c1712099ced498fb1267274032f20c85dddac0d4033dc98dfc34f435ff
DIST cups-filters-1.17.9.tar.xz 1454068 SHA256 98ae3f8c8309ea950144e582d252e65f4636e8812832a982edd0ab83eddef544 SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4 WHIRLPOOL 0b838e546bc505353a7e6294b536ddd3a68b767fa63495f289faa96f9196b2b345a75e611cf082d3c45976658be8eaad60ea5a11d57f7bff9f826b6f3a1835d7
-DIST cups-filters-1.5.0.tar.xz 1375588 SHA256 f22a8864e8d5b693795605a31345c08cc68f85120ebde9a0aa7bc27639815932 SHA512 81574f8368aaef61aeee4369caa394f2c8cdc717b03687d8a17c7927892f07cff68f1efb8d674757cb97001b55fd58fa5c14784a510ce9d31e385b1a73cd18c7 WHIRLPOOL 4201d08a2bb76d349a6b9f7220eb48dea86bb81c0cedbe8dcb8796c49ce26f67f6a7c49677b4fc7b6f865eb20e3c806746f565668e9f9e1e3935630621d032cd
diff --git a/net-print/cups-filters/cups-filters-1.5.0.ebuild b/net-print/cups-filters/cups-filters-1.5.0.ebuild
deleted file mode 100644
index 030ee621125..00000000000
--- a/net-print/cups-filters/cups-filters-1.5.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit eutils perl-module systemd
-
-if [[ "${PV}" == "9999" ]] ; then
- inherit bzr
- EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-else
- SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap perl png static-libs tiff zeroconf"
-
-RDEPEND="
- >=app-text/ghostscript-gpl-9.09
- >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
- >=app-text/qpdf-3.0.2:=
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/lcms:2
- >=net-print/cups-1.7.3
- !<=net-print/cups-1.5.9999
- sys-devel/bc
- sys-libs/zlib
- dbus? ( sys-apps/dbus )
- foomatic? ( !net-print/foomatic-filters )
- jpeg? ( virtual/jpeg:0 )
- ldap? ( net-nds/openldap )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- tiff? ( media-libs/tiff:0 )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
- dev-util/gdbus-codegen
-"
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- $(use_enable dbus) \
- $(use_enable zeroconf avahi) \
- $(use_enable static-libs static) \
- $(use_enable ldap) \
- --with-fontdir="fonts/conf.avail" \
- --with-pdftops=pdftops \
- --enable-imagefilters \
- $(use_with jpeg) \
- $(use_with png) \
- $(use_with tiff) \
- --with-rcdir=no \
- --with-browseremoteprotocols=DNSSD,CUPS \
- --without-php
-}
-
-src_compile() {
- MAKEOPTS=-j1 default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null
- fi
-}
-
-src_install() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_install
- perl_delete_localpod
- popd > /dev/null
- fi
-
- # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
- dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
- dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
-
- prune_libtool_files --all
-
- cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
-
- if ! use zeroconf ; then
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
- sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
- fi
-
- if ! use foomatic ; then
- # this needs an upstream solution / configure switch
- rm -v "${ED}/usr/bin/foomatic-rip" || die
- rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
- rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
- fi
-
- doinitd "${T}"/cups-browsed
- systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
- if ! use foomatic ; then
- ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
- ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
- fi
-}
diff --git a/net-print/cups-filters/files/cups-browsed.init.d b/net-print/cups-filters/files/cups-browsed.init.d
deleted file mode 100644
index 6f5b30a2ac6..00000000000
--- a/net-print/cups-filters/files/cups-browsed.init.d
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-
-PIDFILE=/var/run/cups-browsed.pid
-
-depend() {
- need cupsd avahi-daemon
-}
-
-start() {
- ebegin "Starting cups-browsed"
- start-stop-daemon --start --make-pidfile --pidfile "${PIDFILE}" \
- --background --quiet --exec /usr/sbin/cups-browsed
- eend $?
-}
-
-stop() {
- ebegin "Stopping cups-browsed"
- start-stop-daemon --stop --pidfile "${PIDFILE}" --quiet --exec /usr/sbin/cupsd
- eend $?
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/
@ 2019-03-02 20:29 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2019-03-02 20:29 UTC (permalink / raw
To: gentoo-commits
commit: 721561d6002826ad406ac07c6d6f6308338cebf4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 2 20:27:17 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 2 20:27:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=721561d6
net-print/cups-filters: Drop 1.20.4
Does not build against poppler versions in tree.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-print/cups-filters/Manifest | 1 -
net-print/cups-filters/cups-filters-1.20.4.ebuild | 141 ---------------------
.../files/cups-filters-1.20.4-poppler-0.67.0.patch | 28 ----
3 files changed, 170 deletions(-)
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index feb45a627db..d381addcda4 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,4 +1,3 @@
-DIST cups-filters-1.20.4.tar.xz 1474700 BLAKE2B 70948565e4a2b35d0c3bc510e7c03d77ac1ed47ab16a22bc9f60a7293fe5b5b08fdb1e95dd7a32f4c99a18676e50c48a515a954d437283ce7011ab616804e235 SHA512 4001cefbee945c326e3c597869763286e8665dee098b9aff76340dd249ef3e615f2a8df5c8e802e388b91dfd06ba9e8313b27908ca89ca120f899060785a6f07
DIST cups-filters-1.21.6.tar.xz 1474944 BLAKE2B a4c3418accb9d2bf46a366ec6004919d2a5c2c0a02022102270da17fb81915428275aadf58f1f50f8ca022e1c09cbdbd7300492fa38c53d4a2cbc4c4b86a09e3 SHA512 804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a
DIST cups-filters-1.22.0.tar.xz 1474616 BLAKE2B 045f403bcbae11bd6e0b523d741d1494e6328dfc9386393f974ff82ba816972688613e5c68739dcbf7733aa19c9c063be777cb017dbd041d9c2f23bd21c9182c SHA512 6129c948db2499a300c44ce88a287d5296af4771fb42e991121aaf4eb1258e17f1092afcbb90e5dd63572db410169fed65c6217d1ecd0ba834018acb4ef39bfa
DIST cups-filters-1.22.1.tar.xz 1475456 BLAKE2B f5008cbcfc51f6a194dd5c50b3db288b2703b053d0f0e4ce525ccca255624efe43ec308b59310b24df5ab4f9f5afff54bfab5a102614a8d62209353245d66ed7 SHA512 5ed2f9fe6baecda8e5ed7c6c153e31ba3bc65a28608851141ae77dee5ddc31b3feaf22ab4798c1b47edb98af9f4cacd8437b880d693f5380febd24ef12c92b24
diff --git a/net-print/cups-filters/cups-filters-1.20.4.ebuild b/net-print/cups-filters/cups-filters-1.20.4.ebuild
deleted file mode 100644
index 42d6fce17e8..00000000000
--- a/net-print/cups-filters/cups-filters-1.20.4.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
- inherit bzr autotools
- EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-else
- SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
-
-RDEPEND="
- >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
- >=app-text/qpdf-3.0.2:=
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/lcms:2
- >=net-print/cups-1.7.3
- !<=net-print/cups-1.5.9999
- sys-devel/bc
- sys-libs/zlib
- dbus? ( sys-apps/dbus )
- foomatic? ( !net-print/foomatic-filters )
- jpeg? ( virtual/jpeg:0 )
- ldap? ( net-nds/openldap )
- pclm? ( >=app-text/qpdf-7.0_beta1 )
- pdf? ( app-text/mupdf )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
- tiff? ( media-libs/tiff:0 )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
- dev-util/gdbus-codegen
- test? ( media-fonts/dejavu )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.20.4-poppler-0.67.0.patch"
-)
-
-src_prepare() {
- default
- [[ "${PV}" == "9999" ]] && eautoreconf
-
- # Bug #626800
- append-cxxflags -std=c++11
-}
-
-src_configure() {
- local myeconfargs=(
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
- --enable-imagefilters
- --localstatedir="${EPREFIX}"/var
- --with-browseremoteprotocols=DNSSD,CUPS
- --with-cups-rundir="${EPREFIX}"/run/cups
- --with-fontdir="fonts/conf.avail"
- --with-pdftops=pdftops
- --with-rcdir=no
- --without-php
- $(use_enable dbus)
- $(use_enable foomatic)
- $(use_enable ipp_autosetup auto-setup-driverless)
- $(use_enable ldap)
- $(use_enable pclm)
- $(use_enable pdf mutool)
- $(use_enable postscript ghostscript)
- $(use_enable postscript ijs)
- $(use_enable static-libs static)
- $(use_enable zeroconf avahi)
- $(use_with jpeg)
- $(use_with png)
- $(use_with tiff)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null
- fi
-}
-
-src_install() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_install
- perl_delete_localpod
- popd > /dev/null
- fi
-
- if use postscript; then
- # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
- dosym gstoraster /usr/libexec/cups/filter/pstoraster
- dosym gstopxl /usr/libexec/cups/filter/pstopxl
- fi
-
- find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
- cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
- if ! use zeroconf ; then
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
- sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
- fi
-
- doinitd "${T}"/cups-browsed
- systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
- emake check
-}
-
-pkg_postinst() {
- if ! use foomatic ; then
- ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
- ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
- fi
-}
diff --git a/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch b/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch
deleted file mode 100644
index 69376e1c84d..00000000000
--- a/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 07a0a423a8469a2dd6d7f64bb3b62ba6ac42cc28 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 20 Jul 2018 15:20:11 +0200
-Subject: [PATCH] GooString needs to be const since >=poppler-0.64.0
-
-This only fails with >=poppler-0.67.0 but the change to const was done
-in 0.64.0
----
- filter/pdf.cxx | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/filter/pdf.cxx b/filter/pdf.cxx
-index 206ccf88..665eab09 100644
---- a/filter/pdf.cxx
-+++ b/filter/pdf.cxx
-@@ -734,6 +734,9 @@ extern "C" int pdf_fill_form(pdf_t *doc, opt_t *opt)
- }
-
- FormField *ff = fm_text->getField();
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 64
-+ const
-+#endif
- GooString *field_name;
- field_name = ff->getFullyQualifiedName();
- if ( ! field_name )
---
-2.18.0
-
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/
@ 2020-04-12 22:51 Thomas Deutschmann
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Deutschmann @ 2020-04-12 22:51 UTC (permalink / raw
To: gentoo-commits
commit: 7461a982b3b7cdd5720f72241143e682aa447acc
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 22:50:21 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 22:51:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7461a982
net-print/cups-filters: make testfont optional
Closes: https://bugs.gentoo.org/717138
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
net-print/cups-filters/cups-filters-1.27.4.ebuild | 16 +++++++++++++---
net-print/cups-filters/cups-filters-9999.ebuild | 16 +++++++++++++---
...-filters-1.27.4-make-missing-testfont-non-fatal.patch | 11 +++++++++++
3 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/net-print/cups-filters/cups-filters-1.27.4.ebuild b/net-print/cups-filters/cups-filters-1.27.4.ebuild
index 6cb600e6a3a..7abb7a7fcbf 100644
--- a/net-print/cups-filters/cups-filters-1.27.4.ebuild
+++ b/net-print/cups-filters/cups-filters-1.27.4.ebuild
@@ -5,10 +5,10 @@ EAPI=7
GENTOO_DEPEND_ON_PERL=no
-inherit perl-module systemd flag-o-matic
+inherit autotools perl-module systemd flag-o-matic
if [[ "${PV}" == "9999" ]] ; then
- inherit autotools git-r3
+ inherit git-r3
EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
else
SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
@@ -54,8 +54,18 @@ BDEPEND="
"
src_prepare() {
+ local need_eautoreconf=
+
default
- [[ "${PV}" == "9999" ]] && eautoreconf
+
+ if ! use test ; then
+ eapply "${FILESDIR}"/${PN}-1.27.4-make-missing-testfont-non-fatal.patch
+ need_eautoreconf=yes
+ elif [[ "${PV}" == "9999" ]] ; then
+ need_eautoreconf=yes
+ fi
+
+ [[ -n ${need_eautoreconf} ]] && eautoreconf
# Bug #626800
append-cxxflags -std=c++11
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 6cb600e6a3a..7abb7a7fcbf 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -5,10 +5,10 @@ EAPI=7
GENTOO_DEPEND_ON_PERL=no
-inherit perl-module systemd flag-o-matic
+inherit autotools perl-module systemd flag-o-matic
if [[ "${PV}" == "9999" ]] ; then
- inherit autotools git-r3
+ inherit git-r3
EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
else
SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
@@ -54,8 +54,18 @@ BDEPEND="
"
src_prepare() {
+ local need_eautoreconf=
+
default
- [[ "${PV}" == "9999" ]] && eautoreconf
+
+ if ! use test ; then
+ eapply "${FILESDIR}"/${PN}-1.27.4-make-missing-testfont-non-fatal.patch
+ need_eautoreconf=yes
+ elif [[ "${PV}" == "9999" ]] ; then
+ need_eautoreconf=yes
+ fi
+
+ [[ -n ${need_eautoreconf} ]] && eautoreconf
# Bug #626800
append-cxxflags -std=c++11
diff --git a/net-print/cups-filters/files/cups-filters-1.27.4-make-missing-testfont-non-fatal.patch b/net-print/cups-filters/files/cups-filters-1.27.4-make-missing-testfont-non-fatal.patch
new file mode 100644
index 00000000000..50866e4a729
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.27.4-make-missing-testfont-non-fatal.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -789,7 +789,7 @@ AC_ARG_WITH([test-font-path],
+ [with_test_font_path=`find /usr/share/fonts -name DejaVuSans.ttf || echo /usr/share/fonts/dejavu/DejaVuSans.ttf`]
+ )
+ AC_CHECK_FILE("$with_test_font_path", [], [
+- AC_MSG_ERROR([Requested font file is missing. Please install a package providing it.])
++ AC_MSG_WARN([Specified font for tests not found. Expect test failures!])
+ ])
+ AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/
@ 2020-07-06 11:35 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2020-07-06 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 3a3c565c4461e0984b09d50c435cf66ba3cea832
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 6 11:35:27 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jul 6 11:35:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a3c565c
net-print/cups-filters: Fixed build with USE="-test"
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-print/cups-filters/cups-filters-1.27.5.ebuild | 2 +-
.../cups-filters-1.27.5-make-missing-testfont-non-fatal.patch | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/net-print/cups-filters/cups-filters-1.27.5.ebuild b/net-print/cups-filters/cups-filters-1.27.5.ebuild
index 7abb7a7fcbf..a62c679e894 100644
--- a/net-print/cups-filters/cups-filters-1.27.5.ebuild
+++ b/net-print/cups-filters/cups-filters-1.27.5.ebuild
@@ -59,7 +59,7 @@ src_prepare() {
default
if ! use test ; then
- eapply "${FILESDIR}"/${PN}-1.27.4-make-missing-testfont-non-fatal.patch
+ eapply "${FILESDIR}"/${PN}-1.27.5-make-missing-testfont-non-fatal.patch
need_eautoreconf=yes
elif [[ "${PV}" == "9999" ]] ; then
need_eautoreconf=yes
diff --git a/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal.patch b/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal.patch
new file mode 100644
index 00000000000..0d5b6e6e06c
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal.patch
@@ -0,0 +1,11 @@
+--- cups-filters-1.27.5/configure.ac
++++ cups-filters-1.27.5/configure.ac
+@@ -791,7 +791,7 @@
+
+ AS_IF([test -f "$with_test_font_path"],
+ [AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])],
+- [AC_MSG_ERROR(DejaVuSans.ttf font file is missing. Please install a package providing it.)]
++ [AC_MSG_WARN(DejaVuSans.ttf font file is missing. Expect test failures!)]
+ )
+
+ # ================
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/
@ 2020-07-07 14:18 Thomas Deutschmann
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Deutschmann @ 2020-07-07 14:18 UTC (permalink / raw
To: gentoo-commits
commit: bd6220d7b9f9fd9f2a99b2dbb4862a6af54e6d6d
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 7 14:17:31 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 7 14:18:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd6220d7
net-print/cups-filters: fix building without media-fonts/dejavu
Closes: https://bugs.gentoo.org/731082
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
net-print/cups-filters/cups-filters-1.27.5.ebuild | 2 +-
...s-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch} | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/net-print/cups-filters/cups-filters-1.27.5.ebuild b/net-print/cups-filters/cups-filters-1.27.5.ebuild
index a62c679e894..c56df856744 100644
--- a/net-print/cups-filters/cups-filters-1.27.5.ebuild
+++ b/net-print/cups-filters/cups-filters-1.27.5.ebuild
@@ -59,7 +59,7 @@ src_prepare() {
default
if ! use test ; then
- eapply "${FILESDIR}"/${PN}-1.27.5-make-missing-testfont-non-fatal.patch
+ eapply "${FILESDIR}"/${PN}-1.27.5-make-missing-testfont-non-fatal-r1.patch
need_eautoreconf=yes
elif [[ "${PV}" == "9999" ]] ; then
need_eautoreconf=yes
diff --git a/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal.patch b/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch
similarity index 56%
rename from net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal.patch
rename to net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch
index 0d5b6e6e06c..43aa6bf3b5a 100644
--- a/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal.patch
+++ b/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch
@@ -1,11 +1,14 @@
---- cups-filters-1.27.5/configure.ac
-+++ cups-filters-1.27.5/configure.ac
-@@ -791,7 +791,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -791,7 +791,10 @@ AC_ARG_WITH([test-font-path],
AS_IF([test -f "$with_test_font_path"],
[AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])],
- [AC_MSG_ERROR(DejaVuSans.ttf font file is missing. Please install a package providing it.)]
-+ [AC_MSG_WARN(DejaVuSans.ttf font file is missing. Expect test failures!)]
++ [
++ AC_MSG_WARN(DejaVuSans.ttf font file is missing. Expect test failures!)
++ AC_DEFINE([TESTFONT])
++ ]
)
# ================
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/
@ 2023-03-14 22:46 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-03-14 22:46 UTC (permalink / raw
To: gentoo-commits
commit: c79a0e06a7be1a76ec0368168cafdcf708b977b7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 22:45:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 22:46:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c79a0e06
net-print/cups-filters: fix build w/ C++17
Closes: https://bugs.gentoo.org/898076
Closes: https://bugs.gentoo.org/901243
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../cups-filters/cups-filters-1.28.17-r1.ebuild | 4 +++
.../files/cups-filters-1.28.17-c++17.patch | 31 ++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/net-print/cups-filters/cups-filters-1.28.17-r1.ebuild b/net-print/cups-filters/cups-filters-1.28.17-r1.ebuild
index 2e2bbd3cef13..13b7dac3fc7b 100644
--- a/net-print/cups-filters/cups-filters-1.28.17-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.17-r1.ebuild
@@ -51,6 +51,10 @@ BDEPEND="
test? ( media-fonts/dejavu )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.28.17-c++17.patch
+)
+
src_configure() {
# Bug #898156
append-cxxflags -std=c++17
diff --git a/net-print/cups-filters/files/cups-filters-1.28.17-c++17.patch b/net-print/cups-filters/files/cups-filters-1.28.17-c++17.patch
new file mode 100644
index 000000000000..f8f63ccd4724
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.28.17-c++17.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/901243
+(and https://bugs.gentoo.org/898076)
+https://github.com/OpenPrinting/cups-filters/pull/505
+
+From 104fba23b1c0c67c92777b3165c6dca99558a656 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 6 Feb 2023 18:13:52 -0800
+Subject: [PATCH] use noexcept(false) instead of throw() from c++17 onwards
+
+C++17 removed dynamic exception specifications [1]
+they had been deprecated since C++11, replace
+throw(whatever) with noexcept(false).
+
+[1] https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0003r5.html
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/filter/pdftoraster.cxx
++++ b/filter/pdftoraster.cxx
+@@ -2148,7 +2148,11 @@ int main(int argc, char *argv[]) {
+ /* For compatibility with g++ >= 4.7 compilers _GLIBCXX_THROW
+ * should be used as a guard, otherwise use traditional definition */
+ #ifndef _GLIBCXX_THROW
++#if __cplusplus < 201703L
+ #define _GLIBCXX_THROW throw
++#else
++#define _GLIBCXX_THROW(x) noexcept(false)
++#endif
+ #endif
+
+ void * operator new(size_t size) _GLIBCXX_THROW (std::bad_alloc)
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-03-14 22:46 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-11 2:22 [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/ Mike Frysinger
-- strict thread matches above, loose matches on Subject: below --
2016-03-23 6:29 Mike Frysinger
2016-03-23 6:29 Mike Frysinger
2016-03-27 19:59 Lars Wendler
2016-07-21 10:18 Lars Wendler
2017-10-18 11:19 Lars Wendler
2019-03-02 20:29 Andreas Sturmlechner
2020-04-12 22:51 Thomas Deutschmann
2020-07-06 11:35 Lars Wendler
2020-07-07 14:18 Thomas Deutschmann
2023-03-14 22:46 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox