helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-19 01:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

glibmm: Backport patch to fix invalid code in glibmm/threads.h

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj 2018-03-31 12:21:03 -07:00 committed by Armin Kuster
parent 190bec6025
commit 8b47292042
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch Normal file
View File

@ -0,0 +1,40 @@
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_;

1
meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb
View File

@ -13,6 +13,7 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
SRC_URI = " \
ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \
file://remove-examples.patch \
file://0001-Glib-Threads-Private-Fix-gobj.patch \
"
SRC_URI[md5sum] = "dee5ebe309f5976c3dacfcf5c43a062b"
SRC_URI[sha256sum] = "7cc28c732b04d70ed34f0c923543129083cfb90580ea4a2b4be5b38802bf6a4a"