summaryrefslogtreecommitdiffstats
path: root/exlibs
diff options
context:
space:
mode:
authorQuentin Glidic2018-03-13 20:58:16 +0100
committerQuentin Glidic2018-03-13 20:58:16 +0100
commit54459b6bfa036e2392cd8e80233bf4da5d1460ce (patch)
tree3707d377e973edb3f0b3ef0d931d683c3d7fea96 /exlibs
parent8297be07c17bad842ebdef7599dfdb37d98bea03 (diff)
downloadsardemff7-pending-54459b6bfa036e2392cd8e80233bf4da5d1460ce.tar.xz
mozilla-app: No more GTK+2 support
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Diffstat (limited to 'exlibs')
-rw-r--r--exlibs/mozilla-app.exlib15
1 files changed, 6 insertions, 9 deletions
diff --git a/exlibs/mozilla-app.exlib b/exlibs/mozilla-app.exlib
index f2e3cdb..a47c6b8 100644
--- a/exlibs/mozilla-app.exlib
+++ b/exlibs/mozilla-app.exlib
@@ -54,10 +54,7 @@ MYOPTIONS="
wayland
wifi
( providers: jpeg-turbo [[ description = [ Build with system jpeg ] ]] )
- ( providers: gtk2 gtk3 ) [[ number-selected = exactly-one ]]
- providers:gtk3? (
- gtk2-plugin-support [[ description = [ Build a libmozgtk to support GTK+ 2 plugins ] ]]
- )
+ gtk2-plugin-support [[ description = [ Build a libmozgtk to support GTK+ 2 plugins ] ]]
"
if exparam -b comm; then
MYOPTIONS+="
@@ -89,6 +86,7 @@ DEPENDENCIES="
sys-libs/zlib[>=1.1.4]
sys-sound/alsa-lib
x11-libs/cairo[X][>=1.10.2]
+ x11-libs/gtk+:3
x11-libs/libXmu
x11-libs/libXrender
x11-libs/libXt
@@ -96,8 +94,7 @@ DEPENDENCIES="
x11-libs/pixman
dbus? ( dev-libs/dbus-glib[>=0.72] )
- providers:gtk2? ( x11-libs/gtk+:2[>=2.14.0] )
- providers:gtk3? ( x11-libs/gtk+:3 )
+ gtk2-plugin-support? ( x11-libs/gtk+:2[>=2.14.0] )
providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
startup-notification? ( x11-libs/startup-notification )
wifi? ( net-wireless/wireless_tools )
@@ -176,7 +173,7 @@ if ever is_scm; then
eautoconf
- if option providers:gtk3 && option !gtk2-plugin-support; then
+ if option !gtk2-plugin-support; then
edo sed -i \
-e '\|/gtk2/|d' \
mail/installer/package-manifest.in
@@ -186,7 +183,7 @@ if ever is_scm; then
edo pushd "${ECONF_SOURCE}"/mozilla
fi
- if option providers:gtk3 && option !gtk2-plugin-support; then
+ if option !gtk2-plugin-support; then
edo sed -i \
-e '/MOZ_GTK2_CFLAGS=/d' \
-e '/PKG_CHECK_MODULES(MOZ_GTK2/i\MOZ_GTK2_CFLAGS=${MOZ_GTK3_CFLAGS}' \
@@ -329,7 +326,7 @@ mozilla-app_src_configure() {
# Exheres defaults and options
--enable-chrome-format=omni
- $(option providers:gtk3 --enable-default-toolkit=cairo-gtk3$(option wayland -wayland) --enable-default-toolkit=cairo-gtk2)
+ --enable-default-toolkit=cairo-gtk3$(option wayland -wayland)
#--with-gl-provider=EGL
--disable-crashreporter
--disable-gconf