r53435 - in /desktop/unstable/glade/debian: changelog control control.in patches/ patches/Use_g_ptr_array_find_from_glib.patch patches/series
jbicha at users.alioth.debian.org
jbicha at users.alioth.debian.org
Mon Sep 4 01:48:43 UTC 2017
Author: jbicha
Date: Mon Sep 4 01:48:42 2017
New Revision: 53435
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53435
Log:
Apply upstream fix for build failure with glib2.0 (Closes: #870749)
Added:
desktop/unstable/glade/debian/patches/
desktop/unstable/glade/debian/patches/Use_g_ptr_array_find_from_glib.patch
desktop/unstable/glade/debian/patches/series
Modified:
desktop/unstable/glade/debian/changelog
desktop/unstable/glade/debian/control
desktop/unstable/glade/debian/control.in
Modified: desktop/unstable/glade/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/changelog?rev=53435&op=diff
==============================================================================
--- desktop/unstable/glade/debian/changelog [utf-8] (original)
+++ desktop/unstable/glade/debian/changelog [utf-8] Mon Sep 4 01:48:42 2017
@@ -1,3 +1,12 @@
+glade (3.20.0-3) UNRELEASED; urgency=medium
+
+ * Add Use_g_ptr_array_find_from_glib.patch:
+ - Apply upstream fix for build failure with latest glib2.0. Thanks
+ Adrian Bunk for the bug report and suggested fix. (Closes: #870749)
+ * Build-Depend on libglib2.0-dev (>= 2.53.2) for that change
+
+ -- Jeremy Bicha <jbicha at debian.org> Sun, 03 Sep 2017 21:42:46 -0400
+
glade (3.20.0-2) unstable; urgency=medium
[ Jeremy Bicha ]
Modified: desktop/unstable/glade/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/control?rev=53435&op=diff
==============================================================================
--- desktop/unstable/glade/debian/control [utf-8] (original)
+++ desktop/unstable/glade/debian/control [utf-8] Mon Sep 4 01:48:42 2017
@@ -6,13 +6,14 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Jeremy Bicha <jbicha at debian.org>, Michael Biebl <biebl at debian.org>
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glade
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/glade
Build-Depends: debhelper (>= 10),
gnome-pkg-tools (>= 0.10),
gnome-common,
libxml2-dev (>= 2.4.0),
+ libglib2.0-dev (>= 2.53.2),
libgtk-3-dev (>= 3.20.0),
python-gi-dev (>= 2.90.4),
python2.7-dev,
Modified: desktop/unstable/glade/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/control.in?rev=53435&op=diff
==============================================================================
--- desktop/unstable/glade/debian/control.in [utf-8] (original)
+++ desktop/unstable/glade/debian/control.in [utf-8] Mon Sep 4 01:48:42 2017
@@ -9,6 +9,7 @@
gnome-pkg-tools (>= 0.10),
gnome-common,
libxml2-dev (>= 2.4.0),
+ libglib2.0-dev (>= 2.53.2),
libgtk-3-dev (>= 3.20.0),
python-gi-dev (>= 2.90.4),
python2.7-dev,
Added: desktop/unstable/glade/debian/patches/Use_g_ptr_array_find_from_glib.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/patches/Use_g_ptr_array_find_from_glib.patch?rev=53435&op=file
==============================================================================
--- desktop/unstable/glade/debian/patches/Use_g_ptr_array_find_from_glib.patch (added)
+++ desktop/unstable/glade/debian/patches/Use_g_ptr_array_find_from_glib.patch [utf-8] Mon Sep 4 01:48:42 2017
@@ -0,0 +1,90 @@
+From 8a73d114ca5b4d37a770d0b6b69dd17a366dbcf4 Mon Sep 17 00:00:00 2001
+From: Jonh Wendell <jonh.wendell at redhat.com>
+Date: Thu, 4 May 2017 11:05:48 -0300
+Subject: Use g_ptr_array_find() from GLib
+
+https://bugzilla.gnome.org/show_bug.cgi?id=782161
+---
+ configure.ac | 2 ++
+ gladeui/glade-signal-model.c | 30 ++++++++++--------------------
+ 2 files changed, 12 insertions(+), 20 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ac59f09..db7487e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,8 +146,10 @@ dnl ================================================================
+ dnl Check for gtk+
+ dnl ================================================================
+ GTK_REQUIRED=3.20.0
++GLIB_REQUIRED=2.53.2
+ PKG_CHECK_MODULES([GTK],[
+ gtk+-3.0 >= $GTK_REQUIRED
++ glib-2.0 >= $GLIB_REQUIRED
+ gmodule-2.0
+ libxml-2.0 >= 2.4.0
+ ])
+diff --git a/gladeui/glade-signal-model.c b/gladeui/glade-signal-model.c
+index 2b383e5..4d1a8a4 100644
+--- a/gladeui/glade-signal-model.c
++++ b/gladeui/glade-signal-model.c
+@@ -64,18 +64,6 @@ G_DEFINE_TYPE_WITH_CODE (GladeSignalModel, glade_signal_model, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
+ gtk_tree_drag_source_iface_init))
+
+-static gint
+-g_ptr_array_find (GPtrArray *array, gpointer data)
+-{
+- gint i;
+- for (i = 0; i < array->len; i++)
+- {
+- if (array->pdata[i] == data)
+- return i;
+- }
+- return -1;
+-}
+-
+ static void
+ glade_signal_model_init (GladeSignalModel *object)
+ {
+@@ -524,13 +512,11 @@ glade_signal_model_get_path (GtkTreeModel *model, GtkTreeIter *iter)
+ {
+ if (handlers)
+ {
+- gint handler_index = g_ptr_array_find (handlers, handler);
+- if (handler_index == -1) /* dummy handler */
+- {
+- index1 += handlers->len;
+- }
+- else
++ guint handler_index;
++ if (g_ptr_array_find (handlers, handler, &handler_index))
+ index1 += handler_index;
++ else
++ index1 += handlers->len;
+ }
+ break;
+ }
+@@ -582,7 +568,8 @@ glade_signal_model_get_value (GtkTreeModel *model,
+ {
+ GPtrArray *handlers = g_hash_table_lookup (sig_model->priv->signals,
+ glade_signal_get_name (signal));
+- if (!handlers || !handlers->len || g_ptr_array_find (handlers, signal) == 0)
++ guint index;
++ if (!handlers || !handlers->len || (g_ptr_array_find (handlers, signal, &index) && index == 0))
+ g_value_set_boolean (value, TRUE);
+ else
+ g_value_set_boolean (value, FALSE);
+@@ -718,7 +705,10 @@ glade_signal_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
+ }
+ else if (handlers)
+ {
+- gint new_index = g_ptr_array_find (handlers, handler) + 1;
++ guint new_index = 0;
++ if (g_ptr_array_find (handlers, handler, &new_index))
++ new_index++;
++
+ if (new_index < handlers->len)
+ {
+ glade_signal_model_create_signal_iter (sig_model, widget,
+
Added: desktop/unstable/glade/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/patches/series?rev=53435&op=file
==============================================================================
--- desktop/unstable/glade/debian/patches/series (added)
+++ desktop/unstable/glade/debian/patches/series [utf-8] Mon Sep 4 01:48:42 2017
@@ -0,0 +1 @@
+Use_g_ptr_array_find_from_glib.patch
More information about the pkg-gnome-commits
mailing list