Your message dated Mon, 04 Sep 2017 03:05:27 +0000
with message-id <[email protected]>
and subject line Bug#870749: fixed in glade 3.20.0-3
has caused the Debian Bug report #870749,
regarding glade FTBFS with glib 2.53.4
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
870749: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870749
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: glade
Version: 3.20.0-2
Severity: serious
Tags: patch buster sid
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/glade.html
...
glade-signal-model.c:68:1: error: conflicting types for 'g_ptr_array_find'
g_ptr_array_find (GPtrArray *array, gpointer data)
^~~~~~~~~~~~~~~~
In file included from /usr/include/glib-2.0/glib.h:31:0,
from /usr/include/glib-2.0/gobject/gbinding.h:28,
from /usr/include/glib-2.0/glib-object.h:23,
from glade-signal-model.h:23,
from glade-signal-model.c:23:
/usr/include/glib-2.0/glib/garray.h:186:12: note: previous declaration of
'g_ptr_array_find' was here
gboolean g_ptr_array_find (GPtrArray *haystack,
^~~~~~~~~~~~~~~~
Makefile:1210: recipe for target 'libgladeui_2_la-glade-signal-model.lo' failed
make[4]: *** [libgladeui_2_la-glade-signal-model.lo] Error 1
The upstream fix is attached.
>From 8a73d114ca5b4d37a770d0b6b69dd17a366dbcf4 Mon Sep 17 00:00:00 2001
From: Jonh Wendell <[email protected]>
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 ac59f096..db7487ef 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 2b383e51..4d1a8a40 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,
--
2.11.0
--- End Message ---
--- Begin Message ---
Source: glade
Source-Version: 3.20.0-3
We believe that the bug you reported is fixed in the latest version of
glade, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jeremy Bicha <[email protected]> (supplier of updated glade package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sun, 03 Sep 2017 21:57:55 -0400
Source: glade
Binary: libgladeui-2-6 libgladeui-common libgladeui-dev libgladeui-doc
gir1.2-gladeui-2.0 glade
Architecture: source
Version: 3.20.0-3
Distribution: unstable
Urgency: medium
Maintainer: Debian GNOME Maintainers
<[email protected]>
Changed-By: Jeremy Bicha <[email protected]>
Description:
gir1.2-gladeui-2.0 - GObject introspection data for the GTK+ User Interface
library
glade - GTK+ User Interface Builder
libgladeui-2-6 - GTK+ User Interface Build core library
libgladeui-common - GTK+ User Interface Build core library (common files)
libgladeui-dev - GTK+ User Interface Build core library (development files)
libgladeui-doc - GTK+ User Interface Build core library (documentation)
Closes: 870749
Changes:
glade (3.20.0-3) unstable; 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
* Bump Standards-Version to 4.1.0
Checksums-Sha1:
31d014883b6261daa811b004680efea31366c521 2696 glade_3.20.0-3.dsc
afffbd21bd8f8fa951936c0d19ee543a40bd7cc7 28568 glade_3.20.0-3.debian.tar.xz
e2849919af09ffa635c4aeab47bc6c042e99fb93 16209 glade_3.20.0-3_source.buildinfo
Checksums-Sha256:
30778953e4d38399df70edace3eedfda83c4e35315675b54f9fd83a7b19c409f 2696
glade_3.20.0-3.dsc
ac6e98d530f525517bc89c0b968b599f8dca112305ad91520cbb36a62bc930c7 28568
glade_3.20.0-3.debian.tar.xz
2b51c9faad570e38f2eb86a0482b03c0b612e21515c86daa262248195a9fa235 16209
glade_3.20.0-3_source.buildinfo
Files:
ae061408abc9f69e3995c6efc1dbfef4 2696 gnome optional glade_3.20.0-3.dsc
083e56ec114377f0148d7fe7cb8823c2 28568 gnome optional
glade_3.20.0-3.debian.tar.xz
c96e4f9c5348f703f703bd6cdf404b03 16209 gnome optional
glade_3.20.0-3_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIcBAEBCgAGBQJZrLNeAAoJEOZsd1rr/mx9zakP/iHAOyrzqoCn+AwGHSWbKJvR
vNxrjEOKbQo9qH/7jNgAwpQ06p1/VodC4bJApn0SV/X2+RFzet8+2DP1mpNpG//R
G/T4LxaPJI5LQN4bYKBY80IR++fcIY1xfo/OrJqW+lVd0kjyY5ULd57Q5bb/3VzQ
gC+TbqqaMbGTB/DqI04zSfiqhg5R6o8Lp0W7zU6/GBfBwxA+bKX2ZdobOsEybV1D
lnNiUwYbDEX4UUghAkdY8aXDuRzX0vgnnuDZQF9A2STTZgXxljxaRF0VURmAup6v
Y6yWWEokE7AGWIfPRv4b8toMHjhL/0QDGWSPxd5wSvp9ni3S9rAWZtMLsvFYajNJ
1Ko2tXhMnTojI7Rg0WQKZnsfl3vEPOSHr5bJrLsA5+bOvsxmNVO5bdSBOA4xXTfV
k2unqsexrQt8cMXetKIf/IOR74L6wloTsW6LoaHcUgTAt0n7sZH1TxdthpPh1sj+
Uh9/lGxh7eFtls+q5BVoFesApuGquJVLnDBeG0qfCX3+lILyMg+SBVp4AIw0/YW2
s1JSt3Hy5MxLwzfaqmgaHHiM6EBFfBxdvCSm7BDb7R7nrXuB6M6/9qJN5CZyDB7r
5/qjLcenDhhHinBMk0H+Yx68rJeB6Pqi3L+jvD5Os/SoM9B+Yql+dAybLlyj+9qK
Ry7gL6UnIrI+41r0pzeo
=ExgP
-----END PGP SIGNATURE-----
--- End Message ---
