Fixing libicu build: xlocale.h is missing in newer glibc-headers, using locale.h instead

This commit is contained in:
Jan Horak 2017-08-24 14:45:50 +02:00
parent e9c71d37a3
commit 17ecf6f9ae
2 changed files with 18 additions and 1 deletions

View 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

View File

@ -62,6 +62,10 @@
%endif %endif
%endif %endif
%if %{?system_libvpx}
%global libvpx_version 1.4.0
%endif
%define tb_version 45.6.0 %define tb_version 45.6.0
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
@ -136,6 +140,7 @@ Patch303: mozilla-1253216.patch
Patch304: mozilla-1245783.patch Patch304: mozilla-1245783.patch
Patch305: build-fix-dupes.patch Patch305: build-fix-dupes.patch
Patch306: build-toml-fix.patch Patch306: build-toml-fix.patch
Patch307: build-missing-xlocale-h.patch
# Fedora specific patches # Fedora specific patches
Patch400: rhbz-966424.patch Patch400: rhbz-966424.patch
@ -191,7 +196,6 @@ BuildRequires: desktop-file-utils
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGL-devel
BuildRequires: libvpx-devel >= %{libvpx_version} BuildRequires: libvpx-devel >= %{libvpx_version}
Requires: libvpx >= %{libvpx_version}
BuildRequires: pulseaudio-libs-devel BuildRequires: pulseaudio-libs-devel
BuildRequires: libicu-devel BuildRequires: libicu-devel
BuildRequires: GConf2-devel BuildRequires: GConf2-devel
@ -273,6 +277,7 @@ cd mozilla
# 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
%patch307 -p1 -b .xlocale
%endif %endif
cd .. cd ..