Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2014-12-21 11:59:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-11-18 22:55:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes 2014-12-21 11:59:25.000000000 +0100 @@ -1,0 +2,51 @@ +Tue Dec 16 09:17:05 UTC 2014 - hrvoje.sen...@gmail.com + +- Don't override the shlib generator, but split gtk platformtheme + into platformtheme-gtk2 subpackage, the former approach is creating + problems with other dependant packages + +------------------------------------------------------------------- +Wed Dec 10 11:00:05 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.4 Final + * For more details please see: + http://blog.qt.digia.com/blog/2014/12/10/qt-5-4-released/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.4 +- Added Handle-SelectionClientClose-in-QXcbClipboard.patch, kde#329174 + +------------------------------------------------------------------- +Thu Nov 27 15:46:15 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.4 RC + * For more details please see: + http://blog.qt.digia.com/blog/2014/11/27/qt-5-4-release-candidate-available/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.4 +- New libQt5PlatformHeaders-devel subpackage +- Use one global define for gles on arm and aarch +- (Build)Require Mesa-libGLESv3-devel when building with gles +- Use system harfbuzz on 13.2 and newer +- Filter out requires obtained by dependency generators. + gtk platformtheme now won't pull in gtk libraries, so users can + have a gtk-free envirement if wanted. Those DE's that do need that + platformplugin will already have gtk present +- Drop patches merged upstream: + 0001-Add-QFont-strategy-to-disable-subpixel-antialiasing.patch + 0001-Allow-panels-outside-of-availableGeometry.patch + 0001-QFileDialog-emit-urlsSelected-urlSelected-in-accept.patch + 0001-QKdeTheme-use-system-wide-kdeglobals-as-a-fallback.patch + 00010-Replace-the-const-QString-global-static-with-a-QStri.patch + 00011-Use-correct-signal-name-when-disconnecting.patch + 0002-Always-lock-the-DBus-dispatcher-before-dbus_connecti.patch + 0002-Move-SubpixelAntialiasingType-from-QFontEngineFT-to-.patch + 0002-QUrl-fromLocalFile-QString-should-lead-to-an-empty-U.patch + 0003-QDBusConnection-Merge-the-dispatch-and-the-watch-and.patch + 0003-QFileDialog-turn-workingDirectory-into-a-QUrl.patch + 0003-Support-autohint-and-lcdfilter-fontconfig-configurat.patch + 0004-GTK2-theme-should-use-GTK-configured-font-variant.patch + 0004-Partially-revert-Fix-a-deadlock-introduced-by-the-ra.patch + 0004-QFileDialog-implement-getOpenFileUrl-and-friends-for.patch + f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch + libqt5-add-support-for-byte-swapping.patch + libqt5-byte-order-byte-is-address0.patch + +------------------------------------------------------------------- Old: ---- 0001-Add-QFont-strategy-to-disable-subpixel-antialiasing.patch 0001-Allow-panels-outside-of-availableGeometry.patch 0001-QFileDialog-emit-urlsSelected-urlSelected-in-accept.patch 0001-QKdeTheme-use-system-wide-kdeglobals-as-a-fallback.patch 00010-Replace-the-const-QString-global-static-with-a-QStri.patch 00011-Use-correct-signal-name-when-disconnecting.patch 0002-Always-lock-the-DBus-dispatcher-before-dbus_connecti.patch 0002-Move-SubpixelAntialiasingType-from-QFontEngineFT-to-.patch 0002-QUrl-fromLocalFile-QString-should-lead-to-an-empty-U.patch 0003-QDBusConnection-Merge-the-dispatch-and-the-watch-and.patch 0003-QFileDialog-turn-workingDirectory-into-a-QUrl.patch 0003-Support-autohint-and-lcdfilter-fontconfig-configurat.patch 0004-GTK2-theme-should-use-GTK-configured-font-variant.patch 0004-Partially-revert-Fix-a-deadlock-introduced-by-the-ra.patch 0004-QFileDialog-implement-getOpenFileUrl-and-friends-for.patch f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch libqt5-add-support-for-byte-swapping.patch libqt5-byte-order-byte-is-address0.patch qtbase-opensource-src-5.3.2.tar.xz New: ---- Handle-SelectionClientClose-in-QXcbClipboard.patch qtbase-opensource-src-5.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.JvECkf/_old 2014-12-21 11:59:28.000000000 +0100 +++ /var/tmp/diff_new_pack.JvECkf/_new 2014-12-21 11:59:28.000000000 +0100 @@ -19,16 +19,22 @@ %define qt5_snapshot 0 %define journald 0 +%ifarch %arm aarch64 +%define gles 1 +%else +%define gles 0 +%endif + Name: libqt5-qtbase -Version: 5.3.2 +Version: 5.4.0 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.3.2 -%define so_version 5.3.2 +%define real_version 5.4.0 +%define so_version 5.4.0 %define tar_version qtbase-opensource-src-%{real_version} Source: %{tar_version}.tar.xz # to get mtime of file: @@ -52,42 +58,8 @@ Patch6: QTBUG41590.patch # patches 1000-2000 and above from upstream 5.3 branch # # patches 2000-3000 and above from upstream 5.4 branch # -# PATCH-FIX-UPSTREAM f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch -- prefer QPA implementation in qsystemtrayicon_x11 if available -Patch2000: f1ee10f81ac18789e9a7dc715b464415ba2bc2b8.patch -# PATCH-FIX-UPSTREAM libqt5-add-support-for-byte-swapping.patch -- add support for byte swapping(bnc#866709), currently it's at the upstream dev branch -Patch2001: libqt5-add-support-for-byte-swapping.patch -# PATCH-FIX-UPSTREAM libqt5-byte-order-byte-is-address0.patch -- the byte order byte is at address 0(bnc#866709), currently it's at the upstream dev branch -Patch2002: libqt5-byte-order-byte-is-address0.patch -# PATCH-FIX-UPSTREAM 00010-Replace-the-const-QString-global-static-with-a-QStri.patch -Patch2003: 00010-Replace-the-const-QString-global-static-with-a-QStri.patch -# PATCH-FIX-UPSTREAM 00011-Use-correct-signal-name-when-disconnecting.patch -Patch2004: 00011-Use-correct-signal-name-when-disconnecting.patch -# PATCH-FIX-UPSTREAM 0001-QFileDialog-emit-urlsSelected-urlSelected-in-accept.patch -Patch2005: 0001-QFileDialog-emit-urlsSelected-urlSelected-in-accept.patch -# PATCH-FIX-UPSTREAM 0002-QUrl-fromLocalFile-QString-should-lead-to-an-empty-U.patch -Patch2006: 0002-QUrl-fromLocalFile-QString-should-lead-to-an-empty-U.patch -# PATCH-FIX-UPSTREAM 0003-QFileDialog-turn-workingDirectory-into-a-QUrl.patch -Patch2007: 0003-QFileDialog-turn-workingDirectory-into-a-QUrl.patch -# PATCH-FIX-UPSTREAM 0004-QFileDialog-implement-getOpenFileUrl-and-friends-for.patch -Patch2008: 0004-QFileDialog-implement-getOpenFileUrl-and-friends-for.patch -# PATCH-FIX-UPSTREAM 0001-QKdeTheme-use-system-wide-kdeglobals-as-a-fallback.patch -Patch2009: 0001-QKdeTheme-use-system-wide-kdeglobals-as-a-fallback.patch -# PATCH-FIX-UPSTREAM 0001-Add-QFont-strategy-to-disable-subpixel-antialiasing.patch -Patch2010: 0001-Add-QFont-strategy-to-disable-subpixel-antialiasing.patch -# PATCH-FIX-UPSTREAM 0002-Move-SubpixelAntialiasingType-from-QFontEngineFT-to-.patch -Patch2011: 0002-Move-SubpixelAntialiasingType-from-QFontEngineFT-to-.patch -# PATCH-FIX-UPSTREAM 0003-Support-autohint-and-lcdfilter-fontconfig-configurat.patch -Patch2012: 0003-Support-autohint-and-lcdfilter-fontconfig-configurat.patch -# PATCH-FIX-UPSTREAM 0004-GTK2-theme-should-use-GTK-configured-font-variant.patch -Patch2013: 0004-GTK2-theme-should-use-GTK-configured-font-variant.patch -# PATCH-FIX-UPSTREAM 0001-Allow-panels-outside-of-availableGeometry.patch -Patch2014: 0001-Allow-panels-outside-of-availableGeometry.patch -# PATCH-FIX-UPSTREAM 0002-Always-lock-the-DBus-dispatcher-before-dbus_connecti.patch -Patch2015: 0002-Always-lock-the-DBus-dispatcher-before-dbus_connecti.patch -# PATCH-FIX-UPSTREAM 0003-QDBusConnection-Merge-the-dispatch-and-the-watch-and.patch -Patch2016: 0003-QDBusConnection-Merge-the-dispatch-and-the-watch-and.patch -# PATCH-FIX-UPSTREAM 0004-Partially-revert-Fix-a-deadlock-introduced-by-the-ra.patch -Patch2017: 0004-Partially-revert-Fix-a-deadlock-introduced-by-the-ra.patch +# PATCH-FIX-UPSTREAM Handle-SelectionClientClose-in-QXcbClipboard.patch -- kde#329174 +Patch2000: Handle-SelectionClientClose-in-QXcbClipboard.patch BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: fdupes @@ -113,7 +85,8 @@ BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gl) -%ifarch %arm aarch64 +%if %gles +BuildRequires: Mesa-libGLESv3-devel BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(glesv2) %endif @@ -128,7 +101,7 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libudev) -%if 0%{?suse_version} >= 1310 +%if 0%{?suse_version} >= 1320 BuildRequires: pkgconfig(harfbuzz) %endif BuildRequires: pkgconfig(ice) @@ -174,23 +147,6 @@ %patch5 -p1 %patch6 -p1 %patch2000 -p1 -%patch2001 -p1 -%patch2002 -p1 -%patch2003 -p1 -%patch2004 -p1 -%patch2005 -p1 -%patch2006 -p1 -%patch2007 -p1 -%patch2008 -p1 -%patch2009 -p1 -%patch2010 -p1 -%patch2011 -p1 -%patch2012 -p1 -%patch2013 -p1 -%patch2014 -p1 -%patch2015 -p1 -%patch2016 -p1 -%patch2017 -p1 # be sure not to use them rm -r src/3rdparty/{libjpeg,freetype,libpng,zlib} @@ -208,6 +164,7 @@ Requires: libQt5Gui-devel = %{version} Requires: libQt5Network-devel = %{version} Requires: libQt5OpenGL-devel = %{version} +Requires: libQt5PlatformHeaders-devel = %{version} Requires: libQt5PrintSupport-devel = %{version} Requires: libQt5Sql-devel = %{version} Requires: libQt5Test-devel = %{version} @@ -340,7 +297,8 @@ Requires: libQt5Gui-devel = %{version} Requires: libQt5OpenGL5 = %{version} Requires: libQt5Widgets-devel = %{version} -%ifarch %arm aarch64 +%if %gles +Requires: Mesa-libGLESv3-devel Requires: pkgconfig(glesv2) %else Requires: pkgconfig(gl) @@ -515,12 +473,22 @@ %description -n libQt5Gui5 Qt 5 libraries which are depending on X11. +%package platformtheme-gtk2 +Summary: Qt 5 gtk2 plugin +Group: Development/Libraries/C and C++ +Supplements: packageand(libQt5Gui5:libgtk-2_0-0) + +%description platformtheme-gtk2 +Qt 5 plugin for better integration with gtk2-based desktop enviroments. + %package -n libQt5Gui-devel Summary: Qt 5 GUI related libraries - development files Group: Development/Libraries/C and C++ Requires: libQt5Core-devel = %{version} Requires: libQt5Gui5 = %{version} -%ifarch %arm aarch64 +%if %gles +Requires: Mesa-libGLESv3-devel +Requires: pkgconfig(gbm) Requires: pkgconfig(glesv2) %else Requires: pkgconfig(gl) @@ -588,6 +556,7 @@ Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ BuildArch: noarch +Requires: %{name}-devel = %{version} Requires: libQt5Core-private-headers-devel = %{version} Requires: libQt5DBus-private-headers-devel = %{version} Requires: libQt5Gui-private-headers-devel = %{version} @@ -629,6 +598,7 @@ Group: Development/Libraries/C and C++ Requires: libQt5Core-devel = %{version} Requires: libQt5Gui-devel = %{version} +Requires: libQt5PlatformHeaders-devel = %{version} # List the below ones manually - they are private, but this is a static lib Requires: pkgconfig(Qt5DBus) Requires: pkgconfig(egl) @@ -656,6 +626,24 @@ %description -n libQt5PlatformSupport-private-headers-devel Qt 5 PlatformSupport Library - Non-ABI stable development files. +%package -n libQt5PlatformHeaders-devel +Summary: Qt 5 PlatformHeaders +Group: Development/Libraries/X11 +# NOTE this needs to be checked on every update - package provides only a low number of headers, so check which 3rd party, or other qtbase includes are used +Requires: libQt5Core-devel = %{version} +Requires: libQt5Gui-devel = %{version} +Requires: pkgconfig(egl) +Requires: pkgconfig(x11) +%if %gles +Requires: Mesa-libGLESv3-devel +Requires: pkgconfig(glesv2) +%else +Requires: pkgconfig(gl) +%endif + +%description -n libQt5PlatformHeaders-devel +Qt 5 PlatformHeaders. + %package examples Summary: Qt5 base examples Group: Development/Libraries/X11 @@ -736,7 +724,7 @@ -system-libjpeg \ -openssl-linked \ -system-libpng \ -%if 0%{?suse_version} >= 1310 +%if 0%{?suse_version} >= 1320 -system-harfbuzz \ %endif -fontconfig \ @@ -759,7 +747,7 @@ -xcb \ -egl \ -eglfs \ -%ifarch %arm aarch64 +%if %gles -eglfs -kms \ -opengl es2 \ %else @@ -1035,7 +1023,6 @@ %defattr(-,root,root,755) %doc *.txt LICENSE.* %{libqt5_libdir}/libQt5Widgets.so.* -%{libqt5_plugindir}/accessible %files -n libQt5Widgets-devel %defattr(-,root,root,755) @@ -1058,7 +1045,12 @@ %{libqt5_plugindir}/imageformats %{libqt5_plugindir}/platforminputcontexts %{libqt5_plugindir}/platforms -%{libqt5_plugindir}/platformthemes + +%files platformtheme-gtk2 +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%dir %{libqt5_plugindir}/platformthemes +%{libqt5_plugindir}/platformthemes/libqgtk2.so %files -n libQt5Gui-devel %defattr(-,root,root,755) @@ -1196,6 +1188,11 @@ %doc *.txt LICENSE.* %{libqt5_includedir}/QtWidgets/%{so_version}/ +%files -n libQt5PlatformHeaders-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_includedir}/QtPlatformHeaders/ + %files examples %defattr(-,root,root,755) %doc *.txt LICENSE.* ++++++ Handle-SelectionClientClose-in-QXcbClipboard.patch ++++++ From: Martin Gräßlin <mgraess...@kde.org> Date: Wed, 10 Dec 2014 06:27:23 +0000 Subject: Handle SelectionClientClose in QXcbClipboard X-Git-Url: http://quickgit.kde.org/?p=qt%2Fqtbase.git&a=commitdiff&h=6a7ee92b3958e3a3ebc16be15f8bd34217ec7bd2 --- Handle SelectionClientClose in QXcbClipboard QXcbClipboard listens for subtype SelectionClientClose of Xfixes SelectionNotify event, but doesn't handle it. When the client holding the clipboard selection closes the Clipboard becomes empty and thus the change should be emitted. This fixes downstream KDE Bug #329174. Change-Id: I19fb8cfd7bd3b249c0bc6ca2a724a9aeeb05ac7e Reviewed-by: Jørgen Lind <jorgen.l...@theqtcompany.com> Reviewed-by: Aleix Pol Gonzalez <aleix...@kde.org> --- --- a/src/plugins/platforms/xcb/qxcbclipboard.cpp +++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp @@ -742,7 +742,8 @@ m_xClipboard[mode]->reset(); } emitChanged(mode); - } + } else if (event->subtype == XCB_XFIXES_SELECTION_EVENT_SELECTION_CLIENT_CLOSE) + emitChanged(mode); } ++++++ libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch ++++++ --- /var/tmp/diff_new_pack.JvECkf/_old 2014-12-21 11:59:28.000000000 +0100 +++ /var/tmp/diff_new_pack.JvECkf/_new 2014-12-21 11:59:28.000000000 +0100 @@ -15,7 +15,7 @@ index dc677cd..4cd249e 100644 --- a/src/plugins/platforms/xcb/qxcbbackingstore.cpp +++ b/src/plugins/platforms/xcb/qxcbbackingstore.cpp -@@ -117,7 +117,8 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QI +@@ -118,7 +118,8 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *s m_shm_info.shmseg = xcb_generate_id(xcb_connection()); const xcb_query_extension_reply_t *shm_reply = xcb_get_extension_data(xcb_connection(), &xcb_shm_id); @@ -29,7 +29,7 @@ index 354984c..2ecb5e7 100644 --- a/src/plugins/platforms/xcb/qxcbobject.h +++ b/src/plugins/platforms/xcb/qxcbobject.h -@@ -56,6 +56,7 @@ public: +@@ -48,6 +48,7 @@ public: xcb_atom_t atom(QXcbAtom::Atom atom) const { return m_connection->atom(atom); } xcb_connection_t *xcb_connection() const { return m_connection->xcb_connection(); } ++++++ protect-geometry-QTBUG-40584.patch ++++++ --- /var/tmp/diff_new_pack.JvECkf/_old 2014-12-21 11:59:28.000000000 +0100 +++ /var/tmp/diff_new_pack.JvECkf/_new 2014-12-21 11:59:28.000000000 +0100 @@ -2,10 +2,11 @@ index 35a526e..d417e41 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp -@@ -551,6 +551,13 @@ void QWidgetWindow::updateGeometry() - +@@ -573,6 +573,14 @@ bool QWidgetWindow::updatePos() + void QWidgetWindow::updateMargins() + { const QMargins margins = frameMargins(); - ++ + if (geometry().x() != m_widget->data->crect.x() || + geometry().y() != m_widget->data->crect.y()) + m_widget->setAttribute(Qt::WA_Moved); @@ -13,6 +14,6 @@ + geometry().height() != m_widget->data->crect.height()) + m_widget->setAttribute(Qt::WA_Resized); + - m_widget->data->crect = geometry(); QTLWExtra *te = m_widget->d_func()->topData(); te->posIncludesFrame= false; + te->frameStrut.setCoords(margins.left(), margins.top(), margins.right(), margins.bottom()); ++++++ qtbase-opensource-src-5.3.2.tar.xz -> qtbase-opensource-src-5.4.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qtbase/qtbase-opensource-src-5.3.2.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/qtbase-opensource-src-5.4.0.tar.xz differ: char 26, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
