diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2018-07-12 19:27:23 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-07-14 11:28:12 -0700 |
commit | e8c2ef638ff7c0c18eaeac36b87779e38739582c (patch) | |
tree | 977654a2b80ba96713560cdd79d2a5c1de1bcaf8 /meta-oe/recipes-core/glib-2.0 | |
parent | 1bc94ef4b33af542167abafe804e5c8856369319 (diff) | |
download | meta-openembedded-e8c2ef638ff7c0c18eaeac36b87779e38739582c.tar.gz |
glibmm: Upgrade to 2.56.0
* Remove the backported patch 0001-Glib-Threads-Private-Fix-gobj.patch
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-core/glib-2.0')
-rw-r--r-- | meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch | 40 | ||||
-rw-r--r-- | meta-oe/recipes-core/glib-2.0/glibmm_2.56.0.bb (renamed from meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb) | 5 |
2 files changed, 2 insertions, 43 deletions
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch b/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch deleted file mode 100644 index 7899022f1..000000000 --- a/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 838fe84c2ddcc9af51c34f751defbf3dd0ba8a06 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kjell Ahlstedt <kjellahlstedt@gmail.com> | ||
3 | Date: Wed, 20 Dec 2017 20:00:32 +0100 | ||
4 | Subject: [PATCH] Glib::Threads::Private: Fix gobj() | ||
5 | |||
6 | Bug 791711 | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Upstream-Status: Backport [https://github.com/GNOME/glibmm/commit/37d57ae9572b7d74aa385a30313eceae7f2d3fce] | ||
11 | glib/glibmm/threads.h | 2 +- | ||
12 | glib/src/threads.hg | 2 +- | ||
13 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/glib/glibmm/threads.h b/glib/glibmm/threads.h | ||
16 | index f7e2b82a..2c0cbe8c 100644 | ||
17 | --- a/glib/glibmm/threads.h | ||
18 | +++ b/glib/glibmm/threads.h | ||
19 | @@ -657,7 +657,7 @@ public: | ||
20 | */ | ||
21 | inline void replace(T* data); | ||
22 | |||
23 | - GPrivate* gobj() { return gobject_; } | ||
24 | + GPrivate* gobj() { return &gobject_; } | ||
25 | |||
26 | private: | ||
27 | GPrivate gobject_; | ||
28 | diff --git a/glib/src/threads.hg b/glib/src/threads.hg | ||
29 | index 86d7a17b..c82a6130 100644 | ||
30 | --- a/glib/src/threads.hg | ||
31 | +++ b/glib/src/threads.hg | ||
32 | @@ -628,7 +628,7 @@ public: | ||
33 | */ | ||
34 | inline void replace(T* data); | ||
35 | |||
36 | - GPrivate* gobj() { return gobject_; } | ||
37 | + GPrivate* gobj() { return &gobject_; } | ||
38 | |||
39 | private: | ||
40 | GPrivate gobject_; | ||
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.56.0.bb index 4706432ab..2f048d2f6 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.56.0.bb | |||
@@ -13,10 +13,9 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | |||
13 | SRC_URI = " \ | 13 | SRC_URI = " \ |
14 | ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \ | 14 | ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \ |
15 | file://remove-examples.patch \ | 15 | file://remove-examples.patch \ |
16 | file://0001-Glib-Threads-Private-Fix-gobj.patch \ | ||
17 | " | 16 | " |
18 | SRC_URI[md5sum] = "dee5ebe309f5976c3dacfcf5c43a062b" | 17 | SRC_URI[md5sum] = "5aa7a60084fe3e01d746c96f4a115302" |
19 | SRC_URI[sha256sum] = "7cc28c732b04d70ed34f0c923543129083cfb90580ea4a2b4be5b38802bf6a4a" | 18 | SRC_URI[sha256sum] = "6e74fcba0d245451c58fc8a196e9d103789bc510e1eee1a9b1e816c5209e79a9" |
20 | 19 | ||
21 | do_install_append() { | 20 | do_install_append() { |
22 | install -d ${D}${datadir}/glibmm-2.4 | 21 | install -d ${D}${datadir}/glibmm-2.4 |