mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 07:57:27 +00:00
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>
This commit is contained in:
@@ -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_;
|
|
||||||
+2
-3
@@ -13,10 +13,9 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
|
|||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \
|
ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \
|
||||||
file://remove-examples.patch \
|
file://remove-examples.patch \
|
||||||
file://0001-Glib-Threads-Private-Fix-gobj.patch \
|
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "dee5ebe309f5976c3dacfcf5c43a062b"
|
SRC_URI[md5sum] = "5aa7a60084fe3e01d746c96f4a115302"
|
||||||
SRC_URI[sha256sum] = "7cc28c732b04d70ed34f0c923543129083cfb90580ea4a2b4be5b38802bf6a4a"
|
SRC_URI[sha256sum] = "6e74fcba0d245451c58fc8a196e9d103789bc510e1eee1a9b1e816c5209e79a9"
|
||||||
|
|
||||||
do_install_append() {
|
do_install_append() {
|
||||||
install -d ${D}${datadir}/glibmm-2.4
|
install -d ${D}${datadir}/glibmm-2.4
|
||||||
Reference in New Issue
Block a user