Accepting request 697055 from KDE:Qt5

Qt 5.12.3

OBS-URL: https://build.opensuse.org/request/show/697055
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=95

fix-fixqt4headers.patch

@@ -0,0 +1,46 @@
+commit d57cd2570ef5580168b99d61fe6ce90ce879bac5
+Author: Christophe Giboudeaux <christophe@krop.fr>
+Date:   Sat Apr 13 12:20:28 2019 +0200
+
+    Fix the qmake command and the include subdir for openSUSE
+    
+diff --git a/bin/fixqt4headers.pl b/bin/fixqt4headers.pl
+index b572f469dc..25478a03ac 100755
+--- a/bin/fixqt4headers.pl
++++ b/bin/fixqt4headers.pl
+@@ -139,14 +139,14 @@ sub findQtHeaders
+ # -------- MAIN
+ 
+ if ($qtdir) {
+-    $qtIncludeDir = $qtdir . '/include';
++    $qtIncludeDir = $qtdir . '/include/qt5';
+ } else {
+-    $qtIncludeDir = `qmake -query QT_INSTALL_HEADERS`;
++    $qtIncludeDir = `qmake-qt5 -query QT_INSTALL_HEADERS`;
+     chop($qtIncludeDir);
+ }
+ 
+ die "The location of the Qt 5 include files could not be determined.\n"
+-        ."Please ensure qmake can be found in PATH or pass the command line option --qtdir.\n"
++        ."Please ensure qmake-qt5 can be found in PATH or pass the command line option --qtdir.\n"
+     unless -d $qtIncludeDir;
+ 
+ findQtHeaders('QtCore', $qtIncludeDir);
+@@ -154,7 +154,7 @@ findQtHeaders('QtConcurrent', $qtIncludeDir);
+ findQtHeaders('QtWidgets', $qtIncludeDir);
+ findQtHeaders('QtPrintSupport', $qtIncludeDir);
+ 
+-if (-d $qtIncludeDir . '/include/QtMultimedia') {
++if (-d $qtIncludeDir . '/include/qt5/QtMultimedia') {
+     findQtHeaders('QtMultimedia', $qtIncludeDir);
+     findQtHeaders('QtMultimediaWidgets', $qtIncludeDir);
+ } elsif (-d $qtIncludeDir . '/../qtmultimedia' ) {
+@@ -164,7 +164,7 @@ if (-d $qtIncludeDir . '/include/QtMultimedia') {
+ }
+ 
+ # Support porting from "Qt 4.99" QtDeclarative to QtQuick (QQuickItem et al)
+-if (-d $qtIncludeDir . '/include/QtQuick') {
++if (-d $qtIncludeDir . '/include/qt5/QtQuick') {
+     findQtHeaders('QtQuick', $qtIncludeDir);
+ } elsif (-d $qtIncludeDir . '/../qtdeclarative' ) {
+     # This is the case if QTDIR points to a source tree instead of an installed Qt

libqt5-qtbase.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Apr 18 07:26:30 UTC 2019 - fabian@ritter-vogt.de
+
+- Update to 5.12.3:
+  * New bugfix release
+  * For more details please see:
+  * http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.12.3/?h=v5.12.3
+
+-------------------------------------------------------------------
+Sat Apr 13 10:29:43 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Add fix-fixqt4headers.patch to use the include path used by our
+  Qt5 packages.
+
 -------------------------------------------------------------------
 Thu Mar 14 08:47:45 UTC 2019 - fabian@ritter-vogt.de
 

libqt5-qtbase.spec

@@ -36,16 +36,16 @@
 %endif
 
 Name:           libqt5-qtbase
-Version:        5.12.2
+Version:        5.12.3
 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.12.2
+%define real_version 5.12.3
-%define so_version 5.12.2
+%define so_version 5.12.3
-%define tar_version qtbase-everywhere-src-5.12.2
+%define tar_version qtbase-everywhere-src-5.12.3
 Source:         https://download.qt.io/official_releases/qt/5.12/%{real_version}/submodules/%{tar_version}.tar.xz
 # to get mtime of file:
 Source1:        libqt5-qtbase.changes
@@ -75,6 +75,7 @@ Patch20:        0001-Fix-qfloat16-methods-definition-without-declaration-.patch
 Patch21:        0001-Revert-Blacklist-nouveau-and-llvmpipe-for-multithrea.patch
 Patch22:        0002-Revert-qtlite-Fix-build-libs-with-no-feature-regular.patch
 Patch23:        0003-Revert-White-list-more-recent-Mesa-version-for-multi.patch
+Patch24:        fix-fixqt4headers.patch
 # patches 1000-2000 and above from upstream 5.12 branch #
 # patches 2000-3000 and above from upstream 5.13/dev branch #
 Patch2000:      reproducible-qrc-time.patch

qtbase-everywhere-src-5.12.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:562c095a59c95f393762ec53bc05c0d80fad1758fd5ff7a5231967d1a98d56c1
-size 48364464

qtbase-everywhere-src-5.12.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701
+size 48382148