1 |
commit: 721561d6002826ad406ac07c6d6f6308338cebf4 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 2 20:27:17 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 2 20:27:17 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=721561d6 |
7 |
|
8 |
net-print/cups-filters: Drop 1.20.4 |
9 |
|
10 |
Does not build against poppler versions in tree. |
11 |
|
12 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
net-print/cups-filters/Manifest | 1 - |
16 |
net-print/cups-filters/cups-filters-1.20.4.ebuild | 141 --------------------- |
17 |
.../files/cups-filters-1.20.4-poppler-0.67.0.patch | 28 ---- |
18 |
3 files changed, 170 deletions(-) |
19 |
|
20 |
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest |
21 |
index feb45a627db..d381addcda4 100644 |
22 |
--- a/net-print/cups-filters/Manifest |
23 |
+++ b/net-print/cups-filters/Manifest |
24 |
@@ -1,4 +1,3 @@ |
25 |
-DIST cups-filters-1.20.4.tar.xz 1474700 BLAKE2B 70948565e4a2b35d0c3bc510e7c03d77ac1ed47ab16a22bc9f60a7293fe5b5b08fdb1e95dd7a32f4c99a18676e50c48a515a954d437283ce7011ab616804e235 SHA512 4001cefbee945c326e3c597869763286e8665dee098b9aff76340dd249ef3e615f2a8df5c8e802e388b91dfd06ba9e8313b27908ca89ca120f899060785a6f07 |
26 |
DIST cups-filters-1.21.6.tar.xz 1474944 BLAKE2B a4c3418accb9d2bf46a366ec6004919d2a5c2c0a02022102270da17fb81915428275aadf58f1f50f8ca022e1c09cbdbd7300492fa38c53d4a2cbc4c4b86a09e3 SHA512 804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a |
27 |
DIST cups-filters-1.22.0.tar.xz 1474616 BLAKE2B 045f403bcbae11bd6e0b523d741d1494e6328dfc9386393f974ff82ba816972688613e5c68739dcbf7733aa19c9c063be777cb017dbd041d9c2f23bd21c9182c SHA512 6129c948db2499a300c44ce88a287d5296af4771fb42e991121aaf4eb1258e17f1092afcbb90e5dd63572db410169fed65c6217d1ecd0ba834018acb4ef39bfa |
28 |
DIST cups-filters-1.22.1.tar.xz 1475456 BLAKE2B f5008cbcfc51f6a194dd5c50b3db288b2703b053d0f0e4ce525ccca255624efe43ec308b59310b24df5ab4f9f5afff54bfab5a102614a8d62209353245d66ed7 SHA512 5ed2f9fe6baecda8e5ed7c6c153e31ba3bc65a28608851141ae77dee5ddc31b3feaf22ab4798c1b47edb98af9f4cacd8437b880d693f5380febd24ef12c92b24 |
29 |
|
30 |
diff --git a/net-print/cups-filters/cups-filters-1.20.4.ebuild b/net-print/cups-filters/cups-filters-1.20.4.ebuild |
31 |
deleted file mode 100644 |
32 |
index 42d6fce17e8..00000000000 |
33 |
--- a/net-print/cups-filters/cups-filters-1.20.4.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,141 +0,0 @@ |
36 |
-# Copyright 1999-2019 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=6 |
40 |
- |
41 |
-GENTOO_DEPEND_ON_PERL=no |
42 |
- |
43 |
-inherit perl-module systemd flag-o-matic |
44 |
- |
45 |
-if [[ "${PV}" == "9999" ]] ; then |
46 |
- inherit bzr autotools |
47 |
- EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters" |
48 |
-else |
49 |
- SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz" |
50 |
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~m68k-mint" |
51 |
-fi |
52 |
-DESCRIPTION="Cups filters" |
53 |
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" |
54 |
- |
55 |
-LICENSE="MIT GPL-2" |
56 |
-SLOT="0" |
57 |
-IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf" |
58 |
- |
59 |
-RDEPEND=" |
60 |
- >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] |
61 |
- >=app-text/qpdf-3.0.2:= |
62 |
- dev-libs/glib:2 |
63 |
- media-libs/fontconfig |
64 |
- media-libs/freetype:2 |
65 |
- media-libs/lcms:2 |
66 |
- >=net-print/cups-1.7.3 |
67 |
- !<=net-print/cups-1.5.9999 |
68 |
- sys-devel/bc |
69 |
- sys-libs/zlib |
70 |
- dbus? ( sys-apps/dbus ) |
71 |
- foomatic? ( !net-print/foomatic-filters ) |
72 |
- jpeg? ( virtual/jpeg:0 ) |
73 |
- ldap? ( net-nds/openldap ) |
74 |
- pclm? ( >=app-text/qpdf-7.0_beta1 ) |
75 |
- pdf? ( app-text/mupdf ) |
76 |
- perl? ( dev-lang/perl:= ) |
77 |
- png? ( media-libs/libpng:0= ) |
78 |
- postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) |
79 |
- tiff? ( media-libs/tiff:0 ) |
80 |
- zeroconf? ( net-dns/avahi[dbus] ) |
81 |
-" |
82 |
-DEPEND="${RDEPEND} |
83 |
- dev-util/gdbus-codegen |
84 |
- test? ( media-fonts/dejavu ) |
85 |
-" |
86 |
- |
87 |
-PATCHES=( |
88 |
- "${FILESDIR}/${PN}-1.20.4-poppler-0.67.0.patch" |
89 |
-) |
90 |
- |
91 |
-src_prepare() { |
92 |
- default |
93 |
- [[ "${PV}" == "9999" ]] && eautoreconf |
94 |
- |
95 |
- # Bug #626800 |
96 |
- append-cxxflags -std=c++11 |
97 |
-} |
98 |
- |
99 |
-src_configure() { |
100 |
- local myeconfargs=( |
101 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}" |
102 |
- --enable-imagefilters |
103 |
- --localstatedir="${EPREFIX}"/var |
104 |
- --with-browseremoteprotocols=DNSSD,CUPS |
105 |
- --with-cups-rundir="${EPREFIX}"/run/cups |
106 |
- --with-fontdir="fonts/conf.avail" |
107 |
- --with-pdftops=pdftops |
108 |
- --with-rcdir=no |
109 |
- --without-php |
110 |
- $(use_enable dbus) |
111 |
- $(use_enable foomatic) |
112 |
- $(use_enable ipp_autosetup auto-setup-driverless) |
113 |
- $(use_enable ldap) |
114 |
- $(use_enable pclm) |
115 |
- $(use_enable pdf mutool) |
116 |
- $(use_enable postscript ghostscript) |
117 |
- $(use_enable postscript ijs) |
118 |
- $(use_enable static-libs static) |
119 |
- $(use_enable zeroconf avahi) |
120 |
- $(use_with jpeg) |
121 |
- $(use_with png) |
122 |
- $(use_with tiff) |
123 |
- ) |
124 |
- econf "${myeconfargs[@]}" |
125 |
-} |
126 |
- |
127 |
-src_compile() { |
128 |
- default |
129 |
- |
130 |
- if use perl; then |
131 |
- pushd "${S}/scripting/perl" > /dev/null |
132 |
- perl-module_src_configure |
133 |
- perl-module_src_compile |
134 |
- popd > /dev/null |
135 |
- fi |
136 |
-} |
137 |
- |
138 |
-src_install() { |
139 |
- default |
140 |
- |
141 |
- if use perl; then |
142 |
- pushd "${S}/scripting/perl" > /dev/null |
143 |
- perl-module_src_install |
144 |
- perl_delete_localpod |
145 |
- popd > /dev/null |
146 |
- fi |
147 |
- |
148 |
- if use postscript; then |
149 |
- # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831 |
150 |
- dosym gstoraster /usr/libexec/cups/filter/pstoraster |
151 |
- dosym gstopxl /usr/libexec/cups/filter/pstopxl |
152 |
- fi |
153 |
- |
154 |
- find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die |
155 |
- |
156 |
- cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die |
157 |
- |
158 |
- if ! use zeroconf ; then |
159 |
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die |
160 |
- sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die |
161 |
- fi |
162 |
- |
163 |
- doinitd "${T}"/cups-browsed |
164 |
- systemd_dounit "${S}/utils/cups-browsed.service" |
165 |
-} |
166 |
- |
167 |
-src_test() { |
168 |
- emake check |
169 |
-} |
170 |
- |
171 |
-pkg_postinst() { |
172 |
- if ! use foomatic ; then |
173 |
- ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely." |
174 |
- ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained." |
175 |
- fi |
176 |
-} |
177 |
|
178 |
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 |
179 |
deleted file mode 100644 |
180 |
index 69376e1c84d..00000000000 |
181 |
--- a/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch |
182 |
+++ /dev/null |
183 |
@@ -1,28 +0,0 @@ |
184 |
-From 07a0a423a8469a2dd6d7f64bb3b62ba6ac42cc28 Mon Sep 17 00:00:00 2001 |
185 |
-From: Lars Wendler <polynomial-c@g.o> |
186 |
-Date: Fri, 20 Jul 2018 15:20:11 +0200 |
187 |
-Subject: [PATCH] GooString needs to be const since >=poppler-0.64.0 |
188 |
- |
189 |
-This only fails with >=poppler-0.67.0 but the change to const was done |
190 |
-in 0.64.0 |
191 |
---- |
192 |
- filter/pdf.cxx | 3 +++ |
193 |
- 1 file changed, 3 insertions(+) |
194 |
- |
195 |
-diff --git a/filter/pdf.cxx b/filter/pdf.cxx |
196 |
-index 206ccf88..665eab09 100644 |
197 |
---- a/filter/pdf.cxx |
198 |
-+++ b/filter/pdf.cxx |
199 |
-@@ -734,6 +734,9 @@ extern "C" int pdf_fill_form(pdf_t *doc, opt_t *opt) |
200 |
- } |
201 |
- |
202 |
- FormField *ff = fm_text->getField(); |
203 |
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 64 |
204 |
-+ const |
205 |
-+#endif |
206 |
- GooString *field_name; |
207 |
- field_name = ff->getFullyQualifiedName(); |
208 |
- if ( ! field_name ) |
209 |
--- |
210 |
-2.18.0 |
211 |
- |