diff -Nru webkit2gtk-2.10.5/debian/changelog webkit2gtk-2.10.5/debian/changelog --- webkit2gtk-2.10.5/debian/changelog 2016-01-21 14:29:01.000000000 +0000 +++ webkit2gtk-2.10.5/debian/changelog 2016-01-24 13:06:42.000000000 +0000 @@ -1,3 +1,11 @@ +webkit2gtk (2.10.5-1+rpi1) stretch-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 Sun, 24 Jan 2016 13:06:41 +0000 + webkit2gtk (2.10.5-1) unstable; urgency=high * New upstream release. Fixes CVE-2015-7096 and CVE-2015-7098. diff -Nru webkit2gtk-2.10.5/debian/rules webkit2gtk-2.10.5/debian/rules --- webkit2gtk-2.10.5/debian/rules 2016-01-21 14:29:01.000000000 +0000 +++ webkit2gtk-2.10.5/debian/rules 2016-01-24 13:06:42.000000000 +0000 @@ -31,7 +31,7 @@ endif # See https://bugs.webkit.org/show_bug.cgi?id=113638 -ifeq (,$(filter $(DEB_BUILD_ARCH),i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 armhf)) +ifeq (,$(filter $(DEB_BUILD_ARCH),i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64)) EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF CPPFLAGS += -DENABLE_ASSEMBLER=0 endif