From: Peter Michael Green Date: Sun, 17 Nov 2019 09:05:54 +0000 (+0000) Subject: Manual merge of version 2.26.1-3~deb10u1+rpi1 and 2.26.2-1~deb10+1 to produce 2.26... X-Git-Tag: raspbian/2.26.2-1_deb10+1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=edf906b9192544e4115a1bd59c4e4286b260efab;p=webkit2gtk.git Manual merge of version 2.26.1-3~deb10u1+rpi1 and 2.26.2-1~deb10+1 to produce 2.26.2-1~deb10+1+rpi1 --- fc6698c543584cf8f5dd61e90ddf27d4d4432065 diff --cc debian/changelog index 85e143236e,9c75b457c8..a961c78c59 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,4 +1,12 @@@ - webkit2gtk (2.26.1-3~deb10u1+rpi1) buster-staging; urgency=medium ++webkit2gtk (2.26.2-1~deb10+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 Tue, 05 Nov 2019 19:28:53 +0000 ++ -- Peter Michael Green Sun, 17 Nov 2019 09:03:35 +0000 + - webkit2gtk (2.26.1-3~deb10u1) buster-security; urgency=high + webkit2gtk (2.26.2-1~deb10+1) buster-security; urgency=high * Rebuild for buster-security. * debian/patches/force-single-process.patch: diff --cc debian/rules index fff2beba24,62a4c6335c..dfc7332e2e --- a/debian/rules +++ b/debian/rules @@@ -34,16 -34,6 +34,11 @@@ ifneq (,$(filter $(DEB_HOST_ARCH),arm64 EXTRA_CMAKE_ARGUMENTS += -DWTF_CPU_ARM64_CORTEXA53=OFF endif - # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81426 - ifneq (,$(filter $(DEB_HOST_ARCH),armhf sh3 sh4 powerpc)) - CFLAGS := $(CFLAGS:-O2=-O1) - 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