* [PATCH 2/5] glib-2.0: upgrade to 2.40.0
2014-05-07 16:05 [PATCH 1/5] librsvg: upgrade to 2.40.2 Ross Burton
@ 2014-05-07 16:05 ` Ross Burton
2014-05-07 21:31 ` Saul Wold
2014-05-07 16:05 ` [PATCH 3/5] libxcb: disable check to avoid floating dependencies Ross Burton
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Ross Burton @ 2014-05-07 16:05 UTC (permalink / raw)
To: openembedded-core
The patches Fix-Werror-format-string, gio-test-race, gtest-skip-fixes, and
ptest-dbus have all been merged upstream.
Two license checksums changed as upstream has updated the FSF address in those
files.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
...ror-format-string-errors-from-mismatched-.patch | 56 ------
.../glib-2.0/glib-2.0/gio-test-race.patch | 54 ------
.../glib-2.0/glib-2.0/gtest-skip-fixes.patch | 197 --------------------
.../glib-2.0/glib-2.0/ptest-dbus.patch | 65 -------
.../{glib-2.0_2.38.2.bb => glib-2.0_2.40.0.bb} | 8 +-
meta/recipes-core/glib-2.0/glib.inc | 4 +-
6 files changed, 4 insertions(+), 380 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/gtest-skip-fixes.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/ptest-dbus.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.38.2.bb => glib-2.0_2.40.0.bb} (60%)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch
deleted file mode 100644
index 9b87d9d..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0167c3340d8201dca8e9031b61703bbc5ed6ce33 Mon Sep 17 00:00:00 2001
-From: Jan Schmidt <thaytan@noraisin.net>
-Date: Wed, 25 Sep 2013 19:22:26 +1000
-Subject: [PATCH] gio: Fix -Werror format string errors from mismatched ints.
-
-Upstream-Status: Backport
-
----
- gio/gdbusmessage.c | 8 ++++----
- gio/gdbusprivate.c | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
-index ac233a3..ad77aa6 100644
---- a/gio/gdbusmessage.c
-+++ b/gio/gdbusmessage.c
-@@ -3468,10 +3468,10 @@ g_dbus_message_print (GDBusMessage *message,
- statbuf.st_mode);
- g_string_append_printf (fs, "%s" "ino=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
- (guint64) statbuf.st_ino);
-- g_string_append_printf (fs, "%s" "uid=%d", fs->len > 0 ? "," : "",
-- statbuf.st_uid);
-- g_string_append_printf (fs, "%s" "gid=%d", fs->len > 0 ? "," : "",
-- statbuf.st_gid);
-+ g_string_append_printf (fs, "%s" "uid=%u", fs->len > 0 ? "," : "",
-+ (guint) statbuf.st_uid);
-+ g_string_append_printf (fs, "%s" "gid=%u", fs->len > 0 ? "," : "",
-+ (guint) statbuf.st_gid);
- g_string_append_printf (fs, "%s" "rdev=%d:%d", fs->len > 0 ? "," : "",
- major (statbuf.st_rdev), minor (statbuf.st_rdev));
- g_string_append_printf (fs, "%s" "size=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
-diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
-index 0e5bef2..785a0c0 100644
---- a/gio/gdbusprivate.c
-+++ b/gio/gdbusprivate.c
-@@ -2155,7 +2155,7 @@ write_message_print_transport_debug (gssize bytes_written,
- _g_dbus_debug_print_lock ();
- g_print ("========================================================================\n"
- "GDBus-debug:Transport:\n"
-- " >>>> WROTE %" G_GSIZE_FORMAT " bytes of message with serial %d and\n"
-+ " >>>> WROTE %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n"
- " size %" G_GSIZE_FORMAT " from offset %" G_GSIZE_FORMAT " on a %s\n",
- bytes_written,
- g_dbus_message_get_serial (data->message),
-@@ -2206,7 +2206,7 @@ read_message_print_transport_debug (gssize bytes_read,
- _g_dbus_debug_print_lock ();
- g_print ("========================================================================\n"
- "GDBus-debug:Transport:\n"
-- " <<<< READ %" G_GSIZE_FORMAT " bytes of message with serial %d and\n"
-+ " <<<< READ %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n"
- " size %d to offset %" G_GSIZE_FORMAT " from a %s\n",
- bytes_read,
- serial,
---
-1.8.3.1
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch b/meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch
deleted file mode 100644
index 720ea6c..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From a047a0270ee5faf1d9d6080cbc613defdf52baea Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Tue, 4 Feb 2014 13:15:08 +0000
-Subject: [PATCH] gio/tests: fix race when generating code
-
-There is a race condition in the makefile that can result in build failures like this in parallel builds:
-
-| ./gdbus-test-codegen-generated.h:7:0: error: unterminated #ifndef
-| #ifndef __GDBUS_TEST_CODEGEN_GENERATED_H__
-
-This is because a rule like this:
-
-x.c x.h: prerequisites
- @commands
-
-doesn't consider x.c and x.h together. Instead, it expands to two rules, one to
-generate x.c and one to generate x.h, which happen to run the same commands. In
-the worst case they execute in parallel, overwriting each other's output.
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-https://bugzilla.gnome.org/show_bug.cgi?id=723616
----
- gio/tests/Makefile.am | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 0beb239..270faf6 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -436,7 +436,7 @@ gmenumodel_SOURCES = $(gdbus_sessionbus_sources) gmenumode
- gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotification.c gnotification-server.h gnotification-server.c
-
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h
--gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-@@ -455,6 +455,8 @@ gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml
- --annotate "org.project.Bar::TestSignal[array_of_strings]" Key8 Value8 \
- $(srcdir)/test-codegen.xml \
- $(NULL)
-+gdbus-test-codegen-generated.c: gdbus-test-codegen-generated.h
-+ @: # Generated as side-effect of .h
-
- EXTRA_DIST += test-codegen.xml
- CLEANFILES += gdbus-test-codegen-generated.[ch] gdbus-test-codegen-generated-doc-*.xml
---
-1.7.10.4
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/gtest-skip-fixes.patch b/meta/recipes-core/glib-2.0/glib-2.0/gtest-skip-fixes.patch
deleted file mode 100644
index 3dba0ee..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/gtest-skip-fixes.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-Fix the handling of skipped tests so that it follows what automake does.
-
-Upstream-Status: Backport [https://bugzilla.gnome.org/show_bug.cgi?id=720263]
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/glib/gtestutils.c b/glib/gtestutils.c
-index bc7bbcf..feaafa3 100644
---- a/glib/gtestutils.c
-+++ b/glib/gtestutils.c
-@@ -607,9 +607,10 @@ static gchar *test_run_name = "";
- static GSList **test_filename_free_list;
- static guint test_run_forks = 0;
- static guint test_run_count = 0;
-+static guint test_skipped_count = 0;
- static GTestResult test_run_success = G_TEST_RUN_FAILURE;
- static gchar *test_run_msg = NULL;
--static guint test_skip_count = 0;
-+static guint test_startup_skip_count = 0;
- static GTimer *test_user_timer = NULL;
- static double test_user_stamp = 0;
- static GSList *test_paths = NULL;
-@@ -765,6 +766,8 @@ g_test_log (GTestLogType lbit,
- g_print ("Bail out!\n");
- abort();
- }
-+ if (largs[0] == G_TEST_RUN_SKIPPED)
-+ test_skipped_count++;
- break;
- case G_TEST_LOG_MIN_RESULT:
- if (test_tap_log)
-@@ -869,11 +872,11 @@ parse_args (gint *argc_p,
- {
- gchar *equal = argv[i] + 16;
- if (*equal == '=')
-- test_skip_count = g_ascii_strtoull (equal + 1, NULL, 0);
-+ test_startup_skip_count = g_ascii_strtoull (equal + 1, NULL, 0);
- else if (i + 1 < argc)
- {
- argv[i++] = NULL;
-- test_skip_count = g_ascii_strtoull (argv[i], NULL, 0);
-+ test_startup_skip_count = g_ascii_strtoull (argv[i], NULL, 0);
- }
- argv[i] = NULL;
- }
-@@ -1516,14 +1519,21 @@ g_test_get_root (void)
- * g_test_run_suite() or g_test_run() may only be called once
- * in a program.
- *
-- * Returns: 0 on success
-+ * Returns: 0 on success, 1 on failure (assuming it returns at all),
-+ * 77 if all tests were skipped with g_test_skip().
- *
- * Since: 2.16
- */
- int
- g_test_run (void)
- {
-- return g_test_run_suite (g_test_get_root());
-+ if (g_test_run_suite (g_test_get_root()) != 0)
-+ return 1;
-+
-+ if (test_run_count > 0 && test_run_count == test_skipped_count)
-+ return 77;
-+ else
-+ return 0;
- }
-
- /**
-@@ -2063,7 +2073,7 @@ test_case_run (GTestCase *tc)
- }
- }
-
-- if (++test_run_count <= test_skip_count)
-+ if (++test_run_count <= test_startup_skip_count)
- g_test_log (G_TEST_LOG_SKIP_CASE, test_run_name, NULL, 0, NULL);
- else if (test_run_list)
- {
-@@ -2117,7 +2127,8 @@ test_case_run (GTestCase *tc)
- g_free (test_uri_base);
- test_uri_base = old_base;
-
-- return success == G_TEST_RUN_SUCCESS;
-+ return (success == G_TEST_RUN_SUCCESS ||
-+ success == G_TEST_RUN_SKIPPED);
- }
-
- static int
-diff --git a/glib/tests/testing.c b/glib/tests/testing.c
-index 20c2e79..1025f12 100644
---- a/glib/tests/testing.c
-+++ b/glib/tests/testing.c
-@@ -575,10 +575,93 @@ test_nonfatal (void)
- g_test_trap_assert_stdout ("*The End*");
- }
-
-+static void
-+test_skip (void)
-+{
-+ g_test_skip ("Skipped should count as passed, not failed");
-+}
-+
-+static void
-+test_pass (void)
-+{
-+}
-+
-+static const char *argv0;
-+
-+static void
-+test_skip_all (void)
-+{
-+ GPtrArray *argv;
-+ GError *error = NULL;
-+ int status;
-+
-+ argv = g_ptr_array_new ();
-+ g_ptr_array_add (argv, (char *) argv0);
-+ g_ptr_array_add (argv, "--GTestSubprocess");
-+ g_ptr_array_add (argv, "-p");
-+ g_ptr_array_add (argv, "/misc/skip");
-+ g_ptr_array_add (argv, NULL);
-+
-+ g_spawn_sync (NULL, (char **) argv->pdata, NULL,
-+ G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
-+ NULL, NULL, NULL, NULL, &status,
-+ &error);
-+ g_assert_no_error (error);
-+
-+ g_spawn_check_exit_status (status, &error);
-+ g_assert_error (error, G_SPAWN_EXIT_ERROR, 77);
-+ g_clear_error (&error);
-+
-+ g_ptr_array_set_size (argv, 0);
-+ g_ptr_array_add (argv, (char *) argv0);
-+ g_ptr_array_add (argv, "--GTestSubprocess");
-+ g_ptr_array_add (argv, "-p");
-+ g_ptr_array_add (argv, "/misc/skip");
-+ g_ptr_array_add (argv, "-p");
-+ g_ptr_array_add (argv, "/misc/skip-all/subprocess/skip1");
-+ g_ptr_array_add (argv, "-p");
-+ g_ptr_array_add (argv, "/misc/skip-all/subprocess/skip2");
-+ g_ptr_array_add (argv, NULL);
-+
-+ g_spawn_sync (NULL, (char **) argv->pdata, NULL,
-+ G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
-+ NULL, NULL, NULL, NULL, &status,
-+ &error);
-+ g_assert_no_error (error);
-+
-+ g_spawn_check_exit_status (status, &error);
-+ g_assert_error (error, G_SPAWN_EXIT_ERROR, 77);
-+ g_clear_error (&error);
-+
-+ g_ptr_array_set_size (argv, 0);
-+ g_ptr_array_add (argv, (char *) argv0);
-+ g_ptr_array_add (argv, "--GTestSubprocess");
-+ g_ptr_array_add (argv, "-p");
-+ g_ptr_array_add (argv, "/misc/skip");
-+ g_ptr_array_add (argv, "-p");
-+ g_ptr_array_add (argv, "/misc/skip-all/subprocess/pass");
-+ g_ptr_array_add (argv, "-p");
-+ g_ptr_array_add (argv, "/misc/skip-all/subprocess/skip1");
-+ g_ptr_array_add (argv, NULL);
-+
-+ g_spawn_sync (NULL, (char **) argv->pdata, NULL,
-+ G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
-+ NULL, NULL, NULL, NULL, &status,
-+ &error);
-+ g_assert_no_error (error);
-+
-+ g_spawn_check_exit_status (status, &error);
-+ g_assert_no_error (error);
-+
-+ g_ptr_array_unref (argv);
-+}
-+
- int
- main (int argc,
- char *argv[])
- {
-+ argv0 = argv[0];
-+
- g_test_init (&argc, &argv, NULL);
-
- g_test_add_func ("/random-generator/rand-1", test_rand1);
-@@ -633,5 +716,11 @@ main (int argc,
-
- g_test_add_func ("/misc/nonfatal", test_nonfatal);
-
-+ g_test_add_func ("/misc/skip", test_skip);
-+ g_test_add_func ("/misc/skip-all", test_skip_all);
-+ g_test_add_func ("/misc/skip-all/subprocess/skip1", test_skip);
-+ g_test_add_func ("/misc/skip-all/subprocess/skip2", test_skip);
-+ g_test_add_func ("/misc/skip-all/subprocess/pass", test_pass);
-+
- return g_test_run();
- }
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/ptest-dbus.patch b/meta/recipes-core/glib-2.0/glib-2.0/ptest-dbus.patch
deleted file mode 100644
index 0db8fd1..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/ptest-dbus.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Fix dbus-appinfo from attempting to use the session's bus, and hanging if there
-isn't one present.
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 940fa98290812789d095d93ff1c550cd86fb2428 Mon Sep 17 00:00:00 2001
-From: Xavier Claessens <xavier.claessens@collabora.co.uk>
-Date: Mon, 28 Oct 2013 21:18:54 +0000
-Subject: Tests: add session_bus_run() and use it where possible
-
-This is to avoid having again the subtil bug in dbus-appinfo.c:
-session_bus_down() was called before g_test_run() so the test was
-running on the user's dbus session.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=697348
----
-diff --git a/gio/tests/dbus-appinfo.c b/gio/tests/dbus-appinfo.c
-index ca11e98..7698429 100644
---- a/gio/tests/dbus-appinfo.c
-+++ b/gio/tests/dbus-appinfo.c
-@@ -280,11 +280,7 @@ main (int argc, char **argv)
- {
- g_test_init (&argc, &argv, NULL);
-
-- session_bus_up ();
--
- g_test_add_func ("/appinfo/dbusappinfo", test_dbus_appinfo);
-
-- session_bus_down ();
--
-- return g_test_run ();
-+ return session_bus_run ();
- }
-diff --git a/gio/tests/gdbus-sessionbus.c b/gio/tests/gdbus-sessionbus.c
-index 68c4449..13c2edb 100644
---- a/gio/tests/gdbus-sessionbus.c
-+++ b/gio/tests/gdbus-sessionbus.c
-@@ -47,3 +47,14 @@ session_bus_down (void)
- g_clear_object (&singleton);
- }
-
-+gint
-+session_bus_run (void)
-+{
-+ gint ret;
-+
-+ session_bus_up ();
-+ ret = g_test_run ();
-+ session_bus_down ();
-+
-+ return ret;
-+}
-diff --git a/gio/tests/gdbus-sessionbus.h b/gio/tests/gdbus-sessionbus.h
-index 7ef3abd..284cd00 100644
---- a/gio/tests/gdbus-sessionbus.h
-+++ b/gio/tests/gdbus-sessionbus.h
-@@ -30,6 +30,7 @@ G_BEGIN_DECLS
- void session_bus_up (void);
- void session_bus_stop (void);
- void session_bus_down (void);
-+gint session_bus_run (void);
-
- G_END_DECLS
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.38.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb
similarity index 60%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.38.2.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb
index 4052950..3be126f 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.38.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb
@@ -10,15 +10,11 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://add-march-i486-into-CFLAGS-automatically.patch \
file://glib-2.0-configure-readlink.patch \
file://run-ptest \
- file://0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch \
- file://ptest-dbus.patch \
file://ptest-paths.patch \
- file://gtest-skip-fixes.patch \
- file://gio-test-race.patch \
file://uclibc.patch \
"
SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
-SRC_URI[md5sum] = "26d1d08e478fc48c181ca8be44f5b69f"
-SRC_URI[sha256sum] = "056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734"
+SRC_URI[md5sum] = "05fb7cb17eacbc718e90366a1eae60d9"
+SRC_URI[sha256sum] = "0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 4d27262..1b29e48 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -4,9 +4,9 @@ DESCRIPTION = "GLib is a general-purpose utility library, which provides many us
# docs/reference/COPYING is with a 'public domai'-like license!
LICENSE = "LGPLv2+ & BSD & PD"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
- file://glib/glib.h;beginline=4;endline=17;md5=62b7bd0d17b98573dfb87495ac1c5b4c \
+ file://glib/glib.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \
file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
- file://gmodule/gmodule.h;beginline=4;endline=17;md5=62b7bd0d17b98573dfb87495ac1c5b4c \
+ file://gmodule/gmodule.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \
file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \
file://glib/pcre/pcre.h;beginline=11;endline=35;md5=de27f2bf633d20a2b7af0b1983423283 \
file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/5] glib-2.0: upgrade to 2.40.0
2014-05-07 16:05 ` [PATCH 2/5] glib-2.0: upgrade to 2.40.0 Ross Burton
@ 2014-05-07 21:31 ` Saul Wold
2014-05-07 21:43 ` Burton, Ross
2014-05-08 14:06 ` Burton, Ross
0 siblings, 2 replies; 9+ messages in thread
From: Saul Wold @ 2014-05-07 21:31 UTC (permalink / raw)
To: Ross Burton, openembedded-core
On 05/07/2014 09:05 AM, Ross Burton wrote:
> The patches Fix-Werror-format-string, gio-test-race, gtest-skip-fixes, and
> ptest-dbus have all been merged upstream.
>
> Two license checksums changed as upstream has updated the FSF address in those
> files.
>
This update seems to have introduced a definition of
g_ptr_array_insert() which causes an issue with gst-openmax.
So a patch to gst-openmax might be needed.
Sau!
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> ...ror-format-string-errors-from-mismatched-.patch | 56 ------
> .../glib-2.0/glib-2.0/gio-test-race.patch | 54 ------
> .../glib-2.0/glib-2.0/gtest-skip-fixes.patch | 197 --------------------
> .../glib-2.0/glib-2.0/ptest-dbus.patch | 65 -------
> .../{glib-2.0_2.38.2.bb => glib-2.0_2.40.0.bb} | 8 +-
> meta/recipes-core/glib-2.0/glib.inc | 4 +-
> 6 files changed, 4 insertions(+), 380 deletions(-)
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/gtest-skip-fixes.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/ptest-dbus.patch
> rename meta/recipes-core/glib-2.0/{glib-2.0_2.38.2.bb => glib-2.0_2.40.0.bb} (60%)
>
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch
> deleted file mode 100644
> index 9b87d9d..0000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch
> +++ /dev/null
> @@ -1,56 +0,0 @@
> -From 0167c3340d8201dca8e9031b61703bbc5ed6ce33 Mon Sep 17 00:00:00 2001
> -From: Jan Schmidt <thaytan@noraisin.net>
> -Date: Wed, 25 Sep 2013 19:22:26 +1000
> -Subject: [PATCH] gio: Fix -Werror format string errors from mismatched ints.
> -
> -Upstream-Status: Backport
> -
> ----
> - gio/gdbusmessage.c | 8 ++++----
> - gio/gdbusprivate.c | 4 ++--
> - 2 files changed, 6 insertions(+), 6 deletions(-)
> -
> -diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
> -index ac233a3..ad77aa6 100644
> ---- a/gio/gdbusmessage.c
> -+++ b/gio/gdbusmessage.c
> -@@ -3468,10 +3468,10 @@ g_dbus_message_print (GDBusMessage *message,
> - statbuf.st_mode);
> - g_string_append_printf (fs, "%s" "ino=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
> - (guint64) statbuf.st_ino);
> -- g_string_append_printf (fs, "%s" "uid=%d", fs->len > 0 ? "," : "",
> -- statbuf.st_uid);
> -- g_string_append_printf (fs, "%s" "gid=%d", fs->len > 0 ? "," : "",
> -- statbuf.st_gid);
> -+ g_string_append_printf (fs, "%s" "uid=%u", fs->len > 0 ? "," : "",
> -+ (guint) statbuf.st_uid);
> -+ g_string_append_printf (fs, "%s" "gid=%u", fs->len > 0 ? "," : "",
> -+ (guint) statbuf.st_gid);
> - g_string_append_printf (fs, "%s" "rdev=%d:%d", fs->len > 0 ? "," : "",
> - major (statbuf.st_rdev), minor (statbuf.st_rdev));
> - g_string_append_printf (fs, "%s" "size=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
> -diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
> -index 0e5bef2..785a0c0 100644
> ---- a/gio/gdbusprivate.c
> -+++ b/gio/gdbusprivate.c
> -@@ -2155,7 +2155,7 @@ write_message_print_transport_debug (gssize bytes_written,
> - _g_dbus_debug_print_lock ();
> - g_print ("========================================================================\n"
> - "GDBus-debug:Transport:\n"
> -- " >>>> WROTE %" G_GSIZE_FORMAT " bytes of message with serial %d and\n"
> -+ " >>>> WROTE %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n"
> - " size %" G_GSIZE_FORMAT " from offset %" G_GSIZE_FORMAT " on a %s\n",
> - bytes_written,
> - g_dbus_message_get_serial (data->message),
> -@@ -2206,7 +2206,7 @@ read_message_print_transport_debug (gssize bytes_read,
> - _g_dbus_debug_print_lock ();
> - g_print ("========================================================================\n"
> - "GDBus-debug:Transport:\n"
> -- " <<<< READ %" G_GSIZE_FORMAT " bytes of message with serial %d and\n"
> -+ " <<<< READ %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n"
> - " size %d to offset %" G_GSIZE_FORMAT " from a %s\n",
> - bytes_read,
> - serial,
> ---
> -1.8.3.1
> -
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch b/meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch
> deleted file mode 100644
> index 720ea6c..0000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -Upstream-Status: Submitted
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -From a047a0270ee5faf1d9d6080cbc613defdf52baea Mon Sep 17 00:00:00 2001
> -From: Ross Burton <ross.burton@intel.com>
> -Date: Tue, 4 Feb 2014 13:15:08 +0000
> -Subject: [PATCH] gio/tests: fix race when generating code
> -
> -There is a race condition in the makefile that can result in build failures like this in parallel builds:
> -
> -| ./gdbus-test-codegen-generated.h:7:0: error: unterminated #ifndef
> -| #ifndef __GDBUS_TEST_CODEGEN_GENERATED_H__
> -
> -This is because a rule like this:
> -
> -x.c x.h: prerequisites
> - @commands
> -
> -doesn't consider x.c and x.h together. Instead, it expands to two rules, one to
> -generate x.c and one to generate x.h, which happen to run the same commands. In
> -the worst case they execute in parallel, overwriting each other's output.
> -
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -https://bugzilla.gnome.org/show_bug.cgi?id=723616
> ----
> - gio/tests/Makefile.am | 4 +++-
> - 1 file changed, 3 insertions(+), 1 deletion(-)
> -
> -diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
> -index 0beb239..270faf6 100644
> ---- a/gio/tests/Makefile.am
> -+++ b/gio/tests/Makefile.am
> -@@ -436,7 +436,7 @@ gmenumodel_SOURCES = $(gdbus_sessionbus_sources) gmenumode
> - gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotification.c gnotification-server.h gnotification-server.c
> -
> - gdbus-test-codegen.o: gdbus-test-codegen-generated.h
> --gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
> -+gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
> - $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
> - UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
> - $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
> -@@ -455,6 +455,8 @@ gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml
> - --annotate "org.project.Bar::TestSignal[array_of_strings]" Key8 Value8 \
> - $(srcdir)/test-codegen.xml \
> - $(NULL)
> -+gdbus-test-codegen-generated.c: gdbus-test-codegen-generated.h
> -+ @: # Generated as side-effect of .h
> -
> - EXTRA_DIST += test-codegen.xml
> - CLEANFILES += gdbus-test-codegen-generated.[ch] gdbus-test-codegen-generated-doc-*.xml
> ---
> -1.7.10.4
> -
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/gtest-skip-fixes.patch b/meta/recipes-core/glib-2.0/glib-2.0/gtest-skip-fixes.patch
> deleted file mode 100644
> index 3dba0ee..0000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0/gtest-skip-fixes.patch
> +++ /dev/null
> @@ -1,197 +0,0 @@
> -Fix the handling of skipped tests so that it follows what automake does.
> -
> -Upstream-Status: Backport [https://bugzilla.gnome.org/show_bug.cgi?id=720263]
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -diff --git a/glib/gtestutils.c b/glib/gtestutils.c
> -index bc7bbcf..feaafa3 100644
> ---- a/glib/gtestutils.c
> -+++ b/glib/gtestutils.c
> -@@ -607,9 +607,10 @@ static gchar *test_run_name = "";
> - static GSList **test_filename_free_list;
> - static guint test_run_forks = 0;
> - static guint test_run_count = 0;
> -+static guint test_skipped_count = 0;
> - static GTestResult test_run_success = G_TEST_RUN_FAILURE;
> - static gchar *test_run_msg = NULL;
> --static guint test_skip_count = 0;
> -+static guint test_startup_skip_count = 0;
> - static GTimer *test_user_timer = NULL;
> - static double test_user_stamp = 0;
> - static GSList *test_paths = NULL;
> -@@ -765,6 +766,8 @@ g_test_log (GTestLogType lbit,
> - g_print ("Bail out!\n");
> - abort();
> - }
> -+ if (largs[0] == G_TEST_RUN_SKIPPED)
> -+ test_skipped_count++;
> - break;
> - case G_TEST_LOG_MIN_RESULT:
> - if (test_tap_log)
> -@@ -869,11 +872,11 @@ parse_args (gint *argc_p,
> - {
> - gchar *equal = argv[i] + 16;
> - if (*equal == '=')
> -- test_skip_count = g_ascii_strtoull (equal + 1, NULL, 0);
> -+ test_startup_skip_count = g_ascii_strtoull (equal + 1, NULL, 0);
> - else if (i + 1 < argc)
> - {
> - argv[i++] = NULL;
> -- test_skip_count = g_ascii_strtoull (argv[i], NULL, 0);
> -+ test_startup_skip_count = g_ascii_strtoull (argv[i], NULL, 0);
> - }
> - argv[i] = NULL;
> - }
> -@@ -1516,14 +1519,21 @@ g_test_get_root (void)
> - * g_test_run_suite() or g_test_run() may only be called once
> - * in a program.
> - *
> -- * Returns: 0 on success
> -+ * Returns: 0 on success, 1 on failure (assuming it returns at all),
> -+ * 77 if all tests were skipped with g_test_skip().
> - *
> - * Since: 2.16
> - */
> - int
> - g_test_run (void)
> - {
> -- return g_test_run_suite (g_test_get_root());
> -+ if (g_test_run_suite (g_test_get_root()) != 0)
> -+ return 1;
> -+
> -+ if (test_run_count > 0 && test_run_count == test_skipped_count)
> -+ return 77;
> -+ else
> -+ return 0;
> - }
> -
> - /**
> -@@ -2063,7 +2073,7 @@ test_case_run (GTestCase *tc)
> - }
> - }
> -
> -- if (++test_run_count <= test_skip_count)
> -+ if (++test_run_count <= test_startup_skip_count)
> - g_test_log (G_TEST_LOG_SKIP_CASE, test_run_name, NULL, 0, NULL);
> - else if (test_run_list)
> - {
> -@@ -2117,7 +2127,8 @@ test_case_run (GTestCase *tc)
> - g_free (test_uri_base);
> - test_uri_base = old_base;
> -
> -- return success == G_TEST_RUN_SUCCESS;
> -+ return (success == G_TEST_RUN_SUCCESS ||
> -+ success == G_TEST_RUN_SKIPPED);
> - }
> -
> - static int
> -diff --git a/glib/tests/testing.c b/glib/tests/testing.c
> -index 20c2e79..1025f12 100644
> ---- a/glib/tests/testing.c
> -+++ b/glib/tests/testing.c
> -@@ -575,10 +575,93 @@ test_nonfatal (void)
> - g_test_trap_assert_stdout ("*The End*");
> - }
> -
> -+static void
> -+test_skip (void)
> -+{
> -+ g_test_skip ("Skipped should count as passed, not failed");
> -+}
> -+
> -+static void
> -+test_pass (void)
> -+{
> -+}
> -+
> -+static const char *argv0;
> -+
> -+static void
> -+test_skip_all (void)
> -+{
> -+ GPtrArray *argv;
> -+ GError *error = NULL;
> -+ int status;
> -+
> -+ argv = g_ptr_array_new ();
> -+ g_ptr_array_add (argv, (char *) argv0);
> -+ g_ptr_array_add (argv, "--GTestSubprocess");
> -+ g_ptr_array_add (argv, "-p");
> -+ g_ptr_array_add (argv, "/misc/skip");
> -+ g_ptr_array_add (argv, NULL);
> -+
> -+ g_spawn_sync (NULL, (char **) argv->pdata, NULL,
> -+ G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
> -+ NULL, NULL, NULL, NULL, &status,
> -+ &error);
> -+ g_assert_no_error (error);
> -+
> -+ g_spawn_check_exit_status (status, &error);
> -+ g_assert_error (error, G_SPAWN_EXIT_ERROR, 77);
> -+ g_clear_error (&error);
> -+
> -+ g_ptr_array_set_size (argv, 0);
> -+ g_ptr_array_add (argv, (char *) argv0);
> -+ g_ptr_array_add (argv, "--GTestSubprocess");
> -+ g_ptr_array_add (argv, "-p");
> -+ g_ptr_array_add (argv, "/misc/skip");
> -+ g_ptr_array_add (argv, "-p");
> -+ g_ptr_array_add (argv, "/misc/skip-all/subprocess/skip1");
> -+ g_ptr_array_add (argv, "-p");
> -+ g_ptr_array_add (argv, "/misc/skip-all/subprocess/skip2");
> -+ g_ptr_array_add (argv, NULL);
> -+
> -+ g_spawn_sync (NULL, (char **) argv->pdata, NULL,
> -+ G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
> -+ NULL, NULL, NULL, NULL, &status,
> -+ &error);
> -+ g_assert_no_error (error);
> -+
> -+ g_spawn_check_exit_status (status, &error);
> -+ g_assert_error (error, G_SPAWN_EXIT_ERROR, 77);
> -+ g_clear_error (&error);
> -+
> -+ g_ptr_array_set_size (argv, 0);
> -+ g_ptr_array_add (argv, (char *) argv0);
> -+ g_ptr_array_add (argv, "--GTestSubprocess");
> -+ g_ptr_array_add (argv, "-p");
> -+ g_ptr_array_add (argv, "/misc/skip");
> -+ g_ptr_array_add (argv, "-p");
> -+ g_ptr_array_add (argv, "/misc/skip-all/subprocess/pass");
> -+ g_ptr_array_add (argv, "-p");
> -+ g_ptr_array_add (argv, "/misc/skip-all/subprocess/skip1");
> -+ g_ptr_array_add (argv, NULL);
> -+
> -+ g_spawn_sync (NULL, (char **) argv->pdata, NULL,
> -+ G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
> -+ NULL, NULL, NULL, NULL, &status,
> -+ &error);
> -+ g_assert_no_error (error);
> -+
> -+ g_spawn_check_exit_status (status, &error);
> -+ g_assert_no_error (error);
> -+
> -+ g_ptr_array_unref (argv);
> -+}
> -+
> - int
> - main (int argc,
> - char *argv[])
> - {
> -+ argv0 = argv[0];
> -+
> - g_test_init (&argc, &argv, NULL);
> -
> - g_test_add_func ("/random-generator/rand-1", test_rand1);
> -@@ -633,5 +716,11 @@ main (int argc,
> -
> - g_test_add_func ("/misc/nonfatal", test_nonfatal);
> -
> -+ g_test_add_func ("/misc/skip", test_skip);
> -+ g_test_add_func ("/misc/skip-all", test_skip_all);
> -+ g_test_add_func ("/misc/skip-all/subprocess/skip1", test_skip);
> -+ g_test_add_func ("/misc/skip-all/subprocess/skip2", test_skip);
> -+ g_test_add_func ("/misc/skip-all/subprocess/pass", test_pass);
> -+
> - return g_test_run();
> - }
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/ptest-dbus.patch b/meta/recipes-core/glib-2.0/glib-2.0/ptest-dbus.patch
> deleted file mode 100644
> index 0db8fd1..0000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0/ptest-dbus.patch
> +++ /dev/null
> @@ -1,65 +0,0 @@
> -Fix dbus-appinfo from attempting to use the session's bus, and hanging if there
> -isn't one present.
> -
> -Upstream-Status: Backport
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -From 940fa98290812789d095d93ff1c550cd86fb2428 Mon Sep 17 00:00:00 2001
> -From: Xavier Claessens <xavier.claessens@collabora.co.uk>
> -Date: Mon, 28 Oct 2013 21:18:54 +0000
> -Subject: Tests: add session_bus_run() and use it where possible
> -
> -This is to avoid having again the subtil bug in dbus-appinfo.c:
> -session_bus_down() was called before g_test_run() so the test was
> -running on the user's dbus session.
> -
> -https://bugzilla.gnome.org/show_bug.cgi?id=697348
> ----
> -diff --git a/gio/tests/dbus-appinfo.c b/gio/tests/dbus-appinfo.c
> -index ca11e98..7698429 100644
> ---- a/gio/tests/dbus-appinfo.c
> -+++ b/gio/tests/dbus-appinfo.c
> -@@ -280,11 +280,7 @@ main (int argc, char **argv)
> - {
> - g_test_init (&argc, &argv, NULL);
> -
> -- session_bus_up ();
> --
> - g_test_add_func ("/appinfo/dbusappinfo", test_dbus_appinfo);
> -
> -- session_bus_down ();
> --
> -- return g_test_run ();
> -+ return session_bus_run ();
> - }
> -diff --git a/gio/tests/gdbus-sessionbus.c b/gio/tests/gdbus-sessionbus.c
> -index 68c4449..13c2edb 100644
> ---- a/gio/tests/gdbus-sessionbus.c
> -+++ b/gio/tests/gdbus-sessionbus.c
> -@@ -47,3 +47,14 @@ session_bus_down (void)
> - g_clear_object (&singleton);
> - }
> -
> -+gint
> -+session_bus_run (void)
> -+{
> -+ gint ret;
> -+
> -+ session_bus_up ();
> -+ ret = g_test_run ();
> -+ session_bus_down ();
> -+
> -+ return ret;
> -+}
> -diff --git a/gio/tests/gdbus-sessionbus.h b/gio/tests/gdbus-sessionbus.h
> -index 7ef3abd..284cd00 100644
> ---- a/gio/tests/gdbus-sessionbus.h
> -+++ b/gio/tests/gdbus-sessionbus.h
> -@@ -30,6 +30,7 @@ G_BEGIN_DECLS
> - void session_bus_up (void);
> - void session_bus_stop (void);
> - void session_bus_down (void);
> -+gint session_bus_run (void);
> -
> - G_END_DECLS
> -
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.38.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb
> similarity index 60%
> rename from meta/recipes-core/glib-2.0/glib-2.0_2.38.2.bb
> rename to meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb
> index 4052950..3be126f 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.38.2.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb
> @@ -10,15 +10,11 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
> file://add-march-i486-into-CFLAGS-automatically.patch \
> file://glib-2.0-configure-readlink.patch \
> file://run-ptest \
> - file://0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch \
> - file://ptest-dbus.patch \
> file://ptest-paths.patch \
> - file://gtest-skip-fixes.patch \
> - file://gio-test-race.patch \
> file://uclibc.patch \
> "
>
> SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
>
> -SRC_URI[md5sum] = "26d1d08e478fc48c181ca8be44f5b69f"
> -SRC_URI[sha256sum] = "056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734"
> +SRC_URI[md5sum] = "05fb7cb17eacbc718e90366a1eae60d9"
> +SRC_URI[sha256sum] = "0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5"
> diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
> index 4d27262..1b29e48 100644
> --- a/meta/recipes-core/glib-2.0/glib.inc
> +++ b/meta/recipes-core/glib-2.0/glib.inc
> @@ -4,9 +4,9 @@ DESCRIPTION = "GLib is a general-purpose utility library, which provides many us
> # docs/reference/COPYING is with a 'public domai'-like license!
> LICENSE = "LGPLv2+ & BSD & PD"
> LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
> - file://glib/glib.h;beginline=4;endline=17;md5=62b7bd0d17b98573dfb87495ac1c5b4c \
> + file://glib/glib.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \
> file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
> - file://gmodule/gmodule.h;beginline=4;endline=17;md5=62b7bd0d17b98573dfb87495ac1c5b4c \
> + file://gmodule/gmodule.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \
> file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \
> file://glib/pcre/pcre.h;beginline=11;endline=35;md5=de27f2bf633d20a2b7af0b1983423283 \
> file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc"
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 2/5] glib-2.0: upgrade to 2.40.0
2014-05-07 21:31 ` Saul Wold
@ 2014-05-07 21:43 ` Burton, Ross
2014-05-08 14:06 ` Burton, Ross
1 sibling, 0 replies; 9+ messages in thread
From: Burton, Ross @ 2014-05-07 21:43 UTC (permalink / raw)
To: Saul Wold; +Cc: OE-core
On 7 May 2014 22:31, Saul Wold <sgw@linux.intel.com> wrote:
> This update seems to have introduced a definition of g_ptr_array_insert()
> which causes an issue with gst-openmax.
>
> So a patch to gst-openmax might be needed.
Good catch, I'll sort this tomorrow.
Ross
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/5] glib-2.0: upgrade to 2.40.0
2014-05-07 21:31 ` Saul Wold
2014-05-07 21:43 ` Burton, Ross
@ 2014-05-08 14:06 ` Burton, Ross
1 sibling, 0 replies; 9+ messages in thread
From: Burton, Ross @ 2014-05-08 14:06 UTC (permalink / raw)
To: Saul Wold; +Cc: OE-core
On 7 May 2014 22:31, Saul Wold <sgw@linux.intel.com> wrote:
> This update seems to have introduced a definition of g_ptr_array_insert()
> which causes an issue with gst-openmax.
Yep, gst-openmax was using the same namespace so a conflict was
inevitable. I've patched locally, running a fuller build now.
Ross
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/5] libxcb: disable check to avoid floating dependencies
2014-05-07 16:05 [PATCH 1/5] librsvg: upgrade to 2.40.2 Ross Burton
2014-05-07 16:05 ` [PATCH 2/5] glib-2.0: upgrade to 2.40.0 Ross Burton
@ 2014-05-07 16:05 ` Ross Burton
2014-05-07 16:05 ` [PATCH 4/5] freetype: upgrade to 2.5.3 Ross Burton
2014-05-07 16:05 ` [PATCH 5/5] gdk-pixbuf: upgrade to 2.30.7 Ross Burton
3 siblings, 0 replies; 9+ messages in thread
From: Ross Burton @ 2014-05-07 16:05 UTC (permalink / raw)
To: openembedded-core
The "check" module is checked for in configure without any way to explicitly
enable or disable it, but it isn't a build dependency of libxcb. If it's found
libxslt is also checked for, which is a build dependency but will only be used
if check is also present.
As the libxcb unit test suite is minimal at present, forcibly disable the test
for check and remove the libxslt-native build dependency.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/xorg-lib/libxcb.inc | 5 ++--
.../xorg-lib/libxcb/disable-check.patch | 25 ++++++++++++++++++++
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
diff --git a/meta/recipes-graphics/xorg-lib/libxcb.inc b/meta/recipes-graphics/xorg-lib/libxcb.inc
index 75a43a5..453f550 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb.inc
+++ b/meta/recipes-graphics/xorg-lib/libxcb.inc
@@ -10,10 +10,11 @@ BBCLASSEXTEND = "native nativesdk"
SECTION = "x11/libs"
LICENSE = "MIT-X"
-DEPENDS = "xcb-proto xproto libxau libxslt-native xcb-proto-native libpthread-stubs"
+DEPENDS = "xcb-proto xproto libxau xcb-proto-native libpthread-stubs"
SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
- file://xcbincludedir.patch"
+ file://xcbincludedir.patch \
+ file://disable-check.patch"
PACKAGES_DYNAMIC = "^libxcb-.*"
diff --git a/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch b/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
new file mode 100644
index 0000000..5f59a2b
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
@@ -0,0 +1,25 @@
+The "check" package is checked for without an explicit enable/disable option,
+which can lead to non-deterministic build issues with both check and libxslt.
+
+As the unit test suite is minimal at present, simply disable the test suite. In
+the future if the test suite is expanded this can be made conditional on the
+ptest DISTRO_FEATURE.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+
+diff --git a/configure.ac b/configure.ac
+index 6d7c9a5..22cceb9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,7 +21,8 @@ AC_USE_SYSTEM_EXTENSIONS
+
+ AM_PATH_PYTHON([2.6])
+
+-PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])
++dnl PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])
++HAVE_CHECK=no
+ AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes)
+
+ AC_CONFIG_HEADERS([src/config.h])
\ No newline at end of file
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/5] freetype: upgrade to 2.5.3
2014-05-07 16:05 [PATCH 1/5] librsvg: upgrade to 2.40.2 Ross Burton
2014-05-07 16:05 ` [PATCH 2/5] glib-2.0: upgrade to 2.40.0 Ross Burton
2014-05-07 16:05 ` [PATCH 3/5] libxcb: disable check to avoid floating dependencies Ross Burton
@ 2014-05-07 16:05 ` Ross Burton
2014-05-07 18:04 ` Saul Wold
2014-05-07 16:05 ` [PATCH 5/5] gdk-pixbuf: upgrade to 2.30.7 Ross Burton
3 siblings, 1 reply; 9+ messages in thread
From: Ross Burton @ 2014-05-07 16:05 UTC (permalink / raw)
To: openembedded-core
Also drop the redundant definition of S.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../freetype/{freetype_2.5.2.bb => freetype_2.5.3.bb} | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
rename meta/recipes-graphics/freetype/{freetype_2.5.2.bb => freetype_2.5.3.bb} (89%)
diff --git a/meta/recipes-graphics/freetype/freetype_2.5.2.bb b/meta/recipes-graphics/freetype/freetype_2.5.3.bb
similarity index 89%
rename from meta/recipes-graphics/freetype/freetype_2.5.2.bb
rename to meta/recipes-graphics/freetype/freetype_2.5.3.bb
index 0c62a67..7182c21 100644
--- a/meta/recipes-graphics/freetype/freetype_2.5.2.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.5.3.bb
@@ -13,13 +13,9 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56
SECTION = "libs"
-SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-"
-
-SRC_URI[md5sum] = "10e8f4d6a019b124088d18bc26123a25"
-SRC_URI[sha256sum] = "4ff4bd393aa01071ec7b849d035508a505a78f88b2bcf25ff11e58e43c0b9def"
-
-S = "${WORKDIR}/freetype-${PV}"
+SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2"
+SRC_URI[md5sum] = "d6b60f06bfc046e43ab2a6cbfd171d65"
+SRC_URI[sha256sum] = "c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e"
inherit autotools-brokensep pkgconfig binconfig multilib_header
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 4/5] freetype: upgrade to 2.5.3
2014-05-07 16:05 ` [PATCH 4/5] freetype: upgrade to 2.5.3 Ross Burton
@ 2014-05-07 18:04 ` Saul Wold
0 siblings, 0 replies; 9+ messages in thread
From: Saul Wold @ 2014-05-07 18:04 UTC (permalink / raw)
To: Ross Burton, openembedded-core
On 05/07/2014 09:05 AM, Ross Burton wrote:
> Also drop the redundant definition of S.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> .../freetype/{freetype_2.5.2.bb => freetype_2.5.3.bb} | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
> rename meta/recipes-graphics/freetype/{freetype_2.5.2.bb => freetype_2.5.3.bb} (89%)
>
> diff --git a/meta/recipes-graphics/freetype/freetype_2.5.2.bb b/meta/recipes-graphics/freetype/freetype_2.5.3.bb
> similarity index 89%
> rename from meta/recipes-graphics/freetype/freetype_2.5.2.bb
> rename to meta/recipes-graphics/freetype/freetype_2.5.3.bb
> index 0c62a67..7182c21 100644
> --- a/meta/recipes-graphics/freetype/freetype_2.5.2.bb
> +++ b/meta/recipes-graphics/freetype/freetype_2.5.3.bb
> @@ -13,13 +13,9 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56
>
> SECTION = "libs"
>
> -SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
> -"
> -
> -SRC_URI[md5sum] = "10e8f4d6a019b124088d18bc26123a25"
> -SRC_URI[sha256sum] = "4ff4bd393aa01071ec7b849d035508a505a78f88b2bcf25ff11e58e43c0b9def"
> -
> -S = "${WORKDIR}/freetype-${PV}"
>
> +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2"
> +SRC_URI[md5sum] = "d6b60f06bfc046e43ab2a6cbfd171d65"
> +SRC_URI[sha256sum] = "c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e"
>
> inherit autotools-brokensep pkgconfig binconfig multilib_header
>
>
Hmm, something else went wrong:
> /srv/hdd/builds/world/tmp/sysroots/x86_64-linux/lib -Wl,-O1 -L/srv/hdd/builds/world/tmp/sysroots/x86_64-linux/usr/lib -lharfbuzz -no-undefined
>> | /bin/grep: /srv/hdd/builds/world/tmp/sysroots/x86_64-linux/usr/lib/libfreetype.la: No such file or directory
>> | sed: can't read /srv/hdd/builds/world/tmp/sysroots/x86_64-linux/usr/lib/libfreetype.la: No such file or directory
>> | libtool: error: '/srv/hdd/builds/world/tmp/sysroots/x86_64-linux/usr/lib/libfreetype.la' is not a valid libtool archive
>> | make: *** [/srv/hdd/builds/world/tmp/work/x86_64-linux/freetype-native/2.5.3-r0/freetype-2.5.3/objs/libfreetype.la] Error 1
>> | ERROR: oe_runmake failed
>> | WARNING: /srv/hdd/builds/world/tmp/work/x86_64-linux/freetype-native/2.5.3-r0/temp/run.do_compile.28294:1 exit 1 from
>> | exit 1
>> | ERROR: Function failed: do_compile (log file is located at /srv/hdd/builds/world/tmp/work/x86_64-linux/freetype-native/2.5.3-r0/temp/log.do_compile.28294)
>
Sau!
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 5/5] gdk-pixbuf: upgrade to 2.30.7
2014-05-07 16:05 [PATCH 1/5] librsvg: upgrade to 2.40.2 Ross Burton
` (2 preceding siblings ...)
2014-05-07 16:05 ` [PATCH 4/5] freetype: upgrade to 2.5.3 Ross Burton
@ 2014-05-07 16:05 ` Ross Burton
3 siblings, 0 replies; 9+ messages in thread
From: Ross Burton @ 2014-05-07 16:05 UTC (permalink / raw)
To: openembedded-core
Drop tests-check.patch as it has been merged into this release.
License checksums updated as the FSF address was changed.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../gdk-pixbuf/gdk-pixbuf/tests-check.patch | 465 --------------------
.../{gdk-pixbuf_2.30.3.bb => gdk-pixbuf_2.30.7.bb} | 7 +-
2 files changed, 3 insertions(+), 469 deletions(-)
delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/tests-check.patch
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.30.3.bb => gdk-pixbuf_2.30.7.bb} (94%)
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/tests-check.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/tests-check.patch
deleted file mode 100644
index 31f3368..0000000
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/tests-check.patch
+++ /dev/null
@@ -1,465 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 9fa240c1ad5a815d63d8aa9126954152c2607f2e Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 25 Jan 2014 21:29:34 +0000
-Subject: Make testsuite robust against disabled formats
-
-Skip tests if their file format is not supported by the
-available loaders.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=722651
----
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index de3442e..80840c2 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -42,17 +42,57 @@ dist_installed_test_data = \
- icc-profile.png \
- $(wildcard $(srcdir)/test-images/*)
-
-+pixbuf_icc_SOURCES = \
-+ pixbuf-icc.c \
-+ test-common.c \
-+ test-common.h \
-+ $(NULL)
-+
-+pixbuf_scale_SOURCES = \
-+ pixbuf-scale.c \
-+ test-common.c \
-+ test-common.h \
-+ $(NULL)
-+
-+pixbuf_stream_SOURCES = \
-+ pixbuf-stream.c \
-+ test-common.c \
-+ test-common.h \
-+ $(NULL)
-+
-+pixbuf_threads_SOURCES = \
-+ pixbuf-threads.c \
-+ test-common.c \
-+ test-common.h \
-+ $(NULL)
-+
-+pixbuf_icon_serialize_SOURCES = \
-+ pixbuf-icon-serialize.c \
-+ test-common.c \
-+ test-common.h \
-+ $(NULL)
-+
-+pixbuf_save_SOURCES = \
-+ pixbuf-save.c \
-+ test-common.c \
-+ test-common.h \
-+ $(NULL)
-+
- pixbuf_resource_SOURCES = \
- pixbuf-resource.c \
-+ test-common.c \
-+ test-common.h \
- resources.h \
-- resources.c
-+ resources.c \
-+ $(NULL)
-
- BUILT_SOURCES += resources.h resources.c
- DISTCLEANFILES += \
- resources.h resources.c \
- pixbuf-save-options \
- pixbuf-randomly-modified-image \
-- pixbuf-save-roundtrip
-+ pixbuf-save-roundtrip \
-+ $(NULL)
-
- EXTRA_DIST += resources.gresource.xml
- TESTS_ENVIRONMENT += GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/loaders.cache
-diff --git a/tests/pixbuf-icc.c b/tests/pixbuf-icc.c
-index 9cb9c90..3b95b09 100644
---- a/tests/pixbuf-icc.c
-+++ b/tests/pixbuf-icc.c
-@@ -22,6 +22,7 @@
-
- #include "config.h"
- #include "gdk-pixbuf/gdk-pixbuf.h"
-+#include "test-common.h"
-
- static void
- test_incremental (gconstpointer data)
-@@ -34,7 +35,12 @@ test_incremental (gconstpointer data)
- gchar *contents;
- gsize size;
-
--
-+ if (!format_supported (filename))
-+ {
-+ g_test_skip ("format not supported");
-+ return;
-+ }
-+
- g_file_get_contents (g_test_get_filename (G_TEST_DIST, filename, NULL), &contents, &size, &error);
- g_assert_no_error (error);
-
-@@ -62,6 +68,12 @@ test_nonincremental (gconstpointer data)
- GdkPixbuf *pixbuf;
- const gchar *profile;
-
-+ if (!format_supported (filename))
-+ {
-+ g_test_skip ("format not supported");
-+ return;
-+ }
-+
- pixbuf = gdk_pixbuf_new_from_file (g_test_get_filename (G_TEST_DIST, filename, NULL), &error);
- g_assert_no_error (error);
-
-diff --git a/tests/pixbuf-icon-serialize.c b/tests/pixbuf-icon-serialize.c
-index 20bf6e1..880c654 100644
---- a/tests/pixbuf-icon-serialize.c
-+++ b/tests/pixbuf-icon-serialize.c
-@@ -1,5 +1,6 @@
- #include "config.h"
- #include "gdk-pixbuf/gdk-pixbuf.h"
-+#include "test-common.h"
- #include <string.h>
- #include <glib.h>
-
-@@ -13,6 +14,12 @@ test_serialize (void)
- GIcon *icon;
- GInputStream *stream;
-
-+ if (!format_supported ("png"))
-+ {
-+ g_test_skip ("format not supported");
-+ return;
-+ }
-+
- pixbuf = gdk_pixbuf_new_from_file (g_test_get_filename (G_TEST_DIST, "test-image.png", NULL), &error);
- g_assert_no_error (error);
- g_assert (pixbuf != NULL);
-diff --git a/tests/pixbuf-resource.c b/tests/pixbuf-resource.c
-index a747bca..aa0bed8 100644
---- a/tests/pixbuf-resource.c
-+++ b/tests/pixbuf-resource.c
-@@ -22,6 +22,7 @@
-
- #include "config.h"
- #include "gdk-pixbuf/gdk-pixbuf.h"
-+#include "test-common.h"
- #include <string.h>
-
- #define compare_option(p1, p2, key) \
-@@ -77,6 +78,12 @@ test_resource (void)
- GError *error = NULL;
- GdkPixbuf *pixbuf, *ref;
-
-+ if (!format_supported ("png"))
-+ {
-+ g_test_skip ("format not supported");
-+ return;
-+ }
-+
- path = g_test_get_filename (G_TEST_DIST, "icc-profile.png", NULL);
- ref = gdk_pixbuf_new_from_file (path, &error);
- g_assert_no_error (error);
-@@ -111,6 +118,12 @@ test_resource_at_scale (void)
- GError *error = NULL;
- GdkPixbuf *pixbuf, *ref;
-
-+ if (!format_supported ("png"))
-+ {
-+ g_test_skip ("format not supported");
-+ return;
-+ }
-+
- path = g_test_get_filename (G_TEST_DIST, "icc-profile.png", NULL);
- ref = gdk_pixbuf_new_from_file_at_scale (path, 40, 10, FALSE, &error);
- g_assert_no_error (error);
-diff --git a/tests/pixbuf-save.c b/tests/pixbuf-save.c
-index f7df29b..78ab288 100644
---- a/tests/pixbuf-save.c
-+++ b/tests/pixbuf-save.c
-@@ -21,6 +21,7 @@
- */
-
- #include "gdk-pixbuf/gdk-pixbuf.h"
-+#include "test-common.h"
- #include <string.h>
-
- #define compare_option(p1, p2, key) \
-@@ -76,6 +77,12 @@ test_save_roundtrip (void)
- GdkPixbuf *ref;
- GdkPixbuf *pixbuf;
-
-+ if (!format_supported ("png"))
-+ {
-+ g_test_skip ("format not supported");
-+ return;
-+ }
-+
- ref = gdk_pixbuf_new_from_file (g_test_get_filename (G_TEST_DIST, "test-image.png", NULL), &error);
- g_assert_no_error (error);
-
-@@ -98,6 +105,12 @@ test_save_options (void)
- GdkPixbuf *pixbuf;
- GError *error = NULL;
-
-+ if (!format_supported ("png"))
-+ {
-+ g_test_skip ("format not supported");
-+ return;
-+ }
-+
- ref = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 10, 10);
- gdk_pixbuf_fill (ref, 0xff00ff00);
-
-diff --git a/tests/pixbuf-scale.c b/tests/pixbuf-scale.c
-index 4fd9fd5..d57e56a 100644
---- a/tests/pixbuf-scale.c
-+++ b/tests/pixbuf-scale.c
-@@ -22,6 +22,7 @@
-
- #include "config.h"
- #include "gdk-pixbuf/gdk-pixbuf.h"
-+#include "test-common.h"
-
- static void
- test_scale (gconstpointer data)
-@@ -33,6 +34,12 @@ test_scale (gconstpointer data)
- GdkPixbuf *pixbuf;
- gint width, height;
-
-+ if (!format_supported (filename))
-+ {
-+ g_test_skip ("format not supported");
-+ return;
-+ }
-+
- path = g_test_get_filename (G_TEST_DIST, filename, NULL);
- ref = gdk_pixbuf_new_from_file (path, &error);
- g_assert_no_error (error);
-diff --git a/tests/pixbuf-stream.c b/tests/pixbuf-stream.c
-index 0c2cebe..d66ce3e 100644
---- a/tests/pixbuf-stream.c
-+++ b/tests/pixbuf-stream.c
-@@ -22,6 +22,7 @@
-
- #include "config.h"
- #include "gdk-pixbuf/gdk-pixbuf.h"
-+#include "test-common.h"
- #include <string.h>
-
- #define compare_option(p1, p2, key) \
-@@ -71,6 +72,12 @@ test_stream (gconstpointer data)
- GFile *file;
- GInputStream *stream;
-
-+ if (!format_supported (filename))
-+ {
-+ g_test_skip ("format not supported");
-+ return;
-+ }
-+
- path = g_test_get_filename (G_TEST_DIST, filename, NULL);
- ref = gdk_pixbuf_new_from_file (path, &error);
- g_assert_no_error (error);
-@@ -116,6 +123,12 @@ test_stream_async (gconstpointer data)
- gsize size;
- GInputStream *stream;
-
-+ if (!format_supported (filename))
-+ {
-+ g_test_skip ("format not supported");
-+ return;
-+ }
-+
- path = g_test_get_filename (G_TEST_DIST, filename, NULL);
- ref = gdk_pixbuf_new_from_file (path, &error);
- g_assert_no_error (error);
-@@ -138,6 +151,12 @@ test_stream_at_scale (gconstpointer data)
- GFile *file;
- GInputStream *stream;
-
-+ if (!format_supported (filename))
-+ {
-+ g_test_skip ("format not supported");
-+ return;
-+ }
-+
- path = g_test_get_filename (G_TEST_DIST, filename, NULL);
- ref = gdk_pixbuf_new_from_file_at_scale (path, 20, 30, TRUE, &error);
- g_assert_no_error (error);
-@@ -167,6 +186,12 @@ test_stream_at_scale_async (gconstpointer data)
- gsize size;
- GInputStream *stream;
-
-+ if (!format_supported (filename))
-+ {
-+ g_test_skip ("format not supported");
-+ return;
-+ }
-+
- path = g_test_get_filename (G_TEST_DIST, filename, NULL);
- ref = gdk_pixbuf_new_from_file_at_scale (path, 40, 10, FALSE, &error);
- g_assert_no_error (error);
-diff --git a/tests/pixbuf-threads.c b/tests/pixbuf-threads.c
-index 5eeb9dd..f2694fd 100644
---- a/tests/pixbuf-threads.c
-+++ b/tests/pixbuf-threads.c
-@@ -18,7 +18,9 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include "config.h"
- #include "gdk-pixbuf/gdk-pixbuf.h"
-+#include "test-common.h"
-
- static void
- load_image (gpointer data,
-@@ -71,15 +73,24 @@ test_threads (void)
-
- for (i = 0; i < iterations; i++)
- {
-- g_thread_pool_push (pool, "valid_jpeg_test", NULL);
-- g_thread_pool_push (pool, "valid_png_test", NULL);
-- g_thread_pool_push (pool, "valid_gif_test", NULL);
-- g_thread_pool_push (pool, "valid_bmp_test", NULL);
-- g_thread_pool_push (pool, "valid_jpeg_progressive_test", NULL);
-- g_thread_pool_push (pool, "valid_xpm_test", NULL);
-- g_thread_pool_push (pool, "valid_ras_test", NULL);
-- g_thread_pool_push (pool, "valid_tga_test", NULL);
-- g_thread_pool_push (pool, "valid_tiff1_test", NULL);
-+ if (format_supported ("jpeg"))
-+ g_thread_pool_push (pool, "valid_jpeg_test", NULL);
-+ if (format_supported ("png"))
-+ g_thread_pool_push (pool, "valid_png_test", NULL);
-+ if (format_supported ("gif"))
-+ g_thread_pool_push (pool, "valid_gif_test", NULL);
-+ if (format_supported ("bmp"))
-+ g_thread_pool_push (pool, "valid_bmp_test", NULL);
-+ if (format_supported ("jpeg"))
-+ g_thread_pool_push (pool, "valid_jpeg_progressive_test", NULL);
-+ if (format_supported ("xpm"))
-+ g_thread_pool_push (pool, "valid_xpm_test", NULL);
-+ if (format_supported ("ras"))
-+ g_thread_pool_push (pool, "valid_ras_test", NULL);
-+ if (format_supported ("tga"))
-+ g_thread_pool_push (pool, "valid_tga_test", NULL);
-+ if (format_supported ("tiff"))
-+ g_thread_pool_push (pool, "valid_tiff1_test", NULL);
- }
-
- g_thread_pool_free (pool, FALSE, TRUE);
-diff --git a/tests/test-common.c b/tests/test-common.c
-new file mode 100644
-index 0000000..c7673e3
---- /dev/null
-+++ b/tests/test-common.c
-@@ -0,0 +1,65 @@
-+/* -*- Mode: C; c-basic-offset: 2; -*- */
-+/* GdkPixbuf library - test loaders
-+ *
-+ * Copyright (C) 2014 Red Hat, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * Author: Matthias Clasen
-+ */
-+
-+#include "config.h"
-+#include "test-common.h"
-+#include "gdk-pixbuf/gdk-pixbuf.h"
-+
-+#include <string.h>
-+
-+gboolean
-+format_supported (const gchar *filename)
-+{
-+ const gchar *name = NULL;
-+ GSList *formats, *l;
-+ gboolean retval;
-+ const gchar *names[] = { "png", "jpeg", "bmp", "gif", "ras",
-+ "tga", "xpm", "xbm" };
-+ gint i;
-+
-+ for (i = 0; i < G_N_ELEMENTS (names); i++)
-+ {
-+ if (strstr (filename, names[i]))
-+ {
-+ name = names[i];
-+ break;
-+ }
-+ }
-+ if (name == NULL)
-+ return FALSE;
-+
-+ retval = FALSE;
-+ formats = gdk_pixbuf_get_formats ();
-+ for (l = formats; l; l = l->next)
-+ {
-+ GdkPixbufFormat *format = l->data;
-+
-+ if (g_str_equal (gdk_pixbuf_format_get_name (format), name))
-+ {
-+ retval = TRUE;
-+ break;
-+ }
-+ }
-+ g_slist_free (formats);
-+
-+ return retval;
-+}
-diff --git a/tests/test-common.h b/tests/test-common.h
-new file mode 100644
-index 0000000..32ff35a
---- /dev/null
-+++ b/tests/test-common.h
-@@ -0,0 +1,33 @@
-+/* -*- Mode: C; c-basic-offset: 2; -*- */
-+/* GdkPixbuf library - test loaders
-+ *
-+ * Copyright (C) 2014 Red Hat, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * Author: Matthias Clasen
-+ */
-+
-+#ifndef __TEST_COMMON_H__
-+
-+#include <glib.h>
-+
-+G_BEGIN_DECLS
-+
-+gboolean format_supported (const gchar *filename);
-+
-+G_END_DECLS
-+
-+#endif /* __TEST_COMMON_H__ */
---
-cgit v0.9.2
\ No newline at end of file
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.7.bb
similarity index 94%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.7.bb
index 19848b5..a9d1eed 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.7.bb
@@ -4,7 +4,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
- file://gdk-pixbuf/gdk-pixbuf.h;endline=26;md5=5066b71daefeff678494fffa3040aba9"
+ file://gdk-pixbuf/gdk-pixbuf.h;endline=26;md5=72b39da7cbdde2e665329fef618e1d6b"
SECTION = "libs"
@@ -17,12 +17,11 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://hardcoded_libtool.patch \
file://extending-libinstall-dependencies.patch \
file://run-ptest \
- file://tests-check.patch \
file://fatal-loader.patch \
"
-SRC_URI[md5sum] = "81161cc895eb43afd9ae7354b87e2261"
-SRC_URI[sha256sum] = "c229c53f59573eab9410b53690a4b9db770312c80a4d84ecd6295aa894574494"
+SRC_URI[md5sum] = "1195d26f14adfe99ff0878d37678a70a"
+SRC_URI[sha256sum] = "0aafc365eab1083a53f15e4828333b968219ffcb1a995ac6289c0147c9ffad06"
inherit autotools pkgconfig gettext pixbufcache ptest
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread