Skip to content

Commit

Permalink
TB.spec: Fix broken locales build.
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Sirringhaus committed Sep 12, 2019
1 parent ba7a852 commit 3bf5c11
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 2 deletions.
10 changes: 8 additions & 2 deletions thunderbird/MozillaThunderbird.spec
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
%define desktop_file_name %{progname}
%define __provides_exclude ^lib.*\\.so.*$
%define __requires_exclude ^(libmoz.*|liblgpllibs.*|libxul.*|libldap.*|libldif.*|libprldap.*)$
# TODO: Reactivate this!
%define localize 0

%define localize 1
%ifarch %ix86 x86_64
%define crashreporter 1
%else
Expand Down Expand Up @@ -178,6 +178,8 @@ Patch20: mozilla-bmo1511604.patch
Patch21: mozilla-bmo1554971.patch
Patch22: mozilla-nestegg-big-endian.patch
Patch23: mozilla-bmo1512162.patch
# Thunderbird
Patch101: thunderbird-broken-locales-build.patch
%endif # only_print_mozconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): coreutils shared-mime-info desktop-file-utils
Expand Down Expand Up @@ -273,6 +275,7 @@ fi
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch101 -p1
%endif # only_print_mozconfig

%build
Expand Down Expand Up @@ -442,6 +445,7 @@ install -m 644 %{SOURCE9} %{buildroot}%{progdir}/defaults/pref/all-thunderbird.j
%endif
# build additional locales
%if %localize
mkdir -p %{buildroot}%{progdir}/extensions/
truncate -s 0 %{_tmppath}/translations.{common,other}
sed -r '/^(ja-JP-mac|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{source_prefix}/comm/mail/locales/shipped-locales \
| xargs -P 8 -n 1 -I {} /bin/sh -c '
Expand Down Expand Up @@ -599,9 +603,11 @@ exit 0
%if %localize
%files translations-common -f %{_tmppath}/translations.common
%defattr(-,root,root)
%dir %{progdir}/extensions/

%files translations-other -f %{_tmppath}/translations.other
%defattr(-,root,root)
%dir %{progdir}/extensions/
%endif

%if %crashreporter
Expand Down
16 changes: 16 additions & 0 deletions thunderbird/thunderbird-broken-locales-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# HG changeset patch
# Parent b2d2d5ae8d2a00ddbf496e415fdde16d08e35884
This has been submitted upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=1580701

diff -r b2d2d5ae8d2a -r 91fa98f1d233 comm/mail/locales/l10n.ini
--- a/comm/mail/locales/l10n.ini Fri May 31 11:28:11 2019 +0200
+++ b/comm/mail/locales/l10n.ini Wed Sep 11 15:01:55 2019 +0200
@@ -13,5 +13,5 @@
# include toolkit from mozilla.
# Don't specify which, use l10n-central.ini and friends if you're
# not working on a local check-out
-toolkit = mozilla/toolkit/locales/l10n.ini
-devtools_client = mozilla/devtools/client/locales/l10n.ini
+toolkit = ../toolkit/locales/l10n.ini
+devtools_client = ../devtools/client/locales/l10n.ini

0 comments on commit 3bf5c11

Please sign in to comment.