From 0c297e89d3de4373f6ad241ef313f2502ad4a34c Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 2 Jul 2020 02:55:57 +0000 Subject: MFH: r535268 gecko: drop GCONF option after upstream https://bugzilla.mozilla.org/show_bug.cgi?id=1433685 Approved by: ports-secteam blanket --- Mk/bsd.gecko.mk | 8 -------- www/firefox/Makefile.options | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 4b10b0e16c4e..013ff9e7383a 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -226,14 +226,6 @@ MOZ_OPTIONS+= --disable-dbus RUN_DEPENDS+= ffmpeg>=0.8,1:multimedia/ffmpeg .endif -.if ${PORT_OPTIONS:MGCONF} -# XXX USE_GNOME+=gconf2:build is not supported -BUILD_DEPENDS+= ${LOCALBASE}/lib/libgconf-2.so:devel/gconf2 -MOZ_OPTIONS+= --enable-gconf -.else -MOZ_OPTIONS+= --disable-gconf -.endif - .if ${PORT_OPTIONS:MLIBPROXY} LIB_DEPENDS+= libproxy.so:net/libproxy MOZ_OPTIONS+= --enable-libproxy diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options index bdf91ec17c4f..1a00d068a541 100644 --- a/www/firefox/Makefile.options +++ b/www/firefox/Makefile.options @@ -1,9 +1,9 @@ # -*- makefile-bsdmake -*- -OPTIONS_DEFINE+= CANBERRA DBUS DEBUG FFMPEG GCONF \ +OPTIONS_DEFINE+= CANBERRA DBUS DEBUG FFMPEG \ LIBPROXY OPTIMIZED_CFLAGS PROFILE TEST -OPTIONS_DEFAULT+= DBUS FFMPEG GCONF OPTIMIZED_CFLAGS PROFILE \ +OPTIONS_DEFAULT+= DBUS FFMPEG OPTIMIZED_CFLAGS PROFILE \ ${OPTIONS_GROUP_AUDIO} OPTIONS_GROUP+= AUDIO -- cgit v1.2.3