diff -Nru webkit2gtk-2.18.4/debian/changelog webkit2gtk-2.18.4/debian/changelog --- webkit2gtk-2.18.4/debian/changelog 2017-12-19 16:31:33.000000000 +0000 +++ webkit2gtk-2.18.4/debian/changelog 2017-12-27 15:27:56.000000000 +0000 @@ -1,3 +1,11 @@ +webkit2gtk (2.18.4-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, 27 Dec 2017 15:27:56 +0000 + webkit2gtk (2.18.4-1) unstable; urgency=high [ Alberto Garcia ] diff -Nru webkit2gtk-2.18.4/debian/rules webkit2gtk-2.18.4/debian/rules --- webkit2gtk-2.18.4/debian/rules 2017-12-19 16:31:33.000000000 +0000 +++ webkit2gtk-2.18.4/debian/rules 2017-12-27 15:27:56.000000000 +0000 @@ -25,7 +25,7 @@ CFLAGS := $(CFLAGS:-g=-g1) 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