From a6327f432e527acd792f78587ffa35a5022f1775 Mon Sep 17 00:00:00 2001
From: Thomas Sailer <t.sailer@alumni.ethz.ch>
Date: Feb 22 2013 17:54:04 +0000
Subject: update to 2.35.8


---

diff --git a/commit-9e9d028.patch b/commit-9e9d028.patch
deleted file mode 100644
index 19f37ec..0000000
--- a/commit-9e9d028.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9e9d028b96b3e19902a40b930418a0ec3e30ccfc Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 19 Jan 2013 19:30:05 +0000
-Subject: Fix build with -Werror=format
-
-There were a few places in gmarkup.c where we were giving
-pointer differences when integers are expected. Fix that
-by explicitly casting to int.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=692079
----
-diff --git a/glib/gmarkup.c b/glib/gmarkup.c
-index bf7c008..552773f 100644
---- a/glib/gmarkup.c
-+++ b/glib/gmarkup.c
-@@ -684,7 +684,7 @@ unescape_gstring_inplace (GMarkupParseContext  *context,
-                                         "inside a character reference "
-                                         "(&#234; for example) - perhaps "
-                                         "the digit is too large"),
--                                      end - from, from);
-+                                      (int)(end - from), from);
-                   return FALSE;
-                 }
-               else if (*end != ';')
-@@ -719,7 +719,7 @@ unescape_gstring_inplace (GMarkupParseContext  *context,
-                                           from, G_MARKUP_ERROR_PARSE,
-                                           _("Character reference '%-.*s' does not "
-                                             "encode a permitted character"),
--                                          end - from, from);
-+                                          (int)(end - from), from);
-                       return FALSE;
-                     }
-                 }
-@@ -764,7 +764,7 @@ unescape_gstring_inplace (GMarkupParseContext  *context,
-                     set_unescape_error (context, error,
-                                         from, G_MARKUP_ERROR_PARSE,
-                                         _("Entity name '%-.*s' is not known"),
--                                        end-from, from);
-+                                        (int)(end - from), from);
-                   else
-                     set_unescape_error (context, error,
-                                         from, G_MARKUP_ERROR_PARSE,
---
-cgit v0.9.0.2
diff --git a/mingw-glib2.spec b/mingw-glib2.spec
index 1bd6b53..c5a683d 100644
--- a/mingw-glib2.spec
+++ b/mingw-glib2.spec
@@ -1,8 +1,8 @@
 %?mingw_package_header
 
 Name:           mingw-glib2
-Version:        2.35.4
-Release:        4%{?dist}
+Version:        2.35.8
+Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
@@ -55,11 +55,6 @@ Patch2:         glib-build-dbus-proxy-testcase-only-on-unix.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=692085
 Patch3:         glib-send-log-messages-to-correct-stdout-and-stderr.patch
 
-# Fix build failure when using gcc 4.8
-# https://bugzilla.gnome.org/show_bug.cgi?id=692079
-# Upstream commit 9e9d028
-Patch4:         commit-9e9d028.patch
-
 %description
 MinGW Windows Glib2 library.
 
@@ -103,7 +98,6 @@ Static version of the MinGW Windows GLib2 library.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p0
-%patch4 -p1
 
 autoreconf -i --force
 
@@ -284,6 +278,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Fri Feb 22 2013 Thomas Sailer <t.sailer@alumni.ethz.ch> - 2.35.8-1
+- update to 2.35.8
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.35.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 5944aa5..29e8380 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5dd69d52722a9c123015b9b6dd45ab3d  glib-2.35.4.tar.xz
+3532870fa56ca449c0b282ce63324d63  glib-2.35.8.tar.xz