mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 00:32:12 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
d544482bce
commit
526350a831
@@ -1,39 +0,0 @@
|
||||
From 946d36266d8a30f04fe34d3183bf4929141934d2 Mon Sep 17 00:00:00 2001
|
||||
From: coypu <coypu@sdf.org>
|
||||
Date: Wed, 2 Mar 2016 19:38:48 +0200
|
||||
Subject: [PATCH] gdate: Move warning pragma outside of function
|
||||
|
||||
Commit 0817af40e8c74c721c30f6ef482b1f53d12044c7 breaks the build on
|
||||
older versions of GCC, which don't allow pragma inside functions.
|
||||
|
||||
https://bugzilla.gnome.org/761550
|
||||
---
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
glib/glib/gdate.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/glib/glib/gdate.c b/glib/glib/gdate.c
|
||||
index 1978cf7..20e6c4a 100644
|
||||
--- a/glib/glib/gdate.c
|
||||
+++ b/glib/glib/gdate.c
|
||||
@@ -2439,6 +2439,9 @@ win32_strftime_helper (const GDate *d,
|
||||
*
|
||||
* Returns: number of characters written to the buffer, or 0 the buffer was too small
|
||||
*/
|
||||
+#pragma GCC diagnostic push
|
||||
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
|
||||
+
|
||||
gsize
|
||||
g_date_strftime (gchar *s,
|
||||
gsize slen,
|
||||
@@ -2549,3 +2552,5 @@ g_date_strftime (gchar *s,
|
||||
return retval;
|
||||
#endif
|
||||
}
|
||||
+
|
||||
+#pragma GCC diagnostic pop
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -8,13 +8,12 @@ SECTION = "console/utils"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||
|
||||
SRCREV = "87152c05be88ca8be71a3a563f275b3686d32c28"
|
||||
PV = "0.29.1+git${SRCPV}"
|
||||
SRCREV = "edf8e6f0ea77ede073f07bff0d2ae1fc7a38103b"
|
||||
PV = "0.29.2+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://anongit.freedesktop.org/pkg-config \
|
||||
file://pkg-config-native.in \
|
||||
file://fix-glib-configure-libtool-usage.patch \
|
||||
file://0001-gdate-Move-warning-pragma-outside-of-function.patch \
|
||||
file://0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch \
|
||||
"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user