mirror of
https://git.yoctoproject.org/poky
synced 2026-04-19 06:32:13 +02:00
gdk-pixbuf: update 2.42.8 -> 2.42.9
Disable manpages, as they require rst2man. (From OE-Core rev: 06fc6230823753f2325da7e0916eccc4daac5c6a) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
304d1c917e
commit
a5f2ae764a
@@ -1,4 +1,4 @@
|
||||
From ba73bb0f3d2023839bc3b681c49b7ec1192cceb4 Mon Sep 17 00:00:00 2001
|
||||
From f81b60ebcbbfd9548c8aa1e388662c429068d1e3 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Sat, 8 May 2021 21:58:54 +0200
|
||||
Subject: [PATCH] Add use_prebuilt_tools option
|
||||
@@ -18,7 +18,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
5 files changed, 42 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
|
||||
index 8b0590b..7331491 100644
|
||||
index 54ff9dd..2e321cf 100644
|
||||
--- a/gdk-pixbuf/meson.build
|
||||
+++ b/gdk-pixbuf/meson.build
|
||||
@@ -342,13 +342,20 @@ foreach bin: gdkpixbuf_bin
|
||||
@@ -45,16 +45,18 @@ index 8b0590b..7331491 100644
|
||||
# load the installed cache; we always build it by default
|
||||
loaders_cache = custom_target('loaders.cache',
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 7a1409b..0bc73eb 100644
|
||||
index 813bd43..a93e6f7 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -403,16 +403,16 @@ subdir('gdk-pixbuf')
|
||||
@@ -369,18 +369,18 @@ subdir('gdk-pixbuf')
|
||||
# i18n
|
||||
subdir('po')
|
||||
|
||||
-if not meson.is_cross_build()
|
||||
+if not meson.is_cross_build() or get_option('use_prebuilt_tools')
|
||||
subdir('tests')
|
||||
if get_option('tests')
|
||||
subdir('tests')
|
||||
endif
|
||||
- subdir('thumbnailer')
|
||||
endif
|
||||
+subdir('thumbnailer')
|
||||
@@ -69,10 +71,10 @@ index 7a1409b..0bc73eb 100644
|
||||
gdk_pixbuf_bindir,
|
||||
gdk_pixbuf_libdir,
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 0ee6718..cc29855 100644
|
||||
index d198d99..1c899e9 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -49,4 +49,8 @@ option('gio_sniffing',
|
||||
@@ -53,4 +53,8 @@ option('gio_sniffing',
|
||||
description: 'Perform file type detection using GIO (Unused on MacOS and Windows)',
|
||||
type: 'boolean',
|
||||
value: true)
|
||||
@@ -82,7 +84,7 @@ index 0ee6718..cc29855 100644
|
||||
+ value: false)
|
||||
|
||||
diff --git a/tests/meson.build b/tests/meson.build
|
||||
index 7c6cb11..1029e6a 100644
|
||||
index 28c2525..d97c02d 100644
|
||||
--- a/tests/meson.build
|
||||
+++ b/tests/meson.build
|
||||
@@ -5,6 +5,12 @@
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From f00603d58d844422363b896ea7d07aaf48ddaa66 Mon Sep 17 00:00:00 2001
|
||||
From b511bd1efb43ffc49c753e309717a242ec686ef1 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Tue, 1 Apr 2014 17:23:36 +0100
|
||||
Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal
|
||||
@@ -14,10 +14,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
1 file changed, 15 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c
|
||||
index 312aa78..b813d99 100644
|
||||
index 1d39b44..2b00815 100644
|
||||
--- a/gdk-pixbuf/queryloaders.c
|
||||
+++ b/gdk-pixbuf/queryloaders.c
|
||||
@@ -212,7 +212,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info)
|
||||
@@ -216,7 +216,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info)
|
||||
g_string_append_c (contents, '\n');
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ index 312aa78..b813d99 100644
|
||||
query_module (GString *contents, const char *dir, const char *file)
|
||||
{
|
||||
char *path;
|
||||
@@ -221,6 +221,7 @@ query_module (GString *contents, const char *dir, const char *file)
|
||||
@@ -225,6 +225,7 @@ query_module (GString *contents, const char *dir, const char *file)
|
||||
void (*fill_vtable) (GdkPixbufModule *module);
|
||||
gpointer fill_info_ptr;
|
||||
gpointer fill_vtable_ptr;
|
||||
@@ -34,7 +34,7 @@ index 312aa78..b813d99 100644
|
||||
|
||||
if (g_path_is_absolute (file))
|
||||
path = g_strdup (file);
|
||||
@@ -270,10 +271,13 @@ query_module (GString *contents, const char *dir, const char *file)
|
||||
@@ -274,10 +275,13 @@ query_module (GString *contents, const char *dir, const char *file)
|
||||
g_module_error());
|
||||
else
|
||||
g_fprintf (stderr, "Cannot load loader %s\n", path);
|
||||
@@ -47,8 +47,8 @@ index 312aa78..b813d99 100644
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
@@ -314,6 +318,7 @@ int main (int argc, char **argv)
|
||||
#if defined(G_OS_WIN32) && defined(GDK_PIXBUF_RELOCATABLE)
|
||||
@@ -318,6 +322,7 @@ int main (int argc, char **argv)
|
||||
gint first_file = 1;
|
||||
GFile *pixbuf_libdir_file;
|
||||
gchar *pixbuf_libdir;
|
||||
@@ -56,7 +56,7 @@ index 312aa78..b813d99 100644
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
gchar *libdir;
|
||||
@@ -452,7 +457,9 @@ int main (int argc, char **argv)
|
||||
@@ -456,7 +461,9 @@ int main (int argc, char **argv)
|
||||
}
|
||||
modules = g_list_sort (modules, (GCompareFunc)strcmp);
|
||||
for (l = modules; l != NULL; l = l->next)
|
||||
@@ -67,7 +67,7 @@ index 312aa78..b813d99 100644
|
||||
g_list_free_full (modules, g_free);
|
||||
g_free (moduledir);
|
||||
#else
|
||||
@@ -468,7 +475,8 @@ int main (int argc, char **argv)
|
||||
@@ -472,7 +479,8 @@ int main (int argc, char **argv)
|
||||
infilename = g_locale_to_utf8 (infilename,
|
||||
-1, NULL, NULL, NULL);
|
||||
#endif
|
||||
@@ -77,7 +77,7 @@ index 312aa78..b813d99 100644
|
||||
}
|
||||
g_free (cwd);
|
||||
}
|
||||
@@ -486,5 +494,8 @@ int main (int argc, char **argv)
|
||||
@@ -490,5 +498,8 @@ int main (int argc, char **argv)
|
||||
|
||||
g_free (pixbuf_libdir);
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
|
||||
file://0001-Add-use_prebuilt_tools-option.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "84acea3acb2411b29134b32015a5b1aaa62844b19c4b1ef8b8971c6b0759f4c6"
|
||||
SRC_URI[sha256sum] = "28f7958e7bf29a32d4e963556d241d0a41a6786582ff6a5ad11665e0347fc962"
|
||||
|
||||
inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package
|
||||
|
||||
@@ -44,11 +44,13 @@ PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg"
|
||||
PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff"
|
||||
PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false"
|
||||
|
||||
EXTRA_OEMESON:class-target = " \
|
||||
EXTRA_OEMESON = "-Dman=false"
|
||||
|
||||
EXTRA_OEMESON:append:class-target = " \
|
||||
-Duse_prebuilt_tools=true \
|
||||
"
|
||||
|
||||
EXTRA_OEMESON:class-nativesdk = " \
|
||||
EXTRA_OEMESON:append:class-nativesdk = " \
|
||||
-Duse_prebuilt_tools=true \
|
||||
"
|
||||
|
||||
@@ -95,9 +97,11 @@ do_install:append() {
|
||||
|
||||
}
|
||||
|
||||
# Remove a bad fuzzing attempt that sporadically fails without a way to reproduce
|
||||
do_install_ptest() {
|
||||
# Remove a bad fuzzing attempt that sporadically fails without a way to reproduce
|
||||
rm ${D}/${datadir}/installed-tests/gdk-pixbuf/pixbuf-randomly-modified.test
|
||||
# https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/215
|
||||
rm ${D}/${datadir}/installed-tests/gdk-pixbuf/pixbuf-jpeg.test
|
||||
}
|
||||
|
||||
do_install:append:class-native() {
|
||||
Reference in New Issue
Block a user