diff --git a/libqt5-qtdoc.changes b/libqt5-qtdoc.changes index ea0cf46..4e4dc23 100644 --- a/libqt5-qtdoc.changes +++ b/libqt5-qtdoc.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Sep 30 13:30:17 UTC 2019 - Fabian Vogt + +- 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 diff --git a/libqt5-qtdoc.spec b/libqt5-qtdoc.spec index dce184e..162913a 100644 --- a/libqt5-qtdoc.spec +++ b/libqt5-qtdoc.spec @@ -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-alpha +%define tar_version qt-everywhere-src-5.14.0-alpha Name: libqt5-qtdoc -Version: 5.13.1 +Version: 5.14.0~alpha 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/development_releases/qt/5.14/%{real_version}/single/%{tar_version}.tar.xz # PATCH-FIX-OPENSUSE Patch101: qtdeclarative-switch-to-python3.patch # Breaks make_jobs diff --git a/qt-everywhere-src-5.13.1.tar.xz b/qt-everywhere-src-5.13.1.tar.xz deleted file mode 100644 index 2783f4d..0000000 --- a/qt-everywhere-src-5.13.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e -size 502389648 diff --git a/qt-everywhere-src-5.14.0-alpha.tar.xz b/qt-everywhere-src-5.14.0-alpha.tar.xz new file mode 100644 index 0000000..13adcf6 --- /dev/null +++ b/qt-everywhere-src-5.14.0-alpha.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b363eacf6f0d48b568fb38c2168ddb900cfb18a48eaa5e70dac3c3d63563a21 +size 572118276 diff --git a/workaround-qdoc-failure.patch b/workaround-qdoc-failure.patch deleted file mode 100644 index 3d405e1..0000000 --- a/workaround-qdoc-failure.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Michal Srb -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(a) + static_cast(b)); } - inline qfloat16 operator-(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return qfloat16(static_cast(a) - static_cast(b)); }