Date: Thu, 3 Apr 2014 22:05:06 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1565 - in trunk: Mk mail/thunderbird www/firefox www/firefox-esr www/firefox-nightly www/libxul www/seamonkey Message-ID: <201404032205.s33M56pk012455@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Apr 3 22:05:06 2014
New Revision: 1565
Log:
graphite2 pkg-config version is unreliable, require explicitly
PR: ports/187939
Modified:
trunk/Mk/bsd.gecko.mk
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: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Thu Apr 3 00:07:16 2014 (r1564)
+++ trunk/Mk/bsd.gecko.mk Thu Apr 3 22:05:06 2014 (r1565)
@@ -547,7 +547,7 @@
.endif
# Standard depends
-_ALL_DEPENDS= cairo event ffi harfbuzz hunspell icu jpeg nspr nss opus png pixman sqlite vorbis vpx
+_ALL_DEPENDS= cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss opus png pixman sqlite vorbis vpx
cairo_LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo
cairo_MOZ_OPTIONS= --enable-system-cairo
@@ -562,10 +562,13 @@
ffi_EXTRACT_AFTER_ARGS= --exclude mozilla*/js/src/ctypes/libffi
.if exists(${FILESDIR}/patch-bug847568) || exists(${FILESDIR}/patch-z-bug847568)
+graphite_LIB_DEPENDS= libgraphite2.so:${PORTSDIR}/graphics/graphite2
+graphite_MOZ_OPTIONS= --with-system-graphite2
+graphite_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/graphite2
+
harfbuzz_LIB_DEPENDS= libharfbuzz.so:${PORTSDIR}/print/harfbuzz
-harfbuzz_MOZ_OPTIONS= --with-system-harfbuzz --with-system-graphite2
-harfbuzz_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/harfbuzz \
- --exclude mozilla*/gfx/graphite2
+harfbuzz_MOZ_OPTIONS= --with-system-harfbuzz
+harfbuzz_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/harfbuzz
.endif
hunspell_LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Thu Apr 3 00:07:16 2014 (r1564)
+++ trunk/mail/thunderbird/Makefile Thu Apr 3 22:05:06 2014 (r1565)
@@ -18,6 +18,7 @@
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
harfbuzz>=0.9.16:${PORTSDIR}/print/harfbuzz \
+ graphite2>=1.2.3:${PORTSDIR}/graphics/graphite2 \
libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
Modified: trunk/www/firefox-esr/Makefile
==============================================================================
--- trunk/www/firefox-esr/Makefile Thu Apr 3 00:07:16 2014 (r1564)
+++ trunk/www/firefox-esr/Makefile Thu Apr 3 22:05:06 2014 (r1565)
@@ -18,6 +18,7 @@
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
harfbuzz>=0.9.16:${PORTSDIR}/print/harfbuzz \
+ graphite2>=1.2.3:${PORTSDIR}/graphics/graphite2 \
libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Thu Apr 3 00:07:16 2014 (r1564)
+++ trunk/www/firefox-nightly/Makefile Thu Apr 3 22:05:06 2014 (r1565)
@@ -18,6 +18,7 @@
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \
+ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Thu Apr 3 00:07:16 2014 (r1564)
+++ trunk/www/firefox/Makefile Thu Apr 3 22:05:06 2014 (r1565)
@@ -15,6 +15,7 @@
BUILD_DEPENDS= nspr>=4.10.3:${PORTSDIR}/devel/nspr \
nss>=3.16:${PORTSDIR}/security/nss \
harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \
+ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile Thu Apr 3 00:07:16 2014 (r1564)
+++ trunk/www/libxul/Makefile Thu Apr 3 22:05:06 2014 (r1565)
@@ -17,6 +17,7 @@
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
harfbuzz>=0.9.16:${PORTSDIR}/print/harfbuzz \
+ graphite2>=1.2.3:${PORTSDIR}/graphics/graphite2 \
libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Thu Apr 3 00:07:16 2014 (r1564)
+++ trunk/www/seamonkey/Makefile Thu Apr 3 22:05:06 2014 (r1565)
@@ -15,6 +15,7 @@
BUILD_DEPENDS= nspr>=4.10.3:${PORTSDIR}/devel/nspr \
nss>=3.15.4:${PORTSDIR}/security/nss \
harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \
+ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404032205.s33M56pk012455>