svn commit: r393804 - in head: Mk mail/thunderbird www/firefox www/firefox-esr www/libxul www/seamonkey

Sun Aug 9 16:30:46 UTC 2015

Author: jbeich
Date: Sun Aug  9 16:30:43 2015
New Revision: 393804
URL: https://svnweb.freebsd.org/changeset/ports/393804

Log:
  www/firefox: make testing bundled cairo easier via option
  
  BUNDLED_CAIRO does nothing with GTK3 until Firefox 41.0
  https://bugzilla.mozilla.org/show_bug.cgi?id=1159273
  
  PR:		202174
  MFH:		2015Q3

Modified:
  head/Mk/bsd.gecko.mk   (contents, props changed)
  head/mail/thunderbird/Makefile   (contents, props changed)
  head/www/firefox-esr/Makefile   (contents, props changed)
  head/www/firefox/Makefile   (contents, props changed)
  head/www/firefox/Makefile.options   (contents, props changed)
  head/www/libxul/Makefile   (contents, props changed)
  head/www/seamonkey/Makefile   (contents, props changed)

Modified: head/Mk/bsd.gecko.mk
==============================================================================

--- head/Mk/bsd.gecko.mk	Sun Aug  9 16:25:52 2015	(r393803)
+++ head/Mk/bsd.gecko.mk	Sun Aug  9 16:30:43 2015	(r393804)
@@ -137,8 +137,10 @@ MOZ_OPTIONS+=	--enable-jemalloc
 # Standard depends
 _ALL_DEPENDS=	cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss opus png pixman soundtouch sqlite vorbis vpx
 
+.if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
 cairo_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
 cairo_MOZ_OPTIONS=	--enable-system-cairo
+.endif
 
 event_LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 event_MOZ_OPTIONS=	--with-system-libevent

Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile	Sun Aug  9 16:25:52 2015	(r393803)
+++ head/mail/thunderbird/Makefile	Sun Aug  9 16:30:43 2015	(r393804)
@@ -15,7 +15,6 @@ COMMENT=	Mozilla Thunderbird is standalo
 BUILD_DEPENDS=	nspr>=4.10.8:${PORTSDIR}/devel/nspr \
 		nss>=3.19.2:${PORTSDIR}/security/nss \
 		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
-		cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \
 		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
 		harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
 		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
@@ -81,6 +80,10 @@ MOZ_OPTIONS:=	${MOZ_OPTIONS:S/${CONFIGUR
 RUN_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
 .endif
 
+.if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
+BUILD_DEPENDS+=	cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo
+.endif
+
 .if ${PORT_OPTIONS:MGSTREAMER}
 RUN_DEPENDS+=	gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
 .endif

Modified: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile	Sun Aug  9 16:25:52 2015	(r393803)
+++ head/www/firefox-esr/Makefile	Sun Aug  9 16:30:43 2015	(r393804)
@@ -16,7 +16,6 @@ COMMENT=	Web browser based on the browse
 BUILD_DEPENDS=	nspr>=4.10.8:${PORTSDIR}/devel/nspr \
 		nss>=3.19.2:${PORTSDIR}/security/nss \
 		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
-		cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \
 		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
 		harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
 		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
@@ -65,6 +64,10 @@ WRKSRC:=	${WRKDIR}/mozilla-esr38
 RUN_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
 .endif
 
+.if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
+BUILD_DEPENDS+=	cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo
+.endif
+
 .if ${PORT_OPTIONS:MGSTREAMER}
 RUN_DEPENDS+=	gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
 .endif

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Sun Aug  9 16:25:52 2015	(r393803)
+++ head/www/firefox/Makefile	Sun Aug  9 16:30:43 2015	(r393804)
@@ -15,7 +15,6 @@ COMMENT=	Web browser based on the browse
 BUILD_DEPENDS=	nspr>=4.10.8:${PORTSDIR}/devel/nspr \
 		nss>=3.19.2:${PORTSDIR}/security/nss \
 		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
-		cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \
 		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
 		harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
 		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
@@ -64,6 +63,10 @@ WRKSRC:=	${WRKDIR}/mozilla-release
 RUN_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
 .endif
 
+.if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
+BUILD_DEPENDS+=	cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo
+.endif
+
 .if ${PORT_OPTIONS:MGSTREAMER}
 RUN_DEPENDS+=	gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
 .endif

Modified: head/www/firefox/Makefile.options
==============================================================================
--- head/www/firefox/Makefile.options	Sun Aug  9 16:25:52 2015	(r393803)
+++ head/www/firefox/Makefile.options	Sun Aug  9 16:30:43 2015	(r393804)
@@ -1,13 +1,15 @@
 # -*- makefile-bsdmake -*-
 
-OPTIONS_DEFINE+= 	CANBERRA DBUS DEBUG DTRACE GCONF GIO GNOMEUI \
-			GSTREAMER LIBPROXY LOGGING OPTIMIZED_CFLAGS \
+OPTIONS_DEFINE+= 	BUNDLED_CAIRO CANBERRA DBUS DEBUG DTRACE GCONF GIO \
+			GNOMEUI GSTREAMER LIBPROXY LOGGING OPTIMIZED_CFLAGS \
 			PGO PROFILE TEST
+
 OPTIONS_DEFAULT+=	ALSA DBUS GIO GSTREAMER LOGGING OPTIMIZED_CFLAGS
 
 OPTIONS_MULTI+=		AUDIO
 OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO
 
+BUNDLED_CAIRO_DESC?=	Use bundled fork of cairo-1.9.5
 CANBERRA_DESC?=		Sound theme alerts
 ENIGMAIL_DESC?=		Enigmail extension
 GNOMEUI_DESC?=		libgnomeui support module

Modified: head/www/libxul/Makefile
==============================================================================
--- head/www/libxul/Makefile	Sun Aug  9 16:25:52 2015	(r393803)
+++ head/www/libxul/Makefile	Sun Aug  9 16:30:43 2015	(r393804)
@@ -14,7 +14,6 @@ COMMENT?=	Mozilla runtime package that c
 BUILD_DEPENDS=	nspr>=4.10.8:${PORTSDIR}/devel/nspr \
 		nss>=3.19.2:${PORTSDIR}/security/nss \
 		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
-		cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \
 		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
 		harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
 		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
@@ -67,6 +66,10 @@ MOZ_PKGCONFIG_FILES+=	mozilla-nss
 RUN_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
 .endif
 
+.if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
+BUILD_DEPENDS+=	cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo
+.endif
+
 .if ${PORT_OPTIONS:MGSTREAMER}
 RUN_DEPENDS+=	gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
 .endif

Modified: head/www/seamonkey/Makefile
==============================================================================
--- head/www/seamonkey/Makefile	Sun Aug  9 16:25:52 2015	(r393803)
+++ head/www/seamonkey/Makefile	Sun Aug  9 16:30:43 2015	(r393804)
@@ -16,7 +16,6 @@ COMMENT=	The open source, standards comp
 BUILD_DEPENDS=	nspr>=4.10.6:${PORTSDIR}/devel/nspr \
 		nss>=3.17.4:${PORTSDIR}/security/nss \
 		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
-		cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \
 		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
 		harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
 		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
@@ -79,6 +78,10 @@ XPI_LIBDIR=	${PREFIX}/lib/xpi
 RUN_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
 .endif
 
+.if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
+BUILD_DEPENDS+=	cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo
+.endif
+
 .if ${PORT_OPTIONS:MGSTREAMER}
 RUN_DEPENDS+=	gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
 .endif
