Gentoo Archives: gentoo-commits

From: Ian Stakenvicius <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/, mail-client/thunderbird/files/
Date: Wed, 15 Aug 2018 17:54:10
Message-Id: 1534355637.afc6b6485ad663d136add5398dd533b9fa35c83d.axs@gentoo
1 commit: afc6b6485ad663d136add5398dd533b9fa35c83d
2 Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 15 17:07:08 2018 +0000
4 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 15 17:53:57 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afc6b648
7
8 mail-client/thunderbird-60: fix pref to ensure OS locale is honoured
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 .../thunderbird/files/thunderbird-gentoo-default-prefs.js-2 | 10 ++++++++++
13 .../{thunderbird-60.0.ebuild => thunderbird-60.0-r1.ebuild} | 2 +-
14 2 files changed, 11 insertions(+), 1 deletion(-)
15
16 diff --git a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2 b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2
17 new file mode 100644
18 index 00000000000..9770a1aca5a
19 --- /dev/null
20 +++ b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2
21 @@ -0,0 +1,10 @@
22 +pref("app.update.enabled", false);
23 +pref("app.update.autoInstallEnabled", false);
24 +pref("browser.display.use_system_colors", true);
25 +pref("intl.locale.matchOS", true);
26 +pref("intl.locale.requested", "");
27 +pref("general.useragent.locale", "chrome://global/locale/intl.properties");
28 +pref("mail.shell.checkDefaultClient", false);
29 +# Do not switch to Smart Folders after upgrade to 3.0b4
30 +pref("mail.folder.views.version", "1");
31 +pref("extensions.autoDisableScopes", 0);
32
33 diff --git a/mail-client/thunderbird/thunderbird-60.0.ebuild b/mail-client/thunderbird/thunderbird-60.0-r1.ebuild
34 similarity index 99%
35 rename from mail-client/thunderbird/thunderbird-60.0.ebuild
36 rename to mail-client/thunderbird/thunderbird-60.0-r1.ebuild
37 index 23d639f020e..6b286589d14 100644
38 --- a/mail-client/thunderbird/thunderbird-60.0.ebuild
39 +++ b/mail-client/thunderbird/thunderbird-60.0-r1.ebuild
40 @@ -243,7 +243,7 @@ src_install() {
41 pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
42
43 # Copy our preference before omnijar is created.
44 - cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
45 + cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
46 "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
47 || die