Author: arekm Date: Thu Jan 28 18:18:09 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 5; fix build with libpng14
---- Files affected:
packages/qt:
qt.spec (1.394 -> 1.395) , qt3-png14.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/qt/qt.spec
diff -u packages/qt/qt.spec:1.394 packages/qt/qt.spec:1.395
--- packages/qt/qt.spec:1.394 Thu Jan 28 15:18:42 2010
+++ packages/qt/qt.spec Thu Jan 28 19:18:03 2010
@@ -28,7 +28,7 @@
Summary(pt_BR.UTF-8): Estrutura para rodar aplicações GUI Qt
Name: qt
Version: %{_ver}
-Release: 4
+Release: 5
Epoch: 6
License: QPL v1, GPL v2 or GPL v3
Group: X11/Libraries
@@ -96,6 +96,7 @@
Patch15: %{name}-uic_colon_fix.patch
Patch16: %{name}-fvisibility.patch
Patch17: qtkdeintegration.patch
+Patch18: qt3-png14.patch
URL: http://www.trolltech.com/products/qt/
%{?with_ibase:BuildRequires: Firebird-devel >= 1.5.0}
BuildRequires: OpenGL-GLU-devel
@@ -740,6 +741,7 @@
%patch15 -p0
%patch16 -p0
%patch17 -p0
+%patch18 -p0
# copy qt kde integration files
cp %{SOURCE8} %{SOURCE9} src/kernel
@@ -1328,6 +1330,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.395 2010/01/28 18:18:03 arekm
+- rel 5; fix build with libpng14
+
Revision 1.394 2010/01/28 14:18:42 megabajt
- release 4
================================================================
Index: packages/qt/qt3-png14.patch
diff -u /dev/null packages/qt/qt3-png14.patch:1.1
--- /dev/null Thu Jan 28 19:18:09 2010
+++ packages/qt/qt3-png14.patch Thu Jan 28 19:18:03 2010
@@ -0,0 +1,33 @@
+--- 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
+@@ -159,7 +159,7 @@
+ image.setColor( i, qRgba(c,c,c,0xff) );
+ }
+ if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+- const int g = info_ptr->trans_values.gray;
++ const int g = info_ptr->trans_color.gray;
+ if (g < ncols) {
+ image.setAlphaBuffer(TRUE);
+ image.setColor(g, image.color(g) & RGB_MASK);
+@@ -187,7 +187,7 @@
+ info_ptr->palette[i].red,
+ info_ptr->palette[i].green,
+ info_ptr->palette[i].blue,
+- info_ptr->trans[i]
++ info_ptr->trans_alpha[i]
+ )
+ );
+ i++;
+@@ -321,9 +321,9 @@
+ png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
+ if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
{
+ QRgb trans = 0xFF000000 | qRgb(
+- (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
+- (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
+- (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
++ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
++ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
++ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
+ for (uint y=0; y<height; y++) {
+ for (uint x=0; x<info_ptr->width; x++) {
+ if (((uint**)jt)[y][x] == trans) {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt/qt.spec?r1=1.394&r2=1.395&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
