[neon/qt6/qt6-webengine/Neon/unstable] debian: # all files need to exist before configure is run for unity build

[Carlos De Maine]

Git commit c92e4528b759f98c2178552bd9562e49231a0471 by Carlos De Maine.
Committed on 28/10/2023 at 17:06.
Pushed by carlosdem into branch 'Neon/unstable'.

# all files need to exist before configure is run for unity build

M  +2    -2    debian/control
M  +1    -1    debian/qt6-webengine.install
M  +29   -19   debian/rules

https://invent.kde.org/neon/qt6/qt6-webengine/-/commit/c92e4528b759f98c2178552bd9562e49231a0471

diff --git a/debian/control b/debian/control
index 9706913..60b17a7 100644
--- a/debian/control
+++ b/debian/control
@@ -65,7 +65,6 @@ Build-Depends: binutils (>= 2.32-8~),
                libxcursor-dev,
                libxdamage-dev,
                libxi-dev,
-               libxkbcommon-dev,
                libxkbcommon-dev (>= 0.2.0),
                libxkbfile-dev,
                libxml2-dev,
@@ -117,6 +116,7 @@ X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
 Provides: qt6-webengine-abi (= 6.6.0)
 Depends: qt6-declarative,
+         qt6-svg,
          sse3-support [amd64 i386],
          ${misc:Depends},
          ${shlibs:Depends}
@@ -270,7 +270,7 @@ Depends: qt6-webengine-dev
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qt6-webengine-doc-htlp
+Package: qt6-webengine-doc-html
 Architecture: all
 Depends: qt6-webengine-doc
 Description: Dummy transitional
diff --git a/debian/qt6-webengine.install b/debian/qt6-webengine.install
index 5a3cbbe..aa939e7 100644
--- a/debian/qt6-webengine.install
+++ b/debian/qt6-webengine.install
@@ -10,4 +10,4 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtQuick/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWebEngine/
 usr/lib/qt6/libexec/QtWebEngineProcess
 usr/share/qt6/resources/
-usr/share/qt6/translations/qtwebengine_locales/*
+usr/share/qt6/translations/qtwebengine_locales/
diff --git a/debian/rules b/debian/rules
index ed0fb5d..36b6831 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,6 +50,20 @@ override_dh_auto_clean:
 
 # Turn on system FFmpeg libraries for 6.3
 override_dh_auto_configure:
+	# all files need to exist before configure is run for unity build
+	# Create js files, that are needed for building step for arch and indep builds
+	cd $(CURDIR)/src/3rdparty/chromium/third_party/jstemplate/; \
+	cat util.js jsevalcontext.js jstemplate.js exports.js > jstemplate_compiled.js
+
+	# jQuery
+	cp /usr/share/javascript/jquery/jquery.min.js examples/webenginewidgets/contentmanipulation/
+	cp /usr/share/javascript/jquery/jquery.min.js src/3rdparty/chromium/third_party/pycoverage/coverage/htmlfiles/
+	cp /usr/share/javascript/jquery-tablesorter/jquery.tablesorter.min.js src/3rdparty/chromium/third_party/pycoverage/coverage/htmlfiles/
+
+	set -ex; for fname in $(touch_files); do \
+		mkdir -p $(CURDIR)/$$(dirname $${fname}); \
+		touch $(CURDIR)/$${fname}; \
+	done
 	bash -c "source ~/.nvm/nvm.sh && npm install pako && npm install rollup-plugin-terser && npm install yargs"
 	ln -s ~/.nvm/versions/node/v18.5.0/ ./src/3rdparty/chromium/third_party/node/linux/node-linux-x64
 	bash -c "source ~/.nvm/nvm.sh && \
@@ -57,36 +71,32 @@ override_dh_auto_configure:
 		-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
+		-DFEATURE_pdf_bitcode=ON \
+		-DFEATURE_pdf_xfa=ON \
+		-DFEATURE_pdf_xfa_bmp=ON \
+		-DFEATURE_pdf_xfa_gif=ON \
+		-DFEATURE_pdf_xfa_png=ON \
+		-DFEATURE_pdf_xfa_tiff=ON \
 		-DFEATURE_qtpdf_build=ON \
-		-DFEATURE_qtpdf_enable_v8=ON \
+		-DFEATURE_qtpdf_v8=ON \
 		-DFEATURE_qtpdf_quick_build=ON \
 		-DFEATURE_qtpdf_widgets_build=ON \
-		-DFEATURE_qtwebengine-quick-build=ON \
-		-DFEATURE_qtwebengine-widgets-build=ON \
+		-DFEATURE_qtwebengine_quick_build=ON \
+		-DFEATURE_qtwebengine_widgets_build=ON \
+		-DFEATURE_webengine_build_ninja=ON \
 		-DFEATURE_webengine_kerberos=ON \
+		-DFEATURE_webengine_native_spellchecker=ON \
 		-DFEATURE_webengine_proprietary_codecs=ON \
+		-DFEATURE_webengine_system_harfbuzz=ON \
 		-DFEATURE_webengine_system_icu=OFF \
 		-DFEATURE_webengine_system_libevent=ON \
-		-DFEATURE_webengine-system-libjpeg=on \
-		-DFEATURE_webengine-system-libpng=on \
+		-DFEATURE_webengine_system_libjpeg=on \
+		-DFEATURE_webengine_system_libpng=on \
 		-DFEATURE_webengine_system_zlib=ON \
 		-DFEATURE_webengine_webrtc=ON \
-		-DFEATURE_webengine_webrtc-pipewire=ON \
+		-DFEATURE_webengine_webrtc_pipewire=ON \
 		-DQT_UNITY_BUILD=ON"
 
-# Create js files, that are needed for building step for arch and indep builds
-	cd $(CURDIR)/src/3rdparty/chromium/third_party/jstemplate/; \
-		cat util.js jsevalcontext.js jstemplate.js exports.js > jstemplate_compiled.js
-
-	# jQuery
-	cp /usr/share/javascript/jquery/jquery.min.js examples/webenginewidgets/contentmanipulation/
-	cp /usr/share/javascript/jquery/jquery.min.js src/3rdparty/chromium/third_party/pycoverage/coverage/htmlfiles/
-	cp /usr/share/javascript/jquery-tablesorter/jquery.tablesorter.min.js src/3rdparty/chromium/third_party/pycoverage/coverage/htmlfiles/
-
-	set -ex; for fname in $(touch_files); do \
-		mkdir -p $(CURDIR)/$$(dirname $${fname}); \
-		touch $(CURDIR)/$${fname}; \
-	done
 
 override_dh_auto_build:
 	dh_auto_build