diff options
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch | 53 |
1 files changed, 17 insertions, 36 deletions
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 index 31ed988f32..110b32a490 100644 --- 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 | |||
@@ -1,47 +1,28 @@ | |||
1 | From 6646e8aadc4030d891ac27c25494e5793d59dc85 Mon Sep 17 00:00:00 2001 | 1 | From 8c7ced988def52654946458a3779e383b27f14f7 Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 22 Feb 2017 11:24:39 +0200 | 3 | Date: Thu, 14 Feb 2019 17:56:10 +0100 |
4 | Subject: [PATCH] Work-around thumbnailer cross-compile failure | 4 | Subject: [PATCH] Work-around thumbnailer cross-compile failure |
5 | 5 | ||
6 | Install gdk-pixbuf-print-mime-types that's needed for thumbnail | 6 | Install gdk-pixbuf-print-mime-types that's needed for thumbnail |
7 | metadata generation. | 7 | metadata generation. |
8 | 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 | 9 | The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057 |
15 | 10 | ||
16 | Upstream-Status: Inappropriate [workaround] | 11 | Upstream-Status: Inappropriate [workaround] |
17 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
18 | --- | 13 | --- |
19 | thumbnailer/Makefile.am | 7 +++---- | 14 | thumbnailer/meson.build | 1 + |
20 | 1 file changed, 3 insertions(+), 4 deletions(-) | 15 | 1 file changed, 1 insertion(+) |
21 | 16 | ||
22 | diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am | 17 | diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build |
23 | index c9fe123..b0c6c70 100644 | 18 | index e801144..aaafec8 100644 |
24 | --- a/thumbnailer/Makefile.am | 19 | --- a/thumbnailer/meson.build |
25 | +++ b/thumbnailer/Makefile.am | 20 | +++ b/thumbnailer/meson.build |
26 | @@ -1,5 +1,4 @@ | 21 | @@ -10,6 +10,7 @@ executable('gdk-pixbuf-thumbnailer', |
27 | -bin_PROGRAMS = gdk-pixbuf-thumbnailer | 22 | gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types', |
28 | -noinst_PROGRAMS = gdk-pixbuf-print-mime-types | 23 | 'gdk-pixbuf-print-mime-types.c', |
29 | +bin_PROGRAMS = gdk-pixbuf-thumbnailer gdk-pixbuf-print-mime-types | 24 | c_args: common_cflags, |
30 | 25 | + install: true, | |
31 | gdk_pixbuf_thumbnailer_SOURCES = gdk-pixbuf-thumbnailer.c gnome-thumbnailer-skeleton.c gnome-thumbnailer-skeleton.h | 26 | dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ]) |
32 | gdk_pixbuf_thumbnailer_CPPFLAGS = \ | ||
33 | @@ -25,9 +24,9 @@ gdk_pixbuf_print_mime_types_LDADD = \ | ||
34 | 27 | ||
35 | thumbnailerdir = $(datadir)/thumbnailers/ | 28 | custom_target('thumbnailer', |
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 | |||