diff --git a/generate-qt-doc.sh b/generate-qt-doc.sh index b467250767d58fb3ed3fe01eead4c9cbf7ee6054..1a3b51e28304c14fc13563d6cfc278f45a76ae5d 100755 --- a/generate-qt-doc.sh +++ b/generate-qt-doc.sh @@ -1,14 +1,14 @@ #!/bin/bash -x -QT_BRANCH=5.12 -QT_VERSION=5.12.3 +QT_BRANCH=5.15 +QT_VERSION=5.15.1 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 @@ -30,21 +30,24 @@ git submodule foreach "git pull" -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 qtactiveqt -skip qtwinextras -skip qtqa $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/qt-doc-opensource-src-5.12.3.tar.xz b/qt-doc-opensource-src-5.15.1.tar.xz similarity index 79% rename from qt-doc-opensource-src-5.12.3.tar.xz rename to qt-doc-opensource-src-5.15.1.tar.xz index dbb8226054ec5a4e1b38d583cd1b6f7e95906db4..3cd2f40b28c98dc2dc82ddf390c5c8580bc69891 100644 Binary files a/qt-doc-opensource-src-5.12.3.tar.xz and b/qt-doc-opensource-src-5.15.1.tar.xz differ diff --git a/qt5-doc.spec b/qt5-doc.spec index cb337d393c4eb61ab5242b9fd91fbde036dbbdc9..a00a5409bc5535c962b1d24ace92fe18d496423b 100644 --- a/qt5-doc.spec +++ b/qt5-doc.spec @@ -1,8 +1,8 @@ -%define anolis_release 2 +%define anolis_release 3 Name: qt5-doc Summary: Qt5 - Complete documentation -Version: 5.12.3 -Release: 1.%{anolis_release}%{?dist} +Version: 5.15.1 +Release: %{anolis_release}%{?dist} BuildArch: noarch License: GFDL @@ -17,7 +17,8 @@ Source1: generate-qt-doc.sh BuildRequires: qt5-rpm-macros >= 5.5.0 -Requires: qt5-qtcanvas3d-doc >= %{version} +Obsoletes: qt5-qtcanvas3d-doc < 5.13 + Requires: qt5-qtbase-doc >= %{version} Requires: qt5-qt3d-doc >= %{version} Requires: qt5-qtcharts-doc >= %{version} @@ -38,7 +39,6 @@ Requires: qt5-qtsvg-doc >= %{version} Requires: qt5-qttools-doc >= %{version} Requires: qt5-qtvirtualkeyboard-doc >= %{version} Requires: qt5-qtwebchannel-doc >= %{version} -Requires: qt5-qtwebengine-doc >= %{version} Requires: qt5-qtwebsockets-doc >= %{version} Requires: qt5-qtx11extras-doc >= %{version} Requires: qt5-qtxmlpatterns-doc >= %{version} @@ -55,14 +55,8 @@ Requires: qt5-qtpurchasing-doc >= %{version} %description This is the meta package for all Qt library documentation -%package -n qt5-qtcanvas3d-doc -Summary: Documentation for qtcanvas3d - -%description -n qt5-qtcanvas3d-doc -%{summary}. - -%files -n qt5-qtcanvas3d-doc -%{_qt5_docdir}/qtcanvas3d* +# Empty files to produce qt5-doc package for easier installation of complete documentation +%files %package -n qt5-qtbase-doc Summary: Documentation for qtbase @@ -255,15 +249,6 @@ Summary: Documentation for qtwebchannel %files -n qt5-qtwebchannel-doc %{_qt5_docdir}/qtwebchannel* -%package -n qt5-qtwebengine-doc -Summary: Documentation for qtwebengine - -%description -n qt5-qtwebengine-doc -%{summary}. - -#files -n qt5-qtwebengine-doc -#{_qt5_docdir}/qtwebengine* - %package -n qt5-qtwebsockets-doc Summary: Documentation for qtwebsockets @@ -282,19 +267,6 @@ Summary: Documentation for qtx11extras %files -n qt5-qtx11extras-doc %{_qt5_docdir}/qtx11extras* -## omit from here, conflicts with real qt5-qtdoc -- rex -## https://bugzilla.redhat.com/show_bug.cgi?id=1520355 -%if 0 -%package -n qt5-qtdoc-doc -Summary: Documentation for qtdoc - -%description -n qt5-qtdoc-doc -%{summary}. - -%files -n qt5-qtdoc-doc -%{_qt5_docdir}/qtdoc* -%endif - %package -n qt5-qtspeech-doc Summary: Documentation for qtspeech @@ -383,22 +355,32 @@ Summary: Documentation for qtgamepad # intentionally left blank # though could be used to initially unpack (rex) + %build # intentionally left blank + %install mkdir -p %{buildroot} -cd %{buildroot} -tar xf %{SOURCE0} +tar xf %{SOURCE0} -C %{buildroot} + +## unpackaged files +pushd %{buildroot}%{_qt5_docdir} +rm -rfv \ + qdoc* \ + qtdistancefieldgenerator* \ + qtdoc* qtcmake* \ + qtlottieanimation* \ + qtpdf* \ + qtwebengine* -# Remove non used -cd %{buildroot}%{_docdir}/qt5 -rm -rfv qtdoc* -# unpackaged modules -rm -rfv qtdistancefieldgenerator* +popd %changelog +* Fri Jul 18 2025 NewStart - 5.15.1-3 +- Update qt5-doc to V5.15.1 + * Tue Nov 07 2023 yangxianzhao - 5.12.3-1.2 - rebuild for qt @@ -447,3 +429,4 @@ rm -rfv qtdistancefieldgenerator* * Thu Apr 13 2017 Helio Chissini de Castro - 5.9.0-0.beta1.0 - Full documentation package self generated +