diff options
Diffstat (limited to 'glib/src/glib_enums.defs.patch')
| -rw-r--r-- | glib/src/glib_enums.defs.patch | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/glib/src/glib_enums.defs.patch b/glib/src/glib_enums.defs.patch index feac2c2a..022f3b18 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") |