From c308de0164ec299c9914722e02f9e6176f6c5b89 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 27 Feb 2015 14:42:51 +0000 Subject: - Update Firefox to 36.0 - Update Firefox ESR to 31.5.0 - Update Thunderbird to 31.5.0 - Update libxul to 31.5.0 - Check if NS_NewNativeLocalFile() succeeds before using [1] - Remove DTRACE and GIO descriptions after r377838 and r314893 - bsd.gecko.mk: Prune conditionals for files removed 4 months ago Changes: https://www.mozilla.org/firefox/36.0/releasenotes/ Obtained from: PkgSrc [1] MFH: 2015Q1 X-MFH-With: r377953, r378253, r379485, r378529 Security: https://vuxml.freebsd.org/freebsd/99029172-8253-407d-9d8b-2cfeab9abf81.html --- www/firefox/files/patch-bug847568 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'www/firefox/files/patch-bug847568') diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568 index 698ee2c498fc..2ffb2dbfb5e8 100644 --- a/www/firefox/files/patch-bug847568 +++ b/www/firefox/files/patch-bug847568 @@ -83,10 +83,10 @@ index ac38f40..87536b7 100644 dnl Check for pixman and cairo dnl ======================================================== -diff --git content/base/src/moz.build content/base/src/moz.build +diff --git dom/base/moz.build dom/base/moz.build index a660ba4..6b2f602 100644 ---- content/base/src/moz.build -+++ content/base/src/moz.build +--- dom/base/moz.build ++++ dom/base/moz.build @@ -196,6 +196,9 @@ SOURCES += [ 'nsObjectLoadingContent.cpp', ] @@ -237,6 +237,6 @@ index 67f0db9..d42137a 100644 +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] + - if CONFIG['MOZ_ALSA']: - OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] + if CONFIG['MOZ_OSS']: + OS_LIBS += CONFIG['MOZ_OSS_LIBS'] -- cgit v1.2.3