Merge branch 'master' into f26
This commit is contained in:
commit
61c9d8151a
@ -1,12 +0,0 @@
|
|||||||
diff -up thunderbird-52.3.0/mozilla/intl/icu/source/i18n/digitlst.cpp.xlocale thunderbird-52.3.0/mozilla/intl/icu/source/i18n/digitlst.cpp
|
|
||||||
--- thunderbird-52.3.0/mozilla/intl/icu/source/i18n/digitlst.cpp.xlocale 2017-08-24 14:42:48.634084293 +0200
|
|
||||||
+++ thunderbird-52.3.0/mozilla/intl/icu/source/i18n/digitlst.cpp 2017-08-24 14:42:50.534084676 +0200
|
|
||||||
@@ -64,7 +64,7 @@
|
|
||||||
# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
|
|
||||||
# include <locale.h>
|
|
||||||
# else
|
|
||||||
-# include <xlocale.h>
|
|
||||||
+# include <locale.h>
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
@ -127,7 +127,6 @@ Patch27: mozilla-1335250.patch
|
|||||||
Patch29: build-big-endian.patch
|
Patch29: build-big-endian.patch
|
||||||
Patch32: build-rust-ppc64le.patch
|
Patch32: build-rust-ppc64le.patch
|
||||||
Patch35: build-ppc-jit.patch
|
Patch35: build-ppc-jit.patch
|
||||||
Patch36: build-missing-xlocale-h.patch
|
|
||||||
# Always feel lucky for unsupported platforms:
|
# Always feel lucky for unsupported platforms:
|
||||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
|
# https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
|
||||||
Patch37: build-jit-atomic-always-lucky.patch
|
Patch37: build-jit-atomic-always-lucky.patch
|
||||||
@ -320,7 +319,6 @@ This package contains results of tests executed during build.
|
|||||||
# Patch for big endian platforms only
|
# Patch for big endian platforms only
|
||||||
%if 0%{?big_endian}
|
%if 0%{?big_endian}
|
||||||
%patch26 -p1 -b .icu
|
%patch26 -p1 -b .icu
|
||||||
%patch36 -p2 -b .xlocale
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%{__rm} -f .mozconfig
|
%{__rm} -f .mozconfig
|
||||||
|
Loading…
Reference in New Issue
Block a user