From 2a448dd0ce6879af02fe182d7162605376f84b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Fri, 2 Dec 2016 22:41:19 +0100
Subject: [PATCH] glib: fix gcc5 build.

---
 dev-libs/glib/glib-1.2.10.recipe           |  2 +-
 dev-libs/glib/patches/glib-1.2.10.patchset | 38 ++++++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/dev-libs/glib/glib-1.2.10.recipe b/dev-libs/glib/glib-1.2.10.recipe
index 579583f32..c291cf6fd 100644
--- a/dev-libs/glib/glib-1.2.10.recipe
+++ b/dev-libs/glib/glib-1.2.10.recipe
@@ -17,7 +17,7 @@ COPYRIGHT="1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
 	1998-2001, 2003-2010 Red Hat, Inc.
 	1995-2002 Several others"
 LICENSE="GNU LGPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="http://ftp.gnome.org/pub/gnome/sources/glib/1.2/glib-1.2.10.tar.gz"
 CHECKSUM_SHA256="6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f"
 PATCHES="glib-1.2.10.patchset"
diff --git a/dev-libs/glib/patches/glib-1.2.10.patchset b/dev-libs/glib/patches/glib-1.2.10.patchset
index 13e9d9b04..5e94a2dca 100644
--- a/dev-libs/glib/patches/glib-1.2.10.patchset
+++ b/dev-libs/glib/patches/glib-1.2.10.patchset
@@ -1,8 +1,15 @@
-From afb8aab8236d2c30c34642c755ce7c07dfc95ab2 Mon Sep 17 00:00:00 2001
+From 7f42c71278a86fc337169f469746dd0ebe2d22d3 Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Mon, 9 Dec 2013 16:58:10 -0700
-Subject: Attempt to bring glib-1 into the modern age
+Subject: [PATCH 1/2] Attempt to bring glib-1 into the modern age
 
+---
+ Makefile.am         |  2 +-
+ acinclude.m4        | 12 ++++++++++++
+ configure.in        | 12 ++++++------
+ gmodule/Makefile.am |  2 +-
+ gstrfuncs.c         | 15 +++++----------
+ 5 files changed, 25 insertions(+), 18 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
 index 3a6e201..f059565 100644
@@ -171,5 +178,30 @@ index feb4572..f3859b4 100644
                  }
                conv_done |= conv_len > 0;
 -- 
-1.8.3.4
+2.7.4
+
+From cb3f993649d892e9015e7ff7e928f33a1faa531c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
+Date: Fri, 2 Dec 2016 22:38:49 +0100
+Subject: [PATCH 2/2] fix gcc5 build
+
+---
+ glib.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glib.h b/glib.h
+index b83cf5d..12e0195 100644
+--- a/glib.h
++++ b/glib.h
+@@ -204,7 +204,7 @@ extern "C" {
+ #ifndef G_INLINE_FUNC
+ #  ifdef __GNUC__
+ #    ifdef __OPTIMIZE__
+-#      define G_INLINE_FUNC extern inline
++#      define G_INLINE_FUNC static inline
+ #    else
+ #      undef G_CAN_INLINE
+ #      define G_INLINE_FUNC extern
+-- 
+2.7.4