[SVN-Commit] r1766 - in trunk: . www/firefox www/firefox-nightly

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Thu Nov 20 05:57:42 2014
New Revision: 1766

Log:
after ports at 372768 expose GTK3 for www/firefox and default for -nightly

Modified:
   trunk/Gecko_ChangeLog
   trunk/www/firefox-nightly/Makefile
   trunk/www/firefox/Makefile

Modified: trunk/Gecko_ChangeLog
==============================================================================
--- trunk/Gecko_ChangeLog	Wed Nov 19 04:02:13 2014	(r1765)
+++ trunk/Gecko_ChangeLog	Thu Nov 20 05:57:42 2014	(r1766)
@@ -4,3 +4,7 @@
 - drop lang/python2 dependency, only lang/python27 is required to build
 - use DuckDuckGo searchplugin from upstream (has suggestions and purposes)
 - backport a few about:memory fixes
+- add GTK3 option for www/firefox[1]
+
+[1] Adwaita is a bit broken since Gtk 3.14, see
+    https://bugzilla.mozilla.org/show_bug.cgi?id=1073117

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Wed Nov 19 04:02:13 2014	(r1765)
+++ trunk/www/firefox-nightly/Makefile	Thu Nov 20 05:57:42 2014	(r1766)
@@ -58,7 +58,7 @@
 		--enable-application=browser
 
 OPTIONS_DEFINE=		MACH
-OPTIONS_DEFAULT=	GTK2
+OPTIONS_DEFAULT=	GTK3
 
 OPTIONS_SINGLE+=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
@@ -78,6 +78,10 @@
 RUN_DEPENDS+=	gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
 .endif
 
+.if ${PORT_OPTIONS:MGTK3}
+BUILD_DEPENDS+=	gtk3>=3.14.3:${PORTSDIR}/x11-toolkits/gtk30
+.endif
+
 .if ${PORT_OPTIONS:MMACH} && ${PORT_OPTIONS:MPGO}
 IGNORE=		MACH currently does not support PGO build
 .endif

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Wed Nov 19 04:02:13 2014	(r1765)
+++ trunk/www/firefox/Makefile	Thu Nov 20 05:57:42 2014	(r1766)
@@ -49,6 +49,11 @@
 		--enable-application=browser \
 		--enable-official-branding
 
+OPTIONS_DEFAULT=	GTK2
+
+OPTIONS_SINGLE+=	TOOLKIT
+OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
+
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>
 
@@ -62,6 +67,10 @@
 RUN_DEPENDS+=	gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
 .endif
 
+.if ${PORT_OPTIONS:MGTK3}
+BUILD_DEPENDS+=	gtk3>=3.14.3:${PORTSDIR}/x11-toolkits/gtk30
+.endif
+
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \