Date: Tuesday, June 24, 2014 @ 00:12:14 Author: bisson Revision: 215398
upstream update Modified: inkscape/trunk/PKGBUILD Deleted: inkscape/trunk/freetype.patch inkscape/trunk/gc74.patch inkscape/trunk/poppler-0.26.patch inkscape/trunk/spuriouscomma.patch ---------------------+ PKGBUILD | 23 ++---------- freetype.patch | 15 -------- gc74.patch | 54 ------------------------------ poppler-0.26.patch | 89 -------------------------------------------------- spuriouscomma.patch | 11 ------ 5 files changed, 5 insertions(+), 187 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-06-23 20:16:43 UTC (rev 215397) +++ PKGBUILD 2014-06-23 22:12:14 UTC (rev 215398) @@ -4,8 +4,8 @@ # Contributor: tobias <tob...@archlinux.org> pkgname=inkscape -pkgver=0.48.4 -pkgrel=17 +pkgver=0.48.5 +pkgrel=1 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') @@ -19,33 +19,20 @@ 'python2-lxml: some extensions and filters' 'uniconvertor: reading/writing to some proprietary formats') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"; - 'spuriouscomma.patch' - 'ime-placement.patch' - 'freetype.patch' - 'gc74.patch' - 'poppler-0.26.patch') -sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c' - '7d1d5a6d1d2b0926721a994d5889c52890fc57c1' - 'b12b948ca5ee7e02703a13aa8b8bccdf67947f12' - 'aba4d98bebae088c3401fd9259ea3cf70b96fbbf' - '3e1b5b6852d668388a857bc7a73fb7731fb262b8' - 'b60843f43e6d3b6cfcf4e253abb3f7ea7bc69c2a') + 'ime-placement.patch') +sha1sums=('83ddb0c96069638f712a869039989bfd7d79c6a8' + 'b12b948ca5ee7e02703a13aa8b8bccdf67947f12') install=install prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../gc74.patch # FS#39106 - patch -p0 -i ../freetype.patch # FS#37956 patch -p1 -i ../ime-placement.patch # FS#39898 - patch -p0 -i ../spuriouscomma.patch - patch -p0 -i ../poppler-0.26.patch sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py sed -i 's|"python"|"python2"|g' src/main.cpp - sed -i '/^#include <g.kmm/i #include <glibmm.h>' src/*{,/*{,/*{,/*}}}.{h,cpp} sed -i '/extern unsigned GC_version;/c unsigned GC_version=GC_VERSION_MAJOR<<16+GC_VERSION_MINOR<<8+GC_VERSION_MICRO;' configure } Deleted: freetype.patch =================================================================== --- freetype.patch 2014-06-23 20:16:43 UTC (rev 215397) +++ freetype.patch 2014-06-23 22:12:14 UTC (rev 215398) @@ -1,15 +0,0 @@ -=== modified file 'src/libnrtype/FontFactory.h' ---- 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 <pango/pangowin32.h> - #else - #include <pango/pangoft2.h> --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - #endif - - namespace Glib - - Deleted: gc74.patch =================================================================== --- gc74.patch 2014-06-23 20:16:43 UTC (rev 215397) +++ gc74.patch 2014-06-23 22:12:14 UTC (rev 215398) @@ -1,54 +0,0 @@ ---- inkscape-0.48.4/src/gc-core.h.old 2013-12-31 01:22:38.976653890 +0400 -+++ inkscape-0.48.4/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)(); ---- inkscape-0.48.4/src/gc.cpp.old 2013-12-31 01:23:50.462651778 +0400 -+++ inkscape-0.48.4/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<char *>(base) - debug_base_fixup(); -+int debug_general_register_disappearing_link(void **p_ptr, const void *base) { -+ char *real_base=const_cast<char *>(reinterpret_cast<const char *>(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; - } Deleted: poppler-0.26.patch =================================================================== --- poppler-0.26.patch 2014-06-23 20:16:43 UTC (rev 215397) +++ poppler-0.26.patch 2014-06-23 22:12:14 UTC (rev 215398) @@ -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<char*>("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<char*>("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 Deleted: spuriouscomma.patch =================================================================== --- spuriouscomma.patch 2014-06-23 20:16:43 UTC (rev 215397) +++ spuriouscomma.patch 2014-06-23 22:12:14 UTC (rev 215398) @@ -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);
