diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-05-31 14:23:10 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-03 23:46:06 +0100 |
commit | 6831ee046583df9176cd3bb28b4f562d30c6d379 (patch) | |
tree | d4052a18e03b32f19de69fac69bb1bc86ca6b2f6 /meta/recipes-core/glib-2.0/glib-2.0 | |
parent | 4f8d1e737a2cf1e4cc3ee8cda90681e401a40954 (diff) | |
download | poky-6831ee046583df9176cd3bb28b4f562d30c6d379.tar.gz |
glib-2.0: Upgrade 2.50.3 -> 2.52.2
Remove upstreamed patches (thanks Ross).
(From OE-Core rev: 2fffd85e0799deab09e32af65c524498b140749d)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch | 35 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch | 24 |
2 files changed, 0 insertions, 59 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch b/meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch deleted file mode 100644 index 1571112b0e..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | Rename 'rand' variable to avoid conflict. | ||
2 | |||
3 | Upstream-Status: pending | ||
4 | Signed-off-by: Björn Stenberg <bjst@enea.com> | ||
5 | |||
6 | diff -u glib-2.34.3/tests/refcount/signals.c~ glib-2.34.3/tests/refcount/signals.c | ||
7 | --- glib-2.34.3/tests/refcount/signals.c 2012-11-26 17:52:48.000000000 +0100 | ||
8 | +++ glib-2.34.3/tests/refcount/signals.c 2013-02-08 14:24:10.052477546 +0100 | ||
9 | @@ -9,7 +9,7 @@ | ||
10 | #define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) | ||
11 | #define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) | ||
12 | |||
13 | -static GRand *rand; | ||
14 | +static GRand *grand; | ||
15 | |||
16 | typedef struct _GTest GTest; | ||
17 | typedef struct _GTestClass GTestClass; | ||
18 | @@ -84,7 +84,7 @@ | ||
19 | NULL | ||
20 | }; | ||
21 | |||
22 | - rand = g_rand_new(); | ||
23 | + grand = g_rand_new(); | ||
24 | |||
25 | test_type = g_type_register_static (G_TYPE_OBJECT, "GTest", | ||
26 | &test_info, 0); | ||
27 | @@ -218,7 +218,7 @@ | ||
28 | static void | ||
29 | my_test_do_prop (GTest * test) | ||
30 | { | ||
31 | - test->value = g_rand_int (rand); | ||
32 | + test->value = g_rand_int (grand); | ||
33 | g_object_notify (G_OBJECT (test), "test-prop"); | ||
34 | } | ||
35 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch deleted file mode 100644 index ee435111fc..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | # an very old patch cherry-picked in every glib-2.0 patch directory. The earliest container | ||
2 | # for it is 2.6.5 in OE. The earliest commit for it is c8e5702127e507e82e6f68a4b8c546803accea9d | ||
3 | # in OE side which ports from previous bitkeeper SCM. In OE side it's only used til 2.12.4. | ||
4 | # | ||
5 | # keep it since it's always cleaner to not hardcode destination path. Use @datadir@ is more | ||
6 | # portable here. mark for upstream | ||
7 | # | ||
8 | # by Kevin Tian <kevin.tian@intel.com>, 06/25/2010 | ||
9 | # Rebased by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010 | ||
10 | |||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
13 | diff -ruN glib-2.27.3-orig/glib-gettextize.in glib-2.27.3/glib-gettextize.in | ||
14 | --- glib-2.27.3-orig/glib-gettextize.in 2009-04-01 07:04:20.000000000 +0800 | ||
15 | +++ glib-2.27.3/glib-gettextize.in 2010-11-16 12:55:06.874605916 +0800 | ||
16 | @@ -52,7 +52,7 @@ | ||
17 | datadir=@datadir@ | ||
18 | datarootdir=@datarootdir@ | ||
19 | |||
20 | -gettext_dir=$prefix/share/glib-2.0/gettext | ||
21 | +gettext_dir=@datadir@/glib-2.0/gettext | ||
22 | |||
23 | while test $# -gt 0; do | ||
24 | case "$1" in | ||