diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-09-26 22:50:33 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-09-26 22:50:33 +0800 |
commit | bb264c663d909ad60df8d800e77e8b2ffb561339 (patch) | |
tree | 6331bf1c6d7e8e62df14fb246ee8be080b5ebdb0 /x11-toolkits | |
parent | 80186609a7af3ab41557c6752980726c2550dd53 (diff) | |
download | marcuscom-ports-bb264c663d909ad60df8d800e77e8b2ffb561339.tar marcuscom-ports-bb264c663d909ad60df8d800e77e8b2ffb561339.tar.gz marcuscom-ports-bb264c663d909ad60df8d800e77e8b2ffb561339.tar.bz2 marcuscom-ports-bb264c663d909ad60df8d800e77e8b2ffb561339.tar.lz marcuscom-ports-bb264c663d909ad60df8d800e77e8b2ffb561339.tar.xz marcuscom-ports-bb264c663d909ad60df8d800e77e8b2ffb561339.tar.zst marcuscom-ports-bb264c663d909ad60df8d800e77e8b2ffb561339.zip |
Fix build with the new gtk.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13039 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/gtkextra2/Makefile | 37 | ||||
-rw-r--r-- | x11-toolkits/gtkextra2/distinfo | 3 | ||||
-rw-r--r-- | x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c | 108 | ||||
-rw-r--r-- | x11-toolkits/gtkextra2/pkg-descr | 5 | ||||
-rw-r--r-- | x11-toolkits/gtkextra2/pkg-plist | 53 |
5 files changed, 206 insertions, 0 deletions
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile new file mode 100644 index 000000000..5e830f9a5 --- /dev/null +++ b/x11-toolkits/gtkextra2/Makefile @@ -0,0 +1,37 @@ +# New ports collection makefile for: gtkextra +# Date created: 17 August 2000 +# Whom: Maxim Sobolev <sobomax@FreeBSD.org> +# +# $FreeBSD: ports/x11-toolkits/gtkextra2/Makefile,v 1.32 2009/08/22 00:39:22 amdmi3 Exp $ +# + +PORTNAME= gtkextra +PORTVERSION= 2.1.1 +PORTREVISION= 6 +CATEGORIES= x11-toolkits +MASTER_SITES= SF/scigraphica/GtkExtra/${PORTVERSION}%20Sources +DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION} + +MAINTAINER= ports@FreeBSD.org +COMMENT= A useful widget set complementary to GTK+ 2.0 + +USE_AUTOTOOLS= libtool:22 +USE_GNOME= gtk20 gnomehack +USE_GMAKE= yes +USE_LDCONFIG= yes + +LATEST_LINK= gtkextra2 +DOCSDIR= ${PREFIX}/share/doc/gtkextra2 + +PORTDOCS= * + +post-install: +.if !defined(NOPORTDOCS) +. for d in reference tutorial + cd ${WRKSRC}/docs && \ + ${FIND} ${d} -type d ! -empty -exec ${MKDIR} "${DOCSDIR}/{}" \; && \ + ${FIND} ${d} -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \; +. endfor +.endif + +.include <bsd.port.mk> diff --git a/x11-toolkits/gtkextra2/distinfo b/x11-toolkits/gtkextra2/distinfo new file mode 100644 index 000000000..494112ee3 --- /dev/null +++ b/x11-toolkits/gtkextra2/distinfo @@ -0,0 +1,3 @@ +MD5 (gtk+extra-2.1.1.tar.gz) = 1a933ca1286829383a0554cc2deb9e04 +SHA256 (gtk+extra-2.1.1.tar.gz) = 82d179fd2eb3fd5acbc9fc4d74507c559c6bc3269c488dc8642f9bca47a5dbe4 +SIZE (gtk+extra-2.1.1.tar.gz) = 893481 diff --git a/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c b/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c new file mode 100644 index 000000000..209bf3070 --- /dev/null +++ b/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c @@ -0,0 +1,108 @@ +--- gtkextra/gtkitementry.c.orig 2009-09-26 16:38:37.000000000 +0200 ++++ gtkextra/gtkitementry.c 2009-09-26 16:40:16.000000000 +0200 +@@ -693,23 +693,23 @@ gtk_entry_real_insert_text (GtkEditable + new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text; + } + +- if (new_text_length + entry->n_bytes + 1 > entry->text_size) ++ if (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size) + { +- while (new_text_length + entry->n_bytes + 1 > entry->text_size) ++ while (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size) + { +- if (entry->text_size == 0) +- entry->text_size = MIN_SIZE; ++ if (entry->x_text_size == 0) ++ entry->x_text_size = MIN_SIZE; + else + { +- if (2 * (guint)entry->text_size < MAX_SIZE && +- 2 * (guint)entry->text_size > entry->text_size) +- entry->text_size *= 2; ++ if (2 * (guint)entry->x_text_size < MAX_SIZE && ++ 2 * (guint)entry->x_text_size > entry->x_text_size) ++ entry->x_text_size *= 2; + else + { +- entry->text_size = MAX_SIZE; +- if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1) ++ entry->x_text_size = MAX_SIZE; ++ if (new_text_length > (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1) + { +- new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1; ++ new_text_length = (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1; + new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text; + n_chars = g_utf8_strlen (new_text, new_text_length); + } +@@ -718,19 +718,19 @@ gtk_entry_real_insert_text (GtkEditable + } + } + +- entry->text = g_realloc (entry->text, entry->text_size); ++ entry->text = g_realloc (entry->text, entry->x_text_size); + } + + index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text; + +- g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index); ++ g_memmove (entry->text + index + new_text_length, entry->text + index, entry->x_n_bytes - index); + memcpy (entry->text + index, new_text, new_text_length); + +- entry->n_bytes += new_text_length; ++ entry->x_n_bytes += new_text_length; + entry->text_length += n_chars; + + /* NUL terminate for safety and convenience */ +- entry->text[entry->n_bytes] = '\0'; ++ entry->text[entry->x_n_bytes] = '\0'; + + if (entry->current_pos > *position) + entry->current_pos += n_chars; +@@ -763,9 +763,9 @@ gtk_entry_real_delete_text (GtkEditable + gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text; + gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text; + +- g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index); ++ g_memmove (entry->text + start_index, entry->text + end_index, entry->x_n_bytes + 1 - end_index); + entry->text_length -= (end_pos - start_pos); +- entry->n_bytes -= (end_index - start_index); ++ entry->x_n_bytes -= (end_index - start_index); + + if (entry->current_pos > start_pos) + entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos; +@@ -1028,7 +1028,7 @@ gtk_entry_retrieve_surrounding_cb (GtkIM + { + gtk_im_context_set_surrounding (context, + entry->text, +- entry->n_bytes, ++ entry->x_n_bytes, + g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text); + + return TRUE; +@@ -1229,7 +1229,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 +@@ -1238,7 +1238,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; + +@@ -1272,7 +1272,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 + { diff --git a/x11-toolkits/gtkextra2/pkg-descr b/x11-toolkits/gtkextra2/pkg-descr new file mode 100644 index 000000000..cf241bbab --- /dev/null +++ b/x11-toolkits/gtkextra2/pkg-descr @@ -0,0 +1,5 @@ +GtkExtra is a useful set of widgets for creating GUI's for the X +Window System using GTK+ 2.0. You can use it complementary to GTK+ 2.0 +and it is written in C. + +WWW: http://gtkextra.sourceforge.net/ diff --git a/x11-toolkits/gtkextra2/pkg-plist b/x11-toolkits/gtkextra2/pkg-plist new file mode 100644 index 000000000..b960a16ba --- /dev/null +++ b/x11-toolkits/gtkextra2/pkg-plist @@ -0,0 +1,53 @@ +include/gtkextra-2.0/gtkextra/gtkbordercombo.h +include/gtkextra-2.0/gtkextra/gtkcharsel.h +include/gtkextra-2.0/gtkextra/gtkcheckitem.h +include/gtkextra-2.0/gtkextra/gtkcolorcombo.h +include/gtkextra-2.0/gtkextra/gtkcombobutton.h +include/gtkextra-2.0/gtkextra/gtkdirtree.h +include/gtkextra-2.0/gtkextra/gtkextra-marshal.h +include/gtkextra-2.0/gtkextra/gtkextra.h +include/gtkextra-2.0/gtkextra/gtkextrafeatures.h +include/gtkextra-2.0/gtkextra/gtkextraicons.h +include/gtkextra-2.0/gtkextra/gtkextratypebuiltins.h +include/gtkextra-2.0/gtkextra/gtkfileicons.h +include/gtkextra-2.0/gtkextra/gtkfilelist.h +include/gtkextra-2.0/gtkextra/gtkfontcombo.h +include/gtkextra-2.0/gtkextra/gtkiconfilesel.h +include/gtkextra-2.0/gtkextra/gtkiconlist.h +include/gtkextra-2.0/gtkextra/gtkitementry.h +include/gtkextra-2.0/gtkextra/gtkplot.h +include/gtkextra-2.0/gtkextra/gtkplot3d.h +include/gtkextra-2.0/gtkextra/gtkplotarray.h +include/gtkextra-2.0/gtkextra/gtkplotbar.h +include/gtkextra-2.0/gtkextra/gtkplotbox.h +include/gtkextra-2.0/gtkextra/gtkplotbubble.h +include/gtkextra-2.0/gtkextra/gtkplotcandle.h +include/gtkextra-2.0/gtkextra/gtkplotcanvas.h +include/gtkextra-2.0/gtkextra/gtkplotcanvasellipse.h +include/gtkextra-2.0/gtkextra/gtkplotcanvasline.h +include/gtkextra-2.0/gtkextra/gtkplotcanvaspixmap.h +include/gtkextra-2.0/gtkextra/gtkplotcanvasplot.h +include/gtkextra-2.0/gtkextra/gtkplotcanvasrectangle.h +include/gtkextra-2.0/gtkextra/gtkplotcanvastext.h +include/gtkextra-2.0/gtkextra/gtkplotcsurface.h +include/gtkextra-2.0/gtkextra/gtkplotdata.h +include/gtkextra-2.0/gtkextra/gtkplotdt.h +include/gtkextra-2.0/gtkextra/gtkplotflux.h +include/gtkextra-2.0/gtkextra/gtkplotgdk.h +include/gtkextra-2.0/gtkextra/gtkplotpc.h +include/gtkextra-2.0/gtkextra/gtkplotpixmap.h +include/gtkextra-2.0/gtkextra/gtkplotpolar.h +include/gtkextra-2.0/gtkextra/gtkplotprint.h +include/gtkextra-2.0/gtkextra/gtkplotps.h +include/gtkextra-2.0/gtkextra/gtkplotsegment.h +include/gtkextra-2.0/gtkextra/gtkplotsurface.h +include/gtkextra-2.0/gtkextra/gtkpsfont.h +include/gtkextra-2.0/gtkextra/gtksheet.h +include/gtkextra-2.0/gtkextra/gtktogglecombo.h +lib/libgtkextra-x11-2.0.a +lib/libgtkextra-x11-2.0.la +lib/libgtkextra-x11-2.0.so +lib/libgtkextra-x11-2.0.so.1 +libdata/pkgconfig/gtkextra-2.0.pc +@dirrm include/gtkextra-2.0/gtkextra +@dirrm include/gtkextra-2.0 |