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/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch | |
parent | 1bc94ef4b33af542167abafe804e5c8856369319 (diff) | |
download | meta-openembedded-contrib-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/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch')
-rw-r--r-- | meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch | 40 |
1 files changed, 0 insertions, 40 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 7899022f11..0000000000 --- a/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 838fe84c2ddcc9af51c34f751defbf3dd0ba8a06 Mon Sep 17 00:00:00 2001 -From: Kjell Ahlstedt <kjellahlstedt@gmail.com> -Date: Wed, 20 Dec 2017 20:00:32 +0100 -Subject: [PATCH] Glib::Threads::Private: Fix gobj() - -Bug 791711 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Backport [https://github.com/GNOME/glibmm/commit/37d57ae9572b7d74aa385a30313eceae7f2d3fce] - glib/glibmm/threads.h | 2 +- - glib/src/threads.hg | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/glib/glibmm/threads.h b/glib/glibmm/threads.h -index f7e2b82a..2c0cbe8c 100644 ---- a/glib/glibmm/threads.h -+++ b/glib/glibmm/threads.h -@@ -657,7 +657,7 @@ public: - */ - inline void replace(T* data); - -- GPrivate* gobj() { return gobject_; } -+ GPrivate* gobj() { return &gobject_; } - - private: - GPrivate gobject_; -diff --git a/glib/src/threads.hg b/glib/src/threads.hg -index 86d7a17b..c82a6130 100644 ---- a/glib/src/threads.hg -+++ b/glib/src/threads.hg -@@ -628,7 +628,7 @@ public: - */ - inline void replace(T* data); - -- GPrivate* gobj() { return gobject_; } -+ GPrivate* gobj() { return &gobject_; } - - private: - GPrivate gobject_; |