[PATCH 01/22] lighttpd: upgrade 1.4.48 -> 1.4.49

[PATCH 01/22] lighttpd: upgrade 1.4.48 -> 1.4.49

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../lighttpd/{lighttpd_1.4.48.bb => lighttpd_1.4.49.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/lighttpd/{lighttpd_1.4.48.bb => lighttpd_1.4.49.bb} (96%)

diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.49.bb
similarity index 96%
rename from meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
rename to meta/recipes-extended/lighttpd/lighttpd_1.4.49.bb
index 3c4444cf423..272a66a10d5 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.49.bb
@@ -20,8 +20,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] = "1e3a9eb5078f481e3a8a1d0aaac8c3c8"
-SRC_URI[sha256sum] = "0f8ad5aac7529d7b948b9d7e8cd0b4a9e177309d85d6bf6516e28e6e40d74f36"
+SRC_URI[md5sum] = "aaf8165379351c3766e5ad1e5c9dbe8b"
+SRC_URI[sha256sum] = "aedf49d7127d9e4c0ea56618e9e945a17674dc46a37ac7990120f87dd939ce09"
 
 PACKAGECONFIG ??= "openssl pcre zlib \
     ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
-- 
2.16.1

[PATCH 02/22] gcr: upgrade 3.20.0 -> 3.28.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../gcr-add-missing-dependencies-for-vapi.patch    | 51 ----------------------
 .../gcr/{gcr_3.20.0.bb => gcr_3.28.0.bb}           | 12 +++--
 2 files changed, 8 insertions(+), 55 deletions(-)
 delete mode 100644 meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch
 rename meta/recipes-gnome/gcr/{gcr_3.20.0.bb => gcr_3.28.0.bb} (69%)

