diff options
| author | wiz <wiz> | 2011-12-20 16:14:44 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-12-20 16:14:44 +0000 |
| commit | e5f0dd179f635eac49a31907df5ae1b94eba8c0b (patch) | |
| tree | 0c1ceb625bf5a76e9d4c39204e8895c7b335a107 /math | |
| parent | 15451dda9c69e79b34c6ad16e2eae36055975b5a (diff) | |
| download | pkgsrc-e5f0dd179f635eac49a31907df5ae1b94eba8c0b.tar.gz | |
Fix build with newer GTK2.
Diffstat (limited to 'math')
| -rw-r--r-- | math/pspp/distinfo | 3 | ||||
| -rw-r--r-- | math/pspp/patches/patch-lib_gtksheet_gtkitementry.c | 60 |
2 files changed, 62 insertions, 1 deletions
diff --git a/math/pspp/distinfo b/math/pspp/distinfo index 442ff85e272..40946381885 100644 --- a/math/pspp/distinfo +++ b/math/pspp/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.16 2010/03/09 02:06:37 taca Exp $ +$NetBSD: distinfo,v 1.17 2011/12/20 16:14:44 wiz Exp $ SHA1 (pspp-0.6.2.tar.gz) = c45f721a7ee82aede2106b77eade5e568c0930da RMD160 (pspp-0.6.2.tar.gz) = 97667eb32b23a1bc7d18b7022649bd973ff01424 Size (pspp-0.6.2.tar.gz) = 3375748 bytes SHA1 (patch-aa) = c7024562eee77aa558931cab387d250e046f11e4 SHA1 (patch-ad) = cd06383be08b753423ea10f52098135002671385 +SHA1 (patch-lib_gtksheet_gtkitementry.c) = 22242a3b1b68f77abf98f3d919f955e8537ac0f9 diff --git a/math/pspp/patches/patch-lib_gtksheet_gtkitementry.c b/math/pspp/patches/patch-lib_gtksheet_gtkitementry.c new file mode 100644 index 00000000000..e12cc0ecf51 --- /dev/null +++ b/math/pspp/patches/patch-lib_gtksheet_gtkitementry.c @@ -0,0 +1,60 @@ +$NetBSD: patch-lib_gtksheet_gtkitementry.c,v 1.1 2011/12/20 16:14:44 wiz Exp $ + +Fix conflict with newer GTK2. + +--- lib/gtksheet/gtkitementry.c.orig 2009-09-18 03:05:40.000000000 +0000 ++++ lib/gtksheet/gtkitementry.c +@@ -145,7 +145,7 @@ static void gtk_entry_draw_curso + 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 mygtk_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 + if (position != entry->current_pos || + position != entry->selection_bound) + { +- gtk_entry_reset_im_context (entry); ++ mygtk_entry_reset_im_context (entry); + gtk_entry_set_positions (entry, position, position); + } + } +@@ -895,7 +895,7 @@ gtk_entry_move_cursor (GtkEntry *e + { + gint new_pos = entry->current_pos; + +- gtk_entry_reset_im_context (entry); ++ mygtk_entry_reset_im_context (entry); + + if (entry->current_pos != entry->selection_bound && !extend_selection) + { +@@ -989,7 +989,7 @@ gtk_entry_insert_at_cursor (GtkEntry + + if (entry->editable) + { +- gtk_entry_reset_im_context (entry); ++ mygtk_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 + gint start_pos = entry->current_pos; + gint end_pos = entry->current_pos; + +- gtk_entry_reset_im_context (entry); ++ mygtk_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) ++mygtk_entry_reset_im_context (GtkEntry *entry) + { + if (entry->need_im_reset) + { |