[glibmm] Update glib_enums.defs.patch, add gio_enums.defs.patch

[Kjell Ahlstedt <kjellahl src gnome org>]

commit 4ea0e5fa8ce414421e46ecc4ef80031caf076029
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Fri Jul 24 19:17:18 2015 +0200

    Update glib_enums.defs.patch, add gio_enums.defs.patch
    
    * glib/src/glib_enums.defs.patch: G_IO_FLAG_IS_WRITEABLE is an enum constant
    since 2013-02-04. No patch needed for that any more.
    * gio/src/gio_enums.defs.patch: New file. Such a file has been useful for a
    long time. It should have been stored in git long ago.

 gio/src/gio_enums.defs.patch   |   14 ++++++++++++++
 glib/src/glib_enums.defs.patch |   27 ++++++---------------------
 2 files changed, 20 insertions(+), 21 deletions(-)
---
diff --git a/gio/src/gio_enums.defs.patch b/gio/src/gio_enums.defs.patch
new file mode 100644
index 0000000..4d64a58
--- /dev/null
+++ b/gio/src/gio_enums.defs.patch
@@ -0,0 +1,14 @@
+--- ./../../gio/src/gio_enums.defs.orig        2015-07-24 16:57:40.866238234 +0200
++++ ./../../gio/src/gio_enums.defs     2015-07-24 16:57:40.870238424 +0200
+@@ -495,10 +495,11 @@
+     '("timed-out" "G_IO_ERROR_TIMED_OUT" "24")
+     '("would-recurse" "G_IO_ERROR_WOULD_RECURSE" "25")
+     '("busy" "G_IO_ERROR_BUSY" "26")
+     '("would-block" "G_IO_ERROR_WOULD_BLOCK" "27")
+     '("host-not-found" "G_IO_ERROR_HOST_NOT_FOUND" "28")
++    '("host-not-found" "G_IO_ERROR_HOST_WAS_NOT_FOUND" "28")
+     '("would-merge" "G_IO_ERROR_WOULD_MERGE" "29")
+     '("failed-handled" "G_IO_ERROR_FAILED_HANDLED" "30")
+     '("too-many-open-files" "G_IO_ERROR_TOO_MANY_OPEN_FILES" "31")
+     '("not-initialized" "G_IO_ERROR_NOT_INITIALIZED" "32")
+     '("address-in-use" "G_IO_ERROR_ADDRESS_IN_USE" "33")
diff --git a/glib/src/glib_enums.defs.patch b/glib/src/glib_enums.defs.patch
index feac2c2..022f3b1 100644
--- a/glib/src/glib_enums.defs.patch
+++ b/glib/src/glib_enums.defs.patch
@@ -1,6 +1,8 @@
---- glib_enums.defs    2012-02-28 12:17:21.000000000 -0500
-+++ glib_enums.defs.new        2012-02-28 12:00:52.000000000 -0500
-@@ -386,16 +386,24 @@
+--- ./../../glib/src/glib_enums.defs.orig      2015-07-24 16:56:29.570857821 +0200
++++ ./../../glib/src/glib_enums.defs   2015-07-24 16:56:29.706864274 +0200
+@@ -464,20 +464,28 @@
+ ;;   G_IO_ERR GLIB_SYSDEF_POLLERR,
+ ;;   G_IO_HUP GLIB_SYSDEF_POLLHUP,
  ;;   G_IO_NVAL        GLIB_SYSDEF_POLLNVAL
  ;; } GIOCondition;
  
@@ -31,22 +33,5 @@
    )
  )
  
-@@ -411,6 +419,10 @@
- ;;   G_IO_FLAG_GET_MASK = G_IO_FLAG_MASK,
- ;;   G_IO_FLAG_SET_MASK = G_IO_FLAG_APPEND | G_IO_FLAG_NONBLOCK
- ;; } GIOFlags;
-+;; Note that we add is-writeable in glibmm to preserve API.
-+;; They do that with a #define in glib, though an enum would have been OK:
-+;; See http://git.gnome.org/browse/glib/commit/glib/giochannel.h?id=0d1a2eb4bfcd733e0c015c76fb0ca0308b8a61f0
-+;; and https://bugzilla.gnome.org/show_bug.cgi?id=657045#c6
+ ;; From gmarkup.h
  
- (define-flags-extended IOFlags
-   (in-module "G")
-@@ -419,6 +431,7 @@
-     '("append" "G_IO_FLAG_APPEND" "1 << 0")
-     '("nonblock" "G_IO_FLAG_NONBLOCK" "1 << 1")
-     '("is-readable" "G_IO_FLAG_IS_READABLE" "1 << 2")
-+    '("is-writeable" "G_IO_FLAG_IS_WRITEABLE" "1 << 3")
-     '("is-writable" "G_IO_FLAG_IS_WRITABLE" "1 << 3")
-     '("is-seekable" "G_IO_FLAG_IS_SEEKABLE" "1 << 4")
-     '("mask" "G_IO_FLAG_MASK" "(1 << 5) - 1")