From b0b56b04692fd87f01d10554d67389344c278b11 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 21 Jul 2022 18:09:50 +0000 Subject: [PATCH] import qt5-doc-5.15.3-1.el8 --- .gitignore | 2 +- .qt5-doc.metadata | 2 +- SOURCES/generate-qt-doc.sh | 21 ++++++++++++--------- SPECS/qt5-doc.spec | 16 ++++++++++++++-- 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index cb51150..3caf3b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qt-doc-opensource-src-5.12.5.tar.xz +SOURCES/qt-doc-opensource-src-5.15.3.tar.xz diff --git a/.qt5-doc.metadata b/.qt5-doc.metadata index b6d12d1..01b3159 100644 --- a/.qt5-doc.metadata +++ b/.qt5-doc.metadata @@ -1 +1 @@ -063253dd49ffcf5425afd029f383488042aa8f9d SOURCES/qt-doc-opensource-src-5.12.5.tar.xz +71c044bce298014d97e9fd5cf4e4e34df0d81c8d SOURCES/qt-doc-opensource-src-5.15.3.tar.xz diff --git a/SOURCES/generate-qt-doc.sh b/SOURCES/generate-qt-doc.sh index cb4ec47..07eda37 100755 --- a/SOURCES/generate-qt-doc.sh +++ b/SOURCES/generate-qt-doc.sh @@ -2,15 +2,15 @@ QT_MODULES=('qt3d' 'qtbase' 'qtcanvas3d' 'qtconnectivity' 'qtdeclarative' 'qtdoc' 'qtgraphicaleffects' 'qtimageformats' 'qtlocation' 'qtmultimedia' 'qtquickcontrols' 'qtquickcontrols2' 'qtscript' 'qtsensors' 'qtserialbus' 'qtserialport' 'qtsvg' 'qttools' 'qtwayland' 'qtwebchannel' 'qtwebsockets' 'qtx11extras' 'qtxmlpatterns') -QT_BRANCH=5.12 -QT_VERSION=5.12.5 +QT_BRANCH=5.15 +QT_VERSION=5.15.3 make_build="$(rpm --eval %make_build)" # Clone full qt tree git clone -b $QT_BRANCH git://code.qt.io/qt/qt5.git -# Install fedora deps for qt5-qtbase -# sudo dnf builddep qt5-qtbase +# Install fedora deps for qt5-qtbase, qt5-qttools +sudo dnf builddep qt5-qtbase qt5-qttools -y # Configure using fedora configure basic options cd qt5 || return @@ -34,23 +34,26 @@ MODULES_LIST=${MODULES_LIST:1} -platform linux-g++ -release -shared -accessibility -dbus-runtime -fontconfig -glib -gtk \ -icu -journald -nomake examples -nomake tests -no-rpath -no-separate-debug-info -no-strip \ -system-libjpeg -system-libpng -system-zlib -no-directfb -skip qtmacextras -skip qtandroidextras \ - -skip qtactiveqt -skip qtwinextras -skip qtcharts -skip qtdatavis3d -skip qtgamepad -skip qtnetworkauth \ - -skip qtremoteobjects -skip qtscxml -skip qtspeech -skip qtvirtualkeyboard -skip qtwebengine -skip qtwebview + -skip qtactiveqt -skip qtwinextras -skip qtqa -skip qtwebengine -skip qtwebview -skip qtdatavis3d \ + -skip qtgamepad -skip qtcharts -skip qtnetworkauth -skip qtremoteobjects -skip qtscxml \ + -skip qtvirtualkeyboard -skip qtspeech $make_build qmake_all $make_build -C qtbase || exit +$make_build -C qtbase/src/tools/bootstrap +$make_build -C qtbase/src/tools/rcc $make_build sub-qmldevtools -C qtdeclarative/src/ $make_build sub-qdoc sub-qtattributionsscanner -C qttools/src/ $make_build sub-qhelpgenerator -C qttools/src/assistant/ -$make_build docs +echo "INFO: make docs" +$make_build -j1 docs || echo "ERROR: make docs" ; exit 1 # Install docs on tmp directory DEST=${PWD}/install rm -rf $DEST/ && mkdir -p ${DEST} -make install_docs INSTALL_ROOT=$DEST +$make_build install_docs INSTALL_ROOT=$DEST -k XZ_OPT="-T 2" tar -C $DEST -cJf ../qt-doc-opensource-src-${QT_VERSION}.tar.xz . - diff --git a/SPECS/qt5-doc.spec b/SPECS/qt5-doc.spec index ecdf7a3..863dc05 100644 --- a/SPECS/qt5-doc.spec +++ b/SPECS/qt5-doc.spec @@ -1,6 +1,6 @@ Name: qt5-doc Summary: Qt5 - Complete documentation -Version: 5.12.5 +Version: 5.15.3 Release: 1%{?dist} BuildArch: noarch @@ -286,9 +286,21 @@ cd %{buildroot} tar xf %{SOURCE0} cd %{buildroot}%{_docdir}/qt5 -rm -rfv qtdoc* qtdistancefieldgenerator* qtlabs* +rm -rfv qtdoc* qtcmake* qtdistancefieldgenerator* qtlabs* %changelog +* Fri Apr 01 2022 Jan Grulich - 5.15.3-1 +- 5.15.3 + Resolves: bz#2061378 + +* Tue Apr 13 2021 Jan Grulich - 5.15.2-2 +- Drop qtcmake documentation to avoid duplication with qt5-qtdoc + Resolves: bz#1930039 + +* Mon Apr 05 2021 Jan Grulich - 5.15.2-1 +- 5.15.2 + Resolves: bz#1930039 + * Thu Nov 07 2019 Jan Grulich - 5.12.5-1 - 5.12.5 Resolves: bz#1733134