diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2014-10-30 11:04:23 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-11-19 15:19:25 +0100 |
commit | 23d22879835e1a0fa2f81bf5a6b63bdb09210f14 (patch) | |
tree | 2662e4acef8739c22af68dc3e6fca7a8db7749e4 | |
parent | b4ed05ae7a2a42e33d94094bab410e8082631da7 (diff) | |
download | meta-openembedded-23d22879835e1a0fa2f81bf5a6b63bdb09210f14.tar.gz |
gvfs: replace deprecated g_memmove by memmove
* g_memmove was deprecated ib glib-2.0 2.40
* opening a remote connection created by gigolo with thunar failed with:
| thunar: symbol lookup error: /usr/lib/modules/libgvfsdbus.so: undefined symbol: g_memmove
* further tests showed that browsing in windows networks is fixed now
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-gnome/recipes-gnome/gvfs/files/0005-client-gdaemonfile.c-replace-g_memmove-by-memmove.patch | 36 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs.inc | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gvfs/files/0005-client-gdaemonfile.c-replace-g_memmove-by-memmove.patch b/meta-gnome/recipes-gnome/gvfs/files/0005-client-gdaemonfile.c-replace-g_memmove-by-memmove.patch new file mode 100644 index 000000000..c55a99db4 --- /dev/null +++ b/meta-gnome/recipes-gnome/gvfs/files/0005-client-gdaemonfile.c-replace-g_memmove-by-memmove.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From de7b06dea740900fa63e2e011c9f862fe4b9405c Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Mon, 27 Oct 2014 10:43:40 +0100 | ||
4 | Subject: [PATCH] client/gdaemonfile.c: replace g_memmove by memmove | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | g_memmove was deprecated in glib 2.40 [1] | ||
10 | |||
11 | Upstream-Status: pending [2] | ||
12 | |||
13 | [1] https://developer.gnome.org/glib/stable/glib-Memory-Allocation.html#g-memmove | ||
14 | [2] https://bugzilla.gnome.org/show_bug.cgi?id=739233 | ||
15 | |||
16 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
17 | --- | ||
18 | client/gdaemonfile.c | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c | ||
22 | index 15c368c..593ce7a 100644 | ||
23 | --- a/client/gdaemonfile.c | ||
24 | +++ b/client/gdaemonfile.c | ||
25 | @@ -256,7 +256,7 @@ g_daemon_file_get_parent (GFile *file) | ||
26 | len = (guint) 1 + base - path; | ||
27 | |||
28 | parent_path = g_new (gchar, len + 1); | ||
29 | - g_memmove (parent_path, path, len); | ||
30 | + memmove (parent_path, path, len); | ||
31 | parent_path[len] = 0; | ||
32 | |||
33 | parent = new_file_for_new_path (daemon_file, parent_path); | ||
34 | -- | ||
35 | 1.8.3.1 | ||
36 | |||
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs.inc b/meta-gnome/recipes-gnome/gvfs/gvfs.inc index 288b205da..c516a40f1 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs.inc +++ b/meta-gnome/recipes-gnome/gvfs/gvfs.inc | |||
@@ -15,6 +15,7 @@ SRC_URI += " \ | |||
15 | file://0002-Adapt-to-GLib-2.31-deprecations-and-thread-API-chang.patch \ | 15 | file://0002-Adapt-to-GLib-2.31-deprecations-and-thread-API-chang.patch \ |
16 | file://0003-Adapt-to-glib-mutex-API-changes.patch \ | 16 | file://0003-Adapt-to-glib-mutex-API-changes.patch \ |
17 | file://0004-Adapt-to-glib-thread-API-changes.patch \ | 17 | file://0004-Adapt-to-glib-thread-API-changes.patch \ |
18 | file://0005-client-gdaemonfile.c-replace-g_memmove-by-memmove.patch \ | ||
18 | " | 19 | " |
19 | 20 | ||
20 | EXTRA_OECONF = "--with-archive-includes=${STAGING_INCDIR} \ | 21 | EXTRA_OECONF = "--with-archive-includes=${STAGING_INCDIR} \ |