forked from pool/libqt5-qtdoc
Accepting request 734738 from home:Vogtinator:qt5.14
Qt 5.14 Alpha OBS-URL: https://build.opensuse.org/request/show/734738 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtdoc?expand=0&rev=2
This commit is contained in:
parent
7e3fb9aae5
commit
d4b9a9ffd0
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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>
|
Fri Sep 6 08:04:03 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
@ -17,18 +17,16 @@
|
|||||||
# nodebuginfo
|
# nodebuginfo
|
||||||
|
|
||||||
|
|
||||||
%define real_version 5.13.1
|
%define real_version 5.14.0-alpha
|
||||||
%define tar_version qt-everywhere-src-5.13.1
|
%define tar_version qt-everywhere-src-5.14.0-alpha
|
||||||
Name: libqt5-qtdoc
|
Name: libqt5-qtdoc
|
||||||
Version: 5.13.1
|
Version: 5.14.0~alpha
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Qt 5 API Documentation
|
Summary: Qt 5 API Documentation
|
||||||
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
|
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
|
||||||
Group: Documentation/Other
|
Group: Documentation/Other
|
||||||
URL: https://www.qt.io
|
URL: https://www.qt.io
|
||||||
Source: https://download.qt.io/official_releases/qt/5.13/%{real_version}/single/%{tar_version}.tar.xz
|
Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/single/%{tar_version}.tar.xz
|
||||||
# PATCH-FIX-OPENSUSE
|
|
||||||
Patch100: workaround-qdoc-failure.patch
|
|
||||||
# PATCH-FIX-OPENSUSE
|
# PATCH-FIX-OPENSUSE
|
||||||
Patch101: qtdeclarative-switch-to-python3.patch
|
Patch101: qtdeclarative-switch-to-python3.patch
|
||||||
# Breaks make_jobs
|
# 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-alpha.tar.xz
Normal file
3
qt-everywhere-src-5.14.0-alpha.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:5b363eacf6f0d48b568fb38c2168ddb900cfb18a48eaa5e70dac3c3d63563a21
|
||||||
|
size 572118276
|
@ -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…
x
Reference in New Issue
Block a user