packages: mtpaint/mtpaint.spec, mtpaint/mtpaint-libpng.patch (NEW) - fixed ...

[evil]

Author: evil                         Date: Mon Feb 22 21:49:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed building against new libpng by adding appropiate patch

---- Files affected:
packages/mtpaint:
   mtpaint.spec (1.8 -> 1.9) , mtpaint-libpng.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mtpaint/mtpaint.spec
diff -u packages/mtpaint/mtpaint.spec:1.8 packages/mtpaint/mtpaint.spec:1.9
--- packages/mtpaint/mtpaint.spec:1.8	Mon Oct 12 23:53:20 2009
+++ packages/mtpaint/mtpaint.spec	Mon Feb 22 22:48:58 2010
@@ -3,19 +3,20 @@
 Summary(pl.UTF-8):	Prosty program graficzny
 Name:		mtpaint
 Version:	3.31
-Release:	1
+Release:	2
 License:	GPL v3+
 Group:		X11/Applications/Graphics
 Source0:	http://dl.sourceforge.net/mtpaint/%{name}-%{version}.tar.bz2
 # Source0-md5:	fbe34eb25f96b6092403115f1f6ab387
 Source1:	%{name}.desktop
 Patch0:		%{name}-flags.patch
+Patch1:		%{name}-libpng.patch
 URL:		http://mtpaint.sourceforge.net/
 BuildRequires:	gettext-devel
 BuildRequires:	giflib-devel
 BuildRequires:	gtk+2-devel
 BuildRequires:	libjpeg-devel
-BuildRequires:	libpng-devel
+BuildRequires:	libpng-devel >= 1.2.27
 BuildRequires:	libtiff-devel
 BuildRequires:	openjpeg-devel
 BuildRequires:	perl-tools-pod
@@ -35,6 +36,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure man pod intl jp2 \
@@ -89,6 +91,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2010/02/22 21:48:58  evil
+- fixed building against new libpng by adding appropiate patch
+
 Revision 1.8  2009/10/12 21:53:20  sparky
 - fix compile flags
 

================================================================
Index: packages/mtpaint/mtpaint-libpng.patch
diff -u /dev/null packages/mtpaint/mtpaint-libpng.patch:1.1
--- /dev/null	Mon Feb 22 22:49:04 2010
+++ packages/mtpaint/mtpaint-libpng.patch	Mon Feb 22 22:48:58 2010
@@ -0,0 +1,20 @@
+--- mtpaint-3.31/src/png.c.orig	2010-02-22 22:41:06.935087701 +0100
++++ mtpaint-3.31/src/png.c	2010-02-22 22:41:55.195067047 +0100
+@@ -539,7 +539,7 @@
+ 	if (settings->bpp == 3)
+ 	{
+ 		png_set_strip_16(png_ptr);
+-		png_set_gray_1_2_4_to_8(png_ptr);
++		png_set_expand_gray_1_2_4_to_8(png_ptr);
+ 		png_set_palette_to_rgb(png_ptr);
+ 		png_set_gray_to_rgb(png_ptr);
+ 
+@@ -644,7 +644,7 @@
+ 		png_set_strip_alpha(png_ptr);
+ 		png_set_packing(png_ptr);
+ 		if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8))
+-			png_set_gray_1_2_4_to_8(png_ptr);
++			png_set_expand_gray_1_2_4_to_8(png_ptr);
+ 		for (i = 0; i < height; i++)
+ 		{
+ 			row_pointers[i] = settings->img[CHN_IMAGE] + i * width;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mtpaint/mtpaint.spec?r1=1.8&r2=1.9&f=u