1 |
commit: b275a9a792db9fd662a598309b0c05dbb5fb8507 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 2 09:50:06 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 2 10:02:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b275a9a7 |
7 |
|
8 |
app-text/poppler: Bump to version 20.12.0 |
9 |
|
10 |
Package-Manager: Portage-3.0.11, Repoman-3.0.2 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
app-text/poppler/Manifest | 1 + |
14 |
.../files/poppler-20.12.0-respect-cflags.patch | 108 ++++++++++++++++++ |
15 |
app-text/poppler/poppler-20.12.0.ebuild | 122 +++++++++++++++++++++ |
16 |
3 files changed, 231 insertions(+) |
17 |
|
18 |
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest |
19 |
index 0884a6cbdcf..20f58da4096 100644 |
20 |
--- a/app-text/poppler/Manifest |
21 |
+++ b/app-text/poppler/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335 |
24 |
+DIST poppler-20.12.0.tar.xz 1659844 BLAKE2B 48e35f092ef29b5e9e2e20f1ade3759b0cdbb13ea843adacaf076407654fa52bcc2f42f8f89e72e7d8c717fde72771d43a6a855b0204d52ce450f2593899d3d5 SHA512 8c035847cf5a0763f02ccea45a8f1f563d94847620354c3c1621b05081600a99e207eadbc87398ed40e0d105c5439826130eb49058fed3abb60f5e4642321a0e |
25 |
|
26 |
diff --git a/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch b/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch |
27 |
new file mode 100644 |
28 |
index 00000000000..4b389faa7d6 |
29 |
--- /dev/null |
30 |
+++ b/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch |
31 |
@@ -0,0 +1,108 @@ |
32 |
+From 37f8326557eeb291d78a866d5ff78d79b32f6f8b Mon Sep 17 00:00:00 2001 |
33 |
+From: Lars Wendler <polynomial-c@g.o> |
34 |
+Date: Wed, 2 Dec 2020 09:29:33 +0100 |
35 |
+Subject: [PATCH] build: respect cflags |
36 |
+ |
37 |
+--- |
38 |
+ cmake/modules/PopplerMacros.cmake | 81 +------------------------------ |
39 |
+ 1 file changed, 2 insertions(+), 79 deletions(-) |
40 |
+ |
41 |
+diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake |
42 |
+index 707e7497..882cf11b 100644 |
43 |
+--- a/cmake/modules/PopplerMacros.cmake |
44 |
++++ b/cmake/modules/PopplerMacros.cmake |
45 |
+@@ -79,8 +79,6 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) |
46 |
+ set(CMAKE_BUILD_TYPE RelWithDebInfo) |
47 |
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) |
48 |
+ |
49 |
+-if(CMAKE_COMPILER_IS_GNUCXX) |
50 |
+- # set the default compile warnings |
51 |
+ set(_warn "-Wall -Wextra -Wpedantic") |
52 |
+ set(_warn "${_warn} -Wno-unused-parameter") |
53 |
+ set(_warn "${_warn} -Wcast-align") |
54 |
+@@ -105,80 +103,5 @@ if(CMAKE_COMPILER_IS_GNUCXX) |
55 |
+ set(DEFAULT_COMPILE_WARNINGS "${_warn}") |
56 |
+ set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") |
57 |
+ |
58 |
+- set(_save_cxxflags "${CMAKE_CXX_FLAGS}") |
59 |
+- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") |
60 |
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") |
61 |
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") |
62 |
+- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") |
63 |
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") |
64 |
+- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") |
65 |
+- set(_save_cflags "${CMAKE_C_FLAGS}") |
66 |
+- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") |
67 |
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") |
68 |
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") |
69 |
+- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") |
70 |
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}") |
71 |
+- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}") |
72 |
+- |
73 |
+- poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED) |
74 |
+- if(GCC_HAS_AS_NEEDED) |
75 |
+- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed") |
76 |
+- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed") |
77 |
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") |
78 |
+- endif(GCC_HAS_AS_NEEDED) |
79 |
+-endif (CMAKE_COMPILER_IS_GNUCXX) |
80 |
+- |
81 |
+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") |
82 |
+-# set the default compile warnings |
83 |
+- set(_warn "-Wall -Wextra -Wpedantic") |
84 |
+- set(_warn "${_warn} -Wno-unused-parameter") |
85 |
+- set(_warn "${_warn} -Wcast-align") |
86 |
+- set(_warn "${_warn} -Wformat-security") |
87 |
+- set(_warn "${_warn} -Wframe-larger-than=65536") |
88 |
+- set(_warn "${_warn} -Wmissing-format-attribute") |
89 |
+- set(_warn "${_warn} -Wnon-virtual-dtor") |
90 |
+- set(_warn "${_warn} -Woverloaded-virtual") |
91 |
+- set(_warn "${_warn} -Wmissing-declarations") |
92 |
+- set(_warn "${_warn} -Wundef") |
93 |
+- set(_warn "${_warn} -Wzero-as-null-pointer-constant") |
94 |
+- set(_warn "${_warn} -Wshadow") |
95 |
+- set(_warn "${_warn} -Wweak-vtables") |
96 |
+- |
97 |
+- # set extra warnings |
98 |
+- set(_warnx "${_warnx} -Wconversion") |
99 |
+- |
100 |
+- set(DEFAULT_COMPILE_WARNINGS "${_warn}") |
101 |
+- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") |
102 |
+- |
103 |
+- set(_save_cxxflags "${CMAKE_CXX_FLAGS}") |
104 |
+- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") |
105 |
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") |
106 |
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") |
107 |
+- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 |
108 |
+- set(CMAKE_CXX_FLAGS_DEBUG "-g ${_save_cxxflags}") |
109 |
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") |
110 |
+- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") |
111 |
+- set(_save_cflags "${CMAKE_C_FLAGS}") |
112 |
+- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") |
113 |
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") |
114 |
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") |
115 |
+- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 |
116 |
+- set(CMAKE_C_FLAGS_DEBUG "-g ${_save_cflags}") |
117 |
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}") |
118 |
+- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}") |
119 |
+- |
120 |
+-endif() |
121 |
+- |
122 |
+-if(CMAKE_C_COMPILER MATCHES "icc") |
123 |
+- set(_save_cxxflags "${CMAKE_CXX_FLAGS}") |
124 |
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") |
125 |
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") |
126 |
+- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign ${_save_cxxflags}") |
127 |
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cxxflags}") |
128 |
+- set(_save_cflags "${CMAKE_C_FLAGS}") |
129 |
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") |
130 |
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") |
131 |
+- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign ${_save_cflags}") |
132 |
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cflags}") |
133 |
+-endif(CMAKE_C_COMPILER MATCHES "icc") |
134 |
+- |
135 |
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual") |
136 |
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") |
137 |
+-- |
138 |
+2.29.2 |
139 |
+ |
140 |
|
141 |
diff --git a/app-text/poppler/poppler-20.12.0.ebuild b/app-text/poppler/poppler-20.12.0.ebuild |
142 |
new file mode 100644 |
143 |
index 00000000000..17f47a8d243 |
144 |
--- /dev/null |
145 |
+++ b/app-text/poppler/poppler-20.12.0.ebuild |
146 |
@@ -0,0 +1,122 @@ |
147 |
+# Copyright 2005-2020 Gentoo Authors |
148 |
+# Distributed under the terms of the GNU General Public License v2 |
149 |
+ |
150 |
+EAPI=7 |
151 |
+ |
152 |
+inherit cmake toolchain-funcs xdg-utils |
153 |
+ |
154 |
+if [[ ${PV} == *9999* ]] ; then |
155 |
+ inherit git-r3 |
156 |
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" |
157 |
+ SLOT="0/9999" |
158 |
+else |
159 |
+ SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" |
160 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
161 |
+ SLOT="0/105" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
162 |
+fi |
163 |
+ |
164 |
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" |
165 |
+HOMEPAGE="https://poppler.freedesktop.org/" |
166 |
+ |
167 |
+LICENSE="GPL-2" |
168 |
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" |
169 |
+ |
170 |
+# No test data provided |
171 |
+RESTRICT="test" |
172 |
+ |
173 |
+BDEPEND=" |
174 |
+ dev-util/glib-utils |
175 |
+ virtual/pkgconfig |
176 |
+" |
177 |
+DEPEND=" |
178 |
+ media-libs/fontconfig |
179 |
+ media-libs/freetype |
180 |
+ sys-libs/zlib |
181 |
+ cairo? ( |
182 |
+ dev-libs/glib:2 |
183 |
+ x11-libs/cairo |
184 |
+ introspection? ( dev-libs/gobject-introspection:= ) |
185 |
+ ) |
186 |
+ curl? ( net-misc/curl ) |
187 |
+ jpeg? ( virtual/jpeg:0 ) |
188 |
+ jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) |
189 |
+ lcms? ( media-libs/lcms:2 ) |
190 |
+ nss? ( >=dev-libs/nss-3.19:0 ) |
191 |
+ png? ( media-libs/libpng:0= ) |
192 |
+ qt5? ( |
193 |
+ dev-qt/qtcore:5 |
194 |
+ dev-qt/qtgui:5 |
195 |
+ dev-qt/qtxml:5 |
196 |
+ ) |
197 |
+ tiff? ( media-libs/tiff:0 ) |
198 |
+" |
199 |
+RDEPEND="${DEPEND} |
200 |
+ cjk? ( app-text/poppler-data ) |
201 |
+" |
202 |
+ |
203 |
+DOCS=( AUTHORS NEWS README.md README-XPDF ) |
204 |
+ |
205 |
+PATCHES=( |
206 |
+ "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch" |
207 |
+ "${FILESDIR}/${PN}-20.12.0-respect-cflags.patch" |
208 |
+ "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" |
209 |
+) |
210 |
+ |
211 |
+src_prepare() { |
212 |
+ cmake_src_prepare |
213 |
+ |
214 |
+ # Clang doesn't grok this flag, the configure nicely tests that, but |
215 |
+ # cmake just uses it, so remove it if we use clang |
216 |
+ if [[ ${CC} == clang ]] ; then |
217 |
+ sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die |
218 |
+ fi |
219 |
+ |
220 |
+ if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then |
221 |
+ sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ |
222 |
+ -i CMakeLists.txt || die |
223 |
+ else |
224 |
+ einfo "policy(SET CMP0002 OLD) - workaround can be removed" |
225 |
+ fi |
226 |
+} |
227 |
+ |
228 |
+src_configure() { |
229 |
+ xdg_environment_reset |
230 |
+ local mycmakeargs=( |
231 |
+ -DBUILD_GTK_TESTS=OFF |
232 |
+ -DBUILD_QT5_TESTS=OFF |
233 |
+ -DBUILD_CPP_TESTS=OFF |
234 |
+ -DRUN_GPERF_IF_PRESENT=OFF |
235 |
+ -DENABLE_SPLASH=ON |
236 |
+ -DENABLE_ZLIB=ON |
237 |
+ -DENABLE_ZLIB_UNCOMPRESS=OFF |
238 |
+ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON |
239 |
+ -DUSE_FLOAT=OFF |
240 |
+ -DWITH_Cairo=$(usex cairo) |
241 |
+ -DENABLE_LIBCURL=$(usex curl) |
242 |
+ -DENABLE_CPP=$(usex cxx) |
243 |
+ -DWITH_JPEG=$(usex jpeg) |
244 |
+ -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) |
245 |
+ -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) |
246 |
+ -DENABLE_CMS=$(usex lcms lcms2 none) |
247 |
+ -DWITH_NSS3=$(usex nss) |
248 |
+ -DWITH_PNG=$(usex png) |
249 |
+ $(cmake_use_find_package qt5 Qt5Core) |
250 |
+ -DWITH_TIFF=$(usex tiff) |
251 |
+ -DENABLE_UTILS=$(usex utils) |
252 |
+ -DENABLE_QT6=OFF |
253 |
+ ) |
254 |
+ use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) ) |
255 |
+ |
256 |
+ cmake_src_configure |
257 |
+} |
258 |
+ |
259 |
+src_install() { |
260 |
+ cmake_src_install |
261 |
+ |
262 |
+ # live version doesn't provide html documentation |
263 |
+ if use cairo && use doc && [[ ${PV} != *9999* ]]; then |
264 |
+ # For now install gtk-doc there |
265 |
+ insinto /usr/share/gtk-doc/html/poppler |
266 |
+ doins -r "${S}"/glib/reference/html/* |
267 |
+ fi |
268 |
+} |