r43949 - in /desktop/experimental/glib2.0/debian: changelog patches/0001-gmain-fix-poll-record-comparison.patch patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Fri Nov 28 18:08:09 2014
New Revision: 43949

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43949
Log:
0001-gmain-fix-poll-record-comparison.patch: gmain: fix the sorting of
poll records. Resolves FTBFS on ppc64el.

Added:
    desktop/experimental/glib2.0/debian/patches/0001-gmain-fix-poll-record-comparison.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=43949&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Fri Nov 28 18:08:09 2014
@@ -4,6 +4,8 @@
     Cherry-pick patch from upstream. Check signal detail too when looking for
     pending signal handlers, so that subscribing to changed signals with a
     detail works again.
+  * 0001-gmain-fix-poll-record-comparison.patch: gmain: fix the sorting of
+    poll records. Resolves FTBFS on ppc64el.
 
  -- Iain Lane <laney at debian.org>  Fri, 28 Nov 2014 17:55:55 +0000
 

Added: desktop/experimental/glib2.0/debian/patches/0001-gmain-fix-poll-record-comparison.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/0001-gmain-fix-poll-record-comparison.patch?rev=43949&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/0001-gmain-fix-poll-record-comparison.patch	(added)
+++ desktop/experimental/glib2.0/debian/patches/0001-gmain-fix-poll-record-comparison.patch	[utf-8] Fri Nov 28 18:08:09 2014
@@ -0,0 +1,32 @@
+From d2e79653c093050d790fd43680a420910ba4610e Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Fri, 28 Nov 2014 12:43:03 -0500
+Subject: [PATCH] gmain: fix poll record comparison
+
+We intend to keep the list of poll records sorted by (integer) file
+descriptor, but due to a typo we are actually keeping it sorted by
+pointer address of the GPollFD.
+
+Fix that.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=11059
+---
+ glib/gmain.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glib/gmain.c b/glib/gmain.c
+index e2b6ca3..e20128a 100644
+--- a/glib/gmain.c
++++ b/glib/gmain.c
+@@ -4205,7 +4205,7 @@ g_main_context_add_poll_unlocked (GMainContext *context,
+   nextrec = context->poll_records;
+   while (nextrec)
+     {
+-      if (nextrec->fd > fd)
++      if (nextrec->fd->fd > fd->fd)
+         break;
+       prevrec = nextrec;
+       nextrec = nextrec->next;
+-- 
+2.1.3
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=43949&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Fri Nov 28 18:08:09 2014
@@ -21,3 +21,4 @@
 regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch
 regex-test-do-not-assert-that-system-PCRE-still-has-.patch
 0001-GSettings-fix-check-for-delaying-backend-subscriptio.patch
+0001-gmain-fix-poll-record-comparison.patch