| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 6646e8aadc4030d891ac27c25494e5793d59dc85 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | Date: Wed, 22 Feb 2017 11:24:39 +0200 |
| 4 | Subject: [PATCH] Work-around thumbnailer cross-compile failure |
| 5 | |
| 6 | Install gdk-pixbuf-print-mime-types that's needed for thumbnail |
| 7 | metadata generation. |
| 8 | |
| 9 | Use native gdk-pixbuf-print-mime-types when generating the thumbnail |
| 10 | metadata. This works but the mime types will come from native |
| 11 | loader.cache (which will only contain in-tree loaders), not from the |
| 12 | target loader.cache. |
| 13 | |
| 14 | The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057 |
| 15 | |
| 16 | Upstream-Status: Inappropriate [workaround] |
| 17 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 18 | --- |
| 19 | thumbnailer/Makefile.am | 7 +++---- |
| 20 | 1 file changed, 3 insertions(+), 4 deletions(-) |
| 21 | |
| 22 | diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am |
| 23 | index c9fe123..b0c6c70 100644 |
| 24 | --- a/thumbnailer/Makefile.am |
| 25 | +++ b/thumbnailer/Makefile.am |
| 26 | @@ -1,5 +1,4 @@ |
| 27 | -bin_PROGRAMS = gdk-pixbuf-thumbnailer |
| 28 | -noinst_PROGRAMS = gdk-pixbuf-print-mime-types |
| 29 | +bin_PROGRAMS = gdk-pixbuf-thumbnailer gdk-pixbuf-print-mime-types |
| 30 | |
| 31 | gdk_pixbuf_thumbnailer_SOURCES = gdk-pixbuf-thumbnailer.c gnome-thumbnailer-skeleton.c gnome-thumbnailer-skeleton.h |
| 32 | gdk_pixbuf_thumbnailer_CPPFLAGS = \ |
| 33 | @@ -25,9 +24,9 @@ gdk_pixbuf_print_mime_types_LDADD = \ |
| 34 | |
| 35 | thumbnailerdir = $(datadir)/thumbnailers/ |
| 36 | thumbnailer_DATA = gdk-pixbuf-thumbnailer.thumbnailer |
| 37 | -gdk-pixbuf-thumbnailer.thumbnailer: gdk-pixbuf-thumbnailer.thumbnailer.in Makefile gdk-pixbuf-print-mime-types$(EXEEXT) $(top_builddir)/gdk-pixbuf/loaders.cache |
| 38 | +gdk-pixbuf-thumbnailer.thumbnailer: gdk-pixbuf-thumbnailer.thumbnailer.in Makefile gdk-pixbuf-print-mime-types$(EXEEXT) |
| 39 | $(AM_V_GEN) $(SED) -e "s|\@bindir\@|$(bindir)|" \ |
| 40 | - -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`|" \ |
| 41 | + -e "s|\@mimetypes\@|`gdk-pixbuf-print-mime-types`|" \ |
| 42 | $< > $@ |
| 43 | |
| 44 | EXTRA_DIST = gdk-pixbuf-thumbnailer.thumbnailer.in |
| 45 | -- |
| 46 | 2.1.4 |
| 47 | |