[PATCH 0/6] Upgrades: GLib & friends

[PATCH 0/6] Upgrades: GLib & friends

[Jussi Kukkonen]

GLib 2.46 made custem memory allocation functions no-ops: This leads to
a warning "custom memory allocation vtable not supported" on Qemu
startup. This should be a cosmetic issue (as custom allocators didn't
really work before either) and is already fixed in upstream Qemu.


The following changes since commit fc45deac89ef63ca1c44e763c38ced7dfd72cbe1:

  build-appliance-image: Update to jethro head revision (2015-11-03 14:03:03 +0000)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jku/glib-et-al
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/glib-et-al

Jussi Kukkonen (6):
  glib-2.0: Upgrade 2.44.1 -> 2.46.1
  glib-networking: Upgrade 2.44.0 -> 2.46.1
  atk: Upgrade 2.16.0 -> 2.18.0
  atk-spi2-core: Upgrade 2.16.0 -> 2.18.1
  at-spi2-atk: Upgrade 2.16.0 -> 2.18.1
  libsoup-2.4: Upgrade 2.50.0 -> 2.52.1

 ...on-t-depend-on-a-data-file-that-s-not-bui.patch | 38 ++++++++++++++++++++++
 .../{glib-2.0_2.44.1.bb => glib-2.0_2.46.1.bb}     |  5 +--
 ...working_2.44.0.bb => glib-networking_2.46.1.bb} |  4 +--
 ...at-spi2-atk_2.16.0.bb => at-spi2-atk_2.18.1.bb} |  4 +--
 ...-spi2-core_2.16.0.bb => at-spi2-core_2.18.1.bb} |  4 +--
 .../atk/{atk_2.16.0.bb => atk_2.18.0.bb}           |  4 +--
 ...libsoup-2.4_2.50.0.bb => libsoup-2.4_2.52.1.bb} |  6 ++--
 7 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.44.1.bb => glib-2.0_2.46.1.bb} (78%)
 rename meta/recipes-core/glib-networking/{glib-networking_2.44.0.bb => glib-networking_2.46.1.bb} (88%)
 rename meta/recipes-support/atk/{at-spi2-atk_2.16.0.bb => at-spi2-atk_2.18.1.bb} (82%)
 rename meta/recipes-support/atk/{at-spi2-core_2.16.0.bb => at-spi2-core_2.18.1.bb} (84%)
 rename meta/recipes-support/atk/{atk_2.16.0.bb => atk_2.18.0.bb} (78%)
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.50.0.bb => libsoup-2.4_2.52.1.bb} (82%)

-- 
2.1.4

[PATCH 1/6] glib-2.0: Upgrade 2.44.1 -> 2.46.1

[Jussi Kukkonen]

Fix cross-compilation build issue in gio tests.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 ...on-t-depend-on-a-data-file-that-s-not-bui.patch | 38 ++++++++++++++++++++++
 .../{glib-2.0_2.44.1.bb => glib-2.0_2.46.1.bb}     |  5 +--
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.44.1.bb => glib-2.0_2.46.1.bb} (78%)

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch
new file mode 100644
index 0000000..5f3fef0
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch
@@ -0,0 +1,38 @@
+From 99dabcb02e2b3f90a12d17a9995752fcae57b522 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+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 <jussi.kukkonen@intel.com>
+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
+
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb
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
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb
@@ -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"
-- 
2.1.4

[PATCH 2/6] glib-networking: Upgrade 2.44.0 -> 2.46.1

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../{glib-networking_2.44.0.bb => glib-networking_2.46.1.bb}          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/glib-networking/{glib-networking_2.44.0.bb => glib-networking_2.46.1.bb} (88%)

diff --git a/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.46.1.bb
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
--- a/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.46.1.bb
@@ -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"
 
-- 
2.1.4

[PATCH 3/6] atk: Upgrade 2.16.0 -> 2.18.0

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-support/atk/{atk_2.16.0.bb => atk_2.18.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/atk/{atk_2.16.0.bb => atk_2.18.0.bb} (78%)

diff --git a/meta/recipes-support/atk/atk_2.16.0.bb b/meta/recipes-support/atk/atk_2.18.0.bb
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
--- a/meta/recipes-support/atk/atk_2.16.0.bb
+++ b/meta/recipes-support/atk/atk_2.18.0.bb
@@ -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"
 
-- 
2.1.4

[PATCH 4/6] atk-spi2-core: Upgrade 2.16.0 -> 2.18.1

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../atk/{at-spi2-core_2.16.0.bb => at-spi2-core_2.18.1.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/atk/{at-spi2-core_2.16.0.bb => at-spi2-core_2.18.1.bb} (84%)

diff --git a/meta/recipes-support/atk/at-spi2-core_2.16.0.bb b/meta/recipes-support/atk/at-spi2-core_2.18.1.bb
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
--- a/meta/recipes-support/atk/at-spi2-core_2.16.0.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.18.1.bb
@@ -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"
 
-- 
2.1.4

[PATCH 5/6] at-spi2-atk: Upgrade 2.16.0 -> 2.18.1

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../atk/{at-spi2-atk_2.16.0.bb => at-spi2-atk_2.18.1.bb}              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/atk/{at-spi2-atk_2.16.0.bb => at-spi2-atk_2.18.1.bb} (82%)

diff --git a/meta/recipes-support/atk/at-spi2-atk_2.16.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.18.1.bb
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
--- a/meta/recipes-support/atk/at-spi2-atk_2.16.0.bb
+++ b/meta/recipes-support/atk/at-spi2-atk_2.18.1.bb
@@ -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"
 
-- 
2.1.4

[PATCH 6/6] libsoup-2.4: Upgrade 2.50.0 -> 2.52.1

[Jussi Kukkonen]

Don't build the now-included vala bindings: This requires gobject-introspection.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../libsoup/{libsoup-2.4_2.50.0.bb => libsoup-2.4_2.52.1.bb}        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.50.0.bb => libsoup-2.4_2.52.1.bb} (82%)

diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.52.1.bb
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
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.52.1.bb
@@ -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}"
 
-- 
2.1.4

Re: [PATCH 0/6] Upgrades: GLib & friends

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 290 bytes --]

On 5 November 2015 at 13:27, Jussi Kukkonen <jussi.kukkonen@intel.com>
wrote:

> This should be a cosmetic issue (as custom allocators didn't
> really work before either) and is already fixed in upstream Qemu.
>

As this is pretty ugly, can we backport the fix to our qemu?

Ross

[-- Attachment #2: Type: text/html, Size: 707 bytes --]

Re: [PATCH 1/6] glib-2.0: Upgrade 2.44.1 -> 2.46.1

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

On 5 November 2015 at 13:29, Jussi Kukkonen <jussi.kukkonen@intel.com>
wrote:

> +data.gresource is not built when cross-compiling: Don't
> +add it to test_data in that case.
>

If we're building glib we've already built glib-native, so wouldn't it be
better to build the resources instead?

Ross

[-- Attachment #2: Type: text/html, Size: 735 bytes --]

Re: [PATCH 0/6] Upgrades: GLib & friends

[Jussi Kukkonen]

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]

On 6 November 2015 at 22:38, Burton, Ross <ross.burton@intel.com> wrote:

>
> On 5 November 2015 at 13:27, Jussi Kukkonen <jussi.kukkonen@intel.com>
> wrote:
>
>> This should be a cosmetic issue (as custom allocators didn't
>> really work before either) and is already fixed in upstream Qemu.
>>
>
> As this is pretty ugly, can we backport the fix to our qemu?
>

Sure, it looks like a minimal patch. I'll add it to the patch set.

Alternatively, moving to qemu 2.4.1 (that was released this week) will
solve the issue as well.

Jussi

[-- Attachment #2: Type: text/html, Size: 1249 bytes --]

Re: [PATCH 0/6] Upgrades: GLib & friends

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

On 8 November 2015 at 10:19, Jussi Kukkonen <jussi.kukkonen@intel.com>
wrote:

> Alternatively, moving to qemu 2.4.1 (that was released this week) will
> solve the issue as well.
>

Sounds good.  Can you add a patch to the current qemu and we can drop it if
a tested qemu upgrade also gets merged.  For obvious reasons, qemu takes a
while to test.

Ross

[-- Attachment #2: Type: text/html, Size: 705 bytes --]