[neon/qt6/qt6-webengine/Neon/release] debian: drop nodejs hacks, adapt to noble's gcc-13, bring back system ffmpeg

[Carlos De Maine]

Git commit 772c0b6eb8150f405fb9a6c74db3826ae9de55b6 by Carlos De Maine.
Committed on 30/04/2024 at 11:11.
Pushed by carlosdem into branch 'Neon/release'.

drop nodejs hacks, adapt to noble's gcc-13, bring back system ffmpeg

M  +1    -1    debian/changelog
M  +8    -10   debian/control
M  +1    -8    debian/rules

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

diff --git a/debian/changelog b/debian/changelog
index f459b7f..a3e6888 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt6-webengine (6.7.0-0neon) jammy; urgency=medium
+qt6-webengine (6.7.0-0neon) noble; urgency=medium
 
   * New release
 
diff --git a/debian/control b/debian/control
index 7af7ce1..48b372a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,12 @@ Build-Depends: binutils (>= 2.32-8~),
                cmake,
                debhelper-compat (= 13),
                flex,
-               g++-12,
-               gcc-12,
                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,
@@ -80,10 +78,10 @@ Build-Depends: binutils (>= 2.32-8~),
                mesa-common-dev,
                mold,
                ninja-build,
-#               node-pako,
-#               node-rollup-plugin-terser,
-#               node-yargs,
-#               nodejs,
+               node-pako,
+               node-rollup-plugin-terser,
+               node-yargs,
+               nodejs,
                nvm,
                pkgconf,
                pkg-kde-tools,
@@ -100,7 +98,7 @@ Build-Depends: binutils (>= 2.32-8~),
                qt6-webchannel-dev (>= 6.7.0~),
                qt6-websockets-dev (>= 6.7.0~),
                re2c,
-#               rollup,
+               rollup,
                ruby,
                xauth <!nocheck>,
                xvfb <!nocheck>,
diff --git a/debian/rules b/debian/rules
index fd2f9f3..9de69e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,6 @@ include /usr/share/dpkg/architecture.mk
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 export DH_VERBOSE = 1
 
-# need gcc 12.1 for mold to be able to process --gdb-index
-export CC=gcc-12
-export CXX=g++-12
-
 PARALLEL_OPTION = $(filter parallel=%,$(DEB_BUILD_OPTIONS))
 ifneq (,$(PARALLEL_OPTION))
 	NUMJOBS = $(patsubst parallel=%,%,$(PARALLEL_OPTION))
@@ -46,7 +42,6 @@ override_dh_auto_clean:
 		rm -f $(CURDIR)/$${fname}; \
 	done
 
-# 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
@@ -62,9 +57,7 @@ override_dh_auto_configure:
 		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 && \
+
 	dh_auto_configure -- \
 		-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \