Skip to contentSkip to conversation

Recipe updates and version check fixes

PATCH In review Alexander Kanavin 4 participants 33 messages Oct 19, 2016 – Oct 24, 2016

lore
Share & tools
lore

Alexander Kanavin

author
#0 lore raw

cover Recipe updates and version check fixes

This is a bunch of assorted version updates, and upstream check fixes. I have also re-enabled gobject introspection on musl (seems to work now). Some version updates are held off by the need to update glib/gtk first, or are more involved (openssl), they will come later.

The following changes since commit 9c04beb9adf5ed05b4fe89322bfa4dd60296de2b:

ref-manual: Removed RM_OLD_IMAGE variable description. (2016-10-19 12:56:33 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib akanavin/package-version-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates

Alexander Kanavin (19):
musl: enable gobject introspection
mklibs-native: fix upstream version check
cve-check-tool: fix upstream version check
pigz: fix upstream version check
boost: update to 1.62.0
btrfs-tools: update to 4.8.1
cmake: update to 3.6.2
dtc: update to 1.4.2
ffmpeg: update to 3.1.4
gnome-desktop3: update to 3.22.1
gnutls: update to 3.5.5
libksba: update to 1.3.5
lighttpd: update to 1.4.42
mpg123: update to 1.23.8
nspr: update to 4.13
nss: update to 3.27.1
vala: update to 0.34.1
webkitgtk: update to 2.14.1
epiphany: update to 3.22.1

 meta/conf/distro/include/tclibc-musl.inc           |   4 -
 .../btrfs-tools/btrfs-tools/fix-parallel.patch     |  32 ---
 .../{btrfs-tools_4.7.1.bb => btrfs-tools_4.8.1.bb} |   3 +-
 ...cmake-native_3.6.1.bb => cmake-native_3.6.2.bb} |   0
 meta/recipes-devtools/cmake/cmake.inc              |   4 +-
 .../cmake/{cmake_3.6.1.bb => cmake_3.6.2.bb}       |   0
 .../cve-check-tool/cve-check-tool_5.6.4.bb         |   2 +
 .../mklibs/mklibs-native_0.1.41.bb                 |   2 +
 meta/recipes-devtools/vala/vala.inc                |   2 +-
 .../vala/{vala_0.32.1.bb => vala_0.34.1.bb}        |   4 +-
 .../{lighttpd_1.4.41.bb => lighttpd_1.4.42.bb}     |   4 +-
 meta/recipes-extended/pigz/pigz.inc                |   2 -
 meta/recipes-extended/pigz/pigz_2.3.3.bb           |   2 +-
 .../{epiphany_3.20.3.bb => epiphany_3.22.1.bb}     |   6 +-
 ...desktop3_3.20.2.bb => gnome-desktop3_3.22.1.bb} |   4 +-
 .../dtc/{dtc_git.bb => dtc_1.4.2.bb}               |   3 +-
 .../ffmpeg/{ffmpeg_3.1.3.bb => ffmpeg_3.1.4.bb}    |   4 +-
 .../mpg123/{mpg123_1.23.6.bb => mpg123_1.23.8.bb}  |   4 +-
 ...bKitMacros-Append-to-I-and-not-to-isystem.patch | 272 +++++++++------------
 .../{webkitgtk_2.12.5.bb => webkitgtk_2.14.1.bb}   |  26 +-
 ...bjam-native_1.61.0.bb => bjam-native_1.62.0.bb} |   0
 .../boost/{boost-1.61.0.inc => boost-1.62.0.inc}   |   4 +-
 ...ips-assembly-doesn-t-compile-in-mips16e-m.patch |  60 -----
 .../boost/{boost_1.61.0.bb => boost_1.62.0.bb}     |   1 -
 ...001-Use-correct-include-dir-with-minitasn.patch |  31 ---
 .../gnutls/gnutls/CVE-2016-7444.patch              |  35 ---
 meta/recipes-support/gnutls/gnutls_3.5.3.bb        |  13 -
 meta/recipes-support/gnutls/gnutls_3.5.5.bb        |   9 +
 .../libksba/{libksba_1.3.4.bb => libksba_1.3.5.bb} |   4 +-
 .../nspr/{nspr_4.12.bb => nspr_4.13.bb}            |   4 +-
 .../recipes-support/nss/nss/pqg.c-ULL_addend.patch |   8 +-
 .../nss/{nss_3.25.bb => nss_3.27.1.bb}             |   6 +-
 32 files changed, 173 insertions(+), 382 deletions(-)
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.7.1.bb => btrfs-tools_4.8.1.bb} (91%)
 rename meta/recipes-devtools/cmake/{cmake-native_3.6.1.bb => cmake-native_3.6.2.bb} (100%)
 rename meta/recipes-devtools/cmake/{cmake_3.6.1.bb => cmake_3.6.2.bb} (100%)
 rename meta/recipes-devtools/vala/{vala_0.32.1.bb => vala_0.34.1.bb} (56%)
 rename meta/recipes-extended/lighttpd/{lighttpd_1.4.41.bb => lighttpd_1.4.42.bb} (94%)
 rename meta/recipes-gnome/epiphany/{epiphany_3.20.3.bb => epiphany_3.22.1.bb} (77%)
 rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.20.2.bb => gnome-desktop3_3.22.1.bb} (83%)
 rename meta/recipes-kernel/dtc/{dtc_git.bb => dtc_1.4.2.bb} (75%)
 rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.1.3.bb => ffmpeg_3.1.4.bb} (97%)
 rename meta/recipes-multimedia/mpg123/{mpg123_1.23.6.bb => mpg123_1.23.8.bb} (95%)
 rename meta/recipes-sato/webkit/{webkitgtk_2.12.5.bb => webkitgtk_2.14.1.bb} (85%)
 rename meta/recipes-support/boost/{bjam-native_1.61.0.bb => bjam-native_1.62.0.bb} (100%)
 rename meta/recipes-support/boost/{boost-1.61.0.inc => boost-1.62.0.inc} (83%)
 delete mode 100644 meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch
 rename meta/recipes-support/boost/{boost_1.61.0.bb => boost_1.62.0.bb} (85%)
 delete mode 100644 meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch
 delete mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2016-7444.patch
 delete mode 100644 meta/recipes-support/gnutls/gnutls_3.5.3.bb
 create mode 100644 meta/recipes-support/gnutls/gnutls_3.5.5.bb
 rename meta/recipes-support/libksba/{libksba_1.3.4.bb => libksba_1.3.5.bb} (86%)
 rename meta/recipes-support/nspr/{nspr_4.12.bb => nspr_4.13.bb} (96%)
 rename meta/recipes-support/nss/{nss_3.25.bb => nss_3.27.1.bb} (97%)
Signature · 1 line
2.9.3
author
#1 lore raw

PATCH 1/19 musl: enable gobject introspection

It's working with recent versions of musl, so there's no reason to keep it disabled.

Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/conf/distro/include/tclibc-musl.inc | 4 ----
 1 file changed, 4 deletions(-)
meta/conf/distro/include/tclibc-musl.inc +0 -4
index e6b10f9..1ddd58e 100644
@@ -25,7 +25,3 @@ LIBC_DEPENDENCIES = "\
     musl-dbg \
     musl-dev \
     "
-
-# GLib binaries trigger assertion failures and crash under qemu
-# when musl is in use
-DISTRO_FEATURES_BACKFILL_CONSIDERED += "gobject-introspection-data"
Signature · 1 line
2.9.3
author
#2 lore raw

PATCH 2/19 mklibs-native: fix upstream version check

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-devtools/mklibs/mklibs-native_0.1.41.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-devtools/mklibs/mklibs-native_0.1.41.bb +2 -0
index b3c1b5b..4cf1a5c 100644
@@ -18,4 +18,6 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160207T221625Z/pool/main/
 SRC_URI[md5sum] = "6b2979876a611717df3d49e7f9cf291d"
 SRC_URI[sha256sum] = "058c7349f8ec8a03b529c546a95cd6426741bd819f1e1211f499273eb4bf5d89"
 
+UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/m/mklibs/"
+
 inherit autotools gettext native pythonnative
Signature · 1 line
2.9.3
author
#3 lore raw

PATCH 3/19 cve-check-tool: fix upstream version check

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-devtools/cve-check-tool/cve-check-tool_5.6.4.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-devtools/cve-check-tool/cve-check-tool_5.6.4.bb +2 -0
index 1baadea..6e35421 100644
@@ -14,6 +14,8 @@ SRC_URI = "https://github.com/ikeydoherty/${BPN}/releases/download/v${PV}/${BP}.
 SRC_URI[md5sum] = "c5f4247140fc9be3bf41491d31a34155"
 SRC_URI[sha256sum] = "b8f283be718af8d31232ac1bfc10a0378fb958aaaa49af39168f8acf501e6a5b"
 
+UPSTREAM_CHECK_URI = "https://github.com/ikeydoherty/cve-check-tool/releases"
+
 DEPENDS = "libcheck glib-2.0 json-glib curl libxml2 sqlite3 openssl ca-certificates"
 
 RDEPENDS_${PN} = "ca-certificates"
Signature · 1 line
2.9.3
author
#4 lore raw

PATCH 4/19 pigz: fix upstream version check

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-extended/pigz/pigz.inc      | 2 --
 meta/recipes-extended/pigz/pigz_2.3.3.bb | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
meta/recipes-extended/pigz/pigz.inc +0 -2
index 86f434c..978f905 100644
@@ -7,8 +7,6 @@ HOMEPAGE = "http://zlib.net/pigz/"
 SECTION = "console/utils"
 LICENSE = "Zlib & Apache-2.0"
 
-SRC_URI = "http://zlib.net/${BPN}/${BP}.tar.gz"
-
 PROVIDES_class-native += "gzip-native"
 
 DEPENDS = "zlib"
meta/recipes-extended/pigz/pigz_2.3.3.bb +1 -1
index 9e97273..b4fe831 100644
@@ -1,7 +1,7 @@
 require pigz.inc
 LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95"
 
-UPSTREAM_CHECK_URI := "${SRC_URI}"
+UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/"
 SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.gz"
 SRC_URI += "file://link-order.patch"
Signature · 1 line
2.9.3
author
#5 lore raw

PATCH 5/19 boost: update to 1.62.0

In reply to Alexander Kanavin

Remove backported 0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch

Signed-off-by Alexander Kanavin <[email protected]>
---
 ...bjam-native_1.61.0.bb => bjam-native_1.62.0.bb} |  0
 .../boost/{boost-1.61.0.inc => boost-1.62.0.inc}   |  4 +-
 ...ips-assembly-doesn-t-compile-in-mips16e-m.patch | 60 ----------------------
 .../boost/{boost_1.61.0.bb => boost_1.62.0.bb}     |  1 -
 4 files changed, 2 insertions(+), 63 deletions(-)
 rename meta/recipes-support/boost/{bjam-native_1.61.0.bb => bjam-native_1.62.0.bb} (100%)
 rename meta/recipes-support/boost/{boost-1.61.0.inc => boost-1.62.0.inc} (83%)
 delete mode 100644 meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch
 rename meta/recipes-support/boost/{boost_1.61.0.bb => boost_1.62.0.bb} (85%)
meta/recipes-support/boost/bjam-native_1.62.0.bb renamed from meta/recipes-support/boost/bjam-native_1.61.0.bb +0 -0
similarity index 100%
rename from meta/recipes-support/boost/bjam-native_1.61.0.bb
rename to meta/recipes-support/boost/bjam-native_1.62.0.bb
meta/recipes-support/boost/boost-1.62.0.inc renamed from meta/recipes-support/boost/boost-1.61.0.inc +2 -2
similarity index 83%
rename from meta/recipes-support/boost/boost-1.61.0.inc
rename to meta/recipes-support/boost/boost-1.62.0.inc
index cd9d8a4..a097ea1 100644
@@ -13,7 +13,7 @@ BOOST_P = "boost_${BOOST_VER}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
 
-SRC_URI[md5sum] = "6095876341956f65f9d35939ccea1a9f"
-SRC_URI[sha256sum] = "a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640"
+SRC_URI[md5sum] = "7ef085456c48c49a7fe8237f07e5f674"
+SRC_URI[sha256sum] = "bce80293052e2d6230f1bec9b7524b33412e4fb26e9723460a0f362ac15b7acb"
 
 S = "${WORKDIR}/${BOOST_P}"
meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch deleted +0 -60

60 lines not on this page · raw message

meta/recipes-support/boost/boost_1.62.0.bb renamed from meta/recipes-support/boost/boost_1.61.0.bb +0 -1
similarity index 85%
rename from meta/recipes-support/boost/boost_1.61.0.bb
rename to meta/recipes-support/boost/boost_1.62.0.bb
index 40e3870..120d129 100644
@@ -7,7 +7,6 @@ SRC_URI += "\
     file://boost-CVE-2012-2677.patch \
     file://0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch \
     file://0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch \
-    file://0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch \
     file://0004-Use-atomic-by-default-when-BOOST_NO_CXX11_HDR_ATOMIC.patch \
     file://boost-math-disable-pch-for-gcc.patch \
 "
Signature · 1 line
2.9.3
author
#6 lore raw

PATCH 6/19 btrfs-tools: update to 4.8.1

In reply to Alexander Kanavin

Remove fix-parallel.patch as version.h is now generated by autoconf in configure()

Signed-off-by Alexander Kanavin <[email protected]>
---
 .../btrfs-tools/btrfs-tools/fix-parallel.patch     | 32 ----------------------
 .../{btrfs-tools_4.7.1.bb => btrfs-tools_4.8.1.bb} |  3 +-
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.7.1.bb => btrfs-tools_4.8.1.bb} (91%)
meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch deleted +0 -32
deleted file mode 100644
index bbc53c6..0000000
@@ -1,32 +0,0 @@
-From 373eb51328b5e10529763cad441210e6b0efb24e Mon Sep 17 00:00:00 2001
-From: Robert Yang <[email protected]>
-Date: Wed, 11 Feb 2015 22:08:41 -0800
-Subject: [PATCH] Makefile: fix for parallel build
-
-Fixed:
-mkfs.c:300:46: error: 'BTRFS_BUILD_VERSION' undeclared (first use in this function)
-  fprintf(stderr, "mkfs.btrfs, part of %s\n", BTRFS_BUILD_VERSION);
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <[email protected]>
----
- Makefile.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 860a390..8a6fbd7 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -142,7 +142,7 @@ else
- 	check_echo = true
- endif
- 
--%.o.d: %.c
-+%.o.d: %.c version.h
- 	$(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o) -MT $@ $(CFLAGS) $<
- 
- .c.o:
--- 
-1.7.9.5
-
meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.7.1.bb +1 -2
similarity index 91%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.7.1.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.1.bb
index becf093..b06fd4a 100644
@@ -13,9 +13,8 @@ SECTION = "base"
 DEPENDS = "util-linux attr e2fsprogs lzo acl"
 RDEPENDS_${PN} = "libgcc"
 
-SRCREV = "6819fbcdcab63c2d95da1a2997e37be9a71ca533"
+SRCREV = "d8d0a60406b14b140e83a8c0d5eaedb5dca44092"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
-           file://fix-parallel.patch \
 "
 
 inherit autotools-brokensep pkgconfig
Signature · 1 line
2.9.3
#7 lore raw

Re: [PATCH 06/19] btrfs-tools: update to 4.8.1

Quoted 3 lines · Alexander Kanavin

Remove fix-parallel.patch as version.h is now generated by autoconf in configure()

Doing a rebuild from clean (actually to test the man page patch) resulted in this:

packages/corei7-64-poky-linux/btrfs-tools/btrfs-tools: FILELIST: removed "/lib/udev/rules.d/64-btrfs-dm.rules"

Presumably there's an implicit dependency on udev.

Ross

author
#8 lore raw

Re: [PATCH 06/19] btrfs-tools: update to 4.8.1

Quoted 11 lines · Ross

Remove fix-parallel.patch as version.h is now generated by autoconf in configure()

Doing a rebuild from clean (actually to test the man page patch) resulted in this:

packages/corei7-64-poky-linux/btrfs-tools/btrfs-tools: FILELIST: removed "/lib/udev/rules.d/64-btrfs-dm.rules"

Presumably there's an implicit dependency on udev.

Yep, there's a floating dependency to install the rule (or not). I added it to the recipe.

Alex

author
#9 lore raw

PATCH 7/19 cmake: update to 3.6.2

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 .../cmake/{cmake-native_3.6.1.bb => cmake-native_3.6.2.bb}            | 0
 meta/recipes-devtools/cmake/cmake.inc                                 | 4 ++--
 meta/recipes-devtools/cmake/{cmake_3.6.1.bb => cmake_3.6.2.bb}        | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/cmake/{cmake-native_3.6.1.bb => cmake-native_3.6.2.bb} (100%)
 rename meta/recipes-devtools/cmake/{cmake_3.6.1.bb => cmake_3.6.2.bb} (100%)
meta/recipes-devtools/cmake/cmake-native_3.6.2.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.6.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.6.1.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.6.2.bb
meta/recipes-devtools/cmake/cmake.inc +2 -2
index 4fcb0b1..961d33c 100644
@@ -16,8 +16,8 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
            file://qt4-fail-silent.patch \
            "
 
-SRC_URI[md5sum] = "d6dd661380adacdb12f41b926ec99545"
-SRC_URI[sha256sum] = "28ee98ec40427d41a45673847db7a905b59ce9243bb866eaf59dce0f58aaef11"
+SRC_URI[md5sum] = "139d7affdd4e8ab1edfc9f4322d69e43"
+SRC_URI[sha256sum] = "189ae32a6ac398bb2f523ae77f70d463a6549926cde1544cd9cc7c6609f8b346"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/cmake/cmake_3.6.2.bb renamed from meta/recipes-devtools/cmake/cmake_3.6.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.6.1.bb
rename to meta/recipes-devtools/cmake/cmake_3.6.2.bb
Signature · 1 line
2.9.3
author
#10 lore raw

PATCH 8/19 dtc: update to 1.4.2

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-kernel/dtc/{dtc_git.bb => dtc_1.4.2.bb} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-kernel/dtc/{dtc_git.bb => dtc_1.4.2.bb} (75%)
meta/recipes-kernel/dtc/dtc_1.4.2.bb renamed from meta/recipes-kernel/dtc/dtc_git.bb +1 -2
similarity index 75%
rename from meta/recipes-kernel/dtc/dtc_git.bb
rename to meta/recipes-kernel/dtc/dtc_1.4.2.bb
index 4446142..cc72adc 100644
@@ -3,8 +3,7 @@ require dtc.inc
 LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
 		    file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"
 
-SRCREV = "302fca9f4c283e1994cf0a5a9ce1cf43ca15e6d2"
-PV = "1.4.1+git${SRCPV}"
+SRCREV = "ec02b34c05be04f249ffaaca4b666f5246877dea"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.9.3
author
#11 lore raw

PATCH 9/19 ffmpeg: update to 3.1.4

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-multimedia/ffmpeg/{ffmpeg_3.1.3.bb => ffmpeg_3.1.4.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.1.3.bb => ffmpeg_3.1.4.bb} (97%)
meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.4.bb renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.3.bb +2 -2
similarity index 97%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.3.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.4.bb
index 050f1ee..06e7a306 100644
@@ -16,8 +16,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
            file://mips64_cpu_detection.patch \
           "
-SRC_URI[md5sum] = "72769316a4b2b8809c7f6d5a8b6766f4"
-SRC_URI[sha256sum] = "f8575c071e2a64437aeb70c8c030b385cddbe0b5cde20c9b18a6def840128822"
+SRC_URI[md5sum] = "b54d3e3d2d14d64305b840bb3d287445"
+SRC_URI[sha256sum] = "a80cb378dda5c9bbcdbd62a99bdec0e4eedbcb47f290e72845af4855c1146b5b"
 
 # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
 ARM_INSTRUCTION_SET = "arm"
Signature · 1 line
2.9.3
author
#12 lore raw

PATCH 10/19 gnome-desktop3: update to 3.22.1

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 .../{gnome-desktop3_3.20.2.bb => gnome-desktop3_3.22.1.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.20.2.bb => gnome-desktop3_3.22.1.bb} (83%)
meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.22.1.bb renamed from meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.20.2.bb +2 -2
similarity index 83%
rename from meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.20.2.bb
rename to meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.22.1.bb
index eb061b2..867376e 100644
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 BPN = "gnome-desktop"
 
 inherit gnome pkgconfig upstream-version-is-even gobject-introspection
-SRC_URI[archive.md5sum] = "8354ed38624f5eb6b5d34267b658a9c9"
-SRC_URI[archive.sha256sum] = "492c2da7aa8c3a8b65796e8171fc8f0dfb5d322dd2799c0d76392e1fb061e2b2"
+SRC_URI[archive.md5sum] = "bc09d58d7870d6464f20803850cdb90f"
+SRC_URI[archive.sha256sum] = "6458add4fc3a81fbd9a63db90de22a1e3a62644c1bfd1aca042c43836195aab2"
 
 DEPENDS += "intltool-native gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes"
Signature · 1 line
2.9.3
#13 lore raw

Re: [PATCH 10/19] gnome-desktop3: update to 3.22.1

Quoted 3 lines · Alexander Kanavin

.../{gnome-desktop3_3.20.2.bb => gnome-desktop3_3.22.1.bb} |
4 ++--

* FILELIST: removed "/usr/lib/libgnome-desktop-3.so.12.1.0
/usr/share/libgnome-desktop-3.0/pnp.ids" added "/usr/lib/libgnome-desktop-3.so.12.2.0" packages/corei7-64-poky-linux/gnome-desktop3/libgnome-desktop3: RDEPENDS:
removed "libxrandr (['>= 1.5.0'])" added "libudev (['>= 230+git0+3a74d4fc90']) libcap (['>= 2.25'])"

Can you verify the build and runtime dependencies? If it isn't shipping its own pnp.ids do we need to depend on a data package to ensure they're present?

Ross

author
#14 lore raw

Re: [PATCH 10/19] gnome-desktop3: update to 3.22.1

Quoted 11 lines · Ross

* FILELIST: removed "/usr/lib/libgnome-desktop-3.so.12.1.0
/usr/share/libgnome-desktop-3.0/pnp.ids" added "/usr/lib/libgnome-desktop-3.so.12.2.0" packages/corei7-64-poky-linux/gnome-desktop3/libgnome-desktop3:
RDEPENDS: removed "libxrandr (['>= 1.5.0'])" added "libudev (['>= 230+git0+3a74d4fc90']) libcap (['>= 2.25'])"

Can you verify the build and runtime dependencies? If it isn't shipping its own pnp.ids do we need to depend on a data package to ensure they're present?

Found it and updated dependencies accordingly:

commit b8cbfbe06475703f333367976eae9477f229891a

Author: Bastien Nocera <[email protected]>
Date:   Wed May 20 13:07:49 2015 +0200

pnp-ids: Use udev's hwdb to query PNP IDs

hwdb has its own database which it compiles to binary, so that:
1) initialisation is practically free
See
https://git.gnome.org/browse/gnome-settings-daemon/commit/gnome-settings-daemon/gnome-settings-manager.c?id=d8c158e74caea048dea5a38232bd87c1c7a78a70
2) lookups are also quick, as they use a binary DB
3) we don't have to maintain our own copy of the database
4) allows model lookup rather than simply vendor lookup, when the database contains that information

The only problem being that non-Linux OSes will need reimplement this section of the code. This will be on top of the usual downstream
patches
they ship for a number of components.

https://bugzilla.gnome.org/show_bug.cgi?id=590059

M       configure.ac
M       libgnome-desktop/Makefile.am
M       libgnome-desktop/gnome-pnp-ids.c
D       libgnome-desktop/pnp.ids
M       libgnome-desktop/test-pnp-ids.c

Alex

author
#15 lore raw

PATCH 11/19 gnutls: update to 3.5.5

In reply to Alexander Kanavin

Remove backported 0001-Use-correct-include-dir-with-minitasn.patch and CVE-2016-7444.patch (which still applied silently and incorrectly:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450).

Signed-off-by Alexander Kanavin <[email protected]>
---
 ...001-Use-correct-include-dir-with-minitasn.patch | 31 -------------------
 .../gnutls/gnutls/CVE-2016-7444.patch              | 35 ----------------------
 meta/recipes-support/gnutls/gnutls_3.5.3.bb        | 13 --------
 meta/recipes-support/gnutls/gnutls_3.5.5.bb        |  9 ++++++
 4 files changed, 9 insertions(+), 79 deletions(-)
 delete mode 100644 meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch
 delete mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2016-7444.patch
 delete mode 100644 meta/recipes-support/gnutls/gnutls_3.5.3.bb
 create mode 100644 meta/recipes-support/gnutls/gnutls_3.5.5.bb
meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch deleted +0 -31
deleted file mode 100644
index d7dd7cf..0000000
@@ -1,31 +0,0 @@
-From 2651b08477f42dd7a05ea7d6df410fb2c46de4fb Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <[email protected]>
-Date: Wed, 31 Aug 2016 11:04:06 +0300
-Subject: [PATCH] Use correct include dir with minitasn
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows compiling certtool-cfg without libtasn headers.
-
-Upstream-Status: Submitted [https://gitlab.com/gnutls/gnutls/merge_requests/54]
-Signed-off-by: Jussi Kukkonen <[email protected]>
----
- src/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 182f3a5..cf65388 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -146,6 +146,7 @@ libcmd_cli_debug_la_SOURCES = cli-debug-args.def cli-debug-args.c cli-debug-args
- COMMON_LIBS = $(LIBOPTS) $(LTLIBINTL)
- if ENABLE_MINITASN1
- COMMON_LIBS += ../lib/minitasn1/libminitasn1.la ../gl/libgnu.la 
-+AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1
- else
- COMMON_LIBS += $(LIBTASN1_LIBS)
- endif
--- 
-2.9.3
-
meta/recipes-support/gnutls/gnutls/CVE-2016-7444.patch deleted +0 -35
deleted file mode 100644
index 215be5a..0000000
@@ -1,35 +0,0 @@
-CVE: CVE-2016-7444
-Upstream-Status: Backport
-Signed-off-by: Jussi Kukkonen <[email protected]>
-
-Upstream commit follows:
-
-
-From 964632f37dfdfb914ebc5e49db4fa29af35b1de9 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <[email protected]>
-Date: Sat, 27 Aug 2016 17:00:22 +0200
-Subject: [PATCH] ocsp: corrected the comparison of the serial size in OCSP response
-
-Previously the OCSP certificate check wouldn't verify the serial length
-and could succeed in cases it shouldn't.
-
-Reported by Stefan Buehler.
----
- lib/x509/ocsp.c | 1 +
- 1 file changed, 1 insertion(+), 0 deletions(-)
-
-diff --git a/lib/x509/ocsp.c b/lib/x509/ocsp.c
-index 92db9b6..8181f2e 100644
---- a/lib/x509/ocsp.c
-+++ b/lib/x509/ocsp.c
-@@ -1318,6 +1318,7 @@ gnutls_ocsp_resp_check_crt(gnutls_ocsp_resp_t resp,
- 		gnutls_assert();
- 		goto cleanup;
- 	}
-+	cserial.size = t;
- 
- 	if (rserial.size != cserial.size
- 	    || memcmp(cserial.data, rserial.data, rserial.size) != 0) {
---
-libgit2 0.24.0
-
meta/recipes-support/gnutls/gnutls_3.5.3.bb deleted +0 -13
deleted file mode 100644
index b2dbb07..0000000
@@ -1,13 +0,0 @@
-require gnutls.inc
-
-SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
-            file://0001-configure.ac-fix-sed-command.patch \
-            file://use-pkg-config-to-locate-zlib.patch \
-            file://0001-Use-correct-include-dir-with-minitasn.patch \
-            file://CVE-2016-7444.patch \
-           "
-SRC_URI[md5sum] = "6c2c7f40ddf52933ee3ca474cb8cb63c"
-SRC_URI[sha256sum] = "92c4bc999a10a1b95299ebefaeea8333f19d8a98d957a35b5eae74881bdb1fef"
-
-# x86 .text relocations should be fixed from 3.5.5 onwards
-INSANE_SKIP_${PN}_append_x86 = " textrel"
meta/recipes-support/gnutls/gnutls_3.5.5.bb new file +9 -0
new file mode 100644
index 0000000..d255959
@@ -0,0 +1,9 @@
+require gnutls.inc
+
+SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
+            file://0001-configure.ac-fix-sed-command.patch \
+            file://use-pkg-config-to-locate-zlib.patch \
+           "
+SRC_URI[md5sum] = "fb84c4d7922c1545da8dda4dcb9487d4"
+SRC_URI[sha256sum] = "86994fe7804ee16d2811e366b9bf2f75304f8e470ae0e3716d60ffeedac0e529"
+
Signature · 1 line
2.9.3
author
#16 lore raw

PATCH 12/19 libksba: update to 1.3.5

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-support/libksba/{libksba_1.3.4.bb => libksba_1.3.5.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libksba/{libksba_1.3.4.bb => libksba_1.3.5.bb} (86%)
meta/recipes-support/libksba/libksba_1.3.5.bb renamed from meta/recipes-support/libksba/libksba_1.3.4.bb +2 -2
similarity index 86%
rename from meta/recipes-support/libksba/libksba_1.3.4.bb
rename to meta/recipes-support/libksba/libksba_1.3.5.bb
index e68255c..36b6670 100644
@@ -17,8 +17,8 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://ksba-add-pkgconfig-support.patch"
 
-SRC_URI[md5sum] = "2bfc3d69053db7b6983b5627706033f4"
-SRC_URI[sha256sum] = "f6c2883cebec5608692d8730843d87f237c0964d923bbe7aa89c05f20558ad4f"
+SRC_URI[md5sum] = "8302a3e263a7c630aa7dea7d341f07a2"
+SRC_URI[sha256sum] = "41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340"
 
 do_configure_prepend () {
 	# Else these could be used in preference to those in aclocal-copy
Signature · 1 line
2.9.3
author
#17 lore raw

PATCH 13/19 lighttpd: update to 1.4.42

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 .../lighttpd/{lighttpd_1.4.41.bb => lighttpd_1.4.42.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/lighttpd/{lighttpd_1.4.41.bb => lighttpd_1.4.42.bb} (94%)
meta/recipes-extended/lighttpd/lighttpd_1.4.42.bb renamed from meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb +2 -2
similarity index 94%
rename from meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb
rename to meta/recipes-extended/lighttpd/lighttpd_1.4.42.bb
index 1a3f323..43856ca 100644
@@ -23,8 +23,8 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
         file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
         "
 
-SRC_URI[md5sum] = "1df2e4dbc965cfe6f99f008ac3db4d8d"
-SRC_URI[sha256sum] = "4bcc383ef6d6dc7b284f68882d71a178e2986c83c4e85eeb3c8f3b882e346b6c"
+SRC_URI[md5sum] = "53c55d7e1dac7adec161cd5490491f6d"
+SRC_URI[sha256sum] = "b2c9069ed0bade9362c27b469a9b884641786aea1c3d686f9fd9f01d15e2a15f"
 
 PACKAGECONFIG ??= "openssl \
     ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
Signature · 1 line
2.9.3
author
#18 lore raw

PATCH 14/19 mpg123: update to 1.23.8

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-multimedia/mpg123/{mpg123_1.23.6.bb => mpg123_1.23.8.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/mpg123/{mpg123_1.23.6.bb => mpg123_1.23.8.bb} (95%)
meta/recipes-multimedia/mpg123/mpg123_1.23.8.bb renamed from meta/recipes-multimedia/mpg123/mpg123_1.23.6.bb +2 -2
similarity index 95%
rename from meta/recipes-multimedia/mpg123/mpg123_1.23.6.bb
rename to meta/recipes-multimedia/mpg123/mpg123_1.23.8.bb
index 6ee457d..f4c5c7c 100644
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3"
 
 SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2"
 
-SRC_URI[md5sum] = "ed22a3e664f076fa05131a3454ef8166"
-SRC_URI[sha256sum] = "4073d9c60a43872f6f5a3a322f5ea21ab7f0869d2ed25e79c3eb8521fa3c32d4"
+SRC_URI[md5sum] = "4dde045123a2ad1e385a0a82c0ef9268"
+SRC_URI[sha256sum] = "de2303c8ecb65593e39815c0a2f2f2d91f708c43b85a55fdd1934c82e677cf8e"
 
 inherit autotools pkgconfig
Signature · 1 line
2.9.3
author
#19 lore raw

PATCH 15/19 nspr: update to 4.13

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-support/nspr/{nspr_4.12.bb => nspr_4.13.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/nspr/{nspr_4.12.bb => nspr_4.13.bb} (96%)
meta/recipes-support/nspr/nspr_4.13.bb renamed from meta/recipes-support/nspr/nspr_4.12.bb +2 -2
similarity index 96%
rename from meta/recipes-support/nspr/nspr_4.12.bb
rename to meta/recipes-support/nspr/nspr_4.13.bb
index fa6d523..c616035 100644
@@ -21,8 +21,8 @@ CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE
 UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/"
 UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"
 
-SRC_URI[md5sum] = "0de760c1e00a92e180e611cf06ce9589"
-SRC_URI[sha256sum] = "e0b10a1e569153668ff8bdea6c7e491b389fab69c2f18285a1ebf7c2ea4269de"
+SRC_URI[md5sum] = "74ef1def8a9ff311e32e7648e2c5c8ce"
+SRC_URI[sha256sum] = "19c33334bb3fa6d24800ffa65d7d806c54ad5f8c3758a5c11352ad43212ab181"
 
 S = "${WORKDIR}/nspr-${PV}/nspr"
Signature · 1 line
2.9.3
author
#20 lore raw

PATCH 16/19 nss: update to 3.27.1

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch     | 8 ++++----
 meta/recipes-support/nss/{nss_3.25.bb => nss_3.27.1.bb} | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename meta/recipes-support/nss/{nss_3.25.bb => nss_3.27.1.bb} (97%)
meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch +4 -4
index 9caaaeb..9942bf19 100644
@@ -13,11 +13,11 @@ Index: nss-3.24/nss/lib/freebl/pqg.c
 @@ -322,8 +322,8 @@ generate_h_candidate(SECItem *hit, mp_in
  
  static SECStatus
- addToSeed(const SECItem * seed,
--          unsigned long   addend,
--          int             seedlen, /* g in 186-1 */
+ addToSeed(const SECItem *seed,
+-          unsigned long addend,
+-          int seedlen, /* g in 186-1 */
 +          unsigned long long  addend,
 +          int                 seedlen, /* g in 186-1 */
-           SECItem * seedout)
+           SECItem *seedout)
  {
      mp_int s, sum, modulus, tmp;
meta/recipes-support/nss/nss_3.27.1.bb renamed from meta/recipes-support/nss/nss_3.25.bb +3 -3
similarity index 97%
rename from meta/recipes-support/nss/nss_3.25.bb
rename to meta/recipes-support/nss/nss_3.27.1.bb
index eff09eb..0917938 100644
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
                     file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132"
 
 SRC_URI = "\
-    http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_25_RTM/src/${BP}.tar.gz \
+    http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_27_1_RTM/src/${BP}.tar.gz \
     file://nss-fix-support-cross-compiling.patch \
     file://nss-no-rpath-for-cross-compiling.patch \
     file://nss-fix-incorrect-shebang-of-perl.patch \

@@ -25,8 +25,8 @@ SRC_URI = "\
     file://nss.pc.in \
     file://signlibs.sh \
 "
-SRC_URI[md5sum] = "23169c406adc8ac3672d34bf9ea2433d"
-SRC_URI[sha256sum] = "5d1ad475da19d0c033a716350dc5f8a747999d3eba5ac07ee0368c5bad6e2359"
+SRC_URI[md5sum] = "f18e1ebfe07969c84b890e45843edcb7"
+SRC_URI[sha256sum] = "fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b"
 
 UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
 UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
Signature · 1 line
2.9.3
author
#21 lore raw

PATCH 17/19 vala: update to 0.34.1

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 meta/recipes-devtools/vala/vala.inc                           | 2 +-
 meta/recipes-devtools/vala/{vala_0.32.1.bb => vala_0.34.1.bb} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/vala/{vala_0.32.1.bb => vala_0.34.1.bb} (56%)
meta/recipes-devtools/vala/vala.inc +1 -1
index 34c9db9..afa09ec 100644
@@ -46,5 +46,5 @@ vapigen_sysroot_preprocess() {
         # up our wrapper.
         sed -i \
            -e "s|vapigen=.*|vapigen=${bindir}/vapigen-wrapper|" \
-           ${SYSROOT_DESTDIR}${datadir}/pkgconfig/vapigen-${SHRT_VER}.pc
+           ${SYSROOT_DESTDIR}${libdir}/pkgconfig/vapigen-${SHRT_VER}.pc
 }
meta/recipes-devtools/vala/vala_0.34.1.bb renamed from meta/recipes-devtools/vala/vala_0.32.1.bb +2 -2
similarity index 56%
rename from meta/recipes-devtools/vala/vala_0.32.1.bb
rename to meta/recipes-devtools/vala/vala_0.34.1.bb
index b34086e..a94e621 100644
@@ -4,5 +4,5 @@ SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pa
              file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
 "
 
-SRC_URI[md5sum] = "755881770bffac020b5ea5f625fbe528"
-SRC_URI[sha256sum] = "dd0d47e548a34cfb1e4b04149acd082a86414c49057ffb79902eb9a508a161a9"
+SRC_URI[md5sum] = "4c04e73025127e3ae43b968149c96329"
+SRC_URI[sha256sum] = "f5ccfcfc460a0c6797bfbd7e739042bf5988a0f44d82278dbe1880c0e5f29299"
Signature · 1 line
2.9.3
author
#22 lore raw

PATCH 18/19 webkitgtk: update to 2.14.1

In reply to Alexander Kanavin

Rebase 0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch

Signed-off-by Alexander Kanavin <[email protected]>
---
 ...bKitMacros-Append-to-I-and-not-to-isystem.patch | 272 +++++++++------------
 .../{webkitgtk_2.12.5.bb => webkitgtk_2.14.1.bb}   |  26 +-
 2 files changed, 128 insertions(+), 170 deletions(-)
 rename meta/recipes-sato/webkit/{webkitgtk_2.12.5.bb => webkitgtk_2.14.1.bb} (85%)
meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch +115 -157
index 25b3c9f..ef209c8 100644
@@ -1,4 +1,4 @@
-From 53a00058184cd710c6f4375f4daab49d7e885a30 Mon Sep 17 00:00:00 2001
+From 20ee11dd188e1538f8cdd17a289dc6f9c63a011e Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Sun, 17 Apr 2016 12:35:41 -0700
 Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem

@@ -15,82 +15,95 @@ and ends up with compile errors e.g.
 /usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
 
 Signed-off-by: Khem Raj <[email protected]>
----
 Upstream-Status: Pending
+---
+ Source/JavaScriptCore/shell/CMakeLists.txt             | 2 +-
+ Source/WebCore/PlatformGTK.cmake                       | 6 +++---
+ Source/WebKit2/PlatformGTK.cmake                       | 2 +-
+ Source/cmake/WebKitMacros.cmake                        | 2 +-
+ Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 2 +-
+ Tools/ImageDiff/CMakeLists.txt                         | 2 +-
+ Tools/MiniBrowser/gtk/CMakeLists.txt                   | 2 +-
+ Tools/TestWebKitAPI/PlatformGTK.cmake                  | 2 +-
+ Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt    | 2 +-
+ Tools/WebKitTestRunner/CMakeLists.txt                  | 2 +-
+ 10 files changed, 12 insertions(+), 12 deletions(-)
 
- Source/cmake/WebKitMacros.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: webkitgtk-2.12.1/Source/JavaScriptCore/CMakeLists.txt
-===================================================================
---- webkitgtk-2.12.1.orig/Source/JavaScriptCore/CMakeLists.txt
-+++ webkitgtk-2.12.1/Source/JavaScriptCore/CMakeLists.txt
-@@ -1311,7 +1311,7 @@ add_subdirectory(shell)
+diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
+index 155c797..80fe22b 100644
+--- a/Source/JavaScriptCore/shell/CMakeLists.txt
++++ b/Source/JavaScriptCore/shell/CMakeLists.txt
+@@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
  
- WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
- include_directories(${JavaScriptCore_INCLUDE_DIRECTORIES})
+ WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
+ include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
 -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
 +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
- add_library(JavaScriptCore ${JavaScriptCore_LIBRARY_TYPE} ${JavaScriptCore_HEADERS} ${JavaScriptCore_SOURCES})
- target_link_libraries(JavaScriptCore ${JavaScriptCore_LIBRARIES})
- set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")
-Index: webkitgtk-2.12.1/Source/WTF/wtf/CMakeLists.txt
-===================================================================
---- webkitgtk-2.12.1.orig/Source/WTF/wtf/CMakeLists.txt
-+++ webkitgtk-2.12.1/Source/WTF/wtf/CMakeLists.txt
-@@ -286,7 +286,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
- 
- WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
- include_directories(${WTF_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${WTF_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${WTF_SYSTEM_INCLUDE_DIRECTORIES})
- add_library(WTF ${WTF_LIBRARY_TYPE} ${WTF_HEADERS} ${WTF_SOURCES})
- target_link_libraries(WTF ${WTF_LIBRARIES})
- set_target_properties(WTF PROPERTIES COMPILE_DEFINITIONS "BUILDING_WTF")
-Index: webkitgtk-2.12.1/Source/WebCore/CMakeLists.txt
-===================================================================
---- webkitgtk-2.12.1.orig/Source/WebCore/CMakeLists.txt
-+++ webkitgtk-2.12.1/Source/WebCore/CMakeLists.txt
-@@ -3748,7 +3748,7 @@ WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FIL
- WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})
- 
- include_directories(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
- 
- if (MSVC)
-     ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES)
-Index: webkitgtk-2.12.1/Source/WebKit/CMakeLists.txt
-===================================================================
---- webkitgtk-2.12.1.orig/Source/WebKit/CMakeLists.txt
-+++ webkitgtk-2.12.1/Source/WebKit/CMakeLists.txt
-@@ -28,7 +28,7 @@ set(WebKit_LIBRARIES
- WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
- 
- include_directories(${WebKit_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
+ add_executable(jsc ${JSC_SOURCES})
+ target_link_libraries(jsc ${JSC_LIBRARIES})
  
- if (MSVC)
-     ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKit_SOURCES)
-Index: webkitgtk-2.12.1/Source/WebKit2/CMakeLists.txt
-===================================================================
---- webkitgtk-2.12.1.orig/Source/WebKit2/CMakeLists.txt
-+++ webkitgtk-2.12.1/Source/WebKit2/CMakeLists.txt
-@@ -756,7 +756,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
- GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}")
+diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
+index 567bd79..1fabea8 100644
+--- a/Source/WebCore/PlatformGTK.cmake
++++ b/Source/WebCore/PlatformGTK.cmake
+@@ -340,7 +340,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
+         ${GTK2_INCLUDE_DIRS}
+         ${GDK2_INCLUDE_DIRS}
+     )
+-    target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
++    target_include_directories(WebCorePlatformGTK2 PRIVATE
+         ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
+     )
+     target_link_libraries(WebCorePlatformGTK2
+@@ -365,7 +365,7 @@ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCorePlatformGTK)
+ target_include_directories(WebCorePlatformGTK PRIVATE
+     ${WebCore_INCLUDE_DIRECTORIES}
+ )
+-target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
++target_include_directories(WebCorePlatformGTK PRIVATE
+     ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
+     ${GTK_INCLUDE_DIRS}
+     ${GDK_INCLUDE_DIRS}
+@@ -383,7 +383,7 @@ include_directories(
+     "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}"
+ )
  
- include_directories(${WebKit2_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${WebKit2_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${WebKit2_SYSTEM_INCLUDE_DIRECTORIES})
- add_library(WebKit2 ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES} ${WebKit2_DERIVED_SOURCES})
+-include_directories(SYSTEM
++include_directories(
+     ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
+ )
  
- add_dependencies(WebKit2 WebCore ${WEBKIT2_EXTRA_DEPENDENCIES})
-Index: webkitgtk-2.12.1/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
-===================================================================
---- webkitgtk-2.12.1.orig/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
-+++ webkitgtk-2.12.1/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
-@@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugin_SYSTEM_INCL
+diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
+index e4805a4..c57df5d 100644
+--- a/Source/WebKit2/PlatformGTK.cmake
++++ b/Source/WebKit2/PlatformGTK.cmake
+@@ -822,7 +822,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
+     target_include_directories(WebKitPluginProcess2 PRIVATE
+         ${WebKit2CommonIncludeDirectories}
+     )
+-    target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
++    target_include_directories(WebKitPluginProcess2 PRIVATE
+          ${WebKit2CommonSystemIncludeDirectories}
+          ${GTK2_INCLUDE_DIRS}
+          ${GDK2_INCLUDE_DIRS}
+diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
+index 043e78e..8b3b642 100644
+--- a/Source/cmake/WebKitMacros.cmake
++++ b/Source/cmake/WebKitMacros.cmake
+@@ -224,7 +224,7 @@ endmacro()
+ 
+ macro(WEBKIT_FRAMEWORK _target)
+     include_directories(${${_target}_INCLUDE_DIRECTORIES})
+-    include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
++    include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
+     add_library(${_target} ${${_target}_LIBRARY_TYPE}
+         ${${_target}_HEADERS}
+         ${${_target}_SOURCES}
+diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
+index c431667..6dff244 100644
+--- a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
++++ b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
+@@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES
  )
  
  include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES})

@@ -99,11 +112,11 @@ Index: webkitgtk-2.12.1/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
  
  set(WebKitTestNetscapePlugin_LIBRARIES
      ${X11_LIBRARIES}
-Index: webkitgtk-2.12.1/Tools/ImageDiff/CMakeLists.txt
-===================================================================
---- webkitgtk-2.12.1.orig/Tools/ImageDiff/CMakeLists.txt
-+++ webkitgtk-2.12.1/Tools/ImageDiff/CMakeLists.txt
-@@ -14,7 +14,7 @@ set(IMAGE_DIFF_LIBRARIES
+diff --git a/Tools/ImageDiff/CMakeLists.txt b/Tools/ImageDiff/CMakeLists.txt
+index b15443f..87e03bf 100644
+--- a/Tools/ImageDiff/CMakeLists.txt
++++ b/Tools/ImageDiff/CMakeLists.txt
+@@ -14,6 +14,6 @@ set(IMAGE_DIFF_LIBRARIES
  WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
  
  include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES})

@@ -111,12 +124,11 @@ Index: webkitgtk-2.12.1/Tools/ImageDiff/CMakeLists.txt
 +include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
  add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
  target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})
- set_target_properties(ImageDiff PROPERTIES FOLDER "Tools")
-Index: webkitgtk-2.12.1/Tools/MiniBrowser/gtk/CMakeLists.txt
-===================================================================
---- webkitgtk-2.12.1.orig/Tools/MiniBrowser/gtk/CMakeLists.txt
-+++ webkitgtk-2.12.1/Tools/MiniBrowser/gtk/CMakeLists.txt
-@@ -55,7 +55,7 @@ endif ()
+diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
+index 0704bc6..619e5a5 100644
+--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
++++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
+@@ -58,7 +58,7 @@ endif ()
  add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
  
  include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})

@@ -124,55 +136,11 @@ Index: webkitgtk-2.12.1/Tools/MiniBrowser/gtk/CMakeLists.txt
 +include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
  add_executable(MiniBrowser ${MiniBrowser_SOURCES})
  target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
- set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
-Index: webkitgtk-2.12.1/Tools/WebKitTestRunner/CMakeLists.txt
-===================================================================
---- webkitgtk-2.12.1.orig/Tools/WebKitTestRunner/CMakeLists.txt
-+++ webkitgtk-2.12.1/Tools/WebKitTestRunner/CMakeLists.txt
-@@ -115,7 +115,7 @@ GENERATE_BINDINGS(WebKitTestRunner_SOURC
- WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
- 
- include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
  
- add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES})
- target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES})
-Index: webkitgtk-2.12.1/Source/WebCore/PlatformGTK.cmake
-===================================================================
---- webkitgtk-2.12.1.orig/Source/WebCore/PlatformGTK.cmake
-+++ webkitgtk-2.12.1/Source/WebCore/PlatformGTK.cmake
-@@ -324,7 +324,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
-         ${GTK2_INCLUDE_DIRS}
-         ${GDK2_INCLUDE_DIRS}
-     )
--    target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
-+    target_include_directories(WebCorePlatformGTK2 PRIVATE
-         ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
-     )
-     target_link_libraries(WebCorePlatformGTK2
-@@ -366,7 +366,7 @@ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreP
- target_include_directories(WebCorePlatformGTK PRIVATE
-     ${WebCore_INCLUDE_DIRECTORIES}
- )
--target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
-+target_include_directories(WebCorePlatformGTK PRIVATE
-     ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
-     ${GTK_INCLUDE_DIRS}
-     ${GDK_INCLUDE_DIRS}
-@@ -384,7 +384,7 @@ include_directories(
-     "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}"
- )
- 
--include_directories(SYSTEM
-+include_directories(
-     ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
- )
- 
-Index: webkitgtk-2.12.1/Tools/TestWebKitAPI/PlatformGTK.cmake
-===================================================================
---- webkitgtk-2.12.1.orig/Tools/TestWebKitAPI/PlatformGTK.cmake
-+++ webkitgtk-2.12.1/Tools/TestWebKitAPI/PlatformGTK.cmake
+diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
+index 7552cc2..2eb44d5 100644
+--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
++++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
 @@ -20,7 +20,7 @@ include_directories(
      ${WEBKIT2_DIR}/UIProcess/API/gtk
  )

@@ -182,10 +150,10 @@ Index: webkitgtk-2.12.1/Tools/TestWebKitAPI/PlatformGTK.cmake
      ${GDK3_INCLUDE_DIRS}
      ${GLIB_INCLUDE_DIRS}
      ${GTK3_INCLUDE_DIRS}
-Index: webkitgtk-2.12.1/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
-===================================================================
---- webkitgtk-2.12.1.orig/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
-+++ webkitgtk-2.12.1/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
+diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
+index b0b4739..434e4ca 100644
+--- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
++++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
 @@ -23,7 +23,7 @@ include_directories(
      ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk
  )

@@ -195,29 +163,19 @@ Index: webkitgtk-2.12.1/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
      ${ATSPI_INCLUDE_DIRS}
      ${GLIB_INCLUDE_DIRS}
      ${GSTREAMER_INCLUDE_DIRS}
-Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
-===================================================================
---- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake
-+++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
-@@ -816,7 +816,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
-     target_include_directories(WebKitPluginProcess2 PRIVATE
-         ${WebKit2CommonIncludeDirectories}
-     )
--    target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
-+    target_include_directories(WebKitPluginProcess2 PRIVATE
-          ${WebKit2CommonSystemIncludeDirectories}
-          ${GTK2_INCLUDE_DIRS}
-          ${GDK2_INCLUDE_DIRS}
-Index: webkitgtk-2.12.1/Source/JavaScriptCore/shell/CMakeLists.txt
-===================================================================
---- webkitgtk-2.12.1.orig/Source/JavaScriptCore/shell/CMakeLists.txt
-+++ webkitgtk-2.12.1/Source/JavaScriptCore/shell/CMakeLists.txt
-@@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt
+index 7db90f2..a4f917f 100644
+--- a/Tools/WebKitTestRunner/CMakeLists.txt
++++ b/Tools/WebKitTestRunner/CMakeLists.txt
+@@ -116,7 +116,7 @@ GENERATE_BINDINGS(WebKitTestRunner_SOURCES
+ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
  
- WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
- include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
- add_executable(jsc ${JSC_SOURCES})
- target_link_libraries(jsc ${JSC_LIBRARIES})
- set_target_properties(jsc PROPERTIES FOLDER "JavaScriptCore")
+ include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES})
+-include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
++include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
+ 
+ add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES})
+ target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES})
+-- 
+2.9.3
+
meta/recipes-sato/webkit/webkitgtk_2.14.1.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.12.5.bb +13 -13
similarity index 85%
rename from meta/recipes-sato/webkit/webkitgtk_2.12.5.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
index 941d0e2..f85a33d 100644
@@ -10,19 +10,19 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842
 		    file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \
 		   "
 
-SRC_URI = "\
-  http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
-  file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \
-  file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \
-  file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \
-  file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
-  file://musl-fixes.patch \
-  file://ppc-musl-fix.patch \
-  file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
-  file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
-  "
-SRC_URI[md5sum] = "7a9ea00ec195488db90fdeb2d174ddaf"
-SRC_URI[sha256sum] = "6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40"
+SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
+           file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \
+           file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \
+           file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \
+           file://musl-fixes.patch \
+           file://ppc-musl-fix.patch \
+           file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
+           file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
+           file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
+           "
+
+SRC_URI[md5sum] = "8d6c60dc41604d3bbd43165a674c07e5"
+SRC_URI[sha256sum] = "2e2d76c328de65bed6e0e4f096b2720a366654b27fc1af0830ece90bc4b7ceb5"
 
 inherit cmake lib_package pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
Signature · 1 line
2.9.3
#23 lore raw

Re: [PATCH 18/19] webkitgtk: update to 2.14.1

Quoted 4 lines · Alexander Kanavin

Rebase 0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch

Signed-off-by Alexander Kanavin <[email protected]>

buildhistory-diff reports that the binaries are being removed:

packages/corei7-64-poky-linux/webkitgtk/webkitgtk-bin: PKGSIZE changed from 213688 to 0 (-100%)
* FILELIST: removed all items "/usr/bin/MiniBrowser /usr/bin/jsc"

Have these all been removed upstream (in which case we can remove lib_package), or are they optional now and we should enable this?

Ross

#24 lore raw

Re: [PATCH 18/19] webkitgtk: update to 2.14.1

Quoted 9 lines · Ross

buildhistory-diff reports that the binaries are being removed:

packages/corei7-64-poky-linux/webkitgtk/webkitgtk-bin: PKGSIZE changed from 213688 to 0 (-100%)
* FILELIST: removed all items "/usr/bin/MiniBrowser /usr/bin/jsc"

Have these all been removed upstream (in which case we can remove lib_package), or are they optional now and we should enable this?

I should have finished reading the report before hitting send:

packages/corei7-64-poky-linux/webkitgtk/webkitgtk: FILELIST: removed "/usr/lib/libwebkit2gtk-4.0.so.37.13.11 /usr/lib/libjavascriptcoregtk-4.0.so.18.3.13" added "/usr/lib/libjavascriptcoregtk-4.0.so.18.4.8 /usr/libexec/webkit2gtk-4.0/MiniBrowser /usr/libexec/webkit2gtk-4.0/jsc /usr/lib/libwebkit2gtk-4.0.so.37.14.8"

If libexecdir is the right place for these then we can remove lib_package, otherwise the question is why are they in there and can they be moved back to bindir.

Ross

author
#25 lore raw

Re: [PATCH 18/19] webkitgtk: update to 2.14.1

Quoted 9 lines · Ross

I should have finished reading the report before hitting send:

packages/corei7-64-poky-linux/webkitgtk/webkitgtk: FILELIST: removed "/usr/lib/libwebkit2gtk-4.0.so.37.13.11 /usr/lib/libjavascriptcoregtk-4.0.so.18.3.13" added "/usr/lib/libjavascriptcoregtk-4.0.so.18.4.8 /usr/libexec/webkit2gtk-4.0/MiniBrowser /usr/libexec/webkit2gtk-4.0/jsc /usr/lib/libwebkit2gtk-4.0.so.37.14.8"

Quoted 3 lines

If libexecdir is the right place for these then we can remove lib_package, otherwise the question is why are they in there and can they be moved back to bindir.

They did it on purpose, no idea why:

What's new in WebKitGTK+ 2.14.1?

- MiniBrowser and jsc binaries are now installed in pkglibexecdir
instead of bindir.

I've dropped the lib_package.

Alex

author
#26 lore raw

PATCH 19/19 epiphany: update to 3.22.1

In reply to Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 .../epiphany/{epiphany_3.20.3.bb => epiphany_3.22.1.bb}             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.20.3.bb => epiphany_3.22.1.bb} (77%)
meta/recipes-gnome/epiphany/epiphany_3.22.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.20.3.bb +3 -3
similarity index 77%
rename from meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.22.1.bb
index eba480b..57784ae 100644
@@ -10,10 +10,10 @@ inherit gnomebase gsettings distro_features_check upstream-version-is-even
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch"
-SRC_URI[archive.md5sum] = "31822b6b199f724f212ae9200bc055f1"
-SRC_URI[archive.sha256sum] = "4d9de1bdb44c14adf25aa6dc02ea3de60925cff5eb01fe89545e6032c9b424a2"
+SRC_URI[archive.md5sum] = "9b9b73601a32f5b11c02411952cec27a"
+SRC_URI[archive.sha256sum] = "aab162ede54d71e583e382ab5e3567f28d81e0cd42719a11cad8008b56c5cc0e"
 
-EXTRA_OECONF += " --disable-nss --with-distributor-name=${DISTRO}"
+EXTRA_OECONF += " --with-distributor-name=${DISTRO}"
 
 do_configure_prepend() {
     sed -i -e s:help::g ${S}/Makefile.am
Signature · 1 line
2.9.3
#27 lore raw

Re: [PATCH 19/19] epiphany: update to 3.22.1

Quoted 14 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>
---
 .../epiphany/{epiphany_3.20.3.bb => epiphany_3.22.1.bb}             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.20.3.bb => epiphany_3.22.1.bb} (77%)
meta/recipes-gnome/epiphany/epiphany_3.22.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.20.3.bb +0 -0
similarity index 77%
rename from meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.22.1.bb
index eba480b..57784ae 100644

meta/recipes-gnome/epiphany/epiphany_3.22.1.bb inherit gnomebase gsettings distro_features_check upstream-version-is-even · line 16

Quoted 10 lines
meta/recipes-gnome/epiphany/epiphany_3.22.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.20.3.bb +3 -3
@@ -10,10 +10,10 @@ inherit gnomebase gsettings distro_features_check upstream-version-is-even
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch"
-SRC_URI[archive.md5sum] = "31822b6b199f724f212ae9200bc055f1"
-SRC_URI[archive.sha256sum] = "4d9de1bdb44c14adf25aa6dc02ea3de60925cff5eb01fe89545e6032c9b424a2"
+SRC_URI[archive.md5sum] = "9b9b73601a32f5b11c02411952cec27a"
+SRC_URI[archive.sha256sum] = "aab162ede54d71e583e382ab5e3567f28d81e0cd42719a11cad8008b56c5cc0e"
 
-EXTRA_OECONF += " --disable-nss --with-distributor-name=${DISTRO}"
+EXTRA_OECONF += " --with-distributor-name=${DISTRO}"

why is nss not disabled explicitly anymore ?

Quoted 11 lines
meta/recipes-gnome/epiphany/epiphany_3.22.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.20.3.bb +0 -1
 do_configure_prepend() {
     sed -i -e s:help::g ${S}/Makefile.am
--

2.9.3

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

author
#28 lore raw

Re: [PATCH 19/19] epiphany: update to 3.22.1

Quoted 4 lines · Khem Raj

meta/recipes-gnome/epiphany/epiphany_3.22.1.bb inherit gnomebase gsettings distro_features_check upstream-version-is-even · line 16

Quoted 2 lines
meta/recipes-gnome/epiphany/epiphany_3.22.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.20.3.bb +1 -1
-EXTRA_OECONF += " --disable-nss --with-distributor-name=${DISTRO}"
+EXTRA_OECONF += " --with-distributor-name=${DISTRO}"

why is nss not disabled explicitly anymore ?

Sorry, forgot to add this to the commit log - they dropped nss support altogether in this version.

Alex

#29 lore raw
In reply to Alexander Kanavin

Alexander,

Quoted 4 lines · Alexander Kanavin

This is a bunch of assorted version updates, and upstream check fixes. I have also re-enabled gobject introspection on musl (seems to work now). Some version updates are held off by the need to update glib/gtk first, or are more involved (openssl), they will come later.

Are these updates just bug fixes or do they also contain new features / enhancements. Having a little more description in the commit will help the morty maintainer determine if any of the updates are suitable to backporting.

regards,
Armin

Quoted 88 lines

The following changes since commit 9c04beb9adf5ed05b4fe89322bfa4dd60296de2b:

   ref-manual: Removed RM_OLD_IMAGE variable description. (2016-10-19 12:56:33 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib akanavin/package-version-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates

Alexander Kanavin (19):

   musl: enable gobject introspection
   mklibs-native: fix upstream version check
   cve-check-tool: fix upstream version check
   pigz: fix upstream version check
   boost: update to 1.62.0
   btrfs-tools: update to 4.8.1
   cmake: update to 3.6.2
   dtc: update to 1.4.2
   ffmpeg: update to 3.1.4
   gnome-desktop3: update to 3.22.1
   gnutls: update to 3.5.5
   libksba: update to 1.3.5
   lighttpd: update to 1.4.42
   mpg123: update to 1.23.8
   nspr: update to 4.13
   nss: update to 3.27.1
   vala: update to 0.34.1
   webkitgtk: update to 2.14.1
   epiphany: update to 3.22.1
  meta/conf/distro/include/tclibc-musl.inc           |   4 -
  .../btrfs-tools/btrfs-tools/fix-parallel.patch     |  32 ---
  .../{btrfs-tools_4.7.1.bb => btrfs-tools_4.8.1.bb} |   3 +-
  ...cmake-native_3.6.1.bb => cmake-native_3.6.2.bb} |   0
  meta/recipes-devtools/cmake/cmake.inc              |   4 +-
  .../cmake/{cmake_3.6.1.bb => cmake_3.6.2.bb}       |   0
  .../cve-check-tool/cve-check-tool_5.6.4.bb         |   2 +
  .../mklibs/mklibs-native_0.1.41.bb                 |   2 +
  meta/recipes-devtools/vala/vala.inc                |   2 +-
  .../vala/{vala_0.32.1.bb => vala_0.34.1.bb}        |   4 +-
  .../{lighttpd_1.4.41.bb => lighttpd_1.4.42.bb}     |   4 +-
  meta/recipes-extended/pigz/pigz.inc                |   2 -
  meta/recipes-extended/pigz/pigz_2.3.3.bb           |   2 +-
  .../{epiphany_3.20.3.bb => epiphany_3.22.1.bb}     |   6 +-
  ...desktop3_3.20.2.bb => gnome-desktop3_3.22.1.bb} |   4 +-
  .../dtc/{dtc_git.bb => dtc_1.4.2.bb}               |   3 +-
  .../ffmpeg/{ffmpeg_3.1.3.bb => ffmpeg_3.1.4.bb}    |   4 +-
  .../mpg123/{mpg123_1.23.6.bb => mpg123_1.23.8.bb}  |   4 +-
  ...bKitMacros-Append-to-I-and-not-to-isystem.patch | 272 +++++++++------------
  .../{webkitgtk_2.12.5.bb => webkitgtk_2.14.1.bb}   |  26 +-
  ...bjam-native_1.61.0.bb => bjam-native_1.62.0.bb} |   0
  .../boost/{boost-1.61.0.inc => boost-1.62.0.inc}   |   4 +-
  ...ips-assembly-doesn-t-compile-in-mips16e-m.patch |  60 -----
  .../boost/{boost_1.61.0.bb => boost_1.62.0.bb}     |   1 -
  ...001-Use-correct-include-dir-with-minitasn.patch |  31 ---
  .../gnutls/gnutls/CVE-2016-7444.patch              |  35 ---
  meta/recipes-support/gnutls/gnutls_3.5.3.bb        |  13 -
  meta/recipes-support/gnutls/gnutls_3.5.5.bb        |   9 +
  .../libksba/{libksba_1.3.4.bb => libksba_1.3.5.bb} |   4 +-
  .../nspr/{nspr_4.12.bb => nspr_4.13.bb}            |   4 +-
  .../recipes-support/nss/nss/pqg.c-ULL_addend.patch |   8 +-
  .../nss/{nss_3.25.bb => nss_3.27.1.bb}             |   6 +-
  32 files changed, 173 insertions(+), 382 deletions(-)

delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.7.1.bb => btrfs-tools_4.8.1.bb} (91%) rename meta/recipes-devtools/cmake/{cmake-native_3.6.1.bb => cmake-native_3.6.2.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.6.1.bb => cmake_3.6.2.bb} (100%)
rename meta/recipes-devtools/vala/{vala_0.32.1.bb => vala_0.34.1.bb} (56%)
rename meta/recipes-extended/lighttpd/{lighttpd_1.4.41.bb => lighttpd_1.4.42.bb} (94%)
rename meta/recipes-gnome/epiphany/{epiphany_3.20.3.bb => epiphany_3.22.1.bb} (77%)
rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.20.2.bb => gnome-desktop3_3.22.1.bb} (83%) rename meta/recipes-kernel/dtc/{dtc_git.bb => dtc_1.4.2.bb} (75%)
rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.1.3.bb => ffmpeg_3.1.4.bb} (97%)
rename meta/recipes-multimedia/mpg123/{mpg123_1.23.6.bb => mpg123_1.23.8.bb} (95%)
rename meta/recipes-sato/webkit/{webkitgtk_2.12.5.bb => webkitgtk_2.14.1.bb} (85%)
rename meta/recipes-support/boost/{bjam-native_1.61.0.bb => bjam-native_1.62.0.bb} (100%)
rename meta/recipes-support/boost/{boost-1.61.0.inc => boost-1.62.0.inc} (83%)
delete mode 100644 meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch rename meta/recipes-support/boost/{boost_1.61.0.bb => boost_1.62.0.bb} (85%)
delete mode 100644 meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch delete mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2016-7444.patch
delete mode 100644 meta/recipes-support/gnutls/gnutls_3.5.3.bb
create mode 100644 meta/recipes-support/gnutls/gnutls_3.5.5.bb
rename meta/recipes-support/libksba/{libksba_1.3.4.bb => libksba_1.3.5.bb} (86%)
rename meta/recipes-support/nspr/{nspr_4.12.bb => nspr_4.13.bb} (96%)
rename meta/recipes-support/nss/{nss_3.25.bb => nss_3.27.1.bb} (97%)

author
#30 lore raw
Quoted 4 lines · On 10/19/2016 10:42 PM, akuster808 wrote:

Are these updates just bug fixes or do they also contain new features / enhancements. Having a little more description in the commit will help the morty maintainer determine if any of the updates are suitable to backporting.

They're both. The updates in master happen not because of specific features or bugfixes, but simply because we want to stay as close to upstream as possible at all times, because there is less pain in many incremental updates as opposed to single massive updates that jump over a lot of code changes.

If stable releases want to do recipe version updates, the correct way to do that is to have automatic regression testing on every level, from oe-core all the way to the product image. Manually analyzing git log output and summarizing release announcements or whatnot for all of oe-core packages is labour-intensive and error/omission prone for everyone involved.

Alex

#31 lore raw
Quoted 8 lines · Alexander Kanavin
Quoted 4 lines · On 10/19/2016 10:42 PM, akuster808 wrote:

Are these updates just bug fixes or do they also contain new features / enhancements. Having a little more description in the commit will help the morty maintainer determine if any of the updates are suitable to backporting.

They're both. The updates in master happen not because of specific features or bugfixes, but simply because we want to stay as close to upstream as possible at all times, because there is less pain in many incremental updates as opposed to single massive updates that jump over a lot of code changes.

The issue is not updating master. It is about following the process.
http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded

