1 |
commit: 8d3facf9b2b7766db4ea748405033038337b0f3a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 5 20:24:52 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 5 20:40:47 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d3facf9 |
7 |
|
8 |
app-text/poppler: Drop 21.11.0 and 21.12.0 |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
app-text/poppler/Manifest | 2 - |
14 |
.../files/poppler-21.12.0-include-csetjmp.patch | 27 ----- |
15 |
app-text/poppler/poppler-21.11.0.ebuild | 126 -------------------- |
16 |
app-text/poppler/poppler-21.12.0.ebuild | 127 --------------------- |
17 |
4 files changed, 282 deletions(-) |
18 |
|
19 |
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest |
20 |
index c34c5d4a2099..b51d8ec68d33 100644 |
21 |
--- a/app-text/poppler/Manifest |
22 |
+++ b/app-text/poppler/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST poppler-21.11.0.tar.xz 1783592 BLAKE2B b0448ae0456ffda29c18732e6dd94cb285af67cf4adbaded05a4abe2e465cb63a17e0041240c82c83c89b313ec8c7bf9d68fc8d727b7d41c1ee70722529ce45d SHA512 354d6372093e7ecedf95c43e8d203e9b2781ff7ecd81cd3920cb8c72a37463b47423ce7ab3c8233c0f031f2c024ac1ba5c8d442c80e6643722192fb9638e5d3a |
25 |
-DIST poppler-21.12.0.tar.xz 1798780 BLAKE2B 403f928dfe8f94048307eb120dcd85c9821a12e100b7030831864fbc630244e79923e48061352e49e1a6daf5eda7f05b32254735ef5037db108ac4e3fedd877e SHA512 86856e33479a357deb671b4fdd6336a7581b5ac14b9715ffc2482d8dba7a455aab07317b1fc0c33f479f11de38012958fffa619105c255de51929e61a6b63e33 |
26 |
DIST poppler-22.01.0.tar.xz 1801984 BLAKE2B f238636a0b1f07e0b70de99d8f0b3afcb7e2424c9dee4a044edaa5bd34753061e58a7c530792264ffb5a520cb4dc7dc52de17573fda350de97bef6346048fb76 SHA512 c6ea908a9188483ca588ac81d3e92dd15a405f90d36cc7059e618c8a7e3e9faeda82717aba5df34adb4a0a94e2fbecd472acec44972272349cc8d5a57b7405d1 |
27 |
|
28 |
diff --git a/app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch b/app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch |
29 |
deleted file mode 100644 |
30 |
index 0f0029269673..000000000000 |
31 |
--- a/app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch |
32 |
+++ /dev/null |
33 |
@@ -1,27 +0,0 @@ |
34 |
-https://bugs.gentoo.org/828578 |
35 |
-https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1016 |
36 |
- |
37 |
-From 3ea6bca90d87d3f91556205c4e58ca425c6ac437 Mon Sep 17 00:00:00 2001 |
38 |
-From: Marco Genasci <fedeliallalinea@×××××.com> |
39 |
-Date: Sun, 12 Dec 2021 10:23:37 +0100 |
40 |
-Subject: [PATCH] Include setjmp.h when WITH_JPEG=yes and WITH_PNG=no |
41 |
- |
42 |
---- |
43 |
- poppler/ImageEmbeddingUtils.cc | 1 + |
44 |
- 1 file changed, 1 insertion(+) |
45 |
- |
46 |
-diff --git a/poppler/ImageEmbeddingUtils.cc b/poppler/ImageEmbeddingUtils.cc |
47 |
-index 5c50f1269..c26b9eb2a 100644 |
48 |
---- a/poppler/ImageEmbeddingUtils.cc |
49 |
-+++ b/poppler/ImageEmbeddingUtils.cc |
50 |
-@@ -16,6 +16,7 @@ |
51 |
- extern "C" { |
52 |
- # include <jpeglib.h> |
53 |
- } |
54 |
-+# include <csetjmp> |
55 |
- #endif |
56 |
- #ifdef ENABLE_LIBPNG |
57 |
- # include <png.h> |
58 |
--- |
59 |
-GitLab |
60 |
- |
61 |
|
62 |
diff --git a/app-text/poppler/poppler-21.11.0.ebuild b/app-text/poppler/poppler-21.11.0.ebuild |
63 |
deleted file mode 100644 |
64 |
index 705d9b333728..000000000000 |
65 |
--- a/app-text/poppler/poppler-21.11.0.ebuild |
66 |
+++ /dev/null |
67 |
@@ -1,126 +0,0 @@ |
68 |
-# Copyright 2005-2021 Gentoo Authors |
69 |
-# Distributed under the terms of the GNU General Public License v2 |
70 |
- |
71 |
-EAPI=8 |
72 |
- |
73 |
-inherit cmake toolchain-funcs xdg-utils |
74 |
- |
75 |
-if [[ ${PV} == *9999* ]] ; then |
76 |
- inherit git-r3 |
77 |
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" |
78 |
- SLOT="0/9999" |
79 |
-else |
80 |
- SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" |
81 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
82 |
- SLOT="0/115" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
83 |
-fi |
84 |
- |
85 |
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" |
86 |
-HOMEPAGE="https://poppler.freedesktop.org/" |
87 |
- |
88 |
-LICENSE="GPL-2" |
89 |
-IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" |
90 |
- |
91 |
-# No test data provided |
92 |
-RESTRICT="test" |
93 |
- |
94 |
-DEPEND=" |
95 |
- media-libs/fontconfig |
96 |
- media-libs/freetype |
97 |
- sys-libs/zlib |
98 |
- cairo? ( |
99 |
- dev-libs/glib:2 |
100 |
- x11-libs/cairo |
101 |
- introspection? ( dev-libs/gobject-introspection:= ) |
102 |
- ) |
103 |
- curl? ( net-misc/curl ) |
104 |
- jpeg? ( virtual/jpeg:0 ) |
105 |
- jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) |
106 |
- lcms? ( media-libs/lcms:2 ) |
107 |
- nss? ( >=dev-libs/nss-3.19:0 ) |
108 |
- png? ( media-libs/libpng:0= ) |
109 |
- qt5? ( |
110 |
- dev-qt/qtcore:5 |
111 |
- dev-qt/qtgui:5 |
112 |
- dev-qt/qtxml:5 |
113 |
- ) |
114 |
- tiff? ( media-libs/tiff:0 ) |
115 |
-" |
116 |
-RDEPEND="${DEPEND} |
117 |
- cjk? ( app-text/poppler-data ) |
118 |
-" |
119 |
-DEPEND+=" |
120 |
- boost? ( dev-libs/boost ) |
121 |
-" |
122 |
-BDEPEND=" |
123 |
- dev-util/glib-utils |
124 |
- virtual/pkgconfig |
125 |
-" |
126 |
- |
127 |
-DOCS=( AUTHORS NEWS README.md README-XPDF ) |
128 |
- |
129 |
-PATCHES=( |
130 |
- "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" |
131 |
- "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch" |
132 |
- "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" |
133 |
-) |
134 |
- |
135 |
-src_prepare() { |
136 |
- cmake_src_prepare |
137 |
- |
138 |
- # Clang doesn't grok this flag, the configure nicely tests that, but |
139 |
- # cmake just uses it, so remove it if we use clang |
140 |
- if tc-is-clang ; then |
141 |
- sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die |
142 |
- fi |
143 |
- |
144 |
- if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then |
145 |
- sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ |
146 |
- -i CMakeLists.txt || die |
147 |
- else |
148 |
- einfo "policy(SET CMP0002 OLD) - workaround can be removed" |
149 |
- fi |
150 |
-} |
151 |
- |
152 |
-src_configure() { |
153 |
- xdg_environment_reset |
154 |
- local mycmakeargs=( |
155 |
- -DBUILD_GTK_TESTS=OFF |
156 |
- -DBUILD_QT5_TESTS=OFF |
157 |
- -DBUILD_CPP_TESTS=OFF |
158 |
- -DBUILD_MANUAL_TESTS=OFF |
159 |
- -DRUN_GPERF_IF_PRESENT=OFF |
160 |
- -DENABLE_BOOST="$(usex boost)" |
161 |
- -DENABLE_ZLIB=ON |
162 |
- -DENABLE_ZLIB_UNCOMPRESS=OFF |
163 |
- -DENABLE_UNSTABLE_API_ABI_HEADERS=ON |
164 |
- -DUSE_FLOAT=OFF |
165 |
- -DWITH_Cairo=$(usex cairo) |
166 |
- -DENABLE_LIBCURL=$(usex curl) |
167 |
- -DENABLE_CPP=$(usex cxx) |
168 |
- -DWITH_JPEG=$(usex jpeg) |
169 |
- -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) |
170 |
- -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) |
171 |
- -DENABLE_CMS=$(usex lcms lcms2 none) |
172 |
- -DWITH_NSS3=$(usex nss) |
173 |
- -DWITH_PNG=$(usex png) |
174 |
- $(cmake_use_find_package qt5 Qt5Core) |
175 |
- -DWITH_TIFF=$(usex tiff) |
176 |
- -DENABLE_UTILS=$(usex utils) |
177 |
- -DENABLE_QT6=OFF |
178 |
- ) |
179 |
- use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) ) |
180 |
- |
181 |
- cmake_src_configure |
182 |
-} |
183 |
- |
184 |
-src_install() { |
185 |
- cmake_src_install |
186 |
- |
187 |
- # live version doesn't provide html documentation |
188 |
- if use cairo && use doc && [[ ${PV} != *9999* ]]; then |
189 |
- # For now install gtk-doc there |
190 |
- insinto /usr/share/gtk-doc/html/poppler |
191 |
- doins -r "${S}"/glib/reference/html/* |
192 |
- fi |
193 |
-} |
194 |
|
195 |
diff --git a/app-text/poppler/poppler-21.12.0.ebuild b/app-text/poppler/poppler-21.12.0.ebuild |
196 |
deleted file mode 100644 |
197 |
index 4b6f8bce95bf..000000000000 |
198 |
--- a/app-text/poppler/poppler-21.12.0.ebuild |
199 |
+++ /dev/null |
200 |
@@ -1,127 +0,0 @@ |
201 |
-# Copyright 2005-2021 Gentoo Authors |
202 |
-# Distributed under the terms of the GNU General Public License v2 |
203 |
- |
204 |
-EAPI=8 |
205 |
- |
206 |
-inherit cmake toolchain-funcs xdg-utils |
207 |
- |
208 |
-if [[ ${PV} == *9999* ]] ; then |
209 |
- inherit git-r3 |
210 |
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" |
211 |
- SLOT="0/9999" |
212 |
-else |
213 |
- SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" |
214 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
215 |
- SLOT="0/116" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
216 |
-fi |
217 |
- |
218 |
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" |
219 |
-HOMEPAGE="https://poppler.freedesktop.org/" |
220 |
- |
221 |
-LICENSE="GPL-2" |
222 |
-IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" |
223 |
- |
224 |
-# No test data provided |
225 |
-RESTRICT="test" |
226 |
- |
227 |
-DEPEND=" |
228 |
- media-libs/fontconfig |
229 |
- media-libs/freetype |
230 |
- sys-libs/zlib |
231 |
- cairo? ( |
232 |
- dev-libs/glib:2 |
233 |
- x11-libs/cairo |
234 |
- introspection? ( dev-libs/gobject-introspection:= ) |
235 |
- ) |
236 |
- curl? ( net-misc/curl ) |
237 |
- jpeg? ( virtual/jpeg:0 ) |
238 |
- jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) |
239 |
- lcms? ( media-libs/lcms:2 ) |
240 |
- nss? ( >=dev-libs/nss-3.19:0 ) |
241 |
- png? ( media-libs/libpng:0= ) |
242 |
- qt5? ( |
243 |
- dev-qt/qtcore:5 |
244 |
- dev-qt/qtgui:5 |
245 |
- dev-qt/qtxml:5 |
246 |
- ) |
247 |
- tiff? ( media-libs/tiff:0 ) |
248 |
-" |
249 |
-RDEPEND="${DEPEND} |
250 |
- cjk? ( app-text/poppler-data ) |
251 |
-" |
252 |
-DEPEND+=" |
253 |
- boost? ( dev-libs/boost ) |
254 |
-" |
255 |
-BDEPEND=" |
256 |
- dev-util/glib-utils |
257 |
- virtual/pkgconfig |
258 |
-" |
259 |
- |
260 |
-DOCS=( AUTHORS NEWS README.md README-XPDF ) |
261 |
- |
262 |
-PATCHES=( |
263 |
- "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" |
264 |
- "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch" |
265 |
- "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" |
266 |
- "${FILESDIR}/${P}-include-csetjmp.patch" |
267 |
-) |
268 |
- |
269 |
-src_prepare() { |
270 |
- cmake_src_prepare |
271 |
- |
272 |
- # Clang doesn't grok this flag, the configure nicely tests that, but |
273 |
- # cmake just uses it, so remove it if we use clang |
274 |
- if tc-is-clang ; then |
275 |
- sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die |
276 |
- fi |
277 |
- |
278 |
- if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then |
279 |
- sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ |
280 |
- -i CMakeLists.txt || die |
281 |
- else |
282 |
- einfo "policy(SET CMP0002 OLD) - workaround can be removed" |
283 |
- fi |
284 |
-} |
285 |
- |
286 |
-src_configure() { |
287 |
- xdg_environment_reset |
288 |
- local mycmakeargs=( |
289 |
- -DBUILD_GTK_TESTS=OFF |
290 |
- -DBUILD_QT5_TESTS=OFF |
291 |
- -DBUILD_CPP_TESTS=OFF |
292 |
- -DBUILD_MANUAL_TESTS=OFF |
293 |
- -DRUN_GPERF_IF_PRESENT=OFF |
294 |
- -DENABLE_BOOST="$(usex boost)" |
295 |
- -DENABLE_ZLIB=ON |
296 |
- -DENABLE_ZLIB_UNCOMPRESS=OFF |
297 |
- -DENABLE_UNSTABLE_API_ABI_HEADERS=ON |
298 |
- -DUSE_FLOAT=OFF |
299 |
- -DWITH_Cairo=$(usex cairo) |
300 |
- -DENABLE_LIBCURL=$(usex curl) |
301 |
- -DENABLE_CPP=$(usex cxx) |
302 |
- -DWITH_JPEG=$(usex jpeg) |
303 |
- -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) |
304 |
- -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) |
305 |
- -DENABLE_CMS=$(usex lcms lcms2 none) |
306 |
- -DWITH_NSS3=$(usex nss) |
307 |
- -DWITH_PNG=$(usex png) |
308 |
- $(cmake_use_find_package qt5 Qt5Core) |
309 |
- -DWITH_TIFF=$(usex tiff) |
310 |
- -DENABLE_UTILS=$(usex utils) |
311 |
- -DENABLE_QT6=OFF |
312 |
- ) |
313 |
- use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) ) |
314 |
- |
315 |
- cmake_src_configure |
316 |
-} |
317 |
- |
318 |
-src_install() { |
319 |
- cmake_src_install |
320 |
- |
321 |
- # live version doesn't provide html documentation |
322 |
- if use cairo && use doc && [[ ${PV} != *9999* ]]; then |
323 |
- # For now install gtk-doc there |
324 |
- insinto /usr/share/gtk-doc/html/poppler |
325 |
- doins -r "${S}"/glib/reference/html/* |
326 |
- fi |
327 |
-} |