rpms/xulrunner/devel mozilla-build-s390.patch, NONE, 1.1 xulrunner.spec, 1.199, 1.200

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3844

Modified Files:
	xulrunner.spec 
Added Files:
	mozilla-build-s390.patch 
Log Message:
* Tue Jun 15 2010 Dan Horák <dan at danny.cz> 1.9.2.3-2
- Fixed build on s390


mozilla-build-s390.patch:
 jstl.h |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE mozilla-build-s390.patch ---
diff -up mozilla-1.9.2/js/src/jstl.h.old mozilla-1.9.2/js/src/jstl.h
--- mozilla-1.9.2/js/src/jstl.h.old	2010-03-10 10:01:51.000000000 +0100
+++ mozilla-1.9.2/js/src/jstl.h	2010-03-10 12:24:55.000000000 +0100
@@ -195,7 +195,6 @@ class ReentrancyGuard
 static JS_ALWAYS_INLINE size_t
 RoundUpPow2(size_t x)
 {
-    typedef tl::StaticAssert<tl::IsSameType<size_t,JSUword>::result>::result _;
     size_t log2 = JS_CEILING_LOG2W(x);
     JS_ASSERT(log2 < tl::BitSize<size_t>::result);
     size_t result = size_t(1) << log2;


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- xulrunner.spec	2 Apr 2010 19:35:03 -0000	1.199
+++ xulrunner.spec	15 Jun 2010 13:02:38 -0000	1.200
@@ -15,7 +15,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.2.3
-Release:        1%{?pretag}%{?dist}
+Release:        2%{?pretag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -35,9 +35,10 @@ Patch5:         mozilla-jemalloc-526152.
 Patch7:         xulrunner-1.9.2.1-build.patch
 Patch8:         mozilla-plugin.patch
 Patch9:         mozilla-build-sbrk.patch
+Patch10:        mozilla-build-s390.patch
 
 # Fedora specific patches
-Patch10:        mozilla-192-pkgconfig.patch
+Patch20:        mozilla-192-pkgconfig.patch
 
 # Upstream patches
 Patch100:       mozilla-ps-pdf-simplify-operators.patch
@@ -132,8 +133,11 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 %patch7  -p2 -b .del
 %patch8  -p1 -b .plugin
 %patch9  -p2 -b .sbrk
+%ifarch s390
+%patch10 -p1 -b .s390
+%endif
 
-%patch10 -p1 -b .pk
+%patch20 -p1 -b .pk
 
 %patch100 -p1 -b .ps-pdf-simplify-operators
 
@@ -410,6 +414,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Jun 15 2010 Dan Horák <dan at danny.cz> 1.9.2.3-2
+- Fixed build on s390
+
 * Fri Apr 2 2010 Martin Stransky <stransky at redhat.com> 1.9.2.3-1
 - Update to 1.9.2.3