summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mozilla-build-arm.patch22
-rw-r--r--xulrunner.spec8
2 files changed, 24 insertions, 6 deletions
diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch
index f2885f8..4f25113 100644
--- a/mozilla-build-arm.patch
+++ b/mozilla-build-arm.patch
@@ -1,5 +1,6 @@
---- mozilla-release/gfx/layers/BufferUnrotate.cpp.old 2013-12-05 17:07:31.000000000 +0100
-+++ mozilla-release/gfx/layers/BufferUnrotate.cpp 2013-12-10 14:43:25.948164298 +0100
+diff -up mozilla-release/gfx/layers/BufferUnrotate.cpp.arm mozilla-release/gfx/layers/BufferUnrotate.cpp
+--- mozilla-release/gfx/layers/BufferUnrotate.cpp.arm 2013-12-05 17:07:31.000000000 +0100
++++ mozilla-release/gfx/layers/BufferUnrotate.cpp 2013-12-10 14:47:43.234182482 +0100
@@ -8,6 +8,7 @@
#include <stdint.h>
#include <stdio.h>
@@ -8,8 +9,9 @@
void BufferUnrotate(uint8_t* aBuffer, int aByteWidth, int aHeight,
int aByteStride, int aXBoundary, int aYBoundary)
---- mozilla-release/gfx/ycbcr/moz.build.arm 2013-10-23 15:52:17.056493264 +0200
-+++ mozilla-release/gfx/ycbcr/moz.build 2013-10-23 16:03:04.496045050 +0200
+diff -up mozilla-release/gfx/ycbcr/moz.build.arm mozilla-release/gfx/ycbcr/moz.build
+--- mozilla-release/gfx/ycbcr/moz.build.arm 2013-12-05 17:07:32.000000000 +0100
++++ mozilla-release/gfx/ycbcr/moz.build 2013-12-10 14:47:43.235182479 +0100
@@ -61,7 +61,7 @@ else:
'yuv_row_other.cpp',
]
@@ -19,3 +21,15 @@
ASFILES += [
'yuv_row_arm.s',
]
+diff -up mozilla-release/media/libtheora/lib/moz.build.arm mozilla-release/media/libtheora/lib/moz.build
+--- mozilla-release/media/libtheora/lib/moz.build.arm 2013-12-05 17:07:48.000000000 +0100
++++ mozilla-release/media/libtheora/lib/moz.build 2013-12-12 11:45:41.882119059 +0100
+@@ -8,7 +8,7 @@ MODULE = 'theora'
+
+ LIBRARY_NAME = 'theora'
+
+-if CONFIG['OS_TEST'] == 'arm' and CONFIG['GNU_AS']:
++if CONFIG['HAVE_ARM_NEON'] and CONFIG['GNU_AS']:
+ asm_suffix = CONFIG['ASM_SUFFIX']
+ ASFILES += [
+ 'armbits-gnu.%s' % asm_suffix,
diff --git a/xulrunner.spec b/xulrunner.spec
index 6bc4b8c..4c7ad25 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -1,5 +1,5 @@
# Use system nspr/nss?
-%if 0%{?fedora} < 21
+%if 0%{?fedora} < 18 && 0%{?rhel} < 6
%define system_nss 0
%else
%define system_nss 1
@@ -91,7 +91,7 @@
Summary: XUL Runtime for Gecko Applications
Name: %{shortname}-last
Version: 26.0
-Release: 1%{?pre_tag}%{?dist}
+Release: 2%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -607,6 +607,10 @@ fi
#---------------------------------------------------------------------
%changelog
+* Tue Dec 24 2013 Remi Collet <RPMS@FamilleCollet.com> - 26.0-2
+- sync patch with rawhide
+- rebuild against RHEL-6.5
+
* Tue Dec 10 2013 Remi Collet <RPMS@FamilleCollet.com> - 26.0-1
- sync with rawhide, update to 26.0 Build 2