[xulrunner] fixed arm patch

Jan Horak xhorak at fedoraproject.org
Tue Apr 15 14:39:19 UTC 2014


commit 3662bd7cb21c41d4839c10a6e0f788e045f0a47c
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Apr 15 16:39:04 2014 +0200

    fixed arm patch

 mozilla-build-arm.patch |   20 ++++++++++++++++----
 xulrunner.spec          |    3 ++-
 2 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch
index d61884e..1628018 100644
--- a/mozilla-build-arm.patch
+++ b/mozilla-build-arm.patch
@@ -1,7 +1,7 @@
-diff -up firefox-27.0/mozilla-release/gfx/ycbcr/moz.build.arm firefox-27.0/mozilla-release/gfx/ycbcr/moz.build
---- firefox-27.0/mozilla-release/gfx/ycbcr/moz.build.arm	2014-01-28 05:03:42.000000000 +0100
-+++ firefox-27.0/mozilla-release/gfx/ycbcr/moz.build	2014-02-03 11:14:34.062219509 +0100
-@@ -61,7 +61,7 @@ else:
+diff -up firefox-28.0/mozilla-release/gfx/ycbcr/moz.build.arm firefox-28.0/mozilla-release/gfx/ycbcr/moz.build
+--- firefox-28.0/mozilla-release/gfx/ycbcr/moz.build.arm	2014-03-11 01:54:04.000000000 +0100
++++ firefox-28.0/mozilla-release/gfx/ycbcr/moz.build	2014-03-11 10:12:19.586220802 +0100
+@@ -59,7 +59,7 @@ else:
          'yuv_row_other.cpp',
      ]
  
@@ -10,3 +10,15 @@ diff -up firefox-27.0/mozilla-release/gfx/ycbcr/moz.build.arm firefox-27.0/mozil
      SOURCES += [
          'yuv_row_arm.s',
      ]
+diff -up firefox-28.0/mozilla-release/media/libtheora/lib/moz.build.arm firefox-28.0/mozilla-release/media/libtheora/lib/moz.build
+--- firefox-28.0/mozilla-release/media/libtheora/lib/moz.build.arm	2014-03-11 01:54:13.000000000 +0100
++++ firefox-28.0/mozilla-release/media/libtheora/lib/moz.build	2014-03-19 12:00:57.491064764 +0100
+@@ -20,7 +20,7 @@ UNIFIED_SOURCES += [
+     'state.c',
+ ]
+ 
+-if CONFIG['OS_TEST'] == 'arm' and CONFIG['GNU_AS']:
++if CONFIG['GNU_AS']:
+     GENERATED_SOURCES += [ '%s.%s' % (f, CONFIG['ASM_SUFFIX']) for f in [
+         'armbits-gnu',
+         'armfrag-gnu',
diff --git a/xulrunner.spec b/xulrunner.spec
index 204a87d..74edacd 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -78,7 +78,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        28.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
@@ -525,6 +525,7 @@ fi
 %changelog
 * Tue Mar 18 2014 Martin Stransky <stransky at redhat.com> - 28.0-1
 - Update to 28.0
+- Fixed arm patch
 
 * Mon Feb 3 2014 Martin Stransky <stransky at redhat.com> - 27.0-1
 - Update to 27.0


More information about the scm-commits mailing list