rpms/at-spi/devel at-spi-1.7.7-miscompile.patch, 1.1, 1.2 at-spi.spec, 1.33, 1.34

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6004

Modified Files:
	at-spi-1.7.7-miscompile.patch at-spi.spec 
Log Message:
another attempt


at-spi-1.7.7-miscompile.patch:
 atk-bridge/bridge.c       |    2 +-
 cspi/bonobo/cspi-bonobo.c |    5 ++++-
 libspi/util.c             |    2 ++
 registryd/registry-main.c |    2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

Index: at-spi-1.7.7-miscompile.patch
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi-1.7.7-miscompile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- at-spi-1.7.7-miscompile.patch	4 Apr 2006 17:50:31 -0000	1.1
+++ at-spi-1.7.7-miscompile.patch	4 Apr 2006 18:24:39 -0000	1.2
@@ -1,3 +1,46 @@
+--- at-spi-1.7.7/registryd/registry-main.c.miscompile	2006-04-04 14:10:38.000000000 -0400
++++ at-spi-1.7.7/registryd/registry-main.c	2006-04-04 14:10:55.000000000 -0400
+@@ -56,7 +56,7 @@
+       display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ()));
+       cp = strrchr (display_name, '.');
+       dp = strrchr (display_name, ':');
+-      if (cp && dp && ((guint) cp > (guint) dp)) *cp = '\0';
++      if (cp && dp && (cp > dp)) *cp = '\0';
+   }
+ 
+   reg_env = bonobo_activation_registration_env_set ( reg_env, "AT_SPI_DISPLAY", 
+--- at-spi-1.7.7/atk-bridge/bridge.c.miscompile	2006-04-04 14:11:43.000000000 -0400
++++ at-spi-1.7.7/atk-bridge/bridge.c	2006-04-04 14:11:52.000000000 -0400
+@@ -311,7 +311,7 @@
+ 		canonical_display_name = g_strdup (display_env);
+ 		display_p = strrchr (canonical_display_name, ':');
+ 		screen_p = strrchr (canonical_display_name, '.');
+-		if (screen_p && display_p && ((guint) screen_p > (guint) display_p))
++		if (screen_p && display_p && (screen_p > display_p))
+ 		{
+ 		    *screen_p = '\0';
+ 		}
+--- at-spi-1.7.7/cspi/bonobo/cspi-bonobo.c.miscompile	2006-04-04 14:20:31.000000000 -0400
++++ at-spi-1.7.7/cspi/bonobo/cspi-bonobo.c	2006-04-04 14:21:18.000000000 -0400
+@@ -26,6 +26,9 @@
+ #include <libbonobo.h>
+ #include "../cspi-lowlevel.h"
+ 
++gboolean
++cspi_exception_throw (CORBA_Environment *ev, char *desc_prefix);
++
+ CORBA_Object
+ cspi_dup_ref (CORBA_Object object)
+ {
+@@ -100,7 +103,7 @@
+ 		canonical_display_name = g_strdup (display_env);
+ 		display_p = strrchr (canonical_display_name, ':');
+ 		screen_p = strrchr (canonical_display_name, '.');
+-		if (screen_p && display_p && ((guint) screen_p > (guint) display_p))
++		if (screen_p && display_p && (screen_p > display_p))
+ 		{
+ 		    *screen_p = '\0';
+ 		}
 --- at-spi-1.7.7/libspi/util.c.miscompile	2006-04-04 13:47:50.000000000 -0400
 +++ at-spi-1.7.7/libspi/util.c	2006-04-04 13:48:35.000000000 -0400
 @@ -36,6 +36,8 @@


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- at-spi.spec	4 Apr 2006 17:50:31 -0000	1.33
+++ at-spi.spec	4 Apr 2006 18:24:39 -0000	1.34
@@ -7,7 +7,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.7.7
-Release: 3
+Release: 4
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
 Patch0: at-spi-1.7.7-miscompile.patch
@@ -92,7 +92,7 @@
 %{_includedir}/* 
 
 %changelog
-* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-3
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-4
 - Fix a missing declaration
 
 * Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-1