Many of the changes don't comply to:

"Commit with a concise and descriptive message - one that explains your changes in a way others get a short overview without looking at the code."

Quoted 1 line

If stable releases want to do recipe version updates, the correct way to do that is to have automatic regression testing on every level, from oe-core all the way to the product image. Manually analyzing git log output and summarizing release announcements or whatnot for all of oe-core packages is labour-intensive and error/omission prone for everyone involved.

This has nothing to do with the correct way a stable branch would update a package. It is about providing some information so maintainers can make a decision on what to do.

- armin

Quoted 3 lines

Alex

author
#32 lore raw
Quoted 8 lines · On 10/20/2016 07:36 PM, akuster808 wrote:

The issue is not updating master. It is about following the process.
http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded

Many of the changes don't comply to:

"Commit with a concise and descriptive message - one that explains your changes in a way others get a short overview without looking at the code."

Key words are "your changes". When a recipe is updated to a newer version, the commit message typically includes:

1) what is the new version

2) what changes to the recipe have been done and why (changes to configure flags, changes to patches applied, changes to licensing information, any other changes).

Also describing changes done by the upstream is not required for compliance with the process.

Here's the deal: when 90 percent of oe-core's nearly 800 recipes are kept up to date by maybe seven people from two companies, on top of all the other stuff to be fixed and looked at, there's simply no bandwidth for more. We plan to distribute recipe maintenance and spread it to a lot more people involved in oe-core, and maybe then commit messages will have summaries of upstream work as a rule.

Quoted 3 lines

This has nothing to do with the correct way a stable branch would update a package. It is about providing some information so maintainers can make a decision on what to do.

Before that, we would also need reporting tools that can distinguish between new major releases, and new point releases in stable series. If I update webkit to a new major release and include a link to http://blogs.igalia.com/carlosgc/2016/09/20/webkitgtk-2-14/ in the commit log, that's not a particularly useful information for you, because what you really need to know as a stable branch maintainer is whether there are new bugfix releases of webkit in a previous major version that your stable release contains.

Alex