From 260a6da476889defd5bd768b3e97ae0d5625bfd1 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Fri, 19 Apr 2019 15:48:08 -0500
Subject: [PATCH] 5.12.3 omit qtwebengine, now packaged separately

---
 .gitignore         |  4 +---
 generate-qt-doc.sh | 45 ++++++++++++++++++---------------------------
 qt5-doc.spec       | 20 +++++++++++++-------
 sources            |  2 +-
 4 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4c7ad4f..9e49943 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-/qt-doc-opensource-src-5.9.0.tar.xz
-/qt-doc-opensource-src-5.9.2.tar.xz
-/qt-doc-opensource-src-5.10.1.tar.xz
 /qt-doc-opensource-src-5.11.1.tar.xz
+/qt-doc-opensource-src-5.12.3.tar.xz
diff --git a/generate-qt-doc.sh b/generate-qt-doc.sh
index afe6934..b467250 100755
--- a/generate-qt-doc.sh
+++ b/generate-qt-doc.sh
@@ -1,24 +1,29 @@
 #!/bin/bash -x
 
+QT_BRANCH=5.12
+QT_VERSION=5.12.3
+make_build="$(rpm --eval %make_build)"
+
 # Clone full qt tree
-git clone -b 5.11 git://code.qt.io/qt/qt5.git
+git clone -b $QT_BRANCH git://code.qt.io/qt/qt5.git
 
 # Install fedora deps for qt5-qtbase
 sudo dnf builddep qt5-qtbase
 
 # Configure using fedora configure basic options
 cd qt5 || return
-git submodule foreach "git checkout 5.11"
+git submodule foreach "git checkout $QT_BRANCH"
 git submodule foreach "git fetch"
 git submodule foreach "git pull"
 
 # Init the base source
 ./init-repository
 
+# hard-code docdir for now, rpm --eval %{_qt5_docdir} yields unexpanded %{_docdir}/qt5 , wtf -- rex
 ./configure -confirm-license -opensource -prefix $(rpm --eval "%{_qt5_prefix}") \
     -archdatadir $(rpm --eval "%{_qt5_archdatadir}") -bindir $(rpm --eval "%{_qt5_bindir}") \
     -libdir $(rpm --eval "%{_qt5_libdir}") -libexecdir $(rpm --eval "%{_qt5_libexecdir}") \
-    -datadir $(rpm --eval "%{_qt5_datadir}") -docdir $(rpm --eval "%{_qt5_docdir}") \
+    -datadir $(rpm --eval "%{_qt5_datadir}") -docdir /usr/share/doc/qt5 \
     -examplesdir $(rpm --eval "%{_qt5_examplesdir}") -headerdir $(rpm --eval "%{_qt5_headerdir}") \
     -importdir $(rpm --eval "%{_qt5_importdir}") -plugindir $(rpm --eval "%{_qt5_plugindir}") \
     -sysconfdir $(rpm --eval "%{_qt5_sysconfdir}") -translationdir $(rpm --eval "%{_qt5_translationdir}") \
@@ -27,33 +32,19 @@ git submodule foreach "git pull"
     -system-libjpeg -system-libpng -system-zlib -no-directfb -skip qtmacextras -skip qtandroidextras \
     -skip qtactiveqt -skip qtwinextras
 
+$make_build qmake_all
 
-make qmake_all
+$make_build -C qtbase || exit
+$make_build sub-qmldevtools -C qtdeclarative/src/
+$make_build sub-qdoc sub-qtattributionsscanner -C qttools/src/
+$make_build sub-qhelpgenerator -C qttools/src/assistant/
 
-pushd qtbase
-
-make $(rpm --eval '%{_smp_mflags}') || exit
-
-popd
-
-pushd qtdeclarative/src
-    make $(rpm --eval '%{_smp_mflags}') sub-qmldevtools
-popd
-
-pushd qttools/src/
-    make $(rpm --eval '%{_smp_mflags}') sub-qdoc sub-qtattributionsscanner
-popd
-
-pushd qttools/src/assistant
-    make $(rpm --eval '%{_smp_mflags}') sub-qhelpgenerator
-popd
-
-make docs
+$make_build docs
 
 # Install docs on tmp directory
 DEST=${PWD}/install
-mkdir -p ${DEST}
-make INSTALL_ROOT=${DEST} install_docs
+rm -rf $DEST/ && mkdir -p ${DEST}
+make install_docs INSTALL_ROOT=$DEST
 
-cd ${DEST}
-tar cfJ ../qt-doc-opensource-src-5.11.1.tar.xz .
+XZ_OPT="-T 2"
+tar -C $DEST -cJf ../qt-doc-opensource-src-${QT_VERSION}.tar.xz .
diff --git a/qt5-doc.spec b/qt5-doc.spec
index 54c8503..0dfa26c 100644
--- a/qt5-doc.spec
+++ b/qt5-doc.spec
@@ -1,7 +1,7 @@
 Name:    qt5-doc
 Summary: Qt5 - Complete documentation
-Version: 5.11.1
-Release: 3%{?dist}
+Version: 5.12.3
+Release: 1%{?dist}
 BuildArch: noarch
 
 License: GFDL
@@ -157,7 +157,7 @@ Summary: Documentation for qtquickcontrols2
 %{summary}.
 
 %files -n qt5-qtquickcontrols2-doc
-%{_qt5_docdir}/qtquickcontrols2*
+%{_qt5_docdir}/qtquickcontrols/
 
 %package -n qt5-qtquickcontrols-doc
 Summary: Documentation for qtquickcontrols
@@ -166,7 +166,7 @@ Summary: Documentation for qtquickcontrols
 %{summary}.
 
 %files -n qt5-qtquickcontrols-doc
-%{_qt5_docdir}/qtquickcontrols*
+%{_qt5_docdir}/qtquickcontrols1/
 
 %package -n qt5-qtscript-doc
 Summary: Documentation for qtscript
@@ -229,7 +229,7 @@ Summary: Documentation for qttools
 %{summary}.
 
 %files -n qt5-qttools-doc
-%{_qt5_docdir}/qdoc*
+#{_qt5_docdir}/qdoc*
 %{_qt5_docdir}/qtassistant*
 %{_qt5_docdir}/qtdesigner*
 %{_qt5_docdir}/qthelp*
@@ -260,8 +260,8 @@ Summary: Documentation for qtwebengine
 %description -n qt5-qtwebengine-doc
 %{summary}.
 
-%files -n qt5-qtwebengine-doc
-%{_qt5_docdir}/qtwebengine*
+#files -n qt5-qtwebengine-doc
+#{_qt5_docdir}/qtwebengine*
 
 %package -n qt5-qtwebsockets-doc
 Summary: Documentation for qtwebsockets
@@ -393,9 +393,15 @@ tar xf %{SOURCE0}
 # Remove non used
 cd %{buildroot}%{_docdir}/qt5
 rm -rfv qtdoc*
+# unpackaged modules
+rm -rfv qtdistancefieldgenerator*
 
 
 %changelog
+* Fri Apr 19 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.3-1
+- 5.12.3
+- omit qtwebengine, now packaged separately
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 0e145f4..774297e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt-doc-opensource-src-5.11.1.tar.xz) = f642b134d07dee9f632fca460baa1928023ba91a1eb86fa2aa806e1285a388ac19c0a315bde91b1001a688c8f5d5a6ebfeb1139f22abe665d98dc1928b2e188e
+SHA512 (qt-doc-opensource-src-5.12.3.tar.xz) = 2bdf20ce2264accd8a9fe0da5332b81bd6656f5801af1601bfa3dc37a7fbe9c3e52c224014f028079d563d8e5a13daddc87357d56ca27c783fc171cfb663899b