From: Peter Michael Green Date: Sat, 22 Sep 2018 11:48:32 +0000 (+0000) Subject: Manual merge of version 2.20.5-1+rpi1 and 2.22.0-2 to produce 2.22.0-2+rpi1 X-Git-Tag: raspbian/2.22.0-2+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=89c4246b8dbeb762f34650cdd9e8a23e62eb9f68;p=webkit2gtk.git Manual merge of version 2.20.5-1+rpi1 and 2.22.0-2 to produce 2.22.0-2+rpi1 --- a38221d2d216a6f45857b7095ef6a75ac830a34d diff --cc debian/changelog index 1a6eea6830,676762fa16..cad0db83f2 --- a/debian/changelog +++ b/debian/changelog @@@ -1,26 -1,59 +1,67 @@@ - webkit2gtk (2.20.5-1+rpi1) buster-staging; urgency=medium ++webkit2gtk (2.22.0-2+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 Sat, 25 Aug 2018 15:24:03 +0000 ++ -- Raspbian forward porter Fri, 21 Sep 2018 01:38:20 +0000 + - webkit2gtk (2.20.5-1) unstable; urgency=medium + webkit2gtk (2.22.0-2) unstable; urgency=medium - * New upstream release. - * debian/patches/fix-ftbfs-m68k.patch: - + Update patch (Closes: #902100). + * Upload to unstable. + * debian/rules: + + Disable JIT on armel, it's currently broken. + * debian/gbp.conf: + + Update upstream branch name. + * debian/watch: + + Scan stable releases only. - -- Alberto Garcia Mon, 13 Aug 2018 10:52:34 +0300 + -- Alberto Garcia Fri, 14 Sep 2018 21:23:00 +0300 - webkit2gtk (2.20.4-1) unstable; urgency=high + webkit2gtk (2.22.0-1) experimental; urgency=medium * New upstream release. - + This fixes CVE-2018-4261, CVE-2018-4262, CVE-2018-4263, - CVE-2018-4264, CVE-2018-4265, CVE-2018-4266, CVE-2018-4267, - CVE-2018-4270, CVE-2018-4272, CVE-2018-4273, CVE-2018-4278, - CVE-2018-4284. + * Drop use-wtf-cpu-mips64.patch and refresh fix-ftbfs-x86.patch. + * debian/control: + + Update Standards-Version to 4.2.1 (no changes). + * debian/copyright: + + Remove nonexistent files. + * debian/patches/replace-stdmax.patch: + + Don't use std::max in RegisterState.h, this causes build failures + with some versions of libstdc++. + + -- Alberto Garcia Mon, 03 Sep 2018 15:51:37 +0300 + + webkit2gtk (2.21.92-1) experimental; urgency=medium + + * New upstream development release. + * debian/patches/use-wtf-cpu-mips64.patch: + + Don't use WTF_CPU_MIPS on mips64. This makes WebKit enable JIT, + which breaks the build. + * debian/libwebkit2gtk-4.0-37.symbols: + + Update symbols. + + -- Alberto Garcia Fri, 24 Aug 2018 18:37:29 +0300 + + webkit2gtk (2.21.91-2) experimental; urgency=medium + + * debian/rules: + + Pass --fail-missing to dh_missing. + * debian/libjavascriptcoregtk-4.0-dev.install: + + Install headers in usr/include/webkitgtk-4.0/jsc/ (Closes: #906519). + * Install the jsc-glib and webkitdomgtk documentation. + * debian/patches/detect-jit.patch: + + Fix detection of when to enable the JIT and USE_SYSTEM_MALLOC. + + -- Alberto Garcia Tue, 21 Aug 2018 10:47:19 +0300 + + webkit2gtk (2.21.91-1) experimental; urgency=medium + + * New upstream development release. + * debian/patches/fix-ftbfs-m68k.patch: + + Refresh. + * debian/patches/gtk-doc-build-fix.patch: + + Remove. * Don't use NEWS as an upstream changelog anymore (as required by Debian policy 4.2.0). * debian/control: diff --cc debian/rules index 2b83dd184b,2b531b89a6..b475576fdc --- a/debian/rules +++ b/debian/rules @@@ -28,7 -28,8 +28,8 @@@ ifneq (,$(filter $(DEB_HOST_ARCH),sh3 s CFLAGS := $(CFLAGS:-O2=-O1) endif - ifeq (,$(filter $(DEB_HOST_ARCH),i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 arm64)) + # https://bugs.webkit.org/show_bug.cgi?id=188862 -ifneq (,$(filter $(DEB_HOST_ARCH),armel)) ++ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf)) EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF endif