Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2019-09-09 12:29:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase" Mon Sep 9 12:29:28 2019 rev:101 rq:729199 version:5.13.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2019-09-07 11:30:14.414458148 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.7948/libqt5-qtbase.changes 2019-09-09 12:29:29.933625509 +0200 @@ -1,0 +2,23 @@ +Fri Sep 6 08:03:13 UTC 2019 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.13.1: + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.13.1/?h=v5.13.1 +- Refresh patches: + * 0002-xcb-Use-the-screen-s-physical-DPI-as-logical-DPI-unl.patch +- Drop patches, now upstream: + * 0001-Decrease-focusInTimer-timer-from-400-to-200.patch + * 0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch + * 0001-Fix-crash-with-drag-cursor-handling.patch + * 0001-Fix-meta-file-replacements-if-matches-are-empty.patch + * 0002-Do-not-write-Libs-into-.pc-files-if-TEMPLATE-is-not-.patch + * 0003-Make-sure-.pc-.prl-and-.la-files-are-created-for-hea.patch +- Replace reverts with upstream fix: + * D 0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch + * D 0001-Revert-qmake-link-qt-libraries-by-full-path.patch + * D 0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch + * D 0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch + * A 0001-Fix-CMake-config-files-for-libdir-different-from-lib.patch + +------------------------------------------------------------------- Old: ---- 0001-Decrease-focusInTimer-timer-from-400-to-200.patch 0001-Fix-crash-with-drag-cursor-handling.patch 0001-Fix-meta-file-replacements-if-matches-are-empty.patch 0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch 0001-Revert-qmake-link-qt-libraries-by-full-path.patch 0002-Do-not-write-Libs-into-.pc-files-if-TEMPLATE-is-not-.patch 0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch 0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch 0003-Make-sure-.pc-.prl-and-.la-files-are-created-for-hea.patch 0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch qtbase-everywhere-src-5.13.0.tar.xz New: ---- 0001-Fix-CMake-config-files-for-libdir-different-from-lib.patch qtbase-everywhere-src-5.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.EA8K3o/_old 2019-09-09 12:29:35.085618830 +0200 +++ /var/tmp/diff_new_pack.EA8K3o/_new 2019-09-09 12:29:35.089618825 +0200 @@ -36,16 +36,16 @@ %endif Name: libqt5-qtbase -Version: 5.13.0 +Version: 5.13.1 Release: 0 Summary: C++ Program Library, Core Components License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: System/Libraries Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.13.0 -%define so_version 5.13.0 -%define tar_version qtbase-everywhere-src-5.13.0 +%define real_version 5.13.1 +%define so_version 5.13.1 +%define tar_version qtbase-everywhere-src-5.13.1 Source: https://download.qt.io/official_releases/qt/5.13/%{real_version}/submodules/%{tar_version}.tar.xz # to get mtime of file: Source1: libqt5-qtbase.changes @@ -76,26 +76,13 @@ Patch24: fix-fixqt4headers.patch # Revert to restore compatibility with akonadi and possibly other applications Patch30: 0001-Revert-Always-escape-the-table-names-when-creating-t.patch -# Reverting some commits in the hope to avoid QTBUG-76255 -Patch50: 0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch -Patch51: 0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch -Patch52: 0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch -Patch53: 0001-Revert-qmake-link-qt-libraries-by-full-path.patch -# Workaround for QTBUG-76742, boo#1140084 -Patch60: 0001-Decrease-focusInTimer-timer-from-400-to-200.patch # patches 1000-2000 and above from upstream 5.13 branch # -Patch1000: 0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch -Patch1001: 0001-Fix-crash-with-drag-cursor-handling.patch # patches 2000-3000 and above from upstream 5.14/dev branch # Patch2000: 0001-Fix-notification-of-QDockWidget-when-it-gets-undocke.patch # Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/255384 Patch2001: 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch -# PATCH-FIX-UPSTREAM https://code.qt.io/cgit/qt/qtbase.git/patch/?id=60136b1a846ca5aedeb588edaa178927abb002ec -- https://bugreports.qt.io/browse/QTBUG-75901 -PATCH3000: 0001-Fix-meta-file-replacements-if-matches-are-empty.patch -# PATCH-FIX-UPSTREAM https://code.qt.io/cgit/qt/qtbase.git/patch/?id=c64f8ca232cc1f2131282d9eb6279ef9b565be88 -- https://bugreports.qt.io/browse/QTBUG-75901 -PATCH3001: 0002-Do-not-write-Libs-into-.pc-files-if-TEMPLATE-is-not-.patch -# PATCH-FIX-UPSTREAM https://code.qt.io/cgit/qt/qtbase.git/patch/?id=4da47d0fba04e5d50bf6b63e73bc0de986560f42 -- https://bugreports.qt.io/browse/QTBUG-75901 -PATCH3002: 0003-Make-sure-.pc-.prl-and-.la-files-are-created-for-hea.patch +# Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/273050 +Patch2002: 0001-Fix-CMake-config-files-for-libdir-different-from-lib.patch BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: double-conversion-devel @@ -1247,10 +1234,13 @@ %{libqt5_libdir}/libQt5Gui.prl %{libqt5_libdir}/libQt5EglFSDeviceIntegration.so %{libqt5_libdir}/libQt5EglFSDeviceIntegration.prl +%{libqt5_libdir}/cmake/Qt5EglFSDeviceIntegration/ %{libqt5_libdir}/libQt5EglFsKmsSupport.prl %{libqt5_libdir}/libQt5EglFsKmsSupport.so +%{libqt5_libdir}/cmake/Qt5EglFsKmsSupport/ %{libqt5_libdir}/libQt5XcbQpa.so %{libqt5_libdir}/libQt5XcbQpa.prl +%{libqt5_libdir}/cmake/Qt5XcbQpa/ %{libqt5_libdir}/cmake/Qt5Gui/ %{libqt5_libdir}/pkgconfig/Qt5Gui.pc %{libqt5_includedir}/QtGui/ @@ -1309,7 +1299,7 @@ %doc *.txt %{libqt5_libdir}/libQt5Bootstrap.a %{libqt5_libdir}/libQt5Bootstrap.prl -#{libqt5_libdir}/pkgconfig/Qt5Bootstrap.pc +%{libqt5_libdir}/cmake/Qt5Bootstrap/ %files -n libQt5OpenGLExtensions-devel-static %license LICENSE.* @@ -1325,37 +1315,52 @@ %doc *.txt %{libqt5_libdir}/libQt5XkbCommonSupport.a %{libqt5_libdir}/libQt5XkbCommonSupport.prl +%{libqt5_libdir}/cmake/Qt5XkbCommonSupport/ %{libqt5_libdir}/libQt5AccessibilitySupport.a %{libqt5_libdir}/libQt5AccessibilitySupport.prl +%{libqt5_libdir}/cmake/Qt5AccessibilitySupport/ %{libqt5_libdir}/libQt5DeviceDiscoverySupport.a %{libqt5_libdir}/libQt5DeviceDiscoverySupport.prl +%{libqt5_libdir}/cmake/Qt5DeviceDiscoverySupport/ %{libqt5_libdir}/libQt5EglSupport.a %{libqt5_libdir}/libQt5EglSupport.prl +%{libqt5_libdir}/cmake/Qt5EglSupport/ %{libqt5_libdir}/libQt5EventDispatcherSupport.a %{libqt5_libdir}/libQt5EventDispatcherSupport.prl +%{libqt5_libdir}/cmake/Qt5EventDispatcherSupport/ %{libqt5_libdir}/libQt5FbSupport.a %{libqt5_libdir}/libQt5FbSupport.prl +%{libqt5_libdir}/cmake/Qt5FbSupport/ %{libqt5_libdir}/libQt5FontDatabaseSupport.a %{libqt5_libdir}/libQt5FontDatabaseSupport.prl +%{libqt5_libdir}/cmake/Qt5FontDatabaseSupport/ %ifnarch %arm aarch64 %{libqt5_libdir}/libQt5GlxSupport.a %{libqt5_libdir}/libQt5GlxSupport.prl +%{libqt5_libdir}/cmake/Qt5GlxSupport/ %endif %{libqt5_libdir}/libQt5InputSupport.a %{libqt5_libdir}/libQt5InputSupport.prl +%{libqt5_libdir}/cmake/Qt5InputSupport/ %{libqt5_libdir}/libQt5LinuxAccessibilitySupport.a %{libqt5_libdir}/libQt5LinuxAccessibilitySupport.prl +%{libqt5_libdir}/cmake/Qt5LinuxAccessibilitySupport/ %{libqt5_libdir}/libQt5PlatformCompositorSupport.a %{libqt5_libdir}/libQt5PlatformCompositorSupport.prl +%{libqt5_libdir}/cmake/Qt5PlatformCompositorSupport/ %{libqt5_libdir}/libQt5ServiceSupport.a %{libqt5_libdir}/libQt5ServiceSupport.prl +%{libqt5_libdir}/cmake/Qt5ServiceSupport/ %{libqt5_libdir}/libQt5ThemeSupport.a %{libqt5_libdir}/libQt5ThemeSupport.prl +%{libqt5_libdir}/cmake/Qt5ThemeSupport/ %{libqt5_libdir}/libQt5EdidSupport.a %{libqt5_libdir}/libQt5EdidSupport.prl +%{libqt5_libdir}/cmake/Qt5EdidSupport/ %if %{vulkan} %{libqt5_libdir}/libQt5VulkanSupport.a %{libqt5_libdir}/libQt5VulkanSupport.prl +%{libqt5_libdir}/cmake/Qt5VulkanSupport/ %endif %{libqt5_includedir}/QtAccessibilitySupport/ %{libqt5_includedir}/QtDeviceDiscoverySupport/ @@ -1399,6 +1404,7 @@ %doc *.txt %{libqt5_libdir}/libQt5KmsSupport.a %{libqt5_libdir}/libQt5KmsSupport.prl +%{libqt5_libdir}/cmake/Qt5KmsSupport/ %exclude %{libqt5_includedir}/QtKmsSupport/%{so_version}/ %{libqt5_includedir}/QtKmsSupport/ ++++++ 0001-Fix-CMake-config-files-for-libdir-different-from-lib.patch ++++++ >From dc5362ac7d766a9c1b4ae328bc6ce8a1aa332773 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann <joerg.bornem...@qt.io> Date: Fri, 6 Sep 2019 10:54:44 +0200 Subject: [PATCH] Fix CMake config files for -libdir different from "lib" When Qt was configured with -libdir different from "lib", one could not build with CMake whenever a static lib was pulled in (e.g. uitools). Do not hard-code "/lib" but use the correct variable also for static libraries. Fixes: QTBUG-76255 Change-Id: I28c6861752e29e461247628d2b1f8a9ec32f0790 --- mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in index d4fd057682..f4a34d6e48 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -53,7 +53,11 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura set(_lib_deps) set(_link_flags) - get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE) +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\") +!!ELSE + set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\") +!!ENDIF if(EXISTS \"${prl_file_location}\") file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\") -- 2.22.0 ++++++ 0002-xcb-Use-the-screen-s-physical-DPI-as-logical-DPI-unl.patch ++++++ --- /var/tmp/diff_new_pack.EA8K3o/_old 2019-09-09 12:29:35.141618758 +0200 +++ /var/tmp/diff_new_pack.EA8K3o/_new 2019-09-09 12:29:35.141618758 +0200 @@ -14,16 +14,15 @@ src/plugins/platforms/xcb/qxcbscreen.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -Index: qtbase-everywhere-src-5.11.2/src/plugins/platforms/xcb/qxcbscreen.cpp +Index: qtbase-everywhere-src-5.13.1/src/plugins/platforms/xcb/qxcbscreen.cpp =================================================================== ---- qtbase-everywhere-src-5.11.2.orig/src/plugins/platforms/xcb/qxcbscreen.cpp -+++ qtbase-everywhere-src-5.11.2/src/plugins/platforms/xcb/qxcbscreen.cpp -@@ -681,7 +681,15 @@ QDpi QXcbScreen::logicalDpi() const - if (forcedDpi > 0) { +--- qtbase-everywhere-src-5.13.1.orig/src/plugins/platforms/xcb/qxcbscreen.cpp ++++ qtbase-everywhere-src-5.13.1/src/plugins/platforms/xcb/qxcbscreen.cpp +@@ -676,7 +676,14 @@ QDpi QXcbScreen::logicalDpi() const + if (forcedDpi > 0) return QDpi(forcedDpi, forcedDpi); - } + - return m_virtualDesktop->dpi(); -+ + // By default, X fakes the virtual size to be 96 dpi (+-rounding), + // so if it's different the user overwrote it. + if (qRound(m_virtualDesktop->dpi().first) != 96 || ++++++ qtbase-everywhere-src-5.13.0.tar.xz -> qtbase-everywhere-src-5.13.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qtbase/qtbase-everywhere-src-5.13.0.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.7948/qtbase-everywhere-src-5.13.1.tar.xz differ: char 26, line 1
