Hello community, here is the log from the commit of package libqt4 for openSUSE:11.4 checked in at Wed Aug 31 11:43:13 CEST 2011.
-------- --- old-versions/11.4/all/libqt4/libqt4-devel-doc-data.changes 2011-02-03 16:26:27.000000000 +0100 +++ /mounts/work_src_done/11.4/libqt4/libqt4-devel-doc-data.changes 2011-08-31 11:41:12.912029000 +0200 @@ -1,0 +2,17 @@ +Tue Aug 16 23:06:24 CEST 2011 - [email protected] + +- fix reading of tiff images with multiple samples (bnc#637275) + +------------------------------------------------------------------- +Fri Aug 12 15:29:24 CEST 2011 - [email protected] + +- do not generate documentation in libqt4, it is supposed + to be in libqt4-devel-doc + +------------------------------------------------------------------- +Fri Jul 15 16:11:44 UTC 2011 - [email protected] + +- added libjscore.* from 3rdparty dir into libQtWebKit-devel package + (currently needed to compile eg. gambas3) + +------------------------------------------------------------------- libqt4-devel-doc.changes: same change libqt4-sql-plugins.changes: same change libqt4.changes: same change Package does not exist at destination yet. Using Fallback old-versions/11.4/all/libqt4 Destination is old-versions/11.4/UPDATES/all/libqt4 calling whatdependson for 11.4-i586 New: ---- tiff-samples-reader-crash.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.2E64NR/_old 2011-08-31 11:42:57.000000000 +0200 +++ /var/tmp/diff_new_pack.2E64NR/_new 2011-08-31 11:42:57.000000000 +0200 @@ -28,7 +28,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version: 4.7.1 -Release: 3 +Release: 3.<RELEASE2> %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -80,6 +80,7 @@ Patch122: push-glib-context.diff Patch123: use-cups-default-print-settings-bnc552218.diff Patch124: fix-psql.diff +Patch125: tiff-samples-reader-crash.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -138,6 +139,7 @@ %patch122 %patch123 %patch124 +%patch125 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-devel-doc.spec: same change libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.2E64NR/_old 2011-08-31 11:42:57.000000000 +0200 +++ /var/tmp/diff_new_pack.2E64NR/_new 2011-08-31 11:42:57.000000000 +0200 @@ -54,7 +54,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version: 4.7.1 -Release: 3 +Release: 8.<RELEASE9> %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -97,6 +97,7 @@ Patch122: push-glib-context.diff Patch123: use-cups-default-print-settings-bnc552218.diff Patch124: fix-psql.diff +Patch125: tiff-samples-reader-crash.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -155,6 +156,7 @@ %patch122 %patch123 %patch124 +%patch125 # ### 47 rediff #%patch121 -p1 # be sure not to use them @@ -339,6 +341,7 @@ %if %with_phonon %package -n phonon + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -358,6 +361,7 @@ Matthias Kretz %package -n phonon-devel + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -378,6 +382,7 @@ Matthias Kretz %package -n libphonon4 + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -398,6 +403,7 @@ %if %with_phonon_backend %package -n phonon-backend-gstreamer-0_10 + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -418,6 +424,7 @@ %package -n phonon-backend-xine + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -461,7 +468,7 @@ sed -i -e "s/qt_instdate=\$TODAY/qt_instdate=$CHANGES/" configure echo yes | ./configure %common_options $platform \ - -plugin-sql-sqlite -nomake examples -nomake demos -webkit -xmlpatterns + -plugin-sql-sqlite -nomake examples -nomake demos -nomake docs -webkit -xmlpatterns %check_config test -s translations/qt_de.qm || rm translations/qt_de.qm make %{?jobs:-j %jobs} @@ -471,6 +478,9 @@ %install make INSTALL_ROOT=$RPM_BUILD_ROOT install +install -m 644 -D src/3rdparty/webkit/JavaScriptCore/release/libjscore.a %{buildroot}/%_libdir +install -m 644 -D src/3rdparty/webkit/JavaScriptCore/release/libjscore.prl %{buildroot}/%_libdir + # argggh, qmake is such a piece of <censored> find $RPM_BUILD_ROOT/%_libdir -type f -name '*prl' -exec perl -pi -e "s, -L$RPM_BUILD_DIR/\S+,,g" {} \; find $RPM_BUILD_ROOT/%_libdir -type f -name '*prl' -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \; @@ -627,18 +637,23 @@ %_libdir/libQtDeclarative.so %_libdir/libQtDeclarative.prl %_libdir/libQtDeclarative.la +%_libdir/libjscore.a +%_libdir/libjscore.prl %_libdir/pkgconfig/QtWebKit.pc %_libdir/pkgconfig/QtXmlPatterns.pc %_libdir/pkgconfig/QtDeclarative.pc %files devel %defattr(-,root,root,755) + %exclude %_libdir/libQtWebKit.la %exclude %_libdir/libQtWebKit.prl %exclude %_libdir/libQtWebKit.so %exclude %_libdir/libQtDeclarative.so %exclude %_libdir/libQtDeclarative.prl %exclude %_libdir/libQtDeclarative.la +%exclude %_libdir/libjscore.a +%exclude %_libdir/libjscore.prl %exclude %_libdir/libQtXmlPatterns.la %exclude %_libdir/libQtXmlPatterns.prl %exclude %_libdir/libQtXmlPatterns.prl ++++++ tiff-samples-reader-crash.diff ++++++ commit cb6380beb81ab9571c547270c144988781fed465 Author: Luboš Luňák <[email protected]> Date: Tue Sep 7 12:07:34 2010 +0200 fix tiff reader to handle TIFFTAG_SAMPLESPERPIXEL for grayscale images This commit fixes reading a .tiff file from ImageMagick which reports the following: TIFFTAG_BITSPERSAMPLE = 8 TIFFTAG_SAMPLESPERPIXEL = 2 TIFFTAG_PHOTOMETRIC = PHOTOMETRIC_MINISBLACK The reader uses QImage::Format_Indexed8, but since the samples per pixel value this should be (non-existent) QImage::Format_Indexed16, causing memory corruption. The fix falls back to the "normal" way of reading tiff images. Merge-request: 2467 Reviewed-by: Samuel Rødal <[email protected]> --- src/gui/image/qtiffhandler.cpp +++ src/gui/image/qtiffhandler.cpp @@ -196,9 +196,12 @@ bool QTiffHandler::read(QImage *image) uint16 bitPerSample; if (!TIFFGetField(tiff, TIFFTAG_BITSPERSAMPLE, &bitPerSample)) bitPerSample = 1; + uint16 samplesPerPixel; // they may be e.g. grayscale with 2 samples per pixel + if (!TIFFGetField(tiff, TIFFTAG_SAMPLESPERPIXEL, &samplesPerPixel)) + samplesPerPixel = 1; bool grayscale = photometric == PHOTOMETRIC_MINISBLACK || photometric == PHOTOMETRIC_MINISWHITE; - if (grayscale && bitPerSample == 1) { + if (grayscale && bitPerSample == 1 && samplesPerPixel == 1) { if (image->size() != QSize(width, height) || image->format() != QImage::Format_Mono) *image = QImage(width, height, QImage::Format_Mono); QVector<QRgb> colortable(2); @@ -220,7 +223,7 @@ bool QTiffHandler::read(QImage *image) } } } else { - if ((grayscale || photometric == PHOTOMETRIC_PALETTE) && bitPerSample == 8) { + if ((grayscale || photometric == PHOTOMETRIC_PALETTE) && bitPerSample == 8 && samplesPerPixel == 1) { if (image->size() != QSize(width, height) || image->format() != QImage::Format_Indexed8) *image = QImage(width, height, QImage::Format_Indexed8); if (!image->isNull()) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
