diff options
author | Carlos Alberto Lopez Perez <clopez@igalia.com> | 2017-07-13 14:49:54 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-17 14:01:39 +0100 |
commit | 993cef6bbe14a0b8cd223ec92247295fd58ffd46 (patch) | |
tree | f9b6890295093b1f6e2b5b7158f7250226c2fe0f /meta/recipes-sato/webkit | |
parent | a1d94933f2713479ec46d86372229bc14f8d7134 (diff) | |
download | poky-993cef6bbe14a0b8cd223ec92247295fd58ffd46.tar.gz |
webkitgtk: Upgrade to 2.16.5
Adjust some dependencies: libgcrypt is now required (instead of gnutls)
and the following build deps where missing: gettext-native, glib-2.0
and glib-2.0-native.
Also the CMake argument ENABLE_CREDENTIAL_STORAGE has been renamed to
USE_LIBSECRET.
This new upstream release (2.16.4 actually) includes security fixes for
CVE: CVE-2017-2538
(From OE-Core rev: ef68005a8c527e9b1d05b7769f0ec8ebe9ec3f91)
Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.16.5.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.16.3.bb) | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.16.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.16.5.bb index 5feca17be3..dcaf8a6ed7 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.16.3.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.16.5.bb | |||
@@ -22,19 +22,21 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
22 | file://gcc7.patch \ | 22 | file://gcc7.patch \ |
23 | file://detect-atomics-during-configure.patch \ | 23 | file://detect-atomics-during-configure.patch \ |
24 | " | 24 | " |
25 | SRC_URI[md5sum] = "34dbbcad8a87a929519d93c67edd6d87" | 25 | |
26 | SRC_URI[sha256sum] = "204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512" | 26 | SRC_URI[md5sum] = "fce72dc89cd310a663d9eb97133861fe" |
27 | SRC_URI[sha256sum] = "8e0396f3428e757898c5856e642eed4fcd5a20ae03d96d3eaa03b76634be7dd4" | ||
27 | 28 | ||
28 | inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc | 29 | inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc |
29 | 30 | ||
30 | # depends on libxt | 31 | # depends on libxt |
31 | REQUIRED_DISTRO_FEATURES = "x11" | 32 | REQUIRED_DISTRO_FEATURES = "x11" |
32 | 33 | ||
33 | DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ | 34 | DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ |
34 | gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ | 35 | gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ |
35 | pango icu bison-native gawk intltool-native libwebp \ | 36 | pango icu bison-native gawk intltool-native libwebp \ |
36 | atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ | 37 | atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ |
37 | ruby-native libnotify gstreamer1.0-plugins-bad \ | 38 | ruby-native libnotify gstreamer1.0-plugins-bad \ |
39 | gettext-native glib-2.0 glib-2.0-native \ | ||
38 | " | 40 | " |
39 | 41 | ||
40 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ | 42 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ |
@@ -51,7 +53,7 @@ PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_G | |||
51 | PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" | 53 | PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" |
52 | PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" | 54 | PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" |
53 | PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" | 55 | PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" |
54 | PACKAGECONFIG[libsecret] = "-DENABLE_CREDENTIAL_STORAGE=ON,-DENABLE_CREDENTIAL_STORAGE=OFF,libsecret" | 56 | PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" |
55 | PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" | 57 | PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" |
56 | 58 | ||
57 | EXTRA_OECMAKE = " \ | 59 | EXTRA_OECMAKE = " \ |