commit: 6e99dcafb6cc2e93356e54eae4c101f664974dff
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 04:25:04 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jul 25 07:55:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e99dcaf
app-text/poppler: Remove IUSE=+splash; Add USE=boost
Upstream poppler removed the configuration knob for the Splash backend
in upstream commit ce0bd9bf6f41 ("Remove ENABLE_SPLASH and HAVE_SPLASH
(always true)"). This commit is included in 21.07, but we go ahead and
remove IUSE=+splash from 21.06 because for example Qt-support relies on
it (see bug #795888).
Enabling Boost is recommended by upstream (see
https://gitlab.freedesktop.org/poppler/poppler/-/issues/1080) because it
enables a "serious performance gain", but if we did that people would
scream.
Closes: https://bugs.gentoo.org/795888
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
app-text/poppler/metadata.xml | 2 +-
app-text/poppler/poppler-21.06.1.ebuild | 9 ++++-----
app-text/poppler/poppler-21.07.0.ebuild | 8 +++-----
app-text/poppler/poppler-9999.ebuild | 8 +++-----
4 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 91f9161a0e0..c2171ad4189 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -21,8 +21,8 @@
<remote-id type="cpe">cpe:/a:freedesktop:poppler</remote-id>
</upstream>
<use>
+ <flag name="boost">Use boost::small_vector for a serious performance
gain</flag>
<flag name="nss">Enable signatures handling with
<pkg>dev-libs/nss</pkg></flag>
- <flag name="splash">Build the Splash graphics backend (requires
<pkg>dev-libs/boost</pkg>)</flag>
<flag name="utils">Install command-line PDF converters and various
utilities.</flag>
</use>
<slots>
diff --git a/app-text/poppler/poppler-21.06.1.ebuild
b/app-text/poppler/poppler-21.06.1.ebuild
index 048302fba12..efd4780f0a1 100644
--- a/app-text/poppler/poppler-21.06.1.ebuild
+++ b/app-text/poppler/poppler-21.06.1.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="PDF rendering library based on the xpdf-3.0 code
base"
HOMEPAGE="https://poppler.freedesktop.org/";
LICENSE="GPL-2"
-IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png
qt5 +splash tiff +utils"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms
nss png qt5 tiff +utils"
# No test data provided
RESTRICT="test"
@@ -54,7 +54,7 @@ RDEPEND="${DEPEND}
cjk? ( app-text/poppler-data )
"
DEPEND+="
- splash? ( dev-libs/boost )
+ boost? ( dev-libs/boost )
"
DOCS=( AUTHORS NEWS README.md README-XPDF )
@@ -90,9 +90,8 @@ src_configure() {
-DBUILD_CPP_TESTS=OFF
-DBUILD_MANUAL_TESTS=OFF
-DRUN_GPERF_IF_PRESENT=OFF
- # Required for SPLASH
- -DENABLE_BOOST="$(usex splash)"
- -DENABLE_SPLASH="$(usex splash)"
+ -DENABLE_BOOST="$(usex boost)"
+ -DENABLE_SPLASH=ON
-DENABLE_ZLIB=ON
-DENABLE_ZLIB_UNCOMPRESS=OFF
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
diff --git a/app-text/poppler/poppler-21.07.0.ebuild
b/app-text/poppler/poppler-21.07.0.ebuild
index 5730019c602..46958229f51 100644
--- a/app-text/poppler/poppler-21.07.0.ebuild
+++ b/app-text/poppler/poppler-21.07.0.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="PDF rendering library based on the xpdf-3.0 code
base"
HOMEPAGE="https://poppler.freedesktop.org/";
LICENSE="GPL-2"
-IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png
qt5 +splash tiff +utils"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms
nss png qt5 tiff +utils"
# No test data provided
RESTRICT="test"
@@ -54,7 +54,7 @@ RDEPEND="${DEPEND}
cjk? ( app-text/poppler-data )
"
DEPEND+="
- splash? ( dev-libs/boost )
+ boost? ( dev-libs/boost )
"
DOCS=( AUTHORS NEWS README.md README-XPDF )
@@ -90,9 +90,7 @@ src_configure() {
-DBUILD_CPP_TESTS=OFF
-DBUILD_MANUAL_TESTS=OFF
-DRUN_GPERF_IF_PRESENT=OFF
- # Required for SPLASH
- -DENABLE_BOOST="$(usex splash)"
- -DENABLE_SPLASH="$(usex splash)"
+ -DENABLE_BOOST="$(usex boost)"
-DENABLE_ZLIB=ON
-DENABLE_ZLIB_UNCOMPRESS=OFF
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
diff --git a/app-text/poppler/poppler-9999.ebuild
b/app-text/poppler/poppler-9999.ebuild
index 048302fba12..a7d99002f54 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="PDF rendering library based on the xpdf-3.0 code
base"
HOMEPAGE="https://poppler.freedesktop.org/";
LICENSE="GPL-2"
-IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png
qt5 +splash tiff +utils"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms
nss png qt5 tiff +utils"
# No test data provided
RESTRICT="test"
@@ -54,7 +54,7 @@ RDEPEND="${DEPEND}
cjk? ( app-text/poppler-data )
"
DEPEND+="
- splash? ( dev-libs/boost )
+ boost? ( dev-libs/boost )
"
DOCS=( AUTHORS NEWS README.md README-XPDF )
@@ -90,9 +90,7 @@ src_configure() {
-DBUILD_CPP_TESTS=OFF
-DBUILD_MANUAL_TESTS=OFF
-DRUN_GPERF_IF_PRESENT=OFF
- # Required for SPLASH
- -DENABLE_BOOST="$(usex splash)"
- -DENABLE_SPLASH="$(usex splash)"
+ -DENABLE_BOOST="$(usex boost)"
-DENABLE_ZLIB=ON
-DENABLE_ZLIB_UNCOMPRESS=OFF
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
