Re: PSPP-BUG: Error with make building PSPP 0.6.2 on Mandriva 2011

[Ben Pfaff]

Kyle N Winfree <address@hidden> writes:

>     Here's the full output.  Can you briefly walk me through how you
> came to to the solution after reading though this?  I'd like to learn
> how to handle these things in the future.

The important parts of the output are these lines that point out
the errors:

lib/gtksheet/gtkitementry.c:148:21: error: static declaration of 
‘gtk_entry_reset_im_context’ follows non-static declaration
/usr/include/gtk-2.0/gtk/gtkentry.h:311:13: note: previous declaration of 
‘gtk_entry_reset_im_context’ was here
lib/gtksheet/gtkitementry.c: In function ‘gtk_item_entry_class_init’:
lib/gtksheet/gtkitementry.c:228:19: warning: variable ‘object_class’ set but 
not used [-Wunused-but-set-variable]
lib/gtksheet/gtkitementry.c: In function ‘gtk_entry_realize’:
lib/gtksheet/gtkitementry.c:289:16: warning: variable ‘editable’ set but not 
used [-Wunused-but-set-variable]
lib/gtksheet/gtkitementry.c: At top level:
lib/gtksheet/gtkitementry.c:2196:1: warning: 
‘gtk_entry_update_primary_selection’ defined but not used [-Wunused-function]

It looks like this commit from the "stable" branch (which isn't
in 0.6.2) is the fix.  Please try it:

--8<--------------------------cut here-------------------------->8--

From: Ben Pfaff <address@hidden>
Date: Tue, 30 Nov 2010 20:29:59 -0800
Subject: [PATCH] gtksheet: Fix name collision with GTK+ 2.22.

This just adds a "pspp_" prefix to gtk_entry_reset_im_context().

Bug report and fix from Jeremy Lavergne <address@hidden>.
---
 lib/gtksheet/gtkitementry.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/gtksheet/gtkitementry.c b/lib/gtksheet/gtkitementry.c
index 703215c..c7c211e 100644
--- a/lib/gtksheet/gtkitementry.c
+++ b/lib/gtksheet/gtkitementry.c
@@ -145,7 +145,7 @@ static void         gtk_entry_draw_cursor              
(GtkEntry       *entry,
 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 @@ gtk_entry_real_set_position (GtkEditable *editable,
   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 @@ gtk_entry_move_cursor (GtkEntry       *entry,
 {
   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 @@ gtk_entry_insert_at_cursor (GtkEntry    *entry,
 
   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 @@ gtk_entry_delete_from_cursor (GtkEntry       *entry,
   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 @@ gtk_entry_queue_draw (GtkEntry *entry)
 }
 
 static void
-gtk_entry_reset_im_context (GtkEntry *entry)
+pspp_gtk_entry_reset_im_context (GtkEntry *entry)
 {
   if (entry->need_im_reset)
     {
-- 
1.7.2.5


-- 
Ben Pfaff 
http://benpfaff.org