diff -Nru webkit2gtk-2.6.2+dfsg1/debian/changelog webkit2gtk-2.6.2+dfsg1/debian/changelog --- webkit2gtk-2.6.2+dfsg1/debian/changelog 2015-03-06 07:33:28.000000000 +0000 +++ webkit2gtk-2.6.2+dfsg1/debian/changelog 2015-06-14 19:54:36.000000000 +0000 @@ -1,3 +1,10 @@ +webkit2gtk (2.6.2+dfsg1-4+rpi1) jessie-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, 14 Jun 2015 19:54:16 +0000 + webkit2gtk (2.6.2+dfsg1-4) unstable; urgency=medium * debian/patches/fix-ftbfs-hppa.patch: diff -Nru webkit2gtk-2.6.2+dfsg1/debian/rules webkit2gtk-2.6.2+dfsg1/debian/rules --- webkit2gtk-2.6.2+dfsg1/debian/rules 2015-03-06 07:33:28.000000000 +0000 +++ webkit2gtk-2.6.2+dfsg1/debian/rules 2015-06-14 19:54:36.000000000 +0000 @@ -27,7 +27,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_YARR_JIT=0 -DENABLE_ASSEMBLER=0 endif