summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-05-12 13:14:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-13 19:32:03 +0100
commit95579958c7ce90f9ca16f12524c9319b6a9dad98 (patch)
treeeab9fcadff34d6a9a235bc1929c42e574a1630d4 /meta
parentd5958a9d13be0c7e521ad08b70dedddcfade6ff0 (diff)
downloadpoky-95579958c7ce90f9ca16f12524c9319b6a9dad98.tar.gz
glib-2.0: upgrade to 2.40.0
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. (From OE-Core rev: b755139b8112b425ff0a21f121104b7d212e7143) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch56
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch54
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/gtest-skip-fixes.patch197
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/ptest-dbus.patch65
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.38.2.bb)8
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc4
6 files changed, 4 insertions, 380 deletions
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 9b87d9d547..0000000000
--- 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 @@
1From 0167c3340d8201dca8e9031b61703bbc5ed6ce33 Mon Sep 17 00:00:00 2001
2From: Jan Schmidt <thaytan@noraisin.net>
3Date: Wed, 25 Sep 2013 19:22:26 +1000
4Subject: [PATCH] gio: Fix -Werror format string errors from mismatched ints.
5
6Upstream-Status: Backport
7
8---
9 gio/gdbusmessage.c | 8 ++++----
10 gio/gdbusprivate.c | 4 ++--
11 2 files changed, 6 insertions(+), 6 deletions(-)
12
13diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
14index ac233a3..ad77aa6 100644
15--- a/gio/gdbusmessage.c
16+++ b/gio/gdbusmessage.c
17@@ -3468,10 +3468,10 @@ g_dbus_message_print (GDBusMessage *message,
18 statbuf.st_mode);
19 g_string_append_printf (fs, "%s" "ino=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
20 (guint64) statbuf.st_ino);
21- g_string_append_printf (fs, "%s" "uid=%d", fs->len > 0 ? "," : "",
22- statbuf.st_uid);
23- g_string_append_printf (fs, "%s" "gid=%d", fs->len > 0 ? "," : "",
24- statbuf.st_gid);
25+ g_string_append_printf (fs, "%s" "uid=%u", fs->len > 0 ? "," : "",
26+ (guint) statbuf.st_uid);
27+ g_string_append_printf (fs, "%s" "gid=%u", fs->len > 0 ? "," : "",
28+ (guint) statbuf.st_gid);
29 g_string_append_printf (fs, "%s" "rdev=%d:%d", fs->len > 0 ? "," : "",
30 major (statbuf.st_rdev), minor (statbuf.st_rdev));
31 g_string_append_printf (fs, "%s" "size=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
32diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
33index 0e5bef2..785a0c0 100644
34--- a/gio/gdbusprivate.c
35+++ b/gio/gdbusprivate.c
36@@ -2155,7 +2155,7 @@ write_message_print_transport_debug (gssize bytes_written,
37 _g_dbus_debug_print_lock ();
38 g_print ("========================================================================\n"
39 "GDBus-debug:Transport:\n"
40- " >>>> WROTE %" G_GSIZE_FORMAT " bytes of message with serial %d and\n"
41+ " >>>> WROTE %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n"
42 " size %" G_GSIZE_FORMAT " from offset %" G_GSIZE_FORMAT " on a %s\n",
43 bytes_written,
44 g_dbus_message_get_serial (data->message),
45@@ -2206,7 +2206,7 @@ read_message_print_transport_debug (gssize bytes_read,
46 _g_dbus_debug_print_lock ();
47 g_print ("========================================================================\n"
48 "GDBus-debug:Transport:\n"
49- " <<<< READ %" G_GSIZE_FORMAT " bytes of message with serial %d and\n"
50+ " <<<< READ %" G_GSSIZE_FORMAT " bytes of message with serial %d and\n"
51 " size %d to offset %" G_GSIZE_FORMAT " from a %s\n",
52 bytes_read,
53 serial,
54--
551.8.3.1
56
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 720ea6c328..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From a047a0270ee5faf1d9d6080cbc613defdf52baea Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Tue, 4 Feb 2014 13:15:08 +0000
7Subject: [PATCH] gio/tests: fix race when generating code
8
9There is a race condition in the makefile that can result in build failures like this in parallel builds:
10
11| ./gdbus-test-codegen-generated.h:7:0: error: unterminated #ifndef
12| #ifndef __GDBUS_TEST_CODEGEN_GENERATED_H__
13
14This is because a rule like this:
15
16x.c x.h: prerequisites
17 @commands
18
19doesn't consider x.c and x.h together. Instead, it expands to two rules, one to
20generate x.c and one to generate x.h, which happen to run the same commands. In
21the worst case they execute in parallel, overwriting each other's output.
22
23Signed-off-by: Ross Burton <ross.burton@intel.com>
24
25https://bugzilla.gnome.org/show_bug.cgi?id=723616
26---
27 gio/tests/Makefile.am | 4 +++-
28 1 file changed, 3 insertions(+), 1 deletion(-)
29
30diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
31index 0beb239..270faf6 100644
32--- a/gio/tests/Makefile.am
33+++ b/gio/tests/Makefile.am
34@@ -436,7 +436,7 @@ gmenumodel_SOURCES = $(gdbus_sessionbus_sources) gmenumode
35 gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotification.c gnotification-server.h gnotification-server.c
36
37 gdbus-test-codegen.o: gdbus-test-codegen-generated.h
38-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
39+gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
40 $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
41 UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
42 $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
43@@ -455,6 +455,8 @@ gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml
44 --annotate "org.project.Bar::TestSignal[array_of_strings]" Key8 Value8 \
45 $(srcdir)/test-codegen.xml \
46 $(NULL)
47+gdbus-test-codegen-generated.c: gdbus-test-codegen-generated.h
48+ @: # Generated as side-effect of .h
49
50 EXTRA_DIST += test-codegen.xml
51 CLEANFILES += gdbus-test-codegen-generated.[ch] gdbus-test-codegen-generated-doc-*.xml
52--
531.7.10.4
54
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 3dba0ee31b..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/gtest-skip-fixes.patch
+++ /dev/null
@@ -1,197 +0,0 @@
1Fix the handling of skipped tests so that it follows what automake does.
2
3Upstream-Status: Backport [https://bugzilla.gnome.org/show_bug.cgi?id=720263]
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6diff --git a/glib/gtestutils.c b/glib/gtestutils.c
7index bc7bbcf..feaafa3 100644
8--- a/glib/gtestutils.c
9+++ b/glib/gtestutils.c
10@@ -607,9 +607,10 @@ static gchar *test_run_name = "";
11 static GSList **test_filename_free_list;
12 static guint test_run_forks = 0;
13 static guint test_run_count = 0;
14+static guint test_skipped_count = 0;
15 static GTestResult test_run_success = G_TEST_RUN_FAILURE;
16 static gchar *test_run_msg = NULL;
17-static guint test_skip_count = 0;
18+static guint test_startup_skip_count = 0;
19 static GTimer *test_user_timer = NULL;
20 static double test_user_stamp = 0;
21 static GSList *test_paths = NULL;
22@@ -765,6 +766,8 @@ g_test_log (GTestLogType lbit,
23 g_print ("Bail out!\n");
24 abort();
25 }
26+ if (largs[0] == G_TEST_RUN_SKIPPED)
27+ test_skipped_count++;
28 break;
29 case G_TEST_LOG_MIN_RESULT:
30 if (test_tap_log)
31@@ -869,11 +872,11 @@ parse_args (gint *argc_p,
32 {
33 gchar *equal = argv[i] + 16;
34 if (*equal == '=')
35- test_skip_count = g_ascii_strtoull (equal + 1, NULL, 0);
36+ test_startup_skip_count = g_ascii_strtoull (equal + 1, NULL, 0);
37 else if (i + 1 < argc)
38 {
39 argv[i++] = NULL;
40- test_skip_count = g_ascii_strtoull (argv[i], NULL, 0);
41+ test_startup_skip_count = g_ascii_strtoull (argv[i], NULL, 0);
42 }
43 argv[i] = NULL;
44 }
45@@ -1516,14 +1519,21 @@ g_test_get_root (void)
46 * g_test_run_suite() or g_test_run() may only be called once
47 * in a program.
48 *
49- * Returns: 0 on success
50+ * Returns: 0 on success, 1 on failure (assuming it returns at all),
51+ * 77 if all tests were skipped with g_test_skip().
52 *
53 * Since: 2.16
54 */
55 int
56 g_test_run (void)
57 {
58- return g_test_run_suite (g_test_get_root());
59+ if (g_test_run_suite (g_test_get_root()) != 0)
60+ return 1;
61+
62+ if (test_run_count > 0 && test_run_count == test_skipped_count)
63+ return 77;
64+ else
65+ return 0;
66 }
67
68 /**
69@@ -2063,7 +2073,7 @@ test_case_run (GTestCase *tc)
70 }
71 }
72
73- if (++test_run_count <= test_skip_count)
74+ if (++test_run_count <= test_startup_skip_count)
75 g_test_log (G_TEST_LOG_SKIP_CASE, test_run_name, NULL, 0, NULL);
76 else if (test_run_list)
77 {
78@@ -2117,7 +2127,8 @@ test_case_run (GTestCase *tc)
79 g_free (test_uri_base);
80 test_uri_base = old_base;
81
82- return success == G_TEST_RUN_SUCCESS;
83+ return (success == G_TEST_RUN_SUCCESS ||
84+ success == G_TEST_RUN_SKIPPED);
85 }
86
87 static int
88diff --git a/glib/tests/testing.c b/glib/tests/testing.c
89index 20c2e79..1025f12 100644
90--- a/glib/tests/testing.c
91+++ b/glib/tests/testing.c
92@@ -575,10 +575,93 @@ test_nonfatal (void)
93 g_test_trap_assert_stdout ("*The End*");
94 }
95
96+static void
97+test_skip (void)
98+{
99+ g_test_skip ("Skipped should count as passed, not failed");
100+}
101+
102+static void
103+test_pass (void)
104+{
105+}
106+
107+static const char *argv0;
108+
109+static void
110+test_skip_all (void)
111+{
112+ GPtrArray *argv;
113+ GError *error = NULL;
114+ int status;
115+
116+ argv = g_ptr_array_new ();
117+ g_ptr_array_add (argv, (char *) argv0);
118+ g_ptr_array_add (argv, "--GTestSubprocess");
119+ g_ptr_array_add (argv, "-p");
120+ g_ptr_array_add (argv, "/misc/skip");
121+ g_ptr_array_add (argv, NULL);
122+
123+ g_spawn_sync (NULL, (char **) argv->pdata, NULL,
124+ G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
125+ NULL, NULL, NULL, NULL, &status,
126+ &error);
127+ g_assert_no_error (error);
128+
129+ g_spawn_check_exit_status (status, &error);
130+ g_assert_error (error, G_SPAWN_EXIT_ERROR, 77);
131+ g_clear_error (&error);
132+
133+ g_ptr_array_set_size (argv, 0);
134+ g_ptr_array_add (argv, (char *) argv0);
135+ g_ptr_array_add (argv, "--GTestSubprocess");
136+ g_ptr_array_add (argv, "-p");
137+ g_ptr_array_add (argv, "/misc/skip");
138+ g_ptr_array_add (argv, "-p");
139+ g_ptr_array_add (argv, "/misc/skip-all/subprocess/skip1");
140+ g_ptr_array_add (argv, "-p");
141+ g_ptr_array_add (argv, "/misc/skip-all/subprocess/skip2");
142+ g_ptr_array_add (argv, NULL);
143+
144+ g_spawn_sync (NULL, (char **) argv->pdata, NULL,
145+ G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
146+ NULL, NULL, NULL, NULL, &status,
147+ &error);
148+ g_assert_no_error (error);
149+
150+ g_spawn_check_exit_status (status, &error);
151+ g_assert_error (error, G_SPAWN_EXIT_ERROR, 77);
152+ g_clear_error (&error);
153+
154+ g_ptr_array_set_size (argv, 0);
155+ g_ptr_array_add (argv, (char *) argv0);
156+ g_ptr_array_add (argv, "--GTestSubprocess");
157+ g_ptr_array_add (argv, "-p");
158+ g_ptr_array_add (argv, "/misc/skip");
159+ g_ptr_array_add (argv, "-p");
160+ g_ptr_array_add (argv, "/misc/skip-all/subprocess/pass");
161+ g_ptr_array_add (argv, "-p");
162+ g_ptr_array_add (argv, "/misc/skip-all/subprocess/skip1");
163+ g_ptr_array_add (argv, NULL);
164+
165+ g_spawn_sync (NULL, (char **) argv->pdata, NULL,
166+ G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
167+ NULL, NULL, NULL, NULL, &status,
168+ &error);
169+ g_assert_no_error (error);
170+
171+ g_spawn_check_exit_status (status, &error);
172+ g_assert_no_error (error);
173+
174+ g_ptr_array_unref (argv);
175+}
176+
177 int
178 main (int argc,
179 char *argv[])
180 {
181+ argv0 = argv[0];
182+
183 g_test_init (&argc, &argv, NULL);
184
185 g_test_add_func ("/random-generator/rand-1", test_rand1);
186@@ -633,5 +716,11 @@ main (int argc,
187
188 g_test_add_func ("/misc/nonfatal", test_nonfatal);
189
190+ g_test_add_func ("/misc/skip", test_skip);
191+ g_test_add_func ("/misc/skip-all", test_skip_all);
192+ g_test_add_func ("/misc/skip-all/subprocess/skip1", test_skip);
193+ g_test_add_func ("/misc/skip-all/subprocess/skip2", test_skip);
194+ g_test_add_func ("/misc/skip-all/subprocess/pass", test_pass);
195+
196 return g_test_run();
197 }
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 0db8fd1609..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/ptest-dbus.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1Fix dbus-appinfo from attempting to use the session's bus, and hanging if there
2isn't one present.
3
4Upstream-Status: Backport
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7From 940fa98290812789d095d93ff1c550cd86fb2428 Mon Sep 17 00:00:00 2001
8From: Xavier Claessens <xavier.claessens@collabora.co.uk>
9Date: Mon, 28 Oct 2013 21:18:54 +0000
10Subject: Tests: add session_bus_run() and use it where possible
11
12This is to avoid having again the subtil bug in dbus-appinfo.c:
13session_bus_down() was called before g_test_run() so the test was
14running on the user's dbus session.
15
16https://bugzilla.gnome.org/show_bug.cgi?id=697348
17---
18diff --git a/gio/tests/dbus-appinfo.c b/gio/tests/dbus-appinfo.c
19index ca11e98..7698429 100644
20--- a/gio/tests/dbus-appinfo.c
21+++ b/gio/tests/dbus-appinfo.c
22@@ -280,11 +280,7 @@ main (int argc, char **argv)
23 {
24 g_test_init (&argc, &argv, NULL);
25
26- session_bus_up ();
27-
28 g_test_add_func ("/appinfo/dbusappinfo", test_dbus_appinfo);
29
30- session_bus_down ();
31-
32- return g_test_run ();
33+ return session_bus_run ();
34 }
35diff --git a/gio/tests/gdbus-sessionbus.c b/gio/tests/gdbus-sessionbus.c
36index 68c4449..13c2edb 100644
37--- a/gio/tests/gdbus-sessionbus.c
38+++ b/gio/tests/gdbus-sessionbus.c
39@@ -47,3 +47,14 @@ session_bus_down (void)
40 g_clear_object (&singleton);
41 }
42
43+gint
44+session_bus_run (void)
45+{
46+ gint ret;
47+
48+ session_bus_up ();
49+ ret = g_test_run ();
50+ session_bus_down ();
51+
52+ return ret;
53+}
54diff --git a/gio/tests/gdbus-sessionbus.h b/gio/tests/gdbus-sessionbus.h
55index 7ef3abd..284cd00 100644
56--- a/gio/tests/gdbus-sessionbus.h
57+++ b/gio/tests/gdbus-sessionbus.h
58@@ -30,6 +30,7 @@ G_BEGIN_DECLS
59 void session_bus_up (void);
60 void session_bus_stop (void);
61 void session_bus_down (void);
62+gint session_bus_run (void);
63
64 G_END_DECLS
65
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
index 40529503ba..3be126faef 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 \
10 file://add-march-i486-into-CFLAGS-automatically.patch \ 10 file://add-march-i486-into-CFLAGS-automatically.patch \
11 file://glib-2.0-configure-readlink.patch \ 11 file://glib-2.0-configure-readlink.patch \
12 file://run-ptest \ 12 file://run-ptest \
13 file://0001-gio-Fix-Werror-format-string-errors-from-mismatched-.patch \
14 file://ptest-dbus.patch \
15 file://ptest-paths.patch \ 13 file://ptest-paths.patch \
16 file://gtest-skip-fixes.patch \
17 file://gio-test-race.patch \
18 file://uclibc.patch \ 14 file://uclibc.patch \
19 " 15 "
20 16
21SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" 17SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
22 18
23SRC_URI[md5sum] = "26d1d08e478fc48c181ca8be44f5b69f" 19SRC_URI[md5sum] = "05fb7cb17eacbc718e90366a1eae60d9"
24SRC_URI[sha256sum] = "056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734" 20SRC_URI[sha256sum] = "0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 65c83e9e55..6a47bbc08e 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
4# docs/reference/COPYING is with a 'public domai'-like license! 4# docs/reference/COPYING is with a 'public domai'-like license!
5LICENSE = "LGPLv2+ & BSD & PD" 5LICENSE = "LGPLv2+ & BSD & PD"
6LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
7 file://glib/glib.h;beginline=4;endline=17;md5=62b7bd0d17b98573dfb87495ac1c5b4c \ 7 file://glib/glib.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \
8 file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ 8 file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
9 file://gmodule/gmodule.h;beginline=4;endline=17;md5=62b7bd0d17b98573dfb87495ac1c5b4c \ 9 file://gmodule/gmodule.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \
10 file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ 10 file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \
11 file://glib/pcre/pcre.h;beginline=11;endline=35;md5=de27f2bf633d20a2b7af0b1983423283 \ 11 file://glib/pcre/pcre.h;beginline=11;endline=35;md5=de27f2bf633d20a2b7af0b1983423283 \
12 file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" 12 file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc"