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 /meta-gnome | |
| parent | b4ed05ae7a2a42e33d94094bab410e8082631da7 (diff) | |
| download | meta-openembedded-contrib-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>
Diffstat (limited to 'meta-gnome')
| -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 0000000000..c55a99db4f --- /dev/null +++ b/meta-gnome/recipes-gnome/gvfs/files/0005-client-gdaemonfile.c-replace-g_memmove-by-memmove.patch @@ -0,0 +1,36 @@ +From de7b06dea740900fa63e2e011c9f862fe4b9405c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Mon, 27 Oct 2014 10:43:40 +0100 +Subject: [PATCH] client/gdaemonfile.c: replace g_memmove by memmove +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +g_memmove was deprecated in glib 2.40 [1] + +Upstream-Status: pending [2] + +[1] https://developer.gnome.org/glib/stable/glib-Memory-Allocation.html#g-memmove +[2] https://bugzilla.gnome.org/show_bug.cgi?id=739233 + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + client/gdaemonfile.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c +index 15c368c..593ce7a 100644 +--- a/client/gdaemonfile.c ++++ b/client/gdaemonfile.c +@@ -256,7 +256,7 @@ g_daemon_file_get_parent (GFile *file) + len = (guint) 1 + base - path; + + parent_path = g_new (gchar, len + 1); +- g_memmove (parent_path, path, len); ++ memmove (parent_path, path, len); + parent_path[len] = 0; + + parent = new_file_for_new_path (daemon_file, parent_path); +-- +1.8.3.1 + diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs.inc b/meta-gnome/recipes-gnome/gvfs/gvfs.inc index 288b205da4..c516a40f10 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs.inc +++ b/meta-gnome/recipes-gnome/gvfs/gvfs.inc @@ -15,6 +15,7 @@ SRC_URI += " \ file://0002-Adapt-to-GLib-2.31-deprecations-and-thread-API-chang.patch \ file://0003-Adapt-to-glib-mutex-API-changes.patch \ file://0004-Adapt-to-glib-thread-API-changes.patch \ + file://0005-client-gdaemonfile.c-replace-g_memmove-by-memmove.patch \ " EXTRA_OECONF = "--with-archive-includes=${STAGING_INCDIR} \ |