[mingw-pango/f18] Patch for RHBZ # 976906

[mooninite]

commit 5100fa70bda45bcb2a741f8f570b4149dd0bc05a
Author: Michael Cronenworth <mike at cchtml.com>
Date:   Wed Jun 26 19:46:01 2013 -0500

    Patch for RHBZ # 976906

 mingw-pango.spec                                 |    7 ++-
 pango-fix-pedantic-warning-in-pango-font-h.patch |   61 ++++++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletions(-)
---
diff --git a/mingw-pango.spec b/mingw-pango.spec
index c1de7ce..3ecc7a7 100644
--- a/mingw-pango.spec
+++ b/mingw-pango.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-pango
 Version:        1.32.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows Pango library
 
 License:        LGPLv2+
@@ -11,6 +11,7 @@ URL:            http://www.pango.org
 # first two digits of version
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 Source0:        http://download.gnome.org/sources/pango/%{release_version}/pango-%{version}.tar.xz
+Patch0:         pango-fix-pedantic-warning-in-pango-font-h.patch
 
 # Native pango uses a %post script to generate this, but the
 # pango-querymodules.exe binary is not something we can easily run on
@@ -111,6 +112,7 @@ Static version of the MinGW Windows Pango library.
 
 %prep
 %setup -q -n pango-%{version}
+%patch0 -p1 -b .0-pedantic-warning
 
 %patch1001 -p0 -b .delay_load
 autoreconf -i --force
@@ -232,6 +234,9 @@ rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/pango/1.8.0/modules/*.dll.a
 
 
 %changelog
+* Wed Jun 26 2013 Michael Cronenworth <mike at cchtml.com> - 1.32.5-3
+- Patch for RHBZ# 976906
+
 * Tue May 14 2013 Michael Cronenworth <mike at cchtml.com> - 1.32.5-2
 - Patch for Gnome BZ# 692470
 
diff --git a/pango-fix-pedantic-warning-in-pango-font-h.patch b/pango-fix-pedantic-warning-in-pango-font-h.patch
new file mode 100644
index 0000000..caa352c
--- /dev/null
+++ b/pango-fix-pedantic-warning-in-pango-font-h.patch
@@ -0,0 +1,61 @@
+From 0493b1beb113118b9573f10a87f43814a78a788a Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad at behdad.org>
+Date: Sun, 9 Dec 2012 19:49:29 -0500
+Subject: [PATCH] Bug 689882 - pango-font.h:381: error: comma at end of
+ enumerator list
+
+---
+ pango/pango-font.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pango/pango-font.h b/pango/pango-font.h
+index ce1a421..3d7aeb9 100644
+--- a/pango/pango-font.h
++++ b/pango/pango-font.h
+@@ -378,7 +378,7 @@ enum
+ {
+   PANGO_GLYPH_EMPTY =           ((PangoGlyph)0x0FFFFFFF),
+   PANGO_GLYPH_INVALID_INPUT =   ((PangoGlyph)0xFFFFFFFF),
+-  PANGO_GLYPH_UNKNOWN_FLAG =    ((PangoGlyph)0x10000000),
++  PANGO_GLYPH_UNKNOWN_FLAG =    ((PangoGlyph)0x10000000)
+ };
+ #define PANGO_GET_UNKNOWN_GLYPH(wc) ((PangoGlyph)(wc)|PANGO_GLYPH_UNKNOWN_FLAG)
+ 
+-- 
+1.8.1.4
+
+From 8c1a6ef147edceb05921bb892d620bdced277662 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Sat, 29 Dec 2012 13:36:33 -0800
+Subject: [PATCH] Revert "Make PANGO_GLYPH flags an enum to make
+ gobject-introspection happy."
+
+This reverts commit 7274bd56db3ce2f02594687a307d22aa99c787c4.
+Whatever the problem was with g-ir-scanner, it's resolved.
+---
+ pango/pango-font.h | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/pango/pango-font.h b/pango/pango-font.h
+index 3d7aeb9..eea27b4 100644
+--- a/pango/pango-font.h
++++ b/pango/pango-font.h
+@@ -374,12 +374,10 @@ struct _PangoFontClass
+ #define PANGO_UNKNOWN_GLYPH_HEIGHT 14
+ 
+ #endif /* PANGO_ENABLE_BACKEND */
+-enum
+-{
+-  PANGO_GLYPH_EMPTY =           ((PangoGlyph)0x0FFFFFFF),
+-  PANGO_GLYPH_INVALID_INPUT =   ((PangoGlyph)0xFFFFFFFF),
+-  PANGO_GLYPH_UNKNOWN_FLAG =    ((PangoGlyph)0x10000000)
+-};
++
++#define PANGO_GLYPH_EMPTY           ((PangoGlyph)0x0FFFFFFF)
++#define PANGO_GLYPH_INVALID_INPUT   ((PangoGlyph)0xFFFFFFFF)
++#define PANGO_GLYPH_UNKNOWN_FLAG    ((PangoGlyph)0x10000000)
+ #define PANGO_GET_UNKNOWN_GLYPH(wc) ((PangoGlyph)(wc)|PANGO_GLYPH_UNKNOWN_FLAG)
+ 
+ 
+-- 
+1.8.1.4