Package: pspp
Version: 0.6.2-3
Tags: patch
User: [email protected]
Usertags: origin-ubuntu natty ubuntu-patch
*** /tmp/tmpo5BMbf
In Ubuntu, the attached patch was applied to achieve the following:
* apply patch from upstream to fix FTBFS (LP: #756034)
The patch is taken from
http://lists.gnu.org/archive/html/pspp-dev/2010-11/msg00038.html
Thanks for considering the patch.
-- System Information:
Debian Release: squeeze/sid
APT prefers natty
APT policy: (500, 'natty')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.38-8-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== modified file 'lib/gtksheet/gtkitementry.c'
--- lib/gtksheet/gtkitementry.c 2009-11-05 23:24:10 +0000
+++ lib/gtksheet/gtkitementry.c 2011-04-13 17:49:19 +0000
@@ -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)
{
