diff -Nru webkit2gtk-2.26.4/debian/changelog webkit2gtk-2.26.4/debian/changelog --- webkit2gtk-2.26.4/debian/changelog 2020-04-16 16:37:24.000000000 +0000 +++ webkit2gtk-2.26.4/debian/changelog 2020-04-18 12:01:30.000000000 +0000 @@ -1,3 +1,11 @@ +webkit2gtk (2.26.4-1~deb10u3+rpi1) buster-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) + + -- Raspbian forward porter Sat, 18 Apr 2020 12:01:30 +0000 + webkit2gtk (2.26.4-1~deb10u3) buster-security; urgency=medium * debian/patches/cve-2020-11793-fix.patch: diff -Nru webkit2gtk-2.26.4/debian/rules webkit2gtk-2.26.4/debian/rules --- webkit2gtk-2.26.4/debian/rules 2020-04-16 16:37:24.000000000 +0000 +++ webkit2gtk-2.26.4/debian/rules 2020-04-18 12:01:30.000000000 +0000 @@ -32,6 +32,11 @@ 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 + # Disable Gold where it causes build problems, see #949618 ifneq (,$(filter $(DEB_HOST_ARCH),powerpc)) EXTRA_CMAKE_ARGUMENTS += -DUSE_LD_GOLD=OFF