* Inkscape 0.47.

svn path=/nixpkgs/trunk/; revision=18641

4 files changed, 12 insertions, 97 deletions

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 117b20d4770a..8cd98aef1368 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -1,14 +1,14 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "inkscape-0.46";
+  name = "inkscape-0.47";
 
   src = fetchurl {
-    url = "mirror://sf/inkscape/${name}.tar.gz";
-    sha256 = "0flrjqa68vnnn8lrhj86xpa6h2cyzrvjy6873v9id092f86ix1li";
+    url = "mirror://sourceforge/inkscape/${name}.tar.gz";
+    sha256 = "15wvcllq0nj69hkyanzvxbjhlq06cwabqabaa54n5n4307hrp2g5";
   };
 
-  patches = [ ./configure-python-libs.patch ./libpng-setjmp.patch ./gtk-clist.patch ]; 
+  patches = [ ./configure-python-libs.patch ]; 
 
   propagatedBuildInputs = [
     # Python is used at run-time to execute scripts, e.g., those from
@@ -17,25 +17,13 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    pkgconfig perl perlXMLParser gtk libXft fontconfig libpng zlib popt boehmgc
+    pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext
-    makeWrapper
+    makeWrapper intltool gsl
   ];
 
   configureFlags = "--with-python";
 
-  # Fix compilation on glibc 2.9 by adding missing string header
-  preConfigure = ''
-    echo "#include <string.h>" > tmp.cpp
-    cat tmp.cpp src/dom/io/uristream.cpp > src/dom/io/uristream.cpp.new
-    rm tmp.cpp
-    mv src/dom/io/uristream.cpp.new src/dom/io/uristream.cpp
-  '';
-
-  preBuild = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I./extension/script"
-  '';
-
   postInstall = ''
     # Make sure PyXML modules can be found at run-time.
     for i in "$out/bin/"*
@@ -46,6 +34,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  NIX_LDFLAGS = "-lX11";
+
   meta = {
     license = "GPL";
     homepage = http://www.inkscape.org;
@@ -53,7 +43,7 @@ stdenv.mkDerivation rec {
       Inkscape is a feature-rich vector graphics editor that edits
       files in the W3C SVG (Scalable Vector Graphics) file format.
 
-      If you want to import .eps files install ps2edit
+      If you want to import .eps files install ps2edit.
     '';
 
   };
diff --git a/pkgs/applications/graphics/inkscape/gtk-clist.patch b/pkgs/applications/graphics/inkscape/gtk-clist.patch
deleted file mode 100644
index 6518538fcc15..000000000000
--- a/pkgs/applications/graphics/inkscape/gtk-clist.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- inkscape-0.46/src/widgets/sp-xmlview-attr-list.h  2008/06/07 22:06:52 1.1
-+++ inkscape-0.46/src/widgets/sp-xmlview-attr-list.h  2008/06/07 22:09:22
-@@ -13,7 +13,7 @@
-  */
- 
- #include <stdio.h>
--#include <gtk/gtkclist.h>
-+#include <gtk/gtk.h>
- #include "../xml/repr.h"
- 
- #include <glib.h>
diff --git a/pkgs/applications/graphics/inkscape/libpng-setjmp.patch b/pkgs/applications/graphics/inkscape/libpng-setjmp.patch
deleted file mode 100644
index 623e891b24ba..000000000000
--- a/pkgs/applications/graphics/inkscape/libpng-setjmp.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Include <png.h> as early as possible to make sure <setjmp.h> is not
-included before it.
-
-See http://thread.gmane.org/gmane.linux.distributions.nixos/1501 .
-
---- inkscape-0.46/src/sp-image.cpp	2008-03-11 05:19:56.000000000 +0100
-+++ inkscape-0.46/src/sp-image.cpp	2009-01-26 15:34:33.000000000 +0100
-@@ -17,6 +17,8 @@
- # include "config.h"
- #endif
- 
-+#include <png.h>
-+
- #include <cstring>
- #include <string>
- #include <libnr/nr-matrix-fns.h>
-@@ -41,7 +43,6 @@
- #include "libnr/nr-matrix-fns.h"
- 
- #include "io/sys.h"
--#include <png.h>
- #if ENABLE_LCMS
- #include "color-profile-fns.h"
- #include "color-profile.h"
-
---- inkscape-0.46/src/dialogs/export.cpp	2008-03-11 05:19:54.000000000 +0100
-+++ inkscape-0.46/src/dialogs/export.cpp	2009-01-26 17:01:13.000000000 +0100
-@@ -20,6 +20,7 @@
- # include "config.h"
- #endif
- 
-+#include <png.h>
- #include <gtk/gtk.h>
- #include <gtkmm/box.h>
- #include <gtkmm/buttonbox.h>
-@@ -60,7 +61,6 @@
- #include "io/sys.h"
- 
- #include "helper/png-write.h"
--#include <png.h>
- 
- 
- #define SP_EXPORT_MIN_SIZE 1.0
-
---- inkscape-0.46/src/main.cpp	2008-03-11 05:20:50.000000000 +0100
-+++ inkscape-0.46/src/main.cpp	2009-01-26 17:57:12.000000000 +0100
-@@ -26,6 +26,7 @@
- #ifdef HAVE_CONFIG_H
- # include "config.h"
- #endif
-+#include <png.h>
- #include "path-prefix.h"
- 
- #include <gtk/gtkmessagedialog.h>
-@@ -111,7 +112,6 @@ using Inkscape::Extension::Internal::Pri
- 
- #include "main-cmdlineact.h"
- 
--#include <png.h>
- #include <errno.h>
- 
- enum {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8584da7d3c9..c4464718b13b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3444,7 +3444,6 @@ let
     inherit fetchurl stdenv libgpgerror pkgconfig pth gnupg gnupg2 glib;
   };
 
-  # gnu scientific library
   gsl = import ../development/libraries/gsl {
     inherit fetchurl stdenv;
   };
@@ -6949,10 +6948,9 @@ let
   };
 
   inkscape = import ../applications/graphics/inkscape {
-    inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib
-      popt libxml2 libxslt libpng boehmgc fontconfig
-      libsigcxx lcms boost gettext cairomm
-      python pyxml makeWrapper;
+    inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib popt
+      libxml2 libxslt libpng boehmgc libsigcxx lcms boost gettext
+      cairomm python pyxml makeWrapper intltool gsl;
     inherit (pythonPackages) lxml;
     inherit (gtkLibs) gtk glib glibmm gtkmm;
     inherit (xlibs) libXft;