Hello community,
here is the log from the commit of package pkg-config for openSUSE:Factory
checked in at 2017-03-21 22:43:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pkg-config (Old)
and /work/SRC/openSUSE:Factory/.pkg-config.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pkg-config"
Tue Mar 21 22:43:53 2017 rev:32 rq:479468 version:0.29.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/pkg-config/pkg-config.changes 2016-03-21
12:43:58.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pkg-config.new/pkg-config.changes
2017-03-21 22:43:54.950566621 +0100
@@ -1,0 +2,6 @@
+Wed Mar 15 09:54:10 UTC 2017 - mli...@suse.cz
+
+- Add pkg-config-gdate-fix.patch: enable building with GCC7, taken
+ from upstream.
+
+-------------------------------------------------------------------
New:
----
pkg-config-gdate-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pkg-config.spec ++++++
--- /var/tmp/diff_new_pack.UhHzqT/_old 2017-03-21 22:43:56.306375024 +0100
+++ /var/tmp/diff_new_pack.UhHzqT/_new 2017-03-21 22:43:56.310374459 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pkg-config
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,6 +31,8 @@
# pkg-config has a virtual internal pkg-config.pc file, so we should provide it
Provides: pkgconfig(pkg-config) = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# PATCH-FIX-UPSTREAM pkg-config-gdate-fix.patch mli...@suse.cz -- Fix build
with GCC 7
+Patch0: pkg-config-gdate-fix.patch
%description
The pkg-config program is used to retrieve information about installed
@@ -39,6 +41,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%configure\
++++++ pkg-config-gdate-fix.patch ++++++
diff --git a/glib/glib/gdate.c b/glib/glib/gdate.c
index 4aece02..cdc735c 100644
--- a/glib/glib/gdate.c
+++ b/glib/glib/gdate.c
@@ -2494,7 +2494,10 @@ g_date_strftime (gchar *s,
* recognize whether strftime actually failed or just returned "".
*/
tmpbuf[0] = '\1';
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wformat-nonliteral"
tmplen = strftime (tmpbuf, tmpbufsize, locale_format, &tm);
+ #pragma GCC diagnostic pop
if (tmplen == 0 && tmpbuf[0] != '\0')
{
diff --git a/glib/glib/gdate.c b/glib/glib/gdate.c
index cdc735c..92c34d2 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,
@@ -2494,10 +2497,7 @@ g_date_strftime (gchar *s,
* recognize whether strftime actually failed or just returned "".
*/
tmpbuf[0] = '\1';
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wformat-nonliteral"
tmplen = strftime (tmpbuf, tmpbufsize, locale_format, &tm);
- #pragma GCC diagnostic pop
if (tmplen == 0 && tmpbuf[0] != '\0')
{
@@ -2552,3 +2552,5 @@ g_date_strftime (gchar *s,
return retval;
#endif
}
+
+#pragma GCC diagnostic pop
--
cgit v0.12
