Hello community, here is the log from the commit of package qt3 for openSUSE:Factory checked in at 2012-01-11 15:37:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt3 (Old) and /work/SRC/openSUSE:Factory/.qt3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt3", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/qt3/qt3-extensions.changes 2011-09-26 10:36:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qt3.new/qt3-extensions.changes 2012-01-11 15:38:51.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 7 14:14:08 UTC 2011 - [email protected] + +- use correct license syntax from qt3.spec + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/qt3/qt3.changes 2011-09-26 10:36:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qt3.new/qt3.changes 2012-01-11 15:38:51.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Jan 9 19:46:32 UTC 2012 - [email protected] + +- patch for libpng15 + +------------------------------------------------------------------- +Wed Dec 7 14:15:22 UTC 2011 - [email protected] + +- fix license to be in spdx.org format + +------------------------------------------------------------------- New: ---- qt-3.3.8-libpng15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.xgmAxQ/_old 2012-01-11 15:38:54.000000000 +0100 +++ /var/tmp/diff_new_pack.xgmAxQ/_new 2012-01-11 15:38:54.000000000 +0100 @@ -15,23 +15,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: qt3-devel-doc -BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ pkgconfig qt3-devel update-desktop-files +BuildRequires: cups-devel +BuildRequires: freeglut-devel +BuildRequires: freetype2-devel +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: qt3-devel +BuildRequires: update-desktop-files %if %suse_version < 1130 BuildRequires: libpng-devel %else BuildRequires: libpng14-devel %endif Url: http://www.trolltech.com/ -License: GPL, QPL -AutoReqProv: on Summary: Documentation for the Qt 3 Development Kit +License: GPL-2.0 or GPL-3.0 or QPL-1.0 Group: Documentation/HTML Version: 3.3.8c -Release: 1 +Release: 0 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.xgmAxQ/_old 2012-01-11 15:38:54.000000000 +0100 +++ /var/tmp/diff_new_pack.xgmAxQ/_new 2012-01-11 15:38:54.000000000 +0100 @@ -15,21 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: qt3-extensions -BuildRequires: cups-devel krb5-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files -%if %suse_version > 1020 +BuildRequires: cups-devel +BuildRequires: krb5-devel +BuildRequires: mysql-devel +BuildRequires: postgresql-devel +BuildRequires: qt3-devel +BuildRequires: sqlite2-devel +BuildRequires: unixODBC-devel +BuildRequires: update-desktop-files BuildRequires: fdupes -%endif -License: GPL, QPL Version: 3.3.8c -Release: 1 -AutoReqProv: on +Release: 0 Requires: qt3 = %version -Group: Development/Tools/Other Summary: Qt3 Extensions +License: GPL-2.0 or GPL-3.0 or QPL-1.0 +Group: Development/Tools/Other # COMMON-BEGIN # COMMON-BEGIN %define x11_free -x11-free- @@ -221,7 +222,6 @@ %package -n qt3-devel-examples Summary: Programming Examples for Qt 3 -AutoReqProv: on Group: Development/Sources Provides: qt3-examples Obsoletes: qt3-examples @@ -234,8 +234,8 @@ %package -n qt3-mysql Summary: MySQL Plug-In for Qt -Provides: qt3_database_plugin Group: Productivity/Databases/Clients +Provides: qt3_database_plugin %description -n qt3-mysql Plug-in for using the MySQL database with the generic Qt database @@ -243,8 +243,8 @@ %package -n qt3-unixODBC Summary: A UnixODBC Plug-In for Qt -Provides: qt3_database_plugin Group: Productivity/Databases/Clients +Provides: qt3_database_plugin %description -n qt3-unixODBC A plug-in for using UnixODBC supported databases with the generic Qt @@ -252,8 +252,8 @@ %package -n qt3-postgresql Summary: A PostgreSQL Plug-In for Qt -Provides: qt3_database_plugin Group: Productivity/Databases/Clients +Provides: qt3_database_plugin %description -n qt3-postgresql A Plug-in for using the PostgreSQL database with the generic Qt @@ -261,8 +261,8 @@ %package -n qt3-sqlite Summary: SQLite Database Plug-In for Qt -Provides: qt3_database_plugin Group: Development/Tools/Other +Provides: qt3_database_plugin %description -n qt3-sqlite The Qt database supports SQLite with this plug-in. (No configured and @@ -270,11 +270,10 @@ %package -n qt3-devel-tools Summary: User Interface Builder and other tools (designer, assistant, linguist) -AutoReqProv: on +Group: Development/Tools/GUI Builders Requires: qt3-devel = %version Provides: qt3-designer Obsoletes: qt3-designer -Group: Development/Tools/GUI Builders %description -n qt3-devel-tools The designer creates .ui files. The uic generates C++ code from these @@ -283,10 +282,9 @@ %package -n qt3-man Summary: Qt 3 Man Pages -AutoReqProv: on +Group: Documentation/Man Requires: qt3-devel = %version Conflicts: qtman qt-man -Group: Documentation/Man %description -n qt3-man This package contains all the man pages for all the Qt 3 classes. ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.xgmAxQ/_old 2012-01-11 15:38:54.000000000 +0100 +++ /var/tmp/diff_new_pack.xgmAxQ/_new 2012-01-11 15:38:54.000000000 +0100 @@ -15,27 +15,33 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: qt3 #Remember also to modify Requires in -devel package -BuildRequires: Mesa-devel c++_compiler cups-devel freetype2-devel libjpeg-devel libmng-devel pkgconfig update-desktop-files xorg-x11-devel +BuildRequires: Mesa-devel +BuildRequires: c++_compiler +BuildRequires: cups-devel +BuildRequires: freetype2-devel +BuildRequires: libjpeg-devel +BuildRequires: libmng-devel +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +BuildRequires: xorg-x11-devel Url: http://www.trolltech.com/ -License: GPL-2.0 ; GPL-3.0 ; QPL-1.0 -%if %suse_version > 1120 -BuildRequires: libpng14-compat-devel +%if %suse_version > 1210 +BuildRequires: libpng15-compat-devel %else -BuildRequires: libpng-devel +BuildRequires: libpng14-compat-devel %endif -Group: System/Libraries # bug437293 %ifarch ppc64 Obsoletes: qt3-64bit %endif # Summary: A library for developing applications with graphical user interfaces +License: GPL-2.0 or GPL-3.0 or QPL-1.0 +Group: System/Libraries Version: 3.3.8c -Release: 110 +Release: 0 Provides: qt_library_%version Recommends: kdelibs3-default-style PreReq: /bin/grep @@ -114,8 +120,11 @@ Patch135: parseFontName.diff Patch136: qt3-no-date.diff Patch137: popen-leak-fix.diff +%if %suse_version <= 1210 Patch138: qt3-libpng14.diff +%endif Patch139: gcc46.diff +Patch140: qt-3.3.8-libpng15.patch # TQt integration Patch200: qt-3.3.8c.diff @@ -200,8 +209,10 @@ %patch135 %patch136 %patch137 -%if %suse_version > 1120 +%if %suse_version <= 1210 %patch138 -p1 +%else +%patch140 %endif %patch139 %patch200 @@ -214,8 +225,9 @@ # COMMON-END %package devel -License: GPL-2.0 ; GPL-3.0 ; QPL-1.0 Summary: Include Files and Libraries mandatory for Development +License: GPL-2.0 ; GPL-3.0 ; QPL-1.0 +Group: Development/Libraries/X11 Requires: qt3 = %version Requires: pkgconfig cups-devel freetype2-devel libmng-devel libjpeg-devel c++_compiler xorg-x11-devel %if %suse_version > 1120 @@ -237,7 +249,6 @@ Obsoletes: qt3-devel-64bit %endif # -Group: Development/Libraries/X11 %description devel You need this package if you want to compile programs with Qt 3. It ++++++ qt-3.3.8-libpng15.patch ++++++ $NetBSD: patch-as,v 1.5 2011/03/25 15:28:26 wiz Exp $ --- src/kernel/qpngio.cpp.orig 2007-02-02 10:01:15.000000000 -0400 +++ src/kernel/qpngio.cpp @@ -43,6 +43,7 @@ #include "qiodevice.h" #include <png.h> +#include <zlib.h> #ifdef Q_OS_TEMP @@ -123,9 +124,24 @@ void setup_qt( QImage& image, png_struct png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, 0, 0, 0); + png_colorp info_ptr_palette = NULL; + int info_ptr_num_palette = 0; + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) { + png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette); + } + + png_bytep info_ptr_trans_alpha = NULL; + int info_ptr_num_trans = 0; + png_color_16p info_ptr_trans_color = NULL; + + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { + png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color); + } + + if ( color_type == PNG_COLOR_TYPE_GRAY ) { // Black & White or 8-bit grayscale - if ( bit_depth == 1 && info_ptr->channels == 1 ) { + if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) { png_set_invert_mono( png_ptr ); png_read_update_info( png_ptr, info_ptr ); if (!image.create( width, height, 1, 2, QImage::BigEndian )) @@ -159,7 +175,7 @@ void setup_qt( QImage& image, png_struct 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); @@ -168,7 +184,7 @@ void setup_qt( QImage& image, png_struct } } else if ( color_type == PNG_COLOR_TYPE_PALETTE && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE) - && info_ptr->num_palette <= 256 ) + && info_ptr_num_palette <= 256 ) { // 1-bit and 8-bit color if ( bit_depth != 1 ) @@ -176,28 +192,28 @@ void setup_qt( QImage& image, png_struct png_read_update_info( png_ptr, info_ptr ); png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, 0, 0, 0); - if (!image.create(width, height, bit_depth, info_ptr->num_palette, + if (!image.create(width, height, bit_depth, info_ptr_num_palette, QImage::BigEndian)) return; int i = 0; if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { image.setAlphaBuffer( TRUE ); - while ( i < info_ptr->num_trans ) { + while ( i < info_ptr_num_trans ) { image.setColor(i, qRgba( - info_ptr->palette[i].red, - info_ptr->palette[i].green, - info_ptr->palette[i].blue, - info_ptr->trans[i] + info_ptr_palette[i].red, + info_ptr_palette[i].green, + info_ptr_palette[i].blue, + info_ptr_trans_alpha[i] ) ); i++; } } - while ( i < info_ptr->num_palette ) { + while ( i < info_ptr_num_palette ) { image.setColor(i, qRgba( - info_ptr->palette[i].red, - info_ptr->palette[i].green, - info_ptr->palette[i].blue, + info_ptr_palette[i].red, + info_ptr_palette[i].green, + info_ptr_palette[i].blue, 0xff ) ); @@ -284,7 +300,7 @@ void read_png_image(QImageIO* iio) return; } - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); iio->setStatus(-4); return; @@ -469,7 +485,7 @@ bool QPNGImageWriter::writeImage(const Q return FALSE; } - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_write_struct(&png_ptr, &info_ptr); return FALSE; } @@ -491,10 +507,16 @@ bool QPNGImageWriter::writeImage(const Q png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn); +#warning XXXtnn not too sure about this +/* +according to png.h, channels is only used on read, not writes, so we +should be able to comment this out. + info_ptr->channels = (image.depth() == 32) ? (image.hasAlphaBuffer() ? 4 : 3) : 1; +*/ png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(), image.depth() == 1 ? 1 : 8 /* per channel */, @@ -504,11 +526,12 @@ bool QPNGImageWriter::writeImage(const Q : PNG_COLOR_TYPE_RGB : PNG_COLOR_TYPE_PALETTE, 0, 0, 0); + png_color_8 sig_bit; + sig_bit.red = 8; + sig_bit.green = 8; + sig_bit.blue = 8; + png_set_sBIT(png_ptr, info_ptr, &sig_bit); - //png_set_sBIT(png_ptr, info_ptr, 8); - info_ptr->sig_bit.red = 8; - info_ptr->sig_bit.green = 8; - info_ptr->sig_bit.blue = 8; if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian) png_set_packswap(png_ptr); @@ -522,11 +545,14 @@ bool QPNGImageWriter::writeImage(const Q png_set_PLTE(png_ptr, info_ptr, palette, num_palette); int* trans = new int[num_palette]; int num_trans = 0; + png_colorp info_ptr_palette = NULL; + int tmp; + png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp); for (int i=0; i<num_palette; i++) { QRgb rgb=image.color(i); - info_ptr->palette[i].red = qRed(rgb); - info_ptr->palette[i].green = qGreen(rgb); - info_ptr->palette[i].blue = qBlue(rgb); + info_ptr_palette[i].red = qRed(rgb); + info_ptr_palette[i].green = qGreen(rgb); + info_ptr_palette[i].blue = qBlue(rgb); if (image.hasAlphaBuffer()) { trans[i] = rgb >> 24; if (trans[i] < 255) { @@ -534,6 +560,7 @@ bool QPNGImageWriter::writeImage(const Q } } } + png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette); if (num_trans) { copy_trans = new png_byte[num_trans]; for (int i=0; i<num_trans; i++) @@ -544,7 +571,10 @@ bool QPNGImageWriter::writeImage(const Q } if ( image.hasAlphaBuffer() ) { - info_ptr->sig_bit.alpha = 8; + png_color_8p sig_bit; + png_get_sBIT(png_ptr, info_ptr, &sig_bit); + sig_bit->alpha = 8; + png_set_sBIT(png_ptr, info_ptr, sig_bit); } // Swap ARGB to RGBA (normal PNG format) before saving on @@ -1030,7 +1060,7 @@ int QPNGFormat::decode(QImage& img, QIma return -1; } - if (setjmp((png_ptr)->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_read_struct(&png_ptr, &info_ptr, 0); image = 0; return -1; @@ -1057,7 +1087,7 @@ int QPNGFormat::decode(QImage& img, QIma if ( !png_ptr ) return 0; - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_read_struct(&png_ptr, &info_ptr, 0); image = 0; state = MovieStart; @@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn consumer->frameDone(QPoint(offx,offy),r); consumer->end(); state = FrameStart; - unused_data = (int)png->buffer_size; // Since libpng doesn't tell us + unused_data = png_process_data_pause(png, 0); } #ifdef PNG_USER_CHUNKS_SUPPORTED -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
