[neon/qt6/qt6-webengine/Neon/unstable] debian: rebase

[Carlos De Maine]

Git commit a0faf50eaae3c73914c088952e04daca8101afef by Carlos De Maine.
Committed on 05/09/2023 at 01:05.
Pushed by carlosdem into branch 'Neon/unstable'.

rebase

M  +12   -7    debian/control
M  +16   -7    debian/rules

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

diff --git a/debian/control b/debian/control
index 298bbde..8863e48 100644
--- a/debian/control
+++ b/debian/control
@@ -11,14 +11,16 @@ Build-Depends: binutils (>= 2.32-8~),
                gperf,
                generate-ninja,
                libasound2-dev,
-               libavcodec-dev (>= 7:4.0~),
-               libavformat-dev (>= 7:4.0~),
-               libavutil-dev (>= 7:4.0~),
+#               libavcodec-dev (>= 7:4.0~),
+#               libavformat-dev (>= 7:4.0~),
+#               libavutil-dev (>= 7:4.0~),
                libcups2-dev (>= 1.5.0),
                libdbus-1-dev,
+               libdrm-dev,
                libegl1-mesa-dev,
                libevent-dev,
                libfontconfig1-dev,
+               libfreetype-dev,
                libgl-dev,
                libgles-dev,
                libglib2.0-dev,
@@ -47,17 +49,20 @@ Build-Depends: binutils (>= 2.32-8~),
                libsnappy-dev,
                libsqlite3-dev,
                libssl-dev,
+               libtiff-dev,
                libusb-1.0-0-dev,
+               libva-dev,
                libvpx-dev (>= 1.8),
                libvulkan-dev [linux-any],
-               libv8-dev,
                libwayland-dev (>= 1.8.0),
                libwebp-dev,
+               libx11-dev,
                libx11-xcb-dev,
                libxcb-dri3-dev,
                libxcomposite-dev,
                libxcursor-dev,
                libxdamage-dev,
+               libxi-dev,
                libxkbcommon-dev,
                libxkbcommon-dev (>= 0.2.0),
                libxkbfile-dev,
@@ -75,8 +80,7 @@ Build-Depends: binutils (>= 2.32-8~),
 #               node-rollup-plugin-terser,
 #               node-yargs,
 #               nodejs,
-               nvm,
-	       pkg-config,
+               pkg-config,
                pkg-kde-tools,
                protobuf-compiler,
                python3,
@@ -92,7 +96,8 @@ Build-Depends: binutils (>= 2.32-8~),
 #               rollup,
                ruby,
                xauth <!nocheck>,
-               xvfb <!nocheck>
+               xvfb <!nocheck>,
+               zlib1g-dev,
 Standards-Version: 4.6.1
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-webengine
diff --git a/debian/rules b/debian/rules
index 54dfb20..970f5e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,9 +41,11 @@ override_dh_auto_clean:
 		rm -f $(CURDIR)/$${fname}; \
 	done
 
+	# init nvm and thus npm
+	. ~/.nvm/nvm.sh
 	# install needed nodejs deps with npm
-	npm install rollup
 	npm install pako
+	#npm install rollup
 	npm install rollup-plugin-terser
 	npm install yargs
 
@@ -52,14 +54,21 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		--log-level=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
-		-DFEATURE_webengine_system_icu=OFF \
-		-DFEATURE_webengine_system_libevent=ON \
 		-DFEATURE_qtpdf_build=ON \
-		-DFEATURE_qtpdf_widgets_build=ON \
+		-DFEATURE_qtpdf_enable_v8=ON \
 		-DFEATURE_qtpdf_quick_build=ON \
-		-DFEATURE_webengine_proprietary_codecs=ON \
+		-DFEATURE_qtpdf_widgets_build=ON \
+		-DFEATURE_qtwebengine-quick-build=ON \
+		-DFEATURE_qtwebengine-widgets-build=ON \
 		-DFEATURE_webengine_kerberos=ON \
-		-DFEATURE_webengine_webrtc=ON
+		-DFEATURE_webengine_proprietary_codecs=ON \
+		-DFEATURE_webengine_system_icu=OFF \
+		-DFEATURE_webengine_system_libevent=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
 
 	# Create js files, that are needed for building step for arch and indep builds
 	cd $(CURDIR)/src/3rdparty/chromium/third_party/jstemplate/; \
@@ -79,4 +88,4 @@ execute_after_dh_auto_install:
 	# Reproducible builds: remove build paths from .prl files
 	sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt6*.prl
 
-override_dh_dwz:
+override_dh_dwz:
\ No newline at end of file