[PATCH 0/6] Version upgrades

[PATCH 0/6] Version upgrades

[Jussi Kukkonen]

A bunch of minor version upgrades.

The one that might need a closer look is gdk-pixbuf: There's now yet
another tool that's required at build time and the build system is
broken for the cross-compile case.

Please drop the earlier gdk-pixbuf (2.36.4) upgrade.

Cheers,
  Jussi

The following changes since commit e436a6398684d2872cb541f1cfb0f67b3618d15a:

  layer.conf: bump version for change in eSDK selftest behaviour (2017-02-19 09:39:03 -0800)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jku/m3-upgrades
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/m3-upgrades

Jussi Kukkonen (6):
  glib-2.0: Upgrade 2.50.2 -> 2.50.3
  gtk+3: Upgrade 3.22.7 -> 3.22.8
  libgudev: Upgrade 230 -> 231
  libdrm: Upgrade 2.4.74 -> 2.4.75
  menu-cache: Upgrade 1.0.1 -> 1.0.2
  gdk-pixbuf: Upgrade 2.36.1 -> 2.36.5

 .../{glib-2.0_2.50.2.bb => glib-2.0_2.50.3.bb}     |  4 +-
 ...-around-thumbnailer-cross-compile-failure.patch | 47 ++++++++++++++++++++++
 .../{gdk-pixbuf_2.36.1.bb => gdk-pixbuf_2.36.5.bb} | 12 ++++--
 .../gtk+/{gtk+3_3.22.7.bb => gtk+3_3.22.8.bb}      |  4 +-
 ...e_3.22.7.bb => gtk-icon-utils-native_3.22.8.bb} |  4 +-
 .../libgudev/{libgudev_230.bb => libgudev_231.bb}  |  6 ++-
 .../recipes-graphics/drm/libdrm/installtests.patch | 28 ++++++++-----
 .../drm/{libdrm_2.4.74.bb => libdrm_2.4.75.bb}     |  6 +--
 .../{menu-cache_1.0.1.bb => menu-cache_1.0.2.bb}   |  4 +-
 9 files changed, 89 insertions(+), 26 deletions(-)
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.50.2.bb => glib-2.0_2.50.3.bb} (86%)
 create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
 rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.36.1.bb => gdk-pixbuf_2.36.5.bb} (88%)
 rename meta/recipes-gnome/gtk+/{gtk+3_3.22.7.bb => gtk+3_3.22.8.bb} (84%)
 rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.22.7.bb => gtk-icon-utils-native_3.22.8.bb} (93%)
 rename meta/recipes-gnome/libgudev/{libgudev_230.bb => libgudev_231.bb} (65%)
 rename meta/recipes-graphics/drm/{libdrm_2.4.74.bb => libdrm_2.4.75.bb} (91%)
 rename meta/recipes-graphics/menu-cache/{menu-cache_1.0.1.bb => menu-cache_1.0.2.bb} (79%)

-- 
2.1.4

[PATCH 1/6] glib-2.0: Upgrade 2.50.2 -> 2.50.3

[Jussi Kukkonen]

Tiny bug fix release.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-core/glib-2.0/{glib-2.0_2.50.2.bb => glib-2.0_2.50.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.50.2.bb => glib-2.0_2.50.3.bb} (86%)

diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.50.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.50.3.bb
similarity index 86%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.50.2.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.50.3.bb
index b7a0670..22ea347 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.50.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.50.3.bb
@@ -21,5 +21,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
 SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \
                                 file://relocate-modules.patch"
 
-SRC_URI[md5sum] = "5eeb2bfaf78a07be59585e8b6e80b1d6"
-SRC_URI[sha256sum] = "be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5"
+SRC_URI[md5sum] = "381ab22934f296750d036aa55a397ded"
+SRC_URI[sha256sum] = "82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999"
-- 
2.1.4

[PATCH 2/6] gtk+3: Upgrade 3.22.7 -> 3.22.8

[Jussi Kukkonen]

Bug fix release.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-gnome/gtk+/{gtk+3_3.22.7.bb => gtk+3_3.22.8.bb}          | 4 ++--
 ...tk-icon-utils-native_3.22.7.bb => gtk-icon-utils-native_3.22.8.bb} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-gnome/gtk+/{gtk+3_3.22.7.bb => gtk+3_3.22.8.bb} (84%)
 rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.22.7.bb => gtk-icon-utils-native_3.22.8.bb} (93%)

diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.22.7.bb b/meta/recipes-gnome/gtk+/gtk+3_3.22.8.bb
similarity index 84%
rename from meta/recipes-gnome/gtk+/gtk+3_3.22.7.bb
rename to meta/recipes-gnome/gtk+/gtk+3_3.22.8.bb
index 6b74525..1cc57f9 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.22.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.22.8.bb
@@ -8,8 +8,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
            file://0003-Add-disable-opengl-configure-option.patch \
            file://0004-configure.ac-Fix-wayland-protocols-path.patch \
           "
-SRC_URI[md5sum] = "e05a7e8e9b89a71fd016883b5431e429"
-SRC_URI[sha256sum] = "a3a27564bfb1679ebbc75c37cd2bcd6e727c8bdfbcd3984d29305bf9ee60d432"
+SRC_URI[md5sum] = "b4fb39a829e4425b3fa05adbe7f52fef"
+SRC_URI[sha256sum] = "c7254a88df5c17e9609cee9e848c3d0104512707edad4c3b4f256b131f8d3af1"
 
 S = "${WORKDIR}/gtk+-${PV}"
 
diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.7.bb b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.8.bb
similarity index 93%
rename from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.7.bb
rename to meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.8.bb
index 77bb6e7..7283418 100644
--- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.8.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] = "e05a7e8e9b89a71fd016883b5431e429"
-SRC_URI[sha256sum] = "a3a27564bfb1679ebbc75c37cd2bcd6e727c8bdfbcd3984d29305bf9ee60d432"
+SRC_URI[md5sum] = "b4fb39a829e4425b3fa05adbe7f52fef"
+SRC_URI[sha256sum] = "c7254a88df5c17e9609cee9e848c3d0104512707edad4c3b4f256b131f8d3af1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
                     file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
-- 
2.1.4

[PATCH 3/6] libgudev: Upgrade 230 -> 231

[Jussi Kukkonen]

Very small bug fix release.

Use --disable-umockdev: Testing is great but a single regression test
isn't really worth a new build dependency (that isn't in oe-core yet).

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-gnome/libgudev/{libgudev_230.bb => libgudev_231.bb} | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/libgudev/{libgudev_230.bb => libgudev_231.bb} (65%)

diff --git a/meta/recipes-gnome/libgudev/libgudev_230.bb b/meta/recipes-gnome/libgudev/libgudev_231.bb
similarity index 65%
rename from meta/recipes-gnome/libgudev/libgudev_230.bb
rename to meta/recipes-gnome/libgudev/libgudev_231.bb
index 709553b..ae0f1c7 100644
--- a/meta/recipes-gnome/libgudev/libgudev_230.bb
+++ b/meta/recipes-gnome/libgudev/libgudev_231.bb
@@ -1,10 +1,12 @@
 SUMMARY = "GObject wrapper for libudev"
 
-SRC_URI[archive.md5sum] = "e4dee8f3f349e9372213d33887819a4d"
-SRC_URI[archive.sha256sum] = "a2e77faced0c66d7498403adefcc0707105e03db71a2b2abd620025b86347c18"
+SRC_URI[archive.md5sum] = "916c10c51ec61131e244c3936bbb2e0c"
+SRC_URI[archive.sha256sum] = "3b1ef99d4a8984c35044103d8ddfc3cc52c80035c36abab2bcc5e3532e063f96"
 
 DEPENDS = "glib-2.0 udev"
 
+EXTRA_OECONF = "--disable-umockdev"
+
 RCONFLICTS_${PN} = "systemd (<= 220)"
 
 LICENSE = "LGPLv2.1"
-- 
2.1.4

