From: Peter Michael Green Date: Thu, 29 Mar 2018 14:59:30 +0000 (+0000) Subject: Manual merge of version 2.18.6-1+rpi1 and 2.20.0-2 to produce 2.20.0-2+rpi1 X-Git-Tag: archive/raspbian/2.20.0-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1c7053332bcbe49247ec85caeab80af75289ec9c;p=webkit2gtk.git Manual merge of version 2.18.6-1+rpi1 and 2.20.0-2 to produce 2.20.0-2+rpi1 --- 1c7053332bcbe49247ec85caeab80af75289ec9c diff --cc debian/changelog index ba89d7d43a,0d4a50bfed..c2c9fa3174 --- a/debian/changelog +++ b/debian/changelog @@@ -1,47 -1,120 +1,128 @@@ - webkit2gtk (2.18.6-1+rpi1) buster-staging; urgency=medium ++webkit2gtk (2.20.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 Thu, 01 Feb 2018 15:14:02 +0000 ++ -- Peter Michael Green Wed, 28 Mar 2018 22:44:14 +0000 + - webkit2gtk (2.18.6-1) unstable; urgency=high + webkit2gtk (2.20.0-2) unstable; urgency=medium - * New upstream release. - + This fixes CVE-2018-4088, CVE-2017-13885, CVE-2017-7165, - CVE-2017-13884, CVE-2017-7160, CVE-2017-7153, CVE-2017-7153, - CVE-2017-7161 and CVE-2018-4096. + * Upload to unstable (Closes: #889659, #888543). + * debian/gbp.conf: + + Update upstream branch name. + * debian/NEWS: + + Add news item about the Gigacage feature. - -- Alberto Garcia Wed, 24 Jan 2018 13:30:06 +0200 + -- Alberto Garcia Wed, 21 Mar 2018 14:31:13 +0200 - webkit2gtk (2.18.5-1) unstable; urgency=high + webkit2gtk (2.20.0-1) experimental; urgency=medium * New upstream release. - + This includes fixes to mitigate the effects of the Spectre - vulnerability (CVE-2017-5753 and CVE-2017-5715). + * debian/patches/fix-ftbfs-armel.patch: + + Detect missing __atomic_fetch_add_8() and rename patch to + fix-atomics-build.patch. + * debian/libwebkit2gtk-4.0-37.symbols: + + Update symbols. + * debian/copyright: + + Remove nonexistent files. + * debian/source/lintian-overrides: + + Update source-is-missing overrides. - -- Alberto Garcia Wed, 10 Jan 2018 14:23:33 +0200 + -- Alberto Garcia Mon, 12 Mar 2018 16:49:26 +0200 - webkit2gtk (2.18.4-1) unstable; urgency=high + webkit2gtk (2.19.92-1) experimental; urgency=medium [ Alberto Garcia ] - * New upstream release. - + This fixes CVE-2017-13866, CVE-2017-13870, CVE-2017-7156 and - CVE-2017-13856. + * New upstream development release. + * debian/rules: + + Don't redefine CFLAGS or LDFLAGS when calling cmake, and don't add + CPPFLAGS to CFLAGS/CXXFLAGS. Cmake already reads all those + environment variables. + * Build the documentation: + + debian/rules: + - Support the DEB_BUILD_OPTIONS "nodoc" tag and pass -DENABLE_GTKDOC + to CMake depending on whether it's set or not. + - Override the dh_install rule to make sure that a dummy doc + directory is present if "nodoc" is set. + + debian/control: + - Add build dependencies on libglib2.0-doc, libgtk-3-doc and + libsoup2.4-doc. + - Update Standards-Version to 4.1.3 (we now support "nodoc"). + + debian/libwebkit2gtk-4.0-doc.install: + - Install the generated documentation instead of the one provided by + upstream. + * debian/copyright: + + Update copyright years. + + [ Jeremy Bicha ] + * gstreamergl has moved to gstreamer base in 1.13 so update dependencies + * Fix Ubuntu useragent (LP: #1751484) + * Temporarily disable WOFF2 on Ubuntu, see bug 1742743 + + -- Alberto Garcia Wed, 07 Mar 2018 11:18:52 +0200 + + webkit2gtk (2.19.91-1) experimental; urgency=medium + + * New upstream development release. * Refresh all patches. - * debian/control: - + Request native version of the Ruby package (thanks, Helmut Grohne) - (Closes: #881637). - * Instead of passing -DUSE_GSTREAMER_GL=OFF explicitly, let CMake do it - if libgstreamer-plugins-bad1.0-dev is not installed. - + debian/patches/detect-gstreamer-gl.patch: - - Disable USE_GSTREAMER_GL if GStreamerGL is not found. + * debian/rules: + + Use -O1 in powerpc as well. + * debian/libwebkit2gtk-4.0-37.symbols: + + Update symbols. + + -- Alberto Garcia Wed, 21 Feb 2018 13:09:22 +0200 + + webkit2gtk (2.19.90-1) experimental; urgency=medium + + * New upstream development release. + * debian/rules: + + Use -O1 in sh3 and sh4 (thanks, John Paul Adrian Glaubitz). + * Refresh all patches. + + -- Alberto Garcia Mon, 05 Feb 2018 14:19:43 +0200 + + webkit2gtk (2.19.6-1) experimental; urgency=medium + + * New upstream development release. + * debian/libwebkit2gtk-4.0-37.symbols: + + Update symbols. + + -- Alberto Garcia Wed, 17 Jan 2018 15:55:19 +0200 + + webkit2gtk (2.19.5-1) experimental; urgency=medium + + * New upstream development release. + * debian/patches/fix-ftbfs-armel.patch: + + Refresh. + * debian/source/lintian-overrides: + + Update source-is-missing overrides. + + -- Alberto Garcia Wed, 10 Jan 2018 13:21:48 +0200 + + webkit2gtk (2.19.3-2) experimental; urgency=medium + + * WOFF2 is now available in Debian, so build webkit2gtk with it: + + debian/control: + - Add build dependency on libwoff-dev. + debian/rules: - - Remove the list of architectures that are not using GStreamerGL. - * debian/control: - + Don't require libgstreamer-plugins-bad1.0-dev in hppa, m68k, - powerpcspe, sh4 or x32. + - Remove -DUSE_WOFF2=OFF. + + debian/libwebkit2gtk-4.0-37.symbols: + - Add new symbols. + * Add new webkit2gtk-driver package containing the WebKitWebDriver + binary. + + debian/control: + - Add the entry for the new package. + + debian/webkit2gtk-driver.install: + - Install the WebKitWebDriver binary. + + debian/webkit2gtk-driver.manpages, debian/WebKitWebDriver.1: + - Add manpage. + + -- Alberto Garcia Thu, 04 Jan 2018 15:17:27 +0200 + + webkit2gtk (2.19.3-1) experimental; urgency=medium + + * New upstream development release (Closes: #882387). [ Jeremy Bicha ] * debian/control: Update Vcs-Git to point to correct branch. diff --cc debian/rules index 5aa51623ee,5372f625dd..a4c40a6dcd --- a/debian/rules +++ b/debian/rules @@@ -25,7 -25,12 +25,12 @@@ ifeq (,$(filter $(DEB_HOST_ARCH),amd64 CFLAGS := $(CFLAGS:-g=-g1) endif + # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81426 + ifneq (,$(filter $(DEB_HOST_ARCH),sh3 sh4 powerpc)) + CFLAGS := $(CFLAGS:-O2=-O1) + endif + -ifeq (,$(filter $(DEB_HOST_ARCH),i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 armhf arm64)) +ifeq (,$(filter $(DEB_HOST_ARCH),i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 arm64)) EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF endif