diff -Nru webkit2gtk-2.22.5/debian/changelog webkit2gtk-2.22.5/debian/changelog --- webkit2gtk-2.22.5/debian/changelog 2018-12-13 18:43:29.000000000 +0000 +++ webkit2gtk-2.22.5/debian/changelog 2018-12-19 22:40:37.000000000 +0000 @@ -1,3 +1,11 @@ +webkit2gtk (2.22.5-1+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 Wed, 19 Dec 2018 22:40:37 +0000 + webkit2gtk (2.22.5-1) unstable; urgency=medium * New upstream release. diff -Nru webkit2gtk-2.22.5/debian/rules webkit2gtk-2.22.5/debian/rules --- webkit2gtk-2.22.5/debian/rules 2018-12-13 18:43:29.000000000 +0000 +++ webkit2gtk-2.22.5/debian/rules 2018-12-19 22:40:36.000000000 +0000 @@ -28,6 +28,11 @@ CFLAGS := $(CFLAGS:-O2=-O1) endif +# https://bugs.webkit.org/show_bug.cgi?id=188862 +ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf)) + EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF +endif + ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) EXTRA_CMAKE_ARGUMENTS += -DUSE_SYSTEM_MALLOC=ON CPPFLAGS += -DRELEASE_WITHOUT_OPTIMIZATIONS