rpms
/
firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove the jemalloc specific patches 

They belong in XR, but have already been fixed in other ways anyway
This commit is contained in:
Christopher Aillon 2011-01-31 19:13:52 -08:00
parent 9f0d1ae239
commit b4d6e96efe
3 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firefox.spec
View File

@ -54,8 +54,6 @@ Source23: firefox.1
#Build patches
Patch0: firefox-version.patch
Patch1: firefox4-jemalloc.patch
Patch2: firefox4-build-throw.patch
# Fedora patches
Patch11: firefox-default.patch
@ -106,8 +104,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{internal_version}/' %{P:%%PATCH0} \
# For branding specific patches.
%patch1 -p1 -b .526152
%patch2 -p1 -b .throw
# Fedora patches
%patch11 -p2 -b .default
@ -295,9 +291,6 @@ done
touch $RPM_BUILD_ROOT/%{mozappdir}/components/compreg.dat
touch $RPM_BUILD_ROOT/%{mozappdir}/components/xpti.dat
# jemalloc shows up sometimes, but it's not needed here, it's in XR
%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/libjemalloc.so
# Enable crash reporter for Firefox application
%if %{include_debuginfo}
sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" $RPM_BUILD_ROOT/%{mozappdir}/application.ini

12
firefox4-build-throw.patch
View File

@ -1,12 +0,0 @@
diff -up mozilla-central/memory/mozalloc/mozalloc.h.throw mozilla-central/memory/mozalloc/mozalloc.h
--- mozilla-central/memory/mozalloc/mozalloc.h.throw 2010-09-01 17:21:53.906286481 -0400
+++ mozilla-central/memory/mozalloc/mozalloc.h 2010-09-01 17:22:27.422157338 -0400
@@ -214,7 +214,7 @@ MOZALLOC_EXPORT void* moz_valloc(size_t
#define MOZALLOC_THROW_IF_HAS_EXCEPTIONS throw()
#endif
-#ifdef MOZ_CPP_EXCEPTIONS
+#if 1
#define MOZALLOC_THROW_BAD_ALLOC throw(std::bad_alloc)
#else
#define MOZALLOC_THROW_BAD_ALLOC MOZALLOC_THROW_IF_HAS_EXCEPTIONS

22
firefox4-jemalloc.patch
View File

@ -1,22 +0,0 @@
diff -up mozilla-central/memory/jemalloc/jemalloc.h.jemalloc mozilla-central/memory/jemalloc/jemalloc.h
--- mozilla-central/memory/jemalloc/jemalloc.h.jemalloc 2010-08-18 15:21:10.000000000 -0400
+++ mozilla-central/memory/jemalloc/jemalloc.h 2010-09-01 16:50:38.615946834 -0400
@@ -42,12 +42,12 @@ extern const char *_malloc_options;
/* Darwin and Linux already have memory allocation functions */
#if (!defined(MOZ_MEMORY_DARWIN) && !defined(MOZ_MEMORY_LINUX))
-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);
-int posix_memalign(void **memptr, size_t alignment, size_t size);
+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;
+int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW __attribute_malloc__ __wur;
#endif /* MOZ_MEMORY_DARWIN, MOZ_MEMORY_LINUX */
#if defined(MOZ_MEMORY_ANDROID) || defined(WRAP_MALLOC)