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

diff --cc debian/changelog
index 91aab58c0057dd02f4c8e98de04e53070f127447,f6e870488ca5fd1eaada69dcdf35a4af21565a9c..165f2967c37a6693b6e29348750d8b7a314b6bcc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,67 +1,75 @@@
- webkit2gtk (2.46.0-2+rpi1) trixie-staging; urgency=medium
++webkit2gtk (2.46.5-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)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Sep 2024 22:26:33 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 07 Jan 2025 18:20:16 +0000
++
+ webkit2gtk (2.46.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Thu, 19 Dec 2024 09:55:22 +0100
+ 
+ webkit2gtk (2.46.4-1) unstable; urgency=high
+ 
+   * New upstream release.
+   * The WebKitGTK security advisory WSA-2024-0007 lists the following
+     security fixes in the latest versions of WebKitGTK:
+     - CVE-2024-44308, CVE-2024-44309 (fixed in 2.46.4).
+ 
+  -- Alberto Garcia <berto@igalia.com>  Wed, 27 Nov 2024 16:00:26 +0100
+ 
+ webkit2gtk (2.46.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Wed, 30 Oct 2024 14:39:03 +0100
+ 
+ webkit2gtk (2.46.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop socket-monitor-crash.patch (included in this release).
+   * debian/control-common.in:
+     - The libwebkit*-dev packages are no longer Multi-Arch: same.
+       The s390x versions of the WebKit*.gir files are different due to a
+       change in a default value (WebKit bug #279220).
+   * debian/copyright:
+     - Update copyright information of all files.
+   * debian/rules:
+     - Stop disabling jpeg-xl in Ubuntu (Jeremy Bícha).
+     - Remove the USE_PREBUILT_DOCS variable, we can always build the
+       documentation now.
+     - Fix build with -Nlibwebkitgtk-doc.
+     - Disable Skia on loong64 (Closes: #1082740).
+ 
+  -- Alberto Garcia <berto@igalia.com>  Wed, 23 Oct 2024 11:57:14 +0200
+ 
+ webkit2gtk (2.46.1-2) unstable; urgency=medium
+ 
+   * Make the package Linux-only.
+     - debian/control*.in: Set Architecture: linux-any.
+     - debian/rules: Remove non-Linux quirks.
+   * debian/patches/socket-monitor-crash.patch:
+     - Fix crash due to a regression in 2.46.1 (WebKit bug #281495).
+   * debian/control.in:
+     - Require cmake 3.20.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Thu, 17 Oct 2024 16:52:26 +0200
+ 
+ webkit2gtk (2.46.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * debian/rules:
+     - Remove compiler overrides for sh4 (Closes: #1082305)
+       (thanks, John Paul Adrian Glaubitz).
+     - Build with -DENALE_WEBGL=OFF in the Hurd.
+   * Drop debian/patches/fix-epiphany-ftbfs.patch.
+   * debian/copyright:
+     - Update copyright information of all files.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Mon, 30 Sep 2024 13:51:18 +0200
  
  webkit2gtk (2.46.0-2) unstable; urgency=medium
  

diff --cc debian/rules
index 07674d04076158b2aae750a42a7887c4d6db96b1,ae6571b48fffdd385bd7e12aeea448977cba6d23..286ac9376320ae35b5897532d8e03b2e52960fea
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -84,28 -76,6 +76,11 @@@ ifneq (,$(filter $(DEB_HOST_ARCH),arm64
        EXTRA_CMAKE_ARGUMENTS += -DWTF_CPU_ARM64_CORTEXA53=OFF
  endif
  
- # Lower memory requirements on architectures with only 2 GB address space
- ifneq (,$(filter $(DEB_HOST_ARCH),m68k mips mipsel))
-       CFLAGS := $(CFLAGS:-g1=-g0)
-       CFLAGS := $(CFLAGS:-O2=-Os)
-       CPPFLAGS += --param ggc-min-expand=10
- endif
- 
- # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93876
- # and: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93877
- ifneq (,$(filter $(DEB_HOST_ARCH),sh3 sh4))
-       CFLAGS := $(CFLAGS:-g1=-g0)
-       CFLAGS := $(CFLAGS:-O2=-O1)
-       CXXFLAGS := $(CXXFLAGS:-g1=-g0)
-       CXXFLAGS := $(CXXFLAGS:-O2=-O1)
-       CPPFLAGS += --param ggc-min-expand=10
- 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