commit: c64d6cb6607ce44d0857d0c21a4866fd85ec78c9
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 2 08:17:17 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Jul 2 08:18:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c64d6cb6
media-gfx/inkscape: Drop old
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
media-gfx/inkscape/Manifest | 1 -
.../inkscape/files/inkscape-0.48.4-epython.patch | 11 --
.../files/inkscape-0.91_pre3-cppflags.patch | 14 --
.../inkscape/files/inkscape-0.91_pre3-exif.patch | 12 --
.../inkscape/files/inkscape-0.91_pre3-sk-man.patch | 15 --
.../inkscape/files/inkscape-0.92.1-automagic.patch | 154 -------------------
.../inkscape/files/inkscape-0.92.1-desktop.patch | 12 --
.../files/inkscape-0.92.4-glibmm-2.62.patch | 14 --
.../files/inkscape-0.92.4-poppler-0.76.0.patch | 44 ------
.../files/inkscape-0.92.4-poppler-0.82.0.patch | 76 ----------
.../files/inkscape-0.92.4-poppler-0.83.0.patch | 92 ------------
media-gfx/inkscape/inkscape-0.92.4-r3.ebuild | 166 ---------------------
media-gfx/inkscape/metadata.xml | 2 -
13 files changed, 613 deletions(-)
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 88b7c565b70..7007e82d78c 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1 @@
-DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B
892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77
SHA512
b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
DIST inkscape-1.0.tar.xz 31935616 BLAKE2B
096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8
SHA512
37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch
b/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch
deleted file mode 100644
index 2e2483c1b1e..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- inkscape-0.48.4/src/extension/implementation/script.cpp
-+++ inkscape-0.48.4/src/extension/implementation/script.cpp
-@@ -89,7 +89,7 @@
- #ifdef WIN32
- {"python", "python-interpreter", "pythonw" },
- #else
-- {"python", "python-interpreter", "python" },
-+ {"python", "python-interpreter", "@EPYTHON@" },
- #endif
- {"ruby", "ruby-interpreter", "ruby" },
- {"shell", "shell-interpreter", "sh" },
diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch
b/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch
deleted file mode 100644
index 94dbf881de0..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Gentoo enables _FORTIFY_SOURCE by default so this avoids redefined warnings.
-
---- inkscape-0.91pre3/configure.ac
-+++ inkscape-0.91pre3/configure.ac
-@@ -72,9 +72,6 @@
- ####
- # Generic cpp flags...
-
-- # What is just plain "-W" ?
-- # Fortify source requires -O2 or higher, which is handled with newer
autoconf
-- CPPFLAGS="-W -D_FORTIFY_SOURCE=2 $CPPFLAGS"
- # Enable format and format security warnings
- CPPFLAGS="-Wformat -Wformat-security $CPPFLAGS"
- # Enable all default warnings
diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-exif.patch
b/media-gfx/inkscape/files/inkscape-0.91_pre3-exif.patch
deleted file mode 100644
index 4180fd4d2ef..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.91_pre3-exif.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Actually try to use EXIF support if it's enabled.
-
---- inkscape-0.91pre3/src/extension/internal/image-resolution.cpp
-+++ inkscape-0.91pre3/src/extension/internal/image-resolution.cpp
-@@ -18,6 +18,7 @@
- #include <png.h>
-
- #ifdef HAVE_EXIF
-+#define IR_TRY_EXIF 1
- #include <math.h>
- #include <libexif/exif-data.h>
- #endif
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
deleted file mode 100644
index f14e7d152e1..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Install sk man page to the right directory.
-
-https://bugs.gentoo.org/show_bug.cgi?id=481276
-
---- inkscape-0.91pre3/Makefile.am
-+++ inkscape-0.91pre3/Makefile.am
-@@ -561,7 +561,7 @@
- manja_DATA = inkscape.ja.1
- manjadir = $(mandir)/ja/man1
-
--mansk_DATA = inkscape.ja.1
-+mansk_DATA = inkscape.sk.1
- manskdir = $(mandir)/sk/man1
-
- manzhtw_DATA = inkscape.zh_TW.1
diff --git a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch
b/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch
deleted file mode 100644
index db069d1e87c..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff -ruN inkscape-0.92.1.orig/configure.ac inkscape-0.92.1/configure.ac
---- inkscape-0.92.1.orig/configure.ac 2017-02-14 00:46:57.000000000 +0100
-+++ inkscape-0.92.1/configure.ac 2017-05-12 21:20:45.880842301 +0200
-@@ -201,11 +201,14 @@
- dnl Check for OpenMP
- dnl ******************************
- AC_OPENMP
--if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then
-- openmp_ok=yes
-- dnl We have it, now set up the flags
-- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
-- AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP])
-+openmp_ok="no"
-+if test "x$enable_openmp" = "xyes"; then
-+ if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then
-+ openmp_ok=yes
-+ dnl We have it, now set up the flags
-+ CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
-+ AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP])
-+ fi
- fi
-
- dnl ********************
-@@ -222,9 +225,15 @@
- dnl ******************************
- dnl Check for libexif
- dnl ******************************
--PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no)
--if test "x$exif_ok" = "xyes"; then
-- AC_DEFINE(HAVE_EXIF, 1, [Use libexif])
-+AC_ARG_ENABLE(exif,
-+ AS_HELP_STRING([--enable-exif], [compile with EXIF support]),
-+ enable_exif=$enableval,enable_exif=no)
-+
-+if test "x$enable_exif" = "xyes"; then
-+ PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no)
-+ if test "x$exif_ok" = "xyes"; then
-+ AC_DEFINE(HAVE_EXIF, 1, [Use libexif])
-+ fi
- fi
- AC_SUBST(EXIF_LIBS)
- AC_SUBST(EXIF_CFLAGS)
-@@ -232,10 +241,16 @@
- dnl ******************************
- dnl Check for libjpeg
- dnl ******************************
--AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h,
jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no)
--if test "x$jpeg_ok" = "xyes"; then
-- LIBS="-ljpeg $LIBS"
-- AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg])
-+AC_ARG_ENABLE(jpeg,
-+ AS_HELP_STRING([--enable-jpeg], [compile with JPEG support]),
-+ enable_jpeg=$enableval,enable_jpeg=no)
-+
-+if test "x$enable_jpeg" = "xyes"; then
-+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h,
jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no)
-+ if test "x$jpeg_ok" = "xyes"; then
-+ LIBS="-ljpeg $LIBS"
-+ AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg])
-+ fi
- fi
-
- dnl This check is to get a FIONREAD definition on Solaris 8
-@@ -614,9 +629,16 @@
- dnl Check for ImageMagick Magick++
- dnl ******************************
-
--PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no)
--if test "x$magick_ok" = "xyes"; then
-- AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap
effects])
-+AC_ARG_ENABLE(magick,
-+ AS_HELP_STRING([--enable-magick], [compile with Image Magick++ support
for bitmap effects]),
-+ enable_magick=$enableval,enable_magick=no)
-+
-+magick_ok="no"
-+if test "x$enable_magick" = "xyes"; then
-+ PKG_CHECK_MODULES(IMAGEMAGICK, Magick++, magick_ok=yes, magick_ok=no)
-+ if test "x$magick_ok" = "xyes"; then
-+ AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for
bitmap effects])
-+ fi
- fi
- AM_CONDITIONAL(USE_IMAGE_MAGICK, test "x$magick_ok" = "xyes")
-
-@@ -712,6 +734,10 @@
-
- AC_CHECK_HEADER([boost/unordered_set.hpp],
[AC_DEFINE(HAVE_BOOST_UNORDERED_SET, 1, [Boost unordered_set (Boost >=
1.36)])], [])
-
-+
-+AC_ARG_WITH([gtkspell],
-+ AS_HELP_STRING([--without-gtkspell], [disable gtk spelling
widget]),[with_gtkspell=$withval], [with_gtkspell=yes])
-+
- dnl *********************************
- dnl Allow experimental GTK+3 build
- dnl *********************************
-@@ -723,11 +749,13 @@
- if test "x$enable_gtk3" = "xyes"; then
-
- ink_spell_pkg=
-- if pkg-config --exists gtkspell-3.0; then
-- ink_spell_pkg=gtkspell-3.0
-- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
-+ if test "x$with_gtkspell" = "xyes"; then
-+ if pkg-config --exists gtkspell-3.0; then
-+ ink_spell_pkg=gtkspell-3.0
-+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling
widget])
-+ fi
- fi
--
-+
- PKG_CHECK_MODULES(GTK,
- gtk+-3.0 >= 3.8
- gdk-3.0 >= 3.8
-@@ -804,11 +832,13 @@
- else
-
- ink_spell_pkg=
-- if pkg-config --exists gtkspell-2.0; then
-- ink_spell_pkg=gtkspell-2.0
-- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
-+ if test "x$with_gtkspell" = "xyes"; then
-+ if pkg-config --exists gtkspell-2.0; then
-+ ink_spell_pkg=gtkspell-2.0
-+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling
widget])
-+ fi
- fi
--
-+
- PKG_CHECK_MODULES(GTK,
- gtk+-2.0 >= 2.24
- $ink_spell_pkg)
-@@ -931,12 +961,17 @@
- dnl **************************
- dnl Check for aspell
- dnl ******************************
--AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h,
aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm)
--if test "x$aspell_ok" = "xyes"; then
-- AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker])
-- INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell"
--else
-- AC_MSG_CHECKING([Aspell not found, spell checker will be disabled])
-+AC_ARG_WITH([aspell],
-+ AS_HELP_STRING([--without-aspell], [disable aspell spell
checker]),[with_aspell=$withval], [with_aspell=yes])
-+
-+if test "x$with_aspell" = "xyes"; then
-+ AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h,
aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm)
-+ if test "x$aspell_ok" = "xyes"; then
-+ AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in
spellchecker])
-+ INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell"
-+ else
-+ AC_MSG_CHECKING([Aspell not found, spell checker will be
disabled])
-+ fi
- fi
-
- dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
diff --git a/media-gfx/inkscape/files/inkscape-0.92.1-desktop.patch
b/media-gfx/inkscape/files/inkscape-0.92.1-desktop.patch
deleted file mode 100644
index be49ea505d3..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.1-desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN inkscape-0.92.1.orig/inkscape.desktop.in
inkscape-0.92.1/inkscape.desktop.in
---- inkscape-0.92.1.orig/inkscape.desktop.in 2017-02-14 00:46:57.000000000
+0100
-+++ inkscape-0.92.1/inkscape.desktop.in 2017-05-12 21:25:01.628853033
+0200
-@@ -6,7 +6,7 @@
- _Comment=Create and edit Scalable Vector Graphics images
- _Keywords=image;editor;vector;drawing;
- Type=Application
--Categories=Graphics;VectorGraphics;GTK;
-+Categories=Graphics;2DGraphics;VectorGraphics;GTK;
-
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;
- Exec=inkscape %F
- TryExec=inkscape
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
deleted file mode 100644
index 7a35d8d55ad..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac 2019-01-15 04:29:27.000000000 +0000
-+++ b/configure.ac 2020-04-03 18:39:26.372870987 +0000
-@@ -879,10 +879,6 @@
- if test "x$enable_strict_build" != "xno"; then
- CPPFLAGS="-DGDKMM_DISABLE_DEPRECATED $CPPFLAGS"
-
-- # Ensure that no deprecated glibmm symbols are introduced.
-- # lp:inkscape builds cleanly with this option at r10957
-- CPPFLAGS="-DGLIBMM_DISABLE_DEPRECATED $CPPFLAGS"
--
- dnl Pango 1.32.4 uses a deprecated Glib symbol:
- dnl https://bugzilla.gnome.org/show_bug.cgi?id=689843
- dnl
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
deleted file mode 100644
index 11383d9aa33..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001
-From: Marc Jeanmougin <[email protected]>
-Date: Wed, 24 Apr 2019 14:11:26 +0200
-Subject: [PATCH] Tentative fix for poppler 0.76
-
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 2 +-
- src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp
b/src/extension/internal/pdfinput/pdf-parser.cpp
-index 2981d6ee51..ddbff7671f 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
- error(errInternal, -1, "Weird page contents");
- return;
- }
-- parser = new Parser(xref, new Lexer(xref, obj), gFalse);
-+ parser = new _POPPLER_NEW_PARSER(xref, obj);
- go(topLevel);
- delete parser;
- parser = NULL;
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h
b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 6e4dde7dee..21a60702fa 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -3,6 +3,13 @@
-
- #include <glib/poppler-features.h>
-
-+#if POPPLER_CHECK_VERSION(0, 76, 0)
-+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
-+#else
-+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj),
gFalse)
-+#endif
-+
-+
- #if POPPLER_CHECK_VERSION(0, 72, 0)
- #define getCString c_str
- #endif
---
-2.18.1
-
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
deleted file mode 100644
index 73cc4f97c37..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 9b2f1a99bd8a411926925ac0c91f50289c7db8ee Mon Sep 17 00:00:00 2001
-From: Thomas Holder <[email protected]>
-Date: Sat, 16 Nov 2019 14:12:24 +0100
-Subject: [PATCH] fix poppler 0.82.0 build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Backport of 324c7903d9fd62e74c042c31477299be3b980fd2 from master by
-Andreas K. Hüttel <[email protected]>
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 2 +-
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- src/extension/internal/pdfinput/svg-builder.cpp | 2 +-
- src/extension/internal/pdfinput/svg-builder.h | 2 +-
- 4 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp
b/src/extension/internal/pdfinput/pdf-parser.cpp
-index ddbff7671f..e71bb79381 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) {
- int wMode;
- double riseX, riseY;
- CharCode code;
-- Unicode *u = NULL;
-+ Unicode _POPPLER_CONST_82 *u = NULL;
- double x, y, dx, dy, tdx, tdy;
- double originX, originY, tOriginX, tOriginY;
- double oldCTM[6], newCTM[6];
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h
b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 21a60702fa..93c0f99ba1 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -3,6 +3,12 @@
-
- #include <glib/poppler-features.h>
-
-+#if POPPLER_CHECK_VERSION(0, 82, 0)
-+#define _POPPLER_CONST_82 const
-+#else
-+#define _POPPLER_CONST_82
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 76, 0)
- #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
- #else
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp
b/src/extension/internal/pdfinput/svg-builder.cpp
-index 1cefb92abd..ea2940ffe1 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *state) {
- void SvgBuilder::addChar(GfxState *state, double x, double y,
- double dx, double dy,
- double originX, double originY,
-- CharCode /*code*/, int /*nBytes*/, Unicode *u, int
uLen) {
-+ CharCode /*code*/, int /*nBytes*/, Unicode const *u,
int uLen) {
-
-
- bool is_space = ( uLen == 1 && u[0] == 32 );
-diff --git a/src/extension/internal/pdfinput/svg-builder.h
b/src/extension/internal/pdfinput/svg-builder.h
-index 34b42e17b8..78e302081f 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -141,7 +141,7 @@ public:
- void addChar(GfxState *state, double x, double y,
- double dx, double dy,
- double originX, double originY,
-- CharCode code, int nBytes, Unicode *u, int uLen);
-+ CharCode code, int nBytes, Unicode const *u, int uLen);
- void beginTextObject(GfxState *state);
- void endTextObject(GfxState *state);
-
---
-2.24.0
-
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
deleted file mode 100644
index bcfb1cd482e..00000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 51351358a62acb6887eab49bc0dc4a7a3d18c17a Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <[email protected]>
-Date: Tue, 3 Dec 2019 00:17:05 +0100
-Subject: [PATCH] Fix build with Poppler 0.83.0
-
-Fixed for gentoo by [email protected]
-
-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
---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-input.cpp
2019-01-15 05:29:27.000000000 +0100
-+++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-input.cpp
2020-01-06 10:55:05.105063212 +0100
-@@ -689,12 +689,12 @@
- //
- gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR");
- if (poppler_datadir != NULL) {
-- globalParams = new GlobalParams(poppler_datadir);
-+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(poppler_datadir);
- } else {
-- globalParams = new GlobalParams();
-+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
- }
- #else
-- globalParams = new GlobalParams();
-+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
- #endif // ENABLE_OSX_APP_LOCATIONS
- }
-
-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
---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp
2020-01-06 10:53:44.947229010 +0100
-+++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp
2020-01-06 10:56:49.611773932 +0100
-@@ -272,7 +272,7 @@
- ClipHistoryEntry *save();
- ClipHistoryEntry *restore();
- GBool hasSaves() { return saved != NULL; }
-- void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
-+ void setClip(_POPPLER_CONST_83 GfxPath *newClipPath, GfxClipType
newClipType = clipNormal);
- GfxPath *getClipPath() { return clipPath; }
- GfxClipType getClipType() { return clipType; }
-
-@@ -3394,7 +3394,7 @@
- }
- }
-
--void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) {
-+void ClipHistoryEntry::setClip(_POPPLER_CONST_83 GfxPath *clipPathA,
GfxClipType clipTypeA) {
- // Free previous clip path
- if (clipPath) {
- delete clipPath;
-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
----
inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h
2020-01-06 10:53:44.947229010 +0100
-+++ inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h
2020-01-06 10:55:05.107063491 +0100
-@@ -3,6 +3,12 @@
-
- #include <glib/poppler-features.h>
-
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+#define _POPPLER_CONST_83 const
-+#else
-+#define _POPPLER_CONST_83
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 82, 0)
- #define _POPPLER_CONST_82 const
- #else
-@@ -15,6 +21,12 @@
- #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj),
gFalse)
- #endif
-
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+#define _POPPLER_NEW_GLOBAL_PARAMS(args...) std::unique_ptr<GlobalParams>(new
GlobalParams(args))
-+#else
-+#define _POPPLER_NEW_GLOBAL_PARAMS(args...) new GlobalParams(args)
-+#endif
-+
-
- #if POPPLER_CHECK_VERSION(0, 72, 0)
- #define getCString c_str
-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
---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp
2020-01-06 10:53:44.948229017 +0100
-+++ inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp
2020-01-06 10:55:05.107063491 +0100
-@@ -264,10 +264,10 @@
- /**
- * \brief Generates a SVG path string from poppler's data structure
- */
--static gchar *svgInterpretPath(GfxPath *path) {
-+static gchar *svgInterpretPath(_POPPLER_CONST_83 GfxPath *path) {
- Inkscape::SVG::PathString pathString;
- for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) {
-- GfxSubpath *subpath = path->getSubpath(i);
-+ _POPPLER_CONST_83 GfxSubpath *subpath = path->getSubpath(i);
- if (subpath->getNumPoints() > 0) {
- pathString.moveTo(subpath->getX(0), subpath->getY(0));
- int j = 1;
diff --git a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild
b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild
deleted file mode 100644
index 1b9241b51aa..00000000000
--- a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs
python-single-r1
-
-MY_P="${P/_/}"
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/";
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
-IUSE+=" lcms nls spell static-libs visio wpg uniconvertor"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-text/poppler-0.26.0:=[cairo]
- >=dev-cpp/glibmm-2.54.1
- >=dev-cpp/gtkmm-2.18.0:2.4
- >=dev-cpp/cairomm-1.9.8
- >=dev-libs/boehm-gc-7.1:=
- >=dev-libs/glib-2.28
- >=dev-libs/libsigc++-2.0.12
- >=dev-libs/libxml2-2.6.20
- >=dev-libs/libxslt-1.0.15
- dev-libs/popt
- media-gfx/potrace
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libpng:0=
- sci-libs/gsl:=
- x11-libs/libX11
- >=x11-libs/gtk+-2.10.7:2
- >=x11-libs/pango-1.24
- cdr? (
- app-text/libwpg:0.3
- dev-libs/librevenge
- media-libs/libcdr
- )
- dbus? ( dev-libs/dbus-glib )
- exif? ( media-libs/libexif )
- gnome? ( >=gnome-base/gnome-vfs-2.0 )
- imagemagick? ( <media-gfx/imagemagick-7:=[cxx] )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- spell? (
- app-text/aspell
- app-text/gtkspell:2
- )
- visio? (
- app-text/libwpg:0.3
- dev-libs/librevenge
- media-libs/libvisio
- )
- wpg? (
- app-text/libwpg:0.3
- dev-libs/librevenge
- )
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
- $(python_gen_cond_dep '
- || (
- dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- )
- ')
- uniconvertor? ( media-gfx/uniconvertor )
- dia? ( app-office/dia )
- latex? (
- media-gfx/pstoedit[plotutils]
- app-text/dvipsk
- app-text/texlive-core
- )
- postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.36
- dev-util/glib-utils
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.92.1-automagic.patch"
- "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
- "${FILESDIR}/${PN}-0.92.1-desktop.patch"
- "${FILESDIR}/${PN}-0.91_pre3-exif.patch"
- "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
- "${FILESDIR}/${PN}-0.48.4-epython.patch"
- "${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246
- "${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch"
- "${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch"
- "${FILESDIR}/${PN}-0.92.4-glibmm-2.62.patch" #715394
-)
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible
compiler"
- fi
-}
-
-src_prepare() {
- default
-
- sed -i "s#@EPYTHON@#${EPYTHON}#" \
- src/extension/implementation/script.cpp || die
-
- eautoreconf
-
- # bug 421111
- python_fix_shebang share/extensions
-}
-
-src_configure() {
- # aliasing unsafe wrt #310393
- append-flags -fno-strict-aliasing
-
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable nls)
- $(use_enable openmp)
- $(use_enable exif)
- $(use_enable jpeg)
- $(use_enable lcms)
- --enable-poppler-cairo
- $(use_enable wpg)
- $(use_enable visio)
- $(use_enable cdr)
- $(use_enable dbus dbusapi)
- $(use_enable imagemagick magick)
- $(use_with gnome gnome-vfs)
- $(use_with inkjar)
- $(use_with spell gtkspell)
- $(use_with spell aspell)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake -C src helper/sp-marshal.h #686304
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- find "${ED}" -name "*.la" -delete || die
- python_optimize "${ED%/}"/usr/share/${PN}/extensions
-}
diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index 73af4608f62..67658aa0149 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -13,11 +13,9 @@
<flag name="cdr">Enable support for CorelDRAW files via
<pkg>media-libs/libcdr</pkg></flag>
<flag name="dia">Enable DIA flow chart import via
<pkg>app-office/dia</pkg></flag>
<flag name="inkjar">Enable support for OpenOffice.org SVG jar
files</flag>
- <flag name="latex">Enable rendering of LaTeX formulas</flag>
<flag name="svg2">Enable support for new SVG2 features</flag>
<flag name="visio">Enable support for Microsoft Visio diagrams
via <pkg>media-libs/libvisio</pkg></flag>
<flag name="wpg">Enable support for WordPerfect graphics via
<pkg>app-text/libwpg</pkg></flag>
- <flag name="uniconvertor">Enable conversion of vector graphic
files via <pkg>media-gfx/uniconvertor</pkg> (needs Python 2)</flag>
</use>
<upstream>
<remote-id type="gitlab">inkscape/inkscape</remote-id>
