* [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2011-08-30 21:55 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-08-30 21:55 UTC (permalink / raw
To: gentoo-commits
commit: 3ac8f4cc84f91a0e13c382c6b7f8f866709d0376
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 18:12:53 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Aug 30 18:12:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3ac8f4cc
dev-libs/glib: 2.29.16-r1 → 2.29.18
Version bump, now with a new wallclock API.
---
...h => glib-2.29.18-external-gdbus-codegen.patch} | 50 +++++++++++---------
...{glib-2.29.16-r1.ebuild => glib-2.29.18.ebuild} | 4 +-
dev-libs/glib/glib-9999.ebuild | 4 +-
3 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.29.16-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch
similarity index 61%
rename from dev-libs/glib/files/glib-2.29.16-external-gdbus-codegen.patch
rename to dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch
index 6f38bf8..abec0dd 100644
--- a/dev-libs/glib/files/glib-2.29.16-external-gdbus-codegen.patch
+++ b/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch
@@ -1,4 +1,4 @@
-From 995d2ce4854fd95079f87ba20307c092398cfca3 Mon Sep 17 00:00:00 2001
+From 89a3234d52451cadb21c322931adb6e8928eb21d Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gmail.com>
Date: Wed, 24 Aug 2011 21:35:59 -0400
Subject: [PATCH] Use an external gdbus-codegen package
@@ -7,12 +7,12 @@ Subject: [PATCH] Use an external gdbus-codegen package
configure.ac | 4 +---
docs/reference/gio/Makefile.am | 3 +--
gio/Makefile.am | 2 +-
- gio/tests/Makefile.am | 2 +-
- gio/tests/gdbus-object-manager-example/Makefile.am | 2 +-
- 5 files changed, 5 insertions(+), 8 deletions(-)
+ gio/tests/Makefile.am | 4 +---
+ gio/tests/gdbus-object-manager-example/Makefile.am | 4 +---
+ 5 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 5ef55ce..3f16710 100644
+index dc23b8b..0bb0c4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,7 +365,7 @@ fi
@@ -24,12 +24,12 @@ index 5ef55ce..3f16710 100644
dnl ***********************
-@@ -3841,8 +3841,6 @@ gobject/tests/Makefile
+@@ -3858,8 +3858,6 @@ gobject/tests/Makefile
gthread/Makefile
gthread/tests/Makefile
gio/Makefile
--gio/gdbus-codegen/Makefile
--gio/gdbus-codegen/config.py
+-gio/gdbus-2.0/codegen/Makefile
+-gio/gdbus-2.0/codegen/config.py
gio/xdgmime/Makefile
gio/inotify/Makefile
gio/libasyncns/Makefile
@@ -48,44 +48,48 @@ index 9eb0fce..511aec9 100644
if ENABLE_MAN
diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 0a127a6..d4a08e5 100644
+index 7803bb2..d4a08e5 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
NULL =
--SUBDIRS = gdbus-codegen
+-SUBDIRS = gdbus-2.0/codegen
+SUBDIRS =
if OS_UNIX
SUBDIRS += libasyncns xdgmime
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 45cbe37..5370aa1 100644
+index a85ea4f..8fbe8ec 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
-@@ -260,7 +260,7 @@ gdbus_bz627724_LDADD = $(progs_ldadd)
+@@ -261,9 +261,7 @@ gdbus_bz627724_LDADD = $(progs_ldadd)
if OS_UNIX
gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml
-- $(AM_V_GEN) PYTHONPATH=$(top_srcdir)/gio/gdbus-codegen:$(top_builddir)/gio/gdbus-codegen:$$PYTHONPATH $(PYTHON) $(top_srcdir)/gio/gdbus-codegen/codegen_main.py \
+- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.project. \
- --generate-c-code gdbus-test-codegen-generated \
- --c-generate-object-manager \
+ --interface-prefix org.project. \
+ --generate-c-code gdbus-test-codegen-generated \
+ --c-generate-object-manager \
diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index 3ca56c6..52e7f3d 100644
+index 5e6eb9a..8b16926 100644
--- a/gio/tests/gdbus-object-manager-example/Makefile.am
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -22,7 +22,7 @@ GDBUS_GENERATED = \
+@@ -22,9 +22,7 @@ GDBUS_GENERATED = \
$(NULL)
$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml
-- $(AM_V_GEN) PYTHONPATH=$(top_srcdir)/gio/gdbus-codegen:$(top_builddir)/gio/gdbus-codegen:$$PYTHONPATH $(PYTHON) $(top_srcdir)/gio/gdbus-codegen/codegen_main.py \
+- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- --c-namespace Example \
- --c-generate-object-manager \
+ --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
+ --c-namespace Example \
+ --c-generate-object-manager \
--
-1.7.6
+1.7.6.1
diff --git a/dev-libs/glib/glib-2.29.16-r1.ebuild b/dev-libs/glib/glib-2.29.18.ebuild
similarity index 98%
rename from dev-libs/glib/glib-2.29.16-r1.ebuild
rename to dev-libs/glib/glib-2.29.18.ebuild
index f439e87..d9a1261 100644
--- a/dev-libs/glib/glib-2.29.16-r1.ebuild
+++ b/dev-libs/glib/glib-2.29.18.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
+ >=dev-util/gdbus-codegen-2.29.18
>=sys-apps/dbus-1.2.14 )
!<dev-util/gtk-doc-1.15-r2"
PDEPEND="introspection? ( dev-libs/gobject-introspection )
@@ -88,7 +88,7 @@ src_prepare() {
fi
# gdbus-codegen is a separate package
- epatch "${FILESDIR}/${PN}-2.29.16-external-gdbus-codegen.patch"
+ epatch "${FILESDIR}/${PN}-2.29.18-external-gdbus-codegen.patch"
# disable pyc compiling
ln -sfn $(type -P true) py-compile
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index f439e87..d9a1261 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
+ >=dev-util/gdbus-codegen-2.29.18
>=sys-apps/dbus-1.2.14 )
!<dev-util/gtk-doc-1.15-r2"
PDEPEND="introspection? ( dev-libs/gobject-introspection )
@@ -88,7 +88,7 @@ src_prepare() {
fi
# gdbus-codegen is a separate package
- epatch "${FILESDIR}/${PN}-2.29.16-external-gdbus-codegen.patch"
+ epatch "${FILESDIR}/${PN}-2.29.18-external-gdbus-codegen.patch"
# disable pyc compiling
ln -sfn $(type -P true) py-compile
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2011-09-19 8:43 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-09-19 8:43 UTC (permalink / raw
To: gentoo-commits
commit: a6916622839e4fbfca1d6810de15b900c1dde8dc
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 19 08:38:34 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 19 08:38:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a6916622
dev-libs/glib: 2.29.90 → 2.29.92
Version bump with assorted bugfixes. Requires an up-to-date gdbus
codegen to pass tests.
---
.../files/glib-2.29.90-gsettings-threading.patch | 39 -----
.../files/glib-2.29.92-close-stream-twice.patch | 149 ++++++++++++++++++++
.../{glib-2.29.90.ebuild => glib-2.29.92.ebuild} | 6 +-
dev-libs/glib/glib-9999.ebuild | 2 +-
4 files changed, 153 insertions(+), 43 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.29.90-gsettings-threading.patch b/dev-libs/glib/files/glib-2.29.90-gsettings-threading.patch
deleted file mode 100644
index 63e9c07..0000000
--- a/dev-libs/glib/files/glib-2.29.90-gsettings-threading.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit 27fbaf371278e792c79a3478c2282e43f12472f5
-Author: Ryan Lortie <desrt@desrt.ca>
-Date: Tue Sep 6 14:01:52 2011 -0400
-
- GSettingsBackend: emit changes to correct thread
-
- When g_settings_apply() is called on a delayed settings backend and
- there is a D-Bus error when communicating with dconf-service, recent
- versions of the dconf GSettingsBackend call a function in GLib that
- improperly delivered the signal directly instead of using
- g_main_context_invoke().
-
- This patch fixes this function to route in the same way as the others so
- that the signal is dispatched in the proper GMainContext.
-
-diff --git a/gio/gsettingsbackend.c b/gio/gsettingsbackend.c
-index 4757d63..71341ce 100644
---- a/gio/gsettingsbackend.c
-+++ b/gio/gsettingsbackend.c
-@@ -676,7 +676,6 @@ g_settings_backend_changed_tree (GSettingsBackend *backend,
- GTree *tree,
- gpointer origin_tag)
- {
-- GSettingsBackendWatch *watch;
- const gchar **keys;
- gchar *path;
-
-@@ -696,10 +695,7 @@ g_settings_backend_changed_tree (GSettingsBackend *backend,
- }
- #endif
-
-- for (watch = backend->priv->watches; watch; watch = watch->next)
-- watch->vtable->keys_changed (watch->target, backend,
-- path, keys, origin_tag);
--
-+ g_settings_backend_keys_changed (backend, path, keys, origin_tag);
- g_free (path);
- g_free (keys);
- }
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
new file mode 100644
index 0000000..358bbb5
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.29.92-close-stream-twice.patch
@@ -0,0 +1,149 @@
+commit 7b812c434388f0fc3cbbb67df5ab9f7db3a138ed
+Author: Philip Withnall <philip@tecnocode.co.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.90.ebuild b/dev-libs/glib/glib-2.29.92.ebuild
similarity index 97%
rename from dev-libs/glib/glib-2.29.90.ebuild
rename to dev-libs/glib/glib-2.29.92.ebuild
index f5ce828..169bc12 100644
--- a/dev-libs/glib/glib-2.29.90.ebuild
+++ b/dev-libs/glib/glib-2.29.92.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.18
+ >=dev-util/gdbus-codegen-2.29.92
>=sys-apps/dbus-1.2.14 )
!<dev-util/gtk-doc-1.15-r2"
PDEPEND="introspection? ( dev-libs/gobject-introspection )
@@ -58,8 +58,8 @@ src_prepare() {
fi
fi
- # Fixes g_settings_apply threading bug; will be in next release
- epatch "${FILESDIR}/${P}-gsettings-threading.patch"
+ # 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
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index d9a1261..49e5712 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.18
+ >=dev-util/gdbus-codegen-2.29.92
>=sys-apps/dbus-1.2.14 )
!<dev-util/gtk-doc-1.15-r2"
PDEPEND="introspection? ( dev-libs/gobject-introspection )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2011-09-27 5:58 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-09-27 5:58 UTC (permalink / raw
To: gentoo-commits
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@tecnocode.co.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 )
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-27 5:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-27 5:58 [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/files/, dev-libs/glib/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-09-19 8:43 Alexandre Restovtsev
2011-08-30 21:55 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox