Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/
Date: Sun, 25 Jul 2021 07:56:30
Message-Id: 1627199758.6e99dcafb6cc2e93356e54eae4c101f664974dff.mattst88@gentoo
1 commit: 6e99dcafb6cc2e93356e54eae4c101f664974dff
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 25 04:25:04 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 25 07:55:58 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e99dcaf
7
8 app-text/poppler: Remove IUSE=+splash; Add USE=boost
9
10 Upstream poppler removed the configuration knob for the Splash backend
11 in upstream commit ce0bd9bf6f41 ("Remove ENABLE_SPLASH and HAVE_SPLASH
12 (always true)"). This commit is included in 21.07, but we go ahead and
13 remove IUSE=+splash from 21.06 because for example Qt-support relies on
14 it (see bug #795888).
15
16 Enabling Boost is recommended by upstream (see
17 https://gitlab.freedesktop.org/poppler/poppler/-/issues/1080) because it
18 enables a "serious performance gain", but if we did that people would
19 scream.
20
21 Closes: https://bugs.gentoo.org/795888
22 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
23
24 app-text/poppler/metadata.xml | 2 +-
25 app-text/poppler/poppler-21.06.1.ebuild | 9 ++++-----
26 app-text/poppler/poppler-21.07.0.ebuild | 8 +++-----
27 app-text/poppler/poppler-9999.ebuild | 8 +++-----
28 4 files changed, 11 insertions(+), 16 deletions(-)
29
30 diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
31 index 91f9161a0e0..c2171ad4189 100644
32 --- a/app-text/poppler/metadata.xml
33 +++ b/app-text/poppler/metadata.xml
34 @@ -21,8 +21,8 @@
35 <remote-id type="cpe">cpe:/a:freedesktop:poppler</remote-id>
36 </upstream>
37 <use>
38 + <flag name="boost">Use boost::small_vector for a serious performance gain</flag>
39 <flag name="nss">Enable signatures handling with <pkg>dev-libs/nss</pkg></flag>
40 - <flag name="splash">Build the Splash graphics backend (requires <pkg>dev-libs/boost</pkg>)</flag>
41 <flag name="utils">Install command-line PDF converters and various utilities.</flag>
42 </use>
43 <slots>
44
45 diff --git a/app-text/poppler/poppler-21.06.1.ebuild b/app-text/poppler/poppler-21.06.1.ebuild
46 index 048302fba12..efd4780f0a1 100644
47 --- a/app-text/poppler/poppler-21.06.1.ebuild
48 +++ b/app-text/poppler/poppler-21.06.1.ebuild
49 @@ -19,7 +19,7 @@ DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
50 HOMEPAGE="https://poppler.freedesktop.org/"
51
52 LICENSE="GPL-2"
53 -IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 +splash tiff +utils"
54 +IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
55
56 # No test data provided
57 RESTRICT="test"
58 @@ -54,7 +54,7 @@ RDEPEND="${DEPEND}
59 cjk? ( app-text/poppler-data )
60 "
61 DEPEND+="
62 - splash? ( dev-libs/boost )
63 + boost? ( dev-libs/boost )
64 "
65
66 DOCS=( AUTHORS NEWS README.md README-XPDF )
67 @@ -90,9 +90,8 @@ src_configure() {
68 -DBUILD_CPP_TESTS=OFF
69 -DBUILD_MANUAL_TESTS=OFF
70 -DRUN_GPERF_IF_PRESENT=OFF
71 - # Required for SPLASH
72 - -DENABLE_BOOST="$(usex splash)"
73 - -DENABLE_SPLASH="$(usex splash)"
74 + -DENABLE_BOOST="$(usex boost)"
75 + -DENABLE_SPLASH=ON
76 -DENABLE_ZLIB=ON
77 -DENABLE_ZLIB_UNCOMPRESS=OFF
78 -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
79
80 diff --git a/app-text/poppler/poppler-21.07.0.ebuild b/app-text/poppler/poppler-21.07.0.ebuild
81 index 5730019c602..46958229f51 100644
82 --- a/app-text/poppler/poppler-21.07.0.ebuild
83 +++ b/app-text/poppler/poppler-21.07.0.ebuild
84 @@ -19,7 +19,7 @@ DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
85 HOMEPAGE="https://poppler.freedesktop.org/"
86
87 LICENSE="GPL-2"
88 -IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 +splash tiff +utils"
89 +IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
90
91 # No test data provided
92 RESTRICT="test"
93 @@ -54,7 +54,7 @@ RDEPEND="${DEPEND}
94 cjk? ( app-text/poppler-data )
95 "
96 DEPEND+="
97 - splash? ( dev-libs/boost )
98 + boost? ( dev-libs/boost )
99 "
100
101 DOCS=( AUTHORS NEWS README.md README-XPDF )
102 @@ -90,9 +90,7 @@ src_configure() {
103 -DBUILD_CPP_TESTS=OFF
104 -DBUILD_MANUAL_TESTS=OFF
105 -DRUN_GPERF_IF_PRESENT=OFF
106 - # Required for SPLASH
107 - -DENABLE_BOOST="$(usex splash)"
108 - -DENABLE_SPLASH="$(usex splash)"
109 + -DENABLE_BOOST="$(usex boost)"
110 -DENABLE_ZLIB=ON
111 -DENABLE_ZLIB_UNCOMPRESS=OFF
112 -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
113
114 diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
115 index 048302fba12..a7d99002f54 100644
116 --- a/app-text/poppler/poppler-9999.ebuild
117 +++ b/app-text/poppler/poppler-9999.ebuild
118 @@ -19,7 +19,7 @@ DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
119 HOMEPAGE="https://poppler.freedesktop.org/"
120
121 LICENSE="GPL-2"
122 -IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 +splash tiff +utils"
123 +IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
124
125 # No test data provided
126 RESTRICT="test"
127 @@ -54,7 +54,7 @@ RDEPEND="${DEPEND}
128 cjk? ( app-text/poppler-data )
129 "
130 DEPEND+="
131 - splash? ( dev-libs/boost )
132 + boost? ( dev-libs/boost )
133 "
134
135 DOCS=( AUTHORS NEWS README.md README-XPDF )
136 @@ -90,9 +90,7 @@ src_configure() {
137 -DBUILD_CPP_TESTS=OFF
138 -DBUILD_MANUAL_TESTS=OFF
139 -DRUN_GPERF_IF_PRESENT=OFF
140 - # Required for SPLASH
141 - -DENABLE_BOOST="$(usex splash)"
142 - -DENABLE_SPLASH="$(usex splash)"
143 + -DENABLE_BOOST="$(usex boost)"
144 -DENABLE_ZLIB=ON
145 -DENABLE_ZLIB_UNCOMPRESS=OFF
146 -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
Report Message
Find on MARC Find on Google Groups