summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2017-05-12 21:11:04 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2017-05-12 21:11:04 +0200
commit026776c9488a9cd15f24e66e38efa3ea4df156fe (patch)
treef807c7b7d7171634e6a3da9bb05766d0d920085c /media-gfx/inkscape/files
parentmedia-gfx/inkscape: Stable for HPPA (bug #596914). (diff)
downloadgentoo-026776c9488a9cd15f24e66e38efa3ea4df156fe.tar.gz
gentoo-026776c9488a9cd15f24e66e38efa3ea4df156fe.tar.bz2
gentoo-026776c9488a9cd15f24e66e38efa3ea4df156fe.zip
media-gfx/inkscape: Remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'media-gfx/inkscape/files')
-rw-r--r--media-gfx/inkscape/files/inkscape-0.48.0-spell.patch45
-rw-r--r--media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch25
-rw-r--r--media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch11
-rw-r--r--media-gfx/inkscape/files/inkscape-0.48.4-automake-1.13.patch21
-rw-r--r--media-gfx/inkscape/files/inkscape-0.48.4-gc74-configure.patch15
-rw-r--r--media-gfx/inkscape/files/inkscape-0.48.4-poppler-0.29.0.patch98
6 files changed, 0 insertions, 215 deletions
diff --git a/media-gfx/inkscape/files/inkscape-0.48.0-spell.patch b/media-gfx/inkscape/files/inkscape-0.48.0-spell.patch
deleted file mode 100644
index 946222276b72..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.0-spell.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- inkscape-0.48.0/configure.ac.orig 2010-10-26 21:22:06.000000000 +0200
-+++ inkscape-0.48.0/configure.ac 2010-10-26 21:33:39.000000000 +0200
-@@ -433,10 +433,15 @@
- fi
- AM_CONDITIONAL(INKJAR, test "$with_ij" = "yes")
-
-+AC_ARG_WITH([gtkspell],
-+ AS_HELP_STRING([--without-gtkspell], [disable gtk spelling widget]),[with_gtkspell=$withval], [with_gtkspell=yes])
-+
- 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
-
- dnl ******************************
-@@ -758,12 +763,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.48.2-libwpg.patch b/media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch
deleted file mode 100644
index 998ce41ab3ab..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- inkscape-0.48.2/configure.ac.orig
-+++ inkscape-0.48.2/configure.ac
-@@ -713,14 +713,14 @@
-
- with_libwpg=no
-
--PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no)
--if test "x$with_libwpg01" = "xyes"; then
-- AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x])
-- with_libwpg=yes
-- AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS)
-- AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS)
--fi
--AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes")
-+#PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no)
-+#if test "x$with_libwpg01" = "xyes"; then
-+# AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x])
-+# with_libwpg=yes
-+# AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS)
-+# AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS)
-+#fi
-+#AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes")
-
- PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no)
- if test "x$with_libwpg02" = "xyes"; then
diff --git a/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch b/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch
deleted file mode 100644
index ea5f214cafc4..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- inkscape-0.48.3.1/inkscape.desktop.in
-+++ inkscape-0.48.3.1/inkscape.desktop.in
-@@ -5,7 +5,7 @@
- _X-GNOME-FullName=Inkscape Vector Graphics Editor
- _Comment=Create and edit Scalable Vector Graphics images
- 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;
- Exec=inkscape %F
- TryExec=inkscape
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.13.patch b/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.13.patch
deleted file mode 100644
index 6d649da99dea..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.13.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Apr 25 15:06:01 UTC 2013
-Subject: fix building with automake-1.3
-
---- inkscape-0.48.4/configure.ac
-+++ inkscape-0.48.4/configure.ac
-@@ -21,12 +21,12 @@
- export CC CXX
- ])
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AC_LANG(C++)
- AC_ISC_POSIX
- AC_PROG_CXX
--AM_PROG_CC_STDC
-+AC_PROG_CC
- AM_PROG_AS
- AC_PROG_RANLIB
- AC_PROG_INTLTOOL(0.22)
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-gc74-configure.patch b/media-gfx/inkscape/files/inkscape-0.48.4-gc74-configure.patch
deleted file mode 100644
index 3ef7ce2c98b6..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.4-gc74-configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- inkscape-0.48.4/configure.ac 2013-12-31 00:38:18.592732496 +0400
-+++ inkscape-0.48.4/configure.ac 2013-12-31 00:39:13.558730872 +0400
-@@ -263,7 +263,11 @@
- # include <gc.h>
- #endif
- #include <stdio.h>
-- extern unsigned GC_version;
-+ #if (GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 4)
-+ unsigned GC_version = GC_get_version();
-+ #else
-+ extern unsigned GC_version;
-+ #endif
- int main(void){
- unsigned min = ((6 << 16) | (4 << 8) | 0);
- printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF);
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-poppler-0.29.0.patch b/media-gfx/inkscape/files/inkscape-0.48.4-poppler-0.29.0.patch
deleted file mode 100644
index bcfea9b77adb..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.4-poppler-0.29.0.patch
+++ /dev/null
@@ -1,98 +0,0 @@
- configure.ac | 5 ++++
- src/extension/internal/pdfinput/pdf-parser.cpp | 32 +++++++++++++++++++++-----
- 2 files changed, 31 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c8e1ae2..d62c989 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -593,6 +593,11 @@ if test "x$popplernewercolorspaceapi" = "xyes"; then
- AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0])
- fi
-
-+PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no)
-+if test "x$popplernewernewcolorspaceapi" = "xyes"; then
-+ AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0])
-+fi
-+
- # Poppler's b604a008 commit changes this
- AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
- popplergfxcolor="no"
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index b6edbfb..3fbf237 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -860,7 +860,9 @@ void PdfParser::opSetExtGState(Object args[], int numArgs) {
- blendingColorSpace = NULL;
- isolated = knockout = gFalse;
- if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
-@@ -1085,7 +1087,13 @@ void PdfParser::opSetFillColorSpace(Object args[], int numArgs) {
-
- state->setFillPattern(NULL);
- res->lookupColorSpace(args[0].getName(), &obj);
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ if (obj.isNull()) {
-+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
-+ } else {
-+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
-+ }
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
- } else {
-@@ -1126,7 +1134,13 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int numArgs) {
-
- state->setStrokePattern(NULL);
- res->lookupColorSpace(args[0].getName(), &obj);
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ if (obj.isNull()) {
-+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
-+ } else {
-+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
-+ }
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
- } else {
-@@ -2756,7 +2770,9 @@ void PdfParser::doImage(Object *ref, Stream *str, GBool inlineImg) {
- }
- }
- if (!obj1.isNull()) {
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- colorSpace = GfxColorSpace::parse(&obj1, NULL);
-@@ -2847,7 +2863,9 @@ void PdfParser::doImage(Object *ref, Stream *str, GBool inlineImg) {
- obj2.free();
- }
- }
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
-@@ -3040,7 +3058,9 @@ void PdfParser::doForm(Object *str) {
- if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
- transpGroup = gTrue;
- if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);