[PATCH 00/16] A bunch of minor updates

[PATCH 00/16] A bunch of minor updates

[Alexander Kanavin]

While Jussi Kukkonen is working on sato-gtk3 project, I thought I'd update
some of the packages assigned to him, where possibility of breakage is minimal.
So major GL-related updates are excluded.

The following changes since commit c192bd60e8c7bcb9bbdd24158bd66eb691bfee5a:

  Revert "xz: Allow to work with ASSUME_PROVIDED xz-native" (2016-01-25 12:44:13 +0000)

are available in the git repository at:

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

Alexander Kanavin (16):
  cmake: update to 3.4.2
  at-spi2-core: update to 2.18.3
  gcr: check only even upstream versions
  webkitgtk: update to 2.10.5
  libsecret: update to 0.18.4
  freetype: update to 2.6.2
  gdk-pixbuf: update to 2.32.3
  glib-2.0: update to 2.46.2
  gtk+: update to 2.24.29
  gtk+3: update to 3.18.6
  gtk-icon-utils-native: update to 3.18.6
  libsoup-2.4: update to 2.52.2
  pixman: only check even upstream versions
  waffle: update to 1.5.2
  vala: update to 0.30.0
  rxvt-unicode: update to 9.22

 ...on-t-depend-on-a-data-file-that-s-not-bui.patch | 38 -------------
 .../{glib-2.0_2.46.1.bb => glib-2.0_2.46.2.bb}     |  5 +-
 ...cmake-native_3.3.2.bb => cmake-native_3.4.2.bb} |  0
 meta/recipes-devtools/cmake/cmake.inc              |  4 +-
 .../cmake/{cmake_3.3.2.bb => cmake_3.4.2.bb}       |  0
 .../vala/{vala_0.28.0.bb => vala_0.30.0.bb}        |  4 +-
 meta/recipes-gnome/gcr/gcr_3.18.0.bb               |  2 +-
 .../gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch      | 63 ----------------------
 .../{gdk-pixbuf_2.32.1.bb => gdk-pixbuf_2.32.3.bb} |  5 +-
 .../gtk+/{gtk+3_3.18.2.bb => gtk+3_3.18.6.bb}      |  4 +-
 .../gtk+/{gtk+_2.24.28.bb => gtk+_2.24.29.bb}      |  4 +-
 ...e_3.18.2.bb => gtk-icon-utils-native_3.18.6.bb} |  4 +-
 .../{libsecret_0.18.3.bb => libsecret_0.18.4.bb}   |  4 +-
 .../{freetype_2.6.bb => freetype_2.6.2.bb}         |  6 +--
 .../waffle/{waffle_1.5.1.bb => waffle_1.5.2.bb}    |  4 +-
 meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb    |  3 ++
 meta/recipes-sato/puzzles/puzzles_git.bb           |  2 +-
 meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc    |  2 +-
 .../{rxvt-unicode_9.21.bb => rxvt-unicode_9.22.bb} |  6 +--
 .../{webkitgtk_2.10.4.bb => webkitgtk_2.10.5.bb}   |  4 +-
 ...-spi2-core_2.18.1.bb => at-spi2-core_2.18.3.bb} |  4 +-
 ...libsoup-2.4_2.52.1.bb => libsoup-2.4_2.52.2.bb} |  4 +-
 22 files changed, 36 insertions(+), 136 deletions(-)
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.46.1.bb => glib-2.0_2.46.2.bb} (79%)
 rename meta/recipes-devtools/cmake/{cmake-native_3.3.2.bb => cmake-native_3.4.2.bb} (100%)
 rename meta/recipes-devtools/cmake/{cmake_3.3.2.bb => cmake_3.4.2.bb} (100%)
 rename meta/recipes-devtools/vala/{vala_0.28.0.bb => vala_0.30.0.bb} (42%)
 delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch
 rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.32.1.bb => gdk-pixbuf_2.32.3.bb} (95%)
 rename meta/recipes-gnome/gtk+/{gtk+3_3.18.2.bb => gtk+3_3.18.6.bb} (83%)
 rename meta/recipes-gnome/gtk+/{gtk+_2.24.28.bb => gtk+_2.24.29.bb} (90%)
 rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.18.2.bb => gtk-icon-utils-native_3.18.6.bb} (94%)
 rename meta/recipes-gnome/libsecret/{libsecret_0.18.3.bb => libsecret_0.18.4.bb} (71%)
 rename meta/recipes-graphics/freetype/{freetype_2.6.bb => freetype_2.6.2.bb} (89%)
 rename meta/recipes-graphics/waffle/{waffle_1.5.1.bb => waffle_1.5.2.bb} (91%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode_9.21.bb => rxvt-unicode_9.22.bb} (50%)
 rename meta/recipes-sato/webkit/{webkitgtk_2.10.4.bb => webkitgtk_2.10.5.bb} (96%)
 rename meta/recipes-support/atk/{at-spi2-core_2.18.1.bb => at-spi2-core_2.18.3.bb} (85%)
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.52.1.bb => libsoup-2.4_2.52.2.bb} (86%)

