summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2016-04-28 13:22:31 -0400
committerIan Stakenvicius <axs@gentoo.org>2016-04-28 14:12:28 -0400
commit0bf6849a85f20f8815d870dd28b708dff06ec2ed (patch)
tree50b52580dd87ba342352b1af5a603474276083e7 /www-client/firefox/files
parentwww-client/firefox: bump 38.x ESR to 38.8.0 for security bug 581326 (diff)
downloadgentoo-0bf6849a85f20f8815d870dd28b708dff06ec2ed.tar.gz
gentoo-0bf6849a85f20f8815d870dd28b708dff06ec2ed.tar.bz2
gentoo-0bf6849a85f20f8815d870dd28b708dff06ec2ed.zip
firefox-45, thunderbird-45: support system harfbuzz and graphite2
This commit introduces changes to mozconfig-v6.45.eclass and related changes to the existing mail-client/thunderbird-45.0 and the new version bump www-client/firefox-45.1.0 to support using system copies of media-libs/harfbuzz and media-gfx/graphite2 instead of the copies bundled inside of the mozilla codebase. www-client/firefox-45.1.0 was additionally bumped to support security bug 581326 Package-Manager: portage-2.2.26
Diffstat (limited to 'www-client/firefox/files')
-rw-r--r--www-client/firefox/files/arm64-4-link-chromium-mutex-based-atomics.patch59
-rw-r--r--www-client/firefox/files/arm64-5-mozjemalloc-no-static-page-sizes.patch22
2 files changed, 81 insertions, 0 deletions
diff --git a/www-client/firefox/files/arm64-4-link-chromium-mutex-based-atomics.patch b/www-client/firefox/files/arm64-4-link-chromium-mutex-based-atomics.patch
new file mode 100644
index 000000000000..53bbdc1fb885
--- /dev/null
+++ b/www-client/firefox/files/arm64-4-link-chromium-mutex-based-atomics.patch
@@ -0,0 +1,59 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Sat, 19 Mar 2016 01:24:21 +0900
+Subject: Bug 1257888 - Link chromium mutex-based atomics implementation to
+ webrtc signaling tests
+
+---
+ ipc/chromium/atomics/moz.build | 17 +++++++++++++++++
+ ipc/chromium/moz.build | 4 ++++
+ media/webrtc/signaling/test/common.build | 1 +
+ 3 files changed, 22 insertions(+)
+ create mode 100644 ipc/chromium/atomics/moz.build
+
+diff --git a/ipc/chromium/atomics/moz.build b/ipc/chromium/atomics/moz.build
+new file mode 100644
+index 0000000..6e0a9e4
+--- /dev/null
++++ b/ipc/chromium/atomics/moz.build
+@@ -0,0 +1,17 @@
++# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
++# vim: set filetype=python:
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++include('/ipc/chromium/chromium-config.mozbuild')
++
++Library('chromium_atomics')
++
++# This test is copied from ../moz.build for atomicops_internals_mutex.cc
++ost = CONFIG['OS_TEST']
++if '86' not in ost and 'arm' not in ost and 'aarch64' != ost and 'mips' not in ost:
++ SOURCES += [
++ '../src/base/atomicops_internals_mutex.cc',
++ '../src/base/lock_impl_posix.cc',
++ ]
+diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build
+index 88aaafe..52b6282 100644
+--- a/ipc/chromium/moz.build
++++ b/ipc/chromium/moz.build
+@@ -172,3 +172,7 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
+ include('/ipc/chromium/chromium-config.mozbuild')
+
+ FINAL_LIBRARY = 'xul'
++
++DIRS += [
++ 'atomics',
++]
+diff --git a/media/webrtc/signaling/test/common.build b/media/webrtc/signaling/test/common.build
+index c0a624f..21adad5 100644
+--- a/media/webrtc/signaling/test/common.build
++++ b/media/webrtc/signaling/test/common.build
+@@ -79,6 +79,7 @@ if CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'):
+
+ USE_LIBS += [
+ '/media/webrtc/trunk/testing/gtest_gtest/gtest',
++ 'chromium_atomics',
+ 'gkmedias',
+ 'nksrtp_s',
+ 'nss',
diff --git a/www-client/firefox/files/arm64-5-mozjemalloc-no-static-page-sizes.patch b/www-client/firefox/files/arm64-5-mozjemalloc-no-static-page-sizes.patch
new file mode 100644
index 000000000000..1c8cd9a12e77
--- /dev/null
+++ b/www-client/firefox/files/arm64-5-mozjemalloc-no-static-page-sizes.patch
@@ -0,0 +1,22 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Wed, 25 Feb 2015 10:41:37 +0900
+Subject: Make powerpc not use static page sizes in mozjemalloc
+
+Closes: #763900
+---
+ memory/mozjemalloc/jemalloc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c
+index ee9e288..2e27e69 100644
+--- a/memory/mozjemalloc/jemalloc.c
++++ b/memory/mozjemalloc/jemalloc.c
+@@ -1089,7 +1089,7 @@ static const bool config_recycle = false;
+ * controlling the malloc behavior are defined as compile-time constants
+ * for best performance and cannot be altered at runtime.
+ */
+-#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__)
++#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !defined(__powerpc__)
+ #define MALLOC_STATIC_SIZES 1
+ #endif
+