diff -Nru webkit2gtk-2.26.2/debian/changelog webkit2gtk-2.26.2/debian/changelog --- webkit2gtk-2.26.2/debian/changelog 2019-11-06 12:29:56.000000000 +0000 +++ webkit2gtk-2.26.2/debian/changelog 2019-12-07 04:48:23.000000000 +0000 @@ -1,3 +1,15 @@ +webkit2gtk (2.26.2-1+rpi1) bullseye-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 + (previously it failed to build with assembler errors, nowadays it apparently + builds but does not work) + + [changes introduced in 2.26.2-1+rpi1 by Peter Michael Green] + * Add build-depends on python. + + -- Peter Michael Green Sat, 07 Dec 2019 04:48:23 +0000 + webkit2gtk (2.26.2-1) unstable; urgency=medium * New upstream release. diff -Nru webkit2gtk-2.26.2/debian/control webkit2gtk-2.26.2/debian/control --- webkit2gtk-2.26.2/debian/control 2019-11-06 12:29:56.000000000 +0000 +++ webkit2gtk-2.26.2/debian/control 2019-12-07 04:48:23.000000000 +0000 @@ -57,7 +57,8 @@ ninja-build, libegl1-mesa-dev, libgl1-mesa-dev [!armel !armhf !arm64], - libgles2-mesa-dev + libgles2-mesa-dev, + python Build-Conflicts: gir-repository-dev Standards-Version: 4.4.1 Vcs-Browser: https://salsa.debian.org/webkit-team/webkit diff -Nru webkit2gtk-2.26.2/debian/rules webkit2gtk-2.26.2/debian/rules --- webkit2gtk-2.26.2/debian/rules 2019-11-06 12:29:56.000000000 +0000 +++ webkit2gtk-2.26.2/debian/rules 2019-12-07 04:48:23.000000000 +0000 @@ -34,6 +34,11 @@ EXTRA_CMAKE_ARGUMENTS += -DWTF_CPU_ARM64_CORTEXA53=OFF 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