Merge pull request #21765 from taku0/inkscape-0.92

inkscape: 0.91 -> 0.92

pkgs/applications/graphics/inkscape/default.nix

@@ -2,45 +2,24 @@
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
 , gsl, python2, poppler, imagemagick, libwpg, librevenge
-, libvisio, libcdr, libexif, unzip, automake114x, autoconf
+, libvisio, libcdr, libexif, automake114x, cmake
-, boxMakerPlugin ? false # boxmaker plugin
 }:
 
 let 
   python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]);
-
-boxmaker = fetchurl {
-  # http://www.inkscapeforum.com/viewtopic.php?f=11&t=10403
-  url = "http://www.keppel.demon.co.uk/111000/files/BoxMaker0.91.zip";
-  sha256 = "5c5697f43dc3a95468f61f479cb50b7e2b93379a1729abf19e4040ac9f43a1a8";
-};
-
-stdcxx-patch = fetchpatch {
-  url = http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/diff/14542?context=3;
-  sha256 = "15h831lsh61ichgdygkdkbdm1dlb9mhprldq27hkx2472lcnyx6y";
-};
-
 in
 
 stdenv.mkDerivation rec {
-  name = "inkscape-0.91";
+  name = "inkscape-0.92.0";
 
   src = fetchurl {
-    url = "https://inkscape.global.ssl.fastly.net/media/resources/file/"
+    url = "https://inkscape.org/gallery/item/10552/${name}.tar.bz2";
-        + "${name}.tar.bz2";
+    sha256 = "0mmssxnxsvb3bpm7ck5pqvwyacrz1nkyacs571jx8j04l1cw3d5q";
-    sha256 = "06ql3x732x2rlnanv0a8aharsnj91j5kplksg574090rks51z42d";
   };
 
-  patches = [ ./deprecated-scopedptr.patch ];
-
   postPatch = ''
-    patch -i ${stdcxx-patch} -p 0
     patchShebangs share/extensions
-  ''
+    patchShebangs fix-roff-punct
-  # Clang gets misdetected, so hardcode the right answer
-  + stdenv.lib.optionalString stdenv.cc.isClang ''
-    substituteInPlace src/ui/tool/node.h \
-      --replace "#if __cplusplus >= 201103L" "#if true"
   '';
 
   # Python is used at run-time to execute scripts, e.g., those from
@@ -51,24 +30,12 @@ stdenv.mkDerivation rec {
     pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
     makeWrapper intltool gsl poppler imagemagick libwpg librevenge
-    libvisio libcdr libexif automake114x autoconf
+    libvisio libcdr libexif automake114x cmake
-  ] ++ stdenv.lib.optional boxMakerPlugin unzip;
+  ];
 
   enableParallelBuilding = true;
-  doCheck = true;
 
   postInstall = ''
-    ${if boxMakerPlugin then "
-      mkdir -p $out/share/inkscape/extensions/
-      # boxmaker packaged version 0.91 in a directory called 0.85 ?!??
-      unzip ${boxmaker};
-      cp boxmake-upd-0.85/* $out/share/inkscape/extensions/
-      rm -Rf boxmake-upd-0.85
-      "
-    else 
-      ""
-    }
-
     # Make sure PyXML modules can be found at run-time.
     rm "$out/share/icons/hicolor/icon-theme.cache"
   '';

pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch

@@ -1,16 +0,0 @@
-glibmm deprecated ScopedPtr
----
-diff -u src/ui/clipboard.cpp src/ui/clipboard.cpp
---- a/src/ui/clipboard.cpp	2015-01-28 04:32:28.162676000 +0100
-+++ b/src/ui/clipboard.cpp	2016-04-03 09:13:12.360980533 +0200
-@@ -1402,7 +1402,7 @@
- 
-         Glib::ustring target;
-         if (atom_name) {
--            target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*.
-+            target = Glib::make_unique_ptr_gfree(atom_name).get(); //This frees the gchar*.
-         }
- 
-         listTargets.push_back(target);
-
-Diff finished.  Sun Apr  3 09:13:51 2016