summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-10-20 20:49:20 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-01 10:05:45 +0000
commitb41a2e62b81518b1ac13b8085cf5f36e1ab4eca0 (patch)
treed2ed95409effc7902dd8f237b98b85a2307c5d54
parentfffe8fed85b3b460abd1999e8ddd591ecbcbde76 (diff)
downloadpoky-b41a2e62b81518b1ac13b8085cf5f36e1ab4eca0.tar.gz
glib-2.0: Upgrade 2.48.2 -> 2.50.1
Six-monthly feature release. glib-2.0-utils now includes "gio" command line utility. Drop a patch that's now upstream. Add PACKAGECONFIG for libmount, enabled by default. (From OE-Core rev: 361dc9990fb5fc5604ba8e9d2f1188fd440e916d) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0002-tests-Ignore-y2k-warnings.patch42
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.50.1.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb)5
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc3
3 files changed, 4 insertions, 46 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0002-tests-Ignore-y2k-warnings.patch b/meta/recipes-core/glib-2.0/glib-2.0/0002-tests-Ignore-y2k-warnings.patch
deleted file mode 100644
index f61fa0ae6a..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0002-tests-Ignore-y2k-warnings.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From b06b22fecc7deda8c65e28670562ca2371e4e725 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 16 Apr 2016 13:43:54 -0700
4Subject: [PATCH 2/2] tests: Ignore y2k warnings
5
6silences
7| ../../../../../../../../workspace/sources/glib-2.0/glib/tests/gdatetime.c: In function 'test_strftime':
8| ../../../../../../../../workspace/sources/glib-2.0/glib/tests/gdatetime.c:1338:3: error: '%c' yields only last 2 digits of year in some locales [-Werror=format-y2k]
9| "a%a A%A b%b B%B c%c C%C d%d e%e F%F g%g G%G h%h H%H I%I j%j m%m M%M "
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13Upstream-Status: Submitted
14
15 glib/tests/gdatetime.c | 4 ++++
16 1 file changed, 4 insertions(+)
17
18diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
19index 16a163c..e6062fc 100644
20--- a/glib/tests/gdatetime.c
21+++ b/glib/tests/gdatetime.c
22@@ -1326,6 +1326,9 @@ test_z (void)
23 g_time_zone_unref (tz);
24 }
25
26+#pragma GCC diagnostic push
27+#pragma GCC diagnostic ignored "-Wformat-y2k"
28+
29 static void
30 test_strftime (void)
31 {
32@@ -1351,6 +1354,7 @@ test_strftime (void)
33 }
34 #endif
35 }
36+#pragma GCC diagnostic pop
37
38 static void
39 test_find_interval (void)
40--
412.8.0
42
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.50.1.bb
index a45f644448..00ae7ef22e 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.50.1.bb
@@ -16,11 +16,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
16 file://gi-exclude.patch \ 16 file://gi-exclude.patch \
17 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ 17 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
18 file://0001-Do-not-ignore-return-value-of-write.patch \ 18 file://0001-Do-not-ignore-return-value-of-write.patch \
19 file://0002-tests-Ignore-y2k-warnings.patch \
20 " 19 "
21 20
22SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \ 21SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \
23 file://relocate-modules.patch" 22 file://relocate-modules.patch"
24 23
25SRC_URI[md5sum] = "f4ac1aa2efd4f5798c37625ea697ac57" 24SRC_URI[md5sum] = "6baee4d7e3b1ec791b4ced93976365ee"
26SRC_URI[sha256sum] = "f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4" 25SRC_URI[sha256sum] = "2ef87a78f37c1eb5b95f4cc95efd5b66f69afad9c9c0899918d04659cf6df7dd"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 07d8734d7c..cb6aca702f 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -30,9 +30,10 @@ inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even
30 30
31S = "${WORKDIR}/glib-${PV}" 31S = "${WORKDIR}/glib-${PV}"
32 32
33PACKAGECONFIG ??= "system-pcre" 33PACKAGECONFIG ??= "system-pcre libmount"
34# To use the system pcre it must be configured with --enable-unicode-properties 34# To use the system pcre it must be configured with --enable-unicode-properties
35PACKAGECONFIG[system-pcre] = "--with-pcre=system,--with-pcre=internal,libpcre" 35PACKAGECONFIG[system-pcre] = "--with-pcre=system,--with-pcre=internal,libpcre"
36PACKAGECONFIG[libmount] = "--enable-libmount,--disable-libmount,util-linux"
36PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native" 37PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native"
37 38
38CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap" 39CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap"