summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2017-05-31 14:39:36 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-03 23:46:07 +0100
commit526350a831087a1b228321fffd8daf5dc360bdaa (patch)
tree5f6c3a892463edea21e9af9d8bd8d9cd03e06faa
parentd544482bce208c103dc4441b489d1a0357cefaa7 (diff)
downloadpoky-526350a831087a1b228321fffd8daf5dc360bdaa.tar.gz
pkgconfig: upgrade 0.29.1 -> 0.29.2
Remove backported patch: 1. 0001-gdate-Move-warning-pragma-outside-of-function.patch (From OE-Core rev: 77c09708fb32d6c0bd35af41af95dded22520301) Signed-off-by: Maxin B. John <maxin.john@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-devtools/pkgconfig/pkgconfig/0001-gdate-Move-warning-pragma-outside-of-function.patch39
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_git.bb5
2 files changed, 2 insertions, 42 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-Move-warning-pragma-outside-of-function.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-Move-warning-pragma-outside-of-function.patch
deleted file mode 100644
index 14c8293a5e..0000000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig/0001-gdate-Move-warning-pragma-outside-of-function.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 946d36266d8a30f04fe34d3183bf4929141934d2 Mon Sep 17 00:00:00 2001
2From: coypu <coypu@sdf.org>
3Date: Wed, 2 Mar 2016 19:38:48 +0200
4Subject: [PATCH] gdate: Move warning pragma outside of function
5
6Commit 0817af40e8c74c721c30f6ef482b1f53d12044c7 breaks the build on
7older versions of GCC, which don't allow pragma inside functions.
8
9https://bugzilla.gnome.org/761550
10---
11Upstream-Status: Backport
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14 glib/glib/gdate.c | 5 +++++
15 1 file changed, 5 insertions(+)
16
17diff --git a/glib/glib/gdate.c b/glib/glib/gdate.c
18index 1978cf7..20e6c4a 100644
19--- a/glib/glib/gdate.c
20+++ b/glib/glib/gdate.c
21@@ -2439,6 +2439,9 @@ win32_strftime_helper (const GDate *d,
22 *
23 * Returns: number of characters written to the buffer, or 0 the buffer was too small
24 */
25+#pragma GCC diagnostic push
26+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
27+
28 gsize
29 g_date_strftime (gchar *s,
30 gsize slen,
31@@ -2549,3 +2552,5 @@ g_date_strftime (gchar *s,
32 return retval;
33 #endif
34 }
35+
36+#pragma GCC diagnostic pop
37--
381.9.1
39
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
index dc44992c7e..e6340218e0 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
@@ -8,13 +8,12 @@ SECTION = "console/utils"
8LICENSE = "GPLv2+" 8LICENSE = "GPLv2+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 9LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
10 10
11SRCREV = "87152c05be88ca8be71a3a563f275b3686d32c28" 11SRCREV = "edf8e6f0ea77ede073f07bff0d2ae1fc7a38103b"
12PV = "0.29.1+git${SRCPV}" 12PV = "0.29.2+git${SRCPV}"
13 13
14SRC_URI = "git://anongit.freedesktop.org/pkg-config \ 14SRC_URI = "git://anongit.freedesktop.org/pkg-config \
15 file://pkg-config-native.in \ 15 file://pkg-config-native.in \
16 file://fix-glib-configure-libtool-usage.patch \ 16 file://fix-glib-configure-libtool-usage.patch \
17 file://0001-gdate-Move-warning-pragma-outside-of-function.patch \
18 file://0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch \ 17 file://0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch \
19 " 18 "
20 19