diff --git a/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch b/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch
deleted file mode 100644
index a2054298656..00000000000
--- a/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e7e0c56ca82031121f192f7f711b78418b154c9f Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 28 Nov 2016 10:17:34 +0800
-Subject: [PATCH] gcr: add missing dependencies for vapi
-
-According to the vapi_DEPS definition:
-gcr-3.vapi depends on gck-1.vapi,
-gcr-ui-3.vapi depends on gck-1.vapi and gcr-3.vapi
-
-But these dependencies are missing for the make targets,
-so it will fail when build in parallel:
-error: Package `gck-1' not found in specified Vala API directories or GObject-Introspection GIR directories
-error: Package `gcr-3' not found in specified Vala API directories or GObject-Introspection GIR directories
-
-Upstream-Status: Submitted [https://bug775966.bugzilla-attachments.gnome.org/attachment.cgi?id=341791]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- gcr/Makefile.am | 2 +-
- ui/Makefile.am  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcr/Makefile.am b/gcr/Makefile.am
-index eda302f..6e78dba 100644
---- a/gcr/Makefile.am
-+++ b/gcr/Makefile.am
-@@ -221,7 +221,7 @@ gir_DATA += Gcr-@GCR_MAJOR@.gir
- 
- if ENABLE_VAPIGEN
- 
--gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps
-+gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi
- 
- VAPIGEN_VAPIS += gcr-@GCR_MAJOR@.vapi
- 
-diff --git a/ui/Makefile.am b/ui/Makefile.am
-index aa52476..6612f0d 100644
---- a/ui/Makefile.am
-+++ b/ui/Makefile.am
-@@ -160,7 +160,7 @@ gir_DATA += GcrUi-@GCR_MAJOR@.gir
- 
- if ENABLE_VAPIGEN
- 
--gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps
-+gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi gcr-@GCR_MAJOR@.vapi
- 
- VAPIGEN_VAPIS += gcr-ui-@GCR_MAJOR@.vapi
- 
--- 
-2.8.3
-
diff --git a/meta/recipes-gnome/gcr/gcr_3.20.0.bb b/meta/recipes-gnome/gcr/gcr_3.28.0.bb
similarity index 69%
rename from meta/recipes-gnome/gcr/gcr_3.20.0.bb
rename to meta/recipes-gnome/gcr/gcr_3.28.0.bb
index 4450e155e66..9e6f1ff0d98 100644
--- a/meta/recipes-gnome/gcr/gcr_3.20.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.28.0.bb
@@ -12,10 +12,8 @@ inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstrea
 # depends on gtk+3, but also x11 through gtk+-x11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI += "file://gcr-add-missing-dependencies-for-vapi.patch"
-
-SRC_URI[archive.md5sum] = "4314bf89eac293dd0a9d806593ff1b35"
-SRC_URI[archive.sha256sum] = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379"
+SRC_URI[archive.md5sum] = "5321319307dad34dca2fd52e7c9c01ab"
+SRC_URI[archive.sha256sum] = "15e175d1da7ec486d59749ba34906241c442898118ce224a7b70bf2e849faf0b"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
@@ -24,3 +22,9 @@ FILES_${PN} += " \
 
 # http://errors.yoctoproject.org/Errors/Details/20229/
 ARM_INSTRUCTION_SET = "arm"
+
+# These files may be out of date or missing our fixes
+# libgcrypt.m4 in particular is calling into libgcrypt-config
+do_configure_prepend() {
+    rm -f ${S}/build/m4/*
+}
-- 
2.16.1

[PATCH 03/22] sysprof: add RECIPE_NO_UPDATE_REASON

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-kernel/sysprof/sysprof_3.26.1.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb b/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb
index 1989b52a77d..2ac79f9d720 100644
--- a/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb
@@ -15,6 +15,7 @@ SRC_URI += " \
            file://define-NT_GNU_BUILD_ID.patch \
            file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \
            "
+RECIPE_NO_UPDATE_REASON = "Waiting for resolution of https://bugzilla.gnome.org/show_bug.cgi?id=794625"
 
 PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
 PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3"
-- 
2.16.1

[PATCH 04/22] vala: update to 0.40.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../vala/vala/disable-graphviz.patch               | 26 +++++++++++-----------
 .../vala/{vala_0.38.8.bb => vala_0.40.2.bb}        |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)
 rename meta/recipes-devtools/vala/{vala_0.38.8.bb => vala_0.40.2.bb} (64%)

diff --git a/meta/recipes-devtools/vala/vala/disable-graphviz.patch b/meta/recipes-devtools/vala/vala/disable-graphviz.patch
index 15d186de054..8fb94dc149c 100644
--- a/meta/recipes-devtools/vala/vala/disable-graphviz.patch
+++ b/meta/recipes-devtools/vala/vala/disable-graphviz.patch
@@ -1,4 +1,4 @@
-From eb716dc856c20b3da146a4e83e9800bd1f53c739 Mon Sep 17 00:00:00 2001
+From 500f4220f79c660a70a1ffc0d5b762d70088af5e Mon Sep 17 00:00:00 2001
 From: Rico Tzschichholz <ricotz@ubuntu.com>
 Date: Wed, 6 Sep 2017 18:52:55 +0200
 Subject: [PATCH] libvaladoc: Allow disabling the graphviz dependency of
@@ -7,6 +7,7 @@ Subject: [PATCH] libvaladoc: Allow disabling the graphviz dependency of
 https://bugzilla.gnome.org/show_bug.cgi?id=787375
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 Upstream-Status: Submitted [bugzilla link above]
+
 ---
  configure.ac                          | 60 +++++++++++++++++++----------------
  libvaladoc/Makefile.am                | 25 +++++++++++----
@@ -15,10 +16,10 @@ Upstream-Status: Submitted [bugzilla link above]
  4 files changed, 63 insertions(+), 34 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index c73d5d6b1..291e503d5 100644
+index 662180b..82d7015 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -98,34 +98,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
+@@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
  AC_SUBST(GMODULE_CFLAGS)
  AC_SUBST(GMODULE_LIBS)
  
@@ -86,10 +87,10 @@ index c73d5d6b1..291e503d5 100644
  
  AC_PATH_PROG([XSLTPROC], [xsltproc], :)
 diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
-index 89245d86b..7c07498b9 100644
+index 384292f..cce50d8 100644
 --- a/libvaladoc/Makefile.am
 +++ b/libvaladoc/Makefile.am
-@@ -127,10 +127,6 @@ libvaladoc_la_VALASOURCES = \
+@@ -126,10 +126,6 @@ libvaladoc_la_VALASOURCES = \
  	content/tablerow.vala \
  	content/taglet.vala \
  	content/text.vala \
@@ -100,7 +101,7 @@ index 89245d86b..7c07498b9 100644
  	parser/manyrule.vala \
  	parser/oneofrule.vala \
  	parser/optionalrule.vala \
-@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \
+@@ -156,13 +152,24 @@ libvaladoc_la_VALASOURCES = \
  	highlighter/codetoken.vala \
  	highlighter/highlighter.vala \
  	html/basicdoclet.vala \
@@ -126,17 +127,18 @@ index 89245d86b..7c07498b9 100644
  libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
  	libvaladoc.vala.stamp \
  	$(libvaladoc_la_VALASOURCES:.vala=.c) \
-@@ -182,8 +189,8 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
+@@ -182,9 +189,9 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
  		--library valadoc \
  		--vapi valadoc@PACKAGE_SUFFIX@.vapi \
  		--vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
 -		--vapidir $(top_srcdir)/vapi --pkg libgvc \
  		--vapidir $(top_srcdir)/gee --pkg gee \
+ 		--vapidir $(top_srcdir)/vala --pkg vala \
 +		$(LIBGVC_PKG) \
  		--pkg config \
  		$(filter %.vala %.c,$^)
  	touch $@
-@@ -209,6 +216,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
+@@ -211,6 +218,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
  
  valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
  	cp $< $@
@@ -146,7 +148,7 @@ index 89245d86b..7c07498b9 100644
  
  vapidir = $(datadir)/vala/vapi
  dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
-@@ -216,6 +226,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
+@@ -218,6 +228,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
  
  valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
  	cp $< $@
@@ -157,7 +159,7 @@ index 89245d86b..7c07498b9 100644
  EXTRA_DIST = \
  	$(libvaladoc_la_VALASOURCES) \
 diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala
-index cc9ea4ed7..432c3818f 100644
+index cc9ea4e..432c381 100644
 --- a/libvaladoc/html/basicdoclet.vala
 +++ b/libvaladoc/html/basicdoclet.vala
 @@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
@@ -199,7 +201,7 @@ index cc9ea4ed7..432c3818f 100644
  
  	public void write_namespace_content (Namespace node, Api.Node? parent) {
 diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala
-index 15ed9efd1..fe0d705d4 100644
+index 15ed9ef..fe0d705 100644
 --- a/libvaladoc/html/htmlmarkupwriter.vala
 +++ b/libvaladoc/html/htmlmarkupwriter.vala
 @@ -43,12 +43,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
@@ -219,5 +221,3 @@ index 15ed9efd1..fe0d705d4 100644
  
  		return this;
  	}
--- 
-2.14.1
diff --git a/meta/recipes-devtools/vala/vala_0.38.8.bb b/meta/recipes-devtools/vala/vala_0.40.2.bb
similarity index 64%
rename from meta/recipes-devtools/vala/vala_0.38.8.bb
rename to meta/recipes-devtools/vala/vala_0.40.2.bb
index e2baf655596..3176a9127e1 100644
--- a/meta/recipes-devtools/vala/vala_0.38.8.bb
+++ b/meta/recipes-devtools/vala/vala_0.40.2.bb
@@ -6,5 +6,5 @@ SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pa
 	     file://0001-Disable-valadoc.patch \
 "
 
-SRC_URI[md5sum] = "37edd0467d056fd9e3937d0bbceda80b"
-SRC_URI[sha256sum] = "2fa746b51cd66e43577d1da06a80b708c2875cadaafee77e9700ea35cf23882c"
+SRC_URI[md5sum] = "e7d05683bcac0306fc8d7c875eb3fef1"
+SRC_URI[sha256sum] = "75a3dc2de36873d8ceab168b2fde1b2c378a1f7104a3b3391ba3acf579c674b3"
-- 
2.16.1

[PATCH 05/22] gobject-introspection: do not hardcode the current version in the tarball path

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
index 85c8001dea8..e3306672393 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \
                     file://giscanner/sourcescanner.c;endline=22;md5=194d6e0c1d00662f32d030ce44de8d39 \
                     file://girepository/giregisteredtypeinfo.c;endline=21;md5=661847611ae6979465415f31a759ba27"
 
-SRC_URI = "${GNOME_MIRROR}/${BPN}/1.54/${BPN}-${PV}.tar.xz \
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
            file://0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch \
            file://0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch \
            file://0003-giscanner-add-use-binary-wrapper-option.patch \
-- 
2.16.1

[PATCH 06/22] gobject-introspection: update to 1.56.0

[Alexander Kanavin]

License-Update: bug tracker link changed

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../0001-giscanner-add-a-lib-dirs-envvar-option.patch       | 13 +++++--------
 ...rospection_1.54.1.bb => gobject-introspection_1.56.0.bb} | 13 +++++++------
 2 files changed, 12 insertions(+), 14 deletions(-)
 rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.54.1.bb => gobject-introspection_1.56.0.bb} (94%)

diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
index 4ec527dcc0f..232480f3f56 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
@@ -1,4 +1,4 @@
-From e48f1e18f5ea41656f0ba10fe61d69d2604b0064 Mon Sep 17 00:00:00 2001
+From 06ebdaa5c8f9721acf93cc3e75a877a3c963867f Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 3 Jan 2018 17:02:01 +0200
 Subject: [PATCH] giscanner: add a --lib-dirs-envvar option
@@ -19,7 +19,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  3 files changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index 29de0ee..928eae8 100644
+index a8bd5b1..6cf25d5 100644
 --- a/giscanner/ccompiler.py
 +++ b/giscanner/ccompiler.py
 @@ -109,7 +109,7 @@ class CCompiler(object):
@@ -32,7 +32,7 @@ index 29de0ee..928eae8 100644
          # is being built in the current directory.
  
 @@ -119,7 +119,7 @@ class CCompiler(object):
-         if self.check_is_msvc():
+         if os.name == 'nt':
              runtime_path_envvar = ['LIB', 'PATH']
          else:
 -            runtime_path_envvar = ['LD_LIBRARY_PATH']
@@ -41,7 +41,7 @@ index 29de0ee..928eae8 100644
              # (This flag is not supported nor needed for Visual C++)
              args.append('-L.')
 diff --git a/giscanner/dumper.py b/giscanner/dumper.py
-index 7f77bd2..db96df6 100644
+index 3c7220b..0abd565 100644
 --- a/giscanner/dumper.py
 +++ b/giscanner/dumper.py
 @@ -259,7 +259,8 @@ class DumpCompiler(object):
@@ -55,7 +55,7 @@ index 7f77bd2..db96df6 100644
  
          else:
 diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
-index 38a45c1..b603850 100755
+index d262785..51c9570 100755
 --- a/giscanner/scannermain.py
 +++ b/giscanner/scannermain.py
 @@ -130,6 +130,9 @@ def _get_option_parser():
@@ -68,6 +68,3 @@ index 38a45c1..b603850 100755
      parser.add_option("", "--program-arg",
                        action="append", dest="program_args", default=[],
                        help="extra arguments to program")
--- 
-2.15.1
-
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.0.bb
similarity index 94%
rename from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
rename to meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.0.bb
index e3306672393..8f84f832b03 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.0.bb
@@ -3,10 +3,11 @@ HOMEPAGE = "https://wiki.gnome.org/action/show/Projects/GObjectIntrospection"
 BUGTRACKER = "https://bugzilla.gnome.org/"
 SECTION = "libs"
 LICENSE = "LGPLv2+ & GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \
-                    file://tools/compiler.c;endline=20;md5=fc5007fc20022720e6c0b0cdde41fabd \
-                    file://giscanner/sourcescanner.c;endline=22;md5=194d6e0c1d00662f32d030ce44de8d39 \
-                    file://girepository/giregisteredtypeinfo.c;endline=21;md5=661847611ae6979465415f31a759ba27"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6317a809f70ed9848fa5673121908586 \
+                    file://tools/compiler.c;md5=fc5007fc20022720e6c0b0cdde41fabd;endline=20 \
+                    file://giscanner/sourcescanner.c;md5=194d6e0c1d00662f32d030ce44de8d39;endline=22 \
+                    file://girepository/giregisteredtypeinfo.c;md5=661847611ae6979465415f31a759ba27;endline=21 \
+                    "
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
            file://0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch \
@@ -16,8 +17,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
            file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \
            file://0001-giscanner-add-a-lib-dirs-envvar-option.patch \
            "
-SRC_URI[md5sum] = "126c29e4d54adbed2ed4e2b04483de41"
-SRC_URI[sha256sum] = "b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e"
+SRC_URI[md5sum] = "8064b5cd8fa02feeab850a0f6ef72b0f"
+SRC_URI[sha256sum] = "0d7059fad7aa5ec50d9678aea4ea139acab23737e9cf9ca0d86c615cecbaa0f8"
 
 inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even
 BBCLASSEXTEND = "native"
-- 
2.16.1

[PATCH 07/22] glib-2.0: update to 2.56.0

[Alexander Kanavin]

Remove upstreamed ptest-paths.patch

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../0001-Do-not-ignore-return-value-of-write.patch | 17 +++++-------
 .../glib-2.0/glib-2.0/ptest-paths.patch            | 30 ----------------------
 .../glib-2.0/glib-2.0/relocate-modules.patch       | 13 ++++++----
 .../{glib-2.0_2.54.3.bb => glib-2.0_2.56.0.bb}     |  5 ++--
 4 files changed, 17 insertions(+), 48 deletions(-)
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.54.3.bb => glib-2.0_2.56.0.bb} (82%)

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
index aee96aaa6e7..0ebf138d60a 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
@@ -1,30 +1,30 @@
-From d6501b107940e9f548c89236d773c6d33c15a5c9 Mon Sep 17 00:00:00 2001
+From d250652782b65b071b7cc8f01f2db833df104e0e Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 16 Apr 2016 13:28:59 -0700
-Subject: [PATCH 1/2] Do not ignore return value of write()
+Subject: [PATCH] Do not ignore return value of write()
 
 gcc warns about ignoring return value when compiling
 with fortify turned on.
 
 assert when write() fails
 
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
 Upstream-Status: Submitted
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
+---
  glib/tests/unix.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/glib/tests/unix.c b/glib/tests/unix.c
-index 3543458..4e7ed85 100644
+index 9d55a6c..a07f945 100644
 --- a/glib/tests/unix.c
 +++ b/glib/tests/unix.c
 @@ -32,14 +32,15 @@ test_pipe (void)
    GError *error = NULL;
    int pipefd[2];
    char buf[1024];
--  ssize_t bytes_read;
-+  ssize_t bytes_read, bytes_written;
+-  gssize bytes_read;
++  gssize bytes_read, bytes_written;
    gboolean res;
  
    res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error);
@@ -37,6 +37,3 @@ index 3543458..4e7ed85 100644
    memset (buf, 0, sizeof (buf));
    bytes_read = read (pipefd[0], buf, sizeof(buf) - 1);
    g_assert_cmpint (bytes_read, >, 0);
--- 
-2.8.0
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch b/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
deleted file mode 100644
index f3be02770cb..00000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Instead of writing the temporary mapping files in the mappedfile test to the
-user runtime directory, write them to $TMP.  The runtime directory may not
-currently exist if the test is executed on a non-desktop system and the test
-doesn't attempt to create the directory structure.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/glib/tests/mappedfile.c b/glib/tests/mappedfile.c
-index 40e0e60..27a24be 100644
---- a/glib/tests/mappedfile.c
-+++ b/glib/tests/mappedfile.c
-@@ -81,7 +81,7 @@ test_writable (void)
-   const gchar *new = "abcdefghijklmnopqrstuvxyz";
-   gchar *tmp_copy_path;
- 
--  tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL);
-+  tmp_copy_path = g_build_filename (g_get_tmp_dir (), "glib-test-4096-random-bytes", NULL);
- 
-   g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error);
-   g_assert_no_error (error);
-@@ -125,7 +125,7 @@ test_writable_fd (void)
-   int fd;
-   gchar *tmp_copy_path;
- 
--  tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL);
-+  tmp_copy_path = g_build_filename (g_get_tmp_dir (), "glib-test-4096-random-bytes", NULL);
- 
-   g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error);
-   g_assert_no_error (error);
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
index 65d5b43f9b6..d3d63b2cd15 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
@@ -1,3 +1,8 @@
+From 3edc9a063ceaf27129e0dd96a8be3942e3dd5e96 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Fri, 11 Mar 2016 15:35:55 +0000
+Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
+
 Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to
 determine where libglib.so is and use that path to calculate GIO_MODULES_DIR.
 
@@ -8,12 +13,13 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
 
 Port patch to 2.48
 Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+
 ---
  gio/giomodule.c | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/gio/giomodule.c b/gio/giomodule.c
-index da7c167..cc0bc7c 100644
+index 6937932..66852e6 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
 @@ -40,6 +40,8 @@
@@ -25,7 +31,7 @@ index da7c167..cc0bc7c 100644
  #endif
  #include <glib/gstdio.h>
  
-@@ -1036,7 +1038,15 @@ get_gio_module_dir (void)
+@@ -1050,7 +1052,15 @@ get_gio_module_dir (void)
  #endif
        g_free (install_dir);
  #else
@@ -42,6 +48,3 @@ index da7c167..cc0bc7c 100644
  #endif
      }
  
--- 
-2.1.4
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.56.0.bb
similarity index 82%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.56.0.bb
index faf594569d6..81d207c5963 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.56.0.bb
@@ -7,7 +7,6 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://configure-libtool.patch \
            file://run-ptest \
-           file://ptest-paths.patch \
            file://uclibc_musl_translation.patch \
            file://allow-run-media-sdX-drive-mount-if-username-root.patch \
            file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
@@ -20,5 +19,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
 
 SRC_URI_append_class-native = " file://relocate-modules.patch"
 
-SRC_URI[md5sum] = "16e886ad677bf07b7d48eb8188bcf759"
-SRC_URI[sha256sum] = "963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8"
+SRC_URI[md5sum] = "f2b59392f2fb514bbe7791dda0c36da5"
+SRC_URI[sha256sum] = "ecef6e17e97b8d9150d0e8a4b3edee1ac37331213b8a2a87a083deea408a0fc7"
-- 
2.16.1

[PATCH 08/22] bash-completion: update to 2.8

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../{bash-completion_2.7.bb => bash-completion_2.8.bb}              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-support/bash-completion/{bash-completion_2.7.bb => bash-completion_2.8.bb} (86%)

diff --git a/meta/recipes-support/bash-completion/bash-completion_2.7.bb b/meta/recipes-support/bash-completion/bash-completion_2.8.bb
similarity index 86%
rename from meta/recipes-support/bash-completion/bash-completion_2.7.bb
rename to meta/recipes-support/bash-completion/bash-completion_2.8.bb
index f519b3f3da4..85064343e30 100644
--- a/meta/recipes-support/bash-completion/bash-completion_2.7.bb
+++ b/meta/recipes-support/bash-completion/bash-completion_2.8.bb
@@ -9,8 +9,8 @@ SECTION = "console/utils"
 
 SRC_URI = "https://github.com/scop/bash-completion/releases/download/${PV}/${BPN}-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "28117492bdc9408438e6041683a423ce"
-SRC_URI[sha256sum] = "41ba892d3f427d4a686de32673f35401bc947a7801f684127120cdb13641441e"
+SRC_URI[md5sum] = "201b6ae62f7d5fb5b1b25e34427db919"
+SRC_URI[sha256sum] = "c01f5570f5698a0dda8dc9cfb2a83744daa1ec54758373a6e349bd903375f54d"
 UPSTREAM_CHECK_REGEX = "bash-completion-(?P<pver>(?!2008).+)\.tar"
 UPSTREAM_CHECK_URI = "https://github.com/scop/bash-completion/releases"
 
@@ -25,7 +25,7 @@ do_install_append() {
 
 	# Delete files already provided by util-linux
 	local i
-	for i in mount umount rfkill; do
+	for i in mount umount; do
 		rm ${D}${datadir}/${BPN}/completions/$i
 	done
 }
-- 
2.16.1

[PATCH 09/22] webkitgtk: update to 2.20.0

[Alexander Kanavin]

Rebase patches, remove a couple of upstreamed patches.

Add an option to enable woff2 font library (not currently packaged by oe).

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../webkitgtk/0001-Fix-build-with-musl.patch       | 28 +++++-----
 ...01-Fix-gles3-header-when-gles2-is-enabled.patch | 38 -------------
 ...ix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 63 +++++++++++-----------
 ...cmake-drop-the-hardcoded-introspection-gt.patch | 15 +++---
 ...bKitMacros-Append-to-I-and-not-to-isystem.patch | 52 +++++++++---------
 ...ng-introspection-files-add-CMAKE_C_FLAGS-.patch | 47 ++++++++--------
 .../detect-atomics-during-configure.patch          | 17 +++---
 .../webkitgtk/fix-configure-failure-aarch64.patch  | 29 ----------
 .../webkit/webkitgtk/x32_support.patch             | 24 +++++----
 .../{webkitgtk_2.18.6.bb => webkitgtk_2.20.0.bb}   |  8 +--
 10 files changed, 124 insertions(+), 197 deletions(-)
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch
 rename meta/recipes-sato/webkit/{webkitgtk_2.18.6.bb => webkitgtk_2.20.0.bb} (95%)

diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
index 7cc4514fccc..041ec4675f1 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
@@ -1,24 +1,25 @@
-From 415e31bd5444fa360af58b069f1b9db6607fca7d Mon Sep 17 00:00:00 2001
+From 4f9d736e0458ed33cd161cd164ad0acdac939f44 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Fri, 6 Oct 2017 17:00:08 +0300
 Subject: [PATCH] Fix build with musl
 
 Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
 ---
- Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++-----
+ Source/JavaScriptCore/runtime/MachineContext.h | 18 +++++++++++++++++-
  Source/WTF/wtf/Platform.h                      |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ 2 files changed, 18 insertions(+), 2 deletions(-)
 
 diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h
-index 95080b9..2bb689c 100644
+index bf0bdc7..84b8a8a 100644
 --- a/Source/JavaScriptCore/runtime/MachineContext.h
 +++ b/Source/JavaScriptCore/runtime/MachineContext.h
 @@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext)
  #error Unknown Architecture
  #endif
  
--#elif defined(__GLIBC__)
+-#elif defined(__GLIBC__) || defined(__BIONIC__)
 +#elif defined(__linux__)
  
  #if CPU(X86)
@@ -27,7 +28,7 @@ index 95080b9..2bb689c 100644
  #error Unknown Architecture
  #endif
  
--#elif defined(__GLIBC__)
+-#elif defined(__GLIBC__) || defined(__BIONIC__)
 +#elif defined(__linux__)
  
  // The following sequence depends on glibc's sys/ucontext.h.
@@ -36,7 +37,7 @@ index 95080b9..2bb689c 100644
  #error Unknown Architecture
  #endif
  
--#elif defined(__GLIBC__)
+-#elif defined(__GLIBC__) || defined(__BIONIC__)
 +#elif defined(__linux__)
  
  // The following sequence depends on glibc's sys/ucontext.h.
@@ -45,7 +46,7 @@ index 95080b9..2bb689c 100644
  #error Unknown Architecture
  #endif
  
--#elif defined(__GLIBC__)
+-#elif defined(__GLIBC__) || defined(__BIONIC__)
 +#elif defined(__linux__)
  
  // The following sequence depends on glibc's sys/ucontext.h.
@@ -54,24 +55,21 @@ index 95080b9..2bb689c 100644
  #error Unknown Architecture
  #endif
  
--#elif defined(__GLIBC__)
+-#elif defined(__GLIBC__) || defined(__BIONIC__)
 +#elif defined(__linux__)
  
  // The following sequence depends on glibc's sys/ucontext.h.
  #if CPU(X86)
 diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
-index 5a2863b..b36c3ff 100644
+index 551c047..e50b05a 100644
 --- a/Source/WTF/wtf/Platform.h
 +++ b/Source/WTF/wtf/Platform.h
-@@ -680,7 +680,7 @@
+@@ -683,7 +683,7 @@
  #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
  #endif
  
--#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
 +#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
  #define HAVE_MACHINE_CONTEXT 1
  #endif
  
--- 
-2.14.1
-
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
deleted file mode 100644
index 21574072f17..00000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From adf3d4c9d4133bd6995590d921c0ccaec5254da9 Mon Sep 17 00:00:00 2001
-From: Bhargava Sreekantappa Gayathri
- <bhargava.sreekantappa-gayathri@xilinx.com>
-Date: Tue, 27 Feb 2018 16:09:31 -0800
-Subject: [PATCH] Fix gles3 header when gles2 is enabled
-
-A GLES 2 application should not use gl3.h.
-Fix the gles3 header failure while compiling webkitgtk.
-
-FAILED:
-Source/WebCore/CMakeFiles/WebCore.dir/platform/graphics/GLContext.cpp.o
-           ^~~~~~~~~~~~~
-compilation terminated.
-
-Upstream-Status: Backport
-Imported patch from: https://bugs.webkit.org/show_bug.cgi?id=183008
-
-Signed-off-by: Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@xilinx.com>
-Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
----
- Source/WebCore/platform/graphics/GLContext.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp
-index 599dcc0..46d2fd4 100644
---- a/Source/WebCore/platform/graphics/GLContext.cpp
-+++ b/Source/WebCore/platform/graphics/GLContext.cpp
-@@ -31,7 +31,6 @@
- #elif USE(OPENGL_ES_2)
- #define GL_GLEXT_PROTOTYPES 1
- #include <GLES2/gl2.h>
--#include <GLES3/gl3.h>
- #endif
-
- #if USE(GLX)
---
-2.7.4
-
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
index 896890b4334..aa9a06701a7 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
@@ -1,7 +1,7 @@
-From b7f40eceef0f23bf88090789d4c5845c35f048ae Mon Sep 17 00:00:00 2001
+From 0afc194c6446e6c3242f1d706b4564e3a9cb2cee Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Mon, 29 Aug 2016 16:38:11 +0300
-Subject: [PATCH 4/9] Fix racy parallel build of WebKit2-4.0.gir
+Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir
 
 Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
@@ -11,39 +11,36 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
-index a33c6a86..d83a2e77 100644
+index a074a80..8c6ebb5 100644
 --- a/Source/WebKit/PlatformGTK.cmake
 +++ b/Source/WebKit/PlatformGTK.cmake
-@@ -1122,8 +1122,9 @@ endif ()
- string(REGEX MATCHALL "-L[^ ]*"
-     INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+@@ -728,8 +728,9 @@ if (ENABLE_INTROSPECTION)
+     string(REGEX MATCHALL "-L[^ ]*"
+         INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
  
--add_custom_command(
--    OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
-+# This is a target and not a command because it's used to build another .gir
-+# and a .typelib, which would trigger two racy parallel builds when using command
-+add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir
-     DEPENDS WebKit2
-     DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
-     COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
-@@ -1168,7 +1169,7 @@ add_custom_command(
- add_custom_command(
-     OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
-     DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
--    DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
-+    DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
-     COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
-         LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
-         ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
-@@ -1225,7 +1226,7 @@ add_custom_command(
+-    add_custom_command(
+-        OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
++    # This is a target and not a command because it's used to build another .gir
++    # and a .typelib, which would trigger two racy parallel builds when using command
++    add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir
+         DEPENDS WebKit
+         DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
+         COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
+@@ -773,7 +774,7 @@ if (ENABLE_INTROSPECTION)
+     add_custom_command(
+         OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
+         DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
+-        DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
++        DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
+         COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
+             LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
+             ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
+@@ -828,7 +829,7 @@ if (ENABLE_INTROSPECTION)
  
- add_custom_command(
-     OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
--    DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
-+    DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
-     COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
- )
+     add_custom_command(
+         OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
+-        DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
++        DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
+         COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
+     )
  
--- 
-2.14.1
-
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
index 0f6eeed1a2e..e8d1d8c341a 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
@@ -1,4 +1,4 @@
-From 48648570e449cf7f84a26dc03c1e3f620fa69757 Mon Sep 17 00:00:00 2001
+From bed4cf4aaa6aad4172ec9942e9039fb8e1ef68a4 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Mon, 29 Feb 2016 18:13:39 +0200
 Subject: [PATCH] OptionsGTK.cmake: drop the hardcoded introspection/gtkdoc
@@ -11,16 +11,17 @@ through the use of qemu target emulation.
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 
 Upstream-Status: Pending
+
 ---
  Source/cmake/OptionsGTK.cmake | 6 ------
  1 file changed, 6 deletions(-)
 
-Index: webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake
-===================================================================
---- webkitgtk-2.12.1.orig/Source/cmake/OptionsGTK.cmake
-+++ webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake
-@@ -424,12 +424,6 @@ if (USE_LIBHYPHEN)
-     endif ()
+diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
+index 661b40e..404441b 100644
+--- a/Source/cmake/OptionsGTK.cmake
++++ b/Source/cmake/OptionsGTK.cmake
+@@ -352,12 +352,6 @@ if (ENABLED_COMPILER_SANITIZERS)
+     set(ENABLE_INTROSPECTION OFF)
  endif ()
  
 -# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building.
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
index 9fc1421fdd6..034219f8269 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
@@ -1,7 +1,7 @@
-From ef832a115b40861c08df333339b1366da49e5393 Mon Sep 17 00:00:00 2001
+From e1c6540f7984bd48e1e2d80d965fa82c70de3c20 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 17 Apr 2016 12:35:41 -0700
-Subject: [PATCH 9/9] WebKitMacros: Append to -I and not to -isystem
+Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem
 
 gcc-6 has now introduced stdlib.h in libstdc++ for better
 compliance and its including the C library stdlib.h using
@@ -17,6 +17,7 @@ and ends up with compile errors e.g.
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 Upstream-Status: Pending
+
 ---
  Source/JavaScriptCore/shell/CMakeLists.txt | 2 +-
  Source/WebCore/PlatformGTK.cmake           | 6 +++---
@@ -27,23 +28,23 @@ Upstream-Status: Pending
  6 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
-index bc37dd31..4e49871f 100644
+index b3c7e0b..88446de 100644
 --- a/Source/JavaScriptCore/shell/CMakeLists.txt
 +++ b/Source/JavaScriptCore/shell/CMakeLists.txt
 @@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
  WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
  WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
- include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
+ include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_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})
  
 diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
-index 73506c74..8eb8b415 100644
+index 32c6ccc..fef5e8b 100644
 --- a/Source/WebCore/PlatformGTK.cmake
 +++ b/Source/WebCore/PlatformGTK.cmake
-@@ -281,7 +281,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
+@@ -159,7 +159,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
          ${GTK2_INCLUDE_DIRS}
          ${GDK2_INCLUDE_DIRS}
      )
@@ -52,7 +53,7 @@ index 73506c74..8eb8b415 100644
          ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
      )
      target_link_libraries(WebCorePlatformGTK2
-@@ -305,7 +305,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
+@@ -183,7 +183,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
  target_include_directories(WebCorePlatformGTK PRIVATE
      ${WebCore_INCLUDE_DIRECTORIES}
  )
@@ -61,7 +62,7 @@ index 73506c74..8eb8b415 100644
      ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
      ${GTK_INCLUDE_DIRS}
      ${GDK_INCLUDE_DIRS}
-@@ -321,7 +321,7 @@ include_directories(
+@@ -199,7 +199,7 @@ include_directories(
      "${WEBCORE_DIR}/bindings/gobject/"
  )
  
@@ -71,33 +72,33 @@ index 73506c74..8eb8b415 100644
  )
  
 diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
-index d83a2e77..401246f4 100644
+index 8c6ebb5..772c243 100644
 --- a/Source/WebKit/PlatformGTK.cmake
 +++ b/Source/WebKit/PlatformGTK.cmake
-@@ -1050,7 +1050,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
+@@ -655,7 +655,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
      target_include_directories(WebKitPluginProcess2 PRIVATE
-         ${WebKit2CommonIncludeDirectories}
+         ${WebKitCommonIncludeDirectories}
      )
 -    target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
 +    target_include_directories(WebKitPluginProcess2 PRIVATE
-          ${WebKit2CommonSystemIncludeDirectories}
+          ${WebKitCommonSystemIncludeDirectories}
           ${GTK2_INCLUDE_DIRS}
           ${GDK2_INCLUDE_DIRS}
 diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
-index 7bc89543..d9818fa4 100644
+index a1e7e8f..ce24274 100644
 --- a/Source/cmake/WebKitMacros.cmake
 +++ b/Source/cmake/WebKitMacros.cmake
-@@ -78,7 +78,7 @@ macro(WEBKIT_FRAMEWORK_DECLARE _target)
- endmacro()
- 
- macro(WEBKIT_FRAMEWORK _target)
--    include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
-+    include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
-     target_sources(${_target} PRIVATE
-         ${${_target}_HEADERS}
+@@ -134,7 +134,7 @@ macro(WEBKIT_FRAMEWORK _target)
          ${${_target}_SOURCES}
+     )
+     target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
+-    target_include_directories(${_target} SYSTEM PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
++    target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
+     target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>")
+     target_link_libraries(${_target} ${${_target}_LIBRARIES})
+     set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
 diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
-index e832a86d..ce92c864 100644
+index dc2b61e..0128dca 100644
 --- a/Tools/MiniBrowser/gtk/CMakeLists.txt
 +++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
 @@ -57,7 +57,7 @@ endif ()
@@ -110,11 +111,11 @@ index e832a86d..ce92c864 100644
  target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
  
 diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
-index 1be3dd52..7bdddf37 100644
+index 4aef695..a14b163 100644
 --- a/Tools/TestWebKitAPI/PlatformGTK.cmake
 +++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
 @@ -20,7 +20,7 @@ include_directories(
-     ${WEBKIT2_DIR}/UIProcess/API/gtk
+     ${WEBKIT_DIR}/UIProcess/API/gtk
  )
  
 -include_directories(SYSTEM
@@ -122,6 +123,3 @@ index 1be3dd52..7bdddf37 100644
      ${GDK3_INCLUDE_DIRS}
      ${GLIB_INCLUDE_DIRS}
      ${GTK3_INCLUDE_DIRS}
--- 
-2.14.1
-
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
index fb4c4dc9325..923d00c4bae 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
@@ -1,8 +1,8 @@
-From 98b1359a0cd87bbdb22cef98ba594440f4c57d92 Mon Sep 17 00:00:00 2001
+From f9767a479111f9c6f280c43176c33de50aee7f66 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 28 Oct 2015 14:18:57 +0200
-Subject: [PATCH 2/9] When building introspection files, add CMAKE_C_FLAGS to
- the compiler flags.
+Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the
+ compiler flags.
 
 g-ir-compiler is using a C compiler internally, so it needs to set
 the proper flags for it.
@@ -15,27 +15,24 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
-index 7f92ae72..a33c6a86 100644
+index dc6b306..a074a80 100644
 --- a/Source/WebKit/PlatformGTK.cmake
 +++ b/Source/WebKit/PlatformGTK.cmake
-@@ -1126,7 +1126,7 @@ add_custom_command(
-     OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
-     DEPENDS WebKit2
-     DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
--    COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
-+    COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
-         ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
-         ${INTROSPECTION_SCANNER}
-         --quiet
-@@ -1169,7 +1169,7 @@ add_custom_command(
-     OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
-     DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
-     DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
--    COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
-+    COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
-         LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
-         ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
-         ${INTROSPECTION_SCANNER}
--- 
-2.14.1
-
+@@ -732,7 +732,7 @@ if (ENABLE_INTROSPECTION)
+         OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
+         DEPENDS WebKit
+         DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
+-        COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
++        COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
+             ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
+             ${INTROSPECTION_SCANNER}
+             --quiet
+@@ -774,7 +774,7 @@ if (ENABLE_INTROSPECTION)
+         OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
+         DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
+         DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
+-        COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
++        COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
+             LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
+             ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
+             ${INTROSPECTION_SCANNER}
diff --git a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
index c6157e10378..bbdb64490a2 100644
--- a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
@@ -1,7 +1,7 @@
-From 0b3811771ae6385503f2d949f9433d8f810d2ff9 Mon Sep 17 00:00:00 2001
+From d907ac649ff5514826af9ad7e97e15dfcf79909c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 17 May 2017 22:34:24 -0700
-Subject: [PATCH 8/9] webkitgtk: Fix build for armv5
+Subject: [PATCH] webkitgtk: Fix build for armv5
 
 Taken from
 https://bugs.webkit.org/show_bug.cgi?id=161900
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
-index 6b5e45b9..46ee3c22 100644
+index 220bafd..4e1e9f8 100644
 --- a/Source/WTF/wtf/CMakeLists.txt
 +++ b/Source/WTF/wtf/CMakeLists.txt
-@@ -205,7 +205,6 @@ set(WTF_HEADERS
+@@ -315,7 +315,6 @@ set(WTF_HEADERS
  
  set(WTF_SOURCES
      Assertions.cpp
@@ -25,7 +25,7 @@ index 6b5e45b9..46ee3c22 100644
      AutomaticThread.cpp
      BitVector.cpp
      CPUTime.cpp
-@@ -336,6 +335,15 @@ if (NOT USE_SYSTEM_MALLOC)
+@@ -458,6 +457,15 @@ if (NOT USE_SYSTEM_MALLOC)
      list(APPEND WTF_LIBRARIES bmalloc)
  endif ()
  
@@ -39,8 +39,5 @@ index 6b5e45b9..46ee3c22 100644
 +file(REMOVE ${CMAKE_BINARY_DIR}/test_atomics.cpp)
 +
  list(APPEND WTF_SOURCES
-     unicode/icu/CollatorICU.cpp
- )
--- 
-2.14.1
-
+     unicode/CollatorDefault.cpp
+ 
diff --git a/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch b/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch
deleted file mode 100644
index 4a6ab544b2a..00000000000
--- a/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix configure failure for aarch64
-
-| -- Performing Test CXX_COMPILER_SUPPORTS_-fcolor-diagnostics - Failed
-| -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always
-| -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always - Success
-| CMake Error at Source/cmake/OptionsCommon.cmake:42 (WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG):
-|   Unknown CMake command "WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG".
-| Call Stack (most recent call first):
-|   Source/cmake/WebKitCommon.cmake:58 (include)
-|   CMakeLists.txt:166 (include)
-|
-
-Upstream-Status: Pending
-
-Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-
-Index: webkitgtk-2.14.6/Source/cmake/OptionsCommon.cmake
-===================================================================
---- webkitgtk-2.14.6.orig/Source/cmake/OptionsCommon.cmake     2018-02-15 18:56:29.315238564 -0800
-+++ webkitgtk-2.14.6/Source/cmake/OptionsCommon.cmake  2018-02-15 18:54:57.469518064 -0800
-@@ -39,7 +39,7 @@
-     if (NOT WTF_CPU_ARM64)
-         message(FATAL_ERROR "WTF_CPU_ARM64_CORTEXA53 set without WTF_CPU_ARM64")
-     endif ()
--    WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG(-mfix-cortex-a53-835769)
-+    WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-mfix-cortex-a53-835769)
- endif ()
-
- EXPOSE_VARIABLE_TO_BUILD(WTF_CPU_ARM64_CORTEXA53)
diff --git a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
index 5f23837585b..f2454b98499 100644
--- a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
@@ -1,13 +1,19 @@
+From 897563a0397266d8ceb058f172e16b06419b2593 Mon Sep 17 00:00:00 2001
 From: Daniel Schepler <dschepler@gmail.com>
-Subject: Fix FTBFS in x32
-Bug-Debian: https://bugs.debian.org/700795
-Upstream-Status: Pending
-Signed-off-by: Christopher Larson <chris_larson@mentor.com>
-Index: webkitgtk-2.16.1/Source/WTF/wtf/Platform.h
+Date: Mon, 26 Mar 2018 17:48:34 +0300
+Subject: [PATCH] Fix FTBFS in x32
+
 ===================================================================
---- webkitgtk-2.16.1.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk-2.16.1/Source/WTF/wtf/Platform.h
-@@ -172,7 +172,11 @@
+
+---
+ Source/WTF/wtf/Platform.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 850e298..551c047 100644
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -132,7 +132,11 @@
  /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
  #if   defined(__x86_64__) \
      || defined(_M_X64)
@@ -17,5 +23,5 @@ Index: webkitgtk-2.16.1/Source/WTF/wtf/Platform.h
  #define WTF_CPU_X86_64 1
 +#endif
  #define WTF_CPU_X86_SSE2 1
+ #define WTF_CPU_KNOWN 1
  #endif
- 
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb b/meta/recipes-sato/webkit/webkitgtk_2.20.0.bb
similarity index 95%
rename from meta/recipes-sato/webkit/webkitgtk_2.18.6.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.20.0.bb
index c29fa7f4c5c..50e26665782 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.20.0.bb
@@ -20,12 +20,10 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://detect-atomics-during-configure.patch \
            file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
            file://0001-Fix-build-with-musl.patch \
-           file://fix-configure-failure-aarch64.patch \
-           file://0001-Fix-gles3-header-when-gles2-is-enabled.patch \
            "
 
-SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112"
-SRC_URI[sha256sum] = "93912cc2f40f12e452be1ca4babdbdaac0ec4f828d441257a6b06c2963bbac3c"
+SRC_URI[md5sum] = "51cc47345c3ec53802718cd6fc9b746f"
+SRC_URI[sha256sum] = "57f640f720bd9a8a7207f3321cf803a15c2f207b4e7b75ff1be17bc1eeb00a3c"
 
 inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
 
@@ -56,6 +54,8 @@ PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl"
 PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl"
 PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret"
 PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen"
+# Source is at https://github.com/google/woff2
+PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2"
 
 EXTRA_OECMAKE = " \
 		-DPORT=GTK \
-- 
2.16.1

[PATCH 10/22] gsettings-desktop-schemas: update to 3.28.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...-desktop-schemas_3.24.1.bb => gsettings-desktop-schemas_3.28.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/gsettings-desktop-schemas/{gsettings-desktop-schemas_3.24.1.bb => gsettings-desktop-schemas_3.28.0.bb} (70%)

diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.24.1.bb b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.28.0.bb
similarity index 70%
rename from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.24.1.bb
rename to meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.28.0.bb
index b61fd2408f4..c2b3cd89550 100644
--- a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.24.1.bb
+++ b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.28.0.bb
@@ -9,5 +9,5 @@ DEPENDS = "glib-2.0 intltool-native"
 
 inherit gnomebase gsettings gettext gobject-introspection upstream-version-is-even
 
-SRC_URI[archive.md5sum] = "796b6ac1eff450261edd521b72e7fe6d"
-SRC_URI[archive.sha256sum] = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7"
+SRC_URI[archive.md5sum] = "370610e29b37d063ede3ef0f29c06eb9"
+SRC_URI[archive.sha256sum] = "4cb4cd7790b77e5542ec75275237613ad22f3a1f2f41903a298cf6cc996a9167"
-- 
2.16.1

[PATCH 11/22] gnome-desktop3: update to 3.28.0

[Alexander Kanavin]

Rebase 0001-Disable-libseccomp-sycall-filtering-mechanism.patch
Remove 0001-configure.ac-Remove-gnome-common-macro-calls.patch as
the lines it removes are no longer in upstream code.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...ble-libseccomp-sycall-filtering-mechanism.patch | 31 ++++++++++++--------
 ...figure.ac-Remove-gnome-common-macro-calls.patch | 33 ----------------------
 ...desktop3_3.26.2.bb => gnome-desktop3_3.28.0.bb} |  5 ++--
 3 files changed, 21 insertions(+), 48 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch
 rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.26.2.bb => gnome-desktop3_3.28.0.bb} (81%)

diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
index 10b07435c42..aa11e8a62ec 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
@@ -1,4 +1,4 @@
-From 9dfada06f8d2e02d7a04f793ba6e1d4a2aa5ffb7 Mon Sep 17 00:00:00 2001
+From 96753d85d8b53dd8f87b8f444892efffdbfab388 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Thu, 5 Oct 2017 14:54:17 +0300
 Subject: [PATCH] Disable libseccomp (sycall filtering mechanism)
@@ -7,32 +7,39 @@ Upstream forgot to make it optional, and it is not currently used in Yocto
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
 ---
- configure.ac | 11 -----------
- 1 file changed, 11 deletions(-)
+ configure.ac | 20 --------------------
+ 1 file changed, 20 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 86bcf1f..8911f19 100644
+index 118d04f..47c8894 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -157,17 +157,6 @@ else
- fi
+@@ -151,26 +151,6 @@ fi
  
  SECCOMP_PKG=""
+ enable_seccomp="no"
 -dnl Check for bubblewrap compatible platform
 -case $host_os in
 -  linux*)
--    PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp])
--    SECCOMP_PKG="libseccomp"
+-    case $host_cpu in
+-      alpha|ia64|m68k|sh4|sparc64)
+-        enable_seccomp="no (not available on this architecture)"
+-        AC_MSG_WARN("seccomp not available on this architecture")
+-        ;;
+-      *)
+-        PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp])
+-        SECCOMP_PKG="libseccomp"
+-        AC_DEFINE([ENABLE_SECCOMP], [1], [Define if using seccomp])
+-        enable_seccomp="yes"
+-        ;;
+-    esac
 -    AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define to include GNU extensions])
 -    AC_DEFINE_UNQUOTED(HAVE_BWRAP, 1, [Define to 1 if Bubblewrap support is available])
--    AC_DEFINE([ENABLE_SECCOMP], [1], [Define if using seccomp])
 -    AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "$prefix", [Path to library install prefix])
 -    ;;
 -esac
  
  dnl pkg-config dependency checks
  
--- 
-2.14.1
-
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch
deleted file mode 100644
index e95393c6b5c..00000000000
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 834bc861921fe0361f2d6a5b5716fc97a9519478 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Thu, 6 Jul 2017 13:13:45 +0300
-Subject: [PATCH] configure.ac: Remove gnome-common macro calls
-
-gnome-common is deprecated and these aren't doing much for us.
-
-Upstreamable fix would probably involve using autoconf-archive:
-Trying to avoid that dependency for now.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
----
- configure.ac | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7adcf0e..bb7659d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,9 +71,6 @@ AC_SUBST(GNOME_DATE)
- AC_SUBST(GNOME_DATE_COMMENT_START)
- AC_SUBST(GNOME_DATE_COMMENT_END)
- 
--GNOME_COMPILE_WARNINGS([maximum])
--GNOME_MAINTAINER_MODE_DEFINES
--
- AC_ARG_ENABLE(deprecation_flags,
-               [AC_HELP_STRING([--enable-deprecation-flags],
-                               [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],,
--- 
-2.1.4
-
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.0.bb
similarity index 81%
rename from meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb
rename to meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.0.bb
index 879dc9a2f6e..e23c0305775 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.0.bb
@@ -7,12 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 BPN = "gnome-desktop"
 
 inherit gnome pkgconfig upstream-version-is-even gobject-introspection
-SRC_URI[archive.md5sum] = "6cee2ecd677d87eaa0eb5ebfa7b45fb3"
-SRC_URI[archive.sha256sum] = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a"
+SRC_URI[archive.md5sum] = "3e7b67578307220a21688f28307b6789"
+SRC_URI[archive.sha256sum] = "f1df71c39e32147f6d58f53a9c05b964b00b7c98fbca090419355437c72fd59d"
 
 SRC_URI += " \
            file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
-           file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \
            file://0001-Disable-libseccomp-sycall-filtering-mechanism.patch \
            "
 
-- 
2.16.1

[PATCH 12/22] epiphany: update to 3.28.0.1

[Alexander Kanavin]

Rebase 0002-help-meson.build-disable-the-use-of-yelp.patch.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../{epiphany_3.26.6.bb => epiphany_3.28.0.1.bb}     |  6 +++---
 ...02-help-meson.build-disable-the-use-of-yelp.patch | 20 ++++++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.26.6.bb => epiphany_3.28.0.1.bb} (81%)

diff --git a/meta/recipes-gnome/epiphany/epiphany_3.26.6.bb b/meta/recipes-gnome/epiphany/epiphany_3.28.0.1.bb
similarity index 81%
rename from meta/recipes-gnome/epiphany/epiphany_3.26.6.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.28.0.1.bb
index e250f76ed1e..c878ee3229a 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.26.6.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.28.0.1.bb
@@ -13,10 +13,10 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
            file://0002-help-meson.build-disable-the-use-of-yelp.patch \
            "
-SRC_URI[archive.md5sum] = "8449968366a6f9aaff3ac228ddfc7c66"
-SRC_URI[archive.sha256sum] = "01b16aa55d312ae0f17d3136f90d8c68ac748715f119412fb1917023c6f630a8"
+SRC_URI[archive.md5sum] = "3e127d843d3f255f426ab34804f29163"
+SRC_URI[archive.sha256sum] = "7154b06837655771f2240bf378fb8ba2315ae07dbc6f45d160ca29cd6d377808"
 
 EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}"
 
-FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers"
+FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
diff --git a/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
index 249517d8f90..d4f3cc1d35f 100644
--- a/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
+++ b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
@@ -1,34 +1,30 @@
-From fc314fc3a66c92fe73e1a0cea4f49d11b29e1f45 Mon Sep 17 00:00:00 2001
+From 0048ae2d225d25cc58f378718ca6f9ddb1a228f9 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 31 Jan 2018 15:50:38 +0200
-Subject: [PATCH 2/2] help/meson.build: disable the use of yelp
+Subject: [PATCH] help/meson.build: disable the use of yelp
 
 In particular this avoids calling itstool which oe-core doesn't provide.
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
 ---
- help/meson.build | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ help/meson.build | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/help/meson.build b/help/meson.build
-index f720add..cbfeb1e 100644
+index fddcf4c..f7d76c6 100644
 --- a/help/meson.build
 +++ b/help/meson.build
-@@ -46,8 +46,8 @@ help_linguas = [
-   'sv'
+@@ -32,7 +32,7 @@ help_media = [
+   'media/web-browser.png'
  ]
  
 -gnome.yelp(meson.project_name(),
 -  sources: help_files,
 -  media: help_media,
--  languages: help_linguas,
 -)
 +#gnome.yelp(meson.project_name(),
 +#  sources: help_files,
 +#  media: help_media,
-+#  languages: help_linguas,
 +#)
--- 
-2.15.1
-
-- 
2.16.1

[PATCH 13/22] gtk-doc: update to 1.28

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch     | 12 ++++++------
 .../gtk-doc/{gtk-doc_1.27.bb => gtk-doc_1.28.bb}             |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.27.bb => gtk-doc_1.28.bb} (93%)

diff --git a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
index bfbc777ff87..b77b5a5bcd8 100644
--- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
+++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
@@ -1,7 +1,7 @@
-From 5f145621b4780cfd6a5632fcc97c45f572938efc Mon Sep 17 00:00:00 2001
+From ae29d175016accd8a05ab1e52fc6435ac6291cfc Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Mon, 5 Sep 2016 22:25:44 +0100
-Subject: [PATCH 5/5] Use native pkg-config when looking for gtk-doc.
+Subject: [PATCH] Use native pkg-config when looking for gtk-doc.
 
 Upstream-Status: Inappropriate
 Signed-off-by: Ross Burton <ross.burton@intel.com>
@@ -10,10 +10,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
  gtk-doc.m4 | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
-Index: gtk-doc-1.27/gtk-doc.m4
-===================================================================
---- gtk-doc-1.27.orig/gtk-doc.m4
-+++ gtk-doc-1.27/gtk-doc.m4
+diff --git a/gtk-doc.m4 b/gtk-doc.m4
+index 2d12f01..e5afc3f 100644
+--- a/gtk-doc.m4
++++ b/gtk-doc.m4
 @@ -25,7 +25,7 @@
  # Macro appear in them. The GNU General Public License (GPL) does govern
  # all other use of the material that constitutes the Autoconf Macro.
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.28.bb
similarity index 93%
rename from meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb
rename to meta/recipes-gnome/gtk-doc/gtk-doc_1.28.bb
index 45528111c13..a2ec6ac78f5 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.28.bb
@@ -18,8 +18,8 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation",
 PACKAGECONFIG[working-scripts] = "--with-highlight=source-highlight,--with-highlight=no,libxslt-native xmlto-native source-highlight-native python3-six"
 PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0"
 
-SRC_URI[archive.md5sum] = "b29949e0964762e474b706ce22171602"
-SRC_URI[archive.sha256sum] = "e26bd3f7080c749b1cb66c46c6bf8239e2f320a949964fb9c6d56e1b0c6d9a6f"
+SRC_URI[archive.md5sum] = "48550c33f9b9b530f9e5f397979b613a"
+SRC_URI[archive.sha256sum] = "911e29e302252c96128965ee1f4067d5431a88e00ad1023a8bc1d6b922af5715"
 SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \
            file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \
            file://conditionaltests.patch \
-- 
2.16.1

[PATCH 14/22] icu: update to 61.1

[Alexander Kanavin]

License-Update: copyright years updated, added terms for Google double-conversion

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-support/icu/{icu_60.2.bb => icu_61.1.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-support/icu/{icu_60.2.bb => icu_61.1.bb} (78%)

diff --git a/meta/recipes-support/icu/icu_60.2.bb b/meta/recipes-support/icu/icu_61.1.bb
similarity index 78%
rename from meta/recipes-support/icu/icu_60.2.bb
rename to meta/recipes-support/icu/icu_61.1.bb
index 585a92bc4cd..ffaf3508966 100644
--- a/meta/recipes-support/icu/icu_60.2.bb
+++ b/meta/recipes-support/icu/icu_61.1.bb
@@ -1,6 +1,6 @@
 require icu.inc
 
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=675f2d069434d8a1e4e6b0dcf4379226"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=63752c57bd0b365c9af9f427ef79c819"
 
 def icu_download_version(d):
     pvsplit = d.getVar('PV').split('.')
@@ -22,8 +22,8 @@ SRC_URI = "${BASE_SRC_URI} \
 SRC_URI_append_class-target = "\
            file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
           "
-SRC_URI[md5sum] = "43861b127744b3c0b9d7f386f4b9fa40"
-SRC_URI[sha256sum] = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418"
+SRC_URI[md5sum] = "68fe38999fef94d622bd6843d43c0615"
+SRC_URI[sha256sum] = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef"
 
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
 UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/"
-- 
2.16.1

[PATCH 15/22] babeltrace: update to 1.5.5

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../recipes-kernel/lttng/{babeltrace_1.5.4.bb => babeltrace_1.5.5.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-kernel/lttng/{babeltrace_1.5.4.bb => babeltrace_1.5.5.bb} (82%)

diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.4.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
similarity index 82%
rename from meta/recipes-kernel/lttng/babeltrace_1.5.4.bb
rename to meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
index a29402adb16..92d86b92e8b 100644
--- a/meta/recipes-kernel/lttng/babeltrace_1.5.4.bb
+++ b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
@@ -15,5 +15,5 @@ SRC_URI = "http://www.efficios.com/files/babeltrace/babeltrace-${PV}.tar.bz2 \
 
 EXTRA_OECONF = "--disable-debug-info"
 
-SRC_URI[md5sum] = "3e8cdafec3ac0346a389870e87bf1344"
-SRC_URI[sha256sum] = "9643039923a0abc75a25b3d594cee0017423b57f10d2b625e96ed1e8d4891fc1"
+SRC_URI[md5sum] = "7decafd46093e4e47c14e7307d498986"
+SRC_URI[sha256sum] = "409146789b4a6b81f6a275fcad932a030743d444f6de5bd4a34aaf17aa72e8ac"
-- 
2.16.1

[PATCH 16/22] libaio: update to 0.3.111

[Alexander Kanavin]

Remove:
generic-arch-dectection-for-padding-defines.patch (was a backport)
libaio_fix_for_x32.patch (is patching source code that no longer exists)

Rebase:
00_arches.patch (drop the arm bits, as they no longer exist upstream either)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../recipes-extended/libaio/libaio/00_arches.patch | 194 +++++----------------
 ...neric-arch-dectection-for-padding-defines.patch |  65 -------
 .../libaio/libaio/libaio_fix_for_x32.patch         |  61 -------
 .../{libaio_0.3.110.bb => libaio_0.3.111.bb}       |  11 +-
 4 files changed, 47 insertions(+), 284 deletions(-)
 delete mode 100644 meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch
 delete mode 100644 meta/recipes-extended/libaio/libaio/libaio_fix_for_x32.patch
 rename meta/recipes-extended/libaio/{libaio_0.3.110.bb => libaio_0.3.111.bb} (57%)

diff --git a/meta/recipes-extended/libaio/libaio/00_arches.patch b/meta/recipes-extended/libaio/libaio/00_arches.patch
index 9d6447d98a2..bec189f87ca 100644
--- a/meta/recipes-extended/libaio/libaio/00_arches.patch
+++ b/meta/recipes-extended/libaio/libaio/00_arches.patch
@@ -1,11 +1,27 @@
+From ceba1e03e5b57cdae0b3b2d2c9afebc085c986d8 Mon Sep 17 00:00:00 2001
+From: Qing He <qing.he@intel.com>
+Date: Fri, 27 Aug 2010 10:15:31 +0800
+Subject: [PATCH] libaio: add new recipe
+
 Upstream-Status: Inappropriate [embedded specific]
 
 from openembedded, added by Qing He <qing.he@intel.com>
 
-Index: libaio-0.3.110/src/syscall-m68k.h
-===================================================================
+---
+ src/syscall-m68k.h   |  78 ++++++++++++++++++
+ src/syscall-mips.h   | 223 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/syscall-parisc.h | 146 +++++++++++++++++++++++++++++++++
+ src/syscall.h        |   6 ++
+ 4 files changed, 453 insertions(+)
+ create mode 100644 src/syscall-m68k.h
+ create mode 100644 src/syscall-mips.h
+ create mode 100644 src/syscall-parisc.h
+
+diff --git a/src/syscall-m68k.h b/src/syscall-m68k.h
+new file mode 100644
+index 0000000..f440412
 --- /dev/null
-+++ libaio-0.3.110/src/syscall-m68k.h
++++ b/src/syscall-m68k.h
 @@ -0,0 +1,78 @@
 +#define __NR_io_setup		241
 +#define __NR_io_destroy		242
@@ -85,27 +101,11 @@ Index: libaio-0.3.110/src/syscall-m68k.h
 +return (type) __res; \
 +}
 +
-Index: libaio-0.3.110/src/syscall.h
-===================================================================
---- libaio-0.3.110.orig/src/syscall.h
-+++ libaio-0.3.110/src/syscall.h
-@@ -28,6 +28,12 @@
- #include "syscall-sparc.h"
- #elif defined(__aarch64__)
- #include "syscall-arm64.h"
-+#elif defined(__m68k__)
-+#include "syscall-m68k.h"
-+#elif defined(__hppa__)
-+#include "syscall-parisc.h"
-+#elif defined(__mips__)
-+#include "syscall-mips.h"
- #else
- #warning "using generic syscall method"
- #include "syscall-generic.h"
-Index: libaio-0.3.110/src/syscall-mips.h
-===================================================================
+diff --git a/src/syscall-mips.h b/src/syscall-mips.h
+new file mode 100644
+index 0000000..4142499
 --- /dev/null
-+++ libaio-0.3.110/src/syscall-mips.h
++++ b/src/syscall-mips.h
 @@ -0,0 +1,223 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
@@ -330,10 +330,11 @@ Index: libaio-0.3.110/src/syscall-mips.h
 +
 +#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
 +
-Index: libaio-0.3.110/src/syscall-parisc.h
-===================================================================
+diff --git a/src/syscall-parisc.h b/src/syscall-parisc.h
+new file mode 100644
+index 0000000..ff61746
 --- /dev/null
-+++ libaio-0.3.110/src/syscall-parisc.h
++++ b/src/syscall-parisc.h
 @@ -0,0 +1,146 @@
 +/*
 + * Linux system call numbers.
@@ -481,127 +482,20 @@ Index: libaio-0.3.110/src/syscall-parisc.h
 +    return K_INLINE_SYSCALL(sname, 5, arg1, arg2, arg3, arg4, arg5);	\
 +}
 +
-Index: libaio-0.3.110/src/syscall-arm.h
-===================================================================
---- libaio-0.3.110.orig/src/syscall-arm.h
-+++ libaio-0.3.110/src/syscall-arm.h
-@@ -114,3 +114,119 @@ type fname(type1 arg1, type2 arg2, type3
-   return (type) __res_r0;						\
- }
- 
-+/*
-+ *  linux/include/asm-arm/unistd.h
-+ *
-+ *  Copyright (C) 2001-2005 Russell King
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Please forward _all_ changes to this file to rmk@arm.linux.org.uk,
-+ * no matter what the change is.  Thanks!
-+ */
-+
-+#define __NR_OABI_SYSCALL_BASE	0x900000
-+
-+#if defined(__thumb__) || defined(__ARM_EABI__)
-+#define __NR_SYSCALL_BASE	0
-+#else
-+#define __NR_SYSCALL_BASE	__NR_OABI_SYSCALL_BASE
-+#endif
-+
-+#define __NR_io_setup			(__NR_SYSCALL_BASE+243)
-+#define __NR_io_destroy			(__NR_SYSCALL_BASE+244)
-+#define __NR_io_getevents		(__NR_SYSCALL_BASE+245)
-+#define __NR_io_submit			(__NR_SYSCALL_BASE+246)
-+#define __NR_io_cancel			(__NR_SYSCALL_BASE+247)
-+
-+#define __sys2(x) #x
-+#define __sys1(x) __sys2(x)
-+
-+#if defined(__thumb__) || defined(__ARM_EABI__)
-+#define __SYS_REG(name) register long __sysreg __asm__("r7") = __NR_##name;
-+#define __SYS_REG_LIST(regs...) "r" (__sysreg) , ##regs
-+#define __syscall(name) "swi\t0"
-+#else
-+#define __SYS_REG(name)
-+#define __SYS_REG_LIST(regs...) regs
-+#define __syscall(name) "swi\t" __sys1(__NR_##name) ""
-+#endif
-+
-+#define io_syscall1(type,fname,sname,type1,arg1)			\
-+type fname(type1 arg1) {						\
-+  __SYS_REG(sname)							\
-+  register long __r0 __asm__("r0") = (long)arg1;			\
-+  register long __res_r0 __asm__("r0");					\
-+  __asm__ __volatile__ (						\
-+  __syscall(sname)							\
-+	: "=r" (__res_r0)						\
-+	: __SYS_REG_LIST( "0" (__r0) )					\
-+	: "memory" );							\
-+  return (type) __res_r0;						\
-+}
-+
-+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2)		\
-+type fname(type1 arg1,type2 arg2) {					\
-+  __SYS_REG(sname)							\
-+  register long __r0 __asm__("r0") = (long)arg1;			\
-+  register long __r1 __asm__("r1") = (long)arg2;			\
-+  register long __res_r0 __asm__("r0");					\
-+  __asm__ __volatile__ (						\
-+  __syscall(sname)							\
-+	: "=r" (__res_r0)						\
-+	: __SYS_REG_LIST( "0" (__r0), "r" (__r1) )			\
-+	: "memory" );							\
-+  return (type) __res_r0;						\
-+}
-+
-+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3)	\
-+type fname(type1 arg1,type2 arg2,type3 arg3) {				\
-+  __SYS_REG(sname)							\
-+  register long __r0 __asm__("r0") = (long)arg1;			\
-+  register long __r1 __asm__("r1") = (long)arg2;			\
-+  register long __r2 __asm__("r2") = (long)arg3;			\
-+  register long __res_r0 __asm__("r0");					\
-+  __asm__ __volatile__ (						\
-+  __syscall(sname)							\
-+	: "=r" (__res_r0)						\
-+	: __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2) )		\
-+	: "memory" );							\
-+  return (type) __res_r0;						\
-+}
-+
-+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\
-+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {		\
-+  __SYS_REG(sname)							\
-+  register long __r0 __asm__("r0") = (long)arg1;			\
-+  register long __r1 __asm__("r1") = (long)arg2;			\
-+  register long __r2 __asm__("r2") = (long)arg3;			\
-+  register long __r3 __asm__("r3") = (long)arg4;			\
-+  register long __res_r0 __asm__("r0");					\
-+  __asm__ __volatile__ (						\
-+  __syscall(sname)							\
-+	: "=r" (__res_r0)						\
-+	: __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), "r" (__r3) ) \
-+	: "memory" );							\
-+  return (type) __res_r0;						\
-+}
-+
-+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5)	\
-+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) {\
-+  __SYS_REG(sname)							\
-+  register long __r0 __asm__("r0") = (long)arg1;			\
-+  register long __r1 __asm__("r1") = (long)arg2;			\
-+  register long __r2 __asm__("r2") = (long)arg3;			\
-+  register long __r3 __asm__("r3") = (long)arg4;			\
-+  register long __r4 __asm__("r4") = (long)arg5;			\
-+  register long __res_r0 __asm__("r0");					\
-+  __asm__ __volatile__ (						\
-+  __syscall(sname)							\
-+	: "=r" (__res_r0)						\
-+	: __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2),		\
-+			  "r" (__r3), "r" (__r4) )			\
-+	: "memory" );							\
-+  return (type) __res_r0;						\
-+}
-+
+diff --git a/src/syscall.h b/src/syscall.h
+index 9b9e9c1..9ecd3b4 100644
+--- a/src/syscall.h
++++ b/src/syscall.h
+@@ -29,6 +29,12 @@
+ #include "syscall-sparc.h"
+ #elif defined(__aarch64__) || defined(__riscv)
+ #include "syscall-generic.h"
++#elif defined(__m68k__)
++#include "syscall-m68k.h"
++#elif defined(__hppa__)
++#include "syscall-parisc.h"
++#elif defined(__mips__)
++#include "syscall-mips.h"
+ #else
+ #warning "using system call numbers from sys/syscall.h"
+ #endif
diff --git a/meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch b/meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch
deleted file mode 100644
index bba7e554af3..00000000000
--- a/meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Nathan Rossi <nathan.rossi@xilinx.com>
-Date: Tue, 27 Jan 2015 14:59:35 +1000
-Subject: [PATCH] Generic arch dectection for padding defines
-
-When available use the GNU C defines for endian and bitwidth to
-determine the padding required. This reduces the need to define the
-padding selection for every architecture.
-
-Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
-Upstream-Status: Backport
----
- src/libaio.h | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/src/libaio.h b/src/libaio.h
-index 1223146..4a4e0f5 100644
---- a/src/libaio.h
-+++ b/src/libaio.h
-@@ -52,14 +52,18 @@ typedef enum io_iocb_cmd {
- /* little endian, 32 bits */
- #if defined(__i386__) || (defined(__arm__) && !defined(__ARMEB__)) || \
-     defined(__sh__) || defined(__bfin__) || defined(__MIPSEL__) || \
--    defined(__cris__)
-+    defined(__cris__) || \
-+    (defined(__GNUC__) && defined(__BYTE_ORDER__) && \
-+         __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && __SIZEOF_LONG__ == 4)
- #define PADDED(x, y)	x; unsigned y
- #define PADDEDptr(x, y)	x; unsigned y
- #define PADDEDul(x, y)	unsigned long x; unsigned y
- 
- /* little endian, 64 bits */
- #elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) || \
--      (defined(__aarch64__) && defined(__AARCH64EL__))
-+      (defined(__aarch64__) && defined(__AARCH64EL__)) || \
-+      (defined(__GNUC__) && defined(__BYTE_ORDER__) && \
-+          __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && __SIZEOF_LONG__ == 8)
- #define PADDED(x, y)	x, y
- #define PADDEDptr(x, y)	x
- #define PADDEDul(x, y)	unsigned long x
-@@ -67,7 +71,9 @@ typedef enum io_iocb_cmd {
- /* big endian, 64 bits */
- #elif defined(__powerpc64__) || defined(__s390x__) || \
-       (defined(__sparc__) && defined(__arch64__)) || \
--      (defined(__aarch64__) && defined(__AARCH64EB__))
-+      (defined(__aarch64__) && defined(__AARCH64EB__)) || \
-+      (defined(__GNUC__) && defined(__BYTE_ORDER__) && \
-+           __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ && __SIZEOF_LONG__ == 8)
- #define PADDED(x, y)	unsigned y; x
- #define PADDEDptr(x,y)	x
- #define PADDEDul(x, y)	unsigned long x
-@@ -76,7 +82,9 @@ typedef enum io_iocb_cmd {
- #elif defined(__PPC__) || defined(__s390__) || \
-       (defined(__arm__) && defined(__ARMEB__)) || \
-       defined(__sparc__) || defined(__MIPSEB__) || defined(__m68k__) || \
--      defined(__hppa__) || defined(__frv__) || defined(__avr32__)
-+      defined(__hppa__) || defined(__frv__) || defined(__avr32__) || \
-+      (defined(__GNUC__) && defined(__BYTE_ORDER__) && \
-+           __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ && __SIZEOF_LONG__ == 4)
- #define PADDED(x, y)	unsigned y; x
- #define PADDEDptr(x, y)	unsigned y; x
- #define PADDEDul(x, y)	unsigned y; unsigned long x
--- 
-2.1.1
-
diff --git a/meta/recipes-extended/libaio/libaio/libaio_fix_for_x32.patch b/meta/recipes-extended/libaio/libaio/libaio_fix_for_x32.patch
deleted file mode 100644
index dc4ba505b97..00000000000
--- a/meta/recipes-extended/libaio/libaio/libaio_fix_for_x32.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Upstream-Status: Pending
-
-Properly load arguments 5 an 6 for x86-64 syscall
-Use asm ("r10") and asm ("r8") to load arguments 5 an 6 for x86-64
-syscall so that it works with both x32 and x86-64.
-
-Received this patch from H.J. Lu <hjl.tools@gmail.com>
-
-Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
-2011/12/02
-
---- libaio-0.3.109/src/syscall-x86_64.h.x32	2009-10-09 11:17:02.000000000 -0700
-+++ libaio-0.3.109/src/syscall-x86_64.h	2011-12-02 09:09:07.537603224 -0800
-@@ -1,8 +1,18 @@
-+#ifndef __NR_io_setup
- #define __NR_io_setup		206
-+#endif
-+#ifndef __NR_io_destroy
- #define __NR_io_destroy		207
-+#endif
-+#ifndef __NR_io_getevents
- #define __NR_io_getevents	208
-+#endif
-+#ifndef __NR_io_submit
- #define __NR_io_submit		209
-+#endif
-+#ifndef __NR_io_cancel
- #define __NR_io_cancel		210
-+#endif
- 
- #define __syscall_clobber "r11","rcx","memory" 
- #define __syscall "syscall"
-@@ -42,10 +52,11 @@ return __res;								\
- type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4)		\
- {									\
- long __res;								\
--__asm__ volatile ("movq %5,%%r10 ;" __syscall				\
-+register long __a4 asm ("r10") = (long) arg4;				\
-+__asm__ volatile (__syscall						\
- 	: "=a" (__res)							\
- 	: "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)),	\
--	  "d" ((long)(arg3)),"g" ((long)(arg4)) : __syscall_clobber,"r10" ); \
-+	  "d" ((long)(arg3)),"r" (__a4)); \
- return __res;								\
- } 
- 
-@@ -54,10 +65,11 @@ return __res;								\
- type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5)	\
- {									\
- long __res;								\
--__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " __syscall		\
-+register long __a4 asm ("r10") = (long) arg4;				\
-+register long __a5 asm ("r8") = (long) arg5;				\
-+__asm__ volatile ( __syscall						\
- 	: "=a" (__res)							\
- 	: "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)),	\
--	  "d" ((long)(arg3)),"g" ((long)(arg4)),"g" ((long)(arg5)) :	\
--	__syscall_clobber,"r8","r10" );					\
-+	  "d" ((long)(arg3)),"r" (__a4),"r" (__a5));			\
- return __res;								\
- }
diff --git a/meta/recipes-extended/libaio/libaio_0.3.110.bb b/meta/recipes-extended/libaio/libaio_0.3.111.bb
similarity index 57%
rename from meta/recipes-extended/libaio/libaio_0.3.110.bb
rename to meta/recipes-extended/libaio/libaio_0.3.111.bb
index 75975d4ab7d..5bd83078acc 100644
--- a/meta/recipes-extended/libaio/libaio_0.3.110.bb
+++ b/meta/recipes-extended/libaio/libaio_0.3.111.bb
@@ -5,19 +5,14 @@ HOMEPAGE = "http://lse.sourceforge.net/io/aio.html"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
 
-SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/liba/${BPN}/${BPN}_${PV}.orig.tar.gz \
-           file://generic-arch-dectection-for-padding-defines.patch \
+SRC_URI = "git://pagure.io/libaio.git;protocol=https \
            file://00_arches.patch \
            file://destdir.patch \
-           file://libaio_fix_for_x32.patch \
            file://libaio_fix_for_mips_syscalls.patch \
            file://system-linkage.patch \
            "
-
-SRC_URI[md5sum] = "2a35602e43778383e2f4907a4ca39ab8"
-SRC_URI[sha256sum] = "e019028e631725729376250e32b473012f7cb68e1f7275bfc1bbcdd0f8745f7e"
-
-UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/liba/libaio/"
+SRCREV = "f66be22ab0a59a39858900ab72a8c6a6e8b0b7ec"
+S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}"
 
-- 
2.16.1

[PATCH 17/22] meson: update to 0.45.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...ix-issues-that-arise-when-cross-compiling.patch | 34 ++++++++++------------
 .../meson/{meson_0.44.1.bb => meson_0.45.1.bb}     |  4 +--
 2 files changed, 18 insertions(+), 20 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.44.1.bb => meson_0.45.1.bb} (83%)

diff --git a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
index 1912e94358e..a00743fda84 100644
--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
@@ -1,7 +1,7 @@
-From c5692cac9c555664281377a82bf8b1e46934f437 Mon Sep 17 00:00:00 2001
+From d1c2b3bf01f1a5897cf5c906ba2326fb68c6af12 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Fri, 4 Aug 2017 16:16:41 +0300
-Subject: [PATCH 1/3] gtkdoc: fix issues that arise when cross-compiling
+Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling
 
 Specifically:
 1) Make it possible to specify a wrapper for executing binaries
