From: Raspbian automatic forward porter Date: Tue, 21 Nov 2023 11:53:12 +0000 (+0000) Subject: Merge version 2.40.3-2~deb12u2+rpi1 and 2.42.2-1~deb12u1 to produce 2.42.2-1~deb12u1... X-Git-Tag: archive/raspbian/2.42.2-1_deb12u1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=872af7ac2ee87d4fae36b321b84d4b4418494032;p=webkit2gtk.git Merge version 2.40.3-2~deb12u2+rpi1 and 2.42.2-1~deb12u1 to produce 2.42.2-1~deb12u1+rpi1 --- 872af7ac2ee87d4fae36b321b84d4b4418494032 diff --cc debian/changelog index 2bf2264d86,1d9c580505..78f6b6c563 --- a/debian/changelog +++ b/debian/changelog @@@ -1,27 -1,80 +1,91 @@@ - webkit2gtk (2.40.3-2~deb12u2+rpi1) bookworm-staging; urgency=medium ++webkit2gtk (2.42.2-1~deb12u1+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green 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 Fri, 28 Jul 2023 21:05:13 +0000 ++ -- Raspbian forward porter Tue, 21 Nov 2023 11:53:10 +0000 + - webkit2gtk (2.40.3-2~deb12u2) bookworm-security; urgency=medium + webkit2gtk (2.42.2-1~deb12u1) bookworm-security; urgency=medium - * debian/patches/fix-CVE-2023-37450.patch: - - Cherry pick fix for CVE-2023-37450. + * Rebuild for bookworm-security. + - Fixes CVE-2023-41983 and CVE-2023-42852. + * Disable JPEG XL to avoid adding new dependencies. + - debian/control.in: Remove build dependency on libjxl-dev. + - debian/rules: Build with -DUSE_JPEGXL=OFF. - -- Alberto Garcia Fri, 21 Jul 2023 11:24:47 +0200 + -- Alberto Garcia Thu, 16 Nov 2023 12:15:08 +0100 - webkit2gtk (2.40.3-2~deb12u1) bookworm-security; urgency=medium + webkit2gtk (2.42.2-1) unstable; urgency=high - * Rebuild for bookworm-security. - - Fixes CVE-2023-32439. + * New upstream release. + * debian/copyright: + - Update copyright information of all files. + + -- Alberto Garcia Fri, 10 Nov 2023 19:02:00 +0100 + + 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 Wed, 04 Oct 2023 17:09:23 +0200 + + webkit2gtk (2.42.1-1) unstable; urgency=high + + * New upstream release. + + -- Alberto Garcia Wed, 27 Sep 2023 10:49:22 +0200 + + webkit2gtk (2.42.0-1) unstable; urgency=medium + + * New upstream release. + * Bring all changes from the 2.41 (experimental) branch. + * debian/gbp.conf: + - Update upstream branch name. + * debian/control.in: + - Remove the minimum versions of all build dependencies in the cases + where they are very old. + - Add build dependency on libjxl-dev, JPEGXL is now enabled by + default. + - Require CMake 3.16 + * debian/control-common.in: + - Add dependency on libgles2. This is no longer detected automatically + because it's loaded at runtime by libepoxy (see #1050777). + * debian/source/lintian-overrides: + - Update source-is-missing overrides. + * debian/libwebkit2gtk-4.0-37.symbols: + - Update symbols. + * debian/rules: + - Use --max-parallel=2 in Debian mipsel builds again. + - Don't build jpegxl support on Ubuntu yet (it's still in universe) + (Jeremy Bicha). + * debian/copyright: + - Update copyright information of all files. + + -- Alberto Garcia Fri, 15 Sep 2023 14:49:49 +0200 + + webkit2gtk (2.40.5-1) unstable; urgency=high + + * New upstream release. + * debian/rules: + - Use -O1 instead of -Os in sh4 (thanks, John Paul Adrian Glaubitz) + (Closes: #1042519). + * Drop debian/patches/fix-jsc-timestamp.patch. + + -- Alberto Garcia Wed, 02 Aug 2023 00:01:52 +0300 + + webkit2gtk (2.40.4-1) unstable; urgency=high + + * New upstream release. + * debian/rules: + - Set Build-Depends-Indep to jdupes when USE_PREBUILT_DOCS is set. - -- Alberto Garcia Thu, 06 Jul 2023 15:22:42 +0200 + -- Alberto Garcia Fri, 21 Jul 2023 11:01:47 +0200 webkit2gtk (2.40.3-2) unstable; urgency=high diff --cc debian/rules index e739b537c5,b0c88af962..3c424b1de0 --- a/debian/rules +++ b/debian/rules @@@ -70,13 -71,8 +71,13 @@@ 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 + # Lower memory requirements on architectures with only 2 GB address space - ifneq (,$(filter $(DEB_HOST_ARCH),m68k mips mipsel sh4)) + ifneq (,$(filter $(DEB_HOST_ARCH),m68k mips mipsel)) CFLAGS := $(CFLAGS:-g1=-g0) CFLAGS := $(CFLAGS:-O2=-Os) CPPFLAGS += --param ggc-min-expand=10