<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f0400757cc4eb85b71b157d6ac28a2b26214a758">https://github.com/macports/macports-ports/commit/f0400757cc4eb85b71b157d6ac28a2b26214a758</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f040075 glade: update to version 3.20.1
</span>f040075 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f0400757cc4eb85b71b157d6ac28a2b26214a758
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Oct 23 21:06:31 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> glade: update to version 3.20.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Apply upstream post-release patch.
</span>---
devel/glade/Portfile | 9 ++--
devel/glade/files/fix-gtk-style-context-use.patch | 55 +++++++++++++++++++++++
devel/glade/files/glib-2.54.patch | 52 ---------------------
3 files changed, 59 insertions(+), 57 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glade/Portfile b/devel/glade/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 73b2231..c874d33 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,7 @@ PortGroup gobject_introspection 1.0
</span> PortGroup active_variants 1.1
name glade
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.20.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.20.1
</span> license LGPL-2+ GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description Glade is a RAD tool to enable quick & easy development of user interfaces \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,8 +19,8 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 41f49e78492e52f9a5f51c3a8d0aecadb147796d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 82d96dca5dec40ee34e2f41d49c13b4ea50da8f32a3a49ca2da802ff14dc18fe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 082f5e95240ef735a0f732fa9f8887c0751c072a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8064676dd46baa7e00c38ec1cc3ddc75c4ef5e714cd9d1491309b4df3e9cb1df
</span>
depends_skip_archcheck devhelp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +43,7 @@ depends_run port:desktop-file-utils \
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles glib-2.54.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles fix-gtk-style-context-use.patch
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glade/files/fix-gtk-style-context-use.patch b/devel/glade/files/fix-gtk-style-context-use.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5744826
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glade/files/fix-gtk-style-context-use.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1734289c750cf5c3f780bec474e80f8f1427ebe4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Arnaud Rebillout <arnaud@preev.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 13 Jun 2017 15:03:02 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Fix use of GTK+ style context in GladeDesignLayout.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+It seems like modifying the style context in the 'draw' handler is not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+recommended, and we need to save/restore the context.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Otherwise, for some widgets (GtkButton, GtkComboBox), the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GladeDesignLayout gets trapped in draw-damage loop.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See 0c076cc8828cd80f1f156a08569199675bf35165 for reference.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gladeui/glade-design-layout.c | 7 ++++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gladeui/glade-design-layout.c b/gladeui/glade-design-layout.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b5970ce..17e9a60 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gladeui/glade-design-layout.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gladeui/glade-design-layout.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1033,13 +1033,13 @@ draw_frame (GtkWidget *widget, cairo_t *cr, gboolean selected,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (priv->widget_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GdkRectangle *rect = &priv->south_east;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gtk_style_context_save (context);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_style_context_add_class (context, "handle");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_render_background (context, cr, rect->x, rect->y, rect->width, rect->height);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_render_frame (context, cr, rect->x, rect->y, rect->width, rect->height);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_render_layout (context, cr, rect->x + OUTLINE_WIDTH, rect->y + OUTLINE_WIDTH,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ priv->widget_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gtk_style_context_remove_class (context, "handle");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gtk_style_context_restore (context);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1084,6 +1084,7 @@ draw_selection (cairo_t *cr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (alloc.x < 0 || alloc.y < 0) return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ context = gtk_widget_get_style_context (parent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gtk_style_context_save (context);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_style_context_add_class (context, "selection");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r = color->red; g = color->green; b = color->blue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_widget_translate_coordinates (widget, parent, 0, 0, &x, &y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1122,7 +1123,7 @@ draw_selection (cairo_t *cr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Draw Selection box */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_render_frame (context, cr, x - left, y - top, w + left + right, h + top + bottom);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gtk_style_context_remove_class (context, "selection");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gtk_style_context_restore (context);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DIMENSION_OFFSET 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glade/files/glib-2.54.patch b/devel/glade/files/glib-2.54.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9ade763..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glade/files/glib-2.54.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,52 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From cb87c89745c93969c3742e7a8a11d546c00107c8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Juan Pablo Ugarte <juanpablougarte@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 11 Aug 2017 18:17:18 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: GladeSignalModel: rename g_ptr_array_find() to prt_array_find()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GLib 2.54 introduced g_ptr_array_find() which clashes with our own function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gladeui/glade-signal-model.c | 8 ++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gladeui/glade-signal-model.c b/gladeui/glade-signal-model.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2b383e5..aed27b1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gladeui/glade-signal-model.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gladeui/glade-signal-model.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,7 +65,7 @@ G_DEFINE_TYPE_WITH_CODE (GladeSignalModel, glade_signal_model, G_TYPE_OBJECT,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_tree_drag_source_iface_init))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static gint
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--g_ptr_array_find (GPtrArray *array, gpointer data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ptr_array_find (GPtrArray *array, gpointer data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gint i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < array->len; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -524,7 +524,7 @@ glade_signal_model_get_path (GtkTreeModel *model, GtkTreeIter *iter)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (handlers)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gint handler_index = g_ptr_array_find (handlers, handler);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gint handler_index = ptr_array_find (handlers, handler);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (handler_index == -1) /* dummy handler */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- index1 += handlers->len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -582,7 +582,7 @@ glade_signal_model_get_value (GtkTreeModel *model,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GPtrArray *handlers = g_hash_table_lookup (sig_model->priv->signals,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glade_signal_get_name (signal));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!handlers || !handlers->len || g_ptr_array_find (handlers, signal) == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!handlers || !handlers->len || ptr_array_find (handlers, signal) == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_value_set_boolean (value, TRUE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_value_set_boolean (value, FALSE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -718,7 +718,7 @@ glade_signal_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (handlers)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gint new_index = g_ptr_array_find (handlers, handler) + 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gint new_index = ptr_array_find (handlers, handler) + 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (new_index < handlers->len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glade_signal_model_create_signal_iter (sig_model, widget,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cgit v0.12
</span></pre><pre style='margin:0'>
</pre>