<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/5f906e58c5e927a762946d189f807a86eb20403c">https://github.com/macports/macports-ports/commit/5f906e58c5e927a762946d189f807a86eb20403c</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 5f906e5 glade: update to version 3.20.2
</span>5f906e5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5f906e58c5e927a762946d189f807a86eb20403c
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Nov 26 16:50:43 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> glade: update to version 3.20.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove upstream patch now included in distribution.
</span>---
devel/glade/Portfile | 8 ++--
devel/glade/files/fix-gtk-style-context-use.patch | 55 -----------------------
2 files changed, 3 insertions(+), 60 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 c874d33..4e03685 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,7 +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.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.20.2
</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;'>@@ -19,8 +19,8 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 082f5e95240ef735a0f732fa9f8887c0751c072a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8064676dd46baa7e00c38ec1cc3ddc75c4ef5e714cd9d1491309b4df3e9cb1df
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 13c1787e5958c404c6efca7417dab5673fb420af \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 07d1545570951aeded20e9fdc6d3d8a56aeefe2538734568c5335be336c6abed
</span>
depends_skip_archcheck devhelp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,8 +43,6 @@ depends_run port:desktop-file-utils \
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles fix-gtk-style-context-use.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
configure.cmd ./autogen.sh
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5744826..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glade/files/fix-gtk-style-context-use.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,55 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 1734289c750cf5c3f780bec474e80f8f1427ebe4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Arnaud Rebillout <arnaud@preev.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 13 Jun 2017 15:03:02 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Fix use of GTK+ style context in GladeDesignLayout.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-It seems like modifying the style context in the 'draw' handler is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-recommended, and we need to save/restore the context.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Otherwise, for some widgets (GtkButton, GtkComboBox), the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GladeDesignLayout gets trapped in draw-damage loop.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See 0c076cc8828cd80f1f156a08569199675bf35165 for reference.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gladeui/glade-design-layout.c | 7 ++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+), 3 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-design-layout.c b/gladeui/glade-design-layout.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b5970ce..17e9a60 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gladeui/glade-design-layout.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gladeui/glade-design-layout.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1033,13 +1033,13 @@ draw_frame (GtkWidget *widget, cairo_t *cr, gboolean selected,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (priv->widget_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GdkRectangle *rect = &priv->south_east;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_style_context_save (context);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_style_context_add_class (context, "handle");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_render_background (context, cr, rect->x, rect->y, rect->width, rect->height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_render_frame (context, cr, rect->x, rect->y, rect->width, rect->height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_render_layout (context, cr, rect->x + OUTLINE_WIDTH, rect->y + OUTLINE_WIDTH,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- priv->widget_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gtk_style_context_remove_class (context, "handle");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_style_context_restore (context);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1084,6 +1084,7 @@ draw_selection (cairo_t *cr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (alloc.x < 0 || alloc.y < 0) return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- context = gtk_widget_get_style_context (parent);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_style_context_save (context);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_style_context_add_class (context, "selection");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r = color->red; g = color->green; b = color->blue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_widget_translate_coordinates (widget, parent, 0, 0, &x, &y);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1122,7 +1123,7 @@ draw_selection (cairo_t *cr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Draw Selection box */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_render_frame (context, cr, x - left, y - top, w + left + right, h + top + bottom);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gtk_style_context_remove_class (context, "selection");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_style_context_restore (context);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define DIMENSION_OFFSET 9
</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>