Accepting request 985475 from KDE:Qt:5.15

Qt 5.15.5 with patch collection + qtscript 5.15.10 (forwarded request 985459 from favogt)

OBS-URL: https://build.opensuse.org/request/show/985475
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdoc?expand=0&rev=44

0001-Fix-build-with-GCC-11-include-limits.patch

@@ -1,53 +0,0 @@
-From 924424120a2c468511256072e05d1ecc7c0c74a7 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Mon, 18 Jan 2021 07:40:54 -0800
-Subject: [PATCH 1/2] Fix build with GCC 11: include <limits>
-
-Fixes: QTBUG-90395
-Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40
-(cherry picked from commit 9c56d4da2ff631a8c1c30475bd792f6c86bda53c)
-Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
-(cherry picked from commit b2af6332ea37e45ab230a7a5d2d278f86d961b83)
----
- src/corelib/global/qendian.h  | 6 ++++--
- src/corelib/global/qfloat16.h | 1 +
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/qtbase/src/corelib/global/qendian.h b/qtbase/src/corelib/global/qendian.h
-index 257efbbdbe..339f53abb6 100644
---- a/qtbase/src/corelib/global/qendian.h
-+++ b/qtbase/src/corelib/global/qendian.h
-@@ -1,7 +1,7 @@
- /****************************************************************************
- **
--** Copyright (C) 2016 The Qt Company Ltd.
--** Copyright (C) 2016 Intel Corporation.
-+** Copyright (C) 2021 The Qt Company Ltd.
-+** Copyright (C) 2021 Intel Corporation.
- ** Contact: https://www.qt.io/licensing/
- **
- ** This file is part of the QtCore module of the Qt Toolkit.
-@@ -44,6 +44,8 @@
- #include <QtCore/qfloat16.h>
- #include <QtCore/qglobal.h>
- 
-+#include <limits>
-+
- // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
- #include <stdlib.h>
- #include <string.h>
-diff --git a/qtbase/src/corelib/global/qfloat16.h b/qtbase/src/corelib/global/qfloat16.h
-index c7a9c87af3..5302be072e 100644
---- a/qtbase/src/corelib/global/qfloat16.h
-+++ b/qtbase/src/corelib/global/qfloat16.h
-@@ -43,6 +43,7 @@
- 
- #include <QtCore/qglobal.h>
- #include <QtCore/qmetatype.h>
-+#include <limits>
- #include <string.h>
- 
- #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
--- 
-2.25.1
-

0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch

@@ -13,10 +13,10 @@ Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
  src/corelib/tools/qsharedpointer_impl.h | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/qtbase/src/corelib/tools/qsharedpointer_impl.h b/qtbase/src/corelib/tools/qsharedpointer_impl.h
-index 4aee98af53..790c187cb9 100644
---- a/qtbase/src/corelib/tools/qsharedpointer_impl.h
-+++ b/qtbase/src/corelib/tools/qsharedpointer_impl.h
+Index: qt-everywhere-src-5.15.5/qtbase/src/corelib/tools/qsharedpointer_impl.h
+===================================================================
+--- qt-everywhere-src-5.15.5.orig/qtbase/src/corelib/tools/qsharedpointer_impl.h
++++ qt-everywhere-src-5.15.5/qtbase/src/corelib/tools/qsharedpointer_impl.h
 @@ -155,6 +155,9 @@ namespace QtSharedPointer {
  #endif
          inline void checkQObjectShared(...) { }
@@ -27,6 +27,3 @@ index 4aee98af53..790c187cb9 100644
      };
      // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
  
--- 
-2.25.1
-

0002-Build-fixes-for-GCC-11.patch

@@ -14,23 +14,10 @@ Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
  src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
  3 files changed, 3 insertions(+), 4 deletions(-)
 
-diff --git a/qtbase/src/corelib/text/qbytearraymatcher.h b/qtbase/src/corelib/text/qbytearraymatcher.h
-index 0eedfc1d20..f5f9bef7b8 100644
---- a/qtbase/src/corelib/text/qbytearraymatcher.h
-+++ b/qtbase/src/corelib/text/qbytearraymatcher.h
-@@ -42,6 +42,8 @@
- 
- #include <QtCore/qbytearray.h>
- 
-+#include <limits>
-+
- QT_BEGIN_NAMESPACE
- 
- 
-diff --git a/qtbase/src/corelib/tools/qsharedpointer_impl.h b/qtbase/src/corelib/tools/qsharedpointer_impl.h
-index 790c187cb9..4aee98af53 100644
---- a/qtbase/src/corelib/tools/qsharedpointer_impl.h
-+++ b/qtbase/src/corelib/tools/qsharedpointer_impl.h
+Index: qt-everywhere-src-5.15.5/qtbase/src/corelib/tools/qsharedpointer_impl.h
+===================================================================
+--- qt-everywhere-src-5.15.5.orig/qtbase/src/corelib/tools/qsharedpointer_impl.h
++++ qt-everywhere-src-5.15.5/qtbase/src/corelib/tools/qsharedpointer_impl.h
 @@ -155,9 +155,6 @@ namespace QtSharedPointer {
  #endif
          inline void checkQObjectShared(...) { }
@@ -41,10 +28,10 @@ index 790c187cb9..4aee98af53 100644
      };
      // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
  
-diff --git a/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp b/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
-index 9e7e1a5572..f0866a90ac 100644
---- a/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
-+++ b/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
+Index: qt-everywhere-src-5.15.5/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
+===================================================================
+--- qt-everywhere-src-5.15.5.orig/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
++++ qt-everywhere-src-5.15.5/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
 @@ -698,7 +698,7 @@ void QXcbWindow::show()
          if (isTransient(window())) {
              const QWindow *tp = window()->transientParent();
@@ -54,6 +41,3 @@ index 9e7e1a5572..f0866a90ac 100644
              // Default to client leader if there is no transient parent, else modal dialogs can
              // be hidden by their parents.
              if (!transientXcbParent)
--- 
-2.25.1
-

libqt5-qtdoc.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jun 27 12:50:15 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- Update to 5.15.5:
+  * See individual module packages for changelogs
+- Drop patches, now upstream:
+  * 0001-Fix-build-with-GCC-11-include-limits.patch
+- Rebase patches:
+  * 0002-Build-fixes-for-GCC-11.patch
+  * 0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch
+
 -------------------------------------------------------------------
 Fri May 28 08:17:31 UTC 2021 - Fabian Vogt <fvogt@suse.com>
 

libqt5-qtdoc.spec

@@ -17,10 +17,10 @@
 # nodebuginfo
 
 
-%define real_version 5.15.2
-%define tar_version qt-everywhere-src-5.15.2
+%define real_version 5.15.5
+%define tar_version qt-everywhere-opensource-src-5.15.5
 Name:           libqt5-qtdoc
-Version:        5.15.2
+Version:        5.15.5
 Release:        0
 Summary:        Qt 5 API Documentation
 License:        LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
@@ -28,7 +28,6 @@ Group:          Documentation/Other
 URL:            https://www.qt.io
 Source:         https://download.qt.io/official_releases/qt/5.15/%{real_version}/single/%{tar_version}.tar.xz
 # PATCH-FIX-UPSTREAM
-Patch1:         0001-Fix-build-with-GCC-11-include-limits.patch
 Patch2:         0002-Build-fixes-for-GCC-11.patch
 Patch3:         0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch
 # Breaks make_jobs
@@ -126,8 +125,7 @@ This package contains the QDoc index files and the doxygen tag files to create c
 required.
 
 %prep
-%setup -q -n %{tar_version}
-%autopatch -p1
+%autosetup -p1 -n qt-everywhere-src-%{version}
 
 %build
 # We need to link to some of the programs used as that the source assumes they were just built.

qt-everywhere-opensource-src-5.15.5.tar.xz

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

qt-everywhere-src-5.15.2.tar.xz

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