rpms/at-spi/FC-5 at-spi-1.7.7-miscompile.patch, NONE, 1.1 at-spi.spec, 1.31, 1.32

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Apr 4 19:37:11 UTC 2006


Author: mclasen

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

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


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

--- NEW FILE at-spi-1.7.7-miscompile.patch ---
--- 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 15:20:38.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';
 		}
@@ -694,7 +694,7 @@
   
   g_free (e.type);
 
-  if (e.any_data._release) CORBA_free (&e.any_data._value);
+  if (e.any_data._release) CORBA_free (e.any_data._value);
   
   va_end (args);
 
--- 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 @@
 
 static char *spi_atk_bridge_null_string = "";
 
+Accessibility_Role spi_accessible_role_from_atk_role (AtkRole role);
+
 Accessibility_Role
 spi_role_from_atk_role (AtkRole role)
 {


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/FC-5/at-spi.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- at-spi.spec	9 Mar 2006 13:59:28 -0000	1.31
+++ at-spi.spec	4 Apr 2006 19:37:04 -0000	1.32
@@ -6,12 +6,11 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.7.6
-Release: 2
+Version: 1.7.7
+Release: 1.fc5.1
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
-
-Patch0: at-spi-1.7.6-x86_64-crash.patch
+Patch0: at-spi-1.7.7-miscompile.patch
 
 License: LGPL
 Group: System Environment/Libraries
@@ -52,7 +51,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .crash
+%patch -p1 -b .miscompile
 
 %build
 %configure --disable-gtk-doc
@@ -93,6 +92,13 @@
 %{_includedir}/* 
 
 %changelog
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-1.fc5.1
+- Fix a missing declaration
+- Fix segfaults on x86_64
+
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-1
+- Update to 1.7.7
+
 * Thu Mar  9 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.6-2
 - Fix a crash on x86_64
 




More information about the fedora-cvs-commits mailing list