From 3c20215fc725d1a4e82c5e126e9e01837ca3248b Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Fri, 21 Dec 2007 11:09:38 +0000
Subject: [PATCH] add glib-2.15.0-gtestutils.patch

---
 glib-2.15.0-gtestutils.patch | 37 ++++++++++++++++++++++++++++++++++++
 glib2.spec                   |  8 +++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 glib-2.15.0-gtestutils.patch

diff --git a/glib-2.15.0-gtestutils.patch b/glib-2.15.0-gtestutils.patch
new file mode 100644
index 0000000..c50018c
--- /dev/null
+++ b/glib-2.15.0-gtestutils.patch
@@ -0,0 +1,37 @@
+--- glib-2.15.0/glib/gtestutils.h.jj	2007-12-21 05:53:51.000000000 +0100
++++ glib-2.15.0/glib/gtestutils.h	2007-12-21 11:50:46.000000000 +0100
+@@ -22,7 +22,7 @@
+ 
+ #include <glib.h>
+ 
+-G_BEGIN_DECLS;
++G_BEGIN_DECLS
+ 
+ typedef struct GTestCase  GTestCase;
+ typedef struct GTestSuite GTestSuite;
+@@ -118,7 +118,7 @@ void    g_test_queue_destroy            
+ typedef enum {
+   G_TEST_TRAP_SILENCE_STDOUT    = 1 << 7,
+   G_TEST_TRAP_SILENCE_STDERR    = 1 << 8,
+-  G_TEST_TRAP_INHERIT_STDIN     = 1 << 9,
++  G_TEST_TRAP_INHERIT_STDIN     = 1 << 9
+ } GTestTrapFlags;
+ gboolean g_test_trap_fork               (guint64              usec_timeout,
+                                          GTestTrapFlags       test_trap_flags);
+@@ -215,7 +215,7 @@ typedef enum {
+   G_TEST_LOG_STOP_CASE,         // d:status d:nforks d:elapsed
+   G_TEST_LOG_MIN_RESULT,        // s:blurb d:result
+   G_TEST_LOG_MAX_RESULT,        // s:blurb d:result
+-  G_TEST_LOG_MESSAGE,           // s:blurb
++  G_TEST_LOG_MESSAGE            // s:blurb
+ } GTestLogType;
+ 
+ typedef struct {
+@@ -240,6 +240,6 @@ void            g_test_log_buffer_push  
+ GTestLogMsg*    g_test_log_buffer_pop   (GTestLogBuffer *tbuffer);
+ void            g_test_log_msg_free     (GTestLogMsg    *tmsg);
+ 
+-G_END_DECLS;
++G_END_DECLS
+ 
+ #endif /* __G_TEST_UTILS_H__ */
diff --git a/glib2.spec b/glib2.spec
index b3b4bfe..7c83ed8 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.15.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -15,6 +15,8 @@ BuildRequires: pkgconfig >= 1:0.14
 BuildRequires: gamin-devel
 BuildRequires: gettext
 
+Patch0: glib-2.15.0-gtestutils.patch
+
 %description 
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -46,6 +48,7 @@ of version 2 of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p1 -b .gtestutils.patch
 
 %build
 for i in config.guess config.sub ; do
@@ -121,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Fri Dec 21 2007 Caolan McNamara <caolanm@redhat.com> - 2.15.0-2
+- add jakubs patch in so xulrunner will build and so gcc too
+
 * Thu Dec 20 2007 Matthias Clasen <mclasen@redhat.com> - 2.15.0-1
 - Update to 2.15.0