[gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/files/, dev-libs/glib/

[Alexandre Restovtsev]

commit:     42814d8977fb588a6c7371398f22b0be3fa9b79d
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Sep 27 01:04:23 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Sep 27 01:04:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=42814d89

dev-libs/glib: 2.29.92 → 2.30.0

Version bump with some incompatible API changes in GDBus.

---
 .../files/glib-2.29.92-close-stream-twice.patch    |  149 --------------------
 .../{glib-2.29.92.ebuild => glib-2.30.0.ebuild}    |    5 +-
 dev-libs/glib/glib-9999.ebuild                     |    2 +-
 3 files changed, 2 insertions(+), 154 deletions(-)

diff --git a/dev-libs/glib/files/glib-2.29.92-close-stream-twice.patch b/dev-libs/glib/files/glib-2.29.92-close-stream-twice.patch
deleted file mode 100644
index 358bbb5..0000000
--- a/dev-libs/glib/files/glib-2.29.92-close-stream-twice.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-commit 7b812c434388f0fc3cbbb67df5ab9f7db3a138ed
-Author: Philip Withnall <philip@××××××××××××.uk>
-Date:   Mon Sep 19 10:13:52 2011 +0200
-
-    Don't close stream twice when splicing
-    
-    Ensure that the output/target stream in a g_output_stream_splice_async()
-    operation is marked as closed if G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET is
-    passed to g_output_stream_splice_async(). This removes the possibility of
-    local FDs being closed twice because the stream's not marked as closed.
-    
-    This is implemented by calling g_output_stream_close() from within
-    g_output_stream_splice_async() instead of calling the stream's close_fn()
-    directly.
-    
-    Closes: bgo#659324
-    (cherry picked from commit fe27bf003764e453cd15cab67e8a99fcda84db1d)
-
-diff --git a/gio/goutputstream.c b/gio/goutputstream.c
-index 8132caf..afe135c 100644
---- a/gio/goutputstream.c
-+++ b/gio/goutputstream.c
-@@ -95,6 +95,9 @@ static void     g_output_stream_real_close_async   (GOutputStream             *s
- static gboolean g_output_stream_real_close_finish  (GOutputStream             *stream,
- 						    GAsyncResult              *result,
- 						    GError                   **error);
-+static gboolean _g_output_stream_close_internal    (GOutputStream             *stream,
-+                                                    GCancellable              *cancellable,
-+                                                    GError                   **error);
- 
- static void
- g_output_stream_finalize (GObject *object)
-@@ -459,9 +462,7 @@ g_output_stream_real_splice (GOutputStream             *stream,
-   if (flags & G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET)
-     {
-       /* But write errors on close are bad! */
--      if (class->close_fn &&
--	  !class->close_fn (stream, cancellable, error))
--	res = FALSE;
-+      res = _g_output_stream_close_internal (stream, cancellable, error);
-     }
- 
-   if (res)
-@@ -470,6 +471,54 @@ g_output_stream_real_splice (GOutputStream             *stream,
-   return -1;
- }
- 
-+/* Must always be called inside
-+ * g_output_stream_set_pending()/g_output_stream_clear_pending(). */
-+static gboolean
-+_g_output_stream_close_internal (GOutputStream  *stream,
-+                                 GCancellable   *cancellable,
-+                                 GError        **error)
-+{
-+  GOutputStreamClass *class;
-+  gboolean res;
-+
-+  if (stream->priv->closed)
-+    return TRUE;
-+
-+  class = G_OUTPUT_STREAM_GET_CLASS (stream);
-+
-+  stream->priv->closing = TRUE;
-+
-+  if (cancellable)
-+    g_cancellable_push_current (cancellable);
-+
-+  if (class->flush)
-+    res = class->flush (stream, cancellable, error);
-+  else
-+    res = TRUE;
-+
-+  if (!res)
-+    {
-+      /* flushing caused the error that we want to return,
-+       * but we still want to close the underlying stream if possible
-+       */
-+      if (class->close_fn)
-+        class->close_fn (stream, cancellable, NULL);
-+    }
-+  else
-+    {
-+      res = TRUE;
-+      if (class->close_fn)
-+        res = class->close_fn (stream, cancellable, error);
-+    }
-+
-+  if (cancellable)
-+    g_cancellable_pop_current (cancellable);
-+
-+  stream->priv->closing = FALSE;
-+  stream->priv->closed = TRUE;
-+
-+  return res;
-+}
- 
- /**
-  * g_output_stream_close:
-@@ -514,49 +563,18 @@ g_output_stream_close (GOutputStream  *stream,
- 		       GCancellable   *cancellable,
- 		       GError        **error)
- {
--  GOutputStreamClass *class;
-   gboolean res;
- 
-   g_return_val_if_fail (G_IS_OUTPUT_STREAM (stream), FALSE);
- 
--  class = G_OUTPUT_STREAM_GET_CLASS (stream);
--
-   if (stream->priv->closed)
-     return TRUE;
- 
-   if (!g_output_stream_set_pending (stream, error))
-     return FALSE;
- 
--  stream->priv->closing = TRUE;
--
--  if (cancellable)
--    g_cancellable_push_current (cancellable);
-+  res = _g_output_stream_close_internal (stream, cancellable, error);
- 
--  if (class->flush)
--    res = class->flush (stream, cancellable, error);
--  else
--    res = TRUE;
--  
--  if (!res)
--    {
--      /* flushing caused the error that we want to return,
--       * but we still want to close the underlying stream if possible
--       */
--      if (class->close_fn)
--	class->close_fn (stream, cancellable, NULL);
--    }
--  else
--    {
--      res = TRUE;
--      if (class->close_fn)
--	res = class->close_fn (stream, cancellable, error);
--    }
--  
--  if (cancellable)
--    g_cancellable_pop_current (cancellable);
--
--  stream->priv->closing = FALSE;
--  stream->priv->closed = TRUE;
-   g_output_stream_clear_pending (stream);
-   
-   return res;

diff --git a/dev-libs/glib/glib-2.29.92.ebuild b/dev-libs/glib/glib-2.30.0.ebuild
similarity index 97%
rename from dev-libs/glib/glib-2.29.92.ebuild
rename to dev-libs/glib/glib-2.30.0.ebuild
index 169bc12..e089386 100644
--- a/dev-libs/glib/glib-2.29.92.ebuild
+++ b/dev-libs/glib/glib-2.30.0.ebuild
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 		~app-text/docbook-xml-dtd-4.1.2 )
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
-		>=dev-util/gdbus-codegen-2.29.92
+		>=dev-util/gdbus-codegen-2.30.0
 		>=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
 PDEPEND="introspection? ( dev-libs/gobject-introspection )
@@ -58,9 +58,6 @@ src_prepare() {
 		fi
 	fi
 
-	# Don't close output stream twice; will be in next release
-	epatch "${FILESDIR}/${P}-close-stream-twice.patch"
-
 	# Don't fail gio tests when ran without userpriv, upstream bug 552912
 	# This is only a temporary workaround, remove as soon as possible
 	epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"

diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index 49e5712..e089386 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 		~app-text/docbook-xml-dtd-4.1.2 )
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
-		>=dev-util/gdbus-codegen-2.29.92
+		>=dev-util/gdbus-codegen-2.30.0
 		>=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
 PDEPEND="introspection? ( dev-libs/gobject-introspection )