From 82c1b4e916be53a3e096f2772e6479bf5a8fe01925e648a574d1370ca7c782b0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 8 Jul 2017 10:25:20 +0000 Subject: [PATCH] Accepting request 508314 from KDE:Qt5 - Recommend libqt5-qttranslations in libQt5Core5 (boo#1027925) - Fix typo in description (boo#1043338) - Update to 5.9.1 * For more details please see: http://blog.qt.io/blog/2017/06/30/qt-5-9-1-released/ - Drop upstreamed patches: - fix-cmake-module-version.patch - dont-destroy-foreign-windows.patch - native-children-hidpi-offset.patch - Force use of libproxy, that switch got lost apparently - Add patch to allow build with at-spi2: 0001-Fix-at-spi2-build.patch OBS-URL: https://build.opensuse.org/request/show/508314 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=61 --- 0001-Fix-at-spi2-build.patch | 26 +++++ ...en-chmod-race-condition-in-QSaveFile.patch | 13 +-- dont-destroy-foreign-windows.patch | 100 ------------------ fix-cmake-module-version.patch | 34 ------ libqt5-Fix-Gujarati-font.patch | 8 +- ...hm-if-display-name-doesnt-look-local.patch | 20 ++-- libqt5-prioritise-gtk2-platformtheme.patch | 10 +- libqt5-qtbase.changes | 23 ++++ libqt5-qtbase.spec | 22 ++-- native-children-hidpi-offset.patch | 30 ------ qtbase-opensource-src-5.9.0.tar.xz | 3 - qtbase-opensource-src-5.9.1.tar.xz | 3 + 12 files changed, 86 insertions(+), 206 deletions(-) create mode 100644 0001-Fix-at-spi2-build.patch delete mode 100644 dont-destroy-foreign-windows.patch delete mode 100644 fix-cmake-module-version.patch delete mode 100644 native-children-hidpi-offset.patch delete mode 100644 qtbase-opensource-src-5.9.0.tar.xz create mode 100644 qtbase-opensource-src-5.9.1.tar.xz diff --git a/0001-Fix-at-spi2-build.patch b/0001-Fix-at-spi2-build.patch new file mode 100644 index 0000000..3e7c5f9 --- /dev/null +++ b/0001-Fix-at-spi2-build.patch @@ -0,0 +1,26 @@ +From 54325809cc8e5e6939649f6c6f43fe13de0e0470 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Sat, 1 Jul 2017 13:52:32 +0200 +Subject: [PATCH] Fix at-spi2 build + +- Condition is wrong, always resulting in "Note: Disabling Linux Accessibility Bridge: D-Bus is missing." +--- + src/gui/configure.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/configure.json b/src/gui/configure.json +index 2fb03a452a..957316a51c 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -434,7 +434,7 @@ + "features": { + "accessibility-atspi-bridge": { + "label": "ATSPI Bridge", +- "condition": "features.accessibility && features.xcb && features.dbus && config.atspi", ++ "condition": "features.accessibility && features.xcb && features.dbus && libs.atspi", + "output": [ "privateFeature", "feature" ] + }, + "angle": { +-- +2.13.0 + diff --git a/0001-Fix-open-chmod-race-condition-in-QSaveFile.patch b/0001-Fix-open-chmod-race-condition-in-QSaveFile.patch index caaf450..be8a421 100644 --- a/0001-Fix-open-chmod-race-condition-in-QSaveFile.patch +++ b/0001-Fix-open-chmod-race-condition-in-QSaveFile.patch @@ -14,11 +14,11 @@ Change-Id: I824025f54d6faf853da88e4dfcb092b577b4df04 src/corelib/io/qsavefile.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/corelib/io/qsavefile.cpp b/src/corelib/io/qsavefile.cpp -index 5a325f8e2c..af90b96d82 100644 ---- a/src/corelib/io/qsavefile.cpp -+++ b/src/corelib/io/qsavefile.cpp -@@ -216,7 +216,8 @@ bool QSaveFile::open(OpenMode mode) +Index: qtbase-opensource-src-5.9.1/src/corelib/io/qsavefile.cpp +=================================================================== +--- qtbase-opensource-src-5.9.1.orig/src/corelib/io/qsavefile.cpp ++++ qtbase-opensource-src-5.9.1/src/corelib/io/qsavefile.cpp +@@ -232,7 +232,8 @@ bool QSaveFile::open(OpenMode mode) } d->fileEngine = new QTemporaryFileEngine; @@ -28,6 +28,3 @@ index 5a325f8e2c..af90b96d82 100644 // Same as in QFile: QIODevice provides the buffering, so there's no need to request it from the file engine. if (!d->fileEngine->open(mode | QIODevice::Unbuffered)) { QFileDevice::FileError err = d->fileEngine->error(); --- -2.12.2 - diff --git a/dont-destroy-foreign-windows.patch b/dont-destroy-foreign-windows.patch deleted file mode 100644 index 84dd1e3..0000000 --- a/dont-destroy-foreign-windows.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 32390f49291308eb85dcbcaa898bbf825a2eb229 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Tor=20Arne=20Vestb=C3=B8?= -Date: Fri, 2 Jun 2017 11:09:55 +0200 -Subject: [PATCH] xcb: Don't destroy foreign windows - -We can't rely on virtual dispatch in the destructor. - -Task-number: QTBUG-61140 -Change-Id: Ib1026caf126095778c24254775cb5a0bfecf3a38 ---- - src/plugins/platforms/xcb/qxcbintegration.cpp | 18 +----------------- - src/plugins/platforms/xcb/qxcbwindow.cpp | 16 ++++++++++------ - src/plugins/platforms/xcb/qxcbwindow.h | 12 ++++++++++++ - 3 files changed, 23 insertions(+), 23 deletions(-) - -diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp -index b414bee..8e3ee20 100644 ---- a/src/plugins/platforms/xcb/qxcbintegration.cpp -+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp -@@ -214,25 +214,9 @@ QPlatformWindow *QXcbIntegration::createPlatformWindow(QWindow *window) const - return xcbWindow; - } - --class QXcbForeignWindow : public QXcbWindow --{ --public: -- QXcbForeignWindow(QWindow *window, WId nativeHandle) -- : QXcbWindow(window) { m_window = nativeHandle; } -- ~QXcbForeignWindow() {} -- bool isForeignWindow() const override { return true; } -- --protected: -- // No-ops -- void create() override {} -- void destroy() override {} --}; -- - QPlatformWindow *QXcbIntegration::createForeignWindow(QWindow *window, WId nativeHandle) const - { -- QXcbWindow *xcbWindow = new QXcbForeignWindow(window, nativeHandle); -- xcbWindow->create(); -- return xcbWindow; -+ return new QXcbForeignWindow(window, nativeHandle); - } - - #ifndef QT_NO_OPENGL -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 289d072..d6c69d5 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -597,13 +597,17 @@ QXcbWindow::~QXcbWindow() - } - - destroy(); -+} - -- if (isForeignWindow()) { -- if (connection()->mouseGrabber() == this) -- connection()->setMouseGrabber(Q_NULLPTR); -- if (connection()->mousePressWindow() == this) -- connection()->setMousePressWindow(Q_NULLPTR); -- } -+QXcbForeignWindow::~QXcbForeignWindow() -+{ -+ // Clear window so that destroy() does not affect it -+ m_window = 0; -+ -+ if (connection()->mouseGrabber() == this) -+ connection()->setMouseGrabber(nullptr); -+ if (connection()->mousePressWindow() == this) -+ connection()->setMousePressWindow(nullptr); - } - - void QXcbWindow::destroy() -diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h -index 5662809..f38343b 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.h -+++ b/src/plugins/platforms/xcb/qxcbwindow.h -@@ -278,6 +278,18 @@ protected: - xcb_cursor_t m_currentBitmapCursor = XCB_CURSOR_NONE; - }; - -+class QXcbForeignWindow : public QXcbWindow -+{ -+public: -+ QXcbForeignWindow(QWindow *window, WId nativeHandle) -+ : QXcbWindow(window) { m_window = nativeHandle; } -+ ~QXcbForeignWindow(); -+ bool isForeignWindow() const override { return true; } -+ -+protected: -+ void create() override {} // No-op -+}; -+ - QT_END_NAMESPACE - - Q_DECLARE_METATYPE(QXcbWindow*) --- -2.7.4 - diff --git a/fix-cmake-module-version.patch b/fix-cmake-module-version.patch deleted file mode 100644 index 9ab295b..0000000 --- a/fix-cmake-module-version.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cb4bc34cb150d02889f5be2e54074e4e864b18ae Mon Sep 17 00:00:00 2001 -From: Oswald Buddenhagen -Date: Mon, 22 May 2017 11:17:28 +0200 -Subject: [PATCH] fix module version number in qt modules' cmake config files - -this actually just makes the code more straight-forward. - -amends f8607045c. - -Task-number: QTBUG-60936 -Change-Id: Iaa05b474206cf29352f9bba516936ff30b90a778 -Reviewed-by: Joerg Bornemann -Reviewed-by: Thiago Macieira -Reviewed-by: Lars Knoll ---- - mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 4f342d6..17da8b9 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -35,7 +35,7 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") - - !!IF !equals(TEMPLATE, aux) - # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. --set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)") -+set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") - - set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME}) - !!ENDIF // TEMPLATE != aux --- -2.7.4 - diff --git a/libqt5-Fix-Gujarati-font.patch b/libqt5-Fix-Gujarati-font.patch index 7bea4c0..340719a 100644 --- a/libqt5-Fix-Gujarati-font.patch +++ b/libqt5-Fix-Gujarati-font.patch @@ -2,9 +2,11 @@ src/gui/text/qtextengine.cpp | 1 + 1 file changed, 1 insertion(+) ---- a/src/gui/text/qtextengine.cpp -+++ b/src/gui/text/qtextengine.cpp -@@ -1640,6 +1640,7 @@ void QTextEngine::itemize() const +Index: qtbase-opensource-src-5.9.1/src/gui/text/qtextengine.cpp +=================================================================== +--- qtbase-opensource-src-5.9.1.orig/src/gui/text/qtextengine.cpp ++++ qtbase-opensource-src-5.9.1/src/gui/text/qtextengine.cpp +@@ -1723,6 +1723,7 @@ void QTextEngine::itemize() const case QChar::Script_Katakana: case QChar::Script_Bopomofo: case QChar::Script_Han: diff --git a/libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch b/libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch index 8ddbae2..9a39f8a 100644 --- a/libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch +++ b/libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch @@ -11,11 +11,11 @@ whether the connection is local/remote from display name is not 100% reliable, but worked fine for years in Qt4. Signed-off-by: Michal Srb -diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.cpp b/src/plugins/platforms/xcb/qxcbbackingstore.cpp -index dc677cd..4cd249e 100644 ---- a/src/plugins/platforms/xcb/qxcbbackingstore.cpp -+++ b/src/plugins/platforms/xcb/qxcbbackingstore.cpp -@@ -118,7 +118,8 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *s +Index: qtbase-opensource-src-5.9.1/src/plugins/platforms/xcb/qxcbbackingstore.cpp +=================================================================== +--- qtbase-opensource-src-5.9.1.orig/src/plugins/platforms/xcb/qxcbbackingstore.cpp ++++ qtbase-opensource-src-5.9.1/src/plugins/platforms/xcb/qxcbbackingstore.cpp +@@ -178,7 +178,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); @@ -25,11 +25,11 @@ index dc677cd..4cd249e 100644 xcb_generic_error_t *error = NULL; if (shm_present) error = xcb_request_check(xcb_connection(), xcb_shm_attach_checked(xcb_connection(), m_shm_info.shmseg, m_shm_info.shmid, false)); -diff --git a/src/plugins/platforms/xcb/qxcbobject.h b/src/plugins/platforms/xcb/qxcbobject.h -index 354984c..2ecb5e7 100644 ---- a/src/plugins/platforms/xcb/qxcbobject.h -+++ b/src/plugins/platforms/xcb/qxcbobject.h -@@ -48,6 +48,7 @@ public: +Index: qtbase-opensource-src-5.9.1/src/plugins/platforms/xcb/qxcbobject.h +=================================================================== +--- qtbase-opensource-src-5.9.1.orig/src/plugins/platforms/xcb/qxcbobject.h ++++ qtbase-opensource-src-5.9.1/src/plugins/platforms/xcb/qxcbobject.h +@@ -54,6 +54,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(); } diff --git a/libqt5-prioritise-gtk2-platformtheme.patch b/libqt5-prioritise-gtk2-platformtheme.patch index c7bd6c6..41e7984 100644 --- a/libqt5-prioritise-gtk2-platformtheme.patch +++ b/libqt5-prioritise-gtk2-platformtheme.patch @@ -1,6 +1,8 @@ ---- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp -+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp -@@ -766,9 +766,11 @@ QStringList QGenericUnixTheme::themeName +Index: qtbase-opensource-src-5.9.1/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp +=================================================================== +--- qtbase-opensource-src-5.9.1.orig/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp ++++ qtbase-opensource-src-5.9.1/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp +@@ -828,7 +828,9 @@ QStringList QGenericUnixTheme::themeName result.push_back(QLatin1String(QKdeTheme::name)); #endif } else if (gtkBasedEnvironments.contains(desktopName)) { @@ -11,5 +13,3 @@ result.push_back(QStringLiteral("gtk3")); // fallback to the generic Gnome theme if loading the GTK3 theme fails result.push_back(QLatin1String(QGnomeTheme::name)); - } else { - // unknown, but lowercase the name (our standard practice) and diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes index 89401d3..2e629ff 100644 --- a/libqt5-qtbase.changes +++ b/libqt5-qtbase.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Wed Jul 5 10:36:58 UTC 2017 - fabian@ritter-vogt.de + +- Recommend libqt5-qttranslations in libQt5Core5 (boo#1027925) + +------------------------------------------------------------------- +Sun Jul 2 19:39:15 UTC 2017 - fabian@ritter-vogt.de + +- Fix typo in description (boo#1043338) + +------------------------------------------------------------------- +Sat Jul 1 07:41:09 UTC 2017 - lbeltrame@kde.org + +- Update to 5.9.1 + * For more details please see: + http://blog.qt.io/blog/2017/06/30/qt-5-9-1-released/ +- Drop upstreamed patches: + - fix-cmake-module-version.patch + - dont-destroy-foreign-windows.patch + - native-children-hidpi-offset.patch +- Force use of libproxy, that switch got lost apparently +- Add patch to allow build with at-spi2: 0001-Fix-at-spi2-build.patch + ------------------------------------------------------------------- Thu Jun 22 15:02:38 UTC 2017 - fabian@ritter-vogt.de diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec index d0172fa..c1da54a 100644 --- a/libqt5-qtbase.spec +++ b/libqt5-qtbase.spec @@ -26,15 +26,15 @@ %endif Name: libqt5-qtbase -Version: 5.9.0 +Version: 5.9.1 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: https://www.qt.io %define base_name libqt5 -%define real_version 5.9.0 -%define so_version 5.9.0 +%define real_version 5.9.1 +%define so_version 5.9.1 %define tar_version qtbase-opensource-src-%{real_version} Source: https://download.qt.io/official_releases/qt/5.9/%{real_version}/submodules/%{tar_version}.tar.xz # to get mtime of file: @@ -58,13 +58,9 @@ Patch11: de63bbd2f806b0219a60775017899cedb121581f.patch Patch12: 0001-Add-remote-print-queue-support.patch # PATCH-FIX-UPSTREAM 0001-Fix-open-chmod-race-condition-in-QSaveFile.patch bsc#1034005 -- Fix a open file/change permission race condition in QSaveFile Patch13: 0001-Fix-open-chmod-race-condition-in-QSaveFile.patch +# PATCH-FIX-OPENSUSE (?) +Patch14: 0001-Fix-at-spi2-build.patch # patches 1000-2000 and above from upstream 5.9 branch # -# PATCH-FIX-UPSTREAM -Patch1000: native-children-hidpi-offset.patch -# PATCH-FIX-UPSTREAM -Patch1001: dont-destroy-foreign-windows.patch -# PATCH-FIX-UPSTREAM -Patch1002: fix-cmake-module-version.patch # patches 2000-3000 and above from upstream 5.10/dev branch # BuildRequires: alsa-devel BuildRequires: cups-devel @@ -154,9 +150,7 @@ handling. %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch1000 -p1 -%patch1001 -p1 -%patch1002 -p1 +%patch14 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,zlib} @@ -202,6 +196,7 @@ Summary: Qt 5 Core Library Group: Development/Libraries/X11 Provides: libqt5-qtbase = %{version} Obsoletes: libqt5-qtbase < %{version} +Recommends: libqt5-qttranslations %description -n libQt5Core5 The Qt 5 Core library. @@ -256,7 +251,7 @@ Requires: libQt5Core-devel = %{version} Requires: libQt5DBus5 = %{version} %description -n libQt5DBus-devel -The Qt 5 DBus library - development files. Aditionally, it contains +The Qt 5 DBus library - development files. Additionally, it contains Qt5's qdbusxml2cpp and qdbuscpp2xml binaries. %package -n libQt5DBus-private-headers-devel @@ -770,6 +765,7 @@ echo yes | ./configure $platform \ %if %journald -journald \ %endif + -libproxy \ -xcb \ -egl \ -eglfs \ diff --git a/native-children-hidpi-offset.patch b/native-children-hidpi-offset.patch deleted file mode 100644 index 26cf7a4..0000000 --- a/native-children-hidpi-offset.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9ff4abfb4a2a76b2ed0f664876955a9ab3a5b726 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Thu, 1 Jun 2017 17:45:02 +0200 -Subject: [PATCH] Adjust offset of native children according to device pixel - ratio - -Otherwise the wrong background can be used. - -Task-number: QTBUG-59017 -Change-Id: Iccbe9cd9704bccbceda4c8dafe87435b68b5cf3e ---- - src/gui/painting/qplatformbackingstore.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/painting/qplatformbackingstore.cpp b/src/gui/painting/qplatformbackingstore.cpp -index b8bbdef..b88dd76 100644 ---- a/src/gui/painting/qplatformbackingstore.cpp -+++ b/src/gui/painting/qplatformbackingstore.cpp -@@ -394,7 +394,7 @@ void QPlatformBackingStore::composeAndFlush(QWindow *window, const QRegion ®i - d_ptr->blitter->setRedBlueSwizzle(true); - // The backingstore is for the entire tlw. - // In case of native children offset tells the position relative to the tlw. -- const QRect srcRect = toBottomLeftRect(deviceWindowRect.translated(offset), d_ptr->textureSize.height()); -+ const QRect srcRect = toBottomLeftRect(deviceWindowRect.translated(offset * window->devicePixelRatio()), d_ptr->textureSize.height()); - const QMatrix3x3 source = QOpenGLTextureBlitter::sourceTransform(srcRect, - d_ptr->textureSize, - origin); --- -2.7.4 - diff --git a/qtbase-opensource-src-5.9.0.tar.xz b/qtbase-opensource-src-5.9.0.tar.xz deleted file mode 100644 index 095eba7..0000000 --- a/qtbase-opensource-src-5.9.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:267eb2af1a203c087f2113f43b08014d0e2d2cb269295b8602d869a2fad5296c -size 44893232 diff --git a/qtbase-opensource-src-5.9.1.tar.xz b/qtbase-opensource-src-5.9.1.tar.xz new file mode 100644 index 0000000..fb44431 --- /dev/null +++ b/qtbase-opensource-src-5.9.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6 +size 45350452