Attachment #110407 for bug #151558

View | Details | Raw Unified | Return to bug 151558
Collapse All | Expand All




#

PORTNAME=	gtkextra
PORTVERSION=	2.1.2
PORTREVISION=	8
CATEGORIES=	x11-toolkits
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
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_AUTOTOOLS=	libtool:22
USE_LDCONFIG=	yes

LATEST_LINK=	gtkextra2


PORTDOCS=	*

post-patch:
	@${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||' ${WRKSRC}/Makefile.in

post-install:
.if !defined(NOPORTDOCS)
.for d in reference tutorial
	@${MKDIR} ${DOCSDIR}/${d}
	@(cd ${WRKSRC}/docs/${d} && ${COPYTREE_SHARE} . ${DOCSDIR})
.endfor
.  endfor
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)x11-toolkits/gtkextra2/distinfo (-3 / +3 lines)
1	MD5 (gtk+extra-2.1.1.tar.gz) = 1a933ca1286829383a0554cc2deb9e04	1	MD5 (gtk+extra-2.1.2.tar.gz) = 10779394f39d39115fa3fd0f3dea4436
2	SHA256 (gtk+extra-2.1.1.tar.gz) = 82d179fd2eb3fd5acbc9fc4d74507c559c6bc3269c488dc8642f9bca47a5dbe4	2	SHA256 (gtk+extra-2.1.2.tar.gz) = bfc9603e2023ea071f2661ecc29e52c94b1beed6b69deae45b466df7f5b2ce55
3	SIZE (gtk+extra-2.1.1.tar.gz) = 893481	3	SIZE (gtk+extra-2.1.2.tar.gz) = 1274946




--- 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
         {

Return to bug 151558

Lines 6-23 Link Here

(-)x11-toolkits/gtkextra2/Makefile (-9 / +10 lines)
6	#	6	#
7		7
8	PORTNAME= gtkextra	8	PORTNAME= gtkextra
9	PORTVERSION= 2.1.1	9	PORTVERSION= 2.1.2
10	PORTREVISION= 8
11	CATEGORIES= x11-toolkits	10	CATEGORIES= x11-toolkits
12	MASTER_SITES= SF/scigraphica/GtkExtra/${PORTVERSION}%20Sources	11	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
13	DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}	12	DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
14		13
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT= A useful widget set complementary to GTK+ 2.0	15	COMMENT= A useful widget set complementary to GTK+ 2.0
17		16
18	USE_AUTOTOOLS= libtool:22
19	USE_GNOME= gtk20 gnomehack	17	USE_GNOME= gtk20 gnomehack
20	USE_GMAKE= yes	18	USE_GMAKE= yes
		19	USE_AUTOTOOLS= libtool:22
21	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
22		21
23	LATEST_LINK= gtkextra2	22	LATEST_LINK= gtkextra2
Lines 25-37 Link Here
25		24
26	PORTDOCS= *	25	PORTDOCS= *
27		26
		27	post-patch:
		28	@${REINPLACE_CMD} -e '/^SUBDIRS/s\|docs\|\|' ${WRKSRC}/Makefile.in
		29
28	post-install:	30	post-install:
29	.if !defined(NOPORTDOCS)	31	.if !defined(NOPORTDOCS)
30	. for d in reference tutorial	32	.for d in reference tutorial
31	cd ${WRKSRC}/docs && \	33	@${MKDIR} ${DOCSDIR}/${d}
32	${FIND} ${d} -type d ! -empty -exec ${MKDIR} "${DOCSDIR}/{}" \; && \	34	@(cd ${WRKSRC}/docs/${d} && ${COPYTREE_SHARE} . ${DOCSDIR})
33	${FIND} ${d} -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;	35	.endfor
34	. endfor
35	.endif	36	.endif
36		37
37	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Lines 1-108 Link Here

(-)x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c (-108 lines)
1	--- gtkextra/gtkitementry.c.orig 2009-09-26 16:38:37.000000000 +0200
2	+++ gtkextra/gtkitementry.c 2009-09-26 16:40:16.000000000 +0200
3	@@ -693,23 +693,23 @@ gtk_entry_real_insert_text (GtkEditable
4	new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
5	}
6
7	- if (new_text_length + entry->n_bytes + 1 > entry->text_size)
8	+ if (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
9	{
10	- while (new_text_length + entry->n_bytes + 1 > entry->text_size)
11	+ while (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
12	{
13	- if (entry->text_size == 0)
14	- entry->text_size = MIN_SIZE;
15	+ if (entry->x_text_size == 0)
16	+ entry->x_text_size = MIN_SIZE;
17	else
18	{
19	- if (2 * (guint)entry->text_size < MAX_SIZE &&
20	- 2 * (guint)entry->text_size > entry->text_size)
21	- entry->text_size *= 2;
22	+ if (2 * (guint)entry->x_text_size < MAX_SIZE &&
23	+ 2 * (guint)entry->x_text_size > entry->x_text_size)
24	+ entry->x_text_size *= 2;
25	else
26	{
27	- entry->text_size = MAX_SIZE;
28	- if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1)
29	+ entry->x_text_size = MAX_SIZE;
30	+ if (new_text_length > (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1)
31	{
32	- new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1;
33	+ new_text_length = (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1;
34	new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text;
35	n_chars = g_utf8_strlen (new_text, new_text_length);
36	}
37	@@ -718,19 +718,19 @@ gtk_entry_real_insert_text (GtkEditable
38	}
39	}
40
41	- entry->text = g_realloc (entry->text, entry->text_size);
42	+ entry->text = g_realloc (entry->text, entry->x_text_size);
43	}
44
45	index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
46
47	- g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index);
48	+ g_memmove (entry->text + index + new_text_length, entry->text + index, entry->x_n_bytes - index);
49	memcpy (entry->text + index, new_text, new_text_length);
50
51	- entry->n_bytes += new_text_length;
52	+ entry->x_n_bytes += new_text_length;
53	entry->text_length += n_chars;
54
55	/* NUL terminate for safety and convenience */
56	- entry->text[entry->n_bytes] = '\0';
57	+ entry->text[entry->x_n_bytes] = '\0';
58
59	if (entry->current_pos > *position)
60	entry->current_pos += n_chars;
61	@@ -763,9 +763,9 @@ gtk_entry_real_delete_text (GtkEditable
62	gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
63	gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
64
65	- g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index);
66	+ g_memmove (entry->text + start_index, entry->text + end_index, entry->x_n_bytes + 1 - end_index);
67	entry->text_length -= (end_pos - start_pos);
68	- entry->n_bytes -= (end_index - start_index);
69	+ entry->x_n_bytes -= (end_index - start_index);
70
71	if (entry->current_pos > start_pos)
72	entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos;
73	@@ -1028,7 +1028,7 @@ gtk_entry_retrieve_surrounding_cb (GtkIM
74	{
75	gtk_im_context_set_surrounding (context,
76	entry->text,
77	- entry->n_bytes,
78	+ entry->x_n_bytes,
79	g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
80
81	return TRUE;
82	@@ -1229,7 +1229,7 @@ gtk_entry_create_layout (GtkEntry *entry
83
84	if (entry->visible)
85	{
86	- g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
87	+ g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes);
88	g_string_insert (tmp_string, cursor_index, preedit_string);
89	}
90	else
91	@@ -1238,7 +1238,7 @@ gtk_entry_create_layout (GtkEntry *entry
92	gint preedit_len_chars;
93	gunichar invisible_char;
94
95	- ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
96	+ ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes);
97	preedit_len_chars = g_utf8_strlen (preedit_string, -1);
98	ch_len += preedit_len_chars;
99
100	@@ -1272,7 +1272,7 @@ gtk_entry_create_layout (GtkEntry *entry
101	{
102	if (entry->visible)
103	{
104	- pango_layout_set_text (layout, entry->text, entry->n_bytes);
105	+ pango_layout_set_text (layout, entry->text, entry->x_n_bytes);
106	}
107	else
108	{