rpm/libqt5-qtdoc
SHA256
1
0
Fork 0
forked from pool/libqt5-qtdoc
Code Pull Requests Activity

Accepting request 685630 from KDE:Qt5

Browse Source 
Qt 5.12.2

OBS-URL: https://build.opensuse.org/request/show/685630
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdoc?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger 2019-03-22 14:05:49 +00:00 committed by Git OBS Bridge
parent 5b09f56cb2
commit 3dc7253ca3
5 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libqt5-qtdoc.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu Mar 14 08:51:22 UTC 2019 - fabian@ritter-vogt.de
- Update to 5.12.2:
* New bugfix release
* For more details please see:
* http://code.qt.io/cgit/qt/qt.git/plain/dist/changes-5.12.2/?h=5.12.2
-------------------------------------------------------------------
Fri Feb 1 08:39:58 UTC 2019 - fabian@ritter-vogt.de
- Update to 5.12.1:
* New bugfix release
* For more details please see:
* http://code.qt.io/cgit/qt/qt.git/plain/dist/changes-5.12.1/?h=v5.12.1
- Refresh workaround-qdoc-failure.patch
- cmake breaks %make_jobs - ignore it (boo#1091864)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 6 13:36:34 UTC 2018 - fabian@ritter-vogt.de Thu Dec 6 13:36:34 UTC 2018 - fabian@ritter-vogt.de

16
libqt5-qtdoc.spec
View File

@ -17,10 +17,10 @@
# nodebuginfo # nodebuginfo
%define real_version 5.12.0 %define real_version 5.12.2
%define tar_version qt-everywhere-src-5.12.0 %define tar_version qt-everywhere-src-5.12.2
Name: libqt5-qtdoc Name: libqt5-qtdoc
Version: 5.12.0 Version: 5.12.2
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
@ -31,6 +31,8 @@ Source: https://download.qt.io/official_releases/qt/5.12/%{real_version}
Patch100: workaround-qdoc-failure.patch 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
#!BuildIgnore: cmake
BuildRequires: alsa-devel BuildRequires: alsa-devel
BuildRequires: bison BuildRequires: bison
BuildRequires: clang BuildRequires: clang
@ -156,20 +158,20 @@ make INSTALL_ROOT=%{buildroot} install_docs
%fdupes %{buildroot}%{_libqt5_docdir} %fdupes %{buildroot}%{_libqt5_docdir}
%files %files
%doc LICENSE.* %license LICENSE.*
%files html %files html
%doc LICENSE.* %license LICENSE.*
%{_libqt5_docdir}/*/ %{_libqt5_docdir}/*/
%exclude %{_libqt5_docdir}/*/*.index %exclude %{_libqt5_docdir}/*/*.index
%exclude %{_libqt5_docdir}/*/*.tags %exclude %{_libqt5_docdir}/*/*.tags
%files qch %files qch
%doc LICENSE.* %license LICENSE.*
%{_libqt5_docdir}/*.qch %{_libqt5_docdir}/*.qch
%files devel %files devel
%doc LICENSE.* %license LICENSE.*
%{_libqt5_docdir}/*/*.index %{_libqt5_docdir}/*/*.index
%{_libqt5_docdir}/*/*.tags %{_libqt5_docdir}/*/*.tags

3
qt-everywhere-src-5.12.0.tar.xz
View File

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

3
qt-everywhere-src-5.12.2.tar.xz Normal file
View File

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

16
workaround-qdoc-failure.patch
View File

@ -10,9 +10,11 @@ I don't know yet why it behaves differently on x86 and x86_64, perhaps it has so
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. 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.
--- qt-everywhere-src-5.11.0-rc.out/qtbase/src/corelib/global/qfloat16.h 2018-05-30 08:12:03.405142221 +0000 Index: qt-everywhere-src-5.12.1/qtbase/src/corelib/global/qfloat16.h
+++ qt-everywhere-src-5.11.0-rc/qtbase/src/corelib/global/qfloat16.h 2018-05-30 07:59:19.637190880 +0000 ===================================================================
@@ -144,6 +144,7 @@ --- 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 QT_WARNING_POP
@ -20,11 +22,11 @@ Also, even with broken code, it should not crash with assertion failure. So ther
inline qfloat16::operator float() const Q_DECL_NOTHROW inline qfloat16::operator float() const Q_DECL_NOTHROW
{ {
#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__) #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__)
@@ -162,6 +163,7 @@ @@ -171,6 +172,7 @@ inline qfloat16 operator-(qfloat16 a) Q_
f.b16 = a.b16 ^ quint16(0x8000);
return f; return f;
#endif
} }
+#endif +#endif
inline qfloat16 operator-(qfloat16 a) Q_DECL_NOTHROW 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)); }