summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2018-03-12 11:52:11 +0100
committerMartin Stransky <stransky@redhat.com>2018-03-12 11:52:11 +0100
commit61c9d8151a0dc20b8f7cb9fec2407a49c029ebe4 (patch)
treeeec5f178bb1b2bc1dc78f2983b5117b3c4b20b43
parentMerge branch 'master' into f26 (diff)
parentRemoved obsoleted patch (diff)
downloadlibrewolf-fedora-ff-61c9d8151a0dc20b8f7cb9fec2407a49c029ebe4.tar.gz
librewolf-fedora-ff-61c9d8151a0dc20b8f7cb9fec2407a49c029ebe4.tar.bz2
librewolf-fedora-ff-61c9d8151a0dc20b8f7cb9fec2407a49c029ebe4.zip
Merge branch 'master' into f26
-rw-r--r--build-missing-xlocale-h.patch12
-rw-r--r--firefox.spec2
2 files changed, 0 insertions, 14 deletions
diff --git a/build-missing-xlocale-h.patch b/build-missing-xlocale-h.patch
deleted file mode 100644
index b4a62b2..0000000
--- a/build-missing-xlocale-h.patch
+++ /dev/null
@@ -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
-
diff --git a/firefox.spec b/firefox.spec
index 89cd65e..3157127 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -127,7 +127,6 @@ Patch27: mozilla-1335250.patch
Patch29: build-big-endian.patch
Patch32: build-rust-ppc64le.patch
Patch35: build-ppc-jit.patch
-Patch36: build-missing-xlocale-h.patch
# Always feel lucky for unsupported platforms:
# https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
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
%if 0%{?big_endian}
%patch26 -p1 -b .icu
-%patch36 -p2 -b .xlocale
%endif
%{__rm} -f .mozconfig
bgstack15