Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2014-03-27 09:29:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2014-03-23 22:34:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes 2014-03-27 09:29:44.000000000 +0100 @@ -1,0 +2,20 @@ +Tue Mar 25 11:44:16 UTC 2014 - [email protected] + +- Update to 5.3.0 beta + * New feature release, please see + http://blog.qt.digia.com/blog/2014/03/25/qt-5-3-beta-released/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.3 +- Drop qtbase-qatomic-ppc.patch, merged upstream +- Added f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch: prefer QPA + implementation in qsystemtrayicon_x11 if available +- Added pkgconfig(libsystemd-journal) BuildRequires and activate + journald support +- Added pkgconfig(xkbcommon-x11) BuildRequires with 13.2+: it's now + needed for full xkb support, for lower version added xkeyboard-config + BuildRequires +- Ommit QMAKE_STRIP flags in mkspecs/common/linux.conf, otherwise no + debuginfo is generated for packages which use qmake buildsystem +- Droped passing of -javascript-jit, as per upstream changes +- Rebase libqt5-libtool-nodate.diff for this release + +------------------------------------------------------------------- Old: ---- qtbase-opensource-src-5.2.1.tar.xz qtbase-qatomic-ppc.patch New: ---- f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch qtbase-opensource-src-5.3.0-beta.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.7GRBB5/_old 2014-03-27 09:29:48.000000000 +0100 +++ /var/tmp/diff_new_pack.7GRBB5/_new 2014-03-27 09:29:48.000000000 +0100 @@ -19,15 +19,15 @@ %define qt5_snapshot 0 Name: libqt5-qtbase -Version: 5.2.1 +Version: 5.3.0~beta Release: 0 Summary: C++ Program Library, Core Components License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 Group: System/Libraries Url: http://qt.digia.com %define base_name libqt5 -%define real_version 5.2.1 -%define so_version 5.2.1 +%define real_version 5.3.0-beta +%define so_version 5.3.0 %if %qt5_snapshot %define tar_version qtbase-%{real_version} %else @@ -38,14 +38,14 @@ Source1: libqt5-qtbase.changes Source2: macros.qt5 Source3: baselibs.conf -# PATCH-FIX-UPSTREAM qtbase-qatomic-ppc.patch -- fixes build on PPC -Patch3: qtbase-qatomic-ppc.patch # PATCH-FIX-UPSTREAM libqt5-libtool-nodate.diff -- for ommiting date/time on build Patch109: libqt5-libtool-nodate.diff # PATCH-FIX-UPSTREAM qmake-add-usr-include.diff -- explicitly include /usr/include path Patch131: qmake-add-usr-include.diff # PATCH-FIX-UPSTREAM use-freetype-default.patch -- allow using lcd-default filter regardless of how freetype2 library has been built (w/ & w/o subpixel) Patch132: use-freetype-default.patch +# PATCH-FIX-UPSTREAM f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch -- prefer QPA implementation in qsystemtrayicon_x11 if available +Patch133: f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: fdupes @@ -91,7 +91,13 @@ %endif BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(sm) -BuildRequires: pkgconfig(xkbcommon) >= 0.2.0 +%if 0%{?suse_version} >= 1320 +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xkbcommon-x11) +%else +BuildRequires: xkeyboard-config +%endif +BuildRequires: pkgconfig(libsystemd-journal) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -120,10 +126,10 @@ %else %setup -q -n qtbase-opensource-src-%{real_version} %endif -%patch3 -p1 %patch109 -p1 %patch131 -p1 %patch132 -p1 +%patch133 -p1 # be sure not to use them rm -r src/3rdparty/{libjpeg,freetype,libpng,zlib} @@ -599,6 +605,7 @@ %else platform="" %endif +%define xkbconfigroot %(pkg-config --variable=xkb_base xkeyboard-config) %if %qt5_snapshot #force the configure script to generate the forwarding headers (it checks whether .git directory exists) mkdir .git @@ -606,6 +613,8 @@ # Record mtime of changes file instead of build time CHANGES=`stat --format="%y" %{SOURCE1}|cut --characters=1-10` sed -i -e "s/qt_instdate=\$TODAY/qt_instdate=$CHANGES/" configure +# so non-qt5 apps/libs don't get stripped +sed -i -e 's|^\(QMAKE_STRIP.*=\).*$|\1|g' mkspecs/common/linux.conf echo yes | ./configure $platform \ -prefix %{_prefix} \ @@ -631,6 +640,12 @@ -no-separate-debug-info \ -shared \ -xkb \ +%if 0%{?suse_version} >= 1320 + -system-xkbcommon \ +%else + -qt-xkbcommon \ + -xkb-config-root %{xkbconfigroot} \ +%endif -xrender \ -xcursor \ -dbus-linked \ @@ -657,12 +672,10 @@ -system-sqlite \ -no-sql-mysql \ -no-strip \ + -journald \ -xsync \ -xinput \ -gtkstyle \ -%ifarch %arm %ix86 x86_64 - -javascript-jit \ -%endif -xcb \ -egl \ -eglfs \ @@ -779,6 +792,8 @@ %{libqt5_bindir}/uic* %{_bindir}/syncqt.pl* %{libqt5_bindir}/syncqt.pl* +%{_bindir}/qlalr* +%{libqt5_bindir}/qlalr* %{libqt5_archdatadir}/mkspecs/ %dir %{libqt5_libdir}/cmake %dir %{libqt5_includedir} ++++++ f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch ++++++ >From f1ee10f81ac18789e9a7dc715b464415ba2bc2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <[email protected]> Date: Wed, 19 Feb 2014 11:01:44 +0100 Subject: [PATCH] Prefer QPA implementation in qsystemtrayicon_x11 if available In order to have the possibility to provide a custom QSystemTrayIcon implementation in the platform theme instead of the X11 xembed based one, the qpa implementation needs to be called. This was not possible as qpa and x11 implementation were compile time mutual exclusive. This change moves the qpa implementation in the shared part and the methods in qsystemtrayicon_qpa just delegate to them. In addition the _x11 part tries to create a QPlatformSystemTrayIcon through the platform theme and if that succeeds the implementation prefers the qpa variant and delegates to the same methods. Change-Id: I6b33acac63524a77ebdce39af6eb74666f8c7561 Reviewed-by: Kevin Krammer <[email protected]> Reviewed-by: Friedemann Kleint <[email protected]> Reviewed-by: Paul Olav Tvete <[email protected]> --- src/widgets/util/qsystemtrayicon.cpp | 68 ++++++++++++++++++++++++++++++ src/widgets/util/qsystemtrayicon_p.h | 9 ++++ src/widgets/util/qsystemtrayicon_qpa.cpp | 51 ++++------------------ src/widgets/util/qsystemtrayicon_x11.cpp | 40 +++++++++++++++++- 4 files changed, 126 insertions(+), 42 deletions(-) diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp index f1a69e6..fa318f3 100644 --- a/src/widgets/util/qsystemtrayicon.cpp +++ b/src/widgets/util/qsystemtrayicon.cpp @@ -672,6 +672,74 @@ void QBalloonTip::timerEvent(QTimerEvent *e) QWidget::timerEvent(e); } +////////////////////////////////////////////////////////////////////// +void QSystemTrayIconPrivate::install_sys_qpa() +{ + qpa_sys->init(); + QObject::connect(qpa_sys, SIGNAL(activated(QPlatformSystemTrayIcon::ActivationReason)), + q_func(), SLOT(_q_emitActivated(QPlatformSystemTrayIcon::ActivationReason))); + QObject::connect(qpa_sys, &QPlatformSystemTrayIcon::messageClicked, + q_func(), &QSystemTrayIcon::messageClicked); + updateMenu_sys(); + updateIcon_sys(); + updateToolTip_sys(); +} + +void QSystemTrayIconPrivate::remove_sys_qpa() +{ + qpa_sys->cleanup(); +} + +QRect QSystemTrayIconPrivate::geometry_sys_qpa() const +{ + return qpa_sys->geometry(); +} + +void QSystemTrayIconPrivate::updateIcon_sys_qpa() +{ + qpa_sys->updateIcon(icon); +} + +void QSystemTrayIconPrivate::updateMenu_sys_qpa() +{ + if (menu) { + if (!menu->platformMenu()) { + QPlatformMenu *platformMenu = qpa_sys->createMenu(); + if (platformMenu) + menu->setPlatformMenu(platformMenu); + } + qpa_sys->updateMenu(menu->platformMenu()); + } +} + +void QSystemTrayIconPrivate::updateToolTip_sys_qpa() +{ + qpa_sys->updateToolTip(toolTip); +} + +void QSystemTrayIconPrivate::showMessage_sys_qpa(const QString &message, + const QString &title, + QSystemTrayIcon::MessageIcon icon, + int msecs) +{ + QIcon notificationIcon; + switch (icon) { + case QSystemTrayIcon::Information: + notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation); + break; + case QSystemTrayIcon::Warning: + notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning); + break; + case QSystemTrayIcon::Critical: + notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical); + break; + default: + break; + } + qpa_sys->showMessage(message, title, notificationIcon, + static_cast<QPlatformSystemTrayIcon::MessageIcon>(icon), msecs); +} + QT_END_NAMESPACE #endif // QT_NO_SYSTEMTRAYICON diff --git a/src/widgets/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h index 211ef30..317664a 100644 --- a/src/widgets/util/qsystemtrayicon_p.h +++ b/src/widgets/util/qsystemtrayicon_p.h @@ -98,6 +98,15 @@ public: QSystemTrayIconSys *sys; QPlatformSystemTrayIcon *qpa_sys; bool visible; + +private: + void install_sys_qpa(); + void remove_sys_qpa(); + void updateIcon_sys_qpa(); + void updateToolTip_sys_qpa(); + void updateMenu_sys_qpa(); + QRect geometry_sys_qpa() const; + void showMessage_sys_qpa(const QString &msg, const QString &title, QSystemTrayIcon::MessageIcon icon, int secs); }; class QBalloonTip : public QWidget diff --git a/src/widgets/util/qsystemtrayicon_qpa.cpp b/src/widgets/util/qsystemtrayicon_qpa.cpp index f98aeaf..045641c 100644 --- a/src/widgets/util/qsystemtrayicon_qpa.cpp +++ b/src/widgets/util/qsystemtrayicon_qpa.cpp @@ -65,28 +65,20 @@ QSystemTrayIconPrivate::~QSystemTrayIconPrivate() void QSystemTrayIconPrivate::install_sys() { - if (qpa_sys) { - qpa_sys->init(); - QObject::connect(qpa_sys, SIGNAL(activated(QPlatformSystemTrayIcon::ActivationReason)), - q_func(), SLOT(_q_emitActivated(QPlatformSystemTrayIcon::ActivationReason))); - QObject::connect(qpa_sys, SIGNAL(messageClicked()), - q_func(), SIGNAL(messageClicked())); - updateMenu_sys(); - updateIcon_sys(); - updateToolTip_sys(); - } + if (qpa_sys) + install_sys_qpa(); } void QSystemTrayIconPrivate::remove_sys() { if (qpa_sys) - qpa_sys->cleanup(); + remove_sys_qpa(); } QRect QSystemTrayIconPrivate::geometry_sys() const { if (qpa_sys) - return qpa_sys->geometry(); + return geometry_sys_qpa(); else return QRect(); } @@ -94,25 +86,19 @@ QRect QSystemTrayIconPrivate::geometry_sys() const void QSystemTrayIconPrivate::updateIcon_sys() { if (qpa_sys) - qpa_sys->updateIcon(icon); + updateIcon_sys_qpa(); } void QSystemTrayIconPrivate::updateMenu_sys() { - if (qpa_sys && menu) { - if (!menu->platformMenu()) { - QPlatformMenu *platformMenu = qpa_sys->createMenu(); - if (platformMenu) - menu->setPlatformMenu(platformMenu); - } - qpa_sys->updateMenu(menu->platformMenu()); - } + if (qpa_sys) + updateMenu_sys_qpa(); } void QSystemTrayIconPrivate::updateToolTip_sys() { if (qpa_sys) - qpa_sys->updateToolTip(toolTip); + updateToolTip_sys_qpa(); } bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys() @@ -138,25 +124,8 @@ void QSystemTrayIconPrivate::showMessage_sys(const QString &message, QSystemTrayIcon::MessageIcon icon, int msecs) { - if (!qpa_sys) - return; - - QIcon notificationIcon; - switch (icon) { - case QSystemTrayIcon::Information: - notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation); - break; - case QSystemTrayIcon::Warning: - notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning); - break; - case QSystemTrayIcon::Critical: - notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical); - break; - default: - break; - } - qpa_sys->showMessage(message, title, notificationIcon, - static_cast<QPlatformSystemTrayIcon::MessageIcon>(icon), msecs); + if (qpa_sys) + showMessage_sys_qpa(message, title, icon, msecs); } QT_END_NAMESPACE diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index 347e570..27d0418 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -55,6 +55,9 @@ #include <qscreen.h> #include <qbackingstore.h> #include <qpa/qplatformnativeinterface.h> +#include <qpa/qplatformsystemtrayicon.h> +#include <qpa/qplatformtheme.h> +#include <private/qguiapplication_p.h> #include <qdebug.h> #ifndef QT_NO_SYSTEMTRAYICON @@ -209,16 +212,22 @@ void QSystemTrayIconSys::paintEvent(QPaintEvent *) QSystemTrayIconPrivate::QSystemTrayIconPrivate() : sys(0), + qpa_sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon()), visible(false) { } QSystemTrayIconPrivate::~QSystemTrayIconPrivate() { + delete qpa_sys; } void QSystemTrayIconPrivate::install_sys() { + if (qpa_sys) { + install_sys_qpa(); + return; + } Q_Q(QSystemTrayIcon); if (!sys && locateSystemTray()) { sys = new QSystemTrayIconSys(q); @@ -229,6 +238,8 @@ void QSystemTrayIconPrivate::install_sys() QRect QSystemTrayIconPrivate::geometry_sys() const { + if (qpa_sys) + return geometry_sys_qpa(); if (!sys) return QRect(); return sys->globalGeometry(); @@ -236,6 +247,10 @@ QRect QSystemTrayIconPrivate::geometry_sys() const void QSystemTrayIconPrivate::remove_sys() { + if (qpa_sys) { + remove_sys_qpa(); + return; + } if (!sys) return; QBalloonTip::hideBalloon(); @@ -246,17 +261,26 @@ void QSystemTrayIconPrivate::remove_sys() void QSystemTrayIconPrivate::updateIcon_sys() { + if (qpa_sys) { + updateIcon_sys_qpa(); + return; + } if (sys) sys->updateIcon(); } void QSystemTrayIconPrivate::updateMenu_sys() { - + if (qpa_sys) + updateMenu_sys_qpa(); } void QSystemTrayIconPrivate::updateToolTip_sys() { + if (qpa_sys) { + updateToolTip_sys_qpa(); + return; + } if (!sys) return; #ifndef QT_NO_TOOLTIP @@ -266,6 +290,11 @@ void QSystemTrayIconPrivate::updateToolTip_sys() bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys() { + QScopedPointer<QPlatformSystemTrayIcon> sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon()); + if (sys) + return sys->isSystemTrayAvailable(); + + // no QPlatformSystemTrayIcon so fall back to default xcb platform behavior const QString platform = QGuiApplication::platformName(); if (platform.compare(QStringLiteral("xcb"), Qt::CaseInsensitive) == 0) return locateSystemTray(); @@ -274,12 +303,21 @@ bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys() bool QSystemTrayIconPrivate::supportsMessages_sys() { + QScopedPointer<QPlatformSystemTrayIcon> sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon()); + if (sys) + return sys->supportsMessages(); + + // no QPlatformSystemTrayIcon so fall back to default xcb platform behavior return true; } void QSystemTrayIconPrivate::showMessage_sys(const QString &message, const QString &title, QSystemTrayIcon::MessageIcon icon, int msecs) { + if (qpa_sys) { + showMessage_sys_qpa(message, title, icon, msecs); + return; + } if (!sys) return; const QPoint g = sys->globalGeometry().topLeft(); -- 1.7.1 ++++++ libqt5-libtool-nodate.diff ++++++ --- /var/tmp/diff_new_pack.7GRBB5/_old 2014-03-27 09:29:48.000000000 +0100 +++ /var/tmp/diff_new_pack.7GRBB5/_new 2014-03-27 09:29:48.000000000 +0100 @@ -1,11 +1,11 @@ --- qtbase/qmake/generators/unix/unixmake2.cpp 2012/11/12 14:21:54 1.1 +++ qtbase/qmake/generators/unix/unixmake2.cpp 2012/11/12 14:22:13 -@@ -1297,7 +1297,7 @@ +@@ -1320,7 +1320,7 @@ UnixMakefileGenerator::writeLibtoolFile( QTextStream t(&ft); t << "# " << lname << " - a libtool library file\n"; t << "# Generated by qmake/libtool (" QMAKE_VERSION_STR ") (Qt " - << QT_VERSION_STR << ") on: " << QDateTime::currentDateTime().toString(); + << QT_VERSION_STR << ")"; - t << "\n"; - + t << "\n"; + t << "# The name that we can dlopen(3).\n" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
