[arch-commits] Commit in glib2/trunk (4 files)
Jan Steffens
heftig at nymeria.archlinux.org
Mon May 13 14:45:57 UTC 2013
Date: Monday, May 13, 2013 @ 16:45:56
Author: heftig
Revision: 185344
2.36.2
Modified:
glib2/trunk/PKGBUILD
Deleted:
glib2/trunk/0001-Make-gtester-report-work-with-Python-3.x.patch
glib2/trunk/gvariant-fix-annotation.patch
glib2/trunk/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch
-----------------------------------------------------------------+
0001-Make-gtester-report-work-with-Python-3.x.patch | 60 ----
PKGBUILD | 20 -
gvariant-fix-annotation.patch | 25 -
partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch | 132 ----------
4 files changed, 6 insertions(+), 231 deletions(-)
Deleted: 0001-Make-gtester-report-work-with-Python-3.x.patch
===================================================================
--- 0001-Make-gtester-report-work-with-Python-3.x.patch 2013-05-13 14:31:21 UTC (rev 185343)
+++ 0001-Make-gtester-report-work-with-Python-3.x.patch 2013-05-13 14:45:56 UTC (rev 185344)
@@ -1,60 +0,0 @@
-From 3d81e0a414ecb876f2429c0108a685152bd4ee54 Mon Sep 17 00:00:00 2001
-From: Jan de Groot <jgc at archlinux.org>
-Date: Thu, 21 Mar 2013 20:47:57 +0100
-Subject: [PATCH] Make gtester-report work with Python 3.x: - fix indentations
- (tabs to spaces) - Replace print with print(), still works with Python 2.x
-
----
- glib/gtester-report | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/glib/gtester-report b/glib/gtester-report
-index 0fcdd9a..00296ea 100755
---- a/glib/gtester-report
-+++ b/glib/gtester-report
-@@ -308,20 +308,20 @@ class HTMLReportWriter(ReportWriter):
- if binary.success_cases:
- oklink = 'href="javascript:toggle_display (\'ResultTable\', \'tr\', \'b%u_\', \'success\')"' % self.bcounter
- if real_cases != 0:
-- self.oprint ('<a %s>ER</a>\n' % erlink)
-- self.oprint ('<a %s>OK</a>\n' % oklink)
-- self.oprint ('</td>\n')
-- perc = binary.success_cases * 100.0 / real_cases
-- pcolor = {
-- 100 : 'bgcolor="lightgreen"',
-- 0 : 'bgcolor="red"',
-- }.get (int (perc), 'bgcolor="yellow"')
-- self.oprint ('<td align="right" %s>%.2f%%</td>\n' % (pcolor, perc))
-- self.oprint ('</tr>\n')
-+ self.oprint ('<a %s>ER</a>\n' % erlink)
-+ self.oprint ('<a %s>OK</a>\n' % oklink)
-+ self.oprint ('</td>\n')
-+ perc = binary.success_cases * 100.0 / real_cases
-+ pcolor = {
-+ 100 : 'bgcolor="lightgreen"',
-+ 0 : 'bgcolor="red"',
-+ }.get (int (perc), 'bgcolor="yellow"')
-+ self.oprint ('<td align="right" %s>%.2f%%</td>\n' % (pcolor, perc))
-+ self.oprint ('</tr>\n')
- else:
-- self.oprint ('Empty\n')
-- self.oprint ('</td>\n')
-- self.oprint ('</tr>\n')
-+ self.oprint ('Empty\n')
-+ self.oprint ('</td>\n')
-+ self.oprint ('</tr>\n')
- for tc in binary.testcases:
- self.handle_testcase (tc, binary)
- def handle_totals (self):
-@@ -466,7 +466,7 @@ def parse_opts():
- " Needs python-subunit]")
- options, files = parser.parse_args()
- if options.version:
-- print parser.epilog
-+ print(parser.epilog)
- return None, None
- if len(files) != 1:
- parser.error("Must supply a log file to parse.")
---
-1.8.2
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-13 14:31:21 UTC (rev 185343)
+++ PKGBUILD 2013-05-13 14:45:56 UTC (rev 185344)
@@ -3,31 +3,23 @@
pkgbase=glib2
pkgname=(glib2 glib2-docs)
-pkgver=2.36.1
-pkgrel=3
+pkgver=2.36.2
+pkgrel=1
pkgdesc="Common C routines used by GTK+ and other libs"
url="http://www.gtk.org/"
arch=(i686 x86_64)
makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils')
source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
- revert-warn-glib-compile-schemas.patch
- gvariant-fix-annotation.patch
- partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch)
-sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24'
- '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
- 'ebbb0581322b1fc546f93f9d77f39f37584004086d2f6f2637a8bb7894e36b2b'
- '5928ac4fd114cda846fe38a3b8bedc5b038dbf9e47f76029af7d75e5dc8ae5be')
+ revert-warn-glib-compile-schemas.patch)
+sha256sums=('5ea98451fb57d0ba523a1e836545f0a919b498863056fdd9da69d148c1347f80'
+ '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
build() {
cd glib-$pkgver
- # fix FS#34630 https://bugs.archlinux.org/task/34630
+ # workaround FS#34630 https://bugzilla.gnome.org/show_bug.cgi?id=698716
export CFLAGS+=" -Wall"
- # Upstream fixes from 2.36 branch
- patch -Np1 -i ../gvariant-fix-annotation.patch
- patch -Np1 -i ../partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch
-
patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
--sysconfdir=/etc \
Deleted: gvariant-fix-annotation.patch
===================================================================
--- gvariant-fix-annotation.patch 2013-05-13 14:31:21 UTC (rev 185343)
+++ gvariant-fix-annotation.patch 2013-05-13 14:45:56 UTC (rev 185344)
@@ -1,25 +0,0 @@
-From 7304bbd5d8ad56dcf3ee9fadf74f6104c49d4df7 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna at src.gnome.org>
-Date: Fri, 12 Apr 2013 15:25:15 +0000
-Subject: GVariant: fix transfer annotation
-
-g_variant_new_from_bytes() returns a floating reference, so it
-must be annotated (transfer none)
-
-https://bugzilla.gnome.org/show_bug.cgi?id=697887
----
-diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c
-index b96bc90..f823e01 100644
---- a/glib/gvariant-core.c
-+++ b/glib/gvariant-core.c
-@@ -498,7 +498,7 @@ g_variant_alloc (const GVariantType *type,
- *
- * A reference is taken on @bytes.
- *
-- * Returns: a new #GVariant with a floating reference
-+ * Returns: (transfer none): a new #GVariant with a floating reference
- *
- * Since: 2.36
- */
---
-cgit v0.9.1
Deleted: partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch
===================================================================
--- partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch 2013-05-13 14:31:21 UTC (rev 185343)
+++ partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch 2013-05-13 14:45:56 UTC (rev 185344)
@@ -1,132 +0,0 @@
-From f3b1054b0ebb4912f700e08da0c3d35c30113e79 Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt at desrt.ca>
-Date: Tue, 23 Apr 2013 17:26:48 +0000
-Subject: Partially revert "Merge waitpid() from g_spawn_sync into gmain()"
-
-This partially reverts commit ce0022933c255313e010b27f977f4ae02aad1e7e.
-
-It used to be safe to use g_spawn_sync() from processes that had their
-own SIGCHLD handler because it simply called wait(). When it was
-changed to depend on the GLib child watching infrastructure this meant
-that GLib had to own the SIGCHLD handler.
-
-This caused hangs in at least Pidgin.
-
-The patch contained two other improvements to the child watch code which
-we want to keep, so only revert the changes to gspawn itself.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=698081
----
-diff --git a/glib/gspawn.c b/glib/gspawn.c
-index 381ed5c..01cedf6 100644
---- a/glib/gspawn.c
-+++ b/glib/gspawn.c
-@@ -47,7 +47,6 @@
-
- #include "genviron.h"
- #include "gmem.h"
--#include "gmain.h"
- #include "gshell.h"
- #include "gstring.h"
- #include "gstrfuncs.h"
-@@ -207,21 +206,6 @@ read_data (GString *str,
- }
- }
-
--typedef struct {
-- GMainLoop *loop;
-- gint *status_p;
--} SyncWaitpidData;
--
--static void
--on_sync_waitpid (GPid pid,
-- gint status,
-- gpointer user_data)
--{
-- SyncWaitpidData *data = user_data;
-- *(data->status_p) = status;
-- g_main_loop_quit (data->loop);
--}
--
- /**
- * g_spawn_sync:
- * @working_directory: (allow-none): child's current working directory, or %NULL to inherit parent's
-@@ -277,7 +261,6 @@ g_spawn_sync (const gchar *working_directory,
- GString *errstr = NULL;
- gboolean failed;
- gint status;
-- SyncWaitpidData waitpid_data;
-
- g_return_val_if_fail (argv != NULL, FALSE);
- g_return_val_if_fail (!(flags & G_SPAWN_DO_NOT_REAP_CHILD), FALSE);
-@@ -410,32 +393,45 @@ g_spawn_sync (const gchar *working_directory,
- close_and_invalidate (&outpipe);
- if (errpipe >= 0)
- close_and_invalidate (&errpipe);
--
-- /* Now create a temporary main context and loop, with just one
-- * waitpid source. We used to invoke waitpid() directly here, but
-- * this way we unify with the worker thread in gmain.c.
-+
-+ /* Wait for child to exit, even if we have
-+ * an error pending.
- */
-- {
-- GMainContext *context;
-- GMainLoop *loop;
-- GSource *source;
--
-- context = g_main_context_new ();
-- loop = g_main_loop_new (context, TRUE);
-+ again:
-+
-+ ret = waitpid (pid, &status, 0);
-
-- waitpid_data.loop = loop;
-- waitpid_data.status_p = &status;
--
-- source = g_child_watch_source_new (pid);
-- g_source_set_callback (source, (GSourceFunc)on_sync_waitpid, &waitpid_data, NULL);
-- g_source_attach (source, context);
-- g_source_unref (source);
--
-- g_main_loop_run (loop);
-+ if (ret < 0)
-+ {
-+ if (errno == EINTR)
-+ goto again;
-+ else if (errno == ECHILD)
-+ {
-+ if (exit_status)
-+ {
-+ g_warning ("In call to g_spawn_sync(), exit status of a child process was requested but ECHILD was received by waitpid(). Most likely the process is ignoring SIGCHLD, or some other thread is invoking waitpid() with a nonpositive first argument; either behavior can break applications that use g_spawn_sync either directly or indirectly.");
-+ }
-+ else
-+ {
-+ /* We don't need the exit status. */
-+ }
-+ }
-+ else
-+ {
-+ if (!failed) /* avoid error pileups */
-+ {
-+ int errsv = errno;
-
-- g_main_context_unref (context);
-- g_main_loop_unref (loop);
-- }
-+ failed = TRUE;
-+
-+ g_set_error (error,
-+ G_SPAWN_ERROR,
-+ G_SPAWN_ERROR_READ,
-+ _("Unexpected error in waitpid() (%s)"),
-+ g_strerror (errsv));
-+ }
-+ }
-+ }
-
- if (failed)
- {
---
-cgit v0.9.1
More information about the arch-commits
mailing list