packages: qt/qt.spec, qt/qt3-png14.patch - make libpng14 patch compatible w...

[glen]

Author: glen                         Date: Tue Feb 16 16:22:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- make libpng14 patch compatible with libpng12

---- Files affected:
packages/qt:
   qt.spec (1.397 -> 1.398) , qt3-png14.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/qt/qt.spec
diff -u packages/qt/qt.spec:1.397 packages/qt/qt.spec:1.398
--- packages/qt/qt.spec:1.397	Tue Feb 16 09:45:25 2010
+++ packages/qt/qt.spec	Tue Feb 16 17:22:16 2010
@@ -20,14 +20,14 @@
 %define		with_sql	1
 %{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine with_sql}}}}}
 
-%define		_ver		3.3.8b
+%define		ver		3.3.8b
 
 Summary:	The Qt3 GUI application framework
 Summary(es.UTF-8):	Biblioteca para ejecutar aplicaciones GUI Qt
 Summary(pl.UTF-8):	Biblioteka Qt3 do tworzenia GUI
 Summary(pt_BR.UTF-8):	Estrutura para rodar aplicações GUI Qt
 Name:		qt
-Version:	%{_ver}
+Version:	%{ver}
 Release:	6
 Epoch:		6
 License:	QPL v1, GPL v2 or GPL v3
@@ -107,7 +107,7 @@
 BuildRequires:	giflib-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmng-devel >= 1.0.0
-BuildRequires:	libpng-devel >= 2:1.4.0
+BuildRequires:	libpng-devel >= 2:1.0.8
 BuildRequires:	libstdc++-devel
 %{?with_mysql:BuildRequires:	mysql-devel}
 %{?with_nas:BuildRequires:	nas-devel}
@@ -741,7 +741,7 @@
 %patch15 -p0
 %patch16 -p0
 %patch17 -p0
-%patch18 -p0
+%patch18 -p1
 
 # copy qt kde integration files
 cp %{SOURCE8} %{SOURCE9} src/kernel
@@ -1330,6 +1330,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.398  2010/02/16 16:22:16  glen
+- make libpng14 patch compatible with libpng12
+
 Revision 1.397  2010/02/16 08:45:25  glen
 - qt3-png14.patch is not libpng12 compatible
 

================================================================
Index: packages/qt/qt3-png14.patch
diff -u packages/qt/qt3-png14.patch:1.1 packages/qt/qt3-png14.patch:1.2
--- packages/qt/qt3-png14.patch:1.1	Thu Jan 28 19:18:03 2010
+++ packages/qt/qt3-png14.patch	Tue Feb 16 17:22:16 2010
@@ -1,5 +1,16 @@
---- src/kernel/qpngio.cpp.orig	2010-01-16 22:02:41.000000000 +0100
-+++ src/kernel/qpngio.cpp	2010-01-16 22:03:56.000000000 +0100
+--- qt-x11-free-3.3.8b/src/kernel/qpngio.cpp~	2008-01-15 21:09:13.000000000 +0200
++++ qt-x11-free-3.3.8b/src/kernel/qpngio.cpp	2010-02-16 15:40:00.155342969 +0200
+@@ -47,6 +47,10 @@
+ 
+ #include <png.h>
+ 
++#if (PNG_LIBPNG_VER < 10400)
++#define trans_color trans_values
++#define trans_alpha trans
++#endif
+ 
+ #ifdef Q_OS_TEMP
+ #define CALLBACK_CALL_TYPE	__cdecl
 @@ -159,7 +159,7 @@
  		image.setColor( i, qRgba(c,c,c,0xff) );
  	    }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt/qt.spec?r1=1.397&r2=1.398&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt/qt3-png14.patch?r1=1.1&r2=1.2&f=u