rpms/libbonobo/devel deprecation.patch, NONE, 1.1 libbonobo.spec, 1.68, 1.69

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/libbonobo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23025

Modified Files:
	libbonobo.spec 
Added Files:
	deprecation.patch 
Log Message:
fxi deprecation


deprecation.patch:

--- NEW FILE deprecation.patch ---
diff -up libbonobo-2.20.4/bonobo/bonobo-running-context.h.deprecation libbonobo-2.20.4/bonobo/bonobo-running-context.h
--- libbonobo-2.20.4/bonobo/bonobo-running-context.h.deprecation	2008-01-29 10:28:33.000000000 -0500
+++ libbonobo-2.20.4/bonobo/bonobo-running-context.h	2008-01-29 10:30:51.000000000 -0500
@@ -49,9 +49,9 @@ void        bonobo_running_context_trace
 void        bonobo_running_context_at_exit_unref     (CORBA_Object object);
 
 #ifdef BONOBO_OBJECT_DEBUG
-#	define           bonobo_running_context_add_object_T(o)      G_STMT_START{bonobo_running_context_trace_objects((o),G_GNUC_PRETTY_FUNCTION,__LINE__,0);}G_STMT_END
-#	define           bonobo_running_context_remove_object_T(o)   G_STMT_START{bonobo_running_context_trace_objects((o),G_GNUC_PRETTY_FUNCTION,__LINE__,1);}G_STMT_END
-#	define           bonobo_running_context_ignore_object(o)     G_STMT_START{bonobo_running_context_trace_objects((o),G_GNUC_PRETTY_FUNCTION,__LINE__,2);}G_STMT_END
+#	define           bonobo_running_context_add_object_T(o)      G_STMT_START{bonobo_running_context_trace_objects((o),G_STRFUNC,__LINE__,0);}G_STMT_END
+#	define           bonobo_running_context_remove_object_T(o)   G_STMT_START{bonobo_running_context_trace_objects((o),G_STRFUNC,__LINE__,1);}G_STMT_END
+#	define           bonobo_running_context_ignore_object(o)     G_STMT_START{bonobo_running_context_trace_objects((o),G_STRFUNC,__LINE__,2);}G_STMT_END
 #endif
 
 G_END_DECLS
diff -up libbonobo-2.20.4/bonobo/bonobo-exception.h.deprecation libbonobo-2.20.4/bonobo/bonobo-exception.h
--- libbonobo-2.20.4/bonobo/bonobo-exception.h.deprecation	2008-01-29 10:28:10.000000000 -0500
+++ libbonobo-2.20.4/bonobo/bonobo-exception.h	2008-01-29 10:30:07.000000000 -0500
@@ -56,7 +56,7 @@
 		"file %s: line %d (%s): assertion `%s' failed.",	\
 		__FILE__,						\
 		__LINE__,						\
-		G_GNUC_PRETTY_FUNCTION,					\
+		G_STRFUNC,						\
 		#expr);							\
          return;                                                        \
      };	}G_STMT_END
@@ -71,7 +71,7 @@
 		"file %s: line %d (%s): assertion `%s' failed.",	\
 		__FILE__,						\
 		__LINE__,						\
-		G_GNUC_PRETTY_FUNCTION,					\
+		G_STRFUNC,						\
 		#expr);							\
          return val;                                                    \
      };	}G_STMT_END
diff -up libbonobo-2.20.4/bonobo/bonobo-object.h.deprecation libbonobo-2.20.4/bonobo/bonobo-object.h
--- libbonobo-2.20.4/bonobo/bonobo-object.h.deprecation	2008-01-29 10:28:23.000000000 -0500
+++ libbonobo-2.20.4/bonobo/bonobo-object.h	2008-01-29 10:29:43.000000000 -0500
@@ -117,8 +117,8 @@ gpointer                 bonobo_object_t
 							       gboolean                ref);
 
 #ifdef BONOBO_OBJECT_DEBUG
-#	define           bonobo_object_ref(o)   bonobo_object_trace_refs ((o),G_GNUC_PRETTY_FUNCTION,__LINE__,TRUE);
-#	define           bonobo_object_unref(o) bonobo_object_trace_refs ((o),G_GNUC_PRETTY_FUNCTION,__LINE__,FALSE);
+#	define           bonobo_object_ref(o)   bonobo_object_trace_refs ((o),G_STRFUNC ,__LINE__,TRUE);
+#	define           bonobo_object_unref(o) bonobo_object_trace_refs ((o),G_STRFUNC,__LINE__,FALSE);
 #endif	/* BONOBO_OBJECT_DEBUG */
 void                     bonobo_object_dump_interfaces        (BonoboObject *object);
 


Index: libbonobo.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- libbonobo.spec	29 Jan 2008 15:16:37 -0000	1.68
+++ libbonobo.spec	29 Jan 2008 15:32:21 -0000	1.69
@@ -26,6 +26,7 @@
 Provides: bonobo-activation = %{version}-%{release}
 
 Patch0: libbonobo-2.13.1-multishlib.patch
+Patch1: deprecation.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -53,6 +54,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .deprecation
 
 %ifarch ppc64 s390x x86_64
 %patch0 -p1 -b .multishlib