From b1777d66e3a985eb52c693fe1bcc6333cbcf5cef Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Wed, 22 Feb 2017 15:02:36 +0200 Subject: [PATCH] gdk-pixbuf: Upgrade 2.36.1 -> 2.36.5 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. (From OE-Core rev: 645e14bb39d10a50648daaf7a015f2d75bf357db) Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...nd-thumbnailer-cross-compile-failure.patch | 47 +++++++++++++++++++ ...-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 0000000000..31ed988f32 --- /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 +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 +--- + 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 a188f5473b..7da6d16adb 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