rpms/sunbird/devel mozilla-jemalloc.patch, 1.2, 1.3 sunbird.spec, 1.28, 1.29

Lubomir Rintel lkundrak at fedoraproject.org
Sun Jun 28 10:02:25 UTC 2009


Author: lkundrak

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

Modified Files:
	sunbird.spec 
Added Files:
	mozilla-jemalloc.patch 
Log Message:
re-add the jemalloc fix

mozilla-jemalloc.patch:

Index: mozilla-jemalloc.patch
===================================================================
RCS file: mozilla-jemalloc.patch
diff -N mozilla-jemalloc.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mozilla-jemalloc.patch	28 Jun 2009 10:02:24 -0000	1.3
@@ -0,0 +1,24 @@
+diff -r f1af606531f5 memory/jemalloc/jemalloc.h
+--- mozilla/memory/jemalloc/jemalloc.h	Sat Nov 22 20:22:22 2008 +0100
++++ mozilla/memory/jemalloc/jemalloc.h	Mon Dec 01 16:53:06 2008 -0500
+@@ -45,14 +45,14 @@
+ } jemalloc_stats_t;
+ 
+ #ifndef MOZ_MEMORY_DARWIN
+-void	*malloc(size_t size);
+-void	*valloc(size_t size);
+-void	*calloc(size_t num, size_t size);
+-void	*realloc(void *ptr, size_t size);
+-void	free(void *ptr);
++void	*malloc(size_t size)  __THROW __attribute_malloc__ __wur;
++void	*valloc(size_t size)  __THROW __attribute_malloc__ __wur;
++void	*calloc(size_t num, size_t size)  __THROW __attribute_malloc__ __wur;
++void	*realloc(void *ptr, size_t size)  __THROW __attribute_malloc__ __wur;
++void	free(void *ptr)  __THROW __attribute_malloc__ __wur;
+ #endif
+ 
+-int	posix_memalign(void **memptr, size_t alignment, size_t size);
++int	posix_memalign(void **memptr, size_t alignment, size_t size)  __THROW __attribute_malloc__ __wur;
+ void	*memalign(size_t alignment, size_t size);
+ size_t	malloc_usable_size(const void *ptr);
+ void	jemalloc_stats(jemalloc_stats_t *stats);


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sunbird.spec	28 Jun 2009 07:46:15 -0000	1.28
+++ sunbird.spec	28 Jun 2009 10:02:24 -0000	1.29
@@ -31,7 +31,7 @@ Source3:        mozilla-extension-update
 Source100:      find-external-requires
 
 # Pulled from Thunderbird
-#(null)
+Patch0:         mozilla-jemalloc.patch
 
 # Ours
 Patch10:        sunbird-1.0-libical.patch
@@ -106,6 +106,7 @@ calendaring tasks.
 
 %prep
 %setup -q -a 2
+%patch0 -p0 -b .jemalloc
 %patch10 -p0 -b .libical
 %patch11 -p0 -b .uilocale
 




More information about the fedora-extras-commits mailing list