From f93fcef875560f6a8ac7a3a541e4a96f73751553 Mon Sep 17 00:00:00 2001
From: Martin Erik Werner <martinerikwerner@gmail.com>
Date: Sat, 17 Nov 2018 16:22:49 +0100
Subject: qemu: Update glib to build on newer gcc

Update the glib version to 2.48.2 in order to fix build failure on newer
gcc[0].

Force internal version of libpcre for glib, since otherwise the build
failed, presumably since libpcre is not provided as a module (maybe it
should?).

Increasing the glib version further to the current latest was not
tested.

[0]
  CC       libglib_2_0_la-gdate.lo
../../glib-2.39.3/glib/gdate.c: In function 'g_date_strftime':
../../glib-2.39.3/glib/gdate.c:2497:7: error: format not a string literal, format string not checked [-Werror=format-nonliteral]
       tmplen = strftime (tmpbuf, tmpbufsize, locale_format, &tm);
       ^~~~~~
---
 bare/config/devel/glib-2.39.3-1.cfg | 22 ----------------------
 bare/config/devel/glib-2.48.2-1.cfg | 22 ++++++++++++++++++++++
 bare/config/devel/qemu.bset         |  2 +-
 source-builder/config/glib-2-1.cfg  |  3 ++-
 4 files changed, 25 insertions(+), 24 deletions(-)
 delete mode 100644 bare/config/devel/glib-2.39.3-1.cfg
 create mode 100644 bare/config/devel/glib-2.48.2-1.cfg

diff --git a/bare/config/devel/glib-2.39.3-1.cfg b/bare/config/devel/glib-2.39.3-1.cfg
deleted file mode 100644
index d86fe28..0000000
--- a/bare/config/devel/glib-2.39.3-1.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# GLib
-#
-
-%if %{release} == %{nil}
-%define release 1
-%endif
-
-%include %{_configdir}/base.cfg
-
-%define glib_version_major 2.39
-%define glib_version_minor 3
-%define glib_version       %{glib_version_major}.%{glib_version_minor}
-
-%hash sha256 glib-%{glib_version}.tar.xz d9fa6c9aa645a5e688a3bb29013bb83801b19ee767d99e33ff52e004e1cc5fc8
-
-#
-# The GLib build instructions. We use 2.x.x Release 1.
-#
-%ifn %{pkgconfig check glib-2.0}
- %include %{_configdir}/glib-2-1.cfg
-%endif
diff --git a/bare/config/devel/glib-2.48.2-1.cfg b/bare/config/devel/glib-2.48.2-1.cfg
new file mode 100644
index 0000000..6454346
--- /dev/null
+++ b/bare/config/devel/glib-2.48.2-1.cfg
@@ -0,0 +1,22 @@
+#
+# GLib
+#
+
+%if %{release} == %{nil}
+%define release 1
+%endif
+
+%include %{_configdir}/base.cfg
+
+%define glib_version_major 2.48
+%define glib_version_minor 2
+%define glib_version       %{glib_version_major}.%{glib_version_minor}
+
+%hash sha256 glib-%{glib_version}.tar.xz f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4
+
+#
+# The GLib build instructions. We use 2.x.x Release 1.
+#
+%ifn %{pkgconfig check glib-2.0}
+ %include %{_configdir}/glib-2-1.cfg
+%endif
diff --git a/bare/config/devel/qemu.bset b/bare/config/devel/qemu.bset
index db147fe..543518d 100644
--- a/bare/config/devel/qemu.bset
+++ b/bare/config/devel/qemu.bset
@@ -20,5 +20,5 @@ devel/libiconv-1.14-1
 devel/gettext-0.18.3.1-1
 devel/libffi-3.0.13-1
 devel/pixman-0.32.4-1
-devel/glib-2.39.3-1
+devel/glib-2.48.2-1
 devel/qemu-git-1
diff --git a/source-builder/config/glib-2-1.cfg b/source-builder/config/glib-2-1.cfg
index 16a51fe..09b43fa 100644
--- a/source-builder/config/glib-2-1.cfg
+++ b/source-builder/config/glib-2-1.cfg
@@ -59,7 +59,8 @@ URL: 	   https://developer.gnome.org/glib/
     --datadir=%{_datadir} \
     --build=%{_build} --host=%{_host} \
     --with-sysroot=$SYSROOT \
-    --disable-dtrace
+    --disable-dtrace \
+    --with-pcre=internal
 
   %{_ld_library_path}=$SYSROOT/lib \
   %{__make} %{?_smp_mflags} all
-- 
cgit v1.2.3