@@ -21,10 +21,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  2 files changed, 22 insertions(+), 5 deletions(-)
 
 diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index 56765a5..4f7fe30 100644
+index 569011e..770ff4f 100644
 --- a/mesonbuild/modules/gnome.py
 +++ b/mesonbuild/modules/gnome.py
-@@ -769,6 +769,10 @@ This will become a hard error in the future.''')
+@@ -773,6 +773,10 @@ This will become a hard error in the future.''')
                  '--mode=' + mode]
          if namespace:
              args.append('--namespace=' + namespace)
@@ -35,10 +35,10 @@ index 56765a5..4f7fe30 100644
          args += self._unpack_args('--htmlargs=', 'html_args', kwargs)
          args += self._unpack_args('--scanargs=', 'scan_args', kwargs)
          args += self._unpack_args('--scanobjsargs=', 'scanobjs_args', kwargs)
-@@ -796,14 +800,22 @@ This will become a hard error in the future.''')
-                 raise MesonException(
-                     'Gir include dirs should be include_directories().')
+@@ -829,14 +833,22 @@ This will become a hard error in the future.''')
          cflags.update(get_include_args(inc_dirs))
+         cflags.update(state.environment.coredata.external_args['c'])
+         ldflags.update(state.environment.coredata.external_link_args['c'])
 +
 +        cross_c_args = " ".join(state.environment.cross_info.config["properties"].get('c_args', ""))
 +        cross_link_args = " ".join(state.environment.cross_info.config["properties"].get('c_link_args', ""))
@@ -62,26 +62,27 @@ index 56765a5..4f7fe30 100644
          return args
  
 diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py
-index 4406b28..b846827 100644
+index 2a5ee8b..2fd692b 100644
 --- a/mesonbuild/scripts/gtkdochelper.py
 +++ b/mesonbuild/scripts/gtkdochelper.py
-@@ -44,13 +44,14 @@ parser.add_argument('--ignore-headers', dest='ignore_headers', default='')
+@@ -45,6 +45,7 @@ parser.add_argument('--ignore-headers', dest='ignore_headers', default='')
  parser.add_argument('--namespace', dest='namespace', default='')
  parser.add_argument('--mode', dest='mode', default='')
  parser.add_argument('--installdir', dest='install_dir')
 +parser.add_argument('--gtkdoc-exe-wrapper', dest='gtkdoc_exe_wrapper')
  
- def gtkdoc_run_check(cmd, cwd):
-     # Put stderr into stdout since we want to print it out anyway.
+ def gtkdoc_run_check(cmd, cwd, library_path=None):
+     env = dict(os.environ)
+@@ -54,7 +55,7 @@ def gtkdoc_run_check(cmd, cwd, library_path=None):
      # This preserves the order of messages.
-     p, out = Popen_safe(cmd, cwd=cwd, stderr=subprocess.STDOUT)[0:2]
+     p, out = Popen_safe(cmd, cwd=cwd, env=env, stderr=subprocess.STDOUT)[0:2]
      if p.returncode != 0:
 -        err_msg = ["{!r} failed with status {:d}".format(cmd[0], p.returncode)]
 +        err_msg = ["{!r} failed with status {:d}".format(cmd, p.returncode)]
          if out:
              err_msg.append(out)
          raise MesonException('\n'.join(err_msg))
-@@ -58,7 +59,7 @@ def gtkdoc_run_check(cmd, cwd):
+@@ -62,7 +63,7 @@ def gtkdoc_run_check(cmd, cwd, library_path=None):
  def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs,
                   main_file, module,
                   html_args, scan_args, fixxref_args, mkdb_args,
@@ -90,7 +91,7 @@ index 4406b28..b846827 100644
                   html_assets, content_files, ignore_headers, namespace,
                   expand_content_files, mode):
      print("Building documentation for %s" % module)
-@@ -111,6 +112,9 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs,
+@@ -115,6 +116,9 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs,
      if gobject_typesfile:
          scanobjs_cmd = ['gtkdoc-scangobj'] + scanobjs_args + ['--types=' + gobject_typesfile,
                                                                '--module=' + module,
@@ -100,7 +101,7 @@ index 4406b28..b846827 100644
                                                                '--cflags=' + cflags,
                                                                '--ldflags=' + ldflags,
                                                                '--ld=' + ld]
-@@ -207,6 +211,7 @@ def run(args):
+@@ -219,6 +223,7 @@ def run(args):
          mkdbargs,
          options.gobject_typesfile,
          scanobjsargs,
@@ -108,6 +109,3 @@ index 4406b28..b846827 100644
          options.ld,
          options.cc,
          options.ldflags,
--- 
-2.15.0
-
diff --git a/meta/recipes-devtools/meson/meson_0.44.1.bb b/meta/recipes-devtools/meson/meson_0.45.1.bb
similarity index 83%
rename from meta/recipes-devtools/meson/meson_0.44.1.bb
rename to meta/recipes-devtools/meson/meson_0.45.1.bb
index 6a81dab2650..9decdd0c24c 100644
--- a/meta/recipes-devtools/meson/meson_0.44.1.bb
+++ b/meta/recipes-devtools/meson/meson_0.45.1.bb
@@ -10,8 +10,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/${BP}.tar
            file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \
            file://0003-native_bindir.patch \
            "
-SRC_URI[md5sum] = "82b1198bf714b5a4da84bfe8376c79cc"
-SRC_URI[sha256sum] = "2ea1a721574adb23160b6481191bcc1173f374e02b0ff3bb0ae85d988d97e4fa"
+SRC_URI[md5sum] = "4d9c7b3a7365b7b472f00af14e034949"
+SRC_URI[sha256sum] = "4d0bb0dbb1bb556cb7a4092fdfea3d6e76606bd739a4bc97481c2d7bc6200afb"
 UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
 
 inherit setuptools3
-- 
2.16.1

[PATCH 18/22] btrfs-tools: update to 4.15.1

[Alexander Kanavin]

Drop upstreamed 0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch

Add ftw-subdir-walk.patch as it resolves the RECIPE_NO_UPDATE_REASON.

Add --disable-zstd as libzstd isn't provided in oe-core.

Fix wic testcase, as the minimal fs size is now bigger.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/lib/oeqa/selftest/cases/wic.py                |  2 +-
 ...ith-musl-missing-header-include-for-dev_t.patch | 26 --------
 .../btrfs-tools/btrfs-tools/ftw-subdir-walk.patch  | 69 ++++++++++++++++++++++
 ...btrfs-tools_4.13.3.bb => btrfs-tools_4.15.1.bb} |  6 +-
 4 files changed, 73 insertions(+), 30 deletions(-)
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/ftw-subdir-walk.patch
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.13.3.bb => btrfs-tools_4.15.1.bb} (84%)

diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index b84466d9aef..055175212a6 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -765,7 +765,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r
                             'part emptyvfat   --fstype vfat   --size 1M\n',
                             'part emptymsdos  --fstype msdos  --size 1M\n',
                             'part emptyext2   --fstype ext2   --size 1M\n',
