Add inkscape revision snapshot

svn path=/trunk/overlay/; revision=154

7 files changed, 109 insertions, 94 deletions

diff --git a/media-gfx/inkscape/files/inkscape-0.47-escapeDevName.patch b/media-gfx/inkscape/files/inkscape-0.47-escapeDevName.patch
deleted file mode 100644
index 54088e2..0000000
--- a/media-gfx/inkscape/files/inkscape-0.47-escapeDevName.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- inkscape/src/dialogs/input.cpp	(revision 20335)
-+++ inkscape/src/dialogs/input.cpp	(working copy)
-@@ -67,6 +67,14 @@
-     "ignore", "x", "y", "pressure", "xtilt", "ytilt", "wheel"
- };
- 
-+Glib::ustring stripPeriod(const Glib::ustring &input) {
-+    Glib::ustring result = input;
-+    for(Glib::ustring::size_type pos=result.find('.'); pos!=Glib::ustring::npos; pos=result.find('.',pos)){
-+       result.erase(pos,1);
-+    }
-+    return result;
-+}
-+
- void
- sp_input_load_from_preferences (void)
- {
-@@ -75,7 +83,7 @@
-     for (GList *list_ptr = gdk_devices_list(); list_ptr != NULL; list_ptr = list_ptr->next) {
-         GdkDevice *device = static_cast<GdkDevice *>(list_ptr->data);
-         //repr = sp_repr_lookup_child(devices, "id", device->name);
--        Glib::ustring device_path = Glib::ustring("/devices/") + device->name;
-+        Glib::ustring device_path = Glib::ustring("/devices/") + stripPeriod(device->name);
-         if (/*repr != NULL*/ 1) {
-             GdkInputMode mode;
-             Glib::ustring device_mode = prefs->getString(device_path + "/mode");
diff --git a/media-gfx/inkscape/files/inkscape-0.47-export-dpi.patch b/media-gfx/inkscape/files/inkscape-0.47-export-dpi.patch
deleted file mode 100644
index 8997261..0000000
--- a/media-gfx/inkscape/files/inkscape-0.47-export-dpi.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: src/extension/internal/cairo-renderer-pdf-out.cpp
-===================================================================
---- src/extension/internal/cairo-renderer-pdf-out.cpp	(revision 20479)
-+++ src/extension/internal/cairo-renderer-pdf-out.cpp	(working copy)
-@@ -153,7 +153,7 @@
-         g_warning("Parameter <blurToBitmap> might not exist");
-     }
- 
--    int new_bitmapResolution  = 72;
-+    int new_bitmapResolution  = 150;
-     try {
-         new_bitmapResolution = mod->get_param_int("resolution");
-     }
-Index: src/extension/internal/cairo-ps-out.cpp
-===================================================================
---- src/extension/internal/cairo-ps-out.cpp	(revision 20479)
-+++ src/extension/internal/cairo-ps-out.cpp	(working copy)
-@@ -151,7 +151,7 @@
-         new_blurToBitmap  = mod->get_param_bool("blurToBitmap");
-     } catch(...) {}
- 
--    int new_bitmapResolution  = 72;
-+    int new_bitmapResolution  = 150;
-     try {
-         new_bitmapResolution = mod->get_param_int("resolution");
-     } catch(...) {}
-@@ -215,7 +215,7 @@
-         new_blurToBitmap  = mod->get_param_bool("blurToBitmap");
-     } catch(...) {}
- 
--    int new_bitmapResolution  = 72;
-+    int new_bitmapResolution  = 150;
-     try {
-         new_bitmapResolution = mod->get_param_int("resolution");
-     } catch(...) {}
-Index: src/main.cpp
-===================================================================
---- src/main.cpp	(revision 20479)
-+++ src/main.cpp	(working copy)
-@@ -1398,6 +1398,16 @@
-         (*i)->set_param_bool("blurToBitmap", TRUE);
-     }
- 
-+    if (sp_export_dpi) {
-+        int dpi = atoi(sp_export_dpi);
-+        if ((dpi < 1) || (dpi > 10000)) {
-+            g_warning("DPI value %s out of range [1 - 10000]. Nothing exported.", sp_export_dpi);
-+            return;
-+        }
-+        g_print("DPI: %d\n", dpi);
-+        (*i)->set_param_int("resolution", dpi);
-+    }
-+
-     (*i)->save(doc, uri);
- }
- 
diff --git a/media-gfx/inkscape/files/inkscape-0.47-type-punning.patch b/media-gfx/inkscape/files/inkscape-0.47-type-punning.patch
deleted file mode 100644
index bbd8f68..0000000
--- a/media-gfx/inkscape/files/inkscape-0.47-type-punning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- inkscape/src/util/glib-list-iterators.h	(revision 20335)
-+++ inkscape/src/util/glib-list-iterators.h	(working copy)
-@@ -44,7 +44,8 @@
-     GSList const *list() const { return _list; }
-     
-     reference operator*() const {
--        return *reinterpret_cast<pointer>(&_list->data);
-+        void * const& x(_list->data);
-+        return reinterpret_cast<reference>(x);
-     }
- 
-     bool operator==(GSListConstIterator const &other) {
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
new file mode 100644
index 0000000..ea5f214
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch
@@ -0,0 +1,11 @@
+--- 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.49.0-libwpg.patch b/media-gfx/inkscape/files/inkscape-0.49.0-libwpg.patch
new file mode 100644
index 0000000..124ac39
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.49.0-libwpg.patch
@@ -0,0 +1,23 @@
+--- inkscape-0.49_alpha12387/configure.ac.orig	2013-06-25 14:12:04.000000000 +0100
++++ inkscape-0.49_alpha12387/configure.ac	2013-06-25 14:12:58.000000000 +0100
+@@ -498,13 +498,13 @@
+ with_libwpg=no
+ 
+ if test "x$enable_wpg" = "xyes"; then
+-	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
++#	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
+ 
+ 	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.49.0-spell.patch b/media-gfx/inkscape/files/inkscape-0.49.0-spell.patch
new file mode 100644
index 0000000..882ddfd
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.49.0-spell.patch
@@ -0,0 +1,64 @@
+--- 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
+@@ -645,13 +645,18 @@
+ 	AS_HELP_STRING([--enable-gtk3-experimental], [enable compilation with GTK+3 (EXPERIMENTAL!)]),
+ 	[enable_gtk3=$enableval], [enable_gtk3=no])
+ 
++AC_ARG_WITH([gtkspell],
++	AS_HELP_STRING([--without-gtkspell], [disable gtk spelling widget]),[with_gtkspell=$withval], [with_gtkspell=yes])
++
+ with_gtkmm_3_0="no"
+ 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,
+@@ -703,9 +708,11 @@
+ 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,
+@@ -838,12 +843,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.49_alpha12387-python2.patch b/media-gfx/inkscape/files/inkscape-0.49_alpha12387-python2.patch
new file mode 100644
index 0000000..a586053
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.49_alpha12387-python2.patch
@@ -0,0 +1,11 @@
+--- 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", "python2" },
+ #endif
+         {"ruby",   "ruby-interpreter",   "ruby"   },
+         {"shell",  "shell-interpreter",  "sh"     },