6 files changed, 91 insertions, 14 deletions
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index d0d10ac40c9e..deedbdfc751f 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@@ -1,18 +1,28 @@
-{ stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
+{ stdenv, fetchhg, SDL, libpng, libjpeg, libtiff, libungif, libXpm, automake,
+  autoconf, pkgconfig }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_image";
-  version = "1.2.10";
+  version = "1.2.10-20110925";
 
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "http://www.libsdl.org/projects/${pname}/release/${name}.tar.gz";
-    sha256 = "0xhqw56xgc0rn3ziccirib8ai2whbbidjmvig527n9znjlg5vq3m";
+  src = fetchhg {
+    url = http://hg.libsdl.org/SDL_image;
+    tag = "bb611e7cb1e5";
+    sha256 = "0003inlvvmlc2fyrzy01lwhhfb90ppsar2skaa7x6rhmpc71dakz";
   };
 
   buildInputs = [SDL libpng libjpeg libtiff libungif libXpm];
 
+  buildNativeInputs = [ automake autoconf pkgconfig ];
+
+  patches = [ ./jpeg-linux.diff ];
+
+  preConfigure = ''
+    ./autogen.sh
+    '';
+
   postInstall = ''
     sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
     -e 's,"SDL_version.h",<SDL/SDL_version.h>,' \
diff --git a/pkgs/development/libraries/SDL_image/jpeg-linux.diff b/pkgs/development/libraries/SDL_image/jpeg-linux.diff
new file mode 100644
index 000000000000..fd4cdf7f7a49
--- /dev/null
+++ b/pkgs/development/libraries/SDL_image/jpeg-linux.diff
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Yury G. Kudryashov <urkud@ya.ru>
+# Date 1316994786 -14400
+# Node ID 4c3cd9a4b0602c45c11ec62bcc1f5562ea071d70
+# Parent  bb611e7cb1e58cc37a6773a22a15c74b55e3d267
+Fix compilation on Linux
+
+Submitted upstream, see http://bugzilla.libsdl.org/show_bug.cgi?id=1179
+
+diff -r bb611e7cb1e5 -r 4c3cd9a4b060 IMG_jpg.c
+--- a/IMG_jpg.c	Thu Aug 25 02:24:35 2011 -0400
++++ b/IMG_jpg.c	Mon Sep 26 03:53:06 2011 +0400
+@@ -34,7 +34,7 @@
+ 
+ #include <jpeglib.h>
+ 
+-#if JPEG_LIB_VERSION >= 80
++#ifdef JPEG_TRUE /* MinGW version of jpeg-8.x renamed TRUE to JPEG_TRUE etc. */
+ 	typedef JPEG_boolean boolean;
+ 	#define TRUE JPEG_TRUE
+ 	#define FALSE JPEG_FALSE
diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix
index 3e664ffd43aa..3b8c4be54e05 100644
--- a/pkgs/development/libraries/libharu/default.nix
+++ b/pkgs/development/libraries/libharu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, libpng }:
+{ stdenv, fetchurl, zlib, libpng, patchutils }:
 
 stdenv.mkDerivation {
   name = "libharu-2.2.1";
@@ -12,6 +12,26 @@ stdenv.mkDerivation {
 
   buildInputs = [ zlib libpng ];
 
+  patches =
+    [ (stdenv.mkDerivation {
+        name = "linpng15.patch";
+
+        src = fetchurl {
+          url = https://github.com/tony2001/libharu/commit/e5bf8b01f6c3d5e3fe0e26ac5345e0da10c03934.diff;
+          sha256 = "1993vskpycyr43rwdp8f688fc5zvllrqq935r7rhsgbqbipkk73h";
+        };
+
+        buildNativeInputs = [ patchutils ];
+
+        buildCommand = "filterdiff -x '*/CHANGES' $src > $out";
+      })
+      (fetchurl {
+        url = https://github.com/tony2001/libharu/commit/b472b64ab44d834eb29d237f31bf12396fee9aca.diff;
+        name = "endless-loop.patch";
+        sha256 = "1c95mn6a5wddznqgrsaf3xsh27lz8q0pzc0a7ampxpscq0w6c9fq";
+      })
+    ];
+
   meta = {
     description = "Cross platform, open source library for generating PDF files";
     homepage = http://libharu.org/wiki/Main_Page;
diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
new file mode 100644
index 000000000000..c500b6518446
--- /dev/null
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, zlib, xz }:
+
+assert zlib != null;
+
+stdenv.mkDerivation rec {
+  name = "libpng-1.2.46";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libpng/${name}.tar.xz";
+    sha256 = "0rcx4v4khdkrvz7b02fmx7lab2pk1lal4dhx9widv36b7g2xvwzn";
+  };
+
+  propagatedBuildInputs = [ zlib ];
+
+  buildNativeInputs = [ xz ];
+
+  passthru = { inherit zlib; };
+
+  meta = {
+    description = "The official reference implementation for the PNG file format";
+    homepage = http://www.libpng.org/pub/png/libpng.html;
+    license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
+  };
+}
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 7ba9bfb54b37..a4a1d662308a 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -2,21 +2,20 @@
 
 assert zlib != null;
 
-# If you want to upgrade libpng, look at libpng15 branch
 stdenv.mkDerivation rec {
-  name = "libpng-1.2.46";
-  
+  name = "libpng-1.5.7";
+
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "0rcx4v4khdkrvz7b02fmx7lab2pk1lal4dhx9widv36b7g2xvwzn";
+    sha256 = "07vw7lmd5yqh66f6llmbzbnnqv2cvy5h443a1c64wy5cwlyj1ili";
   };
-  
+
   propagatedBuildInputs = [ zlib ];
 
   buildNativeInputs = [ xz ];
 
   passthru = { inherit zlib; };
-  
+
   meta = {
     description = "The official reference implementation for the PNG file format";
     homepage = http://www.libpng.org/pub/png/libpng.html;
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index e023235b936c..fa6857c1284f 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -7,9 +7,11 @@
 , threadSupport ? true
 , mysqlSupport ? false, mysql ? null
 , openglSupport ? false, mesa ? null, libXmu ? null
-, x11, xextproto, zlib, libjpeg, libpng, which
+, x11, xextproto, zlib, libjpeg, libpng12, which
 }:
 
+let libpng = libpng12; in
+
 assert xftSupport -> libXft != null;
 assert xrenderSupport -> xftSupport && libXrender != null;
 assert xrandrSupport -> libXrandr != null && randrproto != null;
@@ -29,7 +31,8 @@ stdenv.mkDerivation {
     sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8";
   };
 
-  buildInputs = [x11 libXft libXrender zlib libjpeg libpng which];
+  buildNativeInputs = [ which ];
+  propagatedBuildInputs = [x11 libXft libXrender zlib libjpeg libpng];
 
   configureFlags = "
     -v