diff -Nru webkit2gtk-2.22.0/debian/changelog webkit2gtk-2.22.0/debian/changelog --- webkit2gtk-2.22.0/debian/changelog 2018-09-14 18:23:00.000000000 +0000 +++ webkit2gtk-2.22.0/debian/changelog 2018-09-21 01:38:20.000000000 +0000 @@ -1,3 +1,11 @@ +webkit2gtk (2.22.0-2+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 Fri, 21 Sep 2018 01:38:20 +0000 + webkit2gtk (2.22.0-2) unstable; urgency=medium * Upload to unstable. diff -Nru webkit2gtk-2.22.0/debian/rules webkit2gtk-2.22.0/debian/rules --- webkit2gtk-2.22.0/debian/rules 2018-09-14 18:23:00.000000000 +0000 +++ webkit2gtk-2.22.0/debian/rules 2018-09-21 01:38:20.000000000 +0000 @@ -29,7 +29,7 @@ endif # https://bugs.webkit.org/show_bug.cgi?id=188862 -ifneq (,$(filter $(DEB_HOST_ARCH),armel)) +ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf)) EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF endif