Author: jbeich
Date: Sun Jul 8 12:46:22 2012
New Revision: 856
Log:
add QT4 option for cairo-qt toolkit
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/mail/thunderbird-esr/Makefile
branches/experimental/mail/thunderbird/Makefile
branches/experimental/mail/thunderbird3/Makefile
branches/experimental/www/firefox-esr/Makefile
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox/Makefile
branches/experimental/www/firefox36/Makefile
branches/experimental/www/kompozer/Makefile
branches/experimental/www/libxul/Makefile
branches/experimental/www/libxul19/Makefile
branches/experimental/www/seamonkey/Makefile
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Sun Jul 8 12:46:10 2012
(r855)
+++ branches/experimental/Mk/bsd.gecko.mk Sun Jul 8 12:46:22 2012
(r856)
@@ -557,6 +557,9 @@
OPTIONS_SINGLE+= AUDIO
OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO
+OPTIONS_SINGLE+= TOOLKIT
+OPTIONS_SINGLE_TOOLKIT= GTK2 QT4
+
OPTIONS_MULTI+= GNOME
OPTIONS_MULTI_GNOME= GCONF GIO GNOMEUI GNOMEVFS2
@@ -666,6 +669,11 @@
LIBS+= -lcxxrt
.endif
+.if ${PORT_OPTIONS:MQT4}
+MOZ_TOOLKIT= cairo-qt
+USE_MOZILLA+= -cairo # ports/169343
+.endif
+
.if ${MOZ_TOOLKIT:Mcairo-qt}
USE_GNOME+= pango
USE_QT4+= moc_build gui network opengl
Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile Sun Jul 8 12:46:10
2012 (r855)
+++ branches/experimental/mail/thunderbird-esr/Makefile Sun Jul 8 12:46:22
2012 (r856)
@@ -56,7 +56,7 @@
SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-OPTIONS_DEFAULT=DBUS OSS
+OPTIONS_DEFAULT=DBUS GTK2 OSS
OPTIONS_DEFINE= LIGHTNING
.include <bsd.port.pre.mk>
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Sun Jul 8 12:46:10
2012 (r855)
+++ branches/experimental/mail/thunderbird/Makefile Sun Jul 8 12:46:22
2012 (r856)
@@ -56,7 +56,7 @@
SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-OPTIONS_DEFAULT=DBUS OSS
+OPTIONS_DEFAULT=DBUS GTK2 OSS
OPTIONS_DEFINE= LIGHTNING
.include <bsd.port.pre.mk>
Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile Sun Jul 8 12:46:10
2012 (r855)
+++ branches/experimental/mail/thunderbird3/Makefile Sun Jul 8 12:46:22
2012 (r856)
@@ -57,6 +57,7 @@
.include <bsd.port.pre.mk>
OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY}
+OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT}
WRKSRC= ${WRKDIR}/comm-1.9.2
MOZSRC:= ${WRKSRC}/mozilla
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Sun Jul 8 12:46:10
2012 (r855)
+++ branches/experimental/www/firefox-esr/Makefile Sun Jul 8 12:46:22
2012 (r856)
@@ -53,7 +53,7 @@
--disable-updater \
--disable-necko-wifi
-OPTIONS_DEFAULT=DBUS OSS
+OPTIONS_DEFAULT=DBUS GTK2 OSS
OPTIONS_DEFINE= PGO
.include <bsd.port.pre.mk>
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Sun Jul 8 12:46:10
2012 (r855)
+++ branches/experimental/www/firefox-nightly/Makefile Sun Jul 8 12:46:22
2012 (r856)
@@ -53,7 +53,7 @@
--disable-updater \
--disable-necko-wifi
-OPTIONS_DEFAULT=DBUS GSTREAMER OSS
+OPTIONS_DEFAULT=DBUS GTK2 GSTREAMER OSS
OPTIONS_DEFINE= GSTREAMER PGO
.if ${USE_MOZILLA:M-nss}
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Sun Jul 8 12:46:10 2012
(r855)
+++ branches/experimental/www/firefox/Makefile Sun Jul 8 12:46:22 2012
(r856)
@@ -53,7 +53,7 @@
--disable-updater \
--disable-necko-wifi
-OPTIONS_DEFAULT=DBUS OSS
+OPTIONS_DEFAULT=DBUS GTK2 OSS
OPTIONS_DEFINE= PGO
.include <bsd.port.pre.mk>
Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile Sun Jul 8 12:46:10
2012 (r855)
+++ branches/experimental/www/firefox36/Makefile Sun Jul 8 12:46:22
2012 (r856)
@@ -54,6 +54,7 @@
.include <bsd.port.pre.mk>
OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY}
+OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT}
.if ${ARCH} == amd64
CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
Modified: branches/experimental/www/kompozer/Makefile
==============================================================================
--- branches/experimental/www/kompozer/Makefile Sun Jul 8 12:46:10 2012
(r855)
+++ branches/experimental/www/kompozer/Makefile Sun Jul 8 12:46:22 2012
(r856)
@@ -44,8 +44,8 @@
.include <bsd.port.pre.mk>
-OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NLIBPROXY}
-OPTIONS_SINGLE:=${OPTIONS_SINGLE:NAUDIO}
+OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NGIO:NLIBPROXY}
+OPTIONS_SINGLE:=${OPTIONS_SINGLE:NAUDIO:NTOOLKIT}
OPTIONS_MULTI_GNOME:=${OPTIONS_MULTI_GNOME:NGIO}
.if ${ARCH} == amd64
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Sun Jul 8 12:46:10 2012
(r855)
+++ branches/experimental/www/libxul/Makefile Sun Jul 8 12:46:22 2012
(r856)
@@ -45,7 +45,7 @@
--disable-updater \
--disable-necko-wifi
MOZ_EXTENSIONS= default,cookie,permissions
-OPTIONS_DEFAULT=DBUS OSS
+OPTIONS_DEFAULT=DBUS GTK2 OSS
USE_GECKO= gecko
MOZILLA_EXEC_NAME=xulrunner
USE_MOZILLA= # empty
Modified: branches/experimental/www/libxul19/Makefile
==============================================================================
--- branches/experimental/www/libxul19/Makefile Sun Jul 8 12:46:10 2012
(r855)
+++ branches/experimental/www/libxul19/Makefile Sun Jul 8 12:46:22 2012
(r856)
@@ -53,6 +53,7 @@
.include <bsd.port.pre.mk>
OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY}
+OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT}
.if ${USE_MOZILLA:M-nss}
MOZ_PKGCONFIG_FILES+= mozilla-nss
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:46:10
2012 (r855)
+++ branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:46:22
2012 (r856)
@@ -52,7 +52,7 @@
NOT_FOR_ARCHS= ia64
-OPTIONS_DEFAULT=DBUS CHATZILLA COMPOSER LDAP MAILNEWS OSS
+OPTIONS_DEFAULT=DBUS CHATZILLA COMPOSER GTK2 LDAP MAILNEWS OSS
OPTIONS_DEFINE= CHATZILLA COMPOSER LDAP LIGHTNING MAILNEWS
CHATZILLA_DESC?=Chatzilla IRC module
_______________________________________________
freebsd-gecko@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "freebsd-gecko-unsubscr...@freebsd.org"
