rpms/nip2/devel nip2-7.18.2-gtk.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 nip2.spec, 1.24, 1.25 sources, 1.14, 1.15

Miloš Jakubíček mjakubicek at fedoraproject.org
Fri Sep 4 11:24:48 UTC 2009 

Author: mjakubicek

Update of /cvs/pkgs/rpms/nip2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13259

Modified Files:
	.cvsignore nip2.spec sources 
Added Files:
	nip2-7.18.2-gtk.patch 
Log Message:
- Fix FTBFS: update to 7.18.2, added nip2-7.18.2-gtk.patch to build with gtk >= 2.17



nip2-7.18.2-gtk.patch:
 gtkitementry.c |   40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

--- NEW FILE nip2-7.18.2-gtk.patch ---
--- nip2-7.18.2/src/gtkitementry.c.orig	2009-09-04 12:47:59.000000000 +0200
+++ nip2-7.18.2/src/gtkitementry.c	2009-09-04 12:50:36.000000000 +0200
@@ -693,23 +693,23 @@
       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 @@
 	    }
 	}
 
-      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 @@
       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;
@@ -1032,7 +1032,7 @@
 {
   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;
@@ -1233,7 +1233,7 @@
       
       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
@@ -1242,7 +1242,7 @@
           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;
 
@@ -1276,7 +1276,7 @@
     {
       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
         {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nip2/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	29 Dec 2008 05:14:30 -0000	1.14
+++ .cvsignore	4 Sep 2009 11:24:48 -0000	1.15
@@ -1 +1 @@
-nip2-7.16.4.tar.gz
+nip2-7.18.2.tar.gz


Index: nip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nip2/devel/nip2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- nip2.spec	25 Jul 2009 19:23:56 -0000	1.24
+++ nip2.spec	4 Sep 2009 11:24:48 -0000	1.25
@@ -1,6 +1,6 @@
 Name:		nip2
-Version:	7.16.4
-Release:	4%{?dist}
+Version:	7.18.2
+Release:	1%{?dist}
 Summary:	Interactive tool for working with large images
 
 Group:		Applications/Multimedia
@@ -9,6 +9,8 @@ URL:		http://www.vips.ecs.soton.ac.uk/
 Source0:	http://www.vips.ecs.soton.ac.uk/supported/7.16/%{name}-%{version}.tar.gz
 Source1:	nip2.desktop
 Patch0:		nip2-7.16.3-guidedir.patch
+# Patch has been sent to VIPSIP at JISCMAIL.AC.UK on 2009/09/04
+Patch1:		nip2-7.18.2-gtk.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -17,7 +19,6 @@ BuildRequires:	gtk2-devel shared-mime-in
 BuildRequires:	flex bison intltool fftw-devel libxml2-devel gettext
 BuildRequires:	desktop-file-utils gsl-devel xdg-utils
 BuildRequires:	automake autoconf libtool
-#Requires:
 
 
 # description taken from Debian package
@@ -38,6 +39,7 @@ GIMP should be used instead.
 
 # fix location of help in program to look in correct path
 %patch0 -p1 -b .guidedir
+%patch1 -p1 -b .gtk
 
 # CVS dirs
 find . -name CVS -type d -print0 | xargs -0 rm -rf
@@ -126,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep  4 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 7.18.2-1
+- Fix FTBFS: update to 7.18.2, added nip2-7.18.2-gtk.patch to build with gtk >= 2.17
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.16.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nip2/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	29 Dec 2008 05:14:31 -0000	1.14
+++ sources	4 Sep 2009 11:24:48 -0000	1.15
@@ -1 +1 @@
-53ce003ee0873399dbc5a11b6cfd38f7  nip2-7.16.4.tar.gz
+791c1fa6aef3e1c559359ca9a9899dcf  nip2-7.18.2.tar.gz

More information about the fedora-extras-commits mailing list