From 787833a36f3b03f194fb28a97ae8bdc402d8cf70 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 20 Jun 2018 09:10:33 +0200 Subject: build fix --- build-icu-big-endian.patch | 20 +++++++++++++------- firefox.spec | 5 ----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/build-icu-big-endian.patch b/build-icu-big-endian.patch index 2cfc839..831de3d 100644 --- a/build-icu-big-endian.patch +++ b/build-icu-big-endian.patch @@ -1,13 +1,19 @@ -diff -up firefox-60.0/build/autoconf/icu.m4.icu firefox-60.0/build/autoconf/icu.m4 ---- firefox-60.0/build/autoconf/icu.m4.icu 2018-04-24 13:13:03.938961958 +0200 -+++ firefox-60.0/build/autoconf/icu.m4 2018-04-24 13:14:44.472714375 +0200 -@@ -78,7 +78,7 @@ if test -n "$USE_ICU"; then +diff -up firefox-61.0/build/autoconf/icu.m4.icu firefox-61.0/build/autoconf/icu.m4 +--- firefox-61.0/build/autoconf/icu.m4.icu 2018-06-20 09:03:17.957565445 +0200 ++++ firefox-61.0/build/autoconf/icu.m4 2018-06-20 09:08:28.159403451 +0200 +@@ -77,7 +77,7 @@ if test -n "$USE_ICU"; then # TODO: the l is actually endian-dependent # We could make this set as 'l' or 'b' for little or big, respectively, # but we'd need to check in a big-endian version of the file. - ICU_DATA_FILE="icudt${version}l.dat" + ICU_DATA_FILE="icudt${version}b.dat" - - MOZ_ICU_DATA_ARCHIVE= fi - + + AC_SUBST(MOZ_ICU_VERSION) +diff -up firefox-61.0/intl/icu/source/data/in/coll/ucadata-implicithan.icu firefox-61.0/intl/icu/source/data/in/coll/ucadata-implicithan +diff -up firefox-61.0/intl/icu/source/data/in/coll/ucadata-unihan.icu firefox-61.0/intl/icu/source/data/in/coll/ucadata-unihan +diff -up firefox-61.0/intl/icu/source/data/in/pnames.icu firefox-61.0/intl/icu/source/data/in/pnames +diff -up firefox-61.0/intl/icu/source/data/in/ubidi.icu firefox-61.0/intl/icu/source/data/in/ubidi +diff -up firefox-61.0/intl/icu/source/data/in/ucase.icu firefox-61.0/intl/icu/source/data/in/ucase +diff -up firefox-61.0/intl/icu/source/data/in/unames.icu firefox-61.0/intl/icu/source/data/in/unames +diff -up firefox-61.0/intl/icu/source/data/in/uprops.icu firefox-61.0/intl/icu/source/data/in/uprops diff --git a/firefox.spec b/firefox.spec index ca1d114..6f80a7d 100644 --- a/firefox.spec +++ b/firefox.spec @@ -358,7 +358,6 @@ This package contains results of tests executed during build. %patch402 -p1 -b .1196777 %patch406 -p1 -b .256180 %patch413 -p1 -b .1353817 -#%patch414 -p1 -b .ffmpeg-4.0 %ifarch %{arm} %patch415 -p1 -b .mozilla-1238661 %endif @@ -505,10 +504,6 @@ echo "ac_add_options --without-system-icu" >> .mozconfig echo "ac_add_options --disable-ion" >> .mozconfig %endif -%ifarch %{ix86} -echo "ac_add_options --disable-stylo" >> .mozconfig -%endif - # Remove executable bit to make brp-mangle-shebangs happy. chmod -x third_party/rust/itertools/src/lib.rs -- cgit