From a47761a36e0b23b11e4aa991948da17e4f6b17b0 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Mon, 17 Sep 2012 17:53:58 -0400
Subject: [PATCH] GLib 2.33.14

---
 NEWS         | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  2 +-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 76e3daddc..b4e8ab26a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,60 @@
+Overview of changes from GLib 2.33.12 to 2.33.14
+================================================
+
+ * CVE-2012-3524: don't run dbus-launch from setuid binaries
+
+ * g_content_type_get_generic_icon_name():
+     new API for getting the icon name for a mime type
+
+ * Introspection fixes:
+  - GDBusConnection nullability fixes
+  - give a box type to GTimeZone
+
+ * Drop GVFS_INOTIFY_DIAG
+
+ * Add a new "Writing GLib Applications" section to the reference
+   documentation with general info on security, threads, etc.
+
+ * gwin32mount.c: Fix syntax error
+
+ * gresource tests: srcdir != builddir fixes
+
+ * tests/gvariant: Fix test on big endian architectures
+
+ * Fix regression in g_shell_parse_argv()
+
+Bugs fixed:
+ 562907 g_shell_parse_argv() mishandles # (hash)
+ 683167 g_time_zone_new not introspectable
+ 683384 /gvariant/checksum-basic failure on big endian machines
+ 683641 Typo in gwin32mount.c
+ 683744 have a way to get the generic icon name for a mime type
+
+Translation updates:
+ Assamese
+ Belarusian
+ British English
+ Czech
+ Danish
+ French
+ Galician
+ German
+ Greek
+ Hebrew
+ Indonesian
+ Indonesian
+ Korean
+ Lithuanian
+ Marathi
+ Marathi
+ Polish
+ Portuguese
+ Punjabi
+ Russian
+ Serbian
+ Slovenian
+ Traditional Chinese
+
 Overview of changes from GLib 2.33.10 to 2.33.12
 ================================================
 
diff --git a/configure.ac b/configure.ac
index ca1936081..ff17621ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ m4_define(glib_configure_ac)
 
 m4_define([glib_major_version], [2])
 m4_define([glib_minor_version], [33])
-m4_define([glib_micro_version], [13])
+m4_define([glib_micro_version], [14])
 m4_define([glib_interface_age], [0])
 m4_define([glib_binary_age],
           [m4_eval(100 * glib_minor_version + glib_micro_version)])