-- 
2.7.0.rc3

[PATCH 01/16] cmake: update to 3.4.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../cmake/{cmake-native_3.3.2.bb => cmake-native_3.4.2.bb}            | 0
 meta/recipes-devtools/cmake/cmake.inc                                 | 4 ++--
 meta/recipes-devtools/cmake/{cmake_3.3.2.bb => cmake_3.4.2.bb}        | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/cmake/{cmake-native_3.3.2.bb => cmake-native_3.4.2.bb} (100%)
 rename meta/recipes-devtools/cmake/{cmake_3.3.2.bb => cmake_3.4.2.bb} (100%)

diff --git a/meta/recipes-devtools/cmake/cmake-native_3.3.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.4.2.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.3.2.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.4.2.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 41be256..befac7c 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -17,8 +17,8 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
            file://0001-Add-NIOS2-CPU-support.patch \
            "
 
-SRC_URI[md5sum] = "5febbd11bcaac854a27eebaf4a124be2"
-SRC_URI[sha256sum] = "e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22"
+SRC_URI[md5sum] = "04545d3cc3801fe84223b864c4f7a53c"
+SRC_URI[sha256sum] = "da7cc34e1ce1d82e67a32ab081c02c2845534cd8bf2e09d88077a1b282e97392"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
diff --git a/meta/recipes-devtools/cmake/cmake_3.3.2.bb b/meta/recipes-devtools/cmake/cmake_3.4.2.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.3.2.bb
rename to meta/recipes-devtools/cmake/cmake_3.4.2.bb
-- 
2.7.0.rc3

[PATCH 02/16] at-spi2-core: update to 2.18.3

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../atk/{at-spi2-core_2.18.1.bb => at-spi2-core_2.18.3.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/atk/{at-spi2-core_2.18.1.bb => at-spi2-core_2.18.3.bb} (85%)

diff --git a/meta/recipes-support/atk/at-spi2-core_2.18.1.bb b/meta/recipes-support/atk/at-spi2-core_2.18.3.bb
similarity index 85%
rename from meta/recipes-support/atk/at-spi2-core_2.18.1.bb
rename to meta/recipes-support/atk/at-spi2-core_2.18.3.bb
index bade3c6..f22bb83 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.18.1.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.18.3.bb
@@ -8,8 +8,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
            file://0001-nls.m4-Take-it-from-gettext-0.15.patch \
           "
 
-SRC_URI[md5sum] = "5f13ba8cfd97cf817261954ef49ebd48"
-SRC_URI[sha256sum] = "57d555be4cc64905454687bf9bb7dc1e68531bee93befa77222d94ea083f01cf"
+SRC_URI[md5sum] = "fc18801e56f6ce6914126f837d42f556"
+SRC_URI[sha256sum] = "ada26add94155f97d0f601a20cb7a0e3fd3ba1588c3520b7288316494027d629"
 
 DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native"
 
-- 
2.7.0.rc3

[PATCH 03/16] gcr: check only even upstream versions

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-gnome/gcr/gcr_3.18.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-gnome/gcr/gcr_3.18.0.bb b/meta/recipes-gnome/gcr/gcr_3.18.0.bb
index 0636afe..ed6e8c4 100644
--- a/meta/recipes-gnome/gcr/gcr_3.18.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.18.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 
 DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt vala"
 
-inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check
+inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even
 # depends on gtk+3, but also x11 through gtk+-x11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-- 
2.7.0.rc3

[PATCH 04/16] webkitgtk: update to 2.10.5

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-sato/webkit/{webkitgtk_2.10.4.bb => webkitgtk_2.10.5.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-sato/webkit/{webkitgtk_2.10.4.bb => webkitgtk_2.10.5.bb} (96%)

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.10.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.10.5.bb
similarity index 96%
rename from meta/recipes-sato/webkit/webkitgtk_2.10.4.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.10.5.bb
index 098bbbb..fba3108 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.10.4.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.10.5.bb
@@ -16,8 +16,8 @@ SRC_URI = "\
   file://0001-Enable-backtrace-on-linux-when-using-glibc.patch \
   file://0001-Fix-build-with-non-glibc-libraries-on-linux.patch \
   "
-SRC_URI[md5sum] = "fb010031c6f61c3a1a00793b112badb5"
-SRC_URI[sha256sum] = "dbf8260da5cac0c74de2d3cce1fe7c519da3cd816a2c769cb6c6d56addd2f055"
+SRC_URI[md5sum] = "bb3bd727960630bb4cbaddf8b1632d18"
+SRC_URI[sha256sum] = "785d5e98eaf07be15fb8891b7d5b13a2df7072c609b3ee631ca07d5dea1d79fa"
 
 inherit cmake lib_package pkgconfig perlnative pythonnative distro_features_check upstream-version-is-even
 
-- 
2.7.0.rc3

[PATCH 05/16] libsecret: update to 0.18.4

[Alexander Kanavin]

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

diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.3.bb b/meta/recipes-gnome/libsecret/libsecret_0.18.4.bb
similarity index 71%
rename from meta/recipes-gnome/libsecret/libsecret_0.18.3.bb
rename to meta/recipes-gnome/libsecret/libsecret_0.18.4.bb
index 5058427..534caad 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.18.3.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.18.4.bb
@@ -8,8 +8,8 @@ DEPENDS = "glib-2.0 libgcrypt gettext-native intltool-native"
 
 EXTRA_OECONF += "--disable-manpages"
 
-SRC_URI[archive.md5sum] = "a21605644a64883ab685aec50d63253e"
-SRC_URI[archive.sha256sum] = "f2bf1d0c5ab4640664f3e3c7ef6b086c180e50ff415720b5e22f96750dbf84c9"
+SRC_URI[archive.md5sum] = "5190da1ee686437046bc10068f120d1d"
+SRC_URI[archive.sha256sum] = "0f29b51698198e6999c91f4adce3119c8c457f546b133a85baea5ea9010a19ed"
 
 # http://errors.yoctoproject.org/Errors/Details/20228/
 ARM_INSTRUCTION_SET = "arm"
-- 
2.7.0.rc3

[PATCH 06/16] freetype: update to 2.6.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../freetype/{freetype_2.6.bb => freetype_2.6.2.bb}                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/freetype/{freetype_2.6.bb => freetype_2.6.2.bb} (89%)

diff --git a/meta/recipes-graphics/freetype/freetype_2.6.bb b/meta/recipes-graphics/freetype/freetype_2.6.2.bb
similarity index 89%
rename from meta/recipes-graphics/freetype/freetype_2.6.bb
rename to meta/recipes-graphics/freetype/freetype_2.6.2.bb
index 17ab1c8..63e8ff4 100644
--- a/meta/recipes-graphics/freetype/freetype_2.6.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.6.2.bb
@@ -15,8 +15,8 @@ SECTION = "libs"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
            file://use-right-libtool.patch"
-SRC_URI[md5sum] = "5682890cb0267f6671dd3de6eabd3e69"
-SRC_URI[sha256sum] = "8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e"
+SRC_URI[md5sum] = "86109d0c998787d81ac582bad9adf82e"
+SRC_URI[sha256sum] = "baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892"
 
 BINCONFIG = "${bindir}/freetype-config"
 
@@ -46,7 +46,7 @@ do_configure() {
 }
 
 do_install_append() {
-	oe_multilib_header freetype2/config/ftconfig.h
+	oe_multilib_header freetype2/freetype/config/ftconfig.h
 }
 
 BBCLASSEXTEND = "native"
-- 
2.7.0.rc3

[PATCH 07/16] gdk-pixbuf: update to 2.32.3

[Alexander Kanavin]

Drop backported libc_memfuncs.patch

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch      | 63 ----------------------
 .../{gdk-pixbuf_2.32.1.bb => gdk-pixbuf_2.32.3.bb} |  5 +-
 2 files changed, 2 insertions(+), 66 deletions(-)
 delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch
 rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.32.1.bb => gdk-pixbuf_2.32.3.bb} (95%)

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch
deleted file mode 100644
index 82a27c3..0000000
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 205a3b04e1216c1df199aec95185f7f48b8e0491 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 6 Oct 2015 09:11:38 +0200
-Subject: Run only pixbuf-lowmem test on GNU libc
-
-The test case depends on GNU libc specific internals so we only run it
-on GNU libc.
-
-This fixes build on Linux with musl libc.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=756078
----
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Backport
-
- tests/Makefile.am     | 5 -----
- tests/pixbuf-lowmem.c | 8 ++++++++
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index bdd68f3..c122188 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -19,13 +19,8 @@ LDADD = \
- noinst_PROGRAMS += 			\
- 	pixbuf-read			\
- 	pixbuf-random			\
--	$(NULL)
--
--if OS_LINUX
--noinst_PROGRAMS += 			\
- 	pixbuf-lowmem			\
- 	$(NULL)
--endif
- 
- test_programs = 			\
- 	animation			\
-diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c
-index ae71788..9e9571f 100644
---- a/tests/pixbuf-lowmem.c
-+++ b/tests/pixbuf-lowmem.c
-@@ -24,6 +24,7 @@
- #include <time.h>
- #include <string.h>
- 
-+#ifdef __GLIBC__
- #define PRETEND_MEM_SIZE (16 * 1024 * 1024)
- #define REMAINING_MEM_SIZE 100000
- 
-@@ -225,3 +226,10 @@ main (int argc, char **argv)
-   
-   return 0;
- }
-+#else
-+int
-+main (int argc, char **argv)
-+{
-+	return 0;
-+}
-+#endif
--- 
-cgit v0.11.2
-
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb
similarity index 95%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb
index 104c743..ed9c232 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb
@@ -17,11 +17,10 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
            file://extending-libinstall-dependencies.patch \
            file://run-ptest \
            file://fatal-loader.patch \
