diff -Nru webkit2gtk-2.20.0/debian/changelog webkit2gtk-2.20.0/debian/changelog --- webkit2gtk-2.20.0/debian/changelog 2018-03-21 12:31:13.000000000 +0000 +++ webkit2gtk-2.20.0/debian/changelog 2018-03-28 22:44:14.000000000 +0000 @@ -1,3 +1,11 @@ +webkit2gtk (2.20.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) + + -- Peter Michael Green Wed, 28 Mar 2018 22:44:14 +0000 + webkit2gtk (2.20.0-2) unstable; urgency=medium * Upload to unstable (Closes: #889659, #888543). diff -Nru webkit2gtk-2.20.0/debian/rules webkit2gtk-2.20.0/debian/rules --- webkit2gtk-2.20.0/debian/rules 2018-03-21 12:31:13.000000000 +0000 +++ webkit2gtk-2.20.0/debian/rules 2018-03-28 22:44:14.000000000 +0000 @@ -30,7 +30,7 @@ CFLAGS := $(CFLAGS:-O2=-O1) endif -ifeq (,$(filter $(DEB_HOST_ARCH),i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 armhf arm64)) +ifeq (,$(filter $(DEB_HOST_ARCH),i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 arm64)) EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF endif