From 7e3fb9aae5f5faa36dd4d4a4b2bc4d4d29db2df8e350add5908399b811568623 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 30 Sep 2019 13:17:44 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtdoc?expand=0&rev=1 From d4b9a9ffd0c70b6287d1ad967614f88b0148b92c38756478bdb2d9ce7d4176b1 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 5 Oct 2019 16:00:54 +0000 Subject: [PATCH 2/6] 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 --- libqt5-qtdoc.changes | 11 +++++++++ libqt5-qtdoc.spec | 10 ++++----- qt-everywhere-src-5.13.1.tar.xz | 3 --- qt-everywhere-src-5.14.0-alpha.tar.xz | 3 +++ workaround-qdoc-failure.patch | 32 --------------------------- 5 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 qt-everywhere-src-5.13.1.tar.xz create mode 100644 qt-everywhere-src-5.14.0-alpha.tar.xz delete mode 100644 workaround-qdoc-failure.patch 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)); } From 378ad8cc43cfa6667cb89a146d2593d3e6cf18ebec3bdaad1ad4c7ff2ec449aa Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 28 Oct 2019 17:53:55 +0000 Subject: [PATCH 3/6] Accepting request 743230 from home:Vogtinator:qt5.14 Qt 5.14.0 Beta 2 OBS-URL: https://build.opensuse.org/request/show/743230 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtdoc?expand=0&rev=3 --- libqt5-qtdoc.changes | 14 ++++++++++++++ libqt5-qtdoc.spec | 6 +++--- qt-everywhere-src-5.14.0-alpha.tar.xz | 3 --- qt-everywhere-src-5.14.0-beta2.tar.xz | 3 +++ 4 files changed, 20 insertions(+), 6 deletions(-) delete mode 100644 qt-everywhere-src-5.14.0-alpha.tar.xz create mode 100644 qt-everywhere-src-5.14.0-beta2.tar.xz diff --git a/libqt5-qtdoc.changes b/libqt5-qtdoc.changes index 4e4dc23..d2e882f 100644 --- a/libqt5-qtdoc.changes +++ b/libqt5-qtdoc.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Oct 24 13:22:43 UTC 2019 - Fabian Vogt + +- Update to 5.14.0-beta2: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Tue Oct 15 12:34:32 UTC 2019 - Fabian Vogt + +- Update to 5.14.0-beta1: + * New bugfix release + * No changelog available + ------------------------------------------------------------------- Mon Sep 30 13:30:17 UTC 2019 - Fabian Vogt diff --git a/libqt5-qtdoc.spec b/libqt5-qtdoc.spec index 162913a..317740e 100644 --- a/libqt5-qtdoc.spec +++ b/libqt5-qtdoc.spec @@ -17,10 +17,10 @@ # nodebuginfo -%define real_version 5.14.0-alpha -%define tar_version qt-everywhere-src-5.14.0-alpha +%define real_version 5.14.0-beta2 +%define tar_version qt-everywhere-src-5.14.0-beta2 Name: libqt5-qtdoc -Version: 5.14.0~alpha +Version: 5.14.0~beta2 Release: 0 Summary: Qt 5 API Documentation License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only diff --git a/qt-everywhere-src-5.14.0-alpha.tar.xz b/qt-everywhere-src-5.14.0-alpha.tar.xz deleted file mode 100644 index 13adcf6..0000000 --- a/qt-everywhere-src-5.14.0-alpha.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b363eacf6f0d48b568fb38c2168ddb900cfb18a48eaa5e70dac3c3d63563a21 -size 572118276 diff --git a/qt-everywhere-src-5.14.0-beta2.tar.xz b/qt-everywhere-src-5.14.0-beta2.tar.xz new file mode 100644 index 0000000..193cb1f --- /dev/null +++ b/qt-everywhere-src-5.14.0-beta2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e6b3eb4e93e9d96ab1d39aaf7d6a28164aec346f28571bf602c81d4279c15a4 +size 549649100 From feeb1b649705c6d824ad5b6cb8e38f60d9b695d3586ff9edff15dd70cb2f39cd Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 14 Nov 2019 08:34:36 +0000 Subject: [PATCH 4/6] Accepting request 748159 from home:Vogtinator:qt5.14 Qt 5.14 Beta 3 OBS-URL: https://build.opensuse.org/request/show/748159 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtdoc?expand=0&rev=4 --- libqt5-qtdoc.changes | 7 +++++++ libqt5-qtdoc.spec | 6 +++--- qt-everywhere-src-5.14.0-beta2.tar.xz | 3 --- qt-everywhere-src-5.14.0-beta3.tar.xz | 3 +++ 4 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 qt-everywhere-src-5.14.0-beta2.tar.xz create mode 100644 qt-everywhere-src-5.14.0-beta3.tar.xz diff --git a/libqt5-qtdoc.changes b/libqt5-qtdoc.changes index d2e882f..43496bc 100644 --- a/libqt5-qtdoc.changes +++ b/libqt5-qtdoc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 12 13:01:12 UTC 2019 - Fabian Vogt + +- Update to 5.14.0-beta3: + * New bugfix release + * No changelog available + ------------------------------------------------------------------- Thu Oct 24 13:22:43 UTC 2019 - Fabian Vogt diff --git a/libqt5-qtdoc.spec b/libqt5-qtdoc.spec index 317740e..c55c776 100644 --- a/libqt5-qtdoc.spec +++ b/libqt5-qtdoc.spec @@ -17,10 +17,10 @@ # nodebuginfo -%define real_version 5.14.0-beta2 -%define tar_version qt-everywhere-src-5.14.0-beta2 +%define real_version 5.14.0-beta3 +%define tar_version qt-everywhere-src-5.14.0-beta3 Name: libqt5-qtdoc -Version: 5.14.0~beta2 +Version: 5.14.0~beta3 Release: 0 Summary: Qt 5 API Documentation License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only diff --git a/qt-everywhere-src-5.14.0-beta2.tar.xz b/qt-everywhere-src-5.14.0-beta2.tar.xz deleted file mode 100644 index 193cb1f..0000000 --- a/qt-everywhere-src-5.14.0-beta2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e6b3eb4e93e9d96ab1d39aaf7d6a28164aec346f28571bf602c81d4279c15a4 -size 549649100 diff --git a/qt-everywhere-src-5.14.0-beta3.tar.xz b/qt-everywhere-src-5.14.0-beta3.tar.xz new file mode 100644 index 0000000..d7de8f1 --- /dev/null +++ b/qt-everywhere-src-5.14.0-beta3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b75c60644ac26477afabb4997ea55c7d5cefc842bcd3f432f04f1c4fe6d848a3 +size 548611304 From 8dac02b1cb71f0e4d57cf1243a581d1a2bf3efc89e7e5c2a664ddfe76a45eea0 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 5 Dec 2019 09:41:12 +0000 Subject: [PATCH 5/6] Accepting request 754286 from home:Vogtinator:qt5.14 Qt 5.14.0 RC1 OBS-URL: https://build.opensuse.org/request/show/754286 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtdoc?expand=0&rev=5 --- libqt5-qtdoc.changes | 10 ++++++++++ libqt5-qtdoc.spec | 6 +++--- qt-everywhere-src-5.14.0-beta3.tar.xz | 3 --- qt-everywhere-src-5.14.0-rc.tar.xz | 3 +++ 4 files changed, 16 insertions(+), 6 deletions(-) delete mode 100644 qt-everywhere-src-5.14.0-beta3.tar.xz create mode 100644 qt-everywhere-src-5.14.0-rc.tar.xz diff --git a/libqt5-qtdoc.changes b/libqt5-qtdoc.changes index 43496bc..39031ab 100644 --- a/libqt5-qtdoc.changes +++ b/libqt5-qtdoc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Dec 4 14:37:48 UTC 2019 - Fabian Vogt + +- 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 diff --git a/libqt5-qtdoc.spec b/libqt5-qtdoc.spec index c55c776..b2d3e33 100644 --- a/libqt5-qtdoc.spec +++ b/libqt5-qtdoc.spec @@ -17,10 +17,10 @@ # nodebuginfo -%define real_version 5.14.0-beta3 -%define tar_version qt-everywhere-src-5.14.0-beta3 +%define real_version 5.14.0-rc +%define tar_version qt-everywhere-src-5.14.0-rc Name: libqt5-qtdoc -Version: 5.14.0~beta3 +Version: 5.14.0~rc Release: 0 Summary: Qt 5 API Documentation License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only diff --git a/qt-everywhere-src-5.14.0-beta3.tar.xz b/qt-everywhere-src-5.14.0-beta3.tar.xz deleted file mode 100644 index d7de8f1..0000000 --- a/qt-everywhere-src-5.14.0-beta3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b75c60644ac26477afabb4997ea55c7d5cefc842bcd3f432f04f1c4fe6d848a3 -size 548611304 diff --git a/qt-everywhere-src-5.14.0-rc.tar.xz b/qt-everywhere-src-5.14.0-rc.tar.xz new file mode 100644 index 0000000..de9b0c3 --- /dev/null +++ b/qt-everywhere-src-5.14.0-rc.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d8642b0c5f2f7acd600bc3aac068b7b3455a49e0e3dfc8eaf5883b1d537e1be +size 547825920 From 240bca22d1a36be7548f90f127985f4c773c593fb9dc7ec614f5c7e472609d2d Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 12 Dec 2019 20:39:51 +0000 Subject: [PATCH 6/6] Accepting request 756177 from home:Vogtinator:qt5.14 Qt 5.14.0 final - not fully built yet OBS-URL: https://build.opensuse.org/request/show/756177 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtdoc?expand=0&rev=6 --- libqt5-qtdoc.changes | 10 ++++++++++ libqt5-qtdoc.spec | 8 ++++---- qt-everywhere-src-5.14.0-rc.tar.xz | 3 --- qt-everywhere-src-5.14.0.tar.xz | 3 +++ 4 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 qt-everywhere-src-5.14.0-rc.tar.xz create mode 100644 qt-everywhere-src-5.14.0.tar.xz diff --git a/libqt5-qtdoc.changes b/libqt5-qtdoc.changes index 39031ab..cdee574 100644 --- a/libqt5-qtdoc.changes +++ b/libqt5-qtdoc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Dec 12 12:53:01 UTC 2019 - Fabian Vogt + +- 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 diff --git a/libqt5-qtdoc.spec b/libqt5-qtdoc.spec index b2d3e33..5cb40cb 100644 --- a/libqt5-qtdoc.spec +++ b/libqt5-qtdoc.spec @@ -17,16 +17,16 @@ # nodebuginfo -%define real_version 5.14.0-rc -%define tar_version qt-everywhere-src-5.14.0-rc +%define real_version 5.14.0 +%define tar_version qt-everywhere-src-5.14.0 Name: libqt5-qtdoc -Version: 5.14.0~rc +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/development_releases/qt/5.14/%{real_version}/single/%{tar_version}.tar.xz +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 diff --git a/qt-everywhere-src-5.14.0-rc.tar.xz b/qt-everywhere-src-5.14.0-rc.tar.xz deleted file mode 100644 index de9b0c3..0000000 --- a/qt-everywhere-src-5.14.0-rc.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d8642b0c5f2f7acd600bc3aac068b7b3455a49e0e3dfc8eaf5883b1d537e1be -size 547825920 diff --git a/qt-everywhere-src-5.14.0.tar.xz b/qt-everywhere-src-5.14.0.tar.xz new file mode 100644 index 0000000..a6467e9 --- /dev/null +++ b/qt-everywhere-src-5.14.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be9a77cd4e1f9d70b58621d0753be19ea498e6b0da0398753e5038426f76a8ba +size 547854788