svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32792

5 files changed, 37 insertions, 2 deletions

diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix
index 807b0a8ed795..f1759d7a7820 100644
--- a/pkgs/tools/graphics/enblend-enfuse/default.nix
+++ b/pkgs/tools/graphics/enblend-enfuse/default.nix
@@ -13,6 +13,22 @@ stdenv.mkDerivation rec {
 
   buildNativeInputs = [ perl pkgconfig ];
 
+  patches =
+    let
+      prefix = "http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/raw-diff";
+    in map fetchurl [
+      {
+        url = "${prefix}/9d9b5f3a97cd/src/vigra_impex/png.cxx";
+        name = "ftbfs-libpng15.patch";
+        sha256 = "1nqhbbgphwi087qpazngg04c1whc1p4fwq19fx36jrir96xywgzg";
+      }
+      {
+        url = "${prefix}/101796703d73/src/vigra_impex/png.cxx";
+        name = "ftbfs-libpng15.patch";
+        sha256 = "14frqg4hab9ab6pdypkrmji43fmxjj918j7565rdwmifbm9i3005";
+      }
+    ];
+
   meta = {
     homepage = http://enblend.sourceforge.net/;
     description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline";
diff --git a/pkgs/tools/graphics/plotutils/debian-patches.nix b/pkgs/tools/graphics/plotutils/debian-patches.nix
new file mode 100644
index 000000000000..d72974445e6d
--- /dev/null
+++ b/pkgs/tools/graphics/plotutils/debian-patches.nix
@@ -0,0 +1,14 @@
+# Generated by debian-patches.sh from debian-patches.txt
+let
+  prefix = "http://patch-tracker.debian.org/patch/series/dl/plotutils/2.6-2";
+in
+[
+  {
+    url = "${prefix}/10_repair_postscript";
+    sha256 = "01v4a8mdhgsjxbf9a2xppx2lb05lp818v8afp5x2njv64wpgla8p";
+  }
+  {
+    url = "${prefix}/25_libpng15";
+    sha256 = "0l640rcsgc2mwpk7iqm0cf3b0gfcdgcn9wg4x88gaqxzx9rriph0";
+  }
+]
diff --git a/pkgs/tools/graphics/plotutils/debian-patches.txt b/pkgs/tools/graphics/plotutils/debian-patches.txt
new file mode 100644
index 000000000000..8694be8edd79
--- /dev/null
+++ b/pkgs/tools/graphics/plotutils/debian-patches.txt
@@ -0,0 +1,3 @@
+plotutils/2.6-2
+10_repair_postscript
+25_libpng15
diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix
index e7263fcf11e7..bb250b9d8523 100644
--- a/pkgs/tools/graphics/plotutils/default.nix
+++ b/pkgs/tools/graphics/plotutils/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [libpng];
 
+  patches = map fetchurl (import ./debian-patches.nix);
+
   configureFlags = "--enable-libplotter"; # required for pstoedit
 
   doCheck = true;
diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
index 08a7e6b2c426..7293c0db66d6 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pngcrush-1.7.17";
+  name = "pngcrush-1.7.22";
 
   src = fetchurl {
     url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
-    sha256 = "0lh6wl0ci2y9b690n2zggc1mk21xj6iv378gvxk6gksgjkdw2rj2";
+    sha256 = "1sngz34cssni4j7hvqhq5ms6h4ydb3b0s5y7fidv3kjms9g1xcsp";
   };
 
   configurePhase = ''