Hello community, here is the log from the commit of package glade for openSUSE:Factory checked in at 2017-09-13 21:47:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glade (Old) and /work/SRC/openSUSE:Factory/.glade.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glade" Wed Sep 13 21:47:39 2017 rev:29 rq:523027 version:3.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/glade/glade.changes 2016-06-03 16:29:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glade.new/glade.changes 2017-09-13 21:47:40.719783384 +0200 @@ -1,0 +2,16 @@ +Sun Sep 10 22:57:19 UTC 2017 - [email protected] + +- Remove redundant %clean section, and the no-op --with-pic. +- Ensure neutrality of descriptions. Trim/update descriptions. + +------------------------------------------------------------------- +Wed May 31 09:51:11 UTC 2017 - [email protected] + +- Add glade-use-g_ptr_array_find-from-GLib.patch and add explicit + pkgconfig(glib-2.0) BuildRequires: Fix build with new glib, patch + from upstream git (bgo#782161). +- Following the above, add gnome-common BuildRequires and pass + NOCONFIGURE=1 autogen.sh, as the above patch touches the + buildsystem. + +------------------------------------------------------------------- New: ---- glade-use-g_ptr_array_find-from-GLib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glade.spec ++++++ --- /var/tmp/diff_new_pack.vsi1hL/_old 2017-09-13 21:47:41.395688289 +0200 +++ /var/tmp/diff_new_pack.vsi1hL/_new 2017-09-13 21:47:41.395688289 +0200 @@ -1,7 +1,7 @@ # # spec file for package glade # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,13 +24,17 @@ Group: Development/Tools/GUI Builders Url: http://glade.gnome.org/ Source: http://download.gnome.org/sources/glade/3.20/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM glade-use-g_ptr_array_find-from-GLib.patch bgo#782161 [email protected] -- Fix build with new glib2 +Patch0: glade-use-g_ptr_array_find-from-GLib.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes +BuildRequires: gnome-common BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: python-devel BuildRequires: update-desktop-files BuildRequires: yelp-tools +BuildRequires: pkgconfig(glib-2.0) >= 2.53.2 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.20.0 BuildRequires: pkgconfig(libxml-2.0) >= 2.4.0 @@ -39,31 +43,31 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Glade is a RAD tool to enable quick & easy development of user -interfaces for the Gtk+ 3 toolkit and the GNOME desktop environment. +Glade is a RAD tool to develop user interfaces for the Gtk+ 3 toolkit +and the GNOME desktop environment. %package -n libgladeui-2-6 -Summary: User Interface Builder for GTK+ 3 +Summary: Core library of the GLADE User Interface Builder Group: System/Libraries Recommends: %{name}-lang %description -n libgladeui-2-6 -Glade is a RAD tool to enable quick & easy development of user -interfaces for the Gtk+ 3 toolkit and the GNOME desktop environment. +Glade is a RAD tool to develop user interfaces for the Gtk+ 3 toolkit +and the GNOME desktop environment. %package -n typelib-1_0-Gladeui-2_0 -Summary: User Interface Builder for GTK+ 3 -- Introspection bindings +Summary: Introspection bindins for libgladeui Group: System/Libraries %description -n typelib-1_0-Gladeui-2_0 -Glade is a RAD tool to enable quick & easy development of user -interfaces for the Gtk+ 3 toolkit and the GNOME desktop environment. +Glade is a RAD tool to develop user interfaces for the Gtk+ 3 toolkit +and the GNOME desktop environment. This package provides the GObject Introspection bindings for the libgladeui library. %package -n libgladeui-2-devel -Summary: User Interface Builder for GTK+ 3 -- Development Files +Summary: Development files for libgladeui Group: Development/Libraries/C and C++ Requires: libgladeui-2-6 = %{version} Requires: typelib-1_0-Gladeui-2_0 = %{version} @@ -71,16 +75,21 @@ Conflicts: libgladeui-1-devel %description -n libgladeui-2-devel -Glade is a RAD tool to enable quick & easy development of user -interfaces for the Gtk+ 3 toolkit and the GNOME desktop environment. +Glade is a RAD tool to develop user interfaces for the Gtk+ 3 toolkit +and the GNOME desktop environment. + +This subpackage contains the header files for developing +applications that want to make use of libgladeui. %lang_package %prep %setup -q +%patch0 -p1 %build -%configure --disable-static --with-pic -make %{?jobs:-j%jobs} V=1 +NOCONFIGURE=1 ./autogen.sh +%configure --disable-static +make %{?_smp_mflags} V=1 %install %makeinstall @@ -89,9 +98,6 @@ %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}%{_datadir} -%clean -rm -rf %{buildroot} - %post %desktop_database_post %icon_theme_cache_post ++++++ glade-use-g_ptr_array_find-from-GLib.patch ++++++ >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 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, -- cgit v0.12
