qemu: Backport malloc-trace disabling

new file mode 100644
index 0000000..73d699f
@@ -0,0 +1,97 @@
+From 98cf48f60aa4999f5b2808569a193a401a390e6a Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <[email protected]>
+Date: Wed, 16 Sep 2015 17:38:44 +0200
+Subject: [PATCH] trace: remove malloc tracing
+
+The malloc vtable is not supported anymore in glib, because it broke
+when constructors called g_malloc.  Remove tracing of g_malloc,
+g_realloc and g_free calls.
+
+Note that, for systemtap users, glib also provides tracepoints
+glib.mem_alloc, glib.mem_free, glib.mem_realloc, glib.slice_alloc
+and glib.slice_free.
+
+Signed-off-by: Paolo Bonzini <[email protected]>
+Reviewed-by: Alberto Garcia <[email protected]>
+Message-id: [email protected]
+Signed-off-by: Stefan Hajnoczi <[email protected]>
+
+
+For Yocto:
+Upstream-Status: Backport [commit 98cf48f60a, included in 2.4.1]
+Signed-off-by: Jussi Kukkonen <[email protected]>
+
+---
+ trace-events |    3 ---
+ vl.c         |   27 ---------------------------
+ 2 files changed, 0 insertions(+), 30 deletions(-)
+
+diff --git a/trace-events b/trace-events
+index 6790292..b813ae4 100644
+--- a/trace-events
++++ b/trace-events
+@@ -603,9 +603,6 @@ scsi_request_sense(int target, int lun, int tag) "target %d lun %d tag %d"
+ vm_state_notify(int running, int reason) "running %d reason %d"
+ load_file(const char *name, const char *path) "name %s location %s"
+ runstate_set(int new_state) "new state %d"
+-g_malloc(size_t size, void *ptr) "size %zu ptr %p"
+-g_realloc(void *ptr, size_t size, void *newptr) "ptr %p size %zu newptr %p"
+-g_free(void *ptr) "ptr %p"
+ system_wakeup_request(int reason) "reason=%d"
+ qemu_system_shutdown_request(void) ""
+ qemu_system_powerdown_request(void) ""
+diff --git a/vl.c b/vl.c
+index f2bd8d2..ea9e0e6 100644
+--- a/vl.c
++++ b/vl.c
+@@ -2703,26 +2703,6 @@ static const QEMUOption *lookup_opt(int argc, char **argv,
+     return popt;
+ }
+ 
+-static gpointer malloc_and_trace(gsize n_bytes)
+-{
+-    void *ptr = malloc(n_bytes);
+-    trace_g_malloc(n_bytes, ptr);
+-    return ptr;
+-}
+-
+-static gpointer realloc_and_trace(gpointer mem, gsize n_bytes)
+-{
+-    void *ptr = realloc(mem, n_bytes);
+-    trace_g_realloc(mem, n_bytes, ptr);
+-    return ptr;
+-}
+-
+-static void free_and_trace(gpointer mem)
+-{
+-    trace_g_free(mem);
+-    free(mem);
+-}
+-
+ static int machine_set_property(void *opaque,
+                                 const char *name, const char *value,
+                                 Error **errp)
+@@ -2950,11 +2930,6 @@ int main(int argc, char **argv, char **envp)
+     bool userconfig = true;
+     const char *log_mask = NULL;
+     const char *log_file = NULL;
+-    GMemVTable mem_trace = {
+-        .malloc = malloc_and_trace,
+-        .realloc = realloc_and_trace,
+-        .free = free_and_trace,
+-    };
+     const char *trace_events = NULL;
+     const char *trace_file = NULL;
+     ram_addr_t maxram_size;
+@@ -2970,8 +2945,6 @@ int main(int argc, char **argv, char **envp)
+     error_set_progname(argv[0]);
+     qemu_init_exec_dir(argv[0]);
+ 
+-    g_mem_set_vtable(&mem_trace);
+-
+     module_call_init(MODULE_INIT_QOM);
+ 
+     qemu_add_opts(&qemu_drive_opts);
+-- 
+1.7.0.4
+

index 1505b80..7fdae32 100644
@@ -10,6 +10,7 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
             file://smc91c111_fix2.patch \
             file://smc91c111_fix3.patch \
             file://no-valgrind.patch \
+            file://trace-remove-malloc-tracing.patch \
            "
 SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
 SRC_URI[md5sum] = "186ee8194140a484a455f8e3c74589f4"

new file mode 100644
index 0000000..5f3fef0
@@ -0,0 +1,38 @@
+From 99dabcb02e2b3f90a12d17a9995752fcae57b522 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <[email protected]>
+Date: Thu, 5 Nov 2015 11:08:32 +0200
+Subject: [PATCH] gio/tests: Don't depend on a data file that's not built
+
+data.gresource is not built when cross-compiling: Don't
+add it to test_data in that case.
+
+Signed-off-by: Jussi Kukkonen <[email protected]>
+Upstream-Status: Backport [https://bugzilla.gnome.org/show_bug.cgi?id=757628]
+---
+ gio/tests/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index 894cf43..cc7deb3 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -76,7 +76,6 @@ dist_test_data = \
+ 	$(NULL)
+ 
+ test_data = \
+-	test.gresource				\
+ 	$(NULL)
+ 
+ uninstalled_test_extra_programs = \
+@@ -520,6 +519,8 @@ libresourceplugin_la_SOURCES = resourceplugin.c plugin_resources.c
+ libresourceplugin_la_LDFLAGS = -avoid-version -module -export-dynamic $(no_undefined)
+ libresourceplugin_la_LIBADD = $(LDADD)
+ 
++test_data += test.gresource
++
+ # libtool contains a bug whereby the created .la file doesn't contain the correct dlname='' in the case that
+ # you're building a library but not installing it.  This is apparently because the only considered use for an
+ # uninstalled library is as a convenience library for linking (despite the fact that we give -module).  The lack
+-- 
+2.6.2
+

similarity index 78%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb
index 1e3d36a..22fd34a 100644
@@ -15,9 +15,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
            file://allow-run-media-sdX-drive-mount-if-username-root.patch \
 	   file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
+	   file://0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch \
           "
 
 SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
 
-SRC_URI[md5sum] = "83efba4722a9674b97437d1d99af79db"
-SRC_URI[sha256sum] = "8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07"
+SRC_URI[md5sum] = "c90e93ceb45100ffc1d40ec5d2ca3248"
+SRC_URI[sha256sum] = "5a1f03b952ebc3a7e9f612b8724f70898183e31503db329b4f15d07163c8fdfb"

new file mode 100644
index 0000000..011e094
@@ -0,0 +1,79 @@
+From 310dfe1bdd16d4b254732fcc202c6211629bc7b6 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <[email protected]>
+Date: Mon, 9 Nov 2015 11:07:27 +0200
+Subject: [PATCH] Enable more tests while cross-compiling
+
+Upstream disables a few tests while cross-compiling because their build
+requires running other built binaries. This usually makes sense but we
+have a native glib already built: enable these tests.
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Jussi Kukkonen <[email protected]>
+---
+ gio/tests/Makefile.am     | 8 +++-----
+ tests/gobject/Makefile.am | 8 +++-----
+ 2 files changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index 9fa0e11..6bb9e01 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -502,10 +502,9 @@ test_programs += \
+ endif
+ 
+ # -----------------------------------------------------------------------------
+-#  The resources test is a bit more complicated, and we cannot build it when
+-#  cross-compiling GIO because it requires running a binary...
++#  The resources test is a bit more complicated, and requires glib-native
++#  for running a binary
+ 
+-if !CROSS_COMPILING
+ test_programs += resources
+ resources_SOURCES = resources.c
+ nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h
+@@ -529,7 +528,7 @@ if !ENABLE_INSTALLED_TESTS
+ libresourceplugin_la_LDFLAGS += -rpath /
+ endif
+ 
+-glib_compile_resources=$(top_builddir)/gio/glib-compile-resources
++glib_compile_resources=glib-compile-resources
+ 
+ resources.o: test_resources2.h
+ test_resources.c: test2.gresource.xml Makefile $(shell $(glib_compile_resources) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/test2.gresource.xml)
+@@ -546,7 +545,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) --
+ 
+ EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml
+ CLEANFILES += test_resources.c test_resources2.[ch] plugin_resources.c test.gresource
+-endif # !CROSS_COMPILING
+ 
+ BUILT_SOURCES += giotypefuncs.c
+ 
+diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
+index 16f2827..8246ae8 100644
+--- a/tests/gobject/Makefile.am
++++ b/tests/gobject/Makefile.am
+@@ -48,10 +48,9 @@ if ENABLE_TIMELOOP
+ installed_test_programs += timeloop-closure
+ endif
+ 
+-# The marshal test requires running a binary, which means we cannot
+-# build it when cross-compiling
+-if !CROSS_COMPILING
+-glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
++# The marshal test requires running a binary, which means we require
++# glib-native when cross-compiling
++glib_genmarshal=$(shell which glib-genmarshal)
+ 
+ testmarshal.h: stamp-testmarshal.h
+ 	@true
+@@ -69,7 +68,6 @@ BUILT_SOURCES += testmarshal.h testmarshal.c
+ CLEANFILES += stamp-testmarshal.h
+ EXTRA_DIST += testcommon.h testmarshal.list
+ BUILT_EXTRA_DIST += testmarshal.h testmarshal.c
+-endif # !CROSS_COMPILING
+ 
+ dist-hook: $(BUILT_EXTRA_DIST)
+ 	files='$(BUILT_EXTRA_DIST)';				\
+-- 
+2.1.4
+

index 22fd34a..04951f4 100644
@@ -16,6 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://allow-run-media-sdX-drive-mount-if-username-root.patch \
 	   file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
 	   file://0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch \
+           file://Enable-more-tests-while-cross-compiling.patch \
           "
 
 SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"

similarity index 88%
rename from meta/recipes-core/glib-networking/glib-networking_2.44.0.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.46.1.bb
index 4f91b76..b56e757 100644
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 SECTION = "libs"
 DEPENDS = "glib-2.0 intltool-native"
 
-SRC_URI[archive.md5sum] = "6989b20cf3b26dd5ae272e04a9acb0b3"
-SRC_URI[archive.sha256sum] = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"
+SRC_URI[archive.md5sum] = "c000e0b579f5d8fd48efebc7ac4d95dc"
+SRC_URI[archive.sha256sum] = "d5034214217f705891b6c9e719cc2c583c870bfcfdc454ebbb5e5e8940ac90b1"
 
 PACKAGECONFIG ??= "ca-certificates gnutls"
 

similarity index 78%
rename from meta/recipes-support/atk/atk_2.16.0.bb
rename to meta/recipes-support/atk/atk_2.18.0.bb
index 0f8f9b5..83bcae0 100644
@@ -12,8 +12,8 @@ DEPENDS = "glib-2.0"
 
 inherit gnomebase gtk-doc
 
-SRC_URI[archive.md5sum] = "c7c5002bd6e58b4723a165f1bf312116"
-SRC_URI[archive.sha256sum] = "095f986060a6a0b22eb15eef84ae9f14a1cf8082488faa6886d94c37438ae562"
+SRC_URI[archive.md5sum] = "fd3678f35004b4c92e3da39356996054"
+SRC_URI[archive.sha256sum] = "ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b"
 
 BBCLASSEXTEND = "native"
 

similarity index 84%
rename from meta/recipes-support/atk/at-spi2-core_2.16.0.bb
rename to meta/recipes-support/atk/at-spi2-core_2.18.1.bb
index 7c12b54..53fa1f5 100644
@@ -8,8 +8,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
            file://0001-nls.m4-Take-it-from-gettext-0.15.patch \
           "
 
-SRC_URI[md5sum] = "be6eeea370f913b7639b609913b2cf02"
-SRC_URI[sha256sum] = "1c0b77fb8ce81abbf1d80c0afee9858b3f9229f673b7881995fe0fc16b1a74d0"
+SRC_URI[md5sum] = "5f13ba8cfd97cf817261954ef49ebd48"
+SRC_URI[sha256sum] = "57d555be4cc64905454687bf9bb7dc1e68531bee93befa77222d94ea083f01cf"
 
 DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native"
 

similarity index 82%
rename from meta/recipes-support/atk/at-spi2-atk_2.16.0.bb
rename to meta/recipes-support/atk/at-spi2-atk_2.18.1.bb
index 7d95fdb..f2e543f 100644
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
 MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "8936488c8cdce0e158f80b2e247527f9"
-SRC_URI[sha256sum] = "78efc45ec36383bf785f8636e64a8d866defeb020e00a08f92978f1fc3772ff9"
+SRC_URI[md5sum] = "d7040a55df975865ab0d74a4b325afb5"
+SRC_URI[sha256sum] = "c4b15f9386d34d464ddad5f6cc85669742c016df87141ceee93513245979c12d"
 
 DEPENDS = "dbus glib-2.0 atk at-spi2-core"
 

similarity index 82%
rename from meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb
rename to meta/recipes-support/libsoup/libsoup-2.4_2.52.1.bb
index 044db31..55d8b9e 100644
@@ -9,6 +9,8 @@ SECTION = "x11/gnome/libs"
 
 DEPENDS = "glib-2.0 gnutls libxml2 sqlite3 intltool-native"
 
+EXTRA_OECONF = "--disable-vala"
+
 # libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards.  Enable
 # by default but let it be easily disabled.
 PACKAGECONFIG ??= "gnome"

@@ -17,8 +19,8 @@ PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "9a84d66e1b7ccd3bd340574b11eccc15"
-SRC_URI[sha256sum] = "1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b"
+SRC_URI[md5sum] = "b80f11674724ab38f96426875bc0e2e5"
+SRC_URI[sha256sum] = "0e19bca047ad50b28e8ed7663840f9e45a94909148822ca44dcb3e8cafb5cc48"
 
 S = "${WORKDIR}/libsoup-${PV}"