-                            'part emptybtrfs  --fstype btrfs  --size 100M\n'])
+                            'part emptybtrfs  --fstype btrfs  --size 150M\n'])
             wks.flush()
             cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir)
             self.assertEqual(0, runCmd(cmd).status)
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch
deleted file mode 100644
index 790676b9cbf..00000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From bc35c4caebb57cc8b96c30c25432b12ca8dc18d5 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 6 Oct 2017 15:03:49 +0300
-Subject: [PATCH] Fix build with musl (missing header include for dev_t).
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- convert/source-fs.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/convert/source-fs.h b/convert/source-fs.h
-index 23f3356..6fd770f 100644
---- a/convert/source-fs.h
-+++ b/convert/source-fs.h
-@@ -20,6 +20,7 @@
- #include "kerncompat.h"
- #include <linux/kdev_t.h>
- #include <pthread.h>
-+#include <sys/types.h>
- 
- #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID
- 
--- 
-2.14.1
-
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/ftw-subdir-walk.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/ftw-subdir-walk.patch
new file mode 100644
index 00000000000..fbe0c47849f
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/ftw-subdir-walk.patch
@@ -0,0 +1,69 @@
+From patchwork Wed Mar 28 06:39:09 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: btrfs-progs: mkfs/rootdir: Don't follow symbolic link when calcuating
+ size
+From: Qu Wenruo <wqu@suse.com>
+X-Patchwork-Id: 10312225
+Message-Id: <20180328063909.937-1-wqu@suse.com>
+To: linux-btrfs@vger.kernel.org
+Date: Wed, 28 Mar 2018 14:39:09 +0800
+
+[BUG]
+If we have a symbolic link in rootdir pointing to non-existing location,
+mkfs.btrfs --rootdir will just fail:
+------
+$ mkfs.btrfs  -f --rootdir /tmp/rootdir/ /dev/data/btrfs
+btrfs-progs v4.15.1
+See http://btrfs.wiki.kernel.org for more information.
+
+ERROR: ftw subdir walk of /tmp/rootdir/ failed: No such file or directory
+------
+
+[CAUSE]
+Commit 599a0abed564 ("btrfs-progs: mkfs/rootdir: Use over-reserve method
+to make size estimate easier") add extra ftw walk to estimate the
+filesystem size.
+
+Such default ftw walk will follow symbolic link and gives ENOENT error.
+
+[FIX]
+Use nftw() to specify FTW_PHYS so we won't follow symbolic link for size
+calculation.
+
+Reported-by: Alexander Kanavin <alexander.kanavin@intel.com>
+Fixes: 599a0abed564 ("btrfs-progs: mkfs/rootdir: Use over-reserve method to make size estimate easier")
+Signed-off-by: Qu Wenruo <wqu@suse.com>
+Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10312225/]
+---
+ mkfs/rootdir.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c
+index a1d223a2408a..33c3ff1e18cf 100644
+--- a/mkfs/rootdir.c
++++ b/mkfs/rootdir.c
+@@ -696,7 +696,7 @@ out:
+ }
+ 
+ static int ftw_add_entry_size(const char *fpath, const struct stat *st,
+-			      int type)
++			      int type, struct FTW *ftwbuf)
+ {
+ 	/*
+ 	 * Failed to read the directory, mostly due to EPERM.  Abort ASAP, so
+@@ -731,7 +731,12 @@ u64 btrfs_mkfs_size_dir(const char *dir_name, u32 sectorsize, u64 min_dev_size,
+ 	fs_block_size = sectorsize;
+ 	ftw_data_size = 0;
+ 	ftw_meta_nr_inode = 0;
+-	ret = ftw(dir_name, ftw_add_entry_size, 10);
++
++	/*
++	 * Symbolic link is not followed when creating files, so no need to
++	 * follow them here.
++	 */
++	ret = nftw(dir_name, ftw_add_entry_size, 10, FTW_PHYS);
+ 	if (ret < 0) {
+ 		error("ftw subdir walk of %s failed: %s", dir_name,
+ 			strerror(errno));
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.15.1.bb
similarity index 84%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.15.1.bb
index bc157e26776..f7ea27321cf 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.15.1.bb
@@ -14,18 +14,18 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl"
 DEPENDS_append_class-target = " udev"
 RDEPENDS_${PN} = "libgcc"
 
-SRCREV = "a7a1ea0f4f2a1d6eeeb3d106e062c7f1034f16d4"
+SRCREV = "3097f02c948f69f520c565ff8f8ba476aa6edb88"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://0001-Makefile-build-mktables-using-native-gcc.patch \
-           file://0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch \
+           file://ftw-subdir-walk.patch \
            "
 
-RECIPE_NO_UPDATE_REASON = "Waiting for resolution of https://github.com/kdave/btrfs-progs/issues/109"
 inherit autotools-brokensep pkgconfig manpages
 
 CLEANBROKEN = "1"
 
 PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native"
+EXTRA_OECONF = " --disable-zstd"
 EXTRA_OECONF_append_libc-musl = " --disable-backtrace "
 
 do_configure_prepend() {
-- 
2.16.1

[PATCH 19/22] libidn: update to 1.34

[Alexander Kanavin]

Drop backported 0001-idn-fix-printf-format-security-warnings.patch and
gcc7-compatibility.patch.

Refresh a couple other patches.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...1-idn-fix-printf-format-security-warnings.patch | 694 ---------------------
 ..._MKDIR_P_warning_error_with_automake_1.12.patch |  25 +-
 .../libidn/libidn/gcc7-compatibility.patch         | 334 ----------
 .../libidn/libidn_fix_for_automake-1.12.patch      |  19 +-
 .../libidn/{libidn_1.33.bb => libidn_1.34.bb}      |   8 +-
 5 files changed, 34 insertions(+), 1046 deletions(-)
 delete mode 100644 meta/recipes-extended/libidn/libidn/0001-idn-fix-printf-format-security-warnings.patch
 delete mode 100644 meta/recipes-extended/libidn/libidn/gcc7-compatibility.patch
 rename meta/recipes-extended/libidn/{libidn_1.33.bb => libidn_1.34.bb} (86%)

diff --git a/meta/recipes-extended/libidn/libidn/0001-idn-fix-printf-format-security-warnings.patch b/meta/recipes-extended/libidn/libidn/0001-idn-fix-printf-format-security-warnings.patch
deleted file mode 100644
index 2d5faabb240..00000000000
--- a/meta/recipes-extended/libidn/libidn/0001-idn-fix-printf-format-security-warnings.patch
+++ /dev/null
@@ -1,694 +0,0 @@
-From 7148adf34dae30345c2e4d9d437838a45ba6f6e8 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Wed, 1 Feb 2017 11:06:39 +0100
-Subject: [PATCH] Fix -Wformat warnings
-
----
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
- examples/example.c     |  6 +++---
- examples/example3.c    |  4 ++--
- examples/example4.c    |  4 ++--
- examples/example5.c    |  2 +-
- src/idn.c              |  2 +-
- tests/tst_idna.c       | 25 +++++++++++++------------
- tests/tst_idna2.c      |  8 ++++----
- tests/tst_idna3.c      |  8 ++++----
- tests/tst_nfkc.c       |  8 ++++----
- tests/tst_pr29.c       | 12 ++++++------
- tests/tst_punycode.c   | 13 +++++++------
- tests/tst_strerror.c   | 20 ++++++++++----------
- tests/tst_stringprep.c | 12 ++++++------
- tests/tst_tld.c        | 20 ++++++++++----------
- tests/utils.c          |  6 +++---
- 15 files changed, 76 insertions(+), 74 deletions(-)
-
-diff --git a/examples/example.c b/examples/example.c
-index 6e91783..24f64e0 100644
---- a/examples/example.c
-+++ b/examples/example.c
-@@ -55,7 +55,7 @@ main (void)
- 
-   printf ("Before locale2utf8 (length %ld): ", (long int) strlen (buf));
-   for (i = 0; i < strlen (buf); i++)
--    printf ("%02x ", buf[i] & 0xFF);
-+    printf ("%02x ", (unsigned) buf[i] & 0xFF);
-   printf ("\n");
- 
-   p = stringprep_locale_to_utf8 (buf);
-@@ -69,7 +69,7 @@ main (void)
- 
-   printf ("Before stringprep (length %ld): ", (long int) strlen (buf));
-   for (i = 0; i < strlen (buf); i++)
--    printf ("%02x ", buf[i] & 0xFF);
-+    printf ("%02x ", (unsigned) buf[i] & 0xFF);
-   printf ("\n");
- 
-   rc = stringprep (buf, BUFSIZ, 0, stringprep_nameprep);
-@@ -79,7 +79,7 @@ main (void)
-     {
-       printf ("After stringprep (length %ld): ", (long int) strlen (buf));
-       for (i = 0; i < strlen (buf); i++)
--	printf ("%02x ", buf[i] & 0xFF);
-+	printf ("%02x ", (unsigned) buf[i] & 0xFF);
-       printf ("\n");
-     }
- 
-diff --git a/examples/example3.c b/examples/example3.c
-index fc11c1c..ffb9042 100644
---- a/examples/example3.c
-+++ b/examples/example3.c
-@@ -56,7 +56,7 @@ main (void)
- 
-   printf ("Read string (length %ld): ", (long int) strlen (buf));
-   for (i = 0; i < strlen (buf); i++)
--    printf ("%02x ", buf[i] & 0xFF);
-+    printf ("%02x ", (unsigned) buf[i] & 0xFF);
-   printf ("\n");
- 
-   rc = idna_to_ascii_lz (buf, &p, 0);
-@@ -68,7 +68,7 @@ main (void)
- 
-   printf ("ACE label (length %ld): '%s'\n", (long int) strlen (p), p);
-   for (i = 0; i < strlen (p); i++)
--    printf ("%02x ", p[i] & 0xFF);
-+    printf ("%02x ", (unsigned) p[i] & 0xFF);
-   printf ("\n");
- 
-   free (p);
-diff --git a/examples/example4.c b/examples/example4.c
-index 1b319c9..a3315a1 100644
---- a/examples/example4.c
-+++ b/examples/example4.c
-@@ -56,7 +56,7 @@ main (void)
- 
-   printf ("Read string (length %ld): ", (long int) strlen (buf));
-   for (i = 0; i < strlen (buf); i++)
--    printf ("%02x ", buf[i] & 0xFF);
-+    printf ("%02x ", (unsigned) buf[i] & 0xFF);
-   printf ("\n");
- 
-   rc = idna_to_unicode_lzlz (buf, &p, 0);
-@@ -68,7 +68,7 @@ main (void)
- 
-   printf ("ACE label (length %ld): '%s'\n", (long int) strlen (p), p);
-   for (i = 0; i < strlen (p); i++)
--    printf ("%02x ", p[i] & 0xFF);
-+    printf ("%02x ", (unsigned) p[i] & 0xFF);
-   printf ("\n");
- 
-   free (p);
-diff --git a/examples/example5.c b/examples/example5.c
-index df55798..29d40b9 100644
---- a/examples/example5.c
-+++ b/examples/example5.c
-@@ -68,7 +68,7 @@ main (void)
- 
-   printf ("Read string (length %ld): ", (long int) strlen (buf));
-   for (i = 0; i < strlen (buf); i++)
--    printf ("%02x ", buf[i] & 0xFF);
-+    printf ("%02x ", (unsigned) buf[i] & 0xFF);
-   printf ("\n");
- 
-   p = stringprep_locale_to_utf8 (buf);
-diff --git a/src/idn.c b/src/idn.c
-index be1c7d1..13eb3c9 100644
---- a/src/idn.c
-+++ b/src/idn.c
-@@ -419,7 +419,7 @@ main (int argc, char *argv[])
- 	      size_t i;
- 	      for (i = 0; p[i]; i++)
- 		fprintf (stderr, "output[%lu] = U+%04x\n",
--			 (unsigned long) i, p[i]);
-+			 (unsigned long) i, (unsigned) p[i]);
- 	    }
- 
- 	  fprintf (stdout, "%s\n", p);
-diff --git a/tests/tst_idna.c b/tests/tst_idna.c
-index 415764e..4ac046f 100644
---- a/tests/tst_idna.c
-+++ b/tests/tst_idna.c
-@@ -220,13 +220,14 @@ doit (void)
-   char label[100];
-   uint32_t *ucs4label = NULL;
-   uint32_t tmp[100];
--  size_t len, len2, i;
-+  size_t len, len2;
-   int rc;
-+  unsigned i;
- 
-   for (i = 0; i < sizeof (idna) / sizeof (idna[0]); i++)
-     {
-       if (debug)
--	printf ("IDNA entry %ld: %s\n", i, idna[i].name);
-+	printf ("IDNA entry %u: %s\n", i, idna[i].name);
- 
-       if (debug)
- 	{
-@@ -237,7 +238,7 @@ doit (void)
-       rc = idna_to_ascii_4i (idna[i].in, idna[i].inlen, label, idna[i].flags);
-       if (rc != idna[i].toasciirc)
- 	{
--	  fail ("IDNA entry %ld failed: %d\n", i, rc);
-+	  fail ("IDNA entry %u failed: %d\n", i, rc);
- 	  if (debug)
- 	    printf ("FATAL\n");
- 	  continue;
-@@ -256,7 +257,7 @@ doit (void)
- 	  if (strlen (idna[i].out) != strlen (label) ||
- 	      strcasecmp (idna[i].out, label) != 0)
- 	    {
--	      fail ("IDNA entry %ld failed\n", i);
-+	      fail ("IDNA entry %u failed\n", i);
- 	      if (debug)
- 		printf ("ERROR\n");
- 	    }
-@@ -273,8 +274,8 @@ doit (void)
- 
-       if (debug)
- 	{
--	  printf ("in: %s (%ld==%ld)\n", idna[i].out, strlen (idna[i].out),
--		  len);
-+	  printf ("in: %s (%d==%d)\n", idna[i].out, (int) strlen (idna[i].out),
-+		  (int) len);
- 	  ucs4print (ucs4label, len);
- 	}
- 
-@@ -282,20 +283,20 @@ doit (void)
-       rc = idna_to_unicode_44i (ucs4label, len, tmp, &len2, idna[i].flags);
-       if (debug)
- 	{
--	  printf ("expected out (%ld):\n",
-+	  printf ("expected out (%lu):\n",
- 		  rc == IDNA_SUCCESS ? idna[i].inlen : len);
- 	  if (rc == IDNA_SUCCESS)
- 	    ucs4print (idna[i].in, idna[i].inlen);
- 	  else
- 	    ucs4print (ucs4label, len);
- 
--	  printf ("computed out (%ld):\n", len2);
-+	  printf ("computed out (%d):\n", (int) len2);
- 	  ucs4print (tmp, len2);
- 	}
- 
-       if (rc != idna[i].tounicoderc)
- 	{
--	  fail ("IDNA entry %ld failed: %d\n", i, rc);
-+	  fail ("IDNA entry %u failed: %d\n", i, rc);
- 	  if (debug)
- 	    printf ("FATAL\n");
- 	  continue;
-@@ -309,11 +310,11 @@ doit (void)
- 	  if (debug)
- 	    {
- 	      if (rc == IDNA_SUCCESS)
--		printf ("len=%ld len2=%ld\n", len2, idna[i].inlen);
-+		printf ("len=%d len2=%d\n", (int) len2, (int) idna[i].inlen);
- 	      else
--		printf ("len=%ld len2=%ld\n", len, len2);
-+		printf ("len=%d len2=%d\n", (int) len, (int) len2);
- 	    }
--	  fail ("IDNA entry %ld failed\n", i);
-+	  fail ("IDNA entry %u failed\n", i);
- 	  if (debug)
- 	    printf ("ERROR\n");
- 	}
-diff --git a/tests/tst_idna2.c b/tests/tst_idna2.c
-index 65b3a4d..38932ca 100644
---- a/tests/tst_idna2.c
-+++ b/tests/tst_idna2.c
-@@ -461,14 +461,14 @@ static const struct idna idna[] = {
- void
- doit (void)
- {
--  size_t i;
-+  unsigned i;
-   char *out;
-   int rc;
- 
-   for (i = 0; i < sizeof (idna) / sizeof (idna[0]); i++)
-     {
-       if (debug)
--	printf ("IDNA2 entry %ld\n", i);
-+	printf ("IDNA2 entry %u\n", i);
- 
-       if (debug)
- 	{
-@@ -487,7 +487,7 @@ doit (void)
- 			     IDNA_USE_STD3_ASCII_RULES);
-       if (rc != IDNA_SUCCESS && strlen (idna[i].out) > 0)
- 	{
--	  fail ("IDNA2 entry %ld failed: %d\n", i, rc);
-+	  fail ("IDNA2 entry %u failed: %d\n", i, rc);
- 	  continue;
- 	}
- 
-@@ -504,7 +504,7 @@ doit (void)
- 	  if (strlen (idna[i].out) != strlen (out) ||
- 	      strcasecmp (idna[i].out, out) != 0)
- 	    {
--	      fail ("IDNA2 entry %ld failed\n", i);
-+	      fail ("IDNA2 entry %u failed\n", i);
- 	      if (debug)
- 		printf ("ERROR\n");
- 	    }
-diff --git a/tests/tst_idna3.c b/tests/tst_idna3.c
-index a189378..f65628c 100644
---- a/tests/tst_idna3.c
-+++ b/tests/tst_idna3.c
-@@ -59,13 +59,13 @@ doit (void)
- {
-   int rc;
-   char *out = NULL;
--  size_t i;
-+  unsigned i;
- 
-   for (i = 0; i < sizeof (idna) / sizeof (idna[0]); i++)
-     {
-       rc = idna_to_unicode_8z8z (idna[i].in, &out, 0);
-       if (rc != IDNA_SUCCESS)
--	fail ("IDNA3[%ld] failed %d\n", i, rc);
-+	fail ("IDNA3[%u] failed %d\n", i, rc);
- 
-       if (debug && rc == IDNA_SUCCESS)
- 	{
-@@ -75,9 +75,9 @@ doit (void)
- 	}
- 
-       if (strcmp (out, idna[i].out) != 0)
--	fail ("IDNA3[%ld] failed\n", i);
-+	fail ("IDNA3[%u] failed\n", i);
-       else if (debug)
--	printf ("IDNA3[%ld] success\n", i);
-+	printf ("IDNA3[%u] success\n", i);
- 
-       if (out)
- 	idn_free (out);
-diff --git a/tests/tst_nfkc.c b/tests/tst_nfkc.c
-index d150fec..f5af9c6 100644
---- a/tests/tst_nfkc.c
-+++ b/tests/tst_nfkc.c
-@@ -68,18 +68,18 @@ void
- doit (void)
- {
-   char *out;
--  size_t i;
-+  unsigned i;
- 
-   for (i = 0; i < sizeof (nfkc) / sizeof (nfkc[0]); i++)
-     {
-       if (debug)
--	printf ("NFKC entry %ld\n", i);
-+	printf ("NFKC entry %u\n", i);
- 
-       out = stringprep_utf8_nfkc_normalize (nfkc[i].in,
- 					    (ssize_t) strlen (nfkc[i].in));
-       if (out == NULL)
- 	{
--	  fail ("NFKC entry %ld failed fatally\n", i);
-+	  fail ("NFKC entry %u failed fatally\n", i);
- 	  continue;
- 	}
- 
-@@ -114,7 +114,7 @@ doit (void)
-       if (strlen (nfkc[i].out) != strlen (out) ||
- 	  memcmp (nfkc[i].out, out, strlen (out)) != 0)
- 	{
--	  fail ("NFKC entry %ld failed\n", i);
-+	  fail ("NFKC entry %u failed\n", i);
- 	  if (debug)
- 	    printf ("ERROR\n");
- 	}
-diff --git a/tests/tst_pr29.c b/tests/tst_pr29.c
-index 3dc5466..11d0ede 100644
---- a/tests/tst_pr29.c
-+++ b/tests/tst_pr29.c
-@@ -91,7 +91,7 @@ static const struct tv tv[] = {
- void
- doit (void)
- {
--  size_t i;
-+  unsigned i;
-   int rc;
- 
-   for (i = 0; i < sizeof (tv) / sizeof (tv[0]); i++)
-@@ -100,7 +100,7 @@ doit (void)
- 	{
- 	  uint32_t *p, *q;
- 
--	  printf ("PR29 entry %ld: %s\n", i, tv[i].name);
-+	  printf ("PR29 entry %u: %s\n", i, tv[i].name);
- 
- 	  printf ("in:\n");
- 	  ucs4print (tv[i].in, tv[i].inlen);
-@@ -120,7 +120,7 @@ doit (void)
-       rc = pr29_4 (tv[i].in, tv[i].inlen);
-       if (rc != tv[i].rc)
- 	{
--	  fail ("PR29 entry %ld failed (expected %d): %d\n", i, tv[i].rc, rc);
-+	  fail ("PR29 entry %u failed (expected %d): %d\n", i, tv[i].rc, rc);
- 	  if (debug)
- 	    printf ("FATAL\n");
- 	  continue;
-@@ -129,7 +129,7 @@ doit (void)
-       rc = pr29_4z (tv[i].in);
-       if (rc != tv[i].rc)
- 	{
--	  fail ("PR29 entry %ld failed (expected %d): %d\n", i, tv[i].rc, rc);
-+	  fail ("PR29 entry %u failed (expected %d): %d\n", i, tv[i].rc, rc);
- 	  if (debug)
- 	    printf ("FATAL\n");
- 	  continue;
-@@ -142,7 +142,7 @@ doit (void)
- 	p = stringprep_ucs4_to_utf8 (tv[i].in, (ssize_t) tv[i].inlen,
- 				     &items_read, &items_written);
- 	if (p == NULL)
--	  fail ("FAIL: stringprep_ucs4_to_utf8(tv[%ld]) == NULL\n", i);
-+	  fail ("FAIL: stringprep_ucs4_to_utf8(tv[%u]) == NULL\n", i);
- 	if (debug)
- 	  hexprint (p, strlen (p));
- 
-@@ -150,7 +150,7 @@ doit (void)
- 	free (p);
- 	if (rc != tv[i].rc)
- 	  {
--	    fail ("PR29 entry %ld failed (expected %d): %d\n",
-+	    fail ("PR29 entry %u failed (expected %d): %d\n",
- 		  i, tv[i].rc, rc);
- 	    if (debug)
- 	      printf ("FATAL\n");
-diff --git a/tests/tst_punycode.c b/tests/tst_punycode.c
-index 493b8a2..997744a 100644
---- a/tests/tst_punycode.c
-+++ b/tests/tst_punycode.c
-@@ -173,7 +173,8 @@ doit (void)
-   char *p;
-   uint32_t *q;
-   int rc;
--  size_t i, outlen;
-+  size_t outlen;
-+  unsigned i;
- 
-   p = malloc (sizeof (*p) * BUFSIZ);
-   if (p == NULL)
-@@ -186,7 +187,7 @@ doit (void)
-   for (i = 0; i < sizeof (punycode) / sizeof (punycode[0]); i++)
-     {
-       if (debug)
--	printf ("PUNYCODE entry %ld: %s\n", i, punycode[i].name);
-+	printf ("PUNYCODE entry %u: %s\n", i, punycode[i].name);
- 
-       if (debug)
- 	{
-@@ -199,7 +200,7 @@ doit (void)
- 			    NULL, &outlen, p);
-       if (rc != punycode[i].rc)
- 	{
--	  fail ("punycode_encode() entry %ld failed: %d\n", i, rc);
-+	  fail ("punycode_encode() entry %u failed: %d\n", i, rc);
- 	  if (debug)
- 	    printf ("FATAL\n");
- 	  continue;
-@@ -221,7 +222,7 @@ doit (void)
- 	  if (strlen (punycode[i].out) != strlen (p) ||
- 	      memcmp (punycode[i].out, p, strlen (p)) != 0)
- 	    {
--	      fail ("punycode() entry %ld failed\n", i);
-+	      fail ("punycode() entry %u failed\n", i);
- 	      if (debug)
- 		printf ("ERROR\n");
- 	    }
-@@ -241,7 +242,7 @@ doit (void)
- 			    &outlen, q, NULL);
-       if (rc != punycode[i].rc)
- 	{
--	  fail ("punycode() entry %ld failed: %d\n", i, rc);
-+	  fail ("punycode() entry %u failed: %d\n", i, rc);
- 	  if (debug)
- 	    printf ("FATAL\n");
- 	  continue;
-@@ -262,7 +263,7 @@ doit (void)
- 	  if (punycode[i].inlen != outlen ||
- 	      memcmp (punycode[i].in, q, outlen) != 0)
- 	    {
--	      fail ("punycode_decode() entry %ld failed\n", i);
-+	      fail ("punycode_decode() entry %u failed\n", i);
- 	      if (debug)
- 		printf ("ERROR\n");
- 	    }
-diff --git a/tests/tst_strerror.c b/tests/tst_strerror.c
-index 71fff59..730f5e4 100644
---- a/tests/tst_strerror.c
-+++ b/tests/tst_strerror.c
-@@ -110,7 +110,7 @@ doit (void)
-   /* Iterate through all error codes. */
- 
-   {
--    size_t i;
-+    unsigned i;
-     const char *last_p = NULL;
- 
-     for (i = 0;; i++)
-@@ -126,13 +126,13 @@ doit (void)
- 	    break;
- 	  }
- 	if (debug)
--	  printf ("idna %ld: %s\n", i, p);
-+	  printf ("idna %u: %s\n", i, p);
- 	last_p = p;
-       }
-   }
- 
-   {
--    size_t i;
-+    unsigned i;
-     const char *last_p = NULL;
- 
-     for (i = 0;; i++)
-@@ -141,13 +141,13 @@ doit (void)
- 	if (p == last_p)
- 	  break;
- 	if (debug)
--	  printf ("pr29 %ld: %s\n", i, p);
-+	  printf ("pr29 %u: %s\n", i, p);
- 	last_p = p;
-       }
-   }
- 
-   {
--    size_t i;
-+    unsigned i;
-     const char *last_p = NULL;
- 
-     for (i = 0;; i++)
-@@ -156,13 +156,13 @@ doit (void)
- 	if (p == last_p)
- 	  break;
- 	if (debug)
--	  printf ("punycode %ld: %s\n", i, p);
-+	  printf ("punycode %u: %s\n", i, p);
- 	last_p = p;
-       }
-   }
- 
-   {
--    size_t i;
-+    unsigned i;
-     const char *last_p = NULL;
- 
-     for (i = 0;; i++)
-@@ -183,13 +183,13 @@ doit (void)
- 	    break;
- 	  }
- 	if (debug)
--	  printf ("stringprep %ld: %s\n", i, p);
-+	  printf ("stringprep %u: %s\n", i, p);
- 	last_p = p;
-       }
-   }
- 
-   {
--    size_t i;
-+    unsigned i;
-     const char *last_p = NULL;
- 
-     for (i = 0;; i++)
-@@ -198,7 +198,7 @@ doit (void)
- 	if (p == last_p)
- 	  break;
- 	if (debug)
--	  printf ("tld %ld: %s\n", i, p);
-+	  printf ("tld %u: %s\n", i, p);
- 	last_p = p;
-       }
-   }
-diff --git a/tests/tst_stringprep.c b/tests/tst_stringprep.c
-index 149ce6f..7c9ab06 100644
---- a/tests/tst_stringprep.c
-+++ b/tests/tst_stringprep.c
-@@ -205,7 +205,7 @@ doit (void)
- {
-   char *p;
-   int rc;
--  size_t i;
-+  unsigned i;
- 
-   if (!stringprep_check_version (STRINGPREP_VERSION))
-     fail ("stringprep_check_version failed (header %s runtime %s)\n",
-@@ -224,7 +224,7 @@ doit (void)
-   for (i = 0; i < sizeof (strprep) / sizeof (strprep[0]); i++)
-     {
-       if (debug)
--	printf ("STRINGPREP entry %ld\n", i);
-+	printf ("STRINGPREP entry %u\n", i);
- 
-       if (debug)
- 	{
-@@ -247,12 +247,12 @@ doit (void)
- 	  continue;
- 	else if (l == NULL)
- 	  {
--	    fail ("bad UTF-8 in entry %ld\n", i);
-+	    fail ("bad UTF-8 in entry %u\n", i);
- 	    continue;
- 	  }
- 	else if (strcmp (strprep[i].in, x) != 0)
- 	  {
--	    fail ("bad UTF-8 in entry %ld\n", i);
-+	    fail ("bad UTF-8 in entry %u\n", i);
- 	    if (debug)
- 	      {
- 		puts ("expected:");
-@@ -274,7 +274,7 @@ doit (void)
- 			       "Nameprep", strprep[i].flags);
-       if (rc != strprep[i].rc)
- 	{
--	  fail ("stringprep() entry %ld failed: %d\n", i, rc);
-+	  fail ("stringprep() entry %u failed: %d\n", i, rc);
- 	  if (debug)
- 	    printf ("FATAL\n");
- 	  if (rc == STRINGPREP_OK)
-@@ -302,7 +302,7 @@ doit (void)
- 	  if (strlen (strprep[i].out) != strlen (p) ||
- 	      memcmp (strprep[i].out, p, strlen (p)) != 0)
- 	    {
--	      fail ("stringprep() entry %ld failed\n", i);
-+	      fail ("stringprep() entry %ld failed\n", (long) i);
- 	      if (debug)
- 		printf ("ERROR\n");
- 	    }
-diff --git a/tests/tst_tld.c b/tests/tst_tld.c
-index 2f8e12e..d038c79 100644
---- a/tests/tst_tld.c
-+++ b/tests/tst_tld.c
-@@ -80,7 +80,7 @@ const Tld_table * my_tld_tables[] =
- void
- doit (void)
- {
--  size_t i;
-+  unsigned i;
-   const Tld_table *tldtable;
-   char *out;
-   size_t errpos;
-@@ -206,7 +206,7 @@ doit (void)
-   for (i = 0; i < sizeof (tld) / sizeof (tld[0]); i++)
-     {
-       if (debug)
--	printf ("TLD entry %ld: %s\n", i, tld[i].name);
-+	printf ("TLD entry %u: %s\n", i, tld[i].name);
- 
-       if (debug)
- 	{
-@@ -217,7 +217,7 @@ doit (void)
-       tldtable = tld_default_table (tld[i].tld, NULL);
-       if (tldtable == NULL)
- 	{
--	  fail ("TLD entry %ld tld_get_table (%s)\n", i, tld[i].tld);
-+	  fail ("TLD entry %u tld_get_table (%s)\n", i, tld[i].tld);
- 	  if (debug)
- 	    printf ("FATAL\n");
- 	  continue;
-@@ -226,7 +226,7 @@ doit (void)
-       rc = tld_check_4t (tld[i].in, tld[i].inlen, &errpos, tldtable);
-       if (rc != tld[i].rc)
- 	{
--	  fail ("TLD entry %ld failed: %d\n", i, rc);
-+	  fail ("TLD entry %u failed: %d\n", i, rc);
- 	  if (debug)
- 	    printf ("FATAL\n");
- 	  continue;
-@@ -237,7 +237,7 @@ doit (void)
- 
-       if (rc != tld[i].rc)
- 	{
--	  fail ("TLD entry %ld failed\n", i);
-+	  fail ("TLD entry %u failed\n", i);
- 	  if (debug)
- 	    printf ("ERROR\n");
- 	}
-@@ -245,12 +245,12 @@ doit (void)
- 	{
- 	  if (debug)
- 	    printf ("returned errpos %ld expected errpos %ld\n",
--		    errpos, tld[i].errpos);
-+		    (long) errpos, (long) tld[i].errpos);
- 
- 	  if (tld[i].errpos != errpos)
- 	    {
--	      fail ("TLD entry %ld failed because errpos %ld != %ld\n", i,
--		    tld[i].errpos, errpos);
-+	      fail ("TLD entry %u failed because errpos %ld != %ld\n", i,
-+		    (long) tld[i].errpos, (long) errpos);
- 	      if (debug)
- 		printf ("ERROR\n");
- 	    }
-@@ -262,12 +262,12 @@ doit (void)
- 	rc = tld_check_8z (tld[i].example, &errpos, NULL);
- 	if (rc != tld[i].rc)
- 	  {
--	    fail ("TLD entry %ld failed\n", i);
-+	    fail ("TLD entry %u failed\n", i);
- 	    if (debug)
- 	      printf ("ERROR\n");
- 	  }
- 	if (debug)
--	  printf ("TLD entry %ld tld_check_8z (%s)\n", i, tld[i].example);
-+	  printf ("TLD entry %u tld_check_8z (%s)\n", i, tld[i].example);
-       }
-     }
- }
-diff --git a/tests/utils.c b/tests/utils.c
-index 717ee01..5577dc3 100644
---- a/tests/utils.c
-+++ b/tests/utils.c
-@@ -49,7 +49,7 @@ escapeprint (const char *str, size_t len)
- {
-   size_t i;
- 
--  printf (" (length %ld bytes):\n\t", len);
-+  printf (" (length %ld bytes):\n\t", (long) len);
-   for (i = 0; i < len; i++)
-     {
-       if (((str[i] & 0xFF) >= 'A' && (str[i] & 0xFF) <= 'Z') ||
-@@ -58,7 +58,7 @@ escapeprint (const char *str, size_t len)
- 	  || (str[i] & 0xFF) == ' ' || (str[i] & 0xFF) == '.')
- 	printf ("%c", (str[i] & 0xFF));
-       else
--	printf ("\\x%02X", (str[i] & 0xFF));
-+	printf ("\\x%02X", (unsigned) (str[i] & 0xFF));
-       if ((i + 1) % 16 == 0 && (i + 1) < len)
- 	printf ("'\n\t'");
-     }
-@@ -73,7 +73,7 @@ hexprint (const char *str, size_t len)
-   printf ("\t;; ");
-   for (i = 0; i < len; i++)
-     {
--      printf ("%02x ", (str[i] & 0xFF));
-+      printf ("%02x ", (unsigned) (str[i] & 0xFF));
-       if ((i + 1) % 8 == 0)
- 	printf (" ");
-       if ((i + 1) % 16 == 0 && i + 1 < len)
--- 
-1.9.1
-
diff --git a/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
index 98ba4d6ff63..43bd2329448 100644
--- a/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
+++ b/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
@@ -1,25 +1,34 @@
-Upstream-Status: Inappropriate 
+From cdd9e2e960eeb4eda7b08f0113d0cd03524c1d45 Mon Sep 17 00:00:00 2001
+From: Nitin A Kamble <nitin.a.kamble@intel.com>
+Date: Tue, 10 Jul 2012 02:44:30 -0700
+Subject: [PATCH] libidn: fix build with automake 1.12
+
+Upstream-Status: Inappropriate
 
 automake 1.12.x has deprecated AM_PROG_MKDIR_P , and throws a warning for that,
 and the warnings are treated as errors because of the -Werror parameter.
 
-These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not 
+These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not
 eliminated these deprecated macros yet. So disable the treatment of warnings
 as errors until gettext is updated to remove the deprecated macros.
 
 Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
 2012/07/10
 
-Index: libidn-1.24/configure.ac
-===================================================================
---- libidn-1.24.orig/configure.ac
-+++ libidn-1.24/configure.ac
-@@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 2002-2011 Si
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 261dad2..c4f935e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,7 @@ AC_INIT([GNU Libidn], [1.34], [bug-libidn@gnu.org])
  AC_CONFIG_AUX_DIR([build-aux])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_HEADERS(config.h)
 -AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
 +AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
- AM_SILENT_RULES([yes])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
  
  # Library code modified:                              REVISION++
diff --git a/meta/recipes-extended/libidn/libidn/gcc7-compatibility.patch b/meta/recipes-extended/libidn/libidn/gcc7-compatibility.patch
deleted file mode 100644
index 546a6eaafcf..00000000000
--- a/meta/recipes-extended/libidn/libidn/gcc7-compatibility.patch
+++ /dev/null
@@ -1,334 +0,0 @@
-From 230930b3bc3e431b819eb45420cb42475d83ca93 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Wed, 1 Feb 2017 10:44:36 +0100
-Subject: [PATCH] Update intprops.h for gcc-7 compatibility
-
----
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
- gl/intprops.h          | 65 ++++++++++++++++++++++++++++++--------------------
- lib/gltests/intprops.h | 65 ++++++++++++++++++++++++++++++--------------------
- 2 files changed, 78 insertions(+), 52 deletions(-)
-
-diff --git a/gl/intprops.h b/gl/intprops.h
-index e1fce5c..eb06b69 100644
---- a/gl/intprops.h
-+++ b/gl/intprops.h
-@@ -1,18 +1,18 @@
- /* intprops.h -- properties of integer types
- 
--   Copyright (C) 2001-2016 Free Software Foundation, Inc.
-+   Copyright (C) 2001-2017 Free Software Foundation, Inc.
- 
-    This program is free software: you can redistribute it and/or modify it
--   under the terms of the GNU General Public License as published
--   by the Free Software Foundation; either version 3 of the License, or
-+   under the terms of the GNU Lesser General Public License as published
-+   by the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
- 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--   GNU General Public License for more details.
-+   GNU Lesser General Public License for more details.
- 
--   You should have received a copy of the GNU General Public License
-+   You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
- /* Written by Paul Eggert.  */
-@@ -47,12 +47,16 @@
- 
- /* Minimum and maximum values for integer types and expressions.  */
- 
-+/* The width in bits of the integer type or expression T.
-+   Padding bits are not supported; this is checked at compile-time below.  */
-+#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT)
-+
- /* The maximum and minimum values for the integer type T.  */
- #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
- #define TYPE_MAXIMUM(t)                                                 \
-   ((t) (! TYPE_SIGNED (t)                                               \
-         ? (t) -1                                                        \
--        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
-+        : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1)))
- 
- /* The maximum and minimum values for the type of the expression E,
-    after integer promotion.  E should not have side effects.  */
-@@ -65,7 +69,13 @@
-    ? _GL_SIGNED_INT_MAXIMUM (e)                                         \
-    : _GL_INT_NEGATE_CONVERT (e, 1))
- #define _GL_SIGNED_INT_MAXIMUM(e)                                       \
--  (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
-+  (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1)
-+
-+/* Work around OpenVMS incompatibility with C99.  */
-+#if !defined LLONG_MAX && defined __INT64_MAX
-+# define LLONG_MAX __INT64_MAX
-+# define LLONG_MIN __INT64_MIN
-+#endif
- 
- /* This include file assumes that signed types are two's complement without
-    padding bits; the above macros have undefined behavior otherwise.
-@@ -84,10 +94,15 @@ verify (TYPE_MAXIMUM (long int) == LONG_MAX);
- verify (TYPE_MINIMUM (long long int) == LLONG_MIN);
- verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
- #endif
-+/* Similarly, sanity-check one ISO/IEC TS 18661-1:2014 macro if defined.  */
-+#ifdef UINT_WIDTH
-+verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH);
-+#endif
- 
- /* Does the __typeof__ keyword work?  This could be done by
-    'configure', but for now it's easier to do it by hand.  */
--#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
-+#if (2 <= __GNUC__ \
-+     || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \
-      || (0x5110 <= __SUNPRO_C && !__STDC__))
- # define _GL_HAVE___TYPEOF__ 1
- #else
-@@ -116,8 +131,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
-    signed, this macro may overestimate the true bound by one byte when
-    applied to unsigned types of size 2, 4, 16, ... bytes.  */
- #define INT_STRLEN_BOUND(t)                                     \
--  (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT                 \
--                          - _GL_SIGNED_TYPE_OR_EXPR (t))        \
-+  (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \
-    + _GL_SIGNED_TYPE_OR_EXPR (t))
- 
- /* Bound on buffer size needed to represent an integer type or expression T,
-@@ -222,20 +236,23 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
-    ? (a) < (min) >> (b)                                 \
-    : (max) >> (b) < (a))
- 
--/* True if __builtin_add_overflow (A, B, P) works when P is null.  */
--#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__)
-+/* True if __builtin_add_overflow (A, B, P) works when P is non-null.  */
-+#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__)
-+
-+/* True if __builtin_add_overflow_p (A, B, C) works.  */
-+#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)
- 
- /* The _GL*_OVERFLOW macros have the same restrictions as the
-    *_RANGE_OVERFLOW macros, except that they do not assume that operands
-    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
-    that the result (e.g., A + B) has that type.  */
--#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
--# define _GL_ADD_OVERFLOW(a, b, min, max)
--   __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
--# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
--   __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
--# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
--   __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
-+#if _GL_HAS_BUILTIN_OVERFLOW_P
-+# define _GL_ADD_OVERFLOW(a, b, min, max)                               \
-+   __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
-+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                          \
-+   __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
-+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                          \
-+   __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
- #else
- # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
-    ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
-@@ -315,7 +332,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
-   _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
- #define INT_SUBTRACT_OVERFLOW(a, b) \
-   _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
--#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
-+#if _GL_HAS_BUILTIN_OVERFLOW_P
- # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
- #else
- # define INT_NEGATE_OVERFLOW(a) \
-@@ -349,10 +366,6 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
- #define INT_MULTIPLY_WRAPV(a, b, r) \
-   _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
- 
--#ifndef __has_builtin
--# define __has_builtin(x) 0
--#endif
--
- /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390.  See:
-    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
-    https://llvm.org/bugs/show_bug.cgi?id=25390
-@@ -369,7 +382,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
-    the operation.  BUILTIN is the builtin operation, and OVERFLOW the
-    overflow predicate.  Return 1 if the result overflows.  See above
-    for restrictions.  */
--#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)
-+#if _GL_HAS_BUILTIN_OVERFLOW
- # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
- #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
- # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
-@@ -412,7 +425,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
- # else
- #  define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
-     _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
--                     long int, LONG_MIN, LONG_MAX))
-+                     long int, LONG_MIN, LONG_MAX)
- # endif
- #endif
- 
-diff --git a/lib/gltests/intprops.h b/lib/gltests/intprops.h
-index e1fce5c..eb06b69 100644
---- a/lib/gltests/intprops.h
-+++ b/lib/gltests/intprops.h
-@@ -1,18 +1,18 @@
- /* intprops.h -- properties of integer types
- 
--   Copyright (C) 2001-2016 Free Software Foundation, Inc.
-+   Copyright (C) 2001-2017 Free Software Foundation, Inc.
- 
-    This program is free software: you can redistribute it and/or modify it
--   under the terms of the GNU General Public License as published
--   by the Free Software Foundation; either version 3 of the License, or
-+   under the terms of the GNU Lesser General Public License as published
-+   by the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
- 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--   GNU General Public License for more details.
-+   GNU Lesser General Public License for more details.
- 
--   You should have received a copy of the GNU General Public License
-+   You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
- /* Written by Paul Eggert.  */
-@@ -47,12 +47,16 @@
- 
- /* Minimum and maximum values for integer types and expressions.  */
- 
-+/* The width in bits of the integer type or expression T.
-+   Padding bits are not supported; this is checked at compile-time below.  */
-+#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT)
-+
- /* The maximum and minimum values for the integer type T.  */
- #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
- #define TYPE_MAXIMUM(t)                                                 \
-   ((t) (! TYPE_SIGNED (t)                                               \
-         ? (t) -1                                                        \
--        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
-+        : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1)))
- 
- /* The maximum and minimum values for the type of the expression E,
-    after integer promotion.  E should not have side effects.  */
-@@ -65,7 +69,13 @@
-    ? _GL_SIGNED_INT_MAXIMUM (e)                                         \
-    : _GL_INT_NEGATE_CONVERT (e, 1))
- #define _GL_SIGNED_INT_MAXIMUM(e)                                       \
--  (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
-+  (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1)
-+
-+/* Work around OpenVMS incompatibility with C99.  */
-+#if !defined LLONG_MAX && defined __INT64_MAX
-+# define LLONG_MAX __INT64_MAX
-+# define LLONG_MIN __INT64_MIN
-+#endif
- 
- /* This include file assumes that signed types are two's complement without
-    padding bits; the above macros have undefined behavior otherwise.
-@@ -84,10 +94,15 @@ verify (TYPE_MAXIMUM (long int) == LONG_MAX);
- verify (TYPE_MINIMUM (long long int) == LLONG_MIN);
- verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
- #endif
-+/* Similarly, sanity-check one ISO/IEC TS 18661-1:2014 macro if defined.  */
-+#ifdef UINT_WIDTH
-+verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH);
-+#endif
- 
- /* Does the __typeof__ keyword work?  This could be done by
-    'configure', but for now it's easier to do it by hand.  */
--#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
-+#if (2 <= __GNUC__ \
-+     || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \
-      || (0x5110 <= __SUNPRO_C && !__STDC__))
- # define _GL_HAVE___TYPEOF__ 1
- #else
-@@ -116,8 +131,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
-    signed, this macro may overestimate the true bound by one byte when
-    applied to unsigned types of size 2, 4, 16, ... bytes.  */
- #define INT_STRLEN_BOUND(t)                                     \
--  (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT                 \
--                          - _GL_SIGNED_TYPE_OR_EXPR (t))        \
-+  (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \
-    + _GL_SIGNED_TYPE_OR_EXPR (t))
- 
- /* Bound on buffer size needed to represent an integer type or expression T,
-@@ -222,20 +236,23 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
-    ? (a) < (min) >> (b)                                 \
-    : (max) >> (b) < (a))
- 
--/* True if __builtin_add_overflow (A, B, P) works when P is null.  */
--#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__)
-+/* True if __builtin_add_overflow (A, B, P) works when P is non-null.  */
-+#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__)
-+
-+/* True if __builtin_add_overflow_p (A, B, C) works.  */
-+#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)
- 
- /* The _GL*_OVERFLOW macros have the same restrictions as the
-    *_RANGE_OVERFLOW macros, except that they do not assume that operands
-    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
-    that the result (e.g., A + B) has that type.  */
--#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
--# define _GL_ADD_OVERFLOW(a, b, min, max)
--   __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
--# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
--   __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
--# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
--   __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
-+#if _GL_HAS_BUILTIN_OVERFLOW_P
-+# define _GL_ADD_OVERFLOW(a, b, min, max)                               \
-+   __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
-+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                          \
-+   __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
-+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                          \
-+   __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
- #else
- # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
-    ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
-@@ -315,7 +332,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
-   _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
- #define INT_SUBTRACT_OVERFLOW(a, b) \
-   _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
--#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
-+#if _GL_HAS_BUILTIN_OVERFLOW_P
- # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
- #else
- # define INT_NEGATE_OVERFLOW(a) \
-@@ -349,10 +366,6 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
- #define INT_MULTIPLY_WRAPV(a, b, r) \
-   _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
- 
--#ifndef __has_builtin
--# define __has_builtin(x) 0
--#endif
--
- /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390.  See:
-    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
-    https://llvm.org/bugs/show_bug.cgi?id=25390
-@@ -369,7 +382,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
-    the operation.  BUILTIN is the builtin operation, and OVERFLOW the
-    overflow predicate.  Return 1 if the result overflows.  See above
-    for restrictions.  */
--#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)
-+#if _GL_HAS_BUILTIN_OVERFLOW
- # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
- #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
- # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
-@@ -412,7 +425,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
- # else
- #  define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
-     _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
--                     long int, LONG_MIN, LONG_MAX))
-+                     long int, LONG_MIN, LONG_MAX)
- # endif
- #endif
- 
--- 
-1.9.1
-
diff --git a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
index db91317ca5b..5d03810d006 100644
--- a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
+++ b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
@@ -1,3 +1,8 @@
+From c34c7aba769bff3e483f89145055b9b8733435f3 Mon Sep 17 00:00:00 2001
+From: Nitin A Kamble <nitin.a.kamble@intel.com>
+Date: Wed, 2 May 2012 18:05:19 -0700
+Subject: [PATCH] libtasn1: fix build with automake 1.12
+
 Upstream-Status: Pending
 
 This patch fixes following issue with automake 1.12
@@ -9,12 +14,16 @@ This patch fixes following issue with automake 1.12
 Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
 2012/05/03
 
-Index: libidn-1.33/configure.ac
-===================================================================
---- libidn-1.33.orig/configure.ac
-+++ libidn-1.33/configure.ac
+---
+ configure.ac | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index f8049a4..261dad2 100644
+--- a/configure.ac
++++ b/configure.ac
 @@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 17)
- AC_SUBST(LT_REVISION, 16)
+ AC_SUBST(LT_REVISION, 18)
  AC_SUBST(LT_AGE, 6)
  
 +# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
diff --git a/meta/recipes-extended/libidn/libidn_1.33.bb b/meta/recipes-extended/libidn/libidn_1.34.bb
similarity index 86%
rename from meta/recipes-extended/libidn/libidn_1.33.bb
rename to meta/recipes-extended/libidn/libidn_1.34.bb
index 9e8bdbae188..424c6c9f981 100644
--- a/meta/recipes-extended/libidn/libidn_1.33.bb
+++ b/meta/recipes-extended/libidn/libidn_1.34.bb
@@ -18,13 +18,11 @@ SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
            file://libidn_fix_for_automake-1.12.patch \
            file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \
            file://dont-depend-on-help2man.patch \
-           file://0001-idn-fix-printf-format-security-warnings.patch \
-           file://gcc7-compatibility.patch \
            file://0001-idn-format-security-warnings.patch \
-"
+           "
 
-SRC_URI[md5sum] = "a9aa7e003665de9c82bd3f9fc6ccf308"
-SRC_URI[sha256sum] = "44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19"
+SRC_URI[md5sum] = "a829db6cd0b85733017c20a50bf10798"
+SRC_URI[sha256sum] = "3719e2975f2fb28605df3479c380af2cf4ab4e919e1506527e4c7670afff6e3c"
 
 # command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3
 # so package command into a separate package
-- 
2.16.1

[PATCH 20/22] procps: update to 3.3.13

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../procps/0001-Fix-out-of-tree-builds.patch       | 24 ++++++++++++++++++++++
 .../procps/{procps_3.3.12.bb => procps_3.3.13.bb}  |  7 ++++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch
 rename meta/recipes-extended/procps/{procps_3.3.12.bb => procps_3.3.13.bb} (92%)

diff --git a/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch b/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch
new file mode 100644
index 00000000000..e548194362c
--- /dev/null
+++ b/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch
@@ -0,0 +1,24 @@
+From 0825db94fc91fa2150c0e649e92cc8dcc44f4b38 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 4 Apr 2018 14:09:45 +0300
+Subject: [PATCH] Fix out of tree builds
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ include/nls.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/nls.h b/include/nls.h
+index 1166b7b..f5abe05 100644
+--- a/include/nls.h
++++ b/include/nls.h
+@@ -6,7 +6,7 @@
+ #define PROCPS_NG_NLS_H
+ 
+ /* programs issuing textdomain() need PACKAGE string */
+-#include "../config.h"
++#include "config.h"
+ 
+ /* programs issuing bindtextdomain() also need LOCALEDIR string */
+ #ifndef LOCALEDIR
diff --git a/meta/recipes-extended/procps/procps_3.3.12.bb b/meta/recipes-extended/procps/procps_3.3.13.bb
similarity index 92%
rename from meta/recipes-extended/procps/procps_3.3.12.bb
rename to meta/recipes-extended/procps/procps_3.3.13.bb
index 99e43c5349e..ae4a7226fc2 100644
--- a/meta/recipes-extended/procps/procps_3.3.12.bb
+++ b/meta/recipes-extended/procps/procps_3.3.13.bb
@@ -14,10 +14,11 @@ inherit autotools gettext pkgconfig update-alternatives
 
 SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \
            file://sysctl.conf \
-          "
+           file://0001-Fix-out-of-tree-builds.patch \
+           "
 
-SRC_URI[md5sum] = "957e42e8b193490b2111252e4a2b443c"
-SRC_URI[sha256sum] = "6ed65ab86318f37904e8f9014415a098bec5bc53653e5d9ab404f95ca5e1a7d4"
+SRC_URI[md5sum] = "ad20fe97b3f45797dd43e2d3e046ff32"
+SRC_URI[sha256sum] = "52b05b2bd5b05f46f24766a10474337ebadd828df9915e2b178df291cf88f7d3"
 
 S = "${WORKDIR}/procps-ng-${PV}"
 
-- 
2.16.1

[PATCH 21/22] libsecret: update to 0.18.6

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../libsecret/{libsecret_0.18.5.bb => libsecret_0.18.6.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/libsecret/{libsecret_0.18.5.bb => libsecret_0.18.6.bb} (80%)

diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.5.bb b/meta/recipes-gnome/libsecret/libsecret_0.18.6.bb
similarity index 80%
rename from meta/recipes-gnome/libsecret/libsecret_0.18.5.bb
rename to meta/recipes-gnome/libsecret/libsecret_0.18.6.bb
index 2b917ec517b..cdc41e762a8 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.18.5.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.18.6.bb
@@ -8,8 +8,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native intltool-native"
 
 PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
 
-SRC_URI[archive.md5sum] = "2d688825921313da8731313b0a7f394c"
-SRC_URI[archive.sha256sum] = "9ce7bd8dd5831f2786c935d82638ac428fa085057cc6780aba0e39375887ccb3"
+SRC_URI[archive.md5sum] = "c6cf132a56bd346fbf49a43abb02e5c2"
+SRC_URI[archive.sha256sum] = "5efbc890ba41a323ffe0599cd260fd12bd8eb62a04aa1bd1b2762575d253d66f"
 
 # http://errors.yoctoproject.org/Errors/Details/20228/
 ARM_INSTRUCTION_SET = "arm"
-- 
2.16.1

[PATCH 22/22] oeqa/runtime/cases/python: use python 3 rather than python 2

[Alexander Kanavin]

For example, core-image-sato skipped the test alltogether, as it
no longer pulls in Python 2.x at all.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/lib/oeqa/runtime/cases/python.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/lib/oeqa/runtime/cases/python.py b/meta/lib/oeqa/runtime/cases/python.py
index bf3e1791638..3d6eb088024 100644
--- a/meta/lib/oeqa/runtime/cases/python.py
+++ b/meta/lib/oeqa/runtime/cases/python.py
@@ -20,16 +20,16 @@ class PythonTest(OERuntimeTestCase):
 
     @OETestID(1145)
     @OETestDepends(['ssh.SSHTest.test_ssh'])
-    @OEHasPackage(['python-core'])
+    @OEHasPackage(['python3-core'])
     def test_python_exists(self):
-        status, output = self.target.run('which python')
+        status, output = self.target.run('which python3')
         msg = 'Python binary not in PATH or not on target.'
         self.assertEqual(status, 0, msg=msg)
 
     @OETestID(965)
     @OETestDepends(['python.PythonTest.test_python_exists'])
     def test_python_stdout(self):
-        status, output = self.target.run('python /tmp/test.py')
+        status, output = self.target.run('python3 /tmp/test.py')
         msg = 'Exit status was not 0. Output: %s' % output
         self.assertEqual(status, 0, msg=msg)
 
-- 
2.16.1

Re: [PATCH 08/22] bash-completion: update to 2.8

[Khem Raj]

On 4/4/18 4:13 AM, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  .../{bash-completion_2.7.bb => bash-completion_2.8.bb}              | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename meta/recipes-support/bash-completion/{bash-completion_2.7.bb => bash-completion_2.8.bb} (86%)
> 
> diff --git a/meta/recipes-support/bash-completion/bash-completion_2.7.bb b/meta/recipes-support/bash-completion/bash-completion_2.8.bb
> similarity index 86%
> rename from meta/recipes-support/bash-completion/bash-completion_2.7.bb
> rename to meta/recipes-support/bash-completion/bash-completion_2.8.bb
> index f519b3f3da4..85064343e30 100644
> --- a/meta/recipes-support/bash-completion/bash-completion_2.7.bb
> +++ b/meta/recipes-support/bash-completion/bash-completion_2.8.bb
> @@ -9,8 +9,8 @@ SECTION = "console/utils"
>  
>  SRC_URI = "https://github.com/scop/bash-completion/releases/download/${PV}/${BPN}-${PV}.tar.xz"
>  
> -SRC_URI[md5sum] = "28117492bdc9408438e6041683a423ce"
> -SRC_URI[sha256sum] = "41ba892d3f427d4a686de32673f35401bc947a7801f684127120cdb13641441e"
> +SRC_URI[md5sum] = "201b6ae62f7d5fb5b1b25e34427db919"
> +SRC_URI[sha256sum] = "c01f5570f5698a0dda8dc9cfb2a83744daa1ec54758373a6e349bd903375f54d"
>  UPSTREAM_CHECK_REGEX = "bash-completion-(?P<pver>(?!2008).+)\.tar"
>  UPSTREAM_CHECK_URI = "https://github.com/scop/bash-completion/releases"
>  
> @@ -25,7 +25,7 @@ do_install_append() {
>  
>  	# Delete files already provided by util-linux
>  	local i
> -	for i in mount umount rfkill; do
> +	for i in mount umount; do

where did rfkill go ?

>  		rm ${D}${datadir}/${BPN}/completions/$i
>  	done
>  }
> 

Re: [PATCH 14/22] icu: update to 61.1

[Khem Raj]

On 4/4/18 4:13 AM, Alexander Kanavin wrote:
> License-Update: copyright years updated, added terms for Google double-conversion

should this change to terms reflect in LICENSE filed as well.

> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-support/icu/{icu_60.2.bb => icu_61.1.bb} | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename meta/recipes-support/icu/{icu_60.2.bb => icu_61.1.bb} (78%)
> 
> diff --git a/meta/recipes-support/icu/icu_60.2.bb b/meta/recipes-support/icu/icu_61.1.bb
> similarity index 78%
> rename from meta/recipes-support/icu/icu_60.2.bb
> rename to meta/recipes-support/icu/icu_61.1.bb
> index 585a92bc4cd..ffaf3508966 100644
> --- a/meta/recipes-support/icu/icu_60.2.bb
> +++ b/meta/recipes-support/icu/icu_61.1.bb
> @@ -1,6 +1,6 @@
>  require icu.inc
>  
> -LIC_FILES_CHKSUM = "file://../LICENSE;md5=675f2d069434d8a1e4e6b0dcf4379226"
> +LIC_FILES_CHKSUM = "file://../LICENSE;md5=63752c57bd0b365c9af9f427ef79c819"
>  
>  def icu_download_version(d):
>      pvsplit = d.getVar('PV').split('.')
> @@ -22,8 +22,8 @@ SRC_URI = "${BASE_SRC_URI} \
>  SRC_URI_append_class-target = "\
>             file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
>            "
> -SRC_URI[md5sum] = "43861b127744b3c0b9d7f386f4b9fa40"
> -SRC_URI[sha256sum] = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418"
> +SRC_URI[md5sum] = "68fe38999fef94d622bd6843d43c0615"
> +SRC_URI[sha256sum] = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef"
>  
>  UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
>  UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/"
> 

Re: [PATCH 08/22] bash-completion: update to 2.8

[Alexander Kanavin]

On 04/05/2018 03:18 AM, Khem Raj wrote:
>>   	# Delete files already provided by util-linux
>>   	local i
>> -	for i in mount umount rfkill; do
>> +	for i in mount umount; do
> 
> where did rfkill go ?

util-linux obviously. bash-completion no longer provides it in 2.8.



Alex

Re: [PATCH 14/22] icu: update to 61.1

[Alexander Kanavin]

On 04/05/2018 03:20 AM, Khem Raj wrote:
> On 4/4/18 4:13 AM, Alexander Kanavin wrote:
>> License-Update: copyright years updated, added terms for Google double-conversion
> 
> should this change to terms reflect in LICENSE filed as well.

The LICENSE is set to ICU, which I take means "review manually". It 
consists of separate terms for different componetns that icu is made of.

Alex

Re: [PATCH 20/22] procps: update to 3.3.13

[Richard Purdie]

On Wed, 2018-04-04 at 14:13 +0300, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>

Does this build on musl?

https://autobuilder.yocto.io/builders/nightly-musl-x86-64/builds/389/st
eps/BuildImages/logs/stdio

or was there some other bad interaction in master-next?

Cheers,

Richard

Re: [PATCH 14/22] icu: update to 61.1

[Khem Raj]

On Thu, Apr 5, 2018 at 2:32 AM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> On 04/05/2018 03:20 AM, Khem Raj wrote:
>>
>> On 4/4/18 4:13 AM, Alexander Kanavin wrote:
>>>
>>> License-Update: copyright years updated, added terms for Google
>>> double-conversion
>>
>>
>> should this change to terms reflect in LICENSE filed as well.
>
>
> The LICENSE is set to ICU, which I take means "review manually". It consists
> of separate terms for different componetns that icu is made of.
>

Yes thanks, I guess thats reasonable.

> Alex

Re: [PATCH 08/22] bash-completion: update to 2.8

[Khem Raj]

On Thu, Apr 5, 2018 at 2:27 AM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> On 04/05/2018 03:18 AM, Khem Raj wrote:
>>>
>>>         # Delete files already provided by util-linux
>>>         local i
>>> -       for i in mount umount rfkill; do
>>> +       for i in mount umount; do
>>
>>
>> where did rfkill go ?
>
>
> util-linux obviously. bash-completion no longer provides it in 2.8.

perhaps should be in commit message.

Re: [PATCH 20/22] procps: update to 3.3.13

[Alexander Kanavin]

On 04/05/2018 07:43 PM, Richard Purdie wrote:
> Does this build on musl?
> 
> https://autobuilder.yocto.io/builders/nightly-musl-x86-64/builds/389/st
> eps/BuildImages/logs/stdio
> 
> or was there some other bad interaction in master-next?

My bad, please remove the commit. The new version of procps is using a 
header (libio.h) that is absent in musl, deprecated in glibc 2.27 and 
removed in glibc 2.28. I reckon they will sort it soon enough.

Alex

Re: [PATCH 07/22] glib-2.0: update to 2.56.0

[Burton, Ross]

This breaks when building for mingw, but 2.56.1 has the fixes so should work.

Ross

On 4 April 2018 at 12:13, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> Remove upstreamed ptest-paths.patch
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  .../0001-Do-not-ignore-return-value-of-write.patch | 17 +++++-------
>  .../glib-2.0/glib-2.0/ptest-paths.patch            | 30 ----------------------
>  .../glib-2.0/glib-2.0/relocate-modules.patch       | 13 ++++++----
>  .../{glib-2.0_2.54.3.bb => glib-2.0_2.56.0.bb}     |  5 ++--
>  4 files changed, 17 insertions(+), 48 deletions(-)
>  delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
>  rename meta/recipes-core/glib-2.0/{glib-2.0_2.54.3.bb => glib-2.0_2.56.0.bb} (82%)
>
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
> index aee96aaa6e7..0ebf138d60a 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
> @@ -1,30 +1,30 @@
> -From d6501b107940e9f548c89236d773c6d33c15a5c9 Mon Sep 17 00:00:00 2001
> +From d250652782b65b071b7cc8f01f2db833df104e0e Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem@gmail.com>
>  Date: Sat, 16 Apr 2016 13:28:59 -0700
> -Subject: [PATCH 1/2] Do not ignore return value of write()
> +Subject: [PATCH] Do not ignore return value of write()
>
>  gcc warns about ignoring return value when compiling
>  with fortify turned on.
>
>  assert when write() fails
>
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
>  Upstream-Status: Submitted
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
> +---
>   glib/tests/unix.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
>  diff --git a/glib/tests/unix.c b/glib/tests/unix.c
> -index 3543458..4e7ed85 100644
> +index 9d55a6c..a07f945 100644
>  --- a/glib/tests/unix.c
>  +++ b/glib/tests/unix.c
>  @@ -32,14 +32,15 @@ test_pipe (void)
>     GError *error = NULL;
>     int pipefd[2];
>     char buf[1024];
> --  ssize_t bytes_read;
> -+  ssize_t bytes_read, bytes_written;
> +-  gssize bytes_read;
> ++  gssize bytes_read, bytes_written;
>     gboolean res;
>
>     res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error);
> @@ -37,6 +37,3 @@ index 3543458..4e7ed85 100644
>     memset (buf, 0, sizeof (buf));
>     bytes_read = read (pipefd[0], buf, sizeof(buf) - 1);
>     g_assert_cmpint (bytes_read, >, 0);
> ---
> -2.8.0
> -
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch b/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
> deleted file mode 100644
> index f3be02770cb..00000000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -Instead of writing the temporary mapping files in the mappedfile test to the
> -user runtime directory, write them to $TMP.  The runtime directory may not
> -currently exist if the test is executed on a non-desktop system and the test
> -doesn't attempt to create the directory structure.
> -
> -Upstream-Status: Pending
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -diff --git a/glib/tests/mappedfile.c b/glib/tests/mappedfile.c
> -index 40e0e60..27a24be 100644
> ---- a/glib/tests/mappedfile.c
> -+++ b/glib/tests/mappedfile.c
> -@@ -81,7 +81,7 @@ test_writable (void)
> -   const gchar *new = "abcdefghijklmnopqrstuvxyz";
> -   gchar *tmp_copy_path;
> -
> --  tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL);
> -+  tmp_copy_path = g_build_filename (g_get_tmp_dir (), "glib-test-4096-random-bytes", NULL);
> -
> -   g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error);
> -   g_assert_no_error (error);
> -@@ -125,7 +125,7 @@ test_writable_fd (void)
> -   int fd;
> -   gchar *tmp_copy_path;
> -
> --  tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL);
> -+  tmp_copy_path = g_build_filename (g_get_tmp_dir (), "glib-test-4096-random-bytes", NULL);
> -
> -   g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error);
> -   g_assert_no_error (error);
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
> index 65d5b43f9b6..d3d63b2cd15 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
> @@ -1,3 +1,8 @@
> +From 3edc9a063ceaf27129e0dd96a8be3942e3dd5e96 Mon Sep 17 00:00:00 2001
> +From: Ross Burton <ross.burton@intel.com>
> +Date: Fri, 11 Mar 2016 15:35:55 +0000
> +Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
> +
>  Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to
>  determine where libglib.so is and use that path to calculate GIO_MODULES_DIR.
>
> @@ -8,12 +13,13 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
>
>  Port patch to 2.48
>  Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +
>  ---
>   gio/giomodule.c | 12 +++++++++++-
>   1 file changed, 11 insertions(+), 1 deletion(-)
>
>  diff --git a/gio/giomodule.c b/gio/giomodule.c
> -index da7c167..cc0bc7c 100644
> +index 6937932..66852e6 100644
>  --- a/gio/giomodule.c
>  +++ b/gio/giomodule.c
>  @@ -40,6 +40,8 @@
> @@ -25,7 +31,7 @@ index da7c167..cc0bc7c 100644
>   #endif
>   #include <glib/gstdio.h>
>
> -@@ -1036,7 +1038,15 @@ get_gio_module_dir (void)
> +@@ -1050,7 +1052,15 @@ get_gio_module_dir (void)
>   #endif
>         g_free (install_dir);
>   #else
> @@ -42,6 +48,3 @@ index da7c167..cc0bc7c 100644
>   #endif
>       }
>
> ---
> -2.1.4
> -
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.56.0.bb
> similarity index 82%
> rename from meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
> rename to meta/recipes-core/glib-2.0/glib-2.0_2.56.0.bb
> index faf594569d6..81d207c5963 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.56.0.bb
> @@ -7,7 +7,6 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
>  SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
>             file://configure-libtool.patch \
>             file://run-ptest \
> -           file://ptest-paths.patch \
>             file://uclibc_musl_translation.patch \
>             file://allow-run-media-sdX-drive-mount-if-username-root.patch \
>             file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
> @@ -20,5 +19,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
>
>  SRC_URI_append_class-native = " file://relocate-modules.patch"
>
> -SRC_URI[md5sum] = "16e886ad677bf07b7d48eb8188bcf759"
> -SRC_URI[sha256sum] = "963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8"
> +SRC_URI[md5sum] = "f2b59392f2fb514bbe7791dda0c36da5"
> +SRC_URI[sha256sum] = "ecef6e17e97b8d9150d0e8a4b3edee1ac37331213b8a2a87a083deea408a0fc7"
> --
> 2.16.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 09/22] webkitgtk: update to 2.20.0

[Khem Raj]

On Wed, Apr 4, 2018 at 4:13 AM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> Rebase patches, remove a couple of upstreamed patches.
>
> Add an option to enable woff2 font library (not currently packaged by oe).
>

2.20.1 patch release is available since this patch was posted. Since
this patch is still
in staging, it would be nicer if it was rebased to use 2.20.1

> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  .../webkitgtk/0001-Fix-build-with-musl.patch       | 28 +++++-----
>  ...01-Fix-gles3-header-when-gles2-is-enabled.patch | 38 -------------
>  ...ix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 63 +++++++++++-----------
>  ...cmake-drop-the-hardcoded-introspection-gt.patch | 15 +++---
>  ...bKitMacros-Append-to-I-and-not-to-isystem.patch | 52 +++++++++---------
>  ...ng-introspection-files-add-CMAKE_C_FLAGS-.patch | 47 ++++++++--------
>  .../detect-atomics-during-configure.patch          | 17 +++---
>  .../webkitgtk/fix-configure-failure-aarch64.patch  | 29 ----------
>  .../webkit/webkitgtk/x32_support.patch             | 24 +++++----
>  .../{webkitgtk_2.18.6.bb => webkitgtk_2.20.0.bb}   |  8 +--
>  10 files changed, 124 insertions(+), 197 deletions(-)
>  delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
>  delete mode 100644 meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch
>  rename meta/recipes-sato/webkit/{webkitgtk_2.18.6.bb => webkitgtk_2.20.0.bb} (95%)
>
> diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
> index 7cc4514fccc..041ec4675f1 100644
> --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
> +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
> @@ -1,24 +1,25 @@
> -From 415e31bd5444fa360af58b069f1b9db6607fca7d Mon Sep 17 00:00:00 2001
> +From 4f9d736e0458ed33cd161cd164ad0acdac939f44 Mon Sep 17 00:00:00 2001
>  From: Alexander Kanavin <alex.kanavin@gmail.com>
>  Date: Fri, 6 Oct 2017 17:00:08 +0300
>  Subject: [PATCH] Fix build with musl
>
>  Upstream-Status: Pending
>  Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +
>  ---
> - Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++-----
> + Source/JavaScriptCore/runtime/MachineContext.h | 18 +++++++++++++++++-
>   Source/WTF/wtf/Platform.h                      |  2 +-
> - 2 files changed, 6 insertions(+), 6 deletions(-)
> + 2 files changed, 18 insertions(+), 2 deletions(-)
>
>  diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h
> -index 95080b9..2bb689c 100644
> +index bf0bdc7..84b8a8a 100644
>  --- a/Source/JavaScriptCore/runtime/MachineContext.h
>  +++ b/Source/JavaScriptCore/runtime/MachineContext.h
>  @@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext)
>   #error Unknown Architecture
>   #endif
>
> --#elif defined(__GLIBC__)
> +-#elif defined(__GLIBC__) || defined(__BIONIC__)
>  +#elif defined(__linux__)
>
>   #if CPU(X86)
> @@ -27,7 +28,7 @@ index 95080b9..2bb689c 100644
>   #error Unknown Architecture
>   #endif
>
> --#elif defined(__GLIBC__)
> +-#elif defined(__GLIBC__) || defined(__BIONIC__)
>  +#elif defined(__linux__)
>
>   // The following sequence depends on glibc's sys/ucontext.h.
> @@ -36,7 +37,7 @@ index 95080b9..2bb689c 100644
>   #error Unknown Architecture
>   #endif
>
> --#elif defined(__GLIBC__)
> +-#elif defined(__GLIBC__) || defined(__BIONIC__)
>  +#elif defined(__linux__)
>
>   // The following sequence depends on glibc's sys/ucontext.h.
> @@ -45,7 +46,7 @@ index 95080b9..2bb689c 100644
>   #error Unknown Architecture
>   #endif
>
> --#elif defined(__GLIBC__)
> +-#elif defined(__GLIBC__) || defined(__BIONIC__)
>  +#elif defined(__linux__)
>
>   // The following sequence depends on glibc's sys/ucontext.h.
> @@ -54,24 +55,21 @@ index 95080b9..2bb689c 100644
>   #error Unknown Architecture
>   #endif
>
> --#elif defined(__GLIBC__)
> +-#elif defined(__GLIBC__) || defined(__BIONIC__)
>  +#elif defined(__linux__)
>
>   // The following sequence depends on glibc's sys/ucontext.h.
>   #if CPU(X86)
>  diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
> -index 5a2863b..b36c3ff 100644
> +index 551c047..e50b05a 100644
>  --- a/Source/WTF/wtf/Platform.h
>  +++ b/Source/WTF/wtf/Platform.h
> -@@ -680,7 +680,7 @@
> +@@ -683,7 +683,7 @@
>   #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
>   #endif
>
> --#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
> +-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
>  +#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
>   #define HAVE_MACHINE_CONTEXT 1
>   #endif
>
> ---
> -2.14.1
> -
> diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
> deleted file mode 100644
> index 21574072f17..00000000000
> --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -From adf3d4c9d4133bd6995590d921c0ccaec5254da9 Mon Sep 17 00:00:00 2001
> -From: Bhargava Sreekantappa Gayathri
> - <bhargava.sreekantappa-gayathri@xilinx.com>
> -Date: Tue, 27 Feb 2018 16:09:31 -0800
> -Subject: [PATCH] Fix gles3 header when gles2 is enabled
> -
> -A GLES 2 application should not use gl3.h.
> -Fix the gles3 header failure while compiling webkitgtk.
> -
> -FAILED:
> -Source/WebCore/CMakeFiles/WebCore.dir/platform/graphics/GLContext.cpp.o
> -           ^~~~~~~~~~~~~
> -compilation terminated.
> -
> -Upstream-Status: Backport
> -Imported patch from: https://bugs.webkit.org/show_bug.cgi?id=183008
> -
> -Signed-off-by: Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@xilinx.com>
> -Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
> ----
> - Source/WebCore/platform/graphics/GLContext.cpp | 1 -
> - 1 file changed, 1 deletion(-)
> -
> -diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp
> -index 599dcc0..46d2fd4 100644
> ---- a/Source/WebCore/platform/graphics/GLContext.cpp
> -+++ b/Source/WebCore/platform/graphics/GLContext.cpp
> -@@ -31,7 +31,6 @@
> - #elif USE(OPENGL_ES_2)
> - #define GL_GLEXT_PROTOTYPES 1
> - #include <GLES2/gl2.h>
> --#include <GLES3/gl3.h>
> - #endif
> -
> - #if USE(GLX)
> ---
> -2.7.4
> -
> diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
> index 896890b4334..aa9a06701a7 100644
> --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
> +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
> @@ -1,7 +1,7 @@
> -From b7f40eceef0f23bf88090789d4c5845c35f048ae Mon Sep 17 00:00:00 2001
> +From 0afc194c6446e6c3242f1d706b4564e3a9cb2cee Mon Sep 17 00:00:00 2001
>  From: Alexander Kanavin <alex.kanavin@gmail.com>
>  Date: Mon, 29 Aug 2016 16:38:11 +0300
> -Subject: [PATCH 4/9] Fix racy parallel build of WebKit2-4.0.gir
> +Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir
>
>  Upstream-Status: Pending
>  Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> @@ -11,39 +11,36 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>   1 file changed, 5 insertions(+), 4 deletions(-)
>
>  diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
> -index a33c6a86..d83a2e77 100644
> +index a074a80..8c6ebb5 100644
>  --- a/Source/WebKit/PlatformGTK.cmake
>  +++ b/Source/WebKit/PlatformGTK.cmake
> -@@ -1122,8 +1122,9 @@ endif ()
> - string(REGEX MATCHALL "-L[^ ]*"
> -     INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
> +@@ -728,8 +728,9 @@ if (ENABLE_INTROSPECTION)
> +     string(REGEX MATCHALL "-L[^ ]*"
> +         INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
>
> --add_custom_command(
> --    OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
> -+# This is a target and not a command because it's used to build another .gir
> -+# and a .typelib, which would trigger two racy parallel builds when using command
> -+add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir
> -     DEPENDS WebKit2
> -     DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
> -     COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
> -@@ -1168,7 +1169,7 @@ add_custom_command(
> - add_custom_command(
> -     OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
> -     DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
> --    DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
> -+    DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
> -     COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
> -         LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
> -         ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
> -@@ -1225,7 +1226,7 @@ add_custom_command(
> +-    add_custom_command(
> +-        OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
> ++    # This is a target and not a command because it's used to build another .gir
> ++    # and a .typelib, which would trigger two racy parallel builds when using command
> ++    add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir
> +         DEPENDS WebKit
> +         DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
> +         COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
> +@@ -773,7 +774,7 @@ if (ENABLE_INTROSPECTION)
> +     add_custom_command(
> +         OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
> +         DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
> +-        DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
> ++        DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
> +         COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
> +             LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
> +             ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
> +@@ -828,7 +829,7 @@ if (ENABLE_INTROSPECTION)
>
> - add_custom_command(
> -     OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
> --    DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
> -+    DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
> -     COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
> - )
> +     add_custom_command(
> +         OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
> +-        DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
> ++        DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
> +         COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
> +     )
>
> ---
> -2.14.1
> -
> diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
> index 0f6eeed1a2e..e8d1d8c341a 100644
> --- a/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
> +++ b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
> @@ -1,4 +1,4 @@
> -From 48648570e449cf7f84a26dc03c1e3f620fa69757 Mon Sep 17 00:00:00 2001
> +From bed4cf4aaa6aad4172ec9942e9039fb8e1ef68a4 Mon Sep 17 00:00:00 2001
>  From: Alexander Kanavin <alex.kanavin@gmail.com>
>  Date: Mon, 29 Feb 2016 18:13:39 +0200
>  Subject: [PATCH] OptionsGTK.cmake: drop the hardcoded introspection/gtkdoc
> @@ -11,16 +11,17 @@ through the use of qemu target emulation.
>  Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>
>  Upstream-Status: Pending
> +
>  ---
>   Source/cmake/OptionsGTK.cmake | 6 ------
>   1 file changed, 6 deletions(-)
>
> -Index: webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake
> -===================================================================
> ---- webkitgtk-2.12.1.orig/Source/cmake/OptionsGTK.cmake
> -+++ webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake
> -@@ -424,12 +424,6 @@ if (USE_LIBHYPHEN)
> -     endif ()
> +diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
> +index 661b40e..404441b 100644
> +--- a/Source/cmake/OptionsGTK.cmake
> ++++ b/Source/cmake/OptionsGTK.cmake
> +@@ -352,12 +352,6 @@ if (ENABLED_COMPILER_SANITIZERS)
> +     set(ENABLE_INTROSPECTION OFF)
>   endif ()
>
>  -# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building.
> diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
> index 9fc1421fdd6..034219f8269 100644
> --- a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
> +++ b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
> @@ -1,7 +1,7 @@
> -From ef832a115b40861c08df333339b1366da49e5393 Mon Sep 17 00:00:00 2001
> +From e1c6540f7984bd48e1e2d80d965fa82c70de3c20 Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem@gmail.com>
>  Date: Sun, 17 Apr 2016 12:35:41 -0700
> -Subject: [PATCH 9/9] WebKitMacros: Append to -I and not to -isystem
> +Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem
>
>  gcc-6 has now introduced stdlib.h in libstdc++ for better
>  compliance and its including the C library stdlib.h using
> @@ -17,6 +17,7 @@ and ends up with compile errors e.g.
>  Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
>  Upstream-Status: Pending
> +
>  ---
>   Source/JavaScriptCore/shell/CMakeLists.txt | 2 +-
>   Source/WebCore/PlatformGTK.cmake           | 6 +++---
> @@ -27,23 +28,23 @@ Upstream-Status: Pending
>   6 files changed, 8 insertions(+), 8 deletions(-)
>
>  diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
> -index bc37dd31..4e49871f 100644
> +index b3c7e0b..88446de 100644
>  --- a/Source/JavaScriptCore/shell/CMakeLists.txt
>  +++ b/Source/JavaScriptCore/shell/CMakeLists.txt
>  @@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
>   WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
>   WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
> - include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
> + include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_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})
>
>  diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
> -index 73506c74..8eb8b415 100644
> +index 32c6ccc..fef5e8b 100644
>  --- a/Source/WebCore/PlatformGTK.cmake
>  +++ b/Source/WebCore/PlatformGTK.cmake
> -@@ -281,7 +281,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
> +@@ -159,7 +159,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
>           ${GTK2_INCLUDE_DIRS}
>           ${GDK2_INCLUDE_DIRS}
>       )
> @@ -52,7 +53,7 @@ index 73506c74..8eb8b415 100644
>           ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
>       )
>       target_link_libraries(WebCorePlatformGTK2
> -@@ -305,7 +305,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
> +@@ -183,7 +183,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
>   target_include_directories(WebCorePlatformGTK PRIVATE
>       ${WebCore_INCLUDE_DIRECTORIES}
>   )
> @@ -61,7 +62,7 @@ index 73506c74..8eb8b415 100644
>       ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
>       ${GTK_INCLUDE_DIRS}
>       ${GDK_INCLUDE_DIRS}
> -@@ -321,7 +321,7 @@ include_directories(
> +@@ -199,7 +199,7 @@ include_directories(
>       "${WEBCORE_DIR}/bindings/gobject/"
>   )
>
> @@ -71,33 +72,33 @@ index 73506c74..8eb8b415 100644
>   )
>
>  diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
> -index d83a2e77..401246f4 100644
> +index 8c6ebb5..772c243 100644
>  --- a/Source/WebKit/PlatformGTK.cmake
>  +++ b/Source/WebKit/PlatformGTK.cmake
> -@@ -1050,7 +1050,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
> +@@ -655,7 +655,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
>       target_include_directories(WebKitPluginProcess2 PRIVATE
> -         ${WebKit2CommonIncludeDirectories}
> +         ${WebKitCommonIncludeDirectories}
>       )
>  -    target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
>  +    target_include_directories(WebKitPluginProcess2 PRIVATE
> -          ${WebKit2CommonSystemIncludeDirectories}
> +          ${WebKitCommonSystemIncludeDirectories}
>            ${GTK2_INCLUDE_DIRS}
>            ${GDK2_INCLUDE_DIRS}
>  diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
> -index 7bc89543..d9818fa4 100644
> +index a1e7e8f..ce24274 100644
>  --- a/Source/cmake/WebKitMacros.cmake
>  +++ b/Source/cmake/WebKitMacros.cmake
> -@@ -78,7 +78,7 @@ macro(WEBKIT_FRAMEWORK_DECLARE _target)
> - endmacro()
> -
> - macro(WEBKIT_FRAMEWORK _target)
> --    include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
> -+    include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
> -     target_sources(${_target} PRIVATE
> -         ${${_target}_HEADERS}
> +@@ -134,7 +134,7 @@ macro(WEBKIT_FRAMEWORK _target)
>           ${${_target}_SOURCES}
> +     )
> +     target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
> +-    target_include_directories(${_target} SYSTEM PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
> ++    target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
> +     target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>")
> +     target_link_libraries(${_target} ${${_target}_LIBRARIES})
> +     set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
>  diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
> -index e832a86d..ce92c864 100644
> +index dc2b61e..0128dca 100644
>  --- a/Tools/MiniBrowser/gtk/CMakeLists.txt
>  +++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
>  @@ -57,7 +57,7 @@ endif ()
> @@ -110,11 +111,11 @@ index e832a86d..ce92c864 100644
>   target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
>
>  diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
> -index 1be3dd52..7bdddf37 100644
> +index 4aef695..a14b163 100644
>  --- a/Tools/TestWebKitAPI/PlatformGTK.cmake
>  +++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
>  @@ -20,7 +20,7 @@ include_directories(
> -     ${WEBKIT2_DIR}/UIProcess/API/gtk
> +     ${WEBKIT_DIR}/UIProcess/API/gtk
>   )
>
>  -include_directories(SYSTEM
> @@ -122,6 +123,3 @@ index 1be3dd52..7bdddf37 100644
>       ${GDK3_INCLUDE_DIRS}
>       ${GLIB_INCLUDE_DIRS}
>       ${GTK3_INCLUDE_DIRS}
> ---
> -2.14.1
> -
> diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
> index fb4c4dc9325..923d00c4bae 100644
> --- a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
> +++ b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
> @@ -1,8 +1,8 @@
> -From 98b1359a0cd87bbdb22cef98ba594440f4c57d92 Mon Sep 17 00:00:00 2001
> +From f9767a479111f9c6f280c43176c33de50aee7f66 Mon Sep 17 00:00:00 2001
>  From: Alexander Kanavin <alex.kanavin@gmail.com>
>  Date: Wed, 28 Oct 2015 14:18:57 +0200
> -Subject: [PATCH 2/9] When building introspection files, add CMAKE_C_FLAGS to
> - the compiler flags.
> +Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the
> + compiler flags.
>
>  g-ir-compiler is using a C compiler internally, so it needs to set
>  the proper flags for it.
> @@ -15,27 +15,24 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
>  diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
> -index 7f92ae72..a33c6a86 100644
> +index dc6b306..a074a80 100644
>  --- a/Source/WebKit/PlatformGTK.cmake
>  +++ b/Source/WebKit/PlatformGTK.cmake
> -@@ -1126,7 +1126,7 @@ add_custom_command(
> -     OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
> -     DEPENDS WebKit2
> -     DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
> --    COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
> -+    COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
> -         ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
> -         ${INTROSPECTION_SCANNER}
> -         --quiet
> -@@ -1169,7 +1169,7 @@ add_custom_command(
> -     OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
> -     DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
> -     DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
> --    COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
> -+    COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
> -         LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
> -         ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
> -         ${INTROSPECTION_SCANNER}
> ---
> -2.14.1
> -
> +@@ -732,7 +732,7 @@ if (ENABLE_INTROSPECTION)
> +         OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
> +         DEPENDS WebKit
> +         DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
> +-        COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
> ++        COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
> +             ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
> +             ${INTROSPECTION_SCANNER}
> +             --quiet
> +@@ -774,7 +774,7 @@ if (ENABLE_INTROSPECTION)
> +         OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
> +         DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
> +         DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
> +-        COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
> ++        COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
> +             LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
> +             ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
> +             ${INTROSPECTION_SCANNER}
> diff --git a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
> index c6157e10378..bbdb64490a2 100644
> --- a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
> +++ b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
> @@ -1,7 +1,7 @@
> -From 0b3811771ae6385503f2d949f9433d8f810d2ff9 Mon Sep 17 00:00:00 2001
> +From d907ac649ff5514826af9ad7e97e15dfcf79909c Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem@gmail.com>
>  Date: Wed, 17 May 2017 22:34:24 -0700
> -Subject: [PATCH 8/9] webkitgtk: Fix build for armv5
> +Subject: [PATCH] webkitgtk: Fix build for armv5
>
>  Taken from
>  https://bugs.webkit.org/show_bug.cgi?id=161900
> @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
>   1 file changed, 9 insertions(+), 1 deletion(-)
>
>  diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
> -index 6b5e45b9..46ee3c22 100644
> +index 220bafd..4e1e9f8 100644
>  --- a/Source/WTF/wtf/CMakeLists.txt
>  +++ b/Source/WTF/wtf/CMakeLists.txt
> -@@ -205,7 +205,6 @@ set(WTF_HEADERS
> +@@ -315,7 +315,6 @@ set(WTF_HEADERS
>
>   set(WTF_SOURCES
>       Assertions.cpp
> @@ -25,7 +25,7 @@ index 6b5e45b9..46ee3c22 100644
>       AutomaticThread.cpp
>       BitVector.cpp
>       CPUTime.cpp
> -@@ -336,6 +335,15 @@ if (NOT USE_SYSTEM_MALLOC)
> +@@ -458,6 +457,15 @@ if (NOT USE_SYSTEM_MALLOC)
>       list(APPEND WTF_LIBRARIES bmalloc)
>   endif ()
>
> @@ -39,8 +39,5 @@ index 6b5e45b9..46ee3c22 100644
>  +file(REMOVE ${CMAKE_BINARY_DIR}/test_atomics.cpp)
>  +
>   list(APPEND WTF_SOURCES
> -     unicode/icu/CollatorICU.cpp
> - )
> ---
> -2.14.1
> -
> +     unicode/CollatorDefault.cpp
> +
> diff --git a/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch b/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch
> deleted file mode 100644
> index 4a6ab544b2a..00000000000
> --- a/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -Fix configure failure for aarch64
> -
> -| -- Performing Test CXX_COMPILER_SUPPORTS_-fcolor-diagnostics - Failed
> -| -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always
> -| -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always - Success
> -| CMake Error at Source/cmake/OptionsCommon.cmake:42 (WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG):
> -|   Unknown CMake command "WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG".
> -| Call Stack (most recent call first):
> -|   Source/cmake/WebKitCommon.cmake:58 (include)
> -|   CMakeLists.txt:166 (include)
> -|
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
> -
> -Index: webkitgtk-2.14.6/Source/cmake/OptionsCommon.cmake
> -===================================================================
> ---- webkitgtk-2.14.6.orig/Source/cmake/OptionsCommon.cmake     2018-02-15 18:56:29.315238564 -0800
> -+++ webkitgtk-2.14.6/Source/cmake/OptionsCommon.cmake  2018-02-15 18:54:57.469518064 -0800
> -@@ -39,7 +39,7 @@
> -     if (NOT WTF_CPU_ARM64)
> -         message(FATAL_ERROR "WTF_CPU_ARM64_CORTEXA53 set without WTF_CPU_ARM64")
> -     endif ()
> --    WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG(-mfix-cortex-a53-835769)
> -+    WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-mfix-cortex-a53-835769)
> - endif ()
> -
> - EXPOSE_VARIABLE_TO_BUILD(WTF_CPU_ARM64_CORTEXA53)
> diff --git a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
> index 5f23837585b..f2454b98499 100644
> --- a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
> +++ b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
> @@ -1,13 +1,19 @@
> +From 897563a0397266d8ceb058f172e16b06419b2593 Mon Sep 17 00:00:00 2001
>  From: Daniel Schepler <dschepler@gmail.com>
> -Subject: Fix FTBFS in x32
> -Bug-Debian: https://bugs.debian.org/700795
> -Upstream-Status: Pending
> -Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> -Index: webkitgtk-2.16.1/Source/WTF/wtf/Platform.h
> +Date: Mon, 26 Mar 2018 17:48:34 +0300
> +Subject: [PATCH] Fix FTBFS in x32
> +
>  ===================================================================
> ---- webkitgtk-2.16.1.orig/Source/WTF/wtf/Platform.h
> -+++ webkitgtk-2.16.1/Source/WTF/wtf/Platform.h
> -@@ -172,7 +172,11 @@
> +
> +---
> + Source/WTF/wtf/Platform.h | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
> +index 850e298..551c047 100644
> +--- a/Source/WTF/wtf/Platform.h
> ++++ b/Source/WTF/wtf/Platform.h
> +@@ -132,7 +132,11 @@
>   /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
>   #if   defined(__x86_64__) \
>       || defined(_M_X64)
> @@ -17,5 +23,5 @@ Index: webkitgtk-2.16.1/Source/WTF/wtf/Platform.h
>   #define WTF_CPU_X86_64 1
>  +#endif
>   #define WTF_CPU_X86_SSE2 1
> + #define WTF_CPU_KNOWN 1
>   #endif
> -
> diff --git a/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb b/meta/recipes-sato/webkit/webkitgtk_2.20.0.bb
> similarity index 95%
> rename from meta/recipes-sato/webkit/webkitgtk_2.18.6.bb
> rename to meta/recipes-sato/webkit/webkitgtk_2.20.0.bb
> index c29fa7f4c5c..50e26665782 100644
> --- a/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb
> +++ b/meta/recipes-sato/webkit/webkitgtk_2.20.0.bb
> @@ -20,12 +20,10 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
>             file://detect-atomics-during-configure.patch \
>             file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
>             file://0001-Fix-build-with-musl.patch \
> -           file://fix-configure-failure-aarch64.patch \
> -           file://0001-Fix-gles3-header-when-gles2-is-enabled.patch \
>             "
>
> -SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112"
> -SRC_URI[sha256sum] = "93912cc2f40f12e452be1ca4babdbdaac0ec4f828d441257a6b06c2963bbac3c"
> +SRC_URI[md5sum] = "51cc47345c3ec53802718cd6fc9b746f"
> +SRC_URI[sha256sum] = "57f640f720bd9a8a7207f3321cf803a15c2f207b4e7b75ff1be17bc1eeb00a3c"
>
>  inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
>
> @@ -56,6 +54,8 @@ PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl"
>  PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl"
>  PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret"
>  PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen"
> +# Source is at https://github.com/google/woff2
> +PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2"
>
>  EXTRA_OECMAKE = " \
>                 -DPORT=GTK \
> --
> 2.16.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 09/22] webkitgtk: update to 2.20.0

[Alexander Kanavin]

On 04/30/2018 03:43 AM, Khem Raj wrote:
> On Wed, Apr 4, 2018 at 4:13 AM, Alexander Kanavin
> <alexander.kanavin@linux.intel.com> wrote:
>> Rebase patches, remove a couple of upstreamed patches.
>>
>> Add an option to enable woff2 font library (not currently packaged by oe).
>>
> 
> 2.20.1 patch release is available since this patch was posted. Since
> this patch is still
> in staging, it would be nicer if it was rebased to use 2.20.1

If I need to resend the patchset, then I'll update it to catch up with 
upstream. There's plenty of time before the next YP release.

Alex

Re: [PATCH 09/22] webkitgtk: update to 2.20.0

[Khem Raj]

On Mon, Apr 30, 2018 at 6:07 AM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> On 04/30/2018 03:43 AM, Khem Raj wrote:
>>
>> On Wed, Apr 4, 2018 at 4:13 AM, Alexander Kanavin
>> <alexander.kanavin@linux.intel.com> wrote:
>>>
>>> Rebase patches, remove a couple of upstreamed patches.
>>>
>>> Add an option to enable woff2 font library (not currently packaged by
>>> oe).
>>>
>>
>> 2.20.1 patch release is available since this patch was posted. Since
>> this patch is still
>> in staging, it would be nicer if it was rebased to use 2.20.1
>
>
> If I need to resend the patchset, then I'll update it to catch up with
> upstream. There's plenty of time before the next YP release.

its ok, I have done the patch I needed to do on existing version

Re: [PATCH 09/22] webkitgtk: update to 2.20.0

[Alexander Kanavin]

On 04/30/2018 06:39 PM, Khem Raj wrote:

>>> 2.20.1 patch release is available since this patch was posted. Since
>>> this patch is still
>>> in staging, it would be nicer if it was rebased to use 2.20.1
>>
>>
>> If I need to resend the patchset, then I'll update it to catch up with
>> upstream. There's plenty of time before the next YP release.
> 
> its ok, I have done the patch I needed to do on existing version

FWIW, I have the 2.20.1 update here among many others, but I don't want 
to make the master-next/mut situation any worse, so I'm holding them 
back for now. You are welcome to cherry pick.
https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates


Alex