summaryrefslogtreecommitdiff
path: root/graphics/nip2
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2010-11-20 15:37:08 +0000
committerKoop Mast <kwm@FreeBSD.org>2010-11-20 15:37:08 +0000
commit3680f27ebff58ece429c4e032f9ad84fb1372114 (patch)
tree6c5ff4664c1a779ddad350ac887e5706dbfdd4eb /graphics/nip2
parent- Upgrade 1.2000. (diff)
Presenting GNOME 2.32.1 for FreeBSD. The offical release notes for this
release can be found at http://library.gnome.org/misc/release-notes/2.32/ This will be the last release of the GNOME 2.x series, mainly a bugfix and bridge release to the first release of the GNOME 3.x series. This release features commits by avl, marcus, mezz and myself. The FreeBSD GNOME Team would like to thank the following contributors and testers for there help with this release: Zane C.B. <vvelox@vvelox.net> romain@ Olaf Seibert <O.Seibert@cs.ru.nl> DomiX Bapt <baptiste.daroussin@gmail.com> jsa@ miwi@ Sergio de Almeida Lenzi <lenzi.sergio@gmail.com> Maxim Samsonov <xors@mne.ru> Kris Moore And pav@ for 2 exp-runs PR: ports/152255 ports/143260 ports/141033 ports/149629 ports/150350 ports/151523 With hat: gnome@
Diffstat (limited to 'graphics/nip2')
-rw-r--r--graphics/nip2/Makefile2
-rw-r--r--graphics/nip2/files/patch-src_gtkitementry.c56
2 files changed, 57 insertions, 1 deletions
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index cd77657135e9..c36fd1fce617 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nip2
PORTVERSION= 7.14.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
diff --git a/graphics/nip2/files/patch-src_gtkitementry.c b/graphics/nip2/files/patch-src_gtkitementry.c
new file mode 100644
index 000000000000..43b809d653d5
--- /dev/null
+++ b/graphics/nip2/files/patch-src_gtkitementry.c
@@ -0,0 +1,56 @@
+--- src/gtkitementry.c.orig 2010-10-31 15:58:33.000000000 +0100
++++ src/gtkitementry.c 2010-10-31 15:59:28.000000000 +0100
+@@ -131,7 +131,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 nip_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,
+@@ -657,7 +657,7 @@ gtk_entry_real_set_position (GtkEditable
+ if (position != entry->current_pos ||
+ position != entry->selection_bound)
+ {
+- gtk_entry_reset_im_context (entry);
++ nip_gtk_entry_reset_im_context (entry);
+ gtk_entry_set_positions (entry, position, position);
+ }
+ }
+@@ -823,7 +823,7 @@ gtk_entry_move_cursor (GtkEntry *e
+ {
+ gint new_pos = entry->current_pos;
+
+- gtk_entry_reset_im_context (entry);
++ nip_gtk_entry_reset_im_context (entry);
+
+ if (entry->current_pos != entry->selection_bound && !extend_selection)
+ {
+@@ -917,7 +917,7 @@ gtk_entry_insert_at_cursor (GtkEntry
+
+ if (entry->editable)
+ {
+- gtk_entry_reset_im_context (entry);
++ nip_gtk_entry_reset_im_context (entry);
+
+ gtk_editable_insert_text (editable, str, -1, &pos);
+ gtk_editable_set_position (editable, pos);
+@@ -933,7 +933,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);
++ nip_gtk_entry_reset_im_context (entry);
+
+ if (!entry->editable)
+ return;
+@@ -1699,7 +1699,7 @@ gtk_entry_queue_draw (GtkEntry *entry)
+ }
+
+ static void
+-gtk_entry_reset_im_context (GtkEntry *entry)
++nip_gtk_entry_reset_im_context (GtkEntry *entry)
+ {
+ if (entry->need_im_reset)
+ {