Accepting request 756363 from KDE:Qt:5.14
Update to 5.14.0 OBS-URL: https://build.opensuse.org/request/show/756363 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdoc?expand=0&rev=36
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
f124a75cff
@ -1,3 +1,55 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 12 12:53:01 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.14.0:
|
||||
* New bugfix release
|
||||
* For the changes between 5.13.2 and 5.14.0 please see:
|
||||
https://code.qt.io/cgit/qt/qt.git/tree/dist/changes-5.14.0?h=v5.14.0
|
||||
* For the changes between 5.13.1 and 5.13.2 please see:
|
||||
https://code.qt.io/cgit/qt/qt.git/tree/dist/changes-5.13.2?h=v5.14.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 4 14:37:48 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.14.0-rc:
|
||||
* New bugfix release
|
||||
* No changelog available
|
||||
* For more details please see:
|
||||
* For more details about Qt 5.14 please see:
|
||||
https://wiki.qt.io/New_Features_in_Qt_5.14
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 12 13:01:12 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.14.0-beta3:
|
||||
* New bugfix release
|
||||
* No changelog available
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 24 13:22:43 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.14.0-beta2:
|
||||
* New bugfix release
|
||||
* No changelog available
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 15 12:34:32 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.14.0-beta1:
|
||||
* New bugfix release
|
||||
* No changelog available
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 30 13:30:17 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.14.0-alpha:
|
||||
* New feature release
|
||||
* No changelog available
|
||||
* For more details about Qt 5.14 please see:
|
||||
https://wiki.qt.io/New_Features_in_Qt_5.14
|
||||
- Drop patches, now upstream:
|
||||
* workaround-qdoc-failure.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 6 08:04:03 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
|
||||
@ -17,18 +17,16 @@
|
||||
# nodebuginfo
|
||||
|
||||
|
||||
%define real_version 5.13.1
|
||||
%define tar_version qt-everywhere-src-5.13.1
|
||||
%define real_version 5.14.0
|
||||
%define tar_version qt-everywhere-src-5.14.0
|
||||
Name: libqt5-qtdoc
|
||||
Version: 5.13.1
|
||||
Version: 5.14.0
|
||||
Release: 0
|
||||
Summary: Qt 5 API Documentation
|
||||
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
|
||||
Group: Documentation/Other
|
||||
URL: https://www.qt.io
|
||||
Source: https://download.qt.io/official_releases/qt/5.13/%{real_version}/single/%{tar_version}.tar.xz
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch100: workaround-qdoc-failure.patch
|
||||
Source: https://download.qt.io/official_releases/qt/5.14/%{real_version}/single/%{tar_version}.tar.xz
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch101: qtdeclarative-switch-to-python3.patch
|
||||
# Breaks make_jobs
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e
|
||||
size 502389648
|
||||
3
qt-everywhere-src-5.14.0.tar.xz
Normal file
3
qt-everywhere-src-5.14.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:be9a77cd4e1f9d70b58621d0753be19ea498e6b0da0398753e5038426f76a8ba
|
||||
size 547854788
|
||||
@ -1,32 +0,0 @@
|
||||
From: Michal Srb <msrb@suse.com>
|
||||
Subject: Assertion failure in libclang on i586 (when building qtdoc)
|
||||
References: boo#1092425
|
||||
|
||||
I have found that the issue is caused by `qfloat::operator float()` in qtbase/src/corelib/global/qfloat16.h.
|
||||
|
||||
For some reason the declaration is omitted when building the documentation using `#ifndef Q_QDOC`, but its definition is there unconditionally. Omitting the definition prevents the qdoc failure. See the attached patch.
|
||||
|
||||
I don't know yet why it behaves differently on x86 and x86_64, perhaps it has something to do with the body of the method, which is different depending on the architecture.
|
||||
|
||||
Also, even with broken code, it should not crash with assertion failure. So there must be something broken in either libclang or qdoc, but I did not yet find what. Perhaps we could use this patch for the time being.
|
||||
|
||||
Index: qt-everywhere-src-5.12.1/qtbase/src/corelib/global/qfloat16.h
|
||||
===================================================================
|
||||
--- qt-everywhere-src-5.12.1.orig/qtbase/src/corelib/global/qfloat16.h
|
||||
+++ qt-everywhere-src-5.12.1/qtbase/src/corelib/global/qfloat16.h
|
||||
@@ -145,6 +145,7 @@ inline qfloat16::qfloat16(float f) Q_DEC
|
||||
}
|
||||
QT_WARNING_POP
|
||||
|
||||
+#ifndef Q_QDOC
|
||||
inline qfloat16::operator float() const Q_DECL_NOTHROW
|
||||
{
|
||||
#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__)
|
||||
@@ -171,6 +172,7 @@ inline qfloat16 operator-(qfloat16 a) Q_
|
||||
f.b16 = a.b16 ^ quint16(0x8000);
|
||||
return f;
|
||||
}
|
||||
+#endif
|
||||
|
||||
inline qfloat16 operator+(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return qfloat16(static_cast<float>(a) + static_cast<float>(b)); }
|
||||
inline qfloat16 operator-(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return qfloat16(static_cast<float>(a) - static_cast<float>(b)); }
|
||||
Loading…
Reference in New Issue
Block a user