svn commit: r421887 - in branches/2016Q3: Mk www/firefox

[Jan Beich]

Author: jbeich
Date: Mon Sep 12 00:00:51 2016
New Revision: 421887
URL: https://svnweb.freebsd.org/changeset/ports/421887

Log:
  MFH: r421533
  
  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
  Approved by:	ports-secteam (feld)

Modified:
  branches/2016Q3/Mk/bsd.gecko.mk
  branches/2016Q3/www/firefox/Makefile.options
Directory Properties:
  branches/2016Q3/   (props changed)

Modified: branches/2016Q3/Mk/bsd.gecko.mk
==============================================================================
--- branches/2016Q3/Mk/bsd.gecko.mk	Sun Sep 11 23:58:50 2016	(r421886)
+++ branches/2016Q3/Mk/bsd.gecko.mk	Mon Sep 12 00:00:51 2016	(r421887)
@@ -348,12 +348,6 @@ MOZ_OPTIONS+=	--enable-gconf
 MOZ_OPTIONS+=	--disable-gconf
 .endif
 
-.if ${PORT_OPTIONS:MGIO} && ! ${MOZ_TOOLKIT:Mcairo-qt}
-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

Modified: branches/2016Q3/www/firefox/Makefile.options
==============================================================================
--- branches/2016Q3/www/firefox/Makefile.options	Sun Sep 11 23:58:50 2016	(r421886)
+++ branches/2016Q3/www/firefox/Makefile.options	Mon Sep 12 00:00:51 2016	(r421887)
@@ -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/}