summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch27
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-queryloaders-Make-output-more-reproducible.patch56
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch39
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb)6
4 files changed, 56 insertions, 72 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
new file mode 100644
index 0000000000..2a54d8ed76
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
@@ -0,0 +1,27 @@
1From 460befc992adb32434b0408b453be39a6866ccf8 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 10 Oct 2017 14:33:18 +0300
4Subject: [PATCH] Fix --without-libtiff not having an effect.
5
6Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=788770]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 configure.ac | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/configure.ac b/configure.ac
13index 315e0cc..98e780c 100644
14--- a/configure.ac
15+++ b/configure.ac
16@@ -676,7 +676,7 @@ if test x$gio_can_sniff = x; then
17 AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])
18 fi
19
20-AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != x)
21+AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != xno)
22 AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
23 AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
24 AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
25--
262.14.1
27
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-queryloaders-Make-output-more-reproducible.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-queryloaders-Make-output-more-reproducible.patch
deleted file mode 100644
index aa21419faf..0000000000
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-queryloaders-Make-output-more-reproducible.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 1049fbd887e52f94afeb03fc7942c01c143ebdfc Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 9 Jun 2017 12:01:25 +0300
4Subject: [PATCH] queryloaders: Make output more reproducible
5
6Reproducible builds are good: Sort the output by module name so that
7same input always leads to same output.
8
9This should also make gdk-pixbuf-print-mime-types output and
10gdk-pixbuf-thumbnailer.thumbnailer reproducible.
11
12https://bugzilla.gnome.org/show_bug.cgi?id=783592
13
14Upstream-Status: Submitted
15Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
16---
17 gdk-pixbuf/queryloaders.c | 12 ++++++++++--
18 1 file changed, 10 insertions(+), 2 deletions(-)
19
20diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c
21index 395674a..4ac9b28 100644
22--- a/gdk-pixbuf/queryloaders.c
23+++ b/gdk-pixbuf/queryloaders.c
24@@ -346,6 +346,7 @@ int main (int argc, char **argv)
25 #ifdef USE_GMODULE
26 const char *path;
27 GDir *dir;
28+ GList *l, *modules = NULL;
29
30 path = g_getenv ("GDK_PIXBUF_MODULEDIR");
31 #ifdef G_OS_WIN32
32@@ -365,12 +366,19 @@ int main (int argc, char **argv)
33 gint len = strlen (dent);
34 if (len > SOEXT_LEN &&
35 strcmp (dent + len - SOEXT_LEN, SOEXT) == 0) {
36+ modules = g_list_prepend (modules,
37+ g_strdup (dent));
38- if (!query_module (contents, path, dent))
39- success = FALSE;
40 }
41 }
42 g_dir_close (dir);
43 }
44+
45+ modules = g_list_sort (modules, (GCompareFunc)strcmp);
46+ for (l = modules; l != NULL; l = l->next)
47+ if (!query_module (contents, path, l->data))
48+ success = FALSE;
49+
50+ g_list_free_full (modules, g_free);
51 #else
52 g_string_append_printf (contents, "# dynamic loading of modules not supported\n");
53 #endif
54--
552.1.4
56
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
index 70146c6181..7d0d54bafe 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
@@ -1,11 +1,20 @@
1From b6a7b30522455cab39a0b9ea8463313380146e70 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 1 Apr 2014 17:23:36 +0100
4Subject: [PATCH 3/4] gdk-pixbuf: add an option so that loader errors are fatal
5
1If an environment variable is specified set the return value from main() to 6If an environment variable is specified set the return value from main() to
2non-zero if the loader had errors (missing libraries, generally). 7non-zero if the loader had errors (missing libraries, generally).
3 8
4Upstream-Status: Pending 9Upstream-Status: Pending
5Signed-off-by: Ross Burton <ross.burton@intel.com> 10Signed-off-by: Ross Burton <ross.burton@intel.com>
6 11
12---
13 gdk-pixbuf/queryloaders.c | 19 +++++++++++++++----
14 1 file changed, 15 insertions(+), 4 deletions(-)
15
7diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c 16diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c
8index a9ca015..395674a 100644 17index a81c804..350bec8 100644
9--- a/gdk-pixbuf/queryloaders.c 18--- a/gdk-pixbuf/queryloaders.c
10+++ b/gdk-pixbuf/queryloaders.c 19+++ b/gdk-pixbuf/queryloaders.c
11@@ -146,7 +146,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info) 20@@ -146,7 +146,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info)
@@ -47,17 +56,18 @@ index a9ca015..395674a 100644
47 56
48 #ifdef G_OS_WIN32 57 #ifdef G_OS_WIN32
49 gchar *libdir; 58 gchar *libdir;
50@@ -360,7 +365,8 @@ int main (int argc, char **argv) 59@@ -370,7 +375,9 @@ int main (int argc, char **argv)
51 gint len = strlen (dent); 60 }
52 if (len > SOEXT_LEN && 61 modules = g_list_sort (modules, (GCompareFunc)strcmp);
53 strcmp (dent + len - SOEXT_LEN, SOEXT) == 0) { 62 for (l = modules; l != NULL; l = l->next)
54- query_module (contents, path, dent); 63- query_module (contents, path, l->data);
55+ if (!query_module (contents, path, dent)) 64+ if (!query_module (contents, path, l->data))
56+ success = FALSE; 65+ success = FALSE;
57 } 66+
58 } 67 g_list_free_full (modules, g_free);
59 g_dir_close (dir); 68 #else
60@@ -378,7 +384,8 @@ int main (int argc, char **argv) 69 g_string_append_printf (contents, "# dynamic loading of modules not supported\n");
70@@ -385,7 +392,8 @@ int main (int argc, char **argv)
61 infilename = g_locale_to_utf8 (infilename, 71 infilename = g_locale_to_utf8 (infilename,
62 -1, NULL, NULL, NULL); 72 -1, NULL, NULL, NULL);
63 #endif 73 #endif
@@ -67,7 +77,7 @@ index a9ca015..395674a 100644
67 } 77 }
68 g_free (cwd); 78 g_free (cwd);
69 } 79 }
70@@ -394,5 +401,8 @@ int main (int argc, char **argv) 80@@ -401,5 +409,8 @@ int main (int argc, char **argv)
71 else 81 else
72 g_print ("%s\n", contents->str); 82 g_print ("%s\n", contents->str);
73 83
@@ -77,3 +87,6 @@ index a9ca015..395674a 100644
77+ else 87+ else
78+ return 0; 88+ return 0;
79 } 89 }
90--
912.14.1
92
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb
index 8c3590466d..99c84c6dda 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb
@@ -18,11 +18,11 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
18 file://run-ptest \ 18 file://run-ptest \
19 file://fatal-loader.patch \ 19 file://fatal-loader.patch \
20 file://0001-Work-around-thumbnailer-cross-compile-failure.patch \ 20 file://0001-Work-around-thumbnailer-cross-compile-failure.patch \
21 file://0001-queryloaders-Make-output-more-reproducible.patch \ 21 file://0001-Fix-without-libtiff-not-having-an-effect.patch \
22 " 22 "
23 23
24SRC_URI[md5sum] = "e0aaa0061eb12667b32b27472230b962" 24SRC_URI[md5sum] = "6e84e5485c17ce7c25df77fe76eb2d6a"
25SRC_URI[sha256sum] = "5d68e5283cdc0bf9bda99c3e6a1d52ad07a03364fa186b6c26cfc86fcd396a19" 25SRC_URI[sha256sum] = "ae62ab87250413156ed72ef756347b10208c00e76b222d82d9ed361ed9dde2f3"
26 26
27inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package 27inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package
28 28
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 02:03:44 +0000