-           file://libc_memfuncs.patch \
            "
 
-SRC_URI[md5sum] = "b1590189a2e89fab9f871959c168508c"
-SRC_URI[sha256sum] = "4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc"
+SRC_URI[md5sum] = "9275076639baa24a342f3e02c402920e"
+SRC_URI[sha256sum] = "2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031"
 
 inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even
 
-- 
2.7.0.rc3

[PATCH 08/16] glib-2.0: update to 2.46.2

[Alexander Kanavin]

Drop backported 0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...on-t-depend-on-a-data-file-that-s-not-bui.patch | 38 ----------------------
 .../{glib-2.0_2.46.1.bb => glib-2.0_2.46.2.bb}     |  5 ++-
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.46.1.bb => glib-2.0_2.46.2.bb} (79%)

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch
deleted file mode 100644
index 5f3fef0..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 99dabcb02e2b3f90a12d17a9995752fcae57b522 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Thu, 5 Nov 2015 11:08:32 +0200
-Subject: [PATCH] gio/tests: Don't depend on a data file that's not built
-
-data.gresource is not built when cross-compiling: Don't
-add it to test_data in that case.
-
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Upstream-Status: Backport [https://bugzilla.gnome.org/show_bug.cgi?id=757628]
----
- gio/tests/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 894cf43..cc7deb3 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -76,7 +76,6 @@ dist_test_data = \
- 	$(NULL)
- 
- test_data = \
--	test.gresource				\
- 	$(NULL)
- 
- uninstalled_test_extra_programs = \
-@@ -520,6 +519,8 @@ libresourceplugin_la_SOURCES = resourceplugin.c plugin_resources.c
- libresourceplugin_la_LDFLAGS = -avoid-version -module -export-dynamic $(no_undefined)
- libresourceplugin_la_LIBADD = $(LDADD)
- 
-+test_data += test.gresource
-+
- # libtool contains a bug whereby the created .la file doesn't contain the correct dlname='' in the case that
- # you're building a library but not installing it.  This is apparently because the only considered use for an
- # uninstalled library is as a convenience library for linking (despite the fact that we give -module).  The lack
--- 
-2.6.2
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb
similarity index 79%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb
index 937ae65..79643c7 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb
@@ -15,11 +15,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
            file://allow-run-media-sdX-drive-mount-if-username-root.patch \
 	   file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
-	   file://0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch \
            file://Enable-more-tests-while-cross-compiling.patch \
           "
 
 SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
 
-SRC_URI[md5sum] = "c90e93ceb45100ffc1d40ec5d2ca3248"
-SRC_URI[sha256sum] = "5a1f03b952ebc3a7e9f612b8724f70898183e31503db329b4f15d07163c8fdfb"
+SRC_URI[md5sum] = "7f815d6e46df68e070cb421ed7f1139e"
+SRC_URI[sha256sum] = "5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db"
-- 
2.7.0.rc3

[PATCH 09/16] gtk+: update to 2.24.29

[Alexander Kanavin]

Fix a do_configure() error (missing m4 macro) in puzzles recipe caused
by this update.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-gnome/gtk+/{gtk+_2.24.28.bb => gtk+_2.24.29.bb} | 4 ++--
 meta/recipes-sato/puzzles/puzzles_git.bb                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-gnome/gtk+/{gtk+_2.24.28.bb => gtk+_2.24.29.bb} (90%)

diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.28.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.29.bb
similarity index 90%
rename from meta/recipes-gnome/gtk+/gtk+_2.24.28.bb
rename to meta/recipes-gnome/gtk+/gtk+_2.24.29.bb
index e343773..675ef6d 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.28.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.29.bb
@@ -12,8 +12,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
            file://strict-prototypes.patch \
 	  "
 
-SRC_URI[md5sum] = "bfacf87b2ea67e4e5c7866a9003e6526"
-SRC_URI[sha256sum] = "b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656"
+SRC_URI[md5sum] = "1b7a3689f65617387b5b54520f4439e8"
+SRC_URI[sha256sum] = "0741c59600d3d810a223866453dc2bbb18ce4723828681ba24aa6519c37631b8"
 
 EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
 
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index dab5440..346f43b 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -21,7 +21,7 @@ PV = "0.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-inherit autotools-brokensep distro_features_check
+inherit autotools-brokensep distro_features_check pkgconfig
 
 PACKAGECONFIG ??= "gtk2"
 PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+,"
-- 
2.7.0.rc3

[PATCH 10/16] gtk+3: update to 3.18.6

[Alexander Kanavin]

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

diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.18.2.bb b/meta/recipes-gnome/gtk+/gtk+3_3.18.6.bb
similarity index 83%
rename from meta/recipes-gnome/gtk+/gtk+3_3.18.2.bb
rename to meta/recipes-gnome/gtk+/gtk+3_3.18.6.bb
index 46f0cf9..0ea4fd3 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.18.2.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.18.6.bb
@@ -8,8 +8,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
            file://Do-not-try-to-initialize-GL-without-libGL.patch \
           "
 
-SRC_URI[md5sum] = "230fd78e42419d35ff790784b457e5f2"
-SRC_URI[sha256sum] = "5dbec561c4a00070073bf9cf4cfdd61fab4a14c8ff5b15d700bd378f8185e152"
+SRC_URI[md5sum] = "e1c41ad4a6012d703a80f7423acf186e"
+SRC_URI[sha256sum] = "78cabf0fd5a662f8723f62d5ac633072c76c557c1d700454c9c3deaa37e441ef"
 
 S = "${WORKDIR}/gtk+-${PV}"
 
-- 
2.7.0.rc3

[PATCH 11/16] gtk-icon-utils-native: update to 3.18.6

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...tk-icon-utils-native_3.18.2.bb => gtk-icon-utils-native_3.18.6.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.18.2.bb => gtk-icon-utils-native_3.18.6.bb} (94%)

diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.2.bb b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.6.bb
similarity index 94%
rename from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.2.bb
rename to meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.6.bb
index d5e8a1e..7882bb4 100644
--- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.2.bb
+++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.18.6.bb
@@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
           file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch"
-SRC_URI[md5sum] = "230fd78e42419d35ff790784b457e5f2"
-SRC_URI[sha256sum] = "5dbec561c4a00070073bf9cf4cfdd61fab4a14c8ff5b15d700bd378f8185e152"
+SRC_URI[md5sum] = "e1c41ad4a6012d703a80f7423acf186e"
+SRC_URI[sha256sum] = "78cabf0fd5a662f8723f62d5ac633072c76c557c1d700454c9c3deaa37e441ef"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
                     file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
-- 
2.7.0.rc3

[PATCH 12/16] libsoup-2.4: update to 2.52.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../libsoup/{libsoup-2.4_2.52.1.bb => libsoup-2.4_2.52.2.bb}          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.52.1.bb => libsoup-2.4_2.52.2.bb} (86%)

diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.52.1.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb
similarity index 86%
rename from meta/recipes-support/libsoup/libsoup-2.4_2.52.1.bb
rename to meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb
index 5e66197..b342bbd 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.52.1.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb
@@ -19,8 +19,8 @@ PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "b80f11674724ab38f96426875bc0e2e5"
-SRC_URI[sha256sum] = "0e19bca047ad50b28e8ed7663840f9e45a94909148822ca44dcb3e8cafb5cc48"
+SRC_URI[md5sum] = "e4757d09012ed93822b1ee41435fec24"
+SRC_URI[sha256sum] = "db55628b5c7d952945bb71b236469057c8dfb8dea0c271513579c6273c2093dc"
 
 S = "${WORKDIR}/libsoup-${PV}"
 
