1 |
commit: 9c7be06f13a9bb7b07fe368a22ad78549884ceb5 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 3 01:43:04 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 3 01:43:04 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c7be06f |
7 |
|
8 |
Revert "media-gfx/inkscape: update Poppler 22.09.0 patch" |
9 |
|
10 |
Didn't mean to push. |
11 |
|
12 |
This reverts commit 767edb76006523baca227ff79909323ec202583d. |
13 |
|
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
.../files/inkscape-1.2.1-poppler-22.09.0.patch | 2 +- |
17 |
media-gfx/inkscape/inkscape-1.2.1-r1.ebuild | 193 --------------------- |
18 |
...scape-1.2.1-r2.ebuild => inkscape-1.2.1.ebuild} | 0 |
19 |
3 files changed, 1 insertion(+), 194 deletions(-) |
20 |
|
21 |
diff --git a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch |
22 |
index 80d071d51b0b..87583019d6e3 100644 |
23 |
--- a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch |
24 |
+++ b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch |
25 |
@@ -43,7 +43,7 @@ Signed-off-by: Sam James <sam@g.o> |
26 |
} |
27 |
} |
28 |
+#if POPPLER_CHECK_VERSION(22, 9, 0) |
29 |
-+ state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum()); |
30 |
++ state->setLineDash(std::vector<double> (*dash, length), args[1].getNum()); |
31 |
+#else |
32 |
state->setLineDash(dash, length, args[1].getNum()); |
33 |
+#endif |
34 |
|
35 |
diff --git a/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild |
36 |
deleted file mode 100644 |
37 |
index e2183428d93b..000000000000 |
38 |
--- a/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,193 +0,0 @@ |
41 |
-# Copyright 1999-2022 Gentoo Authors |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
- |
44 |
-EAPI=8 |
45 |
- |
46 |
-PYTHON_COMPAT=( python3_{8..10} ) |
47 |
-PYTHON_REQ_USE="xml(+)" |
48 |
-MY_P="${P/_/}" |
49 |
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 |
50 |
- |
51 |
-if [[ ${PV} = 9999* ]]; then |
52 |
- inherit git-r3 |
53 |
- EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" |
54 |
-else |
55 |
- SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" |
56 |
- KEYWORDS="~alpha ~amd64" |
57 |
-fi |
58 |
- |
59 |
-DESCRIPTION="SVG based generic vector-drawing program" |
60 |
-HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/" |
61 |
- |
62 |
-LICENSE="GPL-2 LGPL-2.1" |
63 |
-SLOT="0" |
64 |
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg |
65 |
-openmp postscript readline spell svg2 test visio wpg X" |
66 |
- |
67 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
68 |
- |
69 |
-BDEPEND=" |
70 |
- dev-util/glib-utils |
71 |
- >=dev-util/intltool-0.40 |
72 |
- >=sys-devel/gettext-0.17 |
73 |
- virtual/pkgconfig |
74 |
- test? ( virtual/imagemagick-tools ) |
75 |
-" |
76 |
-COMMON_DEPEND="${PYTHON_DEPS} |
77 |
- >=app-text/poppler-0.57.0:=[cairo] |
78 |
- >=dev-cpp/cairomm-1.12:0 |
79 |
- >=dev-cpp/glibmm-2.54.1:2 |
80 |
- dev-cpp/gtkmm:3.0 |
81 |
- >=dev-cpp/pangomm-2.40:1.4 |
82 |
- >=dev-libs/boehm-gc-7.1:= |
83 |
- >=dev-libs/boost-1.65:= |
84 |
- dev-libs/double-conversion:= |
85 |
- >=dev-libs/glib-2.41 |
86 |
- >=dev-libs/libsigc++-2.8:2 |
87 |
- >=dev-libs/libxml2-2.7.4 |
88 |
- >=dev-libs/libxslt-1.1.25 |
89 |
- dev-libs/gdl:3 |
90 |
- dev-libs/popt |
91 |
- media-gfx/potrace |
92 |
- media-libs/fontconfig |
93 |
- media-libs/freetype:2 |
94 |
- media-libs/lcms:2 |
95 |
- media-libs/libpng:0= |
96 |
- net-libs/libsoup:2.4 |
97 |
- sci-libs/gsl:= |
98 |
- >=x11-libs/pango-1.44 |
99 |
- x11-libs/gtk+:3[X?] |
100 |
- X? ( x11-libs/libX11 ) |
101 |
- $(python_gen_cond_dep ' |
102 |
- dev-python/cachecontrol[${PYTHON_USEDEP}] |
103 |
- dev-python/cssselect[${PYTHON_USEDEP}] |
104 |
- dev-python/lockfile[${PYTHON_USEDEP}] |
105 |
- dev-python/lxml[${PYTHON_USEDEP}] |
106 |
- media-gfx/scour[${PYTHON_USEDEP}] |
107 |
- ') |
108 |
- cdr? ( |
109 |
- app-text/libwpg:0.3 |
110 |
- dev-libs/librevenge |
111 |
- media-libs/libcdr |
112 |
- ) |
113 |
- exif? ( media-libs/libexif ) |
114 |
- imagemagick? ( |
115 |
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) |
116 |
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
117 |
- ) |
118 |
- jemalloc? ( dev-libs/jemalloc ) |
119 |
- jpeg? ( media-libs/libjpeg-turbo:= ) |
120 |
- readline? ( sys-libs/readline:= ) |
121 |
- spell? ( app-text/gspell ) |
122 |
- visio? ( |
123 |
- app-text/libwpg:0.3 |
124 |
- dev-libs/librevenge |
125 |
- media-libs/libvisio |
126 |
- ) |
127 |
- wpg? ( |
128 |
- app-text/libwpg:0.3 |
129 |
- dev-libs/librevenge |
130 |
- ) |
131 |
-" |
132 |
-# These only use executables provided by these packages |
133 |
-# See share/extensions for more details. inkscape can tell you to |
134 |
-# install these so we could of course just not depend on those and rely |
135 |
-# on that. |
136 |
-RDEPEND="${COMMON_DEPEND} |
137 |
- $(python_gen_cond_dep ' |
138 |
- dev-python/numpy[${PYTHON_USEDEP}] |
139 |
- ') |
140 |
- dia? ( app-office/dia ) |
141 |
- postscript? ( app-text/ghostscript-gpl ) |
142 |
-" |
143 |
-DEPEND="${COMMON_DEPEND} |
144 |
- test? ( dev-cpp/gtest ) |
145 |
-" |
146 |
- |
147 |
-RESTRICT="!test? ( test )" |
148 |
- |
149 |
-S="${WORKDIR}/${MY_P}" |
150 |
- |
151 |
-pkg_pretend() { |
152 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
153 |
-} |
154 |
- |
155 |
-pkg_setup() { |
156 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
157 |
- python-single-r1_pkg_setup |
158 |
-} |
159 |
- |
160 |
-src_unpack() { |
161 |
- if [[ ${PV} = 9999* ]]; then |
162 |
- git-r3_src_unpack |
163 |
- else |
164 |
- default |
165 |
- fi |
166 |
- [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die |
167 |
-} |
168 |
- |
169 |
-src_prepare() { |
170 |
- cmake_src_prepare |
171 |
- sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die |
172 |
-} |
173 |
- |
174 |
-src_configure() { |
175 |
- # aliasing unsafe wrt #310393 |
176 |
- append-flags -fno-strict-aliasing |
177 |
- |
178 |
- local mycmakeargs=( |
179 |
- # -DWITH_LPETOOL # Compile with LPE Tool and experimental LPEs enabled |
180 |
- -DWITH_NLS=ON |
181 |
- -DENABLE_POPPLER=ON |
182 |
- -DENABLE_POPPLER_CAIRO=ON |
183 |
- -DWITH_PROFILING=OFF |
184 |
- -DWITH_INTERNAL_2GEOM=ON |
185 |
- -DBUILD_TESTING=$(usex test) |
186 |
- -DWITH_LIBCDR=$(usex cdr) |
187 |
- -DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled |
188 |
- -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick |
189 |
- -DWITH_GNU_READLINE=$(usex readline) |
190 |
- -DWITH_GSPELL=$(usex spell) |
191 |
- -DWITH_JEMALLOC=$(usex jemalloc) |
192 |
- -DENABLE_LCMS=ON |
193 |
- -DWITH_OPENMP=$(usex openmp) |
194 |
- -DBUILD_SHARED_LIBS=ON |
195 |
- -DWITH_SVG2=$(usex svg2) |
196 |
- -DWITH_LIBVISIO=$(usex visio) |
197 |
- -DWITH_LIBWPG=$(usex wpg) |
198 |
- -DWITH_X11=$(usex X) |
199 |
- ) |
200 |
- |
201 |
- cmake_src_configure |
202 |
-} |
203 |
- |
204 |
-src_test() { |
205 |
- local myctestargs=( |
206 |
- # render_text*: needs patched Cairo / maybe upstream changes |
207 |
- # not yet in a release. |
208 |
- # test_lpe/test_lpe64: precision differences b/c of new GCC? |
209 |
- # cli_export-png-color-mode-gray-8_png_check_output: ditto? |
210 |
- -E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)" |
211 |
- ) |
212 |
- |
213 |
- cmake_src_test -j1 |
214 |
-} |
215 |
- |
216 |
-src_install() { |
217 |
- cmake_src_install |
218 |
- |
219 |
- find "${ED}" -type f -name "*.la" -delete || die |
220 |
- |
221 |
- find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die |
222 |
- |
223 |
- find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die |
224 |
- |
225 |
- local extdir="${ED}"/usr/share/${PN}/extensions |
226 |
- |
227 |
- if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then |
228 |
- python_optimize "${ED}"/usr/share/${PN}/extensions |
229 |
- fi |
230 |
- |
231 |
- # Empty directory causes sandbox issues, see bug #761915 |
232 |
- rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory." |
233 |
-} |
234 |
|
235 |
diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1.ebuild |
236 |
similarity index 100% |
237 |
rename from media-gfx/inkscape/inkscape-1.2.1-r2.ebuild |
238 |
rename to media-gfx/inkscape/inkscape-1.2.1.ebuild |