Date: Tue, 11 Aug 2015 08:13:24 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r393934 - in branches/2015Q3: Mk mail/thunderbird www/firefox www/firefox-esr www/libxul www/seamonkey Message-ID: <201508110813.t7B8DOaH014613@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Aug 11 08:13:24 2015 New Revision: 393934 URL: https://svnweb.freebsd.org/changeset/ports/393934 Log: MFH: r393804 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 Approved by: ports-secteam (feld) Modified: branches/2015Q3/Mk/bsd.gecko.mk branches/2015Q3/mail/thunderbird/Makefile branches/2015Q3/www/firefox-esr/Makefile branches/2015Q3/www/firefox/Makefile branches/2015Q3/www/firefox/Makefile.options branches/2015Q3/www/libxul/Makefile branches/2015Q3/www/seamonkey/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/Mk/bsd.gecko.mk ============================================================================== --- branches/2015Q3/Mk/bsd.gecko.mk Tue Aug 11 06:32:05 2015 (r393933) +++ branches/2015Q3/Mk/bsd.gecko.mk Tue Aug 11 08:13:24 2015 (r393934) @@ -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: branches/2015Q3/mail/thunderbird/Makefile ============================================================================== --- branches/2015Q3/mail/thunderbird/Makefile Tue Aug 11 06:32:05 2015 (r393933) +++ branches/2015Q3/mail/thunderbird/Makefile Tue Aug 11 08:13:24 2015 (r393934) @@ -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: branches/2015Q3/www/firefox-esr/Makefile ============================================================================== --- branches/2015Q3/www/firefox-esr/Makefile Tue Aug 11 06:32:05 2015 (r393933) +++ branches/2015Q3/www/firefox-esr/Makefile Tue Aug 11 08:13:24 2015 (r393934) @@ -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: branches/2015Q3/www/firefox/Makefile ============================================================================== --- branches/2015Q3/www/firefox/Makefile Tue Aug 11 06:32:05 2015 (r393933) +++ branches/2015Q3/www/firefox/Makefile Tue Aug 11 08:13:24 2015 (r393934) @@ -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 \ @@ -63,6 +62,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: branches/2015Q3/www/firefox/Makefile.options ============================================================================== --- branches/2015Q3/www/firefox/Makefile.options Tue Aug 11 06:32:05 2015 (r393933) +++ branches/2015Q3/www/firefox/Makefile.options Tue Aug 11 08:13:24 2015 (r393934) @@ -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: branches/2015Q3/www/libxul/Makefile ============================================================================== --- branches/2015Q3/www/libxul/Makefile Tue Aug 11 06:32:05 2015 (r393933) +++ branches/2015Q3/www/libxul/Makefile Tue Aug 11 08:13:24 2015 (r393934) @@ -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: branches/2015Q3/www/seamonkey/Makefile ============================================================================== --- branches/2015Q3/www/seamonkey/Makefile Tue Aug 11 06:32:05 2015 (r393933) +++ branches/2015Q3/www/seamonkey/Makefile Tue Aug 11 08:13:24 2015 (r393934) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508110813.t7B8DOaH014613>