From 205d181222e42a46ee93e2b3c75c43334d99fe08 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 20 Apr 2009 11:18:53 +0000
Subject: [PATCH] Fixed inkscape compilation on glibc 2.9

svn path=/nixpkgs/branches/stdenv-updates/; revision=15168
---
 pkgs/applications/graphics/inkscape/default.nix     | 10 +++++++++-
 pkgs/applications/graphics/inkscape/gtk-clist.patch | 11 +++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/graphics/inkscape/gtk-clist.patch

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index f2379220a65b..cf708da62a96 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0flrjqa68vnnn8lrhj86xpa6h2cyzrvjy6873v9id092f86ix1li";
   };
 
-  patches = [ ./configure-python-libs.patch ./libpng-setjmp.patch ]; 
+  patches = [ ./configure-python-libs.patch ./libpng-setjmp.patch ./gtk-clist.patch ]; 
 
   propagatedBuildInputs = [
     # Python is used at run-time to execute scripts, e.g., those from
@@ -24,6 +24,14 @@ stdenv.mkDerivation rec {
 
   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"
   '';
diff --git a/pkgs/applications/graphics/inkscape/gtk-clist.patch b/pkgs/applications/graphics/inkscape/gtk-clist.patch
new file mode 100644
index 000000000000..6518538fcc15
--- /dev/null
+++ b/pkgs/applications/graphics/inkscape/gtk-clist.patch
@@ -0,0 +1,11 @@
+--- 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>