[73889] trunk/dports/math/pspp

[snc at macports.org]

Revision: 73889
          http://trac.macports.org/changeset/73889
Author:   snc at macports.org
Date:     2010-11-27 18:55:19 -0800 (Sat, 27 Nov 2010)
Log Message:
-----------
pspp: avoid gtk naming collision during build

Modified Paths:
--------------
    trunk/dports/math/pspp/Portfile

Added Paths:
-----------
    trunk/dports/math/pspp/files/patch-lib-gtksheet-gtkitmemory.c.diff

Modified: trunk/dports/math/pspp/Portfile
===================================================================
--- trunk/dports/math/pspp/Portfile	2010-11-28 02:25:40 UTC (rev 73888)
+++ trunk/dports/math/pspp/Portfile	2010-11-28 02:55:19 UTC (rev 73889)
@@ -47,7 +47,8 @@
                         --enable-debug \
                         --without-libncurses
 
-patchfiles              patch-config.h.in.diff
+patchfiles              patch-config.h.in.diff \
+                        patch-lib-gtksheet-gtkitmemory.c.diff
 
 test.run                yes
 test.target             check

Added: trunk/dports/math/pspp/files/patch-lib-gtksheet-gtkitmemory.c.diff
===================================================================
--- trunk/dports/math/pspp/files/patch-lib-gtksheet-gtkitmemory.c.diff	                        (rev 0)
+++ trunk/dports/math/pspp/files/patch-lib-gtksheet-gtkitmemory.c.diff	2010-11-28 02:55:19 UTC (rev 73889)
@@ -0,0 +1,56 @@
+--- lib/gtksheet/gtkitementry.c.orig	2010-11-27 21:44:01.000000000 -0500
++++ lib/gtksheet/gtkitementry.c	2010-11-27 21:44:43.000000000 -0500
+@@ -145,7 +145,7 @@
+ static PangoLayout *gtk_entry_ensure_layout            (GtkEntry       *entry,
+                                                         gboolean        include_preedit);
+ static void         gtk_entry_queue_draw               (GtkEntry       *entry);
+-static void         gtk_entry_reset_im_context         (GtkEntry       *entry);
++static void         pspp_gtk_entry_reset_im_context         (GtkEntry       *entry);
+ static void         gtk_entry_recompute                (GtkEntry       *entry);
+ static void         gtk_entry_get_cursor_locations     (GtkEntry       *entry,
+ 							CursorType      type,
+@@ -694,7 +694,7 @@
+   if (position != entry->current_pos ||
+       position != entry->selection_bound)
+     {
+-      gtk_entry_reset_im_context (entry);
++      pspp_gtk_entry_reset_im_context (entry);
+       gtk_entry_set_positions (entry, position, position);
+     }
+ }
+@@ -895,7 +895,7 @@
+ {
+   gint new_pos = entry->current_pos;
+ 
+-  gtk_entry_reset_im_context (entry);
++  pspp_gtk_entry_reset_im_context (entry);
+ 
+   if (entry->current_pos != entry->selection_bound && !extend_selection)
+     {
+@@ -989,7 +989,7 @@
+ 
+   if (entry->editable)
+     {
+-      gtk_entry_reset_im_context (entry);
++      pspp_gtk_entry_reset_im_context (entry);
+ 
+       gtk_editable_insert_text (editable, str, -1, &pos);
+       gtk_editable_set_position (editable, pos);
+@@ -1005,7 +1005,7 @@
+   gint start_pos = entry->current_pos;
+   gint end_pos = entry->current_pos;
+ 
+-  gtk_entry_reset_im_context (entry);
++  pspp_gtk_entry_reset_im_context (entry);
+ 
+   if (!entry->editable)
+     return;
+@@ -1777,7 +1777,7 @@
+ }
+ 
+ static void
+-gtk_entry_reset_im_context (GtkEntry *entry)
++pspp_gtk_entry_reset_im_context (GtkEntry *entry)
+ {
+   if (entry->need_im_reset)
+     {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101127/231b9a96/attachment-0001.html>