diff --git a/srcpkgs/inkscape/patches/freetype.patch b/srcpkgs/inkscape/patches/freetype.patch deleted file mode 100644 index 47a3f8a6b8..0000000000 --- a/srcpkgs/inkscape/patches/freetype.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/libnrtype/FontFactory.h 2010-04-15 19:00:11 +0000 -+++ src/libnrtype/FontFactory.h 2013-11-28 05:54:34 +0000 -@@ -31,7 +31,8 @@ - #include - #else - #include --#include -+#include -+#include FT_FREETYPE_H - #endif - - namespace Glib - - diff --git a/srcpkgs/inkscape/patches/inkscape-0.48.4-gc74.patch b/srcpkgs/inkscape/patches/inkscape-0.48.4-gc74.patch deleted file mode 100644 index b610d09749..0000000000 --- a/srcpkgs/inkscape/patches/inkscape-0.48.4-gc74.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- src/gc-core.h.old 2013-12-31 01:22:38.976653890 +0400 -+++ src/gc-core.h 2013-12-31 01:22:48.525653608 +0400 -@@ -57,7 +57,7 @@ - CleanupFunc *old_func, - void **old_data); - int (*general_register_disappearing_link)(void **p_ptr, -- void *base); -+ const void *base); - int (*unregister_disappearing_link)(void **p_ptr); - std::size_t (*get_heap_size)(); - std::size_t (*get_free_bytes)(); ---- src/gc.cpp.old 2013-12-31 01:23:50.462651778 +0400 -+++ src/gc.cpp 2013-12-31 01:40:37.718622017 +0400 -@@ -70,8 +70,8 @@ - return base + debug_base_fixup(); - } - --int debug_general_register_disappearing_link(void **p_ptr, void *base) { -- char *real_base=reinterpret_cast(base) - debug_base_fixup(); -+int debug_general_register_disappearing_link(void **p_ptr, const void *base) { -+ char *real_base=const_cast(reinterpret_cast(base)) - debug_base_fixup(); - return GC_general_register_disappearing_link(p_ptr, real_base); - } - -@@ -90,7 +90,7 @@ - } - } - --int dummy_general_register_disappearing_link(void **, void *) { return false; } -+int dummy_general_register_disappearing_link(void **, const void *) { return false; } - - int dummy_unregister_disappearing_link(void **/*link*/) { return false; } - -@@ -112,7 +112,11 @@ - &GC_malloc_atomic_uncollectable, - &GC_base, - &GC_register_finalizer_ignore_self, -+#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4) - &GC_general_register_disappearing_link, -+#else -+ (int (*)(void**, const void*))(&GC_general_register_disappearing_link), -+#endif - &GC_unregister_disappearing_link, - &GC_get_heap_size, - &GC_get_free_bytes, -@@ -202,7 +206,7 @@ - die_because_not_initialized(); - } - --int stub_general_register_disappearing_link(void **, void *) { -+int stub_general_register_disappearing_link(void **, const void *) { - die_because_not_initialized(); - return 0; - } diff --git a/srcpkgs/inkscape/patches/poppler-0.26.patch b/srcpkgs/inkscape/patches/poppler-0.26.patch deleted file mode 100644 index 84b324a5df..0000000000 --- a/srcpkgs/inkscape/patches/poppler-0.26.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2014-04-28 13:42:17.843140695 +0000 -+++ src/extension/internal/pdfinput/pdf-parser.cpp 2014-04-28 14:05:10.646106685 +0000 -@@ -861,7 +861,7 @@ - isolated = knockout = gFalse; - if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) { - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); -+ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL); - #else - blendingColorSpace = GfxColorSpace::parse(&obj5); - #endif -@@ -1085,9 +1085,9 @@ - res->lookupColorSpace(args[0].getName(), &obj); - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0], NULL); -+ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); - } else { -- colorSpace = GfxColorSpace::parse(&obj, NULL); -+ colorSpace = GfxColorSpace::parse(&obj, NULL, NULL); - } - #else - if (obj.isNull()) { -@@ -1120,9 +1120,9 @@ - res->lookupColorSpace(args[0].getName(), &obj); - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0], NULL); -+ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); - } else { -- colorSpace = GfxColorSpace::parse(&obj, NULL); -+ colorSpace = GfxColorSpace::parse(&obj, NULL, NULL); - } - #else - if (obj.isNull()) { -@@ -1213,7 +1213,7 @@ - } - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { -+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) { - state->setFillPattern(pattern); - builder->updateStyle(state); - } -@@ -1273,7 +1273,7 @@ - } - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { -+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) { - state->setStrokePattern(pattern); - builder->updateStyle(state); - } -@@ -1711,7 +1711,7 @@ - GBool savedState = gFalse; - - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- if (!(shading = res->lookupShading(args[0].getName(), NULL))) { -+ if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) { - return; - } - #else -@@ -2727,7 +2727,7 @@ - } - if (!obj1.isNull()) { - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- colorSpace = GfxColorSpace::parse(&obj1, NULL); -+ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); - #else - colorSpace = GfxColorSpace::parse(&obj1); - #endif -@@ -2816,7 +2816,7 @@ - } - } - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- maskColorSpace = GfxColorSpace::parse(&obj1, NULL); -+ maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); - #else - maskColorSpace = GfxColorSpace::parse(&obj1); - #endif -@@ -3007,7 +3007,7 @@ - transpGroup = gTrue; - if (!obj1.dictLookup(const_cast("CS"), &obj3)->isNull()) { - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); -+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL); - #else - blendingColorSpace = GfxColorSpace::parse(&obj3); - #endif diff --git a/srcpkgs/inkscape/patches/spuriouscomma.patch b/srcpkgs/inkscape/patches/spuriouscomma.patch deleted file mode 100644 index bc538068f9..0000000000 --- a/srcpkgs/inkscape/patches/spuriouscomma.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/widgets/desktop-widget.h~ 2011-07-08 13:25:09.000000000 -0500 -+++ src/widgets/desktop-widget.h 2013-02-15 16:04:45.806910365 -0600 -@@ -239,7 +239,7 @@ - private: - GtkWidget *tool_toolbox; - GtkWidget *aux_toolbox; -- GtkWidget *commands_toolbox,; -+ GtkWidget *commands_toolbox; - GtkWidget *snap_toolbox; - - static void init(SPDesktopWidget *widget); diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 93de2a9526..391f60f9be 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape' pkgname=inkscape -version=0.48.4 -revision=5 +version=0.48.5 +revision=1 build_style=gnu-configure configure_args="--enable-lcms --enable-poppler-cairo" hostmakedepends="pkg-config intltool which" @@ -14,4 +14,4 @@ maintainer="Juan RP " homepage="http://inkscape.org/" license="GPL-2" distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.bz2" -checksum=8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d +checksum=2b6ce684f9f2a0691ab454656424555cbda131db78e13973360684bc833ad969