diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch | 95 | ||||
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch | 94 | ||||
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch | 9 | ||||
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch | 55 | ||||
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb) | 21 |
7 files changed, 105 insertions, 238 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch new file mode 100644 index 0000000000..2aa9164750 --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch | |||
| @@ -0,0 +1,95 @@ | |||
| 1 | From dcaf3106e2cca27f728a8bd26127430500a1136e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Fri, 22 Feb 2019 13:22:06 +0100 | ||
| 4 | Subject: [PATCH] Work-around thumbnailer and pixdata cross-compile failure | ||
| 5 | |||
| 6 | Use native gdk-pixbuf-print-mime-types and gdk-pixbuf-pixdata | ||
| 7 | when generating the thumbnail metadata and resources. | ||
| 8 | |||
| 9 | This works but the mime types will come from native | ||
| 10 | loader.cache (which will only contain in-tree loaders), not from the | ||
| 11 | target loader.cache. | ||
| 12 | |||
| 13 | The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057 | ||
| 14 | |||
| 15 | Upstream-Status: Inappropriate [workaround] | ||
| 16 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 17 | |||
| 18 | --- | ||
| 19 | tests/meson.build | 11 +++++++++-- | ||
| 20 | thumbnailer/meson.build | 23 ++++++++++++++++++++++- | ||
| 21 | 2 files changed, 31 insertions(+), 3 deletions(-) | ||
| 22 | |||
| 23 | diff --git a/tests/meson.build b/tests/meson.build | ||
| 24 | index 7c6cb11..07121f1 100644 | ||
| 25 | --- a/tests/meson.build | ||
| 26 | +++ b/tests/meson.build | ||
| 27 | @@ -8,13 +8,20 @@ if enabled_loaders.contains('png') and host_system != 'windows' | ||
| 28 | # Resources; we cannot use gnome.compile_resources() here, because we need to | ||
| 29 | # override the environment in order to use the utilities we just built instead | ||
| 30 | # of the system ones | ||
| 31 | + | ||
| 32 | + if not meson.is_cross_build() | ||
| 33 | + pixdata_binary = gdk_pixbuf_pixdata.full_path() | ||
| 34 | + else | ||
| 35 | + pixdata_binary = 'gdk-pixbuf-pixdata' | ||
| 36 | + endif | ||
| 37 | + | ||
| 38 | resources_c = custom_target('resources.c', | ||
| 39 | input: 'resources.gresource.xml', | ||
| 40 | output: 'resources.c', | ||
| 41 | command: [ | ||
| 42 | gen_resources, | ||
| 43 | '--glib-compile-resources=@0@'.format(glib_compile_resources.full_path()), | ||
| 44 | - '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), | ||
| 45 | + '--pixdata=@0@'.format(pixdata_binary), | ||
| 46 | '--loaders=@0@'.format(loaders_cache.full_path()), | ||
| 47 | '--sourcedir=@0@'.format(meson.current_source_dir()), | ||
| 48 | '--source', | ||
| 49 | @@ -33,7 +40,7 @@ if enabled_loaders.contains('png') and host_system != 'windows' | ||
| 50 | command: [ | ||
| 51 | gen_resources, | ||
| 52 | '--glib-compile-resources=@0@'.format(glib_compile_resources.full_path()), | ||
| 53 | - '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), | ||
| 54 | + '--pixdata=@0@'.format(pixdata_binary), | ||
| 55 | '--loaders=@0@'.format(loaders_cache.full_path()), | ||
| 56 | '--sourcedir=@0@'.format(meson.current_source_dir()), | ||
| 57 | '--header', | ||
| 58 | diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build | ||
| 59 | index 8c741e0..5a3b52a 100644 | ||
| 60 | --- a/thumbnailer/meson.build | ||
| 61 | +++ b/thumbnailer/meson.build | ||
| 62 | @@ -14,7 +14,27 @@ gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types', | ||
| 63 | install: true, | ||
| 64 | dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ]) | ||
| 65 | |||
| 66 | -custom_target('thumbnailer', | ||
| 67 | +if meson.is_cross_build() | ||
| 68 | + custom_target('thumbnailer', | ||
| 69 | + input: 'gdk-pixbuf-thumbnailer.thumbnailer.in', | ||
| 70 | + output: 'gdk-pixbuf-thumbnailer.thumbnailer', | ||
| 71 | + command: [ | ||
| 72 | + gen_thumbnailer, | ||
| 73 | + '--printer=gdk-pixbuf-print-mime-types', | ||
| 74 | + '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), | ||
| 75 | + '--loaders=@0@'.format(loaders_cache.full_path()), | ||
| 76 | + '--bindir=@0@'.format(gdk_pixbuf_bindir), | ||
| 77 | + '@INPUT@', | ||
| 78 | + '@OUTPUT@', | ||
| 79 | + ], | ||
| 80 | + depends: [ | ||
| 81 | + gdk_pixbuf_print_mime_types, | ||
| 82 | + gdk_pixbuf_pixdata, | ||
| 83 | + ], | ||
| 84 | + install: true, | ||
| 85 | + install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) | ||
| 86 | +else | ||
| 87 | + custom_target('thumbnailer', | ||
| 88 | input: 'gdk-pixbuf-thumbnailer.thumbnailer.in', | ||
| 89 | output: 'gdk-pixbuf-thumbnailer.thumbnailer', | ||
| 90 | command: [ | ||
| 91 | @@ -33,3 +53,4 @@ custom_target('thumbnailer', | ||
| 92 | ], | ||
| 93 | install: true, | ||
| 94 | install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) | ||
| 95 | +endif | ||
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 deleted file mode 100644 index a9c7600eb3..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch +++ /dev/null | |||
| @@ -1,94 +0,0 @@ | |||
| 1 | From 2d1b65bd1272ad63b7fbd4babd9a8e8c296d15b5 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Fri, 22 Feb 2019 13:22:06 +0100 | ||
| 4 | Subject: [PATCH] (target only) Work-around thumbnailer and pixdata | ||
| 5 | cross-compile failure | ||
| 6 | |||
| 7 | Use native gdk-pixbuf-print-mime-types and gdk-pixbuf-pixdata | ||
| 8 | when generating the thumbnail metadata and resources. | ||
| 9 | |||
| 10 | 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: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 18 | |||
| 19 | --- | ||
| 20 | build-aux/gen-thumbnailer.py | 2 -- | ||
| 21 | tests/meson.build | 11 +++++++++-- | ||
| 22 | thumbnailer/meson.build | 5 +---- | ||
| 23 | 3 files changed, 10 insertions(+), 8 deletions(-) | ||
| 24 | |||
| 25 | diff --git a/build-aux/gen-thumbnailer.py b/build-aux/gen-thumbnailer.py | ||
| 26 | index 05ac821..c5b99ab 100644 | ||
| 27 | --- a/build-aux/gen-thumbnailer.py | ||
| 28 | +++ b/build-aux/gen-thumbnailer.py | ||
| 29 | @@ -20,8 +20,6 @@ argparser.add_argument('output', help='Output file') | ||
| 30 | args = argparser.parse_args() | ||
| 31 | |||
| 32 | newenv = os.environ.copy() | ||
| 33 | -newenv['GDK_PIXBUF_PIXDATA'] = args.pixdata | ||
| 34 | -newenv['GDK_PIXBUF_MODULE_FILE'] = args.loaders | ||
| 35 | # 'nt': NT-based Windows, see https://docs.python.org/3/library/os.html | ||
| 36 | if os.name == 'nt': | ||
| 37 | gdk_pixbuf_dll_buildpath = os.path.dirname(args.pixdata) | ||
| 38 | diff --git a/tests/meson.build b/tests/meson.build | ||
| 39 | index 8ed7cc1..e011b77 100644 | ||
| 40 | --- a/tests/meson.build | ||
| 41 | +++ b/tests/meson.build | ||
| 42 | @@ -1,12 +1,19 @@ | ||
| 43 | # Resources; we cannot use gnome.compile_resources() here, because we need to | ||
| 44 | # override the environment in order to use the utilities we just built instead | ||
| 45 | # of the system ones | ||
| 46 | + | ||
| 47 | +if not meson.is_cross_build() | ||
| 48 | +pixdata_binary = gdk_pixbuf_pixdata.full_path() | ||
| 49 | +else | ||
| 50 | +pixdata_binary = 'gdk-pixbuf-pixdata' | ||
| 51 | +endif | ||
| 52 | + | ||
| 53 | resources_c = custom_target('resources.c', | ||
| 54 | input: 'resources.gresource.xml', | ||
| 55 | output: 'resources.c', | ||
| 56 | command: [ | ||
| 57 | gen_resources, | ||
| 58 | - '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), | ||
| 59 | + '--pixdata=@0@'.format(pixdata_binary), | ||
| 60 | '--loaders=@0@'.format(loaders_cache.full_path()), | ||
| 61 | '--sourcedir=@0@'.format(meson.current_source_dir()), | ||
| 62 | '--source', | ||
| 63 | @@ -24,7 +31,7 @@ resources_h = custom_target('resources.h', | ||
| 64 | output: 'resources.h', | ||
| 65 | command: [ | ||
| 66 | gen_resources, | ||
| 67 | - '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), | ||
| 68 | + '--pixdata=@0@'.format(pixdata_binary), | ||
| 69 | '--loaders=@0@'.format(loaders_cache.full_path()), | ||
| 70 | '--sourcedir=@0@'.format(meson.current_source_dir()), | ||
| 71 | '--header', | ||
| 72 | diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build | ||
| 73 | index aaafec8..71bd61b 100644 | ||
| 74 | --- a/thumbnailer/meson.build | ||
| 75 | +++ b/thumbnailer/meson.build | ||
| 76 | @@ -18,9 +18,7 @@ custom_target('thumbnailer', | ||
| 77 | output: 'gdk-pixbuf-thumbnailer.thumbnailer', | ||
| 78 | command: [ | ||
| 79 | gen_thumbnailer, | ||
| 80 | - '--printer=@0@'.format(gdk_pixbuf_print_mime_types.full_path()), | ||
| 81 | - '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()), | ||
| 82 | - '--loaders=@0@'.format(loaders_cache.full_path()), | ||
| 83 | + '--printer=gdk-pixbuf-print-mime-types', | ||
| 84 | '--bindir=@0@'.format(gdk_pixbuf_bindir), | ||
| 85 | '@INPUT@', | ||
| 86 | '@OUTPUT@', | ||
| 87 | @@ -28,7 +26,6 @@ custom_target('thumbnailer', | ||
| 88 | depends: [ | ||
| 89 | gdk_pixbuf_print_mime_types, | ||
| 90 | gdk_pixbuf_pixdata, | ||
| 91 | - loaders_cache, | ||
| 92 | ], | ||
| 93 | install: true, | ||
| 94 | install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) | ||
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patch deleted file mode 100644 index 96c546f271..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From 3c4a6c147ae8a0962ba9194373d8a41d14eed44f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Fri, 22 Feb 2019 13:23:55 +0100 | ||
| 4 | Subject: [PATCH] Do not run tests when building | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [cross-compile specific] | ||
| 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 8 | --- | ||
| 9 | tests/meson.build | 17 ----------------- | ||
| 10 | 1 file changed, 17 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/tests/meson.build b/tests/meson.build | ||
| 13 | index 4fa3fbc..6ef7884 100644 | ||
| 14 | --- a/tests/meson.build | ||
| 15 | +++ b/tests/meson.build | ||
| 16 | @@ -138,23 +138,6 @@ foreach t: installed_tests | ||
| 17 | install_dir: installed_test_bindir, | ||
| 18 | ) | ||
| 19 | |||
| 20 | - # Two particularly slow tests | ||
| 21 | - if test_suites.contains('slow') | ||
| 22 | - timeout = 300 | ||
| 23 | - else | ||
| 24 | - timeout = 30 | ||
| 25 | - endif | ||
| 26 | - | ||
| 27 | - test(test_name, test_bin, | ||
| 28 | - suite: test_suites, | ||
| 29 | - args: [ '-k', '--tap' ], | ||
| 30 | - env: [ | ||
| 31 | - 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), | ||
| 32 | - 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), | ||
| 33 | - 'GDK_PIXBUF_MODULE_FILE=@0@'.format(loaders_cache.full_path()), | ||
| 34 | - ], | ||
| 35 | - timeout: timeout, | ||
| 36 | - ) | ||
| 37 | endforeach | ||
| 38 | |||
| 39 | executable('pixbuf-read', | ||
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch index 0fe13a387a..cd9f88befc 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch | |||
| @@ -1,19 +1,20 @@ | |||
| 1 | From 1a532e090c558a830de9503f56e23414e880bb95 Mon Sep 17 00:00:00 2001 | 1 | From d02a8e202d2fe5caf3449683e0ccdf84a482a325 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: Wed, 5 Jun 2019 14:17:55 +0200 | 3 | Date: Wed, 5 Jun 2019 14:17:55 +0200 |
| 4 | Subject: [PATCH] Build thumbnailer and tests also in cross builds. | 4 | Subject: [PATCH] Build thumbnailer and tests also in cross builds. |
| 5 | 5 | ||
| 6 | Upstream-Status: Inappropriate [relies on oe-core specific hacks] | 6 | Upstream-Status: Inappropriate [relies on oe-core specific hacks] |
| 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 8 | |||
| 8 | --- | 9 | --- |
| 9 | meson.build | 6 ++---- | 10 | meson.build | 6 ++---- |
| 10 | 1 file changed, 2 insertions(+), 4 deletions(-) | 11 | 1 file changed, 2 insertions(+), 4 deletions(-) |
| 11 | 12 | ||
| 12 | diff --git a/meson.build b/meson.build | 13 | diff --git a/meson.build b/meson.build |
| 13 | index d104cea..7acb88a 100644 | 14 | index 73034d1..d114016 100644 |
| 14 | --- a/meson.build | 15 | --- a/meson.build |
| 15 | +++ b/meson.build | 16 | +++ b/meson.build |
| 16 | @@ -397,10 +397,8 @@ endif | 17 | @@ -378,10 +378,8 @@ subdir('gdk-pixbuf') |
| 17 | # i18n | 18 | # i18n |
| 18 | subdir('po') | 19 | subdir('po') |
| 19 | 20 | ||
| @@ -25,4 +26,4 @@ index d104cea..7acb88a 100644 | |||
| 25 | +subdir('thumbnailer') | 26 | +subdir('thumbnailer') |
| 26 | 27 | ||
| 27 | # Documentation | 28 | # Documentation |
| 28 | subdir('docs') | 29 | build_docs = get_option('gtk_doc') or get_option('docs') |
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch deleted file mode 100644 index 3fef2bc1eb..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2020-29385.patch +++ /dev/null | |||
| @@ -1,55 +0,0 @@ | |||
| 1 | From bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Robert Ancell <robert.ancell@canonical.com> | ||
| 3 | Date: Mon, 30 Nov 2020 12:26:12 +1300 | ||
| 4 | Subject: [PATCH 02/13] gif: Fix LZW decoder accepting invalid LZW code. | ||
| 5 | |||
| 6 | The code value after a reset wasn't being validated, which means we would | ||
| 7 | accept invalid codes. This could cause an infinite loop in the decoder. | ||
| 8 | |||
| 9 | Fixes CVE-2020-29385 | ||
| 10 | |||
| 11 | Fixes https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/164 | ||
| 12 | |||
| 13 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81] | ||
| 14 | CVE: CVE-2020-29385 | ||
| 15 | Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> | ||
| 16 | |||
| 17 | --- | ||
| 18 | gdk-pixbuf/lzw.c | 13 +++++++------ | ||
| 19 | 1 files changed, 7 insertions(+), 6 deletions(-) | ||
| 20 | create mode 100644 tests/test-images/fail/hang_114.gif | ||
| 21 | |||
| 22 | diff --git a/gdk-pixbuf/lzw.c b/gdk-pixbuf/lzw.c | ||
| 23 | index 9e052a6f7..105daf2b1 100644 | ||
| 24 | --- a/gdk-pixbuf/lzw.c | ||
| 25 | +++ b/gdk-pixbuf/lzw.c | ||
| 26 | @@ -195,19 +195,20 @@ lzw_decoder_feed (LZWDecoder *self, | ||
| 27 | if (self->last_code != self->clear_code && self->code_table_size < MAX_CODES) { | ||
| 28 | if (self->code < self->code_table_size) | ||
| 29 | add_code (self, self->code); | ||
| 30 | - else if (self->code == self->code_table_size) | ||
| 31 | + else | ||
| 32 | add_code (self, self->last_code); | ||
| 33 | - else { | ||
| 34 | - /* Invalid code received - just stop here */ | ||
| 35 | - self->last_code = self->eoi_code; | ||
| 36 | - return output_length; | ||
| 37 | - } | ||
| 38 | |||
| 39 | /* When table is full increase code size */ | ||
| 40 | if (self->code_table_size == (1 << self->code_size) && self->code_size < LZW_CODE_MAX) | ||
| 41 | self->code_size++; | ||
| 42 | } | ||
| 43 | |||
| 44 | + /* Invalid code received - just stop here */ | ||
| 45 | + if (self->code >= self->code_table_size) { | ||
| 46 | + self->last_code = self->eoi_code; | ||
| 47 | + return output_length; | ||
| 48 | + } | ||
| 49 | + | ||
| 50 | /* Convert codeword into indexes */ | ||
| 51 | n_written += write_indexes (self, output + n_written, output_length - n_written); | ||
| 52 | } | ||
| 53 | -- | ||
| 54 | 2.25.1 | ||
| 55 | |||
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch deleted file mode 100644 index 6c758fd61c..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | Upstream-Status: Backport | ||
| 2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 3 | |||
| 4 | From d8d231c01ef2e59856da8a5c26ace955e5f29370 Mon Sep 17 00:00:00 2001 | ||
| 5 | From: Ross Burton <ross.burton@intel.com> | ||
| 6 | Date: Mon, 25 Nov 2019 17:05:46 +0000 | ||
| 7 | Subject: [PATCH] tests: install circular-table.gif | ||
| 8 | |||
| 9 | This test data was added for the pixbuf-gif-circular-table test (added October | ||
| 10 | 2018 in 0b9d004) but because the file was never actually installed the installed | ||
| 11 | test suite never passes. | ||
| 12 | --- | ||
| 13 | tests/meson.build | 1 + | ||
| 14 | 1 file changed, 1 insertion(+) | ||
| 15 | |||
| 16 | diff --git a/tests/meson.build b/tests/meson.build | ||
| 17 | index 5116fc2b9..80ed3e8b2 100644 | ||
| 18 | --- a/tests/meson.build | ||
| 19 | +++ b/tests/meson.build | ||
| 20 | @@ -97,6 +97,7 @@ test_data = [ | ||
| 21 | 'bug775693.pixdata', | ||
| 22 | 'bug775229.pixdata', | ||
| 23 | 'aero.gif', | ||
| 24 | + 'circular-table.gif' | ||
| 25 | ] | ||
| 26 | |||
| 27 | installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name()) | ||
| 28 | -- | ||
| 29 | 2.20.1 | ||
| 30 | |||
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb index 226e1c7b89..2734a11f96 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb | |||
| @@ -22,41 +22,30 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | |||
| 22 | file://fatal-loader.patch \ | 22 | file://fatal-loader.patch \ |
| 23 | file://0001-Work-around-thumbnailer-cross-compile-failure.patch \ | 23 | file://0001-Work-around-thumbnailer-cross-compile-failure.patch \ |
| 24 | file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \ | 24 | file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \ |
| 25 | file://0004-Do-not-run-tests-when-building.patch \ | ||
| 26 | file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \ | 25 | file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \ |
| 27 | file://missing-test-data.patch \ | 26 | file://0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch \ |
| 28 | file://CVE-2020-29385.patch \ | ||
| 29 | " | 27 | " |
| 30 | 28 | ||
| 31 | SRC_URI_append_class-target = " \ | 29 | SRC_URI[sha256sum] = "c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f" |
| 32 | file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \ | ||
| 33 | " | ||
| 34 | SRC_URI_append_class-nativesdk = " \ | ||
| 35 | file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \ | ||
| 36 | " | ||
| 37 | |||
| 38 | SRC_URI[md5sum] = "05eb1ebc258ba905f1c8644ef49de064" | ||
| 39 | SRC_URI[sha256sum] = "1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6" | ||
| 40 | 30 | ||
| 41 | inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package | 31 | inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package |
| 42 | 32 | ||
| 43 | GIR_MESON_OPTION = 'gir' | 33 | GIR_MESON_OPTION = 'introspection' |
| 34 | GIR_MESON_ENABLE_FLAG = "enabled" | ||
| 35 | GIR_MESON_DISABLE_FLAG = "disabled" | ||
| 44 | 36 | ||
| 45 | LIBV = "2.10.0" | 37 | LIBV = "2.10.0" |
| 46 | 38 | ||
| 47 | GDK_PIXBUF_LOADERS ?= "png jpeg" | 39 | GDK_PIXBUF_LOADERS ?= "png jpeg" |
| 48 | 40 | ||
| 49 | PACKAGECONFIG = "${GDK_PIXBUF_LOADERS} \ | 41 | PACKAGECONFIG = "${GDK_PIXBUF_LOADERS} \ |
| 50 | ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ | ||
| 51 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" | 42 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" |
| 52 | PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}" | 43 | PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}" |
| 53 | 44 | ||
| 54 | PACKAGECONFIG[png] = "-Dpng=true,-Dpng=false,libpng" | 45 | PACKAGECONFIG[png] = "-Dpng=true,-Dpng=false,libpng" |
| 55 | PACKAGECONFIG[jpeg] = "-Djpeg=true,-Djpeg=false,jpeg" | 46 | PACKAGECONFIG[jpeg] = "-Djpeg=true,-Djpeg=false,jpeg" |
| 56 | PACKAGECONFIG[tiff] = "-Dtiff=true,-Dtiff=false,tiff" | 47 | PACKAGECONFIG[tiff] = "-Dtiff=true,-Dtiff=false,tiff" |
| 57 | PACKAGECONFIG[jpeg2000] = "-Djasper=true,-Djasper=false,jasper" | ||
| 58 | PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" | 48 | PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" |
| 59 | PACKAGECONFIG[x11] = "-Dx11=true,-Dx11=false,virtual/libx11" | ||
| 60 | 49 | ||
| 61 | PACKAGES =+ "${PN}-xlib" | 50 | PACKAGES =+ "${PN}-xlib" |
| 62 | 51 | ||
