mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdk-pixbuf: update to 2.36.11

Browse Source 
Remove upstreamed 0001-queryloaders-Make-output-more-reproducible.patch

Rebase fatal-loader.patch

Add a patch to fix a libtiff detection issue.

(From OE-Core rev: 057fadbaa9948fb26d99ffcbe68145658df64038)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2017-10-09 16:50:11 +03:00
committed by Richard Purdie
parent 638971d641
commit 2d2327911f
4 changed files with 56 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch Normal file
View File

@@ -0,0 +1,27 @@
From 460befc992adb32434b0408b453be39a6866ccf8 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 10 Oct 2017 14:33:18 +0300
Subject: [PATCH] Fix --without-libtiff not having an effect.
Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=788770]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 315e0cc..98e780c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -676,7 +676,7 @@ if test x$gio_can_sniff = x; then
AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])
fi
-AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != x)
+AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != xno)
AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
--
2.14.1

56
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-queryloaders-Make-output-more-reproducible.patch
View File

@@ -1,56 +0,0 @@
From 1049fbd887e52f94afeb03fc7942c01c143ebdfc Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Fri, 9 Jun 2017 12:01:25 +0300
Subject: [PATCH] queryloaders: Make output more reproducible
Reproducible builds are good: Sort the output by module name so that
same input always leads to same output.
This should also make gdk-pixbuf-print-mime-types output and
gdk-pixbuf-thumbnailer.thumbnailer reproducible.
https://bugzilla.gnome.org/show_bug.cgi?id=783592
Upstream-Status: Submitted
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
gdk-pixbuf/queryloaders.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c
index 395674a..4ac9b28 100644
--- a/gdk-pixbuf/queryloaders.c
+++ b/gdk-pixbuf/queryloaders.c
@@ -346,6 +346,7 @@ int main (int argc, char **argv)
#ifdef USE_GMODULE
const char *path;
GDir *dir;
+ GList *l, *modules = NULL;
path = g_getenv ("GDK_PIXBUF_MODULEDIR");
#ifdef G_OS_WIN32
@@ -365,12 +366,19 @@ int main (int argc, char **argv)
gint len = strlen (dent);
if (len > SOEXT_LEN &&
strcmp (dent + len - SOEXT_LEN, SOEXT) == 0) {
+ modules = g_list_prepend (modules,
+ g_strdup (dent));
- if (!query_module (contents, path, dent))
- success = FALSE;
}
}
g_dir_close (dir);
}
+
+ modules = g_list_sort (modules, (GCompareFunc)strcmp);
+ for (l = modules; l != NULL; l = l->next)
+ if (!query_module (contents, path, l->data))
+ success = FALSE;
+
+ g_list_free_full (modules, g_free);
#else
g_string_append_printf (contents, "# dynamic loading of modules not supported\n");
#endif
--
2.1.4

39
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
View File

@@ -1,11 +1,20 @@
From b6a7b30522455cab39a0b9ea8463313380146e70 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 3/4] gdk-pixbuf: add an option so that loader errors are fatal
If an environment variable is specified set the return value from main() to
non-zero if the loader had errors (missing libraries, generally).
Upstream-Status: Pending
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
gdk-pixbuf/queryloaders.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c
index a9ca015..395674a 100644
index a81c804..350bec8 100644
--- a/gdk-pixbuf/queryloaders.c
+++ b/gdk-pixbuf/queryloaders.c
@@ -146,7 +146,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info)
@@ -47,17 +56,18 @@ index a9ca015..395674a 100644
#ifdef G_OS_WIN32
gchar *libdir;
@@ -360,7 +365,8 @@ int main (int argc, char **argv)
gint len = strlen (dent);
if (len > SOEXT_LEN &&
strcmp (dent + len - SOEXT_LEN, SOEXT) == 0) {
- query_module (contents, path, dent);
+ if (!query_module (contents, path, dent))
+ success = FALSE;
}
}
g_dir_close (dir);
@@ -378,7 +384,8 @@ int main (int argc, char **argv)
@@ -370,7 +375,9 @@ int main (int argc, char **argv)
}
modules = g_list_sort (modules, (GCompareFunc)strcmp);
for (l = modules; l != NULL; l = l->next)
- query_module (contents, path, l->data);
+ if (!query_module (contents, path, l->data))
+ success = FALSE;
+
g_list_free_full (modules, g_free);
#else
g_string_append_printf (contents, "# dynamic loading of modules not supported\n");
@@ -385,7 +392,8 @@ int main (int argc, char **argv)
infilename = g_locale_to_utf8 (infilename,
-1, NULL, NULL, NULL);
#endif
@@ -67,7 +77,7 @@ index a9ca015..395674a 100644
}
g_free (cwd);
}
@@ -394,5 +401,8 @@ int main (int argc, char **argv)
@@ -401,5 +409,8 @@ int main (int argc, char **argv)
else
g_print ("%s\n", contents->str);
@@ -77,3 +87,6 @@ index a9ca015..395674a 100644
+ else
+ return 0;
}
--
2.14.1

6
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb → meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb
View File

@@ -18,11 +18,11 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://run-ptest \
file://fatal-loader.patch \
file://0001-Work-around-thumbnailer-cross-compile-failure.patch \
file://0001-queryloaders-Make-output-more-reproducible.patch \
file://0001-Fix-without-libtiff-not-having-an-effect.patch \
"
SRC_URI[md5sum] = "e0aaa0061eb12667b32b27472230b962"
SRC_URI[sha256sum] = "5d68e5283cdc0bf9bda99c3e6a1d52ad07a03364fa186b6c26cfc86fcd396a19"
SRC_URI[md5sum] = "6e84e5485c17ce7c25df77fe76eb2d6a"
SRC_URI[sha256sum] = "ae62ab87250413156ed72ef756347b10208c00e76b222d82d9ed361ed9dde2f3"
inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package