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

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Fri Jun 21 22:05:15 2013
New Revision: 1272

Log:
connect gtk3 build glue (broken, see bug 884708)

Modified:
   trunk/Gecko_TODO
   trunk/Mk/bsd.gecko.mk
   trunk/www/firefox-nightly/Makefile

Modified: trunk/Gecko_TODO
==============================================================================
--- trunk/Gecko_TODO	Fri Jun 21 22:05:07 2013	(r1271)
+++ trunk/Gecko_TODO	Fri Jun 21 22:05:15 2013	(r1272)
@@ -32,5 +32,4 @@
 - remove 9.0 support at esr24
 - remove WEBRTC option at 22.0 -> always build with
 - switch to --ignore-unresolved-symbol (waiting for binutils 2.24)
-- add Gtk3 support (not landed in m-c yet)
 - move PGO to bsd.gecko.mk (blocked by USE_PYTHON_BUILD in *-esr)

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Fri Jun 21 22:05:07 2013	(r1271)
+++ trunk/Mk/bsd.gecko.mk	Fri Jun 21 22:05:15 2013	(r1272)
@@ -679,6 +679,10 @@
 MOZ_OPTIONS+=	--disable-necko-wifi
 .endif
 
+.if ${PORT_OPTIONS:MGTK3}
+MOZ_TOOLKIT=	cairo-gtk3
+.endif
+
 .if ${MOZ_TOOLKIT:Mcairo-qt}
 # don't use - transparent backgrounds (bug 521582),
 USE_MOZILLA+=	-cairo # ports/169343
@@ -687,6 +691,8 @@
 USE_QT4+=	moc_build gui network opengl
 MOZ_OPTIONS+=	--with-qtdir= # pkg-config
 MOZ_EXPORT+=	HOST_MOC="${MOC}" HOST_RCC="${FALSE}"
+.elif ${MOZ_TOOLKIT:Mcairo-gtk3}
+USE_GNOME+=	gtk30
 .else # gtk2, cairo-gtk2
 USE_GNOME+=	gtk20
 .endif

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Fri Jun 21 22:05:07 2013	(r1271)
+++ trunk/www/firefox-nightly/Makefile	Fri Jun 21 22:05:15 2013	(r1272)
@@ -49,7 +49,10 @@
 		--enable-application=browser
 
 OPTIONS_DEFINE=	PGO WEBRTC
-OPTIONS_DEFAULT=GSTREAMER WEBRTC
+OPTIONS_DEFAULT=GSTREAMER GTK2 WEBRTC
+
+OPTIONS_SINGLE+=	TOOLKIT
+OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"