1 |
commit: c64d6cb6607ce44d0857d0c21a4866fd85ec78c9 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 2 08:17:17 2020 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 2 08:18:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c64d6cb6 |
7 |
|
8 |
media-gfx/inkscape: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.23 |
11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
12 |
|
13 |
media-gfx/inkscape/Manifest | 1 - |
14 |
.../inkscape/files/inkscape-0.48.4-epython.patch | 11 -- |
15 |
.../files/inkscape-0.91_pre3-cppflags.patch | 14 -- |
16 |
.../inkscape/files/inkscape-0.91_pre3-exif.patch | 12 -- |
17 |
.../inkscape/files/inkscape-0.91_pre3-sk-man.patch | 15 -- |
18 |
.../inkscape/files/inkscape-0.92.1-automagic.patch | 154 ------------------- |
19 |
.../inkscape/files/inkscape-0.92.1-desktop.patch | 12 -- |
20 |
.../files/inkscape-0.92.4-glibmm-2.62.patch | 14 -- |
21 |
.../files/inkscape-0.92.4-poppler-0.76.0.patch | 44 ------ |
22 |
.../files/inkscape-0.92.4-poppler-0.82.0.patch | 76 ---------- |
23 |
.../files/inkscape-0.92.4-poppler-0.83.0.patch | 92 ------------ |
24 |
media-gfx/inkscape/inkscape-0.92.4-r3.ebuild | 166 --------------------- |
25 |
media-gfx/inkscape/metadata.xml | 2 - |
26 |
13 files changed, 613 deletions(-) |
27 |
|
28 |
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest |
29 |
index 88b7c565b70..7007e82d78c 100644 |
30 |
--- a/media-gfx/inkscape/Manifest |
31 |
+++ b/media-gfx/inkscape/Manifest |
32 |
@@ -1,2 +1 @@ |
33 |
-DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120 |
34 |
DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0 |
35 |
|
36 |
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch b/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch |
37 |
deleted file mode 100644 |
38 |
index 2e2483c1b1e..00000000000 |
39 |
--- a/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch |
40 |
+++ /dev/null |
41 |
@@ -1,11 +0,0 @@ |
42 |
---- inkscape-0.48.4/src/extension/implementation/script.cpp |
43 |
-+++ inkscape-0.48.4/src/extension/implementation/script.cpp |
44 |
-@@ -89,7 +89,7 @@ |
45 |
- #ifdef WIN32 |
46 |
- {"python", "python-interpreter", "pythonw" }, |
47 |
- #else |
48 |
-- {"python", "python-interpreter", "python" }, |
49 |
-+ {"python", "python-interpreter", "@EPYTHON@" }, |
50 |
- #endif |
51 |
- {"ruby", "ruby-interpreter", "ruby" }, |
52 |
- {"shell", "shell-interpreter", "sh" }, |
53 |
|
54 |
diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch |
55 |
deleted file mode 100644 |
56 |
index 94dbf881de0..00000000000 |
57 |
--- a/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch |
58 |
+++ /dev/null |
59 |
@@ -1,14 +0,0 @@ |
60 |
-Gentoo enables _FORTIFY_SOURCE by default so this avoids redefined warnings. |
61 |
- |
62 |
---- inkscape-0.91pre3/configure.ac |
63 |
-+++ inkscape-0.91pre3/configure.ac |
64 |
-@@ -72,9 +72,6 @@ |
65 |
- #### |
66 |
- # Generic cpp flags... |
67 |
- |
68 |
-- # What is just plain "-W" ? |
69 |
-- # Fortify source requires -O2 or higher, which is handled with newer autoconf |
70 |
-- CPPFLAGS="-W -D_FORTIFY_SOURCE=2 $CPPFLAGS" |
71 |
- # Enable format and format security warnings |
72 |
- CPPFLAGS="-Wformat -Wformat-security $CPPFLAGS" |
73 |
- # Enable all default warnings |
74 |
|
75 |
diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-exif.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-exif.patch |
76 |
deleted file mode 100644 |
77 |
index 4180fd4d2ef..00000000000 |
78 |
--- a/media-gfx/inkscape/files/inkscape-0.91_pre3-exif.patch |
79 |
+++ /dev/null |
80 |
@@ -1,12 +0,0 @@ |
81 |
-Actually try to use EXIF support if it's enabled. |
82 |
- |
83 |
---- inkscape-0.91pre3/src/extension/internal/image-resolution.cpp |
84 |
-+++ inkscape-0.91pre3/src/extension/internal/image-resolution.cpp |
85 |
-@@ -18,6 +18,7 @@ |
86 |
- #include <png.h> |
87 |
- |
88 |
- #ifdef HAVE_EXIF |
89 |
-+#define IR_TRY_EXIF 1 |
90 |
- #include <math.h> |
91 |
- #include <libexif/exif-data.h> |
92 |
- #endif |
93 |
|
94 |
diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch |
95 |
deleted file mode 100644 |
96 |
index f14e7d152e1..00000000000 |
97 |
--- a/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch |
98 |
+++ /dev/null |
99 |
@@ -1,15 +0,0 @@ |
100 |
-Install sk man page to the right directory. |
101 |
- |
102 |
-https://bugs.gentoo.org/show_bug.cgi?id=481276 |
103 |
- |
104 |
---- inkscape-0.91pre3/Makefile.am |
105 |
-+++ inkscape-0.91pre3/Makefile.am |
106 |
-@@ -561,7 +561,7 @@ |
107 |
- manja_DATA = inkscape.ja.1 |
108 |
- manjadir = $(mandir)/ja/man1 |
109 |
- |
110 |
--mansk_DATA = inkscape.ja.1 |
111 |
-+mansk_DATA = inkscape.sk.1 |
112 |
- manskdir = $(mandir)/sk/man1 |
113 |
- |
114 |
- manzhtw_DATA = inkscape.zh_TW.1 |
115 |
|
116 |
diff --git a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch b/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch |
117 |
deleted file mode 100644 |
118 |
index db069d1e87c..00000000000 |
119 |
--- a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch |
120 |
+++ /dev/null |
121 |
@@ -1,154 +0,0 @@ |
122 |
-diff -ruN inkscape-0.92.1.orig/configure.ac inkscape-0.92.1/configure.ac |
123 |
---- inkscape-0.92.1.orig/configure.ac 2017-02-14 00:46:57.000000000 +0100 |
124 |
-+++ inkscape-0.92.1/configure.ac 2017-05-12 21:20:45.880842301 +0200 |
125 |
-@@ -201,11 +201,14 @@ |
126 |
- dnl Check for OpenMP |
127 |
- dnl ****************************** |
128 |
- AC_OPENMP |
129 |
--if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then |
130 |
-- openmp_ok=yes |
131 |
-- dnl We have it, now set up the flags |
132 |
-- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" |
133 |
-- AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP]) |
134 |
-+openmp_ok="no" |
135 |
-+if test "x$enable_openmp" = "xyes"; then |
136 |
-+ if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then |
137 |
-+ openmp_ok=yes |
138 |
-+ dnl We have it, now set up the flags |
139 |
-+ CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" |
140 |
-+ AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP]) |
141 |
-+ fi |
142 |
- fi |
143 |
- |
144 |
- dnl ******************** |
145 |
-@@ -222,9 +225,15 @@ |
146 |
- dnl ****************************** |
147 |
- dnl Check for libexif |
148 |
- dnl ****************************** |
149 |
--PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no) |
150 |
--if test "x$exif_ok" = "xyes"; then |
151 |
-- AC_DEFINE(HAVE_EXIF, 1, [Use libexif]) |
152 |
-+AC_ARG_ENABLE(exif, |
153 |
-+ AS_HELP_STRING([--enable-exif], [compile with EXIF support]), |
154 |
-+ enable_exif=$enableval,enable_exif=no) |
155 |
-+ |
156 |
-+if test "x$enable_exif" = "xyes"; then |
157 |
-+ PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no) |
158 |
-+ if test "x$exif_ok" = "xyes"; then |
159 |
-+ AC_DEFINE(HAVE_EXIF, 1, [Use libexif]) |
160 |
-+ fi |
161 |
- fi |
162 |
- AC_SUBST(EXIF_LIBS) |
163 |
- AC_SUBST(EXIF_CFLAGS) |
164 |
-@@ -232,10 +241,16 @@ |
165 |
- dnl ****************************** |
166 |
- dnl Check for libjpeg |
167 |
- dnl ****************************** |
168 |
--AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no) |
169 |
--if test "x$jpeg_ok" = "xyes"; then |
170 |
-- LIBS="-ljpeg $LIBS" |
171 |
-- AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg]) |
172 |
-+AC_ARG_ENABLE(jpeg, |
173 |
-+ AS_HELP_STRING([--enable-jpeg], [compile with JPEG support]), |
174 |
-+ enable_jpeg=$enableval,enable_jpeg=no) |
175 |
-+ |
176 |
-+if test "x$enable_jpeg" = "xyes"; then |
177 |
-+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no) |
178 |
-+ if test "x$jpeg_ok" = "xyes"; then |
179 |
-+ LIBS="-ljpeg $LIBS" |
180 |
-+ AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg]) |
181 |
-+ fi |
182 |
- fi |
183 |
- |
184 |
- dnl This check is to get a FIONREAD definition on Solaris 8 |
185 |
-@@ -614,9 +629,16 @@ |
186 |
- dnl Check for ImageMagick Magick++ |
187 |
- dnl ****************************** |
188 |
- |
189 |
--PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no) |
190 |
--if test "x$magick_ok" = "xyes"; then |
191 |
-- AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects]) |
192 |
-+AC_ARG_ENABLE(magick, |
193 |
-+ AS_HELP_STRING([--enable-magick], [compile with Image Magick++ support for bitmap effects]), |
194 |
-+ enable_magick=$enableval,enable_magick=no) |
195 |
-+ |
196 |
-+magick_ok="no" |
197 |
-+if test "x$enable_magick" = "xyes"; then |
198 |
-+ PKG_CHECK_MODULES(IMAGEMAGICK, Magick++, magick_ok=yes, magick_ok=no) |
199 |
-+ if test "x$magick_ok" = "xyes"; then |
200 |
-+ AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects]) |
201 |
-+ fi |
202 |
- fi |
203 |
- AM_CONDITIONAL(USE_IMAGE_MAGICK, test "x$magick_ok" = "xyes") |
204 |
- |
205 |
-@@ -712,6 +734,10 @@ |
206 |
- |
207 |
- AC_CHECK_HEADER([boost/unordered_set.hpp], [AC_DEFINE(HAVE_BOOST_UNORDERED_SET, 1, [Boost unordered_set (Boost >= 1.36)])], []) |
208 |
- |
209 |
-+ |
210 |
-+AC_ARG_WITH([gtkspell], |
211 |
-+ AS_HELP_STRING([--without-gtkspell], [disable gtk spelling widget]),[with_gtkspell=$withval], [with_gtkspell=yes]) |
212 |
-+ |
213 |
- dnl ********************************* |
214 |
- dnl Allow experimental GTK+3 build |
215 |
- dnl ********************************* |
216 |
-@@ -723,11 +749,13 @@ |
217 |
- if test "x$enable_gtk3" = "xyes"; then |
218 |
- |
219 |
- ink_spell_pkg= |
220 |
-- if pkg-config --exists gtkspell-3.0; then |
221 |
-- ink_spell_pkg=gtkspell-3.0 |
222 |
-- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) |
223 |
-+ if test "x$with_gtkspell" = "xyes"; then |
224 |
-+ if pkg-config --exists gtkspell-3.0; then |
225 |
-+ ink_spell_pkg=gtkspell-3.0 |
226 |
-+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) |
227 |
-+ fi |
228 |
- fi |
229 |
-- |
230 |
-+ |
231 |
- PKG_CHECK_MODULES(GTK, |
232 |
- gtk+-3.0 >= 3.8 |
233 |
- gdk-3.0 >= 3.8 |
234 |
-@@ -804,11 +832,13 @@ |
235 |
- else |
236 |
- |
237 |
- ink_spell_pkg= |
238 |
-- if pkg-config --exists gtkspell-2.0; then |
239 |
-- ink_spell_pkg=gtkspell-2.0 |
240 |
-- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) |
241 |
-+ if test "x$with_gtkspell" = "xyes"; then |
242 |
-+ if pkg-config --exists gtkspell-2.0; then |
243 |
-+ ink_spell_pkg=gtkspell-2.0 |
244 |
-+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) |
245 |
-+ fi |
246 |
- fi |
247 |
-- |
248 |
-+ |
249 |
- PKG_CHECK_MODULES(GTK, |
250 |
- gtk+-2.0 >= 2.24 |
251 |
- $ink_spell_pkg) |
252 |
-@@ -931,12 +961,17 @@ |
253 |
- dnl ************************** |
254 |
- dnl Check for aspell |
255 |
- dnl ****************************** |
256 |
--AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm) |
257 |
--if test "x$aspell_ok" = "xyes"; then |
258 |
-- AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker]) |
259 |
-- INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell" |
260 |
--else |
261 |
-- AC_MSG_CHECKING([Aspell not found, spell checker will be disabled]) |
262 |
-+AC_ARG_WITH([aspell], |
263 |
-+ AS_HELP_STRING([--without-aspell], [disable aspell spell checker]),[with_aspell=$withval], [with_aspell=yes]) |
264 |
-+ |
265 |
-+if test "x$with_aspell" = "xyes"; then |
266 |
-+ AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm) |
267 |
-+ if test "x$aspell_ok" = "xyes"; then |
268 |
-+ AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker]) |
269 |
-+ INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell" |
270 |
-+ else |
271 |
-+ AC_MSG_CHECKING([Aspell not found, spell checker will be disabled]) |
272 |
-+ fi |
273 |
- fi |
274 |
- |
275 |
- dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. |
276 |
|
277 |
diff --git a/media-gfx/inkscape/files/inkscape-0.92.1-desktop.patch b/media-gfx/inkscape/files/inkscape-0.92.1-desktop.patch |
278 |
deleted file mode 100644 |
279 |
index be49ea505d3..00000000000 |
280 |
--- a/media-gfx/inkscape/files/inkscape-0.92.1-desktop.patch |
281 |
+++ /dev/null |
282 |
@@ -1,12 +0,0 @@ |
283 |
-diff -ruN inkscape-0.92.1.orig/inkscape.desktop.in inkscape-0.92.1/inkscape.desktop.in |
284 |
---- inkscape-0.92.1.orig/inkscape.desktop.in 2017-02-14 00:46:57.000000000 +0100 |
285 |
-+++ inkscape-0.92.1/inkscape.desktop.in 2017-05-12 21:25:01.628853033 +0200 |
286 |
-@@ -6,7 +6,7 @@ |
287 |
- _Comment=Create and edit Scalable Vector Graphics images |
288 |
- _Keywords=image;editor;vector;drawing; |
289 |
- Type=Application |
290 |
--Categories=Graphics;VectorGraphics;GTK; |
291 |
-+Categories=Graphics;2DGraphics;VectorGraphics;GTK; |
292 |
- MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;image/cgm;image/x-wmf;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;application/visio;application/x-visio;application/vnd.visio;application/visio.drawing;application/vsd;application/x-vsd;image/x-vsd; |
293 |
- Exec=inkscape %F |
294 |
- TryExec=inkscape |
295 |
|
296 |
diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch b/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch |
297 |
deleted file mode 100644 |
298 |
index 7a35d8d55ad..00000000000 |
299 |
--- a/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch |
300 |
+++ /dev/null |
301 |
@@ -1,14 +0,0 @@ |
302 |
-diff -Naur a/configure.ac b/configure.ac |
303 |
---- a/configure.ac 2019-01-15 04:29:27.000000000 +0000 |
304 |
-+++ b/configure.ac 2020-04-03 18:39:26.372870987 +0000 |
305 |
-@@ -879,10 +879,6 @@ |
306 |
- if test "x$enable_strict_build" != "xno"; then |
307 |
- CPPFLAGS="-DGDKMM_DISABLE_DEPRECATED $CPPFLAGS" |
308 |
- |
309 |
-- # Ensure that no deprecated glibmm symbols are introduced. |
310 |
-- # lp:inkscape builds cleanly with this option at r10957 |
311 |
-- CPPFLAGS="-DGLIBMM_DISABLE_DEPRECATED $CPPFLAGS" |
312 |
-- |
313 |
- dnl Pango 1.32.4 uses a deprecated Glib symbol: |
314 |
- dnl https://bugzilla.gnome.org/show_bug.cgi?id=689843 |
315 |
- dnl |
316 |
|
317 |
diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch |
318 |
deleted file mode 100644 |
319 |
index 11383d9aa33..00000000000 |
320 |
--- a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch |
321 |
+++ /dev/null |
322 |
@@ -1,44 +0,0 @@ |
323 |
-From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001 |
324 |
-From: Marc Jeanmougin <marc@××××××××××.fr> |
325 |
-Date: Wed, 24 Apr 2019 14:11:26 +0200 |
326 |
-Subject: [PATCH] Tentative fix for poppler 0.76 |
327 |
- |
328 |
---- |
329 |
- src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- |
330 |
- src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++ |
331 |
- 2 files changed, 8 insertions(+), 1 deletion(-) |
332 |
- |
333 |
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp |
334 |
-index 2981d6ee51..ddbff7671f 100644 |
335 |
---- a/src/extension/internal/pdfinput/pdf-parser.cpp |
336 |
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp |
337 |
-@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { |
338 |
- error(errInternal, -1, "Weird page contents"); |
339 |
- return; |
340 |
- } |
341 |
-- parser = new Parser(xref, new Lexer(xref, obj), gFalse); |
342 |
-+ parser = new _POPPLER_NEW_PARSER(xref, obj); |
343 |
- go(topLevel); |
344 |
- delete parser; |
345 |
- parser = NULL; |
346 |
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h |
347 |
-index 6e4dde7dee..21a60702fa 100644 |
348 |
---- a/src/extension/internal/pdfinput/poppler-transition-api.h |
349 |
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h |
350 |
-@@ -3,6 +3,13 @@ |
351 |
- |
352 |
- #include <glib/poppler-features.h> |
353 |
- |
354 |
-+#if POPPLER_CHECK_VERSION(0, 76, 0) |
355 |
-+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) |
356 |
-+#else |
357 |
-+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) |
358 |
-+#endif |
359 |
-+ |
360 |
-+ |
361 |
- #if POPPLER_CHECK_VERSION(0, 72, 0) |
362 |
- #define getCString c_str |
363 |
- #endif |
364 |
--- |
365 |
-2.18.1 |
366 |
- |
367 |
|
368 |
diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch |
369 |
deleted file mode 100644 |
370 |
index 73cc4f97c37..00000000000 |
371 |
--- a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch |
372 |
+++ /dev/null |
373 |
@@ -1,76 +0,0 @@ |
374 |
-From 9b2f1a99bd8a411926925ac0c91f50289c7db8ee Mon Sep 17 00:00:00 2001 |
375 |
-From: Thomas Holder <thomas@×××××××××××××.de> |
376 |
-Date: Sat, 16 Nov 2019 14:12:24 +0100 |
377 |
-Subject: [PATCH] fix poppler 0.82.0 build |
378 |
-MIME-Version: 1.0 |
379 |
-Content-Type: text/plain; charset=UTF-8 |
380 |
-Content-Transfer-Encoding: 8bit |
381 |
- |
382 |
-Backport of 324c7903d9fd62e74c042c31477299be3b980fd2 from master by |
383 |
-Andreas K. Hüttel <dilfridge@g.o> |
384 |
---- |
385 |
- src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- |
386 |
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++ |
387 |
- src/extension/internal/pdfinput/svg-builder.cpp | 2 +- |
388 |
- src/extension/internal/pdfinput/svg-builder.h | 2 +- |
389 |
- 4 files changed, 9 insertions(+), 3 deletions(-) |
390 |
- |
391 |
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp |
392 |
-index ddbff7671f..e71bb79381 100644 |
393 |
---- a/src/extension/internal/pdfinput/pdf-parser.cpp |
394 |
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp |
395 |
-@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) { |
396 |
- int wMode; |
397 |
- double riseX, riseY; |
398 |
- CharCode code; |
399 |
-- Unicode *u = NULL; |
400 |
-+ Unicode _POPPLER_CONST_82 *u = NULL; |
401 |
- double x, y, dx, dy, tdx, tdy; |
402 |
- double originX, originY, tOriginX, tOriginY; |
403 |
- double oldCTM[6], newCTM[6]; |
404 |
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h |
405 |
-index 21a60702fa..93c0f99ba1 100644 |
406 |
---- a/src/extension/internal/pdfinput/poppler-transition-api.h |
407 |
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h |
408 |
-@@ -3,6 +3,12 @@ |
409 |
- |
410 |
- #include <glib/poppler-features.h> |
411 |
- |
412 |
-+#if POPPLER_CHECK_VERSION(0, 82, 0) |
413 |
-+#define _POPPLER_CONST_82 const |
414 |
-+#else |
415 |
-+#define _POPPLER_CONST_82 |
416 |
-+#endif |
417 |
-+ |
418 |
- #if POPPLER_CHECK_VERSION(0, 76, 0) |
419 |
- #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) |
420 |
- #else |
421 |
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp |
422 |
-index 1cefb92abd..ea2940ffe1 100644 |
423 |
---- a/src/extension/internal/pdfinput/svg-builder.cpp |
424 |
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp |
425 |
-@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *state) { |
426 |
- void SvgBuilder::addChar(GfxState *state, double x, double y, |
427 |
- double dx, double dy, |
428 |
- double originX, double originY, |
429 |
-- CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) { |
430 |
-+ CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) { |
431 |
- |
432 |
- |
433 |
- bool is_space = ( uLen == 1 && u[0] == 32 ); |
434 |
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h |
435 |
-index 34b42e17b8..78e302081f 100644 |
436 |
---- a/src/extension/internal/pdfinput/svg-builder.h |
437 |
-+++ b/src/extension/internal/pdfinput/svg-builder.h |
438 |
-@@ -141,7 +141,7 @@ public: |
439 |
- void addChar(GfxState *state, double x, double y, |
440 |
- double dx, double dy, |
441 |
- double originX, double originY, |
442 |
-- CharCode code, int nBytes, Unicode *u, int uLen); |
443 |
-+ CharCode code, int nBytes, Unicode const *u, int uLen); |
444 |
- void beginTextObject(GfxState *state); |
445 |
- void endTextObject(GfxState *state); |
446 |
- |
447 |
--- |
448 |
-2.24.0 |
449 |
- |
450 |
|
451 |
diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch |
452 |
deleted file mode 100644 |
453 |
index bcfb1cd482e..00000000000 |
454 |
--- a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch |
455 |
+++ /dev/null |
456 |
@@ -1,92 +0,0 @@ |
457 |
-From 51351358a62acb6887eab49bc0dc4a7a3d18c17a Mon Sep 17 00:00:00 2001 |
458 |
-From: Jan Tojnar <jtojnar@×××××.com> |
459 |
-Date: Tue, 3 Dec 2019 00:17:05 +0100 |
460 |
-Subject: [PATCH] Fix build with Poppler 0.83.0 |
461 |
- |
462 |
-Fixed for gentoo by dilfridge@g.o |
463 |
- |
464 |
-diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-input.cpp inkscape-0.92.4/src/extension/internal/pdfinput/pdf-input.cpp |
465 |
---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-input.cpp 2019-01-15 05:29:27.000000000 +0100 |
466 |
-+++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-input.cpp 2020-01-06 10:55:05.105063212 +0100 |
467 |
-@@ -689,12 +689,12 @@ |
468 |
- // |
469 |
- gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR"); |
470 |
- if (poppler_datadir != NULL) { |
471 |
-- globalParams = new GlobalParams(poppler_datadir); |
472 |
-+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(poppler_datadir); |
473 |
- } else { |
474 |
-- globalParams = new GlobalParams(); |
475 |
-+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(); |
476 |
- } |
477 |
- #else |
478 |
-- globalParams = new GlobalParams(); |
479 |
-+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(); |
480 |
- #endif // ENABLE_OSX_APP_LOCATIONS |
481 |
- } |
482 |
- |
483 |
-diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp |
484 |
---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp 2020-01-06 10:53:44.947229010 +0100 |
485 |
-+++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp 2020-01-06 10:56:49.611773932 +0100 |
486 |
-@@ -272,7 +272,7 @@ |
487 |
- ClipHistoryEntry *save(); |
488 |
- ClipHistoryEntry *restore(); |
489 |
- GBool hasSaves() { return saved != NULL; } |
490 |
-- void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal); |
491 |
-+ void setClip(_POPPLER_CONST_83 GfxPath *newClipPath, GfxClipType newClipType = clipNormal); |
492 |
- GfxPath *getClipPath() { return clipPath; } |
493 |
- GfxClipType getClipType() { return clipType; } |
494 |
- |
495 |
-@@ -3394,7 +3394,7 @@ |
496 |
- } |
497 |
- } |
498 |
- |
499 |
--void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) { |
500 |
-+void ClipHistoryEntry::setClip(_POPPLER_CONST_83 GfxPath *clipPathA, GfxClipType clipTypeA) { |
501 |
- // Free previous clip path |
502 |
- if (clipPath) { |
503 |
- delete clipPath; |
504 |
-diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h |
505 |
---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h 2020-01-06 10:53:44.947229010 +0100 |
506 |
-+++ inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h 2020-01-06 10:55:05.107063491 +0100 |
507 |
-@@ -3,6 +3,12 @@ |
508 |
- |
509 |
- #include <glib/poppler-features.h> |
510 |
- |
511 |
-+#if POPPLER_CHECK_VERSION(0, 83, 0) |
512 |
-+#define _POPPLER_CONST_83 const |
513 |
-+#else |
514 |
-+#define _POPPLER_CONST_83 |
515 |
-+#endif |
516 |
-+ |
517 |
- #if POPPLER_CHECK_VERSION(0, 82, 0) |
518 |
- #define _POPPLER_CONST_82 const |
519 |
- #else |
520 |
-@@ -15,6 +21,12 @@ |
521 |
- #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) |
522 |
- #endif |
523 |
- |
524 |
-+#if POPPLER_CHECK_VERSION(0, 83, 0) |
525 |
-+#define _POPPLER_NEW_GLOBAL_PARAMS(args...) std::unique_ptr<GlobalParams>(new GlobalParams(args)) |
526 |
-+#else |
527 |
-+#define _POPPLER_NEW_GLOBAL_PARAMS(args...) new GlobalParams(args) |
528 |
-+#endif |
529 |
-+ |
530 |
- |
531 |
- #if POPPLER_CHECK_VERSION(0, 72, 0) |
532 |
- #define getCString c_str |
533 |
-diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp |
534 |
---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp 2020-01-06 10:53:44.948229017 +0100 |
535 |
-+++ inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp 2020-01-06 10:55:05.107063491 +0100 |
536 |
-@@ -264,10 +264,10 @@ |
537 |
- /** |
538 |
- * \brief Generates a SVG path string from poppler's data structure |
539 |
- */ |
540 |
--static gchar *svgInterpretPath(GfxPath *path) { |
541 |
-+static gchar *svgInterpretPath(_POPPLER_CONST_83 GfxPath *path) { |
542 |
- Inkscape::SVG::PathString pathString; |
543 |
- for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) { |
544 |
-- GfxSubpath *subpath = path->getSubpath(i); |
545 |
-+ _POPPLER_CONST_83 GfxSubpath *subpath = path->getSubpath(i); |
546 |
- if (subpath->getNumPoints() > 0) { |
547 |
- pathString.moveTo(subpath->getX(0), subpath->getY(0)); |
548 |
- int j = 1; |
549 |
|
550 |
diff --git a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild |
551 |
deleted file mode 100644 |
552 |
index 1b9241b51aa..00000000000 |
553 |
--- a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild |
554 |
+++ /dev/null |
555 |
@@ -1,166 +0,0 @@ |
556 |
-# Copyright 1999-2020 Gentoo Authors |
557 |
-# Distributed under the terms of the GNU General Public License v2 |
558 |
- |
559 |
-EAPI=6 |
560 |
- |
561 |
-PYTHON_COMPAT=( python2_7 ) |
562 |
-PYTHON_REQ_USE="xml" |
563 |
-inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1 |
564 |
- |
565 |
-MY_P="${P/_/}" |
566 |
- |
567 |
-DESCRIPTION="SVG based generic vector-drawing program" |
568 |
-HOMEPAGE="https://inkscape.org/" |
569 |
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2" |
570 |
- |
571 |
-LICENSE="GPL-2 LGPL-2.1" |
572 |
-SLOT="0" |
573 |
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" |
574 |
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex" |
575 |
-IUSE+=" lcms nls spell static-libs visio wpg uniconvertor" |
576 |
- |
577 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
578 |
- |
579 |
-COMMON_DEPEND="${PYTHON_DEPS} |
580 |
- >=app-text/poppler-0.26.0:=[cairo] |
581 |
- >=dev-cpp/glibmm-2.54.1 |
582 |
- >=dev-cpp/gtkmm-2.18.0:2.4 |
583 |
- >=dev-cpp/cairomm-1.9.8 |
584 |
- >=dev-libs/boehm-gc-7.1:= |
585 |
- >=dev-libs/glib-2.28 |
586 |
- >=dev-libs/libsigc++-2.0.12 |
587 |
- >=dev-libs/libxml2-2.6.20 |
588 |
- >=dev-libs/libxslt-1.0.15 |
589 |
- dev-libs/popt |
590 |
- media-gfx/potrace |
591 |
- media-libs/fontconfig |
592 |
- media-libs/freetype:2 |
593 |
- media-libs/libpng:0= |
594 |
- sci-libs/gsl:= |
595 |
- x11-libs/libX11 |
596 |
- >=x11-libs/gtk+-2.10.7:2 |
597 |
- >=x11-libs/pango-1.24 |
598 |
- cdr? ( |
599 |
- app-text/libwpg:0.3 |
600 |
- dev-libs/librevenge |
601 |
- media-libs/libcdr |
602 |
- ) |
603 |
- dbus? ( dev-libs/dbus-glib ) |
604 |
- exif? ( media-libs/libexif ) |
605 |
- gnome? ( >=gnome-base/gnome-vfs-2.0 ) |
606 |
- imagemagick? ( <media-gfx/imagemagick-7:=[cxx] ) |
607 |
- jpeg? ( virtual/jpeg:0 ) |
608 |
- lcms? ( media-libs/lcms:2 ) |
609 |
- spell? ( |
610 |
- app-text/aspell |
611 |
- app-text/gtkspell:2 |
612 |
- ) |
613 |
- visio? ( |
614 |
- app-text/libwpg:0.3 |
615 |
- dev-libs/librevenge |
616 |
- media-libs/libvisio |
617 |
- ) |
618 |
- wpg? ( |
619 |
- app-text/libwpg:0.3 |
620 |
- dev-libs/librevenge |
621 |
- ) |
622 |
-" |
623 |
-# These only use executables provided by these packages |
624 |
-# See share/extensions for more details. inkscape can tell you to |
625 |
-# install these so we could of course just not depend on those and rely |
626 |
-# on that. |
627 |
-RDEPEND="${COMMON_DEPEND} |
628 |
- $(python_gen_cond_dep ' |
629 |
- || ( |
630 |
- dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] |
631 |
- dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
632 |
- ) |
633 |
- ') |
634 |
- uniconvertor? ( media-gfx/uniconvertor ) |
635 |
- dia? ( app-office/dia ) |
636 |
- latex? ( |
637 |
- media-gfx/pstoedit[plotutils] |
638 |
- app-text/dvipsk |
639 |
- app-text/texlive-core |
640 |
- ) |
641 |
- postscript? ( app-text/ghostscript-gpl ) |
642 |
-" |
643 |
-DEPEND="${COMMON_DEPEND} |
644 |
- >=dev-libs/boost-1.36 |
645 |
- dev-util/glib-utils |
646 |
- >=dev-util/intltool-0.40 |
647 |
- >=sys-devel/gettext-0.17 |
648 |
- virtual/pkgconfig |
649 |
-" |
650 |
- |
651 |
-PATCHES=( |
652 |
- "${FILESDIR}/${PN}-0.92.1-automagic.patch" |
653 |
- "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch" |
654 |
- "${FILESDIR}/${PN}-0.92.1-desktop.patch" |
655 |
- "${FILESDIR}/${PN}-0.91_pre3-exif.patch" |
656 |
- "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch" |
657 |
- "${FILESDIR}/${PN}-0.48.4-epython.patch" |
658 |
- "${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246 |
659 |
- "${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch" |
660 |
- "${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch" |
661 |
- "${FILESDIR}/${PN}-0.92.4-glibmm-2.62.patch" #715394 |
662 |
-) |
663 |
- |
664 |
-S="${WORKDIR}/${MY_P}" |
665 |
- |
666 |
-RESTRICT="test" |
667 |
- |
668 |
-pkg_pretend() { |
669 |
- if [[ ${MERGE_TYPE} != binary ]] && use openmp; then |
670 |
- tc-has-openmp || die "Please switch to an openmp compatible compiler" |
671 |
- fi |
672 |
-} |
673 |
- |
674 |
-src_prepare() { |
675 |
- default |
676 |
- |
677 |
- sed -i "s#@EPYTHON@#${EPYTHON}#" \ |
678 |
- src/extension/implementation/script.cpp || die |
679 |
- |
680 |
- eautoreconf |
681 |
- |
682 |
- # bug 421111 |
683 |
- python_fix_shebang share/extensions |
684 |
-} |
685 |
- |
686 |
-src_configure() { |
687 |
- # aliasing unsafe wrt #310393 |
688 |
- append-flags -fno-strict-aliasing |
689 |
- |
690 |
- local myeconfargs=( |
691 |
- $(use_enable static-libs static) |
692 |
- $(use_enable nls) |
693 |
- $(use_enable openmp) |
694 |
- $(use_enable exif) |
695 |
- $(use_enable jpeg) |
696 |
- $(use_enable lcms) |
697 |
- --enable-poppler-cairo |
698 |
- $(use_enable wpg) |
699 |
- $(use_enable visio) |
700 |
- $(use_enable cdr) |
701 |
- $(use_enable dbus dbusapi) |
702 |
- $(use_enable imagemagick magick) |
703 |
- $(use_with gnome gnome-vfs) |
704 |
- $(use_with inkjar) |
705 |
- $(use_with spell gtkspell) |
706 |
- $(use_with spell aspell) |
707 |
- ) |
708 |
- econf "${myeconfargs[@]}" |
709 |
-} |
710 |
- |
711 |
-src_compile() { |
712 |
- emake -C src helper/sp-marshal.h #686304 |
713 |
- emake AR="$(tc-getAR)" |
714 |
-} |
715 |
- |
716 |
-src_install() { |
717 |
- default |
718 |
- |
719 |
- find "${ED}" -name "*.la" -delete || die |
720 |
- python_optimize "${ED%/}"/usr/share/${PN}/extensions |
721 |
-} |
722 |
|
723 |
diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml |
724 |
index 73af4608f62..67658aa0149 100644 |
725 |
--- a/media-gfx/inkscape/metadata.xml |
726 |
+++ b/media-gfx/inkscape/metadata.xml |
727 |
@@ -13,11 +13,9 @@ |
728 |
<flag name="cdr">Enable support for CorelDRAW files via <pkg>media-libs/libcdr</pkg></flag> |
729 |
<flag name="dia">Enable DIA flow chart import via <pkg>app-office/dia</pkg></flag> |
730 |
<flag name="inkjar">Enable support for OpenOffice.org SVG jar files</flag> |
731 |
- <flag name="latex">Enable rendering of LaTeX formulas</flag> |
732 |
<flag name="svg2">Enable support for new SVG2 features</flag> |
733 |
<flag name="visio">Enable support for Microsoft Visio diagrams via <pkg>media-libs/libvisio</pkg></flag> |
734 |
<flag name="wpg">Enable support for WordPerfect graphics via <pkg>app-text/libwpg</pkg></flag> |
735 |
- <flag name="uniconvertor">Enable conversion of vector graphic files via <pkg>media-gfx/uniconvertor</pkg> (needs Python 2)</flag> |
736 |
</use> |
737 |
<upstream> |
738 |
<remote-id type="gitlab">inkscape/inkscape</remote-id> |