Date: Sat, 13 Sep 2014 07:11:17 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1695 - branches/firefox32/mail/thunderbird branches/firefox32/www/firefox branches/firefox32/www/firefox-esr branches/firefox32/www/firefox-nightly branches/firefox32/www/seamonkey trunk/mail/thunderbird trunk/www/firefox trunk/www/firefox-esr trunk/www/firefox-nightly trunk/www/libxul trunk/www/seamonkey Message-ID: <201409130711.s8D7BHCc013204@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Sep 13 07:11:17 2014 New Revision: 1695 Log: switch to system cairo Modified: branches/firefox32/mail/thunderbird/Makefile branches/firefox32/www/firefox-esr/Makefile branches/firefox32/www/firefox-nightly/Makefile branches/firefox32/www/firefox/Makefile branches/firefox32/www/seamonkey/Makefile trunk/mail/thunderbird/Makefile trunk/www/firefox-esr/Makefile trunk/www/firefox-nightly/Makefile trunk/www/firefox/Makefile trunk/www/libxul/Makefile trunk/www/seamonkey/Makefile Modified: branches/firefox32/mail/thunderbird/Makefile ============================================================================== --- branches/firefox32/mail/thunderbird/Makefile Sat Sep 13 06:51:20 2014 (r1694) +++ branches/firefox32/mail/thunderbird/Makefile Sat Sep 13 07:11:17 2014 (r1695) @@ -15,6 +15,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ nss>=3.16:${PORTSDIR}/security/nss \ + cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ @@ -26,7 +27,6 @@ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -37,7 +37,7 @@ USE_AUTOTOOLS= autoconf213:env OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko -USE_MOZILLA= -cairo +USE_MOZILLA= # empty WANT_GNOME= yes USE_QT5= # empty Modified: branches/firefox32/www/firefox-esr/Makefile ============================================================================== --- branches/firefox32/www/firefox-esr/Makefile Sat Sep 13 06:51:20 2014 (r1694) +++ branches/firefox32/www/firefox-esr/Makefile Sat Sep 13 07:11:17 2014 (r1695) @@ -15,6 +15,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ nss>=3.16.2:${PORTSDIR}/security/nss \ + cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ @@ -26,7 +27,6 @@ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -36,7 +36,7 @@ CPE_PRODUCT= ${PORTNAME}_esr CONFLICTS= firefox-3[02-9].* firefox-2[0-35-9].* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -cairo +USE_MOZILLA= # empty MOZILLA_NAME= Firefox WANT_GNOME= yes Modified: branches/firefox32/www/firefox-nightly/Makefile ============================================================================== --- branches/firefox32/www/firefox-nightly/Makefile Sat Sep 13 06:51:20 2014 (r1694) +++ branches/firefox32/www/firefox-nightly/Makefile Sat Sep 13 07:11:17 2014 (r1695) @@ -18,6 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ sqlite3>=3.8.6:${PORTSDIR}/databases/sqlite3 \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ + cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ @@ -27,7 +28,6 @@ nspr>=4.10.6:${PORTSDIR}/devel/nspr \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \ # nss>=3.17.1:${PORTSDIR}/security/nss \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -39,7 +39,7 @@ CPE_VERSION= ${PORTVERSION:R} CPE_UPDATE= alpha1 MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -cairo -nss +USE_MOZILLA= -nss MOZILLA_NAME= Firefox Nightly MOZILLA_SUFX= -nightly MOZILLA= ${PORTNAME}${MOZILLA_SUFX} Modified: branches/firefox32/www/firefox/Makefile ============================================================================== --- branches/firefox32/www/firefox/Makefile Sat Sep 13 06:51:20 2014 (r1694) +++ branches/firefox32/www/firefox/Makefile Sat Sep 13 07:11:17 2014 (r1695) @@ -15,6 +15,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ nss>=3.16.2:${PORTSDIR}/security/nss \ + cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ @@ -26,7 +27,6 @@ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -35,7 +35,7 @@ USE_GECKO= gecko CONFLICTS= firefox-esr-31.* firefox-esr-24.* firefox-esr-17.* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -cairo +USE_MOZILLA= # empty MOZILLA_NAME= Firefox WANT_GNOME= yes Modified: branches/firefox32/www/seamonkey/Makefile ============================================================================== --- branches/firefox32/www/seamonkey/Makefile Sat Sep 13 06:51:20 2014 (r1694) +++ branches/firefox32/www/seamonkey/Makefile Sat Sep 13 07:11:17 2014 (r1695) @@ -14,6 +14,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ nss>=3.16:${PORTSDIR}/security/nss \ + cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ @@ -25,7 +26,6 @@ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -50,7 +50,7 @@ MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \ --enable-application=suite -USE_MOZILLA= -cairo +USE_MOZILLA= # empty MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Sat Sep 13 06:51:20 2014 (r1694) +++ trunk/mail/thunderbird/Makefile Sat Sep 13 07:11:17 2014 (r1695) @@ -15,6 +15,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ nss>=3.16:${PORTSDIR}/security/nss \ + cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ @@ -26,7 +27,6 @@ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -37,7 +37,7 @@ USE_AUTOTOOLS= autoconf213:env OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko -USE_MOZILLA= -cairo +USE_MOZILLA= # empty WANT_GNOME= yes USE_QT5= # empty Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Sat Sep 13 06:51:20 2014 (r1694) +++ trunk/www/firefox-esr/Makefile Sat Sep 13 07:11:17 2014 (r1695) @@ -15,6 +15,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ nss>=3.16.2:${PORTSDIR}/security/nss \ + cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ @@ -26,7 +27,6 @@ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -36,7 +36,7 @@ CPE_PRODUCT= ${PORTNAME}_esr CONFLICTS= firefox-3[02-9].* firefox-2[0-35-9].* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -cairo +USE_MOZILLA= # empty MOZILLA_NAME= Firefox WANT_GNOME= yes Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Sat Sep 13 06:51:20 2014 (r1694) +++ trunk/www/firefox-nightly/Makefile Sat Sep 13 07:11:17 2014 (r1695) @@ -18,6 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ sqlite3>=3.8.6:${PORTSDIR}/databases/sqlite3 \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ + cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ @@ -27,7 +28,6 @@ nspr>=4.10.6:${PORTSDIR}/devel/nspr \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \ # nss>=3.17.1:${PORTSDIR}/security/nss \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -39,7 +39,7 @@ CPE_VERSION= ${PORTVERSION:R} CPE_UPDATE= alpha1 MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -cairo -nss +USE_MOZILLA= -nss MOZILLA_NAME= Firefox Nightly MOZILLA_SUFX= -nightly MOZILLA= ${PORTNAME}${MOZILLA_SUFX} Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sat Sep 13 06:51:20 2014 (r1694) +++ trunk/www/firefox/Makefile Sat Sep 13 07:11:17 2014 (r1695) @@ -14,6 +14,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ nss>=3.16.2:${PORTSDIR}/security/nss \ + cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ @@ -25,7 +26,6 @@ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -34,7 +34,7 @@ USE_GECKO= gecko CONFLICTS= firefox-esr-31.* firefox-esr-24.* firefox-esr-17.* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -cairo +USE_MOZILLA= # empty MOZILLA_NAME= Firefox WANT_GNOME= yes Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Sat Sep 13 06:51:20 2014 (r1694) +++ trunk/www/libxul/Makefile Sat Sep 13 07:11:17 2014 (r1695) @@ -12,6 +12,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ nss>=3.16.2:${PORTSDIR}/security/nss \ + cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ @@ -23,7 +24,6 @@ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -50,7 +50,7 @@ CPE_PRODUCT= firefox_esr OBJDIR_BUILD= # in-tree build broken after bug 789837 MOZILLA_EXEC_NAME=xulrunner -USE_MOZILLA= -cairo +USE_MOZILLA= # empty MOZILLA_PLIST_DIRS= bin include lib share/idl libdata PLIST_DIRSTRY= share/idl MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js \ Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Sat Sep 13 06:51:20 2014 (r1694) +++ trunk/www/seamonkey/Makefile Sat Sep 13 07:11:17 2014 (r1695) @@ -14,6 +14,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ nss>=3.16:${PORTSDIR}/security/nss \ + cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ @@ -25,7 +26,6 @@ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -50,7 +50,7 @@ MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \ --enable-application=suite -USE_MOZILLA= -cairo +USE_MOZILLA= # empty MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409130711.s8D7BHCc013204>