aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2016-09-08 14:49:24 +0800
committerjbeich <jbeich@FreeBSD.org>2016-09-08 14:49:24 +0800
commit3b2474f55a669ef1ef5af728d68bfe3db47c797c (patch)
tree3daccad69376dffac142b868dec0122dee422a1b
parentd42cf7f5175dc63432107a2b4fe7c2e8f5a96054 (diff)
downloadfreebsd-ports-gnome-3b2474f55a669ef1ef5af728d68bfe3db47c797c.tar.gz
freebsd-ports-gnome-3b2474f55a669ef1ef5af728d68bfe3db47c797c.tar.zst
freebsd-ports-gnome-3b2474f55a669ef1ef5af728d68bfe3db47c797c.zip
gecko: drop poorly maintained GIO=off case after r376999
Glib IO is already used by Gtk internally, so there's little reason to avoid it unless using non-Gtk builds which are no longer supported. https://bugzilla.mozilla.org/show_bug.cgi?id=1286627 https://bugzilla.mozilla.org/show_bug.cgi?id=1287288 PR: 210220 Reported by: Marco Beishuizen, Arrigo Marchiori MFH: 2016Q3
-rw-r--r--Mk/bsd.gecko.mk6
-rw-r--r--www/firefox/Makefile.options4
2 files changed, 2 insertions, 8 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 99aad151e547..607cdfbde855 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -341,12 +341,6 @@ MOZ_OPTIONS+= --enable-gconf
MOZ_OPTIONS+= --disable-gconf
.endif
-.if ${PORT_OPTIONS:MGIO}
-MOZ_OPTIONS+= --enable-gio
-.else
-MOZ_OPTIONS+= --disable-gio
-.endif
-
.if ${PORT_OPTIONS:MGNOMEUI}
BUILD_DEPENDS+= ${libgnomeui_DETECT}:${libgnomeui_LIB_DEPENDS:C/.*://}
USE_GNOME+= libgnomeui:build
diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options
index 5470ad32f4c2..901b0be0dfe4 100644
--- a/www/firefox/Makefile.options
+++ b/www/firefox/Makefile.options
@@ -1,10 +1,10 @@
# -*- makefile-bsdmake -*-
-OPTIONS_DEFINE+= BUNDLED_CAIRO CANBERRA DBUS DEBUG DTRACE FFMPEG GCONF GIO \
+OPTIONS_DEFINE+= BUNDLED_CAIRO CANBERRA DBUS DEBUG DTRACE FFMPEG GCONF \
GNOMEUI GSTREAMER INTEGER_SAMPLES LIBPROXY LOGGING \
OPTIMIZED_CFLAGS PGO PROFILE TEST
-OPTIONS_DEFAULT+= DBUS DTRACE FFMPEG GIO GSTREAMER LOGGING OPTIMIZED_CFLAGS \
+OPTIONS_DEFAULT+= DBUS DTRACE FFMPEG GSTREAMER LOGGING OPTIMIZED_CFLAGS \
${OPTIONS_MULTI_AUDIO} \
${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/INTEGER_SAMPLES/}