| 1 |
commit: bf741d439b77cc0e9bc908032ea764cafd5287b1 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 9 11:53:49 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 9 11:54:09 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf741d43 |
| 7 |
|
| 8 |
app-text/poppler: sync live ebuild with release |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
app-text/poppler/poppler-9999.ebuild | 18 +++++++++++++----- |
| 13 |
1 file changed, 13 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild |
| 16 |
index 4f1e5562753..b0c72bd971c 100644 |
| 17 |
--- a/app-text/poppler/poppler-9999.ebuild |
| 18 |
+++ b/app-text/poppler/poppler-9999.ebuild |
| 19 |
@@ -12,16 +12,14 @@ if [[ "${PV}" == "9999" ]] ; then |
| 20 |
else |
| 21 |
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" |
| 22 |
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" |
| 23 |
- SLOT="0/67" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
| 24 |
+ SLOT="0/68" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
| 25 |
fi |
| 26 |
|
| 27 |
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" |
| 28 |
HOMEPAGE="https://poppler.freedesktop.org/" |
| 29 |
|
| 30 |
LICENSE="GPL-2" |
| 31 |
-IUSE="cairo cairo-qt cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils" |
| 32 |
- |
| 33 |
-REQUIRED_USE="cairo-qt? ( qt4 )" |
| 34 |
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils" |
| 35 |
|
| 36 |
# No test data provided |
| 37 |
RESTRICT="test" |
| 38 |
@@ -84,6 +82,11 @@ src_prepare() { |
| 39 |
else |
| 40 |
einfo "policy(SET CMP0002 OLD) - workaround can be removed" |
| 41 |
fi |
| 42 |
+ |
| 43 |
+ if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then |
| 44 |
+ # we need to up the C++ version, bug #622526 |
| 45 |
+ export CXX="$(tc-getCXX) -std=c++11" |
| 46 |
+ fi |
| 47 |
} |
| 48 |
|
| 49 |
src_configure() { |
| 50 |
@@ -112,10 +115,15 @@ src_configure() { |
| 51 |
$(cmake-utils_use_find_package qt5 Qt5Core) |
| 52 |
-DWITH_TIFF="$(usex tiff)" |
| 53 |
) |
| 54 |
+ if use jpeg; then |
| 55 |
+ mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg) |
| 56 |
+ else |
| 57 |
+ mycmakeargs+=(-DENABLE_DCTDECODER=none) |
| 58 |
+ fi |
| 59 |
if use jpeg2k; then |
| 60 |
mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) |
| 61 |
else |
| 62 |
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=) |
| 63 |
+ mycmakeargs+=(-DENABLE_LIBOPENJPEG=none) |
| 64 |
fi |
| 65 |
if use lcms; then |
| 66 |
mycmakeargs+=(-DENABLE_CMS=lcms2) |
Archives