From 17a14b17fea88369d2eb82c7572a7995b132da12 Mon Sep 17 00:00:00 2001 From: landry Date: Sun, 11 Oct 2009 11:14:18 +0000 Subject: [PATCH] Unbreak after gtk+2 update.. using private gtk struct fields is nasty. Now, let's try to update that crap to a newer version... sigh. --- www/kazehakase/Makefile | 8 ++--- .../patches/patch-src_widget_kz-entry_c | 30 +++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 www/kazehakase/patches/patch-src_widget_kz-entry_c diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile index ec78e66cf10..b54b2737348 100644 --- a/www/kazehakase/Makefile +++ b/www/kazehakase/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2009/08/10 06:34:56 kili Exp $ +# $OpenBSD: Makefile,v 1.13 2009/10/11 11:14:18 landry Exp $ COMMENT-main= common files for kazehakase COMMENT-gecko= lightweight gecko-based web browser @@ -10,9 +10,9 @@ SHARED_ONLY= Yes VERSION= 0.5.6 DISTNAME= kazehakase-${VERSION} -PKGNAME-main= kazehakase-common-${VERSION}p1 -PKGNAME-gecko= ${DISTNAME}p3 -PKGNAME-webkit= kazehakase-webkit-${VERSION}p2 +PKGNAME-main= kazehakase-common-${VERSION}p2 +PKGNAME-gecko= ${DISTNAME}p4 +PKGNAME-webkit= kazehakase-webkit-${VERSION}p3 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=kazehakase/33533/} HOMEPAGE= http://kazehakase.sourceforge.jp/ diff --git a/www/kazehakase/patches/patch-src_widget_kz-entry_c b/www/kazehakase/patches/patch-src_widget_kz-entry_c new file mode 100644 index 00000000000..656c8d1523a --- /dev/null +++ b/www/kazehakase/patches/patch-src_widget_kz-entry_c @@ -0,0 +1,30 @@ +$OpenBSD: patch-src_widget_kz-entry_c,v 1.1 2009/10/11 11:14:18 landry Exp $ +--- src/widget/kz-entry.c.orig Sun Oct 11 11:54:47 2009 ++++ src/widget/kz-entry.c Sun Oct 11 11:54:58 2009 +@@ -515,7 +515,7 @@ gtk_entry_create_layout (GtkEntry *entry, + + if (entry->visible) + { +- g_string_prepend_len (tmp_string, entry->text, entry->n_bytes); ++ g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes); + g_string_insert (tmp_string, cursor_index, preedit_string); + } + else +@@ -524,7 +524,7 @@ gtk_entry_create_layout (GtkEntry *entry, + gint preedit_len_chars; + gunichar invisible_char; + +- ch_len = g_utf8_strlen (entry->text, entry->n_bytes); ++ ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes); + preedit_len_chars = g_utf8_strlen (preedit_string, -1); + ch_len += preedit_len_chars; + +@@ -558,7 +558,7 @@ gtk_entry_create_layout (GtkEntry *entry, + { + if (entry->visible) + { +- pango_layout_set_text (layout, entry->text, entry->n_bytes); ++ pango_layout_set_text (layout, entry->text, entry->x_n_bytes); + } + else + {