Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/
Date: Mon, 04 Dec 2017 14:29:12
Message-Id: 1512397616.d6734e9a0a0db3d7b28deffc35b876695643b14d.polynomial-c@gentoo
1 commit: d6734e9a0a0db3d7b28deffc35b876695643b14d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 4 14:26:56 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 4 14:26:56 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6734e9a
7
8 app-text/poppler: Bump to version 0.62.0
9
10 Package-Manager: Portage-2.3.16, Repoman-2.3.6
11
12 app-text/poppler/Manifest | 3 +-
13 .../poppler/files/poppler-0.62.0-openjpeg2.patch | 14 +++
14 app-text/poppler/poppler-0.62.0.ebuild | 139 +++++++++++++++++++++
15 3 files changed, 155 insertions(+), 1 deletion(-)
16
17 diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
18 index 15244e7da33..87dea90af9d 100644
19 --- a/app-text/poppler/Manifest
20 +++ b/app-text/poppler/Manifest
21 @@ -2,4 +2,5 @@ DIST poppler-0.57.0.tar.xz 1703300 BLAKE2B e4126dff2e0ee140fa4c5c30d5a57da5aff38
22 DIST poppler-0.58.0.tar.xz 1710412 BLAKE2B ac2558503f86e8f0729d9ee5e4bc6c59dc9a4abca2e94b4e94b27b139dcb237b608af70b011b6f042a06d18ce83e32593f5b3d28876ee2606d7e63bc9230e51e SHA512 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee
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.1.tar.xz 1433696 SHA256 1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9 SHA512 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d WHIRLPOOL 9d41a9c2ae551f71a82cdae763a4d9c032977c1140fb89f619b912169f9c48c6b310bba38b0138de16c5af04cb46f0f58c57c60a15a648fefcd92cee8c8583df
26 +DIST poppler-0.61.1.tar.xz 1433696 BLAKE2B 6749466223d3bb0e891c6b26c7f1faa5c774dd47ac94c22474efe4a52af228aeb2abbb8ab268667acaa83fb41293246266124a111740df764eeedbe229fa70aa SHA512 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d
27 +DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
28
29 diff --git a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
30 new file mode 100644
31 index 00000000000..789090cc9b2
32 --- /dev/null
33 +++ b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
34 @@ -0,0 +1,14 @@
35 +Sadly the CMake side of openjpeg slotting in Gentoo is broken.
36 +To reliably find openjpeg:2 we need to use pkg-config.
37 +
38 +--- poppler-0.62.0/CMakeLists.txt
39 ++++ poppler-0.62.0/CMakeLists.txt
40 +@@ -193,7 +193,7 @@
41 + endif()
42 + set(WITH_OPENJPEG FALSE)
43 + if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
44 +- find_package(LIBOPENJPEG2)
45 ++ pkg_check_modules(LIBOPENJPEG2 libopenjp2)
46 + set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
47 + if(NOT LIBOPENJPEG2_FOUND)
48 + message(FATAL_ERROR "Install libopenjpeg2 before trying to build poppler. You can also decide to use the internal unmaintained JPX decoder or none at all.")
49
50 diff --git a/app-text/poppler/poppler-0.62.0.ebuild b/app-text/poppler/poppler-0.62.0.ebuild
51 new file mode 100644
52 index 00000000000..317b923ddd9
53 --- /dev/null
54 +++ b/app-text/poppler/poppler-0.62.0.ebuild
55 @@ -0,0 +1,139 @@
56 +# Copyright 1999-2017 Gentoo Foundation
57 +# Distributed under the terms of the GNU General Public License v2
58 +
59 +EAPI=6
60 +
61 +inherit cmake-utils toolchain-funcs xdg-utils
62 +
63 +if [[ "${PV}" == "9999" ]] ; then
64 + inherit git-r3
65 + EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
66 + SLOT="0/9999"
67 +else
68 + SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
69 + 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"
70 + SLOT="0/72" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
71 +fi
72 +
73 +DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
74 +HOMEPAGE="https://poppler.freedesktop.org/"
75 +
76 +LICENSE="GPL-2"
77 +IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
78 +
79 +# No test data provided
80 +RESTRICT="test"
81 +
82 +COMMON_DEPEND="
83 + >=media-libs/fontconfig-2.6.0
84 + >=media-libs/freetype-2.3.9
85 + sys-libs/zlib
86 + cairo? (
87 + dev-libs/glib:2
88 + >=x11-libs/cairo-1.10.0
89 + introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
90 + )
91 + curl? ( net-misc/curl )
92 + jpeg? ( virtual/jpeg:0 )
93 + jpeg2k? ( media-libs/openjpeg:2= )
94 + lcms? ( media-libs/lcms:2 )
95 + nss? ( >=dev-libs/nss-3.19:0 )
96 + png? ( media-libs/libpng:0= )
97 + qt5? (
98 + dev-qt/qtcore:5
99 + dev-qt/qtgui:5
100 + dev-qt/qtxml:5
101 + )
102 + tiff? ( media-libs/tiff:0 )
103 +"
104 +DEPEND="${COMMON_DEPEND}
105 + virtual/pkgconfig
106 +"
107 +RDEPEND="${COMMON_DEPEND}
108 + cjk? ( >=app-text/poppler-data-0.4.7 )
109 +"
110 +
111 +DOCS=(AUTHORS NEWS README README-XPDF)
112 +
113 +PATCHES=(
114 + "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
115 + "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
116 + "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
117 + "${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
118 +)
119 +
120 +src_prepare() {
121 + cmake-utils_src_prepare
122 +
123 + # Clang doesn't grok this flag, the configure nicely tests that, but
124 + # cmake just uses it, so remove it if we use clang
125 + if [[ ${CC} == clang ]] ; then
126 + sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
127 + fi
128 +
129 + if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
130 + sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
131 + -i CMakeLists.txt || die
132 + else
133 + einfo "policy(SET CMP0002 OLD) - workaround can be removed"
134 + fi
135 +
136 + if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
137 + # we need to up the C++ version, bug #622526
138 + export CXX="$(tc-getCXX) -std=c++11"
139 + fi
140 +}
141 +
142 +src_configure() {
143 + xdg_environment_reset
144 + local mycmakeargs=(
145 + -DBUILD_GTK_TESTS=OFF
146 + -DBUILD_QT5_TESTS=OFF
147 + -DBUILD_CPP_TESTS=OFF
148 + -DENABLE_SPLASH=ON
149 + -DENABLE_ZLIB=ON
150 + -DENABLE_ZLIB_UNCOMPRESS=OFF
151 + -DENABLE_XPDF_HEADERS=ON
152 + -DENABLE_LIBCURL="$(usex curl)"
153 + -DENABLE_CPP="$(usex cxx)"
154 + -DENABLE_UTILS="$(usex utils)"
155 + -DSPLASH_CMYK=OFF
156 + -DUSE_FIXEDPOINT=OFF
157 + -DUSE_FLOAT=OFF
158 + -DWITH_Cairo="$(usex cairo)"
159 + -DWITH_GObjectIntrospection="$(usex introspection)"
160 + -DWITH_JPEG="$(usex jpeg)"
161 + -DWITH_NSS3="$(usex nss)"
162 + -DWITH_PNG="$(usex png)"
163 + $(cmake-utils_use_find_package qt5 Qt5Core)
164 + -DWITH_TIFF="$(usex tiff)"
165 + )
166 + if use jpeg; then
167 + mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
168 + else
169 + mycmakeargs+=(-DENABLE_DCTDECODER=none)
170 + fi
171 + if use jpeg2k; then
172 + mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
173 + else
174 + mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
175 + fi
176 + if use lcms; then
177 + mycmakeargs+=(-DENABLE_CMS=lcms2)
178 + else
179 + mycmakeargs+=(-DENABLE_CMS=)
180 + fi
181 +
182 + cmake-utils_src_configure
183 +}
184 +
185 +src_install() {
186 + cmake-utils_src_install
187 +
188 + # live version doesn't provide html documentation
189 + if use cairo && use doc && [[ ${PV} != 9999 ]]; then
190 + # For now install gtk-doc there
191 + insinto /usr/share/gtk-doc/html/poppler
192 + doins -r "${S}"/glib/reference/html/*
193 + fi
194 +}