main/inkscape: upgrade to 0.48.5

3 files changed, 8 insertions, 82 deletions

diff --git a/main/inkscape/APKBUILD b/main/inkscape/APKBUILD
index 1397658cd..ae2dcc897 100644
--- a/main/inkscape/APKBUILD
+++ b/main/inkscape/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=inkscape
-pkgver=0.48.4
-pkgrel=13
+pkgver=0.48.5
+pkgrel=0
 pkgdesc="A vector-based drawing program - svg compliant"
 url="http://inkscape.sourceforge.net/"
 arch="all"
@@ -27,15 +27,12 @@ install=
 subpackages="$pkgname-doc $pkgname-lang $pkgname-view"
 source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
 	automake.patch
-	inkscape-0.48.4-spuriouscomma.patch
-	inkscape-0.48.4-gc74.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
-	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg "$i"; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -79,15 +76,9 @@ doc() {
 		"$pkgdir"/usr/share/inkscape/tutorials \
 		"$subpkgdir"/usr/share/inkscape
 }
-md5sums="2c7149e877609f3f7e7a9d4e6f510d2b  inkscape-0.48.4.tar.gz
-f212448d60a2182611071e40d247da06  automake.patch
-a78af90abbf8629636f726dda30a128c  inkscape-0.48.4-spuriouscomma.patch
-19c6ba7677067a5d8cc20a4baa137be3  inkscape-0.48.4-gc74.patch"
-sha256sums="6e19ee087a79012a0cec9c6e6d194357e256b7ec538536efcbdf74fdf2d31d5a  inkscape-0.48.4.tar.gz
-4c21350f16032615ff98096a1cd7bf83ec3a55f8df4f3ed4ea356d47f9df6a78  automake.patch
-6d7ed69e538f6e1cb1762a144a852ff39c8781e5dba5c4c515e65ce0b7b17066  inkscape-0.48.4-spuriouscomma.patch
-e9f308ea08b76af028184fd9e6a3228c7efa57b75697eb65bb0edbf7d6d12f4b  inkscape-0.48.4-gc74.patch"
-sha512sums="bb9ad17304a335d6b0eb1e9e03833a4f510c24851f91b1f8964a17b092f168ebd37f1782eafc74ee3056e8f3db55e60e1148bb3411058a2c6099f5ff49fbade8  inkscape-0.48.4.tar.gz
-fab98a525a3343eda7c8e8ce59ce9a8f977c1b8edea07870cc4f4b23fc0fd452792b39f2a87cebb5be110e2b82cf95bc871be9d0f3c1a764d6ded86e218e1537  automake.patch
-5bcdff5f67a8fa2e685ab9207c9657fdb43821b6706345264fdaccbc84a89f8157144d4f854ad9d203c2679f76aa4e94136bb13fd011404dd678699ee1044948  inkscape-0.48.4-spuriouscomma.patch
-d4b3189b19c41dff5e835e3ca5454cec7f962cfd5c3bd4098f4346913029bb00d8d8f4b61e6fe056059b3f059c91c350b610cc4d85c830293b5d3ed31202a317  inkscape-0.48.4-gc74.patch"
+md5sums="4e25b665ab40506955fb520aaa4e0d8f  inkscape-0.48.5.tar.gz
+f212448d60a2182611071e40d247da06  automake.patch"
+sha256sums="ff5194f78057ab24234ed71b8e7aa227d4847d42166c6d44391efa86f3caf130  inkscape-0.48.5.tar.gz
+4c21350f16032615ff98096a1cd7bf83ec3a55f8df4f3ed4ea356d47f9df6a78  automake.patch"
+sha512sums="dd62a3b7d1b6875f83f3ec88646c1576735b7d359f75722f1ad6204530370d45256de54781b9f51f97aed32f19e23d7bee059339d398efbff01169f66d982818  inkscape-0.48.5.tar.gz
+fab98a525a3343eda7c8e8ce59ce9a8f977c1b8edea07870cc4f4b23fc0fd452792b39f2a87cebb5be110e2b82cf95bc871be9d0f3c1a764d6ded86e218e1537  automake.patch"
diff --git a/main/inkscape/inkscape-0.48.4-gc74.patch b/main/inkscape/inkscape-0.48.4-gc74.patch
deleted file mode 100644
index 41615ac49..000000000
--- a/main/inkscape/inkscape-0.48.4-gc74.patch
+++ /dev/null
@@ -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;
- }
diff --git a/main/inkscape/inkscape-0.48.4-spuriouscomma.patch b/main/inkscape/inkscape-0.48.4-spuriouscomma.patch
deleted file mode 100644
index 316c571d8..000000000
--- a/main/inkscape/inkscape-0.48.4-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);