<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[135417] users/devans/GNOME-3/stable/dports/devel/glade</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/135417">135417</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-04-23 09:43:20 -0700 (Thu, 23 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: glade, apply recent upstream patches, reconfigure using upstream autogen.sh for intltool 0.51 compatibility, increment revision to rebuild.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsdevelgladePortfile">users/devans/GNOME-3/stable/dports/devel/glade/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>users/devans/GNOME-3/stable/dports/devel/glade/files/</li>
<li><a href="#usersdevansGNOME3stabledportsdevelgladefilespatchupstreamfixesthru20141205diff">users/devans/GNOME-3/stable/dports/devel/glade/files/patch-upstream-fixes-thru-20141205.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsdevelgladePortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/devel/glade/Portfile (135416 => 135417)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glade/Portfile 2015-04-23 15:59:40 UTC (rev 135416)
+++ users/devans/GNOME-3/stable/dports/devel/glade/Portfile 2015-04-23 16:43:20 UTC (rev 135417)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name glade
</span><span class="cx"> version 3.18.3
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> license LGPL-2+ GPL-2+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Glade is a RAD tool to enable quick & easy development of user interfaces \
</span><span class="lines">@@ -30,7 +30,10 @@
</span><span class="cx"> port:itstool \
</span><span class="cx"> port:gnome-common \
</span><span class="cx"> port:yelp-tools \
</span><del>- port:gtk-doc
</del><ins>+ port:gtk-doc \
+ port:autoconf \
+ port:automake \
+ port:libtool
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gtk3 \
</span><span class="cx"> port:libxml2
</span><span class="lines">@@ -40,14 +43,11 @@
</span><span class="cx">
</span><span class="cx"> gobject_introspection yes
</span><span class="cx">
</span><del>-# update m4/intltool.m4 and autoreconf
</del><ins>+patchfiles patch-upstream-fixes-thru-20141205.diff
</ins><span class="cx">
</span><del>-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
-}
</del><ins>+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</ins><span class="cx">
</span><del>-use_autoreconf yes
-autoreconf.args -fvi
</del><ins>+configure.cmd ./autogen.sh
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # disable optimization which (at least with clang)
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsdevelgladefilespatchupstreamfixesthru20141205diff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/devel/glade/files/patch-upstream-fixes-thru-20141205.diff (0 => 135417)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/devel/glade/files/patch-upstream-fixes-thru-20141205.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/devel/glade/files/patch-upstream-fixes-thru-20141205.diff 2015-04-23 16:43:20 UTC (rev 135417)
</span><span class="lines">@@ -0,0 +1,283 @@
</span><ins>+From f7152fc8c76ce30310b488adb110000cadab4291 Mon Sep 17 00:00:00 2001
+From: Juan Pablo Ugarte <juanpablougarte@gmail.com>
+Date: Sat, 17 May 2014 20:12:15 -0300
+Subject: GladeBaseEditor->build_child() use correct type for paramenters Fixes
+ bug 704600 "Cannot add items to menu hierarchy - assertion
+ `GLADE_IS_WIDGET_ADAPTOR (adaptor)' failed"
+
+ GladeWidget * (*build_child) (GladeBaseEditor *, GladeWidget *, GType);
+
+glin-genmarshal does not have a specific type for GType thus back in the day UINT was used instead.
+But this is not correct in systems where GType is bigger than UINT
+
+diff --git a/gladeui/glade-base-editor.c b/gladeui/glade-base-editor.c
+index 2a28875..faa344f 100644
+--- gladeui/glade-base-editor.c
++++ gladeui/glade-base-editor.c
+@@ -1560,9 +1560,8 @@ glade_base_editor_class_init (GladeBaseEditorClass *klass)
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GladeBaseEditorClass, build_child),
+- _glade_stop_emission_accumulator, NULL,
+- _glade_marshal_OBJECT__OBJECT_UINT,
+- G_TYPE_OBJECT, 2, G_TYPE_OBJECT, G_TYPE_UINT);
++ _glade_stop_emission_accumulator, NULL, NULL,
++ G_TYPE_OBJECT, 2, G_TYPE_OBJECT, G_TYPE_GTYPE);
+
+ /**
+ * GladeBaseEditor::delete-child:
+--
+cgit v0.10.2
+
+From d00ece8aa71332930e4a2d0d490d175567dbde36 Mon Sep 17 00:00:00 2001
+From: David Shea <dshea@redhat.com>
+Date: Wed, 23 Jul 2014 17:34:02 -0400
+Subject: Avoid reading freed data in glade_project_read_requires
+
+Ensure that required_lib is NULL at the start of each iteration through
+the loop.
+
+diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
+index eecdb86..e91b0cb 100644
+--- gladeui/glade-project.c
++++ gladeui/glade-project.c
+@@ -1435,7 +1435,6 @@ glade_project_read_requires (GladeProject *project,
+
+ GString *string = g_string_new (NULL);
+ GladeXmlNode *node;
+- gchar *required_lib = NULL;
+ gboolean loadable = TRUE;
+ guint16 major, minor;
+ gint position = 0;
+@@ -1443,6 +1442,8 @@ glade_project_read_requires (GladeProject *project,
+ for (node = glade_xml_node_get_children_with_comments (root_node);
+ node; node = glade_xml_node_next_with_comments (node))
+ {
++ gchar *required_lib = NULL;
++
+ /* Skip non "requires" tags */
+ if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_REQUIRES) ||
+ (required_lib =
+--
+cgit v0.10.2
+
+From 779f60a38020779445abb7a52ba5b1d2603a6bc4 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Fri, 10 Oct 2014 22:32:06 -0700
+Subject: style: Fix indentation of #ifdef block for OS X
+
+There are no tabs in the rest of the file, so this matches the
+surrounding indentation.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=738339
+
+diff --git a/src/glade-window.c b/src/glade-window.c
+index 702e79f..2e36cfa 100644
+--- src/glade-window.c
++++ src/glade-window.c
+@@ -3272,36 +3272,36 @@ glade_window_constructed (GObject *object)
+ G_CALLBACK (clipboard_notify_handler_cb), window);
+
+ #ifdef MAC_INTEGRATION
+- {
+- /* Fix up the menubar for MacOSX Quartz builds */
+- GtkWidget *menubar = GET_OBJECT (builder, GTK_WIDGET, "menubar");
+- GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
+- GtkWidget *sep, *widget;
+-
+- gtk_widget_hide (menubar);
+- gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar));
+- widget = GET_OBJECT (builder, GTK_WIDGET, "quit_menuitem");
+- gtk_widget_hide (widget);
+- widget = GET_OBJECT (builder, GTK_WIDGET, "about_menuitem");
+- gtk_osxapplication_insert_app_menu_item (theApp, widget, 0);
+- sep = gtk_separator_menu_item_new();
+- g_object_ref(sep);
+- gtk_osxapplication_insert_app_menu_item (theApp, sep, 1);
+-
+- widget = GET_OBJECT (builder, GTK_WIDGET, "properties_menuitem");
+- gtk_osxapplication_insert_app_menu_item (theApp, widget, 2);
+- sep = gtk_separator_menu_item_new();
+- g_object_ref(sep);
+- gtk_osxapplication_insert_app_menu_item (theApp, sep, 3);
+-
+- widget = GET_OBJECT (builder, GTK_WIDGET, "help_menuitem");
+- gtk_osxapplication_set_help_menu(theApp, GTK_MENU_ITEM(widget));
+-
+- g_signal_connect(theApp, "NSApplicationWillTerminate",
+- G_CALLBACK(on_quit_action_activate), window);
+-
+- gtk_osxapplication_ready(theApp);
+- }
++ {
++ /* Fix up the menubar for MacOSX Quartz builds */
++ GtkWidget *menubar = GET_OBJECT (builder, GTK_WIDGET, "menubar");
++ GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
++ GtkWidget *sep, *widget;
++
++ gtk_widget_hide (menubar);
++ gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar));
++ widget = GET_OBJECT (builder, GTK_WIDGET, "quit_menuitem");
++ gtk_widget_hide (widget);
++ widget = GET_OBJECT (builder, GTK_WIDGET, "about_menuitem");
++ gtk_osxapplication_insert_app_menu_item (theApp, widget, 0);
++ sep = gtk_separator_menu_item_new();
++ g_object_ref(sep);
++ gtk_osxapplication_insert_app_menu_item (theApp, sep, 1);
++
++ widget = GET_OBJECT (builder, GTK_WIDGET, "properties_menuitem");
++ gtk_osxapplication_insert_app_menu_item (theApp, widget, 2);
++ sep = gtk_separator_menu_item_new();
++ g_object_ref(sep);
++ gtk_osxapplication_insert_app_menu_item (theApp, sep, 3);
++
++ widget = GET_OBJECT (builder, GTK_WIDGET, "help_menuitem");
++ gtk_osxapplication_set_help_menu(theApp, GTK_MENU_ITEM(widget));
++
++ g_signal_connect(theApp, "NSApplicationWillTerminate",
++ G_CALLBACK(on_quit_action_activate), window);
++
++ gtk_osxapplication_ready(theApp);
++ }
+ #endif
+
+ show_dock_first_time (window, DOCK_PALETTE, priv->dock_palette_action);
+--
+cgit v0.10.2
+
+From 62a115d0231f5fd0f47b8110251738ab14371524 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Fri, 10 Oct 2014 22:35:24 -0700
+Subject: osx: Use current gtk-mac-integration API
+
+The #ifdef'd block did not compile at all because it used the old API
+from gtk-mac-integration, and because it used GtkBuilder when the
+surrounding code had been ported to use widget templates.
+
+This fixes up the use of the API and adds a few widget variables to
+GladeWindowPrivate which have to be bound to the template.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=738339
+
+diff --git a/configure.ac b/configure.ac
+index 0c19bdd..377ce3a 100644
+--- configure.ac
++++ configure.ac
+@@ -263,7 +263,7 @@ dnl ================================================================
+ _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0`
+ AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
+ if test "x$_gdk_tgt" = xquartz; then
+- PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration)
++ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3)
+
+ GTK_MAC_BUNDLE_FLAG=
+
+diff --git a/src/glade-window.c b/src/glade-window.c
+index 2e36cfa..c397909 100644
+--- src/glade-window.c
++++ src/glade-window.c
+@@ -136,11 +136,17 @@ struct _GladeWindowPrivate
+ GtkActionGroup *static_actiongroup;
+ GtkActionGroup *view_actiongroup;
+
++ GtkMenuShell *menubar;
+ GtkMenuShell *project_menu;
+
+ GtkRecentManager *recent_manager;
+ GtkWidget *recent_menu;
+
++ GtkWidget *quit_menuitem;
++ GtkWidget *about_menuitem;
++ GtkWidget *properties_menuitem;
++ GtkMenuItem *help_menuitem;
++
+ gchar *default_path; /* the default path for open/save operations */
+
+ GtkToolItem *undo_toolbutton; /* customized buttons for undo/redo with history */
+@@ -3274,33 +3280,29 @@ glade_window_constructed (GObject *object)
+ #ifdef MAC_INTEGRATION
+ {
+ /* Fix up the menubar for MacOSX Quartz builds */
+- GtkWidget *menubar = GET_OBJECT (builder, GTK_WIDGET, "menubar");
+- GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
+- GtkWidget *sep, *widget;
+-
+- gtk_widget_hide (menubar);
+- gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar));
+- widget = GET_OBJECT (builder, GTK_WIDGET, "quit_menuitem");
+- gtk_widget_hide (widget);
+- widget = GET_OBJECT (builder, GTK_WIDGET, "about_menuitem");
+- gtk_osxapplication_insert_app_menu_item (theApp, widget, 0);
++ GtkosxApplication *theApp = gtkosx_application_get ();
++ GtkWidget *sep;
++
++ gtk_widget_hide (priv->menubar);
++ gtkosx_application_set_menu_bar (theApp, priv->menubar);
++ gtk_widget_hide (priv->quit_menuitem);
++ gtkosx_application_insert_app_menu_item (theApp, priv->about_menuitem, 0);
+ sep = gtk_separator_menu_item_new();
+ g_object_ref(sep);
+- gtk_osxapplication_insert_app_menu_item (theApp, sep, 1);
++ gtkosx_application_insert_app_menu_item (theApp, sep, 1);
+
+- widget = GET_OBJECT (builder, GTK_WIDGET, "properties_menuitem");
+- gtk_osxapplication_insert_app_menu_item (theApp, widget, 2);
++ gtkosx_application_insert_app_menu_item (theApp, priv->properties_menuitem,
++ 2);
+ sep = gtk_separator_menu_item_new();
+ g_object_ref(sep);
+- gtk_osxapplication_insert_app_menu_item (theApp, sep, 3);
++ gtkosx_application_insert_app_menu_item (theApp, sep, 3);
+
+- widget = GET_OBJECT (builder, GTK_WIDGET, "help_menuitem");
+- gtk_osxapplication_set_help_menu(theApp, GTK_MENU_ITEM(widget));
++ gtkosx_application_set_help_menu (theApp, priv->help_menuitem);
+
+ g_signal_connect(theApp, "NSApplicationWillTerminate",
+ G_CALLBACK(on_quit_action_activate), window);
+
+- gtk_osxapplication_ready(theApp);
++ gtkosx_application_ready (theApp);
+ }
+ #endif
+
+@@ -3393,7 +3395,12 @@ glade_window_class_init (GladeWindowClass *klass)
+ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, pointer_mode_actiongroup);
+ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, static_actiongroup);
+ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, view_actiongroup);
+-
++ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, menubar);
++ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, quit_menuitem);
++ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, properties_menuitem);
++ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, about_menuitem);
++ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, help_menuitem);
++
+ /* Actions */
+ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, save_action);
+ gtk_widget_class_bind_template_child_private (widget_class, GladeWindow, quit_action);
+--
+cgit v0.10.2
+
+From 1a47c6b15a0297dee5c65f4eb6c1bd1bfeb36946 Mon Sep 17 00:00:00 2001
+From: Juan Pablo Ugarte <juanpablougarte@gmail.com>
+Date: Fri, 5 Dec 2014 14:17:59 -0300
+Subject: glade_preview_window_screenshot() fixed segfault when saving to png
+ file. Bug #741165 "Previewer crashes when taking PNG screenshot"
+
+
+diff --git a/gladeui/glade-preview-window.c b/gladeui/glade-preview-window.c
+index cb2bfd6..388ba2d 100644
+--- gladeui/glade-preview-window.c
++++ gladeui/glade-preview-window.c
+@@ -481,7 +481,7 @@ glade_preview_window_screenshot (GladePreviewWindow *window,
+ const gchar *ext = glade_preview_get_extension (filename);
+ GError *error = NULL;
+
+- if (gdk_pixbuf_save (pix, filename, ext ? ext : "png", &error, NULL))
++ if (!gdk_pixbuf_save (pix, filename, ext ? ext : "png", &error, NULL))
+ {
+ g_warning ("Could not save screenshot to %s because %s", filename, error->message);
+ g_error_free (error);
+--
+cgit v0.10.2
+
</ins></span></pre>
</div>
</div>
</body>
</html>