Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2014-09-20 15:50:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4" Changes: -------- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes 2014-09-10 07:27:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2014-09-20 15:50:45.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Sep 18 18:38:07 UTC 2014 - [email protected] + +- Added fix_qrasterpixmapdata_bnc847880.diff (bnc#847880). + When extracting a region of a QRasterPixmapData an optimization + was using the wrong bit depth for some calculations thus copying + a different section of the image than requested. This breaks + specially the oxygen kde theme under qemu when using a cirrus driver. +- Removed workaround for bnc#847880 which is no longer needed. + +------------------------------------------------------------------- New: ---- fix_qrasterpixmapdata_bnc847880.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.3lScZX/_old 2014-09-20 15:50:51.000000000 +0200 +++ /var/tmp/diff_new_pack.3lScZX/_new 2014-09-20 15:50:51.000000000 +0200 @@ -131,6 +131,8 @@ Patch163: l-qclipboard_fix_recursive.patch # PATCH-FIX-OPENSUSE fix clipboard delay when pasting with LO and KFileDialog open - needed for LO KDE4 filepicker integration (3/3) Patch164: l-qclipboard_delay.patch +# PATCH-FIX-OPENSUSE fix_qrasterpixmapdata_bnc847880.diff -- fix image rect copy optimization that copied "garbage" when used in qemu/cirrus (bnc#847880) +Patch165: fix_qrasterpixmapdata_bnc847880.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/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 @@ -436,6 +438,7 @@ %patch162 -p1 %patch163 %patch164 +%patch165 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} @@ -506,27 +509,6 @@ ln -s %{_libdir} %{buildroot}/%{_libdir}/qt4/lib ln -s %{_bindir} %{buildroot}/%{_libdir}/qt4/bin -#BNC847880 -mkdir -p %{buildroot}%{_sysconfdir}/profile.d/ -cat <<EOF >%{buildroot}%{_sysconfdir}/profile.d/qt-graphicssystem.sh -if [ -z "${QT_GRAPHICSSYSTEM_CHECKED}" -a -z "${QT_GRAPHICSSYSTEM}" ] ; then - QT_GRAPHICSSYSTEM_CHECKED=1 - export QT_GRAPHICSSYSTEM_CHECKED - if ( /sbin/lspci 2>/dev/null | grep -qi "VGA compatible controller: Cirrus" ) ; then - QT_GRAPHICSSYSTEM=native - export QT_GRAPHICSSYSTEM - fi -fi -EOF -cat <<EOF >%{buildroot}%{_sysconfdir}/profile.d/qt-graphicssystem.csh -if ( ! $?QT_GRAPHICSSYSTEM_CHECKED ) then - setenv QT_GRAPHICSSYSTEM_CHECKED 1 - if ( ! $?QT_GRAPHICSSYSTEM ) then - /sbin/lspci |& grep -qi "VGA compatible controller: Cirrus" && setenv QT_GRAPHICSSYSTEM native - endif -endif -EOF - # install private headers manually instead of using -developer-build for comb in QtDeclarative/declarative QtCore/corelib QtScript/script QtGui/gui; do d=${comb%%/*} @@ -661,8 +643,6 @@ %{_sysconfdir}/rpm/macros.qt4 -%{_sysconfdir}/profile.d/qt-graphicssystem.*sh - %if %with_qt3support %exclude %plugindir/accessible/libqtaccessiblecompatwidgets.so %endif ++++++ fix_qrasterpixmapdata_bnc847880.diff ++++++ Index: qt-everywhere-opensource-src-4.8.6/src/gui/image/qpixmap_raster.cpp =================================================================== --- qt-everywhere-opensource-src-4.8.6.orig/src/gui/image/qpixmap_raster.cpp +++ qt-everywhere-opensource-src-4.8.6/src/gui/image/qpixmap_raster.cpp @@ -330,7 +330,7 @@ QImage QRasterPixmapData::toImage(const return image; QRect clipped = rect.intersected(QRect(0, 0, w, h)); - const uint du = uint(d); + const uint du = uint(image.depth()); if ((du % 8 == 0) && (((uint(clipped.x()) * du)) % 32 == 0)) return QImage(image.scanLine(clipped.y()) + clipped.x() * (du / 8), clipped.width(), clipped.height(), -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