-- 
2.7.0.rc3

[PATCH 13/16] pixman: only check even upstream versions

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb b/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb
index 16e68fc..553ce36 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb
@@ -7,6 +7,9 @@ including trapezoids, triangles, and rectangles."
 
 require xorg-lib-common.inc
 
+# see http://cairographics.org/releases/ - only even minor versions are stable
+UPSTREAM_CHECK_REGEX = "pixman-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
+
 LICENSE = "MIT & MIT-style & PD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \
                     file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \
-- 
2.7.0.rc3

[PATCH 14/16] waffle: update to 1.5.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-graphics/waffle/{waffle_1.5.1.bb => waffle_1.5.2.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/waffle/{waffle_1.5.1.bb => waffle_1.5.2.bb} (91%)

diff --git a/meta/recipes-graphics/waffle/waffle_1.5.1.bb b/meta/recipes-graphics/waffle/waffle_1.5.2.bb
similarity index 91%
rename from meta/recipes-graphics/waffle/waffle_1.5.1.bb
rename to meta/recipes-graphics/waffle/waffle_1.5.2.bb
index 6e77948..f7db1bc 100644
--- a/meta/recipes-graphics/waffle/waffle_1.5.1.bb
+++ b/meta/recipes-graphics/waffle/waffle_1.5.2.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
 SRC_URI = "http://waffle-gl.org/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz \
            file://0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch \
           "
-SRC_URI[md5sum] = "c0d802bc3d0aba87c51e423a3a8bdd69"
-SRC_URI[sha256sum] = "cbab0e926515064e818bf089a5af04be33307e5f40d07659fb40d59b2bfe20aa"
+SRC_URI[md5sum] = "c669c91bf2f7e13a5d781c3dbb30fd8c"
+SRC_URI[sha256sum] = "d2c096cf654bf0061323a4b9231a1ef5b749a1e5c7c5bfe067e964219c2a851c"
 
 UPSTREAM_CHECK_URI = "http://www.waffle-gl.org/releases.html"
 
-- 
2.7.0.rc3

[PATCH 15/16] vala: update to 0.30.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/vala/{vala_0.28.0.bb => vala_0.30.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/vala/{vala_0.28.0.bb => vala_0.30.0.bb} (42%)

diff --git a/meta/recipes-devtools/vala/vala_0.28.0.bb b/meta/recipes-devtools/vala/vala_0.30.0.bb
similarity index 42%
rename from meta/recipes-devtools/vala/vala_0.28.0.bb
rename to meta/recipes-devtools/vala/vala_0.30.0.bb
index 120906c..2a20ac6 100644
--- a/meta/recipes-devtools/vala/vala_0.28.0.bb
+++ b/meta/recipes-devtools/vala/vala_0.30.0.bb
@@ -2,5 +2,5 @@ require ${BPN}.inc
 
 SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch"
 
-SRC_URI[md5sum] = "8d4ceac3451a0d5497e7be38e5e4c2ad"
-SRC_URI[sha256sum] = "0d9e3bd3f82145664875f7c29b2f544ba92d2814f75412948f774c0727fc977f"
+SRC_URI[md5sum] = "acfaac43a65cc20d80e08fe6c81c7663"
+SRC_URI[sha256sum] = "61f0337b000f7ed6ef8c1fea87e0047d9bd7c0f91dd9c5b4eb70fd3fb883dedf"
-- 
2.7.0.rc3

[PATCH 16/16] rxvt-unicode: update to 9.22

[Alexander Kanavin]

License checksum change due to new copyright year.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc                     | 2 +-
 .../rxvt-unicode/{rxvt-unicode_9.21.bb => rxvt-unicode_9.22.bb}     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode_9.21.bb => rxvt-unicode_9.22.bb} (50%)

diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
index 04a43c0..4d5daa6 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
@@ -5,7 +5,7 @@ terminal emulator rxvt, modified to store text in Unicode \
 (either UCS-2 or UCS-4) and to use locale-correct input and \
 output. It also supports mixing multiple fonts at the \
 same time, including Xft fonts."
-DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf"
+DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu"
 
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
 	   file://xwc.patch \
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb
similarity index 50%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb
index 7049495..bfa8a61 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb
@@ -2,7 +2,7 @@ require rxvt-unicode.inc
 
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://src/main.C;beginline=1;endline=31;md5=7dac0395806570856e037f98aba8513b"
+                    file://src/main.C;beginline=1;endline=31;md5=d3600d7ee1062667fcd1193fbe6485f6"
 
-SRC_URI[md5sum] = "a9a06c608258c5fd247c3725d8f44582"
-SRC_URI[sha256sum] = "75270ed72bc5895a64a1d7392bf45a622204192371c3965bd3dd978dc088956b"
+SRC_URI[md5sum] = "93782dec27494eb079467dacf6e48185"
+SRC_URI[sha256sum] = "e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd"
-- 
2.7.0.rc3