From 89ac993a1a9a358d268aabd8001c0f052a128650 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 21:38:30 +0000 Subject: [PATCH 1/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- qt6-doc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt6-doc.spec b/qt6-doc.spec index e3ce7bb..6e1cd08 100644 --- a/qt6-doc.spec +++ b/qt6-doc.spec @@ -1,7 +1,7 @@ Name: qt6-doc Summary: Qt6 - Complete documentation Version: 6.8.1 -Release: 1%{?dist} +Release: 2%{?dist} BuildArch: noarch License: GFDL @@ -59,6 +59,9 @@ tar xf %{SOURCE0} -C %{buildroot} %{_qt6_docdir}/*/*.tags %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 6.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Dec 30 2024 Marie Loise Nolden - 6.8.1-1 - 6.8.1 From ae185a79d2b5aa8c66e5006215d9f72da61eedb4 Mon Sep 17 00:00:00 2001 From: Marie Loise Nolden Date: Tue, 15 Apr 2025 13:10:18 +0200 Subject: [PATCH 2/7] 6.9.0 --- .gitignore | 1 + generate-qt6-doc.sh | 4 ++-- qt6-doc.spec | 7 +++++-- sources | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9115262..40e6485 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /qt-doc-opensource-src-6.6.2.tar.xz /qt-doc-opensource-src-6.7.0.tar.xz /qt-doc-opensource-src-6.8.1.tar.xz +/qt-doc-opensource-src-6.9.0.tar.xz diff --git a/generate-qt6-doc.sh b/generate-qt6-doc.sh index 87866af..ebae3b3 100755 --- a/generate-qt6-doc.sh +++ b/generate-qt6-doc.sh @@ -1,7 +1,7 @@ #!/bin/bash -x -QT_BRANCH=6.8.1 -QT_VERSION=6.8.1 +QT_BRANCH=6.9.0 +QT_VERSION=6.9.0 # Install fedora deps for qt6-qtbase, qt6-qttools #sudo dnf builddep qt6-qtbase qt6-qttools qt6-qtwebengine -y diff --git a/qt6-doc.spec b/qt6-doc.spec index 6e1cd08..136deb5 100644 --- a/qt6-doc.spec +++ b/qt6-doc.spec @@ -1,7 +1,7 @@ Name: qt6-doc Summary: Qt6 - Complete documentation -Version: 6.8.1 -Release: 2%{?dist} +Version: 6.9.0 +Release: 1%{?dist} BuildArch: noarch License: GFDL @@ -59,6 +59,9 @@ tar xf %{SOURCE0} -C %{buildroot} %{_qt6_docdir}/*/*.tags %changelog +* Tue Apr 15 2025 Marie Loise Nolden - 6.9.0-1 +- 6.9.0 + * Sat Jan 18 2025 Fedora Release Engineering - 6.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index f96a2dd..b021154 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qt-doc-opensource-src-6.8.1.tar.xz) = b9e1fafef0a391cfa77e331d151c792303c248ed7dadc42f7432a0b73ce528563c739ca2fafc9884df644f4a9561c75abd9f5fdea06b0655e2f62472410cb760 +SHA512 (qt-doc-opensource-src-6.9.0.tar.xz) = a8fff1bb7bd61be3380d06bd28d7f7be5ee543fbc4c652471d9e8b5d8cf6c89ce0c9e52452c5b0b85b45e6475624715b78c6d5b3f09d102a355329859c4daeab From 3de805a027a2200cf8e197382bc0351852453ffc Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 16 Apr 2025 18:51:52 -0400 Subject: [PATCH 3/7] Rebuilt https://pagure.io/fedora-infrastructure/issue/12496 --- qt6-doc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt6-doc.spec b/qt6-doc.spec index 136deb5..367b06a 100644 --- a/qt6-doc.spec +++ b/qt6-doc.spec @@ -1,7 +1,7 @@ Name: qt6-doc Summary: Qt6 - Complete documentation Version: 6.9.0 -Release: 1%{?dist} +Release: 2%{?dist} BuildArch: noarch License: GFDL @@ -59,6 +59,9 @@ tar xf %{SOURCE0} -C %{buildroot} %{_qt6_docdir}/*/*.tags %changelog +* Wed Apr 16 2025 Yaakov Selkowitz - 6.9.0-2 +- Rebuilt + * Tue Apr 15 2025 Marie Loise Nolden - 6.9.0-1 - 6.9.0 From ffa235131d1eb7e8add8d342ab3c0b7ef8a3bd50 Mon Sep 17 00:00:00 2001 From: Marie Loise Nolden Date: Sun, 8 Jun 2025 08:41:10 +0200 Subject: [PATCH 4/7] update to 6.9.1 --- .gitignore | 1 + generate-qt6-doc.sh | 13 ++++++++----- qt6-doc.spec | 7 +++++-- sources | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 40e6485..b8395b7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /qt-doc-opensource-src-6.7.0.tar.xz /qt-doc-opensource-src-6.8.1.tar.xz /qt-doc-opensource-src-6.9.0.tar.xz +/qt-doc-opensource-src-6.9.1.tar.xz diff --git a/generate-qt6-doc.sh b/generate-qt6-doc.sh index ebae3b3..9ac07af 100755 --- a/generate-qt6-doc.sh +++ b/generate-qt6-doc.sh @@ -1,11 +1,13 @@ #!/bin/bash -x -QT_BRANCH=6.9.0 -QT_VERSION=6.9.0 +QT_BRANCH=6.9.1 +QT_VERSION=6.9.1 # Install fedora deps for qt6-qtbase, qt6-qttools #sudo dnf builddep qt6-qtbase qt6-qttools qt6-qtwebengine -y #sudo dnf install qt6-qtbase qt6-doctools -y +sudo dnf install -y cmake ninja-build clang-devel llvm-devel libdrm-devel dbus-devel python3-html5lib + # Clone full qt tree #git clone -b $QT_BRANCH git://code.qt.io/qt/qt5.git qt6 @@ -34,10 +36,11 @@ popd -examplesdir $(rpm --eval "%{_qt6_examplesdir}") -headerdir $(rpm --eval "%{_qt6_headerdir}") \ -plugindir $(rpm --eval "%{_qt6_plugindir}") \ -sysconfdir $(rpm --eval "%{_qt6_sysconfdir}") -translationdir $(rpm --eval "%{_qt6_translationdir}") \ - -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 + -platform linux-g++ -release -shared \ + -nomake examples -nomake tests -no-rpath -no-separate-debug-info -no-strip \ + -no-directfb +cmake --build . --parallel cmake --build . --target docs # Install docs on tmp directory diff --git a/qt6-doc.spec b/qt6-doc.spec index 367b06a..2f37c0b 100644 --- a/qt6-doc.spec +++ b/qt6-doc.spec @@ -1,7 +1,7 @@ Name: qt6-doc Summary: Qt6 - Complete documentation -Version: 6.9.0 -Release: 2%{?dist} +Version: 6.9.1 +Release: 1%{?dist} BuildArch: noarch License: GFDL @@ -59,6 +59,9 @@ tar xf %{SOURCE0} -C %{buildroot} %{_qt6_docdir}/*/*.tags %changelog +* Sun Jun 08 2025 Marie Loise Nolden - 6.9.1-1 +- 6.9.1 + * Wed Apr 16 2025 Yaakov Selkowitz - 6.9.0-2 - Rebuilt diff --git a/sources b/sources index b021154..dd355b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qt-doc-opensource-src-6.9.0.tar.xz) = a8fff1bb7bd61be3380d06bd28d7f7be5ee543fbc4c652471d9e8b5d8cf6c89ce0c9e52452c5b0b85b45e6475624715b78c6d5b3f09d102a355329859c4daeab +SHA512 (qt-doc-opensource-src-6.9.1.tar.xz) = fc6867d4a94e309c1b7ca4d167837833c342a55db6830e440f4a13ce21cc2a0edac9ed1f531959e963ccb10f4514aa27e9e5ffa360873d5f9203f6e5e3eaa8f6 From 8300713546da63657a0f476c26e878d6b5a2d3b2 Mon Sep 17 00:00:00 2001 From: Marie Loise Nolden Date: Tue, 10 Jun 2025 21:06:11 +0000 Subject: [PATCH 5/7] add *.index files to -devel For kf6-6.15.0 the api doc generation switched to using qdoc where the tags files are not enough and index files do the crosslinking, so add them to -devel to pick them up automatically for proper API doc generation --- qt6-doc.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qt6-doc.spec b/qt6-doc.spec index 2f37c0b..59a2f46 100644 --- a/qt6-doc.spec +++ b/qt6-doc.spec @@ -1,7 +1,7 @@ Name: qt6-doc Summary: Qt6 - Complete documentation Version: 6.9.1 -Release: 1%{?dist} +Release: 2%{?dist} BuildArch: noarch License: GFDL @@ -54,11 +54,16 @@ tar xf %{SOURCE0} -C %{buildroot} %files html %{_qt6_docdir}/*/* %exclude %{_qt6_docdir}/*/*.tags +%exclude %{_qt6_docdir}/*/*.index %files devel %{_qt6_docdir}/*/*.tags +%{_qt6_docdir}/*/*.index %changelog +* Tue Jun 10 2025 Marie Loise Nolden - 6.9.1-2 +- add *.index files to devel + * Sun Jun 08 2025 Marie Loise Nolden - 6.9.1-1 - 6.9.1 From 43e0170880713ba5f8c88dfec98497146e5d9778 Mon Sep 17 00:00:00 2001 From: Marie Loise Nolden Date: Tue, 10 Jun 2025 21:06:11 +0000 Subject: [PATCH 6/7] add *.index files to -devel For kf6-6.15.0 the api doc generation switched to using qdoc where the tags files are not enough and index files do the crosslinking, so add them to -devel to pick them up automatically for proper API doc generation --- qt6-doc.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qt6-doc.spec b/qt6-doc.spec index e3ce7bb..09e7c43 100644 --- a/qt6-doc.spec +++ b/qt6-doc.spec @@ -1,7 +1,7 @@ Name: qt6-doc Summary: Qt6 - Complete documentation Version: 6.8.1 -Release: 1%{?dist} +Release: 2%{?dist} BuildArch: noarch License: GFDL @@ -54,11 +54,16 @@ tar xf %{SOURCE0} -C %{buildroot} %files html %{_qt6_docdir}/*/* %exclude %{_qt6_docdir}/*/*.tags +%exclude %{_qt6_docdir}/*/*.index %files devel %{_qt6_docdir}/*/*.tags +%{_qt6_docdir}/*/*.index %changelog +* Tue Jun 10 2025 Marie Loise Nolden - 6.8.1-2 +- add *.index files to devel + * Mon Dec 30 2024 Marie Loise Nolden - 6.8.1-1 - 6.8.1 From 415c7dee0138a67ef1825839abfc89a48807e486 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 11:33:41 +0000 Subject: [PATCH 7/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- qt6-doc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt6-doc.spec b/qt6-doc.spec index 59a2f46..1bac055 100644 --- a/qt6-doc.spec +++ b/qt6-doc.spec @@ -1,7 +1,7 @@ Name: qt6-doc Summary: Qt6 - Complete documentation Version: 6.9.1 -Release: 2%{?dist} +Release: 3%{?dist} BuildArch: noarch License: GFDL @@ -61,6 +61,9 @@ tar xf %{SOURCE0} -C %{buildroot} %{_qt6_docdir}/*/*.index %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 6.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 10 2025 Marie Loise Nolden - 6.9.1-2 - add *.index files to devel