Attachment 110407 Details for Bug 151558 – file.diff

[patch] file.diff

file.diff (text/plain), 6.89 KB, created by tkato432 on 2010-10-18 19:10:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2010-10-18 19:10:13 UTC

Size: 6.89 KB

patch

obsolete

>diff -urN /usr/ports/x11-toolkits/gtkextra2/Makefile x11-toolkits/gtkextra2/Makefile
>--- /usr/ports/x11-toolkits/gtkextra2/Makefile	2010-03-28 17:49:47.000000000 +0900
>+++ x11-toolkits/gtkextra2/Makefile	2010-03-30 05:12:42.000000000 +0900
>@@ -6,18 +6,17 @@
> #
> 
> PORTNAME=	gtkextra
>-PORTVERSION=	2.1.1
>-PORTREVISION=	8
>+PORTVERSION=	2.1.2
> CATEGORIES=	x11-toolkits
>-MASTER_SITES=	SF/scigraphica/GtkExtra/${PORTVERSION}%20Sources
>+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
>@@ -25,13 +24,15 @@
> 
> PORTDOCS=	*
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||' ${WRKSRC}/Makefile.in
>+
> 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
>+.for d in reference tutorial
>+	@${MKDIR} ${DOCSDIR}/${d}
>+	@(cd ${WRKSRC}/docs/${d} && ${COPYTREE_SHARE} . ${DOCSDIR})
>+.endfor
> .endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/x11-toolkits/gtkextra2/distinfo x11-toolkits/gtkextra2/distinfo
>--- /usr/ports/x11-toolkits/gtkextra2/distinfo	2005-11-24 16:15:12.000000000 +0900
>+++ x11-toolkits/gtkextra2/distinfo	2010-03-23 17:36:47.000000000 +0900
>@@ -1,3 +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
>+MD5 (gtk+extra-2.1.2.tar.gz) = 10779394f39d39115fa3fd0f3dea4436
>+SHA256 (gtk+extra-2.1.2.tar.gz) = bfc9603e2023ea071f2661ecc29e52c94b1beed6b69deae45b466df7f5b2ce55
>+SIZE (gtk+extra-2.1.2.tar.gz) = 1274946
>diff -urN /usr/ports/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c
>--- /usr/ports/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c	2009-11-29 05:06:21.000000000 +0900
>+++ x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,108 +0,0 @@
>---- 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
>-         {

Actions: View | Diff

Attachments on bug 151558: 110407