inkscape: Update to 0.92. Need switch to cmake build soon.

mingw-w64-inkscape/PKGBUILD

@@ -11,14 +11,15 @@ fi
 _realname=inkscape
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.91
-pkgrel=15
+pkgver=0.92.0
+pkgrel=1
 pkgdesc="Vector graphics editor using the SVG file format (mingw-w64)"
 arch=('any')
 url="http://inkscape.sourceforge.net/"
 license=("GPL" "LGPL")
 install=inkscape-${CARCH}.install
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
              "${MINGW_PACKAGE_PREFIX}-boost"
              "intltool")
@@ -49,23 +50,23 @@ optdepends=(#"${MINGW_PACKAGE_PREFIX}-pstoedit: latex formulas"
             #"${MINGW_PACKAGE_PREFIX}-uniconvertor: reading/writing to some proprietary formats"
             )
 options=('staticlibs' 'strip')
-source=("https://inkscape.global.ssl.fastly.net/media/resources/file/${_realname}-${pkgver}.tar.gz"
+source=(https://inkscape.org/gallery/item/10552/${_realname}-${pkgver}.tar.bz2
         inkscape-0.48.4-headers-fix.patch
         inkscape-0.48.4-python.patch
         inkscape-0.48.4-use-GStatBuf-insted-stat.patch
         inkscape-0.48.4-use-GStatBuf-insted-stat-gtk3.patch
         inkscape-0.48.4-poppler-includes-conflicts.patch
-        inkscape-0.48.4-win32-relocatable.patch
+        inkscape-0.92.0-win32-relocatable.patch
         inkscape-0.48.4-win32-file-dialog.patch
         inkscape-0.48.4-python-extensions-location.patch
         inkscape-0.91-simulaneous-intltool-gettext.patch)
-sha256sums=('2ca3cfbc8db53e4a4f20650bf50c7ce692a88dcbf41ebc0c92cd24e46500db20'
+sha256sums=('b8b4c159a00448d465384533e5a70d3f33e5f9c6b74c76ea5d636ddd6dd7ba56'
             'e578fbef476704a42522ec5298f0202d2e600c2e03a98dba2c62d4ee1e53b6b5'
             'ee948c90126407285b262cbea3d5a182e8fc166fddce09ea33d689fde3101a49'
             '53351468636dec1b00815d87d29dc1117538378f691efd00d2ef4716e0153ed9'
             'a6013a43d26a0cbb6cfc19d1c7ce7d63c24b2b9368c22df600f0cf8ad741ff1e'
             '7458f4fac3bf75d388b71a61bdc30e0bed97cbbf63b73119b2f61af6d674a8b0'
-            'e68cf8dfd575639923527450b6357eda8e5656fdca18acdd0471d8cc429f7b16'
+            '38a880a5475dd0ad99707c18a35e716f6cd677ecb7982612f2f699002f7113bf'
             '5912d39285b0fd4ab63651836ef6ddd32d149a1e739c9561584fdcadc0b17220'
             '55b0922f98c98ac5df8ba0869c46ff9eeeee9aaceef9afbaad9c4763dd3923ba'
             'ea625d1d7260d32866e4e61946fa02793b1762f66dc223364dbcc5e628bb5bfe')
@@ -80,19 +81,19 @@ prepare() {
     patch -p1 -i ${srcdir}/inkscape-0.48.4-use-GStatBuf-insted-stat-gtk3.patch
   fi
   patch -p1 -i ${srcdir}/inkscape-0.48.4-poppler-includes-conflicts.patch
-  patch -p1 -i ${srcdir}/inkscape-0.48.4-win32-relocatable.patch
+  patch -p1 -i ${srcdir}/inkscape-0.92.0-win32-relocatable.patch
   patch -p1 -i ${srcdir}/inkscape-0.48.4-win32-file-dialog.patch
   patch -p1 -i ${srcdir}/inkscape-0.48.4-python-extensions-location.patch
-  patch -p1 -i ${srcdir}/inkscape-0.91-simulaneous-intltool-gettext.patch
+  #patch -p1 -i ${srcdir}/inkscape-0.91-simulaneous-intltool-gettext.patch
 
+  ./autogen.sh 
+  
   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 '/^#include <g.kmm/i #include <glibmm.h>' src/*{,/*{,/*{,/*}}}.{h,cpp}
   sed -e "s|export-dynamic|export-all-symbols|g" -i src/Makefile.am
-
-  autoreconf -fi -I m4
 }
 
 build() {

mingw-w64-inkscape/inkscape-0.92.0-win32-relocatable.patch

@@ -1,6 +1,6 @@
---- inkscape-0.48.4-orig/src/main.cpp.orig	2012-02-14 07:22:17.670697000 +0400
-+++ inkscape-0.48.4-orig/src/main.cpp	2014-03-04 09:34:39.428200000 +0400
-@@ -477,33 +477,31 @@
+--- inkscape-0.92.0/src/main.cpp.orig	2017-01-02 12:44:59.000000000 +0300
++++ inkscape-0.92.0/src/main.cpp	2017-01-16 12:53:06.744038300 +0300
+@@ -546,33 +546,31 @@
      gchar const *path = g_getenv("PATH");
      gchar const *pythonpath = g_getenv("PYTHONPATH");
  
@@ -12,7 +12,7 @@
 +    gchar *prefixpath = g_strdup(win32_getPrefix().data());
 +    gchar *pythonlib = g_build_filename(prefixpath, "lib", "python2.7", NULL);
 +    gchar *pythondll = g_build_filename(prefixpath, "lib", "python2.7", "lib-dynload", "DLLs", NULL);
-     
+ 
      // Python 2.x needs short paths in PYTHONPATH.
      // Otherwise it doesn't work when Inkscape is installed in Unicode directories.
      // g_win32_locale_filename_from_utf8 is the GLib wrapper for GetShortPathName.
@@ -44,9 +44,9 @@
      }
  
      g_setenv("PATH", new_path, TRUE);
-@@ -521,9 +518,7 @@
-         printf("python not found\n\n");
-     }*/
+@@ -597,9 +595,7 @@
+     // prevent "please insert disk" messages. fixes bug #950781
+     SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
  
 -    g_free(python);
 -    g_free(scripts);
@@ -54,8 +54,8 @@
 +    g_free(prefixpath);
      g_free(pythonlib);
      g_free(pythondll);
-     
-@@ -595,19 +591,21 @@
+ 
+@@ -673,19 +669,21 @@
      // obtain short path to executable dir and pass it
      // to bindtextdomain (it doesn't understand UTF-8)
      gchar *shortexedir = g_win32_locale_filename_from_utf8(exedir);
@@ -78,8 +78,8 @@
  #elif defined(ENABLE_NLS)
  # ifdef ENABLE_BINRELOC
      bindtextdomain(GETTEXT_PACKAGE, BR_LOCALEDIR(""));
---- inkscape-0.48.4-orig/src/prefix.h.orig	2014-03-04 07:07:25.022000000 +0400
-+++ inkscape-0.48.4-orig/src/prefix.h	2014-03-04 09:31:46.705000000 +0400
+--- inkscape-0.92.0/src/prefix.h.orig	2014-03-04 07:07:25.022000000 +0400
++++ inkscape-0.92.0/src/prefix.h	2014-03-04 09:31:46.705000000 +0400
 @@ -124,6 +124,8 @@
  #include <glibmm/ustring.h>
  
@@ -89,8 +89,8 @@
  char *win32_relative_path(const char *childPath);
  
  #define WIN32_DATADIR(suffix) (win32_relative_path(suffix))
---- inkscape-0.48.4-orig/src/prefix.cpp.orig	2011-07-08 22:25:09.468790000 +0400
-+++ inkscape-0.48.4-orig/src/prefix.cpp	2014-03-04 09:31:35.395000000 +0400
+--- inkscape-0.92.0/src/prefix.cpp.orig	2011-07-08 22:25:09.468790000 +0400
++++ inkscape-0.92.0/src/prefix.cpp	2014-03-04 09:31:35.395000000 +0400
 @@ -447,23 +447,49 @@
      return ret;
  }
@@ -149,8 +149,8 @@
  static Glib::ustring win32_getResourcePath(const Glib::ustring &childPath)
  {
      Glib::ustring dir = win32_getDataDir();
---- inkscape-0.48.4-orig/src/path-prefix.h.orig	2014-03-04 07:02:21.005800000 +0400
-+++ inkscape-0.48.4-orig/src/path-prefix.h	2014-03-04 07:04:57.427800000 +0400
+--- inkscape-0.92.0/src/path-prefix.h.orig	2014-03-04 07:02:21.005800000 +0400
++++ inkscape-0.92.0/src/path-prefix.h	2014-03-04 07:04:57.427800000 +0400
 @@ -43,22 +43,22 @@
  #else
  #  ifdef WIN32