Date: Wed, 15 Jul 2015 17:06:44 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1853 - in trunk: Mk mail/thunderbird/files www/firefox-esr/files www/firefox/files www/libxul/files www/seamonkey/files Message-ID: <201507151706.t6FH6iZ0098479@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Jul 15 17:06:44 2015
New Revision: 1853
Log:
sync with ports and update jpeg-turbo comment
Added:
trunk/mail/thunderbird/files/patch-bug1143411
trunk/www/firefox-esr/files/patch-bug1143411
trunk/www/firefox/files/patch-bug1143411
trunk/www/libxul/files/patch-bug1143411
trunk/www/seamonkey/files/patch-bug1143411
Modified:
trunk/Mk/bsd.gecko.mk
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Thu Jun 25 14:00:39 2015 (r1852)
+++ trunk/Mk/bsd.gecko.mk Wed Jul 15 17:06:44 2015 (r1853)
@@ -4,7 +4,7 @@
# Date created: 12 Nov 2005
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
-# $FreeBSD: head/Mk/bsd.gecko.mk 389557 2015-06-13 22:57:17Z antoine $
+# $FreeBSD: head/Mk/bsd.gecko.mk 390310 2015-06-22 18:33:20Z antoine $
#
# 4 column tabs prevent hair loss and tooth decay!
@@ -161,9 +161,9 @@
icu_MOZ_OPTIONS= --with-system-icu --with-intl-api
-jpeg_BUILD_DEPENDS=yasm:${PORTSDIR}/devel/yasm
-# XXX depends on ports/180159 or package flavor support
-#jpeg_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/libjpeg-turbo
-jpeg_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg
+# XXX JCS_EXTENSIONS API is currently disabled by r371283
+# XXX Remove files/patch-ijg-libjpeg once -turbo is default
+jpeg_USES= jpeg
jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE}
nspr_LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr
@@ -217,6 +217,7 @@
BUILD_DEPENDS+= ${${dep}_BUILD_DEPENDS}
LIB_DEPENDS+= ${${dep}_LIB_DEPENDS}
RUN_DEPENDS+= ${${dep}_RUN_DEPENDS}
+USES+= ${${dep}_USES}
MOZ_OPTIONS+= ${${dep}_MOZ_OPTIONS}
.else
BUILD_DEPENDS+= ${-${dep}_BUILD_DEPENDS}
Added: trunk/mail/thunderbird/files/patch-bug1143411
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug1143411 Wed Jul 15 17:06:44 2015 (r1853)
@@ -0,0 +1,27 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
+
+diff --git a/config/system-headers b/config/system-headers
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
+@@ -465,16 +465,17 @@ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+ freetype/ftadvanc.h
+ freetype/ftbitmap.h
+ freetype/ftxf86.h
+ freetype.h
+ ftcache.h
++ftfntfmt.h
+ ftglyph.h
+ ftsynth.h
+ ftoutln.h
+ ttnameid.h
+ tttables.h
+ t1tables.h
+ ftlcdfil.h
+ ftsizes.h
+
+
+
+
Added: trunk/www/firefox-esr/files/patch-bug1143411
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-esr/files/patch-bug1143411 Wed Jul 15 17:06:44 2015 (r1853)
@@ -0,0 +1,27 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
+
+diff --git a/config/system-headers b/config/system-headers
+--- config/system-headers
++++ config/system-headers
+@@ -465,16 +465,17 @@ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+ freetype/ftadvanc.h
+ freetype/ftbitmap.h
+ freetype/ftxf86.h
+ freetype.h
+ ftcache.h
++ftfntfmt.h
+ ftglyph.h
+ ftsynth.h
+ ftoutln.h
+ ttnameid.h
+ tttables.h
+ t1tables.h
+ ftlcdfil.h
+ ftsizes.h
+
+
+
+
Added: trunk/www/firefox/files/patch-bug1143411
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug1143411 Wed Jul 15 17:06:44 2015 (r1853)
@@ -0,0 +1,27 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
+
+diff --git a/config/system-headers b/config/system-headers
+--- config/system-headers
++++ config/system-headers
+@@ -465,16 +465,17 @@ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+ freetype/ftadvanc.h
+ freetype/ftbitmap.h
+ freetype/ftxf86.h
+ freetype.h
+ ftcache.h
++ftfntfmt.h
+ ftglyph.h
+ ftsynth.h
+ ftoutln.h
+ ttnameid.h
+ tttables.h
+ t1tables.h
+ ftlcdfil.h
+ ftsizes.h
+
+
+
+
Added: trunk/www/libxul/files/patch-bug1143411
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/libxul/files/patch-bug1143411 Wed Jul 15 17:06:44 2015 (r1853)
@@ -0,0 +1,27 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
+
+diff --git a/config/system-headers b/config/system-headers
+--- config/system-headers
++++ config/system-headers
+@@ -465,16 +465,17 @@ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+ freetype/ftadvanc.h
+ freetype/ftbitmap.h
+ freetype/ftxf86.h
+ freetype.h
+ ftcache.h
++ftfntfmt.h
+ ftglyph.h
+ ftsynth.h
+ ftoutln.h
+ ttnameid.h
+ tttables.h
+ t1tables.h
+ ftlcdfil.h
+ ftsizes.h
+
+
+
+
Added: trunk/www/seamonkey/files/patch-bug1143411
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug1143411 Wed Jul 15 17:06:44 2015 (r1853)
@@ -0,0 +1,27 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
+
+diff --git a/config/system-headers b/config/system-headers
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
+@@ -465,16 +465,17 @@ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+ freetype/ftadvanc.h
+ freetype/ftbitmap.h
+ freetype/ftxf86.h
+ freetype.h
+ ftcache.h
++ftfntfmt.h
+ ftglyph.h
+ ftsynth.h
+ ftoutln.h
+ ttnameid.h
+ tttables.h
+ t1tables.h
+ ftlcdfil.h
+ ftsizes.h
+
+
+
+
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507151706.t6FH6iZ0098479>