From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 18 Oct 2023 21:19:32 +0000 (+0100)
Subject: Merge version 2.42.1-1+rpi1 and 2.42.1-2 to produce 2.42.1-2+rpi1
X-Git-Tag: archive/raspbian/2.42.1-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=49161e820d1b9e9c49733fc41419ae39dfc29cdf;p=webkit2gtk.git

Merge version 2.42.1-1+rpi1 and 2.42.1-2 to produce 2.42.1-2+rpi1
---

49161e820d1b9e9c49733fc41419ae39dfc29cdf
diff --cc debian/changelog
index fc880cbed0,263a642042..5e1321a55f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,21 @@@
- webkit2gtk (2.42.1-1+rpi1) trixie-staging; urgency=medium
++webkit2gtk (2.42.1-2+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)
 +
 +  [changes introuced in 2.40.0-3+rpi1 by Peter Michael Green]
 +  * Disable webgl on armhf.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 02 Oct 2023 10:15:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 18 Oct 2023 21:19:31 +0000
++
+ webkit2gtk (2.42.1-2) unstable; urgency=medium
+ 
+   * debian/patches/disable-dmabuf-nvidia.patch:
+     - Disable the DMABuf renderer for NVIDIA proprietary drivers
+       (Closes: #1039720, #1052055).
+ 
+  -- Alberto Garcia <berto@igalia.com>  Wed, 04 Oct 2023 17:09:23 +0200
  
  webkit2gtk (2.42.1-1) unstable; urgency=high