[gtksourceview2/f17] fix compile against new glib

[Daniel Drake]

commit 6a80ed039aed1a63d6d376710a81900e7fcaf0b8
Author: Daniel Drake <dsd at laptop.org>
Date:   Fri Mar 2 10:37:30 2012 -0600

    fix compile against new glib

 gtksourceview-2.11-glib-unicode-constant.patch |   13 +++++++++++++
 gtksourceview2.spec                            |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/gtksourceview-2.11-glib-unicode-constant.patch b/gtksourceview-2.11-glib-unicode-constant.patch
new file mode 100644
index 0000000..50d7d39
--- /dev/null
+++ b/gtksourceview-2.11-glib-unicode-constant.patch
@@ -0,0 +1,13 @@
+Index: gtksourceview-2.11.2/gtksourceview/gtksourceiter.c
+===================================================================
+--- gtksourceview-2.11.2.orig/gtksourceview/gtksourceiter.c
++++ gtksourceview-2.11.2/gtksourceview/gtksourceiter.c
+@@ -80,7 +80,7 @@ exact_prefix_cmp (const gchar *string,
+ 	/* If string contains prefix, check that prefix is not followed
+ 	 * by a unicode mark symbol, e.g. that trailing 'a' in prefix
+ 	 * is not part of two-char a-with-hat symbol in string. */
+-	return type != G_UNICODE_COMBINING_MARK &&
++	return type != G_UNICODE_SPACING_MARK &&
+ 		type != G_UNICODE_ENCLOSING_MARK &&
+ 		type != G_UNICODE_NON_SPACING_MARK;
+ }
diff --git a/gtksourceview2.spec b/gtksourceview2.spec
index 18ef4fc..c07ade2 100644
--- a/gtksourceview2.spec
+++ b/gtksourceview2.spec
@@ -6,7 +6,7 @@
 Summary: A library for viewing source files
 Name: gtksourceview2
 Version: 2.11.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
 Group: System Environment/Libraries
@@ -18,6 +18,7 @@ Patch0: gtksourceview-2.11.2-cflags.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=672823
 Patch1: gtksourceview-2.11-fix-GCONST-def.patch
 Patch2: gtksourceview-2.11-add-libs.patch
+Patch3: gtksourceview-2.11-glib-unicode-constant.patch
 BuildRequires: libxml2-devel
 BuildRequires: GConf2-devel
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -50,6 +51,7 @@ applications which use GtkSourceView 2.x.
 %patch0 -p1 -b .cflags
 %patch1 -p1 -b .gconst
 %patch2 -p1 -b .addlibs
+%patch3 -p1 -b .glib-deprecated
 
 %build
 %configure --disable-gtk-doc --disable-static --disable-deprecations
@@ -86,6 +88,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/gtksourceview-2.0/language-specs/convert.py
 %{_datadir}/gir-1.0/GtkSource-2.0.gir
 
 %changelog
+* Fri Mar  2 2012 Daniel Drake <dsd at laptop.org> - 2.11.2-13
+- Fix build against new glib (avoid G_UNICODE_COMBINING_MARK) (#716176)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild