commit: b076a968d2ccaa57761779faa0e306083a48a767
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 7 14:13:41 2017 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Aug 7 14:13:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b076a968
eclass/mozconfig-v6.5{2,5} - Enable sandbox content on esr builds, major
changes for release build eclass
eclass/mozconfig-v6.52.eclass | 4 +++
...zconfig-v6.52.eclass => mozconfig-v6.55.eclass} | 42 ++++++++++------------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/eclass/mozconfig-v6.52.eclass b/eclass/mozconfig-v6.52.eclass
index c859aa7b8c1..8dbb55f2649 100644
--- a/eclass/mozconfig-v6.52.eclass
+++ b/eclass/mozconfig-v6.52.eclass
@@ -312,6 +312,10 @@ mozconfig_config() {
mozconfig_annotate '-pulseaudio' --enable-alsa
fi
+ # Enable sandbox and content sandboxing
+ mozconfig_annotate 'sandbox' --enable-sandbox
+ mozconfig_annotate 'sandbox' --enable-content-sandbox
+
mozconfig_use_enable system-cairo
mozconfig_use_enable system-sqlite
mozconfig_use_with system-jpeg
diff --git a/eclass/mozconfig-v6.52.eclass b/eclass/mozconfig-v6.55.eclass
similarity index 93%
copy from eclass/mozconfig-v6.52.eclass
copy to eclass/mozconfig-v6.55.eclass
index c859aa7b8c1..0b133c065e0 100644
--- a/eclass/mozconfig-v6.52.eclass
+++ b/eclass/mozconfig-v6.55.eclass
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
#
-# @ECLASS: mozconfig-v6.52.eclass
+# @ECLASS: mozconfig-v6.55.eclass
# @MAINTAINER:
# mozilla team <[email protected]>
# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
@@ -84,21 +84,21 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5
# Set the variable to any value if the use flag should exist but not be
default-enabled.
# use-flags common among all mozilla ebuilds
-IUSE="${IUSE} dbus debug +jemalloc neon pulseaudio selinux
startup-notification system-cairo
+IUSE="${IUSE} dbus debug neon pulseaudio selinux startup-notification
system-cairo
system-harfbuzz system-icu system-jpeg system-libevent system-sqlite
system-libvpx"
# some notes on deps:
# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs
2.14
# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
-RDEPEND=">=app-text/hunspell-1.2:=
+RDEPEND=">=app-text/hunspell-1.5.4:=
dev-libs/atk
dev-libs/expat
>=x11-libs/cairo-1.10[X]
>=x11-libs/gtk+-2.18:2
x11-libs/gdk-pixbuf
>=x11-libs/pango-1.22.0
- >=media-libs/libpng-1.6.25:0=[apng]
+ >=media-libs/libpng-1.6.28:0=[apng]
>=media-libs/mesa-10.2:*
media-libs/fontconfig
>=media-libs/freetype-2.4.10
@@ -124,9 +124,9 @@ RDEPEND=">=app-text/hunspell-1.2:=
system-icu? ( >=dev-libs/icu-58.1:= )
system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
system-libevent? ( >=dev-libs/libevent-2.0:0= )
- system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] )
+ system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] )
system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
- system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0=
>=media-gfx/graphite2-1.3.8 )
+ system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0=
>=media-gfx/graphite2-1.3.9-r1 )
"
if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
@@ -144,6 +144,9 @@ elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
IUSE+=" gtk2"
fi
RDEPEND+=" !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )"
+else
+ # no gtk3 related dep set by optional use flags, force it
+ RDEPEND+=" >=x11-libs/gtk+-3.4.0:3"
fi
if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
@@ -242,8 +245,6 @@ mozconfig_config() {
mozconfig_annotate '' --prefix="${EPREFIX}"/usr
mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
mozconfig_annotate 'Gentoo default' --enable-system-hunspell
- mozconfig_annotate '' --disable-gnomeui
- mozconfig_annotate '' --enable-gio
mozconfig_annotate '' --disable-crashreporter
mozconfig_annotate 'Gentoo default' --with-system-png
mozconfig_annotate '' --enable-system-ffi
@@ -258,18 +259,18 @@ mozconfig_config() {
mozconfig_annotate '' --enable-skia
fi
- # default toolkit is cairo-gtk2, optional use flags can change this
- local toolkit="cairo-gtk2"
+ # default toolkit is cairo-gtk3, optional use flags can change this
+ local toolkit="cairo-gtk3"
local toolkit_comment=""
if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
- if use force-gtk3; then
- toolkit="cairo-gtk3"
+ if ! use force-gtk3; then
+ toolkit="cairo-gtk2"
toolkit_comment="force-gtk3 use flag"
fi
fi
if [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
- if ! use gtk2 ; then
- toolkit="cairo-gtk3"
+ if use gtk2 ; then
+ toolkit="cairo-gtk2"
else
toolkit_comment="gtk2 use flag"
fi
@@ -291,14 +292,6 @@ mozconfig_config() {
fi
mozconfig_annotate "${toolkit_comment}"
--enable-default-toolkit=${toolkit}
- # Use jemalloc unless libc is not glibc >= 2.4
- # at this time the minimum glibc in the tree is 2.9 so we should be
safe.
- if use elibc_glibc && use jemalloc; then
- # We must force-enable jemalloc 4 via .mozconfig
- echo "export MOZ_JEMALLOC4=1" >> "${S}"/.mozconfig || die
- mozconfig_annotate '' --enable-replace-malloc
- fi
-
# Instead of the standard --build= and --host=, mozilla uses --host
instead
# of --build, and --target intstead of --host.
# Note, mozilla also has --build but it does not do what you think it
does.
@@ -312,6 +305,9 @@ mozconfig_config() {
mozconfig_annotate '-pulseaudio' --enable-alsa
fi
+ # For testing purpose only
+ mozconfig_annotate 'Sandbox' --enable-content-sandbox
+
mozconfig_use_enable system-cairo
mozconfig_use_enable system-sqlite
mozconfig_use_with system-jpeg