[PATCH 4/6] libdrm: Upgrade 2.4.74 -> 2.4.75

[Jussi Kukkonen]

* Remove udev from depends (it's not actually used).
* Rebase a patch

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../recipes-graphics/drm/libdrm/installtests.patch | 28 +++++++++++++++-------
 .../drm/{libdrm_2.4.74.bb => libdrm_2.4.75.bb}     |  6 ++---
 2 files changed, 22 insertions(+), 12 deletions(-)
 rename meta/recipes-graphics/drm/{libdrm_2.4.74.bb => libdrm_2.4.75.bb} (91%)

diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch
index 30e0a61..ec1fb02 100644
--- a/meta/recipes-graphics/drm/libdrm/installtests.patch
+++ b/meta/recipes-graphics/drm/libdrm/installtests.patch
@@ -1,15 +1,25 @@
-tests: also install tests app
+From 5c6eb43c2f6e7f2ee7c25c92e42f4e4403fa0527 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Tue, 21 Feb 2017 14:37:52 +0200
+Subject: [PATCH] tests: also install test apps
 
 Upstream-Status: Inappropriate [configuration]
 
 Signed-off-by: Yu Ke <ke.yu@intel.com>
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ tests/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
 
-Index: libdrm-2.4.66/tests/Makefile.am
-===================================================================
---- libdrm-2.4.66.orig/tests/Makefile.am
-+++ libdrm-2.4.66/tests/Makefile.am
-@@ -73,3 +73,4 @@ TESTS +=					\
- endif
- 
- check_PROGRAMS += $(TESTS)
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 0355a92..b4882cd 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -45,3 +45,4 @@ TESTS = \
+ check_PROGRAMS = \
+ 	$(TESTS) \
+ 	drmdevice
 +bin_PROGRAMS = $(check_PROGRAMS)
+-- 
+2.1.4
+
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.74.bb b/meta/recipes-graphics/drm/libdrm_2.4.75.bb
similarity index 91%
rename from meta/recipes-graphics/drm/libdrm_2.4.74.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.75.bb
index 06d7642..56963d4 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.74.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.75.bb
@@ -8,7 +8,7 @@ SECTION = "x11/base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
 PROVIDES = "drm"
-DEPENDS = "libpthread-stubs udev libpciaccess"
+DEPENDS = "libpthread-stubs libpciaccess"
 
 SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
            file://installtests.patch \
@@ -16,8 +16,8 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
            file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \
           "
 
-SRC_URI[md5sum] = "31964aa15bdea1a40c5941d4ce0962ee"
-SRC_URI[sha256sum] = "d80dd5a76c401f4c8756dcccd999c63d7e0a3bad258d96a829055cfd86ef840b"
+SRC_URI[md5sum] = "57b0589122ec4b8d5dfb9e430a21f0b3"
+SRC_URI[sha256sum] = "2d5a500eef412cc287d12268eed79d571e262d4957a2ec9258073f305985054f"
 
 inherit autotools pkgconfig manpages
 
-- 
2.1.4

Re: [PATCH 4/6] libdrm: Upgrade 2.4.74 -> 2.4.75

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 531 bytes --]

On 22 February 2017 at 13:02, Jussi Kukkonen <jussi.kukkonen@intel.com>
wrote:

> * Remove udev from depends (it's not actually used).
>

Is it not used by some of the tests?

packages/corei7-64-poky-linux/libdrm/libdrm-tests: PKGSIZE changed from
350048 to 225496 (-35%)
  * PV changed from "2.4.74" to "2.4.75"
  * FILELIST: removed "/usr/bin/dristat /usr/bin/updatedraw
/usr/bin/openclose /usr/bin/name_from_fd /usr/bin/setversion
/usr/bin/getstats /usr/bin/getclient /usr/bin/drmstat /usr/bin/getversion"

Ross

[-- Attachment #2: Type: text/html, Size: 1219 bytes --]

Re: [PATCH 4/6] libdrm: Upgrade 2.4.74 -> 2.4.75

[Jussi Kukkonen]

[-- Attachment #1: Type: text/plain, Size: 787 bytes --]

On 23 February 2017 at 00:22, Burton, Ross <ross.burton@intel.com> wrote:
>
>
> On 22 February 2017 at 13:02, Jussi Kukkonen <jussi.kukkonen@intel.com>
wrote:
>>
>> * Remove udev from depends (it's not actually used).
>
>
> Is it not used by some of the tests?
>
> packages/corei7-64-poky-linux/libdrm/libdrm-tests: PKGSIZE changed from
350048 to 225496 (-35%)
>   * PV changed from "2.4.74" to "2.4.75"
>   * FILELIST: removed "/usr/bin/dristat /usr/bin/updatedraw
/usr/bin/openclose /usr/bin/name_from_fd /usr/bin/setversion
/usr/bin/getstats /usr/bin/getclient /usr/bin/drmstat /usr/bin/getversion"


No, these were removed as tests for "functionality which is neither being
worked on or actively maintained". Should have mentioned this in the
message.

Jussi

[-- Attachment #2: Type: text/html, Size: 1037 bytes --]

Re: [PATCH 4/6] libdrm: Upgrade 2.4.74 -> 2.4.75

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 290 bytes --]

On 23 February 2017 at 08:51, Jussi Kukkonen <jussi.kukkonen@intel.com>
wrote:

> No, these were removed as tests for "functionality which is neither being
> worked on or actively maintained". Should have mentioned this in the message
>

Cool, thanks for the clarification.

Ross

[-- Attachment #2: Type: text/html, Size: 659 bytes --]

[PATCH 5/6] menu-cache: Upgrade 1.0.1 -> 1.0.2

[Jussi Kukkonen]

Small bug fix release.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../menu-cache/{menu-cache_1.0.1.bb => menu-cache_1.0.2.bb}           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/menu-cache/{menu-cache_1.0.1.bb => menu-cache_1.0.2.bb} (79%)

diff --git a/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb b/meta/recipes-graphics/menu-cache/menu-cache_1.0.2.bb
similarity index 79%
rename from meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb
rename to meta/recipes-graphics/menu-cache/menu-cache_1.0.2.bb
index a1a8e26..71540cf 100644
--- a/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb
+++ b/meta/recipes-graphics/menu-cache/menu-cache_1.0.2.bb
@@ -10,8 +10,8 @@ DEPENDS = "glib-2.0 libfm-extra"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "a856ba860b16fdc8c69ee784bc4ade36"
-SRC_URI[sha256sum] = "0ac72649919946070258320aafc320467dd040bcef7b3a225e2ab7241ddffd59"
+SRC_URI[md5sum] = "8dde7a3f5bd9798d0129d1979a5d7640"
+SRC_URI[sha256sum] = "6f83edf2de34f83e701dcb52145d755250a5677580cd413476cc4d7f2d2012d5"
 
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lxde/files/menu-cache/1.0/"
 
-- 
2.1.4

[PATCH 6/6] gdk-pixbuf: Upgrade 2.36.1 -> 2.36.5

[Jussi Kukkonen]

Mostly bug fix releases.

Generating the thumbnailer metadata now requires running yet another
tool at build time. This is broken for cross-compiling, add a
work-around.

Add gdk-pixbuf-native to DEPENDS to make the above workaround possible:
We already build gdk-pixbuf-native anyway so this is not a huge deal.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 ...-around-thumbnailer-cross-compile-failure.patch | 47 ++++++++++++++++++++++
 .../{gdk-pixbuf_2.36.1.bb => gdk-pixbuf_2.36.5.bb} | 12 ++++--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
 rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.36.1.bb => gdk-pixbuf_2.36.5.bb} (88%)

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
new file mode 100644
index 0000000..31ed988
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
@@ -0,0 +1,47 @@
+From 6646e8aadc4030d891ac27c25494e5793d59dc85 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Wed, 22 Feb 2017 11:24:39 +0200
+Subject: [PATCH] Work-around thumbnailer cross-compile failure
+
+Install gdk-pixbuf-print-mime-types that's needed for thumbnail
+metadata generation.
+
+Use native gdk-pixbuf-print-mime-types when generating the thumbnail
+metadata. This works but the mime types will come from native
+loader.cache (which will only contain in-tree loaders), not from the
+target loader.cache.
+
+The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057
+
+Upstream-Status: Inappropriate [workaround]
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ thumbnailer/Makefile.am | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
+index c9fe123..b0c6c70 100644
+--- a/thumbnailer/Makefile.am
++++ b/thumbnailer/Makefile.am
+@@ -1,5 +1,4 @@
+-bin_PROGRAMS = gdk-pixbuf-thumbnailer
+-noinst_PROGRAMS = gdk-pixbuf-print-mime-types
++bin_PROGRAMS = gdk-pixbuf-thumbnailer gdk-pixbuf-print-mime-types
+ 
+ gdk_pixbuf_thumbnailer_SOURCES = gdk-pixbuf-thumbnailer.c gnome-thumbnailer-skeleton.c gnome-thumbnailer-skeleton.h
+ gdk_pixbuf_thumbnailer_CPPFLAGS =			\
+@@ -25,9 +24,9 @@ gdk_pixbuf_print_mime_types_LDADD =			\
+ 
+ thumbnailerdir = $(datadir)/thumbnailers/
+ thumbnailer_DATA = gdk-pixbuf-thumbnailer.thumbnailer
+-gdk-pixbuf-thumbnailer.thumbnailer: gdk-pixbuf-thumbnailer.thumbnailer.in Makefile gdk-pixbuf-print-mime-types$(EXEEXT) $(top_builddir)/gdk-pixbuf/loaders.cache
++gdk-pixbuf-thumbnailer.thumbnailer: gdk-pixbuf-thumbnailer.thumbnailer.in Makefile gdk-pixbuf-print-mime-types$(EXEEXT)
+ 	$(AM_V_GEN) $(SED) -e "s|\@bindir\@|$(bindir)|"						\
+-	-e "s|\@mimetypes\@|`GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/loaders.cache GDK_PIXBUF_PIXDATA=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-pixdata $(builddir)/gdk-pixbuf-print-mime-types`|" \
++	-e "s|\@mimetypes\@|`gdk-pixbuf-print-mime-types`|" \
+ 	$< > $@
+ 
+ EXTRA_DIST = gdk-pixbuf-thumbnailer.thumbnailer.in
+-- 
+2.1.4
+
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.5.bb
similarity index 88%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.5.bb
index 98e5090..5d42697 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.5.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
 
 SECTION = "libs"
 
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 gdk-pixbuf-native"
 
 MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
@@ -17,10 +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://0001-Work-around-thumbnailer-cross-compile-failure.patch \
            "
-
-SRC_URI[md5sum] = "fe30b0420e013f2c4590ae6226d895d4"
-SRC_URI[sha256sum] = "9d5ba72070460c1b5b74115d395a3e33daeb7b7b67fb256cdccc9d7187c42a38"
+SRC_URI[md5sum] = "0173fd5c11a5d2030d09201090636477"
+SRC_URI[sha256sum] = "7ace06170291a1f21771552768bace072ecdea9bd4a02f7658939b9a314c40fc"
 
 inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package
 
@@ -53,6 +53,7 @@ FILES_${PN}-bin += "${datadir}/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer"
 FILES_${PN}-dev += " \
 	${bindir}/gdk-pixbuf-csource \
 	${bindir}/gdk-pixbuf-pixdata \
+        ${bindir}/gdk-pixbuf-print-mime-types \
 	${includedir}/* \
 	${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/*.la \
 "
@@ -88,6 +89,9 @@ do_install_append_class-native() {
 	create_wrapper ${D}/${bindir}/gdk-pixbuf-pixdata \
 		GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
 
+	create_wrapper ${D}/${bindir}/gdk-pixbuf-print-mime-types \
+		GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
+
 	create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \
 		GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \
 		GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders
-- 
2.1.4