diff --git a/base/qt6/qt6-doc/generate-qt6-doc.sh b/base/qt6/qt6-doc/generate-qt6-doc.sh index 7678622..f192779 100755 --- a/base/qt6/qt6-doc/generate-qt6-doc.sh +++ b/base/qt6/qt6-doc/generate-qt6-doc.sh @@ -1,7 +1,7 @@ #!/bin/bash -x -QT_BRANCH=6.8.0 -QT_VERSION=6.8.0 +QT_BRANCH=6.8.2 +QT_VERSION=6.8.2 # Install fedora deps for qt6-qtbase, qt6-qttools #sudo dnf builddep qt6-qtbase qt6-qttools qt6-qtwebengine -y @@ -21,6 +21,8 @@ git submodule foreach "git pull" # Init the base source ./init-repository +#. /opt/rh/gcc-toolset-14/enable + # hard-code docdir for now, rpm --eval %{_qt6_docdir} yields unexpanded %{_docdir}/qt6 , wtf -- rex ./configure -confirm-license -opensource -prefix $(rpm --eval "%{_qt6_prefix}") \ -archdatadir $(rpm --eval "%{_qt6_archdatadir}") -bindir $(rpm --eval "%{_qt6_bindir}") \ @@ -47,14 +49,14 @@ ln -s /usr/lib64/qt6/libexec/qhelpgenerator qtbase/lib64/qt6/libexec/qhelpgenera # export QT_PLUGIN_PATH to get compiled qhelpgenerator to run export QT_PLUGIN_PATH=/usr/lib64/qt6/plugins -cmake --build . --target docs +cmake --build . --target docs || exit 1 #cmake --build . --target qch_docs # Install docs on tmp directory DEST=${PWD}/install rm -rf $DEST/ && mkdir -p ${DEST} -DESTDIR=$DEST cmake --build . --target install_docs -k +DESTDIR=$DEST cmake --build . --target install_docs -k || exit 1 XZ_OPT="-T 2" tar -C $DEST -cJf ../qt-doc-opensource-src-${QT_VERSION}.tar.xz . diff --git a/base/qt6/qt6-doc/qt6-doc.spec b/base/qt6/qt6-doc/qt6-doc.spec index a537d28..3164419 100644 --- a/base/qt6/qt6-doc/qt6-doc.spec +++ b/base/qt6/qt6-doc/qt6-doc.spec @@ -1,6 +1,6 @@ Name: qt6-doc Summary: Qt6 - Complete documentation -Version: 6.8.1 +Version: 6.8.2 Release: 1%{?dist} BuildArch: noarch @@ -58,6 +58,9 @@ tar xf %{SOURCE0} -C %{buildroot} %{_qt6_docdir}/*/*.tags %changelog +* Sat Feb 15 2024 Raven - 6.8.2-1 +- 6.8.2 + * Tue Dec 3 2024 Raven - 6.8.1-1 - 6.8.1