Manual merge of version 2.46.5-1+rpi1 and 2.48.0-1 to produce 2.48.0-1+rpi1

diff --cc debian/changelog
index 165f2967c37a6693b6e29348750d8b7a314b6bcc,dc4ffce722e6d0a2610855cf11316c300c6fbd1b..c8b76bda3bc2ce391c0910d66bd44d92f1bf7c42
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,51 +1,59 @@@
- webkit2gtk (2.46.5-1+rpi1) trixie-staging; urgency=medium
++webkit2gtk (2.48.0-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 25 Jan 2015 02:14:50 +0000]
 +  * Disable javascript JIT as it doesn't appear to be armv6 compatible
 +    (at least I assume that is the cause of the assembler errors)
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 07 Jan 2025 18:20:16 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 03 Apr 2025 16:19:18 +0000
++
+ webkit2gtk (2.48.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Bring all changes from the 2.47 (experimental) branch.
+   * debian/source/lintian-overrides:
+     - Update source-is-missing overrides.
+   * Remove libwebkit2gtk-4.0-37.lintian-overrides.
+   * debian/control.in:
+     - Add build dependency on flite1-dev (for speech synthesis).
+     - Remove the minimum versions of all build dependencies in the cases
+       where they are very old.
+     - Remove build dependencies on all lib*-doc packages.
+   * Enable clang again in the architectures where it's available and known
+     to work.
+   * Replace USE_OLD_*_PKG with USE_OLD_PKG_NAMES.
+   * debian/copyright:
+     - Update copyright information of all files.
+   * debian/gbp.conf:
+     - Update upstream branch name.
+   * debian/libwebkit2gtk-4.0-37.symbols:
+     - Update symbols.
+   * fix-bmalloc-armhf.patch:
+     - Drop this patch, the armhf build works fine now without it.
+   * fix-ftbfs-hurd.patch:
+     - Drop this patch, I forgot to do it in 2.46.1-2.
+   * disable-nvidia-dmabuf.patch:
+     - Update this patch for the 2.48.x branch.
+   * debian/rules:
+     - Stop overriding dh_builddeb, running it in parallel used to be a
+       problem when we were building without -g1 and had very large debug
+       packages.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Fri, 14 Mar 2025 23:12:01 +0100
+ 
+ webkit2gtk (2.46.6-1) unstable; urgency=high
+ 
+   * New upstream release (Closes: #1092311).
+   * Refresh debian/patches/disable-nvidia-dmabuf.patch
+   * debian/copyright:
+     - Update copyright information of all files.
+   * debian/rules:
+     - Stop using -DWTF_CPU_ARM64_CORTEXA53=OFF, this was fixed upstream a
+       long time ago (WebKit bug #197192).
+   * debian/upstream/signing-key.asc:
+     - sq complains about multiple concatenated ASCII Armor blocks, so put
+       all keys in the same block.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Fri, 07 Feb 2025 14:40:10 +0100
  
  webkit2gtk (2.46.5-1) unstable; urgency=medium
  

diff --cc debian/rules
index 286ac9376320ae35b5897532d8e03b2e52960fea,bfac162d7b483547b2434a531aba1df812195e87..81aac21a910a4cfe4f819c59e92ba8a5c595aa4e
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -71,16 -74,6 +74,11 @@@ ifneq (,$(filter $(DEB_HOST_ARCH),loong
        EXTRA_CMAKE_ARGUMENTS += -DUSE_SKIA=OFF
  endif
  
- # See https://bugs.webkit.org/show_bug.cgi?id=197192
- ifneq (,$(filter $(DEB_HOST_ARCH),arm64))
-       EXTRA_CMAKE_ARGUMENTS += -DWTF_CPU_ARM64_CORTEXA53=OFF
- endif
- 
 +# https://bugs.webkit.org/show_bug.cgi?id=188862
 +ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf))
 +      EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF
 +endif
 +
  ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
        EXTRA_CMAKE_ARGUMENTS += -DUSE_SYSTEM_MALLOC=ON
        CPPFLAGS += -DRELEASE_WITHOUT_OPTIMIZATIONS