summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pkgs/applications/display-managers/slim/default.nix4
-rw-r--r--pkgs/applications/video/xine-ui/default.nix4
-rw-r--r--pkgs/desktops/kde-3/kdelibs/default.nix7
-rw-r--r--pkgs/development/libraries/SDL_image/default.nix20
-rw-r--r--pkgs/development/libraries/SDL_image/jpeg-linux.diff21
-rw-r--r--pkgs/development/libraries/libharu/default.nix22
-rw-r--r--pkgs/development/libraries/libpng/12.nix24
-rw-r--r--pkgs/development/libraries/libpng/default.nix11
-rw-r--r--pkgs/development/libraries/qt-3/default.nix7
-rw-r--r--pkgs/misc/emulators/VisualBoyAdvance/default.nix2
-rw-r--r--pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch13
-rw-r--r--pkgs/misc/ghostscript/libpng-1.5.patch198
-rw-r--r--pkgs/tools/graphics/plotutils/debian-patches.nix14
-rw-r--r--pkgs/tools/graphics/plotutils/debian-patches.txt3
-rw-r--r--pkgs/tools/graphics/plotutils/default.nix2
-rw-r--r--pkgs/tools/graphics/pngcrush/default.nix7
-rw-r--r--pkgs/top-level/all-packages.nix18
17 files changed, 345 insertions, 32 deletions
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 2ea53fd4e55a..be546d76836b 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, x11, libjpeg, libpng, libXmu, freetype, pam}:
+{stdenv, fetchurl, x11, libjpeg, libpng12, libXmu, freetype, pam}:
 
 stdenv.mkDerivation rec {
   name = "slim-1.3.2";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     ./pam2.patch
   ];
 
-  buildInputs = [x11 libjpeg libpng libXmu freetype pam];
+  buildInputs = [x11 libjpeg libpng12 libXmu freetype pam];
 
   NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
 
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 092f5270b783..7faa572a0c98 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl
+{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng12, readline, ncurses, curl
 , lirc, xz, shared_mime_info }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildNativeInputs = [ xz pkgconfig shared_mime_info ];
 
   buildInputs =
-    [ xineLib libpng readline ncurses curl lirc
+    [ xineLib libpng12 readline ncurses curl lirc
       xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
       xlibs.libXinerama xlibs.libXi xlibs.libXft
     ];
diff --git a/pkgs/desktops/kde-3/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix
index 0f3494c05811..2c9e8e3563a8 100644
--- a/pkgs/desktops/kde-3/kdelibs/default.nix
+++ b/pkgs/desktops/kde-3/kdelibs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre
-, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
+, pkgconfig, libtiff, libxml2, libxslt, libtool, expat
 , freetype, bzip2, cups, attr, acl
 }:
 
@@ -22,10 +22,8 @@ stdenv.mkDerivation {
     ./kdelibs-3.5.10-openssl_1.0.0.patch
   ];
 
-  passthru = {inherit openssl libjpeg qt3; inherit (xlibs) libX11;};
-  
   buildInputs = [
-    zlib perl qt3 openssl pcre pkgconfig libjpeg libpng libtiff libxml2
+    zlib perl qt3 openssl pcre pkgconfig libtiff libxml2
     libxslt expat libtool freetype bzip2 cups
     xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
   ];
@@ -45,7 +43,6 @@ stdenv.mkDerivation {
   configureFlags = ''
     --without-arts 
     --with-ssl-dir=${openssl}
-    --with-extra-includes=${libjpeg}/include
     --x-includes=${xlibs.libX11}/include
     --x-libraries=${xlibs.libX11}/lib
   '';
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
diff --git a/pkgs/misc/emulators/VisualBoyAdvance/default.nix b/pkgs/misc/emulators/VisualBoyAdvance/default.nix
index 964a0491adb4..95f7d9433f9b 100644
--- a/pkgs/misc/emulators/VisualBoyAdvance/default.nix
+++ b/pkgs/misc/emulators/VisualBoyAdvance/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
     url = mirror://sourceforge/vba/VisualBoyAdvance-src-1.7.2.tar.gz;
     sha256 = "1dr9w5i296dyq2gbx7sijk6p375aqnwld2n6rwnbzm2g3a94y4gl";
   };
-  patches = [ ./fix.diff ]; # patch to shut up lost of precision errors
+  patches = [ ./libpng15.patch ./fix.diff ]; # patch to shut up lost of precision errors
   preConfigure = ''
     # Fix errors with invalid conversion from 'const char*' to 'char*'
     sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/GBA.cpp
diff --git a/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch b/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch
new file mode 100644
index 000000000000..b6f8872ce2bb
--- /dev/null
+++ b/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch
@@ -0,0 +1,13 @@
+From Gentoo. Fixes compilation with libpng-1.5
+
+--- a/src/Util.cpp
++++ b/src/Util.cpp
+@@ -79,7 +79,7 @@
+     return false;
+   }
+ 
+-  if(setjmp(png_ptr->jmpbuf)) {
++  if(setjmp(png_jmpbuf(png_ptr))) {
+     png_destroy_write_struct(&png_ptr,NULL);
+     fclose(fp);
+     return false;
diff --git a/pkgs/misc/ghostscript/libpng-1.5.patch b/pkgs/misc/ghostscript/libpng-1.5.patch
new file mode 100644
index 000000000000..b00305804a09
--- /dev/null
+++ b/pkgs/misc/ghostscript/libpng-1.5.patch
@@ -0,0 +1,198 @@
+$NetBSD: patch-ak,v 1.5 2011/01/15 14:08:10 wiz Exp $
+
+Fix build with png-1.5. From John Bowler.
+
+See also http://bugs.ghostscript.com/show_bug.cgi?id=692060
+
+--- a/base/gdevpng.c.orig	2008-07-17 02:34:01.000000000 +0000
++++ b/base/gdevpng.c
+@@ -36,12 +36,14 @@
+ #include "gdevpccm.h"
+ #include "gscdefs.h"
+ 
+-#define PNG_INTERNAL
+ /*
+  * libpng versions 1.0.3 and later allow disabling access to the stdxxx
+  * files while retaining support for FILE * I/O.
++ *
++ * This is a misunderstanding - this is a build time option for libpng,
++ * it has no effect on a user of libpng.
+  */
+-#define PNG_NO_CONSOLE_IO
++/*#define PNG_NO_CONSOLE_IO*/
+ /*
+  * Earlier libpng versions require disabling FILE * I/O altogether.
+  * This produces a compiler warning about no prototype for png_init_io.
+@@ -280,7 +282,7 @@ png_print_page(gx_device_printer * pdev,
+ 	goto done;
+     }
+     /* set error handling */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	/* If we get here, we had a problem reading the file */
+ 	code = gs_note_error(gs_error_VMerror);
+ 	goto done;
+@@ -290,19 +292,12 @@ png_print_page(gx_device_printer * pdev,
+     png_init_io(png_ptr, file);
+ 
+     /* set the file information here */
+-    info_ptr->width = pdev->width;
+-    info_ptr->height = pdev->height;
+-    /* resolution is in pixels per meter vs. dpi */
+-    info_ptr->x_pixels_per_unit =
+-	(png_uint_32) (pdev->HWResolution[0] * (100.0 / 2.54));
+-    info_ptr->y_pixels_per_unit =
+-	(png_uint_32) (pdev->HWResolution[1] * (100.0 / 2.54));
+-    info_ptr->phys_unit_type = PNG_RESOLUTION_METER;
+-    info_ptr->valid |= PNG_INFO_pHYs;
+     switch (depth) {
+ 	case 32:
+-	    info_ptr->bit_depth = 8;
+-	    info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++	    png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++	    	8, PNG_COLOR_TYPE_RGB_ALPHA,
++		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++		PNG_FILTER_TYPE_DEFAULT);
+ 	    png_set_invert_alpha(png_ptr);
+ 	    {   gx_device_pngalpha *ppdev = (gx_device_pngalpha *)pdev;
+ 		png_color_16 background;
+@@ -315,57 +310,69 @@ png_print_page(gx_device_printer * pdev,
+ 	    }
+ 	    break;
+ 	case 48:
+-	    info_ptr->bit_depth = 16;
+-	    info_ptr->color_type = PNG_COLOR_TYPE_RGB;
++	    png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++	    	16, PNG_COLOR_TYPE_RGB,
++		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++		PNG_FILTER_TYPE_DEFAULT);
+ #if defined(ARCH_IS_BIG_ENDIAN) && (!ARCH_IS_BIG_ENDIAN) 
+ 	    png_set_swap(png_ptr);
+ #endif
+ 	    break;
+ 	case 24:
+-	    info_ptr->bit_depth = 8;
+-	    info_ptr->color_type = PNG_COLOR_TYPE_RGB;
++	    png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++	    	8, PNG_COLOR_TYPE_RGB,
++		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++		PNG_FILTER_TYPE_DEFAULT);
+ 	    break;
+ 	case 8:
+-	    info_ptr->bit_depth = 8;
+-	    if (gx_device_has_color(pdev))
+-		info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
+-	    else
+-		info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
++	    png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++	    	8, gx_device_has_color(pdev) ?
++			PNG_COLOR_TYPE_PALETTE : PNG_COLOR_TYPE_GRAY,
++		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++		PNG_FILTER_TYPE_DEFAULT);
+ 	    break;
+ 	case 4:
+-	    info_ptr->bit_depth = 4;
+-	    info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
++	    png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++	    	4, PNG_COLOR_TYPE_PALETTE,
++		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++		PNG_FILTER_TYPE_DEFAULT);
+ 	    break;
+ 	case 1:
+-	    info_ptr->bit_depth = 1;
+-	    info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
++	    png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++	    	1, PNG_COLOR_TYPE_GRAY,
++		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++		PNG_FILTER_TYPE_DEFAULT);
+ 	    /* invert monocrome pixels */
+ 	    png_set_invert_mono(png_ptr);
+ 	    break;
++	default:
++	    png_error(png_ptr, "invalid bit depth");
+     }
+ 
++    /* resolution is in pixels per meter vs. dpi */
++    png_set_pHYs(png_ptr, info_ptr, 
++	(png_uint_32) (pdev->HWResolution[0] * (100.0 / 2.54)),
++	(png_uint_32) (pdev->HWResolution[1] * (100.0 / 2.54)),
++	PNG_RESOLUTION_METER);
++
+     /* set the palette if there is one */
+-    if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) {
++    if (png_get_color_type(png_ptr, info_ptr)  == PNG_COLOR_TYPE_PALETTE) {
+ 	int i;
+ 	int num_colors = 1 << depth;
+ 	gx_color_value rgb[3];
++	png_color palette[256];
++
++	if (num_colors > 256)
++	    num_colors = 256;
+ 
+-	info_ptr->palette =
+-	    (void *)gs_alloc_bytes(mem, 256 * sizeof(png_color),
+-				   "png palette");
+-	if (info_ptr->palette == 0) {
+-	    code = gs_note_error(gs_error_VMerror);
+-	    goto done;
+-	}
+-	info_ptr->num_palette = num_colors;
+-	info_ptr->valid |= PNG_INFO_PLTE;
+ 	for (i = 0; i < num_colors; i++) {
+ 	    (*dev_proc(pdev, map_color_rgb)) ((gx_device *) pdev,
+ 					      (gx_color_index) i, rgb);
+-	    info_ptr->palette[i].red = gx_color_value_to_byte(rgb[0]);
+-	    info_ptr->palette[i].green = gx_color_value_to_byte(rgb[1]);
+-	    info_ptr->palette[i].blue = gx_color_value_to_byte(rgb[2]);
++	    palette[i].red = gx_color_value_to_byte(rgb[0]);
++	    palette[i].green = gx_color_value_to_byte(rgb[1]);
++	    palette[i].blue = gx_color_value_to_byte(rgb[2]);
+ 	}
++	png_set_PLTE(png_ptr, info_ptr, palette, num_colors);
+     }
+     /* add comment */
+     strncpy(software_key, "Software", sizeof(software_key));
+@@ -375,15 +382,14 @@ png_print_page(gx_device_printer * pdev,
+     text_png.key = software_key;
+     text_png.text = software_text;
+     text_png.text_length = strlen(software_text);
+-    info_ptr->text = &text_png;
+-    info_ptr->num_text = 1;
++    png_set_text(png_ptr, info_ptr, &text_png, 1);
+ 
+     /* write the file information */
+     png_write_info(png_ptr, info_ptr);
+ 
+     /* don't write the comments twice */
+-    info_ptr->num_text = 0;
+-    info_ptr->text = NULL;
++    /*info_ptr->num_text = 0;*/
++    /*info_ptr->text = NULL;*/
+ 
+     /* Write the contents of the image. */
+     for (y = 0; y < height; y++) {
+@@ -395,7 +401,7 @@ png_print_page(gx_device_printer * pdev,
+     png_write_end(png_ptr, info_ptr);
+ 
+     /* if you alloced the palette, free it here */
+-    gs_free_object(mem, info_ptr->palette, "png palette");
++    /*gs_free_object(mem, info_ptr->palette, "png palette");*/
+ 
+   done:
+     /* free the structures */
+@@ -405,6 +411,7 @@ png_print_page(gx_device_printer * pdev,
+     return code;
+ }
+ 
++#if 0 /* not required in 1.5 */
+ /*
+  * Patch around a static reference to a never-used procedure.
+  * This could be avoided if we were willing to edit pngconf.h to
+@@ -422,6 +429,7 @@ png_push_fill_buffer(png_structp png_ptr
+ {
+ }
+ #endif
++#endif
+ 
+ static int
+ pngalpha_open(gx_device * pdev)
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 caa99d2c4e2a..8e58b8d1903e 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, libpng, xz }:
 
 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 = ''
     sed -i s,/usr,$out, Makefile
   '';
 
-  buildInputs = [ xz libpng ];
+  buildInputs = [ libpng ];
+  buildNativeInputs = [ xz ];
 
   meta = {
     homepage = http://pmt.sourceforge.net/pngcrush;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01ef719b0856..5bd327de7bd2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3825,7 +3825,9 @@ let
 
   ilmbase = callPackage ../development/libraries/ilmbase { };
 
-  imlib = callPackage ../development/libraries/imlib { };
+  imlib = callPackage ../development/libraries/imlib {
+    libpng = libpng12;
+  };
 
   imlib2 = callPackage ../development/libraries/imlib2 { };
 
@@ -4169,6 +4171,7 @@ let
 
   libpng = callPackage ../development/libraries/libpng { };
   libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { };
+  libpng12 = callPackage ../development/libraries/libpng/12.nix { };
 
   libproxy = callPackage ../development/libraries/libproxy { };
 
@@ -4441,6 +4444,7 @@ let
 
   opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
     ffmpeg = ffmpeg_0_6_90;
+    libpng = libpng12;
     inherit (gst_all) gstreamer;
   };
 
@@ -4551,6 +4555,7 @@ let
 
   qt46 = callPackage ../development/libraries/qt-4.x/4.6 {
     inherit (gnome) glib;
+    libpng = pkgs.libpng12;
   };
 
   qt47 = callPackage ../development/libraries/qt-4.x/4.7 {
@@ -4747,13 +4752,14 @@ let
       inherit (gnome) gtkdoc libsoup;
       inherit (gtkLibs) gtk atk pango glib;
       inherit freetype fontconfig gettext gperf curl
-        libjpeg libtiff libpng libxml2 libxslt sqlite
+        libjpeg libtiff libxml2 libxslt sqlite
         icu cairo perl intltool automake libtool
         pkgconfig autoconf bison libproxy enchant
         python ruby which flex geoclue;
       inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
         gstPluginsGood;
       inherit (xlibs) libXt renderproto libXrender;
+      libpng = libpng12;
     };
 
   webkitSVN =
@@ -4761,13 +4767,14 @@ let
       inherit (gnome) gtkdoc libsoup;
       inherit (gtkLibs) gtk atk pango glib;
       inherit freetype fontconfig gettext gperf curl
-        libjpeg libtiff libpng libxml2 libxslt sqlite
+        libjpeg libtiff libxml2 libxslt sqlite
         icu cairo perl intltool automake libtool
         pkgconfig autoconf bison libproxy enchant
         python ruby which flex geoclue;
       inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
         gstPluginsGood;
       inherit (xlibs) libXt renderproto libXrender;
+      libpng = libpng12;
     };
 
   wvstreams = callPackage ../development/libraries/wvstreams { };
@@ -7005,7 +7012,7 @@ let
   };
 
   qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
-    inherit libpng;
+    libpng = libpng12;
     opencv = opencv_2_1;
   };
 
@@ -7922,6 +7929,7 @@ let
 
   exult = callPackage ../games/exult {
     stdenv = overrideGCC stdenv gcc42;
+    libpng = libpng12;
   };
 
   /*
@@ -8699,7 +8707,7 @@ let
 
   splix = callPackage ../misc/cups/drivers/splix { };
 
-  tetex = callPackage ../tools/typesetting/tex/tetex { };
+  tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
 
   tex4ht = callPackage ../tools/typesetting/tex/tex4ht { };
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-29 18:29:25 +0000