diff -Nru webkit2gtk-2.28.4/debian/changelog webkit2gtk-2.28.4/debian/changelog --- webkit2gtk-2.28.4/debian/changelog 2020-07-28 15:12:20.000000000 +0000 +++ webkit2gtk-2.28.4/debian/changelog 2020-08-01 12:53:25.000000000 +0000 @@ -1,3 +1,11 @@ +webkit2gtk (2.28.4-1+rpi1) bullseye-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, 01 Aug 2020 12:53:25 +0000 + webkit2gtk (2.28.4-1) unstable; urgency=high * New upstream release. diff -Nru webkit2gtk-2.28.4/debian/rules webkit2gtk-2.28.4/debian/rules --- webkit2gtk-2.28.4/debian/rules 2020-07-28 15:12:20.000000000 +0000 +++ webkit2gtk-2.28.4/debian/rules 2020-08-01 12:53:25.000000000 +0000 @@ -29,6 +29,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