[neon/qt/qtwebengine/Neon/release_jammy] debian: merge salsa

[Jonathan Riddell]

Git commit 1f1e41268f3323b57936aee6f060a1ad19eba4b0 by Jonathan Riddell.
Committed on 21/08/2024 at 08:44.
Pushed by jriddell into branch 'Neon/release_jammy'.

merge salsa

M  +297  -2    debian/changelog
M  +44   -37   debian/control
M  +15   -5    debian/patches/series
M  +45   -78   debian/rules

https://invent.kde.org/neon/qt/qtwebengine/-/commit/1f1e41268f3323b57936aee6f060a1ad19eba4b0

diff --cc debian/control
index 8cfd992,af2afb6..81f388c
--- a/debian/control
+++ b/debian/control
@@@ -19,10 -20,10 +20,10 @@@ Build-Depends: binutils (>= 2.32-8~)
                 libegl1-mesa-dev,
                 libevent-dev,
                 libflac-dev,
-                libfontconfig1-dev,
-                libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
+                libfontconfig-dev,
+                libgl-dev (>= 1.3) [!armel !armhf],
                 libgl1-mesa-dri,
 -               libgles-dev [armel armhf],
 +               libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
                 libglib2.0-dev,
                 libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
                 libgstreamer-plugins-base1.0-dev,
@@@ -215,11 -215,9 +217,11 @@@ Description: Web content engine librar
   This package contains the arch independent parts of QtWebEngine libraries.
  
  Package: qt5-image-formats-plugin-pdf
- Architecture: amd64 arm64 armhf i386 mips64el mipsel
+ Architecture: amd64 arm64 armhf i386 mips64el
  Multi-Arch: same
  Depends: ${misc:Depends}, ${shlibs:Depends}
 +Breaks: libqt5pdfwidgets5 (<< ${binary:Version}~ciBuild)
 +Replaces: libqt5pdfwidgets5 (<< ${binary:Version}~ciBuild)
  Description: Qt 5 PDF image format plugin
   The Qt PDF module contains classes and functions for rendering PDF documents.
   .
diff --cc debian/patches/series
index c08b26b,31eb382..31d7bd5
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,15 -1,27 +1,25 @@@
+ # Use system libraries.
+ system-openjpeg2.patch
  system-lcms2.patch
  system-nspr-prtime.patch
+ system-icu-utf.patch
+ 
+ # Fix python problems.
+ python3.12-imp.patch
+ python3.12-six.patch
+ 
+ # General patches.
  verbose-gn-bootstrap.patch
 -mips64el-ptrace-include.patch
 -mips64el-no-dav1d.patch
  sandbox-time64-syscalls.patch
  breakpad-getcontext.patch
- mipsel-ggc-min-expand.patch
  mips64el-crashpad.patch
  mips64el-bad-define.patch
- mipsel-syscall-ranges.patch
+ mips64el-syscall-ranges.patch
  mips64el-kernel_stat64.patch
  armhf-no-thumb.patch
- gcc-12.patch
  disable-catapult.patch
- python3.patch
- chromium-python3.patch
+ pipewire-0.3.patch
+ fix-example-pro-files.patch
+ build-with-c++17.patch
+ ninja-1.12.patch
+ mips64el-v8-regexp.patch
diff --cc debian/rules
index aaac58e,8c23562..a64d2d5
--- a/debian/rules
+++ b/debian/rules
@@@ -65,60 -78,9 +78,9 @@@ override_dh_auto_clean
  	done
  
  override_dh_auto_configure:
- 	# Run qmake once to create .qmake.conf and be sure to append the following values.
- 	qmake QT_BUILD_PARTS+=tests QMAKE_EXTRA_ARGS+="$(config_args)" QMAKE_PYTHON3=python3
- 
- # Enable gstabs debugging symbols only on gstab_architectures.
- ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gstab_architectures)))
- 	echo "QMAKE_CXXFLAGS -= -g" >> .qmake.conf
- 	echo "QMAKE_CXXFLAGS += -gstabs" >> .qmake.conf
- # Enable normal debugging symbols only on fulldebug_architectures.
- else ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(fulldebug_architectures)))
- 	echo "QMAKE_CXXFLAGS_DEBUG += -fdebug-types-section" >> .qmake.conf
- 	echo "QMAKE_CXXFLAGS += -fdebug-types-section" >> .qmake.conf
- 	echo "QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -fdebug-types-section" >> .qmake.conf
- 	echo "QMAKE_CXXFLAGS_RELEASE += -fdebug-types-section" >> .qmake.conf
- 	echo "QMAKE_LFLAGS += -fdebug-types-section" >> .qmake.conf
- else
- # Disable debugging symbols in all the other archs.
- 	echo "QMAKE_CFLAGS -= -g" >> .qmake.conf
- 	echo "QMAKE_CFLAGS -= -gstabs" >> .qmake.conf
- 	echo "QMAKE_CXXFLAGS -= -g" >> .qmake.conf
- 	echo "QMAKE_CXXFLAGS -= -gstabs" >> .qmake.conf
- 	echo "QT_CONFIG -= force_debug_info" >> .qmake.conf
- 	echo "QT_CONFIG -= separate_debug_info" >> .qmake.conf
- endif
- 
- ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(small_architectures)))
- 	echo "QMAKE_CXXFLAGS += --param ggc-min-expand=20" >> .qmake.conf
- 	echo "QMAKE_CFLAGS += --param ggc-min-expand=20" >> .qmake.conf
- 	echo "QMAKE_LFLAGS -= Wl,--gc-sections" >> .qmake.conf
- endif
- 
- ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(no_gold_architectures)))
- 	# Do not use ld.gold
- 	echo "QMAKE_LFLAGS -= -fuse-ld=gold" >> .qmake.conf
- 	echo "QMAKE_LFLAGS += -fuse-ld=bfd" >> .qmake.conf
- endif
- 
- 	# Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
- 	echo "QMAKE_LFLAGS += -Wl,--no-keep-memory" >> .qmake.conf
- 
- 	# Missing hardening flag detected by blhc
- 	echo "QMAKE_LFLAGS += -Wl,-z,now" >> .qmake.conf
- 
- ifeq ($(DEB_HOST_ARCH),i386)
- 	# Make the following linker warning on i386 not fatal:
- 	# /usr/bin/ld: .../src/core/release/obj/third_party/ffmpeg/ffmpeg_nasm/dct32.o: warning: relocation in read-only section `.text'
- 	# /usr/bin/ld: warning: creating DT_TEXTREL in a shared object
- 	# Upstream does the same for lld linker, see third_party/ffmpeg/BUILD.gn.
- 	echo "QMAKE_LFLAGS += -Wl,-z,notext" >> .qmake.conf
- endif
- 
- 	# Run qmake again now with the proper values.
- 	qmake QT_BUILD_PARTS+=tests QMAKE_EXTRA_ARGS+="$(config_args)" QMAKE_PYTHON3=python3
+ 	qmake QT_BUILD_PARTS+=tests QMAKE_EXTRA_ARGS+="$(config_args)" QMAKE_PYTHON2=python3 $(qmake_args)
  
 -	# Create js files, that are needed for building step for arch and indep builds
 +	# # 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