[mingw-glib2] Resolve regression regarding linking against C++ code (GNOME BZ #690902)

[Erik van Pienbroek]

commit 38044df94c98609ff49c1c0a356b36a4665e07a0
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Jan 3 19:28:17 2013 +0100

    Resolve regression regarding linking against C++ code (GNOME BZ #690902)

 0d3da350c608483a12c89334638317d57449e968.patch |   33 ++++++++++++++++++++++++
 mingw-glib2.spec                               |   10 ++++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/0d3da350c608483a12c89334638317d57449e968.patch b/0d3da350c608483a12c89334638317d57449e968.patch
new file mode 100644
index 0000000..bcf6789
--- /dev/null
+++ b/0d3da350c608483a12c89334638317d57449e968.patch
@@ -0,0 +1,33 @@
+From 0d3da350c608483a12c89334638317d57449e968 Mon Sep 17 00:00:00 2001
+From: Michael Henning <drawoc at darkrefraction.com>
+Date: Sun, 30 Dec 2012 04:57:23 +0000
+Subject: gutils: move G_END_DECLS to the end of gutils.h
+
+Previously, some declarations near the bottom came after the
+G_END_DECLS, causing linker errors for C++ users that called those
+functions.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=690902
+---
+diff --git a/glib/gutils.h b/glib/gutils.h
+index 15f1ed9..8102f53 100644
+--- a/glib/gutils.h
++++ b/glib/gutils.h
+@@ -307,8 +307,6 @@ g_bit_storage (gulong number)
+ }
+ #endif  /* G_CAN_INLINE || __G_UTILS_C__ */
+ 
+-G_END_DECLS
+-
+ #ifndef G_DISABLE_DEPRECATED
+ 
+ /*
+@@ -372,4 +370,6 @@ const gchar *g_get_tmp_dir_utf8          (void);
+ gchar       *g_find_program_in_path_utf8 (const gchar *program);
+ #endif
+ 
++G_END_DECLS
++
+ #endif /* __G_UTILS_H__ */
+--
+cgit v0.9.0.2
diff --git a/mingw-glib2.spec b/mingw-glib2.spec
index 55620a4..bdf6dcb 100644
--- a/mingw-glib2.spec
+++ b/mingw-glib2.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-glib2
 Version:        2.35.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
@@ -54,6 +54,10 @@ Patch2:         glib-build-dbus-proxy-testcase-only-on-unix.patch
 # will become different than 1 and 2
 Patch3:         glib-send-log-messages-to-correct-stdout-and-stderr.patch
 
+# Resolve regression regarding linking against C++ code
+Patch4:         0d3da350c608483a12c89334638317d57449e968.patch
+
+
 %description
 MinGW Windows Glib2 library.
 
@@ -97,6 +101,7 @@ Static version of the MinGW Windows GLib2 library.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p0
+%patch4 -p1
 
 autoreconf -i --force
 
@@ -277,6 +282,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Thu Jan  3 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.35.3-3
+- Resolve regression regarding linking against C++ code (GNOME BZ #690902)
+
 * Tue Jan  1 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.35.3-2
 - Make sure g_log_default_handler uses the correct file descriptors for stdout and stderr