Added google api key for safebrowsing, fixing failing builds on latest fedoras
This commit is contained in:
parent
1b6bc4737b
commit
b41c541c5b
12
build-missing-xlocale-h.patch
Normal file
12
build-missing-xlocale-h.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
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
|
||||||
|
|
@ -19,6 +19,7 @@ ac_add_options --enable-chrome-format=omni
|
|||||||
ac_add_options --enable-pulseaudio
|
ac_add_options --enable-pulseaudio
|
||||||
ac_add_options --with-system-icu
|
ac_add_options --with-system-icu
|
||||||
ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
|
ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
|
||||||
|
ac_add_options --with-google-api-keyfile=../google-api-key
|
||||||
ac_add_options --enable-release
|
ac_add_options --enable-release
|
||||||
ac_add_options --enable-pie
|
ac_add_options --enable-pie
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
# Use system libicu?
|
# Use system libicu?
|
||||||
%if 0%{?fedora} > 27
|
%if 0%{?fedora} > 27
|
||||||
%define system_libicu 1
|
%define system_libicu 0
|
||||||
%else
|
%else
|
||||||
%define system_libicu 0
|
%define system_libicu 0
|
||||||
%endif
|
%endif
|
||||||
@ -90,9 +90,11 @@
|
|||||||
%define enable_mozilla_crashreporter 0
|
%define enable_mozilla_crashreporter 0
|
||||||
%if !%{debug_build}
|
%if !%{debug_build}
|
||||||
%ifarch %{ix86} x86_64
|
%ifarch %{ix86} x86_64
|
||||||
|
%if 0%{?fedora} < 27
|
||||||
%define enable_mozilla_crashreporter 1
|
%define enable_mozilla_crashreporter 1
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
Summary: Mozilla Firefox Web browser
|
Summary: Mozilla Firefox Web browser
|
||||||
Name: firefox
|
Name: firefox
|
||||||
@ -113,6 +115,7 @@ Source23: firefox.1
|
|||||||
Source24: mozilla-api-key
|
Source24: mozilla-api-key
|
||||||
Source25: firefox-symbolic.svg
|
Source25: firefox-symbolic.svg
|
||||||
Source26: distribution.ini
|
Source26: distribution.ini
|
||||||
|
Source27: google-api-key
|
||||||
|
|
||||||
# Build patches
|
# Build patches
|
||||||
Patch0: firefox-install-dir.patch
|
Patch0: firefox-install-dir.patch
|
||||||
@ -133,6 +136,7 @@ Patch32: build-rust-ppc64le.patch
|
|||||||
Patch33: build-ppc-s390-dom.patch
|
Patch33: build-ppc-s390-dom.patch
|
||||||
Patch34: build-cubeb-pulse-arm.patch
|
Patch34: build-cubeb-pulse-arm.patch
|
||||||
Patch35: build-ppc-jit.patch
|
Patch35: build-ppc-jit.patch
|
||||||
|
Patch36: build-missing-xlocale-h.patch
|
||||||
|
|
||||||
# Fedora specific patches
|
# Fedora specific patches
|
||||||
# Unable to install addons from https pages
|
# Unable to install addons from https pages
|
||||||
@ -346,6 +350,7 @@ 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
|
||||||
|
%patch37 -p2 -b .xlocale
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%{__rm} -f .mozconfig
|
%{__rm} -f .mozconfig
|
||||||
@ -354,6 +359,7 @@ This package contains results of tests executed during build.
|
|||||||
echo "ac_add_options --enable-official-branding" >> .mozconfig
|
echo "ac_add_options --enable-official-branding" >> .mozconfig
|
||||||
%endif
|
%endif
|
||||||
%{__cp} %{SOURCE24} mozilla-api-key
|
%{__cp} %{SOURCE24} mozilla-api-key
|
||||||
|
%{__cp} %{SOURCE27} google-api-key
|
||||||
|
|
||||||
%if %{?system_nss}
|
%if %{?system_nss}
|
||||||
echo "ac_add_options --with-system-nspr" >> .mozconfig
|
echo "ac_add_options --with-system-nspr" >> .mozconfig
|
||||||
|
1
google-api-key
Normal file
1
google-api-key
Normal file
@ -0,0 +1 @@
|
|||||||
|
AIzaSyAUhOVZlk5GiSm5a5_x9vQYkM5oCPUK6tY
|
Loading…
Reference in New Issue
Block a user