Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2014-05-11 18:30:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2014-03-16 08:05:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2014-05-11 18:31:01.000000000 +0200 @@ -1,0 +2,26 @@ +Tue Apr 29 21:58:40 UTC 2014 - [email protected] + +- update to 4.8.6: + * long list of bugfixes, forward and backward compatible + * for detailed list of changes, see included changes-4.8.6 +- remove patches that went upstream: + * 0001-Disallow-deep-or-widely-nested-entity-references.patch + * 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch + * 0001-Fully-expand-entities-to-ensure-deep-or-widely-neste.patch + * 0001-Mitigate-performance-regression-in-isExpandedEntityV.patch + * 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch + * 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch + * 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch + * 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch + * 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch + * aarch64-support.diff + * qt-everywhere-opensource-src-4.8.5.tar.gz + * webkit-sparc64.diff + +------------------------------------------------------------------- +Mon Apr 28 15:26:07 UTC 2014 - [email protected] + +- add 0001-Don-t-crash-on-broken-GIF-images.patch (bnc#875470, + CVE-2014-0190) + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change libqt4.changes: same change Old: ---- 0001-Disallow-deep-or-widely-nested-entity-references.patch 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch 0001-Fully-expand-entities-to-ensure-deep-or-widely-neste.patch 0001-Mitigate-performance-regression-in-isExpandedEntityV.patch 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch aarch64-support.diff qt-everywhere-opensource-src-4.8.5.tar.gz webkit-sparc64.diff New: ---- 0001-Don-t-crash-on-broken-GIF-images.patch qt-everywhere-opensource-src-4.8.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.fSAAuB/_old 2014-05-11 18:31:18.000000000 +0200 +++ /var/tmp/diff_new_pack.fSAAuB/_new 2014-05-11 18:31:18.000000000 +0200 @@ -38,7 +38,7 @@ # COMMON-VERSION-BEGIN %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version} -Version: 4.8.5 +Version: 4.8.6 Release: 0 # COMMON-VERSION-END # COMMON-VERSION-END @@ -86,7 +86,6 @@ Patch118: rcc-stable-dirlisting.diff Patch119: hppa_ldcw_fix.diff Patch120: hppa_unaligned_access_fix_458133.diff -Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff Patch128: build-qvfb-tool.diff Patch131: disable-im-for-password.diff @@ -100,26 +99,11 @@ # PATCH-FEATURE-OPENSUSE QSystemTrayicon.diff -- adds support for sni-qt plugin, which allows Qt applications to communicate via KStatusNotifier spec -- needed for # Plasma Next Patch150: QSystemTrayicon.diff -Patch151: aarch64-support.diff Patch152: fix-moc-from-choking-on-boost-headers.patch # PATCH-FIX-OPENSUSE qlocale_icu-no-warning-output.patch -- qWarnings about icu libraries and symbols are now only emmited in debug builds Patch153: qlocale_icu-no-warning-output.patch -# PATCH-FIX-UPSTREAM 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch (QTBUG#31932,kde#234484) -Patch154: 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch -# PATCH-FIX-UPSTREAM 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch (QTBUG#27809) -Patch155: 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch -# PATCH-FIX-UPSTREAM 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch (QTBUG#27809) -Patch156: 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch -# PATCH-FIX-UPSTREAM 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch (QTBUG#27809) -Patch157: 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch -# PATCH-FIX-UPSTREAM 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch (QTBUG#27809) -Patch158: 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch -# PATCH-FIX-UPSTREAM 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch (QTBUG#32908) -Patch159: 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch Patch160: ppc64le.diff -Patch161: 0001-Disallow-deep-or-widely-nested-entity-references.patch -Patch162: 0001-Fully-expand-entities-to-ensure-deep-or-widely-neste.patch -Patch163: 0001-Mitigate-performance-regression-in-isExpandedEntityV.patch +Patch161: 0001-Don-t-crash-on-broken-GIF-images.patch 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 %define check_config \ @@ -194,21 +178,10 @@ %patch141 -p0 %patch149 -p1 %patch150 -p1 -%patch151 %patch152 -p1 %patch153 -p1 -%patch154 -p1 -%patch155 -p1 -%patch156 -p1 -%patch157 -p1 -%patch158 -p1 -%patch159 -p1 %patch160 %patch161 -p1 -%patch162 -p1 -%patch163 -p1 -# ### 47 rediff -#%patch121 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} # COMMON-PREP-END libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.fSAAuB/_old 2014-05-11 18:31:18.000000000 +0200 +++ /var/tmp/diff_new_pack.fSAAuB/_new 2014-05-11 18:31:18.000000000 +0200 @@ -50,7 +50,7 @@ # COMMON-VERSION-BEGIN %define base_name libqt4 %define tar_version everywhere-opensource-src-%{version} -Version: 4.8.5 +Version: 4.8.6 Release: 0 # COMMON-VERSION-END Summary: C++ Program Library, Core Components @@ -104,7 +104,6 @@ Patch118: rcc-stable-dirlisting.diff Patch119: hppa_ldcw_fix.diff Patch120: hppa_unaligned_access_fix_458133.diff -Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff Patch128: build-qvfb-tool.diff Patch131: disable-im-for-password.diff @@ -118,26 +117,11 @@ # PATCH-FEATURE-OPENSUSE QSystemTrayicon.diff -- adds support for sni-qt plugin, which allows Qt applications to communicate via KStatusNotifier spec -- needed for # Plasma Next Patch150: QSystemTrayicon.diff -Patch151: aarch64-support.diff Patch152: fix-moc-from-choking-on-boost-headers.patch # PATCH-FIX-OPENSUSE qlocale_icu-no-warning-output.patch -- qWarnings about icu libraries and symbols are now only emmited in debug builds Patch153: qlocale_icu-no-warning-output.patch -# PATCH-FIX-UPSTREAM 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch (QTBUG#31932,kde#234484) -Patch154: 0001-Don-t-crash-if-the-relayed-signal-was-emitted-from-t.patch -# PATCH-FIX-UPSTREAM 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch (QTBUG#27809) -Patch155: 0002-QDBusPendingCall-add-a-missing-QWaitCondition-wakeAl.patch -# PATCH-FIX-UPSTREAM 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch (QTBUG#27809) -Patch156: 0003-Fix-unprotected-access-to-QDBusPendingCallPrivate-pe.patch -# PATCH-FIX-UPSTREAM 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch (QTBUG#27809) -Patch157: 0004-Remove-QDBusPendingCallPrivate-autoDelete-logic.patch -# PATCH-FIX-UPSTREAM 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch (QTBUG#27809) -Patch158: 0005-Change-QDBusPendingCallPrivate-to-full-reference-cou.patch -# PATCH-FIX-UPSTREAM 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch (QTBUG#32908) -Patch159: 0006-Revert-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch Patch160: ppc64le.diff -Patch161: 0001-Disallow-deep-or-widely-nested-entity-references.patch -Patch162: 0001-Fully-expand-entities-to-ensure-deep-or-widely-neste.patch -Patch163: 0001-Mitigate-performance-regression-in-isExpandedEntityV.patch +Patch161: 0001-Don-t-crash-on-broken-GIF-images.patch 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 %define check_config \ @@ -434,21 +418,10 @@ %patch141 -p0 %patch149 -p1 %patch150 -p1 -%patch151 %patch152 -p1 %patch153 -p1 -%patch154 -p1 -%patch155 -p1 -%patch156 -p1 -%patch157 -p1 -%patch158 -p1 -%patch159 -p1 %patch160 %patch161 -p1 -%patch162 -p1 -%patch163 -p1 -# ### 47 rediff -#%patch121 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} # COMMON-PREP-END @@ -591,6 +564,7 @@ %{_bindir}/xmlpatternsvalidator %{_datadir}/qt4/translations/qt_*.qm +%{_datadir}/qt4/translations/qtscript_*.qm %{_libdir}/libQtCLucene.so.* %{_libdir}/libQtCore*.so.* ++++++ 0001-Don-t-crash-on-broken-GIF-images.patch ++++++ >From 19d31c5b036a46365584d7d97e87f7fe16150623 Mon Sep 17 00:00:00 2001 From: Lars Knoll <[email protected]> Date: Thu, 24 Apr 2014 15:33:27 +0200 Subject: [PATCH] Don't crash on broken GIF images Broken GIF images could set invalid width and height values inside the image, leading to Qt creating a null QImage for it. In that case we need to abort decoding the image and return an error. Initial patch by Rich Moore. Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5 Task-number: QTBUG-38367 Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a Security-advisory: CVE-2014-0190 --- src/gui/image/qgifhandler.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp index 3324f04..5199dd3 100644 --- a/src/gui/image/qgifhandler.cpp +++ b/src/gui/image/qgifhandler.cpp @@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length, memset(bits, 0, image->byteCount()); } + // Check if the previous attempt to create the image failed. If it + // did then the image is broken and we should give up. + if (image->isNull()) { + state = Error; + return -1; + } + disposePrevious(image); disposed = false; -- 1.9.0 ++++++ 0180-window-role.diff ++++++ --- /var/tmp/diff_new_pack.fSAAuB/_old 2014-05-11 18:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.fSAAuB/_new 2014-05-11 18:31:19.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- src/corelib/kernel/qobject.cpp.orig +++ src/corelib/kernel/qobject.cpp -@@ -1074,10 +1074,19 @@ void QObject::setObjectName(const QStrin +@@ -1102,10 +1102,19 @@ void QObject::setObjectName(const QStrin d->objectName = name; @@ -40,7 +40,7 @@ =================================================================== --- src/gui/kernel/qwidget_p.h.orig +++ src/gui/kernel/qwidget_p.h -@@ -782,6 +782,7 @@ public: +@@ -784,6 +784,7 @@ public: static QWidget *keyboardGrabber; void setWindowRole(); @@ -76,7 +76,7 @@ } // set client leader property -@@ -3014,6 +3018,17 @@ void QWidgetPrivate::setWindowRole() +@@ -3015,6 +3019,17 @@ void QWidgetPrivate::setWindowRole() XChangeProperty(X11->display, q->internalWinId(), ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace, (unsigned char *)windowRole.constData(), windowRole.length()); ++++++ 0191-listview-alternate-row-colors.diff ++++++ --- /var/tmp/diff_new_pack.fSAAuB/_old 2014-05-11 18:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.fSAAuB/_new 2014-05-11 18:31:19.000000000 +0200 @@ -13,7 +13,7 @@ =================================================================== --- src/gui/itemviews/qlistview.cpp.orig +++ src/gui/itemviews/qlistview.cpp -@@ -992,7 +992,7 @@ void QListView::paintEvent(QPaintEvent * +@@ -997,7 +997,7 @@ void QListView::paintEvent(QPaintEvent * option.state &= ~QStyle::State_Enabled; cg = QPalette::Disabled; } else { ++++++ QSystemTrayicon.diff ++++++ --- /var/tmp/diff_new_pack.fSAAuB/_old 2014-05-11 18:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.fSAAuB/_new 2014-05-11 18:31:19.000000000 +0200 @@ -18,17 +18,19 @@ src/gui/util/util.pri | 7 10 files changed, 916 insertions(+), 328 deletions(-) ---- a/examples/desktop/systray/window.cpp -+++ b/examples/desktop/systray/window.cpp -@@ -158,15 +158,23 @@ +Index: qt-everywhere-opensource-src-4.8.6/examples/desktop/systray/window.cpp +=================================================================== +--- qt-everywhere-opensource-src-4.8.6.orig/examples/desktop/systray/window.cpp ++++ qt-everywhere-opensource-src-4.8.6/examples/desktop/systray/window.cpp +@@ -158,15 +158,23 @@ void Window::createIconGroupBox() iconComboBox->addItem(QIcon(":/images/bad.svg"), tr("Bad")); iconComboBox->addItem(QIcon(":/images/heart.svg"), tr("Heart")); iconComboBox->addItem(QIcon(":/images/trash.svg"), tr("Trash")); + iconComboBox->addItem(QIcon::fromTheme("system-file-manager"), tr("File Manager")); - + showIconCheckBox = new QCheckBox(tr("Show icon")); showIconCheckBox->setChecked(true); - + +#if defined(Q_WS_X11) + jitToolTipCheckBox = new QCheckBox(tr("Just In Time Tooltip")); +#endif @@ -43,10 +45,10 @@ +#endif iconGroupBox->setLayout(iconLayout); } - -@@ -254,5 +262,37 @@ + +@@ -254,5 +262,37 @@ void Window::createTrayIcon() trayIconMenu->addAction(quitAction); - + trayIcon = new QSystemTrayIcon(this); + QByteArray category = qgetenv("SNI_CATEGORY"); + if (!category.isEmpty()) { @@ -82,30 +84,34 @@ + return false; } +#endif ---- a/examples/desktop/systray/window.h -+++ b/examples/desktop/systray/window.h -@@ -69,6 +69,9 @@ - +Index: qt-everywhere-opensource-src-4.8.6/examples/desktop/systray/window.h +=================================================================== +--- qt-everywhere-opensource-src-4.8.6.orig/examples/desktop/systray/window.h ++++ qt-everywhere-opensource-src-4.8.6/examples/desktop/systray/window.h +@@ -69,6 +69,9 @@ public: + protected: void closeEvent(QCloseEvent *event); +#if defined(Q_WS_X11) + bool eventFilter(QObject *object, QEvent *event); +#endif - + private slots: void setIcon(int index); -@@ -86,6 +89,9 @@ +@@ -86,6 +89,9 @@ private: QLabel *iconLabel; QComboBox *iconComboBox; QCheckBox *showIconCheckBox; +#if defined(Q_WS_X11) + QCheckBox *jitToolTipCheckBox; +#endif - + QGroupBox *messageGroupBox; QLabel *typeLabel; +Index: qt-everywhere-opensource-src-4.8.6/src/gui/util/qabstractsystemtrayiconsys.cpp +=================================================================== --- /dev/null -+++ b/src/gui/util/qabstractsystemtrayiconsys.cpp ++++ qt-everywhere-opensource-src-4.8.6/src/gui/util/qabstractsystemtrayiconsys.cpp @@ -0,0 +1,65 @@ +/**************************************************************************** +** @@ -172,8 +178,10 @@ +} + +#endif +Index: qt-everywhere-opensource-src-4.8.6/src/gui/util/qabstractsystemtrayiconsys_p.h +=================================================================== --- /dev/null -+++ b/src/gui/util/qabstractsystemtrayiconsys_p.h ++++ qt-everywhere-opensource-src-4.8.6/src/gui/util/qabstractsystemtrayiconsys_p.h @@ -0,0 +1,106 @@ +/**************************************************************************** +** @@ -281,9 +289,11 @@ + +#endif // QABSTRACTSYSTEMTRAYICONSYS_P_H + ---- a/src/gui/util/qsystemtrayicon.cpp -+++ b/src/gui/util/qsystemtrayicon.cpp -@@ -287,12 +287,6 @@ +Index: qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon.cpp +=================================================================== +--- qt-everywhere-opensource-src-4.8.6.orig/src/gui/util/qsystemtrayicon.cpp ++++ qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon.cpp +@@ -287,12 +287,6 @@ bool QSystemTrayIcon::isVisible() const */ bool QSystemTrayIcon::event(QEvent *e) { @@ -295,9 +305,11 @@ -#endif return QObject::event(e); } - ---- a/src/gui/util/qsystemtrayicon_p.h -+++ b/src/gui/util/qsystemtrayicon_p.h + +Index: qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon_p.h +=================================================================== +--- qt-everywhere-opensource-src-4.8.6.orig/src/gui/util/qsystemtrayicon_p.h ++++ qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon_p.h @@ -62,10 +62,17 @@ #include "QtGui/qpixmap.h" #include "QtCore/qstring.h" @@ -305,9 +317,9 @@ +#if defined(Q_WS_X11) +#include "QtCore/qset.h" +#endif - + QT_BEGIN_NAMESPACE - + +#if defined(Q_WS_X11) +class QAbstractSystemTrayIconSys; +#else @@ -315,18 +327,18 @@ +#endif class QToolButton; class QLabel; - -@@ -75,6 +82,9 @@ - + +@@ -75,6 +82,9 @@ class QSystemTrayIconPrivate : public QO + public: QSystemTrayIconPrivate() : sys(0), visible(false) { } + #if defined(Q_WS_X11) + ~QSystemTrayIconPrivate(); + #endif - + void install_sys(); void remove_sys(); -@@ -90,7 +100,11 @@ +@@ -90,7 +100,11 @@ public: QPointer<QMenu> menu; QIcon icon; QString toolTip; @@ -337,10 +349,10 @@ + #endif bool visible; }; - -@@ -123,60 +137,37 @@ + +@@ -123,60 +137,37 @@ private: }; - + #if defined(Q_WS_X11) -QT_BEGIN_INCLUDE_NAMESPACE -#include <QtCore/qcoreapplication.h> @@ -349,7 +361,7 @@ -#include <X11/Xutil.h> -QT_END_INCLUDE_NAMESPACE +class QSystemTrayIconSysFactoryInterface; - + -class QSystemTrayIconSys : public QWidget +/** + * This class acts as a composite QSystemTrayIconSysFactory: It can create @@ -390,7 +402,7 @@ + QSystemTrayIconSysFactory(); + void registerSystemTrayIconPrivate(QSystemTrayIconPrivate *iconPrivate); + void unregisterSystemTrayIconPrivate(QSystemTrayIconPrivate *iconPrivate); - + -protected: - void paintEvent(QPaintEvent *pe); - void resizeEvent(QResizeEvent *re); @@ -407,7 +419,7 @@ + +private Q_SLOTS: + void refreshTrayIconPrivates(); - + private: - QPixmap background; - QSystemTrayIcon *q; @@ -420,19 +432,13 @@ }; -#endif // Q_WS_X11 +#endif - + QT_END_NAMESPACE - ---- a/src/gui/util/qsystemtrayicon_x11.cpp -+++ b/src/gui/util/qsystemtrayicon_x11.cpp -@@ -1,6 +1,6 @@ - /**************************************************************************** - ** --** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/legal - ** - ** This file is part of the QtGui module of the Qt Toolkit. + +Index: qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon_x11.cpp +=================================================================== +--- qt-everywhere-opensource-src-4.8.6.orig/src/gui/util/qsystemtrayicon_x11.cpp ++++ qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon_x11.cpp @@ -38,311 +38,122 @@ ** $QT_END_LICENSE$ ** @@ -440,7 +446,7 @@ +#ifndef QT_NO_SYSTEMTRAYICON + +#include <private/qfactoryloader_p.h> - + -#include "private/qt_x11_p.h" -#include "qlabel.h" -#include "qx11info_x11.h" @@ -457,10 +463,10 @@ +#include "qabstractsystemtrayiconsys_p.h" +#include "qcoreapplication.h" +#include "qxembedsystemtrayicon_x11_p.h" - + -#ifndef QT_NO_SYSTEMTRAYICON QT_BEGIN_NAMESPACE - + -Window QSystemTrayIconSys::sysTrayWindow = XNone; -QList<QSystemTrayIconSys *> QSystemTrayIconSys::trayIcons; -QCoreApplication::EventFilter QSystemTrayIconSys::oldEventFilter = 0; @@ -480,7 +486,7 @@ - return XGetSelectionOwner(QX11Info::display(), sysTraySelection); -} +Q_GLOBAL_STATIC(QSystemTrayIconSysFactory, qt_guiSystemTrayIconSysFactory) - + -XVisualInfo* QSystemTrayIconSys::getSysTrayVisualInfo() +QSystemTrayIconSysFactory::QSystemTrayIconSysFactory() +: pluginFactory(0) @@ -522,7 +528,7 @@ - - return sysTrayVisual.visual ? &sysTrayVisual : 0; } - + -bool QSystemTrayIconSys::sysTrayTracker(void *message, long *result) +void QSystemTrayIconSysFactory::loadPluginFactory() { @@ -617,7 +623,7 @@ - addToTray(); +#endif // QT_NO_LIBRARY } - + -QSystemTrayIconSys::~QSystemTrayIconSys() +QSystemTrayIconSysFactoryInterface *QSystemTrayIconSysFactory::factory() const { @@ -640,7 +646,7 @@ + static QXEmbedSystemTrayIconSysFactory def; + return def.isAvailable() ? &def : 0; } - + -void QSystemTrayIconSys::addToTray() +void QSystemTrayIconSysFactory::refreshTrayIconPrivates() { @@ -721,7 +727,7 @@ + } } } - + -void QSystemTrayIconSys::mousePressEvent(QMouseEvent *ev) +void QSystemTrayIconSysFactory::registerSystemTrayIconPrivate(QSystemTrayIconPrivate* trayIconPrivate) { @@ -742,7 +748,7 @@ - emit q->activated(QSystemTrayIcon::MiddleClick); + trayIconPrivates.insert(trayIconPrivate); } - + -void QSystemTrayIconSys::mouseDoubleClickEvent(QMouseEvent *ev) +void QSystemTrayIconSysFactory::unregisterSystemTrayIconPrivate(QSystemTrayIconPrivate* trayIconPrivate) { @@ -750,7 +756,7 @@ - emit q->activated(QSystemTrayIcon::DoubleClick); + trayIconPrivates.remove(trayIconPrivate); } - + -#ifndef QT_NO_WHEELEVENT -void QSystemTrayIconSys::wheelEvent(QWheelEvent *e) +QAbstractSystemTrayIconSys *QSystemTrayIconSysFactory::create(QSystemTrayIcon *trayIcon) const @@ -764,7 +770,7 @@ + return f->create(trayIcon); } -#endif - + -bool QSystemTrayIconSys::event(QEvent *e) +bool QSystemTrayIconSysFactory::isAvailable() const { @@ -774,7 +780,7 @@ - return QWidget::event(e); + return factory(); } - + -bool QSystemTrayIconSys::x11Event(XEvent *event) +//////////////////////////////////////////////// +QSystemTrayIconPrivate::~QSystemTrayIconPrivate() @@ -785,7 +791,7 @@ + qt_guiSystemTrayIconSysFactory()->unregisterSystemTrayIconPrivate(this); + delete sys; } - + -//////////////////////////////////////////////////////////////////////////// void QSystemTrayIconPrivate::install_sys() { @@ -805,7 +811,7 @@ + } + sys->updateVisibility(); } - + QRect QSystemTrayIconPrivate::geometry_sys() const { - if (!sys) @@ -815,9 +821,9 @@ + return QRect(); + return sys->geometry(); } - + void QSystemTrayIconPrivate::remove_sys() -@@ -350,35 +161,35 @@ +@@ -350,35 +161,35 @@ void QSystemTrayIconPrivate::remove_sys( if (!sys) return; QBalloonTip::hideBalloon(); @@ -826,7 +832,7 @@ - sys = 0; + sys->updateVisibility(); } - + void QSystemTrayIconPrivate::updateIcon_sys() { - if (!sys) @@ -834,7 +840,7 @@ return; sys->updateIcon(); } - + void QSystemTrayIconPrivate::updateMenu_sys() { - @@ -842,7 +848,7 @@ + return; + sys->updateMenu(); } - + void QSystemTrayIconPrivate::updateToolTip_sys() { - if (!sys) @@ -853,15 +859,15 @@ + sys->updateToolTip(); #endif } - + bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys() { - return QSystemTrayIconSys::locateSystemTray() != XNone; + return qt_guiSystemTrayIconSysFactory()->isAvailable(); } - + bool QSystemTrayIconPrivate::supportsMessages_sys() -@@ -389,12 +200,9 @@ +@@ -389,12 +200,9 @@ bool QSystemTrayIconPrivate::supportsMes void QSystemTrayIconPrivate::showMessage_sys(const QString &message, const QString &title, QSystemTrayIcon::MessageIcon icon, int msecs) { @@ -874,10 +880,12 @@ - msecs); + sys->showMessage(message, title, icon, msecs); } - + QT_END_NAMESPACE +Index: qt-everywhere-opensource-src-4.8.6/src/gui/util/qxembedsystemtrayicon_x11.cpp +=================================================================== --- /dev/null -+++ b/src/gui/util/qxembedsystemtrayicon_x11.cpp ++++ qt-everywhere-opensource-src-4.8.6/src/gui/util/qxembedsystemtrayicon_x11.cpp @@ -0,0 +1,469 @@ +/**************************************************************************** +** @@ -1348,8 +1356,10 @@ + +QT_END_NAMESPACE +#endif //QT_NO_SYSTEMTRAYICON +Index: qt-everywhere-opensource-src-4.8.6/src/gui/util/qxembedsystemtrayicon_x11_p.h +=================================================================== --- /dev/null -+++ b/src/gui/util/qxembedsystemtrayicon_x11_p.h ++++ qt-everywhere-opensource-src-4.8.6/src/gui/util/qxembedsystemtrayicon_x11_p.h @@ -0,0 +1,104 @@ +/**************************************************************************** +** @@ -1455,11 +1465,13 @@ + +#endif // QXEMBEDSYSTEMTRAYICON_X11_P_H + ---- a/src/gui/util/util.pri -+++ b/src/gui/util/util.pri -@@ -29,8 +29,13 @@ +Index: qt-everywhere-opensource-src-4.8.6/src/gui/util/util.pri +=================================================================== +--- qt-everywhere-opensource-src-4.8.6.orig/src/gui/util/util.pri ++++ qt-everywhere-opensource-src-4.8.6/src/gui/util/util.pri +@@ -29,8 +29,13 @@ wince* { } - + unix:x11 { + HEADERS += \ + util/qabstractsystemtrayiconsys_p.h \ @@ -1470,5 +1482,5 @@ + util/qsystemtrayicon_x11.cpp \ + util/qxembedsystemtrayicon_x11.cpp } - + embedded|qpa { ++++++ plastik-default.diff ++++++ --- /var/tmp/diff_new_pack.fSAAuB/_old 2014-05-11 18:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.fSAAuB/_new 2014-05-11 18:31:19.000000000 +0200 @@ -31,7 +31,7 @@ =================================================================== --- src/gui/kernel/qapplication_x11.cpp.orig +++ src/gui/kernel/qapplication_x11.cpp -@@ -2321,12 +2321,23 @@ void qt_init(QApplicationPrivate *priv, +@@ -2323,12 +2323,23 @@ void qt_init(QApplicationPrivate *priv, int rc; do { @@ -60,9 +60,9 @@ =================================================================== --- src/gui/kernel/qt_x11_p.h.orig +++ src/gui/kernel/qt_x11_p.h -@@ -689,6 +689,8 @@ struct QX11Data - XTabletStylus, +@@ -690,6 +690,8 @@ struct QX11Data XTabletEraser, + XTablet, + KDE_FULL_SESSION, + ++++++ qdbusconnection-no-warning-output.patch ++++++ --- /var/tmp/diff_new_pack.fSAAuB/_old 2014-05-11 18:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.fSAAuB/_new 2014-05-11 18:31:19.000000000 +0200 @@ -1,6 +1,8 @@ ---- src/dbus/qdbusconnection.cpp +Index: src/dbus/qdbusconnection.cpp +=================================================================== +--- src/dbus/qdbusconnection.cpp.orig +++ src/dbus/qdbusconnection.cpp -@@ -1109,8 +1109,10 @@ +@@ -1110,8 +1110,10 @@ public: // make sure this connection is running on the main thread QCoreApplication *instance = QCoreApplication::instance(); if (!instance) { ++++++ qfatal-noreturn.diff ++++++ --- /var/tmp/diff_new_pack.fSAAuB/_old 2014-05-11 18:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.fSAAuB/_new 2014-05-11 18:31:19.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- src/corelib/global/qglobal.h.orig +++ src/corelib/global/qglobal.h -@@ -1764,6 +1764,7 @@ Q_CORE_EXPORT void qCritical(const char +@@ -1772,6 +1772,7 @@ Q_CORE_EXPORT void qCritical(const char Q_CORE_EXPORT void qFatal(const char *, ...) /* print fatal message and exit */ #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) ++++++ qt-debug-timer.diff ++++++ --- /var/tmp/diff_new_pack.fSAAuB/_old 2014-05-11 18:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.fSAAuB/_new 2014-05-11 18:31:19.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- src/corelib/kernel/qeventdispatcher_unix.cpp.orig +++ src/corelib/kernel/qeventdispatcher_unix.cpp -@@ -593,6 +593,21 @@ int QTimerInfoList::activateTimers() +@@ -592,6 +592,21 @@ int QTimerInfoList::activateTimers() if (!firstTimerInfo) { firstTimerInfo = currentTimerInfo; ++++++ qt-everywhere-opensource-src-4.8.5.tar.gz -> qt-everywhere-opensource-src-4.8.6.tar.gz ++++++ /work/SRC/openSUSE:Factory/libqt4/qt-everywhere-opensource-src-4.8.5.tar.gz /work/SRC/openSUSE:Factory/.libqt4.new/qt-everywhere-opensource-src-4.8.6.tar.gz differ: char 5, line 1 ++++++ qt-never-strip.diff ++++++ --- /var/tmp/diff_new_pack.fSAAuB/_old 2014-05-11 18:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.fSAAuB/_new 2014-05-11 18:31:19.000000000 +0200 @@ -10,7 +10,7 @@ QMAKE_CONFIG= QTCONFIG_CONFIG= QT_CONFIG= -@@ -1619,7 +1618,7 @@ while [ "$#" -gt 0 ]; do +@@ -1625,7 +1624,7 @@ while [ "$#" -gt 0 ]; do QMakeVar add QMAKE_CFLAGS -pg QMakeVar add QMAKE_CXXFLAGS -pg QMakeVar add QMAKE_LFLAGS -pg @@ -19,7 +19,7 @@ else UNKNOWN_OPT=yes fi -@@ -3354,6 +3353,8 @@ if [ "$OPT_VERBOSE" = "yes" ]; then +@@ -3359,6 +3358,8 @@ if [ "$OPT_VERBOSE" = "yes" ]; then fi fi ++++++ qt4-fix-s390x-build.diff ++++++ --- /var/tmp/diff_new_pack.fSAAuB/_old 2014-05-11 18:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.fSAAuB/_new 2014-05-11 18:31:19.000000000 +0200 @@ -1,4 +1,6 @@ ---- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +Index: src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +=================================================================== +--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig +++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -189,6 +189,18 @@ #define WTF_CPU_SPARC 1 @@ -19,18 +21,20 @@ /* CPU(X86) - i386 / x86 32-bit */ #if defined(__i386__) \ || defined(i386) \ -@@ -884,7 +896,7 @@ +@@ -903,7 +915,7 @@ #endif #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) -+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X) +-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) ++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(S390X) #define WTF_USE_JSVALUE64 1 #elif CPU(ARM) || CPU(PPC64) #define WTF_USE_JSVALUE32 1 ---- src/corelib/arch/qatomic_s390.h +Index: src/corelib/arch/qatomic_s390.h +=================================================================== +--- src/corelib/arch/qatomic_s390.h.orig +++ src/corelib/arch/qatomic_s390.h -@@ -398,6 +398,15 @@ +@@ -398,6 +398,15 @@ Q_INLINE_TEMPLATE T* QBasicAtomicPointer return fetchAndStoreAcquire(newValue); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
