1 |
commit: afcaa4c7bf59fb9e3b89b88fd03cbb98c1465a42 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 6 15:05:23 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 6 15:29:30 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afcaa4c7 |
7 |
|
8 |
app-text/poppler: Bump to version 0.61.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
11 |
|
12 |
app-text/poppler/Manifest | 1 + |
13 |
.../files/poppler-0.61.0-respect-cflags.patch | 55 ++++++++ |
14 |
app-text/poppler/poppler-0.61.0.ebuild | 146 +++++++++++++++++++++ |
15 |
3 files changed, 202 insertions(+) |
16 |
|
17 |
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest |
18 |
index a12dbceeb42..bd59768ed12 100644 |
19 |
--- a/app-text/poppler/Manifest |
20 |
+++ b/app-text/poppler/Manifest |
21 |
@@ -3,3 +3,4 @@ DIST poppler-0.57.0.tar.xz 1703300 SHA256 0ea37de71b7db78212ebc79df59f99b66409a2 |
22 |
DIST poppler-0.58.0.tar.xz 1710412 SHA256 0e42e46419ae54b02d9f2b527c6475b6011d15816918b9057dfa3aae211af832 SHA512 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee WHIRLPOOL 658f7dfbb786c2e09558f7e89ef0832db4ff32eaef08b7360fbf468236db01b44e33374424df6b64c17f018d7b10f61e151c08026652628d387958143a5a3837 |
23 |
DIST poppler-0.59.0.tar.xz 1712004 SHA256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e WHIRLPOOL 82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2 |
24 |
DIST poppler-0.60.1.tar.xz 1432712 SHA256 19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc WHIRLPOOL fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7 |
25 |
+DIST poppler-0.61.0.tar.xz 1432952 SHA256 53cde17a2afa3b73eb8b209d24e4369b52bfac444065dbb0a8cbcc7356582b7f SHA512 d65a7ed87c8b87ee9a6b15ace90114c1538af29669a0bd6688895876f1fb726d38ddc4f686efdf5a33fc2a950cab10ca032dcd8f42ef5941b3b089239c6b11f5 WHIRLPOOL 56848f1248f42066c3fa76b617c9f24411209376fa088b39ee3a630ffb7a6368fa188050118f17b09af77a4ab6495e310edefc6c4f9dfd2082ef4d57eb902c0f |
26 |
|
27 |
diff --git a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..a75b84b482f |
30 |
--- /dev/null |
31 |
+++ b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch |
32 |
@@ -0,0 +1,55 @@ |
33 |
+--- poppler-0.61.0/cmake/modules/PopplerMacros.cmake |
34 |
++++ poppler-0.61.0/cmake/modules/PopplerMacros.cmake |
35 |
+@@ -98,8 +98,6 @@ |
36 |
+ set(CMAKE_BUILD_TYPE RelWithDebInfo) |
37 |
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) |
38 |
+ |
39 |
+-if(CMAKE_COMPILER_IS_GNUCXX) |
40 |
+- # set the default compile warnings |
41 |
+ set(_warn "-Wall -Wextra -Wpedantic") |
42 |
+ set(_warn "${_warn} -Wno-unused-parameter -Wno-missing-field-initializers") |
43 |
+ set(_warn "${_warn} -Wcast-align") |
44 |
+@@ -124,39 +122,6 @@ |
45 |
+ set(DEFAULT_COMPILE_WARNINGS "${_warn}") |
46 |
+ set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") |
47 |
+ |
48 |
+- set(_save_cxxflags "${CMAKE_CXX_FLAGS}") |
49 |
+- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") |
50 |
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") |
51 |
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") |
52 |
+- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") |
53 |
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") |
54 |
+- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") |
55 |
+- set(_save_cflags "${CMAKE_C_FLAGS}") |
56 |
+- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") |
57 |
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") |
58 |
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") |
59 |
+- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") |
60 |
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}") |
61 |
+- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}") |
62 |
+- |
63 |
+- poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED) |
64 |
+- if(GCC_HAS_AS_NEEDED) |
65 |
+- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed") |
66 |
+- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed") |
67 |
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") |
68 |
+- endif(GCC_HAS_AS_NEEDED) |
69 |
+-endif (CMAKE_COMPILER_IS_GNUCXX) |
70 |
+- |
71 |
+-if(CMAKE_C_COMPILER MATCHES "icc") |
72 |
+- set(_save_cxxflags "${CMAKE_CXX_FLAGS}") |
73 |
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") |
74 |
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") |
75 |
+- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign ${_save_cxxflags}") |
76 |
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cxxflags}") |
77 |
+- set(_save_cflags "${CMAKE_C_FLAGS}") |
78 |
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") |
79 |
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") |
80 |
+- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign ${_save_cflags}") |
81 |
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cflags}") |
82 |
+-endif(CMAKE_C_COMPILER MATCHES "icc") |
83 |
+- |
84 |
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual") |
85 |
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") |
86 |
++ |
87 |
+\ Kein Zeilenumbruch am Dateiende. |
88 |
|
89 |
diff --git a/app-text/poppler/poppler-0.61.0.ebuild b/app-text/poppler/poppler-0.61.0.ebuild |
90 |
new file mode 100644 |
91 |
index 00000000000..2cfa1ed7abe |
92 |
--- /dev/null |
93 |
+++ b/app-text/poppler/poppler-0.61.0.ebuild |
94 |
@@ -0,0 +1,146 @@ |
95 |
+# Copyright 1999-2017 Gentoo Foundation |
96 |
+# Distributed under the terms of the GNU General Public License v2 |
97 |
+ |
98 |
+EAPI=6 |
99 |
+ |
100 |
+inherit cmake-utils toolchain-funcs xdg-utils |
101 |
+ |
102 |
+if [[ "${PV}" == "9999" ]] ; then |
103 |
+ inherit git-r3 |
104 |
+ EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" |
105 |
+ SLOT="0/9999" |
106 |
+else |
107 |
+ SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" |
108 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
109 |
+ SLOT="0/72" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
110 |
+fi |
111 |
+ |
112 |
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" |
113 |
+HOMEPAGE="https://poppler.freedesktop.org/" |
114 |
+ |
115 |
+LICENSE="GPL-2" |
116 |
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils" |
117 |
+ |
118 |
+# No test data provided |
119 |
+RESTRICT="test" |
120 |
+ |
121 |
+COMMON_DEPEND=" |
122 |
+ >=media-libs/fontconfig-2.6.0 |
123 |
+ >=media-libs/freetype-2.3.9 |
124 |
+ sys-libs/zlib |
125 |
+ cairo? ( |
126 |
+ dev-libs/glib:2 |
127 |
+ >=x11-libs/cairo-1.10.0 |
128 |
+ introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) |
129 |
+ ) |
130 |
+ curl? ( net-misc/curl ) |
131 |
+ jpeg? ( virtual/jpeg:0 ) |
132 |
+ jpeg2k? ( media-libs/openjpeg:2= ) |
133 |
+ lcms? ( media-libs/lcms:2 ) |
134 |
+ nss? ( >=dev-libs/nss-3.19:0 ) |
135 |
+ png? ( media-libs/libpng:0= ) |
136 |
+ qt4? ( |
137 |
+ dev-qt/qtcore:4 |
138 |
+ dev-qt/qtgui:4 |
139 |
+ ) |
140 |
+ qt5? ( |
141 |
+ dev-qt/qtcore:5 |
142 |
+ dev-qt/qtgui:5 |
143 |
+ dev-qt/qtxml:5 |
144 |
+ ) |
145 |
+ tiff? ( media-libs/tiff:0 ) |
146 |
+" |
147 |
+DEPEND="${COMMON_DEPEND} |
148 |
+ virtual/pkgconfig |
149 |
+" |
150 |
+RDEPEND="${COMMON_DEPEND} |
151 |
+ cjk? ( >=app-text/poppler-data-0.4.7 ) |
152 |
+" |
153 |
+ |
154 |
+DOCS=(AUTHORS NEWS README README-XPDF) |
155 |
+ |
156 |
+PATCHES=( |
157 |
+ "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch" |
158 |
+ "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" |
159 |
+ "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" |
160 |
+ "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" |
161 |
+ "${FILESDIR}/${PN}-0.40-FindQt4.patch" |
162 |
+) |
163 |
+ |
164 |
+src_prepare() { |
165 |
+ cmake-utils_src_prepare |
166 |
+ |
167 |
+ # Clang doesn't grok this flag, the configure nicely tests that, but |
168 |
+ # cmake just uses it, so remove it if we use clang |
169 |
+ if [[ ${CC} == clang ]] ; then |
170 |
+ sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die |
171 |
+ fi |
172 |
+ |
173 |
+ if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then |
174 |
+ sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ |
175 |
+ -i CMakeLists.txt || die |
176 |
+ else |
177 |
+ einfo "policy(SET CMP0002 OLD) - workaround can be removed" |
178 |
+ fi |
179 |
+ |
180 |
+ if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then |
181 |
+ # we need to up the C++ version, bug #622526 |
182 |
+ export CXX="$(tc-getCXX) -std=c++11" |
183 |
+ fi |
184 |
+} |
185 |
+ |
186 |
+src_configure() { |
187 |
+ xdg_environment_reset |
188 |
+ local mycmakeargs=( |
189 |
+ -DBUILD_GTK_TESTS=OFF |
190 |
+ -DBUILD_QT4_TESTS=OFF |
191 |
+ -DBUILD_QT5_TESTS=OFF |
192 |
+ -DBUILD_CPP_TESTS=OFF |
193 |
+ -DENABLE_SPLASH=ON |
194 |
+ -DENABLE_ZLIB=ON |
195 |
+ -DENABLE_ZLIB_UNCOMPRESS=OFF |
196 |
+ -DENABLE_XPDF_HEADERS=ON |
197 |
+ -DENABLE_LIBCURL="$(usex curl)" |
198 |
+ -DENABLE_CPP="$(usex cxx)" |
199 |
+ -DENABLE_UTILS="$(usex utils)" |
200 |
+ -DSPLASH_CMYK=OFF |
201 |
+ -DUSE_FIXEDPOINT=OFF |
202 |
+ -DUSE_FLOAT=OFF |
203 |
+ -DWITH_Cairo="$(usex cairo)" |
204 |
+ -DWITH_GObjectIntrospection="$(usex introspection)" |
205 |
+ -DWITH_JPEG="$(usex jpeg)" |
206 |
+ -DWITH_NSS3="$(usex nss)" |
207 |
+ -DWITH_PNG="$(usex png)" |
208 |
+ -DWITH_Qt4="$(usex qt4)" |
209 |
+ $(cmake-utils_use_find_package qt5 Qt5Core) |
210 |
+ -DWITH_TIFF="$(usex tiff)" |
211 |
+ ) |
212 |
+ if use jpeg; then |
213 |
+ mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg) |
214 |
+ else |
215 |
+ mycmakeargs+=(-DENABLE_DCTDECODER=none) |
216 |
+ fi |
217 |
+ if use jpeg2k; then |
218 |
+ mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) |
219 |
+ else |
220 |
+ mycmakeargs+=(-DENABLE_LIBOPENJPEG=none) |
221 |
+ fi |
222 |
+ if use lcms; then |
223 |
+ mycmakeargs+=(-DENABLE_CMS=lcms2) |
224 |
+ else |
225 |
+ mycmakeargs+=(-DENABLE_CMS=) |
226 |
+ fi |
227 |
+ |
228 |
+ cmake-utils_src_configure |
229 |
+} |
230 |
+ |
231 |
+src_install() { |
232 |
+ cmake-utils_src_install |
233 |
+ |
234 |
+ # live version doesn't provide html documentation |
235 |
+ if use cairo && use doc && [[ ${PV} != 9999 ]]; then |
236 |
+ # For now install gtk-doc there |
237 |
+ insinto /usr/share/gtk-doc/html/poppler |
238 |
+ doins -r "${S}"/glib/reference/html/* |
239 |
+ fi |
240 |
+} |