commit: aa0146434e5cb397038fc3f0e4ff0d02673b77de
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 28 21:20:01 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Sep 28 21:20:01 2018 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=aa014643
synchronize with Gentoo repository
eclass/mozcoreconf-v6.eclass | 6 ----
.../files/thunderbird-60.0-rust-1.29-comp.patch | 37 ++++++++++++++++++++++
mail-client/thunderbird/thunderbird-60.0-r3.ebuild | 4 +++
...missing-errno_h-in-SandboxOpenedFiles_cpp.patch | 27 ++++++++++++++++
.../files/firefox-60.0-rust-1.29-comp.patch | 37 ++++++++++++++++++++++
www-client/firefox/firefox-60.2.1-r1.ebuild | 5 +++
www-client/firefox/firefox-62.0.2.ebuild | 1 +
7 files changed, 111 insertions(+), 6 deletions(-)
diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass
index 930122f..571f195 100644
--- a/eclass/mozcoreconf-v6.eclass
+++ b/eclass/mozcoreconf-v6.eclass
@@ -16,12 +16,6 @@
if [[ ! ${_MOZCORECONF} ]]; then
-# for compatibility with packages prior to v1
-if [[ -z ${PYTHON_COMPAT[@]} ]]; then
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads'
-fi
-
inherit multilib toolchain-funcs flag-o-matic python-any-r1 versionator
IUSE="${IUSE} custom-cflags custom-optimization"
diff --git
a/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch
b/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch
new file mode 100644
index 0000000..6fbd13f
--- /dev/null
+++ b/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/666898
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1479540
+--- a/build/moz.configure/init.configure
++++ b/build/moz.configure/init.configure
+@@ -572,17 +572,26 @@ option('--target', nargs=1,
+ @imports(_from='__builtin__', _import='KeyError')
+ @imports(_from='__builtin__', _import='ValueError')
+ def split_triplet(triplet, allow_unknown=False):
+ # The standard triplet is defined as
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+ # There is also a quartet form:
+ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
+- cpu, manufacturer, os = triplet.split('-', 2)
++ # Additionally, some may omit "unknown" when the manufacturer
++ # is not specified and emit
++ # CPU_TYPE-OPERATING_SYSTEM
++ parts = triplet.split('-', 2)
++ if len(parts) == 3:
++ cpu, _, os = parts
++ elif len(parts) == 2:
++ cpu, os = parts
++ else:
++ die("Unexpected triplet string: %s" % triplet)
+
+ # Autoconf uses config.sub to validate and canonicalize those triplets,
+ # but the granularity of its results has never been satisfying to our
+ # use, so we've had our own, different, canonicalization. We've also
+ # historically not been very consistent with how we use the canonicalized
+ # values. Hopefully, this will help us make things better.
+ # The tests are inherited from our decades-old autoconf-based configure,
+ # which can probably be improved/cleaned up because they are based on a
+
+
+
+
diff --git a/mail-client/thunderbird/thunderbird-60.0-r3.ebuild
b/mail-client/thunderbird/thunderbird-60.0-r3.ebuild
index f9ecfc8..246f6b1 100644
--- a/mail-client/thunderbird/thunderbird-60.0-r3.ebuild
+++ b/mail-client/thunderbird/thunderbird-60.0-r3.ebuild
@@ -8,6 +8,9 @@ MOZ_ESR=""
MOZ_LIGHTNING_VER="6.2"
MOZ_LIGHTNING_GDATA_VER="4.4.1"
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads'
+
# This list can be updated using scripts/get_langs.sh from the mozilla overlay
MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
@@ -195,6 +198,7 @@ src_prepare() {
|| die
eapply "${WORKDIR}/firefox"
eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
+ eapply "${FILESDIR}"/${PN}-60.0-rust-1.29-comp.patch
# Ensure that are plugins dir is enabled as default
sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
diff --git
a/www-client/firefox/files/firefox-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
b/www-client/firefox/files/firefox-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
new file mode 100644
index 0000000..c746c73
--- /dev/null
+++
b/www-client/firefox/files/firefox-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/667096
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1480554
+--- a/security/sandbox/linux/SandboxOpenedFiles.cpp
++++ b/security/sandbox/linux/SandboxOpenedFiles.cpp
+@@ -4,16 +4,17 @@
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ #include "SandboxOpenedFiles.h"
+
+ #include "mozilla/Move.h"
+ #include "SandboxLogging.h"
+
++#include <errno.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+
+ namespace mozilla {
+
+ // The default move constructor almost works, but Atomic isn't
+ // move-constructable and the fd needs some special handling.
+ SandboxOpenedFile::SandboxOpenedFile(SandboxOpenedFile&& aMoved)
+
+
+
+
diff --git a/www-client/firefox/files/firefox-60.0-rust-1.29-comp.patch
b/www-client/firefox/files/firefox-60.0-rust-1.29-comp.patch
new file mode 100644
index 0000000..6fbd13f
--- /dev/null
+++ b/www-client/firefox/files/firefox-60.0-rust-1.29-comp.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/666898
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1479540
+--- a/build/moz.configure/init.configure
++++ b/build/moz.configure/init.configure
+@@ -572,17 +572,26 @@ option('--target', nargs=1,
+ @imports(_from='__builtin__', _import='KeyError')
+ @imports(_from='__builtin__', _import='ValueError')
+ def split_triplet(triplet, allow_unknown=False):
+ # The standard triplet is defined as
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+ # There is also a quartet form:
+ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
+- cpu, manufacturer, os = triplet.split('-', 2)
++ # Additionally, some may omit "unknown" when the manufacturer
++ # is not specified and emit
++ # CPU_TYPE-OPERATING_SYSTEM
++ parts = triplet.split('-', 2)
++ if len(parts) == 3:
++ cpu, _, os = parts
++ elif len(parts) == 2:
++ cpu, os = parts
++ else:
++ die("Unexpected triplet string: %s" % triplet)
+
+ # Autoconf uses config.sub to validate and canonicalize those triplets,
+ # but the granularity of its results has never been satisfying to our
+ # use, so we've had our own, different, canonicalization. We've also
+ # historically not been very consistent with how we use the canonicalized
+ # values. Hopefully, this will help us make things better.
+ # The tests are inherited from our decades-old autoconf-based configure,
+ # which can probably be improved/cleaned up because they are based on a
+
+
+
+
diff --git a/www-client/firefox/firefox-60.2.1-r1.ebuild
b/www-client/firefox/firefox-60.2.1-r1.ebuild
index 03ffedb..ac27525 100644
--- a/www-client/firefox/firefox-60.2.1-r1.ebuild
+++ b/www-client/firefox/firefox-60.2.1-r1.ebuild
@@ -6,6 +6,9 @@ VIRTUALX_REQUIRED="pgo"
WANT_AUTOCONF="2.1"
MOZ_ESR="1"
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads'
+
# This list can be updated with scripts/get_langs.sh from the mozilla overlay
MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL
ga-IE
@@ -126,6 +129,8 @@ src_prepare() {
eapply "${FILESDIR}"/bug_1461221.patch
eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
+ eapply "${FILESDIR}"/${PN}-60.0-rust-1.29-comp.patch
+ eapply
"${FILESDIR}"/${PN}-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
# Enable gnomebreakpad
if use debug ; then
diff --git a/www-client/firefox/firefox-62.0.2.ebuild
b/www-client/firefox/firefox-62.0.2.ebuild
index 426d2ba..bee2af6 100644
--- a/www-client/firefox/firefox-62.0.2.ebuild
+++ b/www-client/firefox/firefox-62.0.2.ebuild
@@ -187,6 +187,7 @@ src_prepare() {
eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
eapply "${FILESDIR}"/${PN}-60.0-do-not-force-lld.patch
eapply "${FILESDIR}"/${PN}-60.0-sandbox-lto.patch # 666580
+ eapply
"${FILESDIR}"/${PN}-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
# Enable gnomebreakpad
if use debug ; then
