rpms/GtkAda/devel GtkAda-gtk217.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 GtkAda.spec, 1.27, 1.28 sources, 1.6, 1.7

[Gérard Milmeister]

Author: gemi

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

Modified Files:
	.cvsignore GtkAda.spec sources 
Added Files:
	GtkAda-gtk217.patch 
Log Message:
update to 2.14.0


GtkAda-gtk217.patch:
 gtkitementry.c |   40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

--- NEW FILE GtkAda-gtk217.patch ---
diff -up GtkAda-2.14.0/src/gtkextra/gtkitementry.c.gtk217 GtkAda-2.14.0/src/gtkextra/gtkitementry.c
--- GtkAda-2.14.0/src/gtkextra/gtkitementry.c.gtk217	2009-08-09 07:19:21.000000000 -0600
+++ GtkAda-2.14.0/src/gtkextra/gtkitementry.c	2009-08-09 07:22:10.000000000 -0600
@@ -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
         {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GtkAda/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Dec 2008 22:25:19 -0000	1.6
+++ .cvsignore	9 Aug 2009 14:54:31 -0000	1.7
@@ -1 +1 @@
-GtkAda-gpl-2.10.2.tgz
+GtkAda-gpl-2.14.0.tgz


Index: GtkAda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GtkAda/devel/GtkAda.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- GtkAda.spec	24 Jul 2009 15:31:55 -0000	1.27
+++ GtkAda.spec	9 Aug 2009 14:54:31 -0000	1.28
@@ -1,12 +1,13 @@
 Name:		GtkAda
-Version:	2.10.2
-Release:	3%{?dist}
+Version:	2.14.0
+Release:	1%{?dist}
 Summary:	Ada graphical toolkit based on Gtk+
 Group:		System Environment/Libraries
 License:	GPLv2+
 URL:		https://libre.adacore.com/GtkAda/
 # Source is available, but requires registration
-Source:         GtkAda-gpl-2.10.2.tgz
+Source:         GtkAda-gpl-%{version}.tgz
+Patch0:         GtkAda-gtk217.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-gnat
 BuildRequires:  libgnat
@@ -19,12 +20,12 @@ BuildRequires:  bonobo-activation-devel
 BuildRequires:  libbonoboui-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  libGL-devel
+BuildRequires:  libGLU-devel
 BuildRequires:  GConf2-devel
 BuildRequires:  texinfo-tex
 BuildRequires:	texinfo
 BuildRequires:	tetex
 BuildRequires:  tetex-dvips
-ExcludeArch:    ppc64
 
 %description
 GtkAda is an Ada graphical toolkit based on Gtk+. It allows you to
@@ -35,6 +36,9 @@ develop graphical applications in Ada us
 Summary:	Development files for GtkAda
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-gnome = %{version}-%{release}
+Requires:	%{name}-glade = %{version}-%{release}
+Requires:	%{name}-gl = %{version}-%{release}
 Requires:       perl
 Requires:       gtk2-devel
 Requires:       pkgconfig
@@ -43,6 +47,34 @@ Requires:       pkgconfig
 Development files for GtkAda.
 
 
+%package gnome
+Summary:	GNOME bindings of GtkAda
+Group:		Development/Libraries
+
+%description gnome
+%{summary}.
+
+
+%package glade
+Summary:	Glade bindings of GtkAda
+Group:		Development/Libraries
+
+%description glade
+%{summary}.
+
+
+%package gl
+Summary:	OpenGL bindings of GtkAda
+Group:		Development/Libraries
+
+%description gl
+%{summary}.
+
+
+%description devel
+Development files for GtkAda.
+
+
 %package doc
 Summary:	Documentation for GtkAda
 Group:		Documentation
@@ -53,7 +85,8 @@ Documentation for GtkAda.
 
 
 %prep
-%setup -q -n %{name}-gpl-%{version}
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .gtk217
 sed -i "s|\$.prefix./lib|\$(libdir)|" projects/Makefile
 sed -i "s|\$prefix/lib|%{_libdir}|" projects/generate_prj.sh
 sed -i "s|@prefix@/lib|@prefix@/%{_lib}|" projects/gtkada.pc.in
@@ -82,7 +115,7 @@ mv $RPM_BUILD_ROOT%{_libdir}/gtkada/relo
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-(cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
+(cd docs; install -m 0644 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
 
 # this conflicts with gdialog from gnome-utils
 rm -f $RPM_BUILD_ROOT%{_bindir}/gdialog
@@ -97,16 +130,45 @@ rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
 
+%post gnome -p /sbin/ldconfig
+
+%postun gnome -p /sbin/ldconfig
+
+
+%post gl -p /sbin/ldconfig
+
+%postun gl -p /sbin/ldconfig
+
+
+%post glade -p /sbin/ldconfig
+
+%postun glade -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
+%{_libdir}/libgtkada-*.so.*
 %doc AUTHORS COPYING README
 
 
+%files gnome
+%defattr(-,root,root,-)
+%{_libdir}/libgnomeada-*.so.*
+
+
+%files gl
+%defattr(-,root,root,-)
+%{_libdir}/libgtkada_gl-*.so.*
+
+
+%files glade
+%defattr(-,root,root,-)
+%{_libdir}/libgtkada_glade-*.so.*
+
+
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -127,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  9 2009 Gerard Milmeister <gemi at bluewin.ch> - 2.14.0-1
+- new release 2.14.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GtkAda/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Dec 2008 22:25:19 -0000	1.6
+++ sources	9 Aug 2009 14:54:31 -0000	1.7
@@ -1 +1 @@
-cbd287fad55f7e62ff15d7fcf8db7cd4  GtkAda-gpl-2.10.2.tgz
+e43cd5d882f044a70d76cea74e6cd705  GtkAda-gpl-2.14.0.tgz