From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 21 Oct 2023 02:08:38 +0000 (+0100)
Subject: Merge version 2.42.1-1~deb11u1+rpi1 and 2.42.1-1~deb11u2 to produce 2.42.1-1~deb11u2... 
X-Git-Tag: archive/raspbian/2.42.1-1_deb11u2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a8a888cd782393141f9fa6816d8efd1733324d29;p=webkit2gtk.git

Merge version 2.42.1-1~deb11u1+rpi1 and 2.42.1-1~deb11u2 to produce 2.42.1-1~deb11u2+rpi1
---

a8a888cd782393141f9fa6816d8efd1733324d29
diff --cc debian/changelog
index 9bf83ce53e,d3b486f75f..7e08598e17
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,21 @@@
- webkit2gtk (2.42.1-1~deb11u1+rpi1) bullseye-staging; urgency=medium
++webkit2gtk (2.42.1-1~deb11u2+rpi1) bullseye-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)
 +
 +  [changes introduced in 2.42.1-1~deb11u1+rpi1 by Peter Michael Green]
 +  * Disable webgl support, it fails to build.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 19 Oct 2023 03:51:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 21 Oct 2023 02:08:37 +0000
++
+ webkit2gtk (2.42.1-1~deb11u2) bullseye-security; urgency=medium
+ 
+   * debian/patches/disable-dmabuf.patch:
+     - Disable the DMABuf renderer in all cases in bullseye
+       (Closes: #1054101).
+ 
+  -- Alberto Garcia <berto@igalia.com>  Fri, 20 Oct 2023 00:26:39 +0200
  
  webkit2gtk (2.42.1-1~deb11u1) bullseye-security; urgency=medium