[xulrunner/f15] build patch and fix
Martin Stransky
stransky at fedoraproject.org
Tue Jun 5 09:03:11 UTC 2012
commit 463948894493650faa8881628d16e1dec541c91b
Author: Martin Stransky <stransky at anakreon.cz>
Date: Tue Jun 5 11:03:04 2012 +0200
build patch and fix
mozilla-nspr-build.patch | 12 ++++++++++++
xulrunner.spec | 4 +++-
2 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/mozilla-nspr-build.patch b/mozilla-nspr-build.patch
new file mode 100644
index 0000000..c3f285a
--- /dev/null
+++ b/mozilla-nspr-build.patch
@@ -0,0 +1,12 @@
+diff -up mozilla-release/hal/sandbox/PHal.ipdl.old mozilla-release/hal/sandbox/PHal.ipdl
+--- mozilla-release/hal/sandbox/PHal.ipdl.old 2012-06-01 14:04:00.000000000 +0200
++++ mozilla-release/hal/sandbox/PHal.ipdl 2012-06-05 09:15:02.524408100 +0200
+@@ -39,7 +39,7 @@
+
+ include protocol PContent;
+ include protocol PBrowser;
+-include "nspr/prtime.h";
++include "prtime.h";
+ include "mozilla/HalSensor.h";
+ include "mozilla/HalTypes.h";
+
diff --git a/xulrunner.spec b/xulrunner.spec
index 2dc9514..81af527 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -93,6 +93,7 @@ Patch16: add-gtkmozembed-11.0.patch
Patch17: xulrunner-10.0-gcc47.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
Patch18: xulrunner-12.0-jemalloc-ppc.patch
+Patch19: mozilla-nspr-build.patch
# Fedora specific patches
@@ -236,6 +237,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
%endif
%patch17 -p1 -b .gcc47
%patch18 -p2 -b .jemalloc-ppc
+%patch19 -p1 -b .nspr
%patch20 -p2 -b .pk
%patch24 -p1 -b .static
@@ -359,7 +361,7 @@ make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_SE
# create debuginfo for crash-stats.mozilla.com
%if %{enable_mozilla_crashreporter}
#cd %{moz_objdir}
-make buildsymbols
+make -C objdir buildsymbols
%endif
#---------------------------------------------------------------------
More information about the scm-commits
mailing list