[121620] users/devans/dports/editors/abiword-x11

[devans at macports.org]

Revision: 121620
          https://trac.macports.org/changeset/121620
Author:   devans at macports.org
Date:     2014-07-02 07:48:42 -0700 (Wed, 02 Jul 2014)
Log Message:
-----------
devans/dports: abiword-x11, build fixes.

Modified Paths:
--------------
    users/devans/dports/editors/abiword-x11/Portfile

Added Paths:
-----------
    users/devans/dports/editors/abiword-x11/files/patch-src-af-ev-gtk-ev_UnixMenu.cpp.diff
    users/devans/dports/editors/abiword-x11/files/patch-src-af-ev-gtk-ev_UnixToolbar.cpp.diff

Modified: users/devans/dports/editors/abiword-x11/Portfile
===================================================================
--- users/devans/dports/editors/abiword-x11/Portfile	2014-07-02 14:30:03 UTC (rev 121619)
+++ users/devans/dports/editors/abiword-x11/Portfile	2014-07-02 14:48:42 UTC (rev 121620)
@@ -22,7 +22,9 @@
 checksums       rmd160  a3252631bebf28ac22308ce71ad276d9c5280592 \
                 sha256  d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01
 
-patchfiles      patch-configure.diff
+patchfiles      patch-configure.diff \
+                patch-src-af-ev-gtk-ev_UnixMenu.cpp.diff \
+                patch-src-af-ev-gtk-ev_UnixToolbar.cpp.diff
 
 depends_build   port:pkgconfig
 

Added: users/devans/dports/editors/abiword-x11/files/patch-src-af-ev-gtk-ev_UnixMenu.cpp.diff
===================================================================
--- users/devans/dports/editors/abiword-x11/files/patch-src-af-ev-gtk-ev_UnixMenu.cpp.diff	                        (rev 0)
+++ users/devans/dports/editors/abiword-x11/files/patch-src-af-ev-gtk-ev_UnixMenu.cpp.diff	2014-07-02 14:48:42 UTC (rev 121620)
@@ -0,0 +1,11 @@
+--- src/af/ev/gtk/ev_UnixMenu.cpp.orig	2014-07-01 14:38:22.000000000 -0700
++++ src/af/ev/gtk/ev_UnixMenu.cpp	2014-07-01 14:39:41.000000000 -0700
+@@ -988,7 +988,7 @@
+ 	synthesizeMenu(m_wMenuBar, false);
+ 	gtk_widget_show_all(m_wMenuBar);
+ 
+-#ifdef EMBEDDED_TARGET
++#if defined(EMBEDDED_TARGET) || defined(ENABLE_MENUBUTTON)
+ #else
+ 	gtk_box_pack_start(GTK_BOX(wVBox), m_wMenuBar, FALSE, TRUE, 0);
+ #endif	

Added: users/devans/dports/editors/abiword-x11/files/patch-src-af-ev-gtk-ev_UnixToolbar.cpp.diff
===================================================================
--- users/devans/dports/editors/abiword-x11/files/patch-src-af-ev-gtk-ev_UnixToolbar.cpp.diff	                        (rev 0)
+++ users/devans/dports/editors/abiword-x11/files/patch-src-af-ev-gtk-ev_UnixToolbar.cpp.diff	2014-07-02 14:48:42 UTC (rev 121620)
@@ -0,0 +1,29 @@
+--- src/af/ev/gtk/ev_UnixToolbar.cpp.orig	2014-07-01 14:49:33.000000000 -0700
++++ src/af/ev/gtk/ev_UnixToolbar.cpp	2014-07-01 14:50:57.000000000 -0700
+@@ -201,7 +201,7 @@
+ menubutton_show_cb (GtkWidget *widget, gpointer data)
+ {
+ 	g_signal_stop_emission_by_name (G_OBJECT (widget), "show");
+-	gtk_widget_hide_all (widget);
++	gtk_widget_hide (widget);
+ }
+ 
+ /*!
+@@ -235,7 +235,7 @@
+ 		if (children && children->data)
+ 		{
+ 			GtkWidget * button = GTK_WIDGET (children->data);
+-			gtk_widget_hide_all (button);
++			gtk_widget_hide(button);
+ 
+ 			g_signal_connect(G_OBJECT (button), "show",
+ 							 G_CALLBACK (menubutton_show_cb), NULL);
+@@ -1487,7 +1487,7 @@
+ 		gtk_widget_hide (m_wToolbar);
+ #else
+ 		GtkWidget *widget = gtk_bin_get_child(GTK_BIN(m_wHandleBox));
+-		gtk_widget_hide(m_wHandleBox);
++		gtk_widget_hide (m_wHandleBox);
+ 		gtk_widget_hide (gtk_widget_get_parent(m_wToolbar));
+ 		if (getDetachable()) {
+ 			gtk_widget_hide(widget);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140702/6d79de80/attachment-0001.html>