diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-06-11 16:51:58 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-12 10:54:40 +0100 |
commit | 9fbd020124c9d1edb67014d8b846f76b741ac25e (patch) | |
tree | 1cc2b314d7ef7b25f447ed2915638f8339b648eb /meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch | |
parent | e3d0dd9163820b2bcc3ec30118338ad20bf170bf (diff) | |
download | poky-9fbd020124c9d1edb67014d8b846f76b741ac25e.tar.gz |
gdk-pixbuf: update 2.38.0 -> 2.38.1
Remove 0001-loaders.cache-depend-on-loaders-being-fully-build.patch
as upstream has fixed the issue.
Add a patch to revert upstream's decision to not cross-compile
thumbnailer or tests.
(From OE-Core rev: 0598f66aa823ec4355284a0a40c3d125d6c5e0c9)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch index 928962d230..a9c7600eb3 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6fc7f341399ec49ab06c94426f50dbdca49a2844 Mon Sep 17 00:00:00 2001 | 1 | From 2d1b65bd1272ad63b7fbd4babd9a8e8c296d15b5 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 22 Feb 2019 13:22:06 +0100 | 3 | Date: Fri, 22 Feb 2019 13:22:06 +0100 |
4 | Subject: [PATCH] (target only) Work-around thumbnailer and pixdata | 4 | Subject: [PATCH] (target only) Work-around thumbnailer and pixdata |
@@ -15,6 +15,7 @@ The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057 | |||
15 | 15 | ||
16 | Upstream-Status: Inappropriate [workaround] | 16 | Upstream-Status: Inappropriate [workaround] |
17 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 17 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
18 | |||
18 | --- | 19 | --- |
19 | build-aux/gen-thumbnailer.py | 2 -- | 20 | build-aux/gen-thumbnailer.py | 2 -- |
20 | tests/meson.build | 11 +++++++++-- | 21 | tests/meson.build | 11 +++++++++-- |
@@ -35,7 +36,7 @@ index 05ac821..c5b99ab 100644 | |||
35 | if os.name == 'nt': | 36 | if os.name == 'nt': |
36 | gdk_pixbuf_dll_buildpath = os.path.dirname(args.pixdata) | 37 | gdk_pixbuf_dll_buildpath = os.path.dirname(args.pixdata) |
37 | diff --git a/tests/meson.build b/tests/meson.build | 38 | diff --git a/tests/meson.build b/tests/meson.build |
38 | index 4fa3fbc..eca5166 100644 | 39 | index 8ed7cc1..e011b77 100644 |
39 | --- a/tests/meson.build | 40 | --- a/tests/meson.build |
40 | +++ b/tests/meson.build | 41 | +++ b/tests/meson.build |
41 | @@ -1,12 +1,19 @@ | 42 | @@ -1,12 +1,19 @@ |
@@ -91,6 +92,3 @@ index aaafec8..71bd61b 100644 | |||
91 | ], | 92 | ], |
92 | install: true, | 93 | install: true, |
93 | install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) | 94 | install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) |
94 | -- | ||
95 | 2.17.1 | ||
96 | |||