www/firefox: update to 72.0

Changes:	https://www.mozilla.org/firefox/72.0/releasenotes/
PR:		242605
Security:	a4d0f92b-2188-40aa-9aa3-005b0a89cc72
Differential Revision:	https://reviews.freebsd.org/D22781
This commit is contained in:
Jan Beich 2019-12-31 00:46:53 +00:00
parent 96758e3ac3
commit bddf82db3a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=521576
5 changed files with 43 additions and 58 deletions

View File

@ -372,6 +372,9 @@ gecko-post-patch:
-e 's|share/mozilla/extensions|lib/xpi|g' \
${MOZSRC}/xpcom/io/nsAppFileLocationProvider.cpp \
${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp
# Disable vendor checksums like lang/rust
@${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
${MOZSRC}/third_party/rust/*/.cargo-checksum.json
post-install-script: gecko-create-plist

View File

@ -2,26 +2,25 @@
# $FreeBSD$
PORTNAME= firefox
DISTVERSION= 71.0
PORTREVISION= 6
DISTVERSION= 72.0
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build5/source
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX}
MAINTAINER= gecko@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
BUILD_DEPENDS= nspr>=4.23:devel/nspr \
nss>=3.47.1:security/nss \
BUILD_DEPENDS= nspr>=4.24:devel/nspr \
nss>=3.48:security/nss \
icu>=64.1,1:devel/icu \
libevent>=2.1.8:devel/libevent \
harfbuzz>=2.6.2:print/harfbuzz \
harfbuzz>=2.6.4:print/harfbuzz \
graphite2>=1.3.13:graphics/graphite2 \
png>=1.6.35:graphics/png \
libvpx>=1.5.0:multimedia/libvpx \
sqlite3>=3.29.0:databases/sqlite3 \
sqlite3>=3.30.1:databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
v4l_compat>0:multimedia/v4l_compat \
autoconf-2.13:devel/autoconf213 \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1575289476
SHA256 (firefox-71.0.source.tar.xz) = 78304cd58229e7103b56b34718aad051c9a4db30c266512a64f501ba58da7fbe
SIZE (firefox-71.0.source.tar.xz) = 312341460
TIMESTAMP = 1577735100
SHA256 (firefox-72.0.source.tar.xz) = d156cdaa4934bb12a28cfe3c1d4caa4e22988cba07d049f1d2ce546b332aae77
SIZE (firefox-72.0.source.tar.xz) = 315293152

View File

@ -1,45 +0,0 @@
commit 9ca396abb28b
Author: Emilio Cobos Álvarez <emilio@crisal.io>
Date: Mon Dec 9 12:47:00 2019 +0000
Bug 1602358 - Fix older builds with newer cbindgen. r=heycam
This should be fine to uplift so that downstream doesn't need multiple cbindgen
versions.
---
layout/generic/WritingModes.h | 3 ++-
servo/ports/geckolib/cbindgen.toml | 10 ----------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git layout/generic/WritingModes.h layout/generic/WritingModes.h
index 1a8d08b191bbb..0671388902f0f 100644
--- layout/generic/WritingModes.h
+++ layout/generic/WritingModes.h
@@ -518,7 +518,8 @@ class WritingMode {
*/
void SetDirectionFromBidiLevel(uint8_t level) {
if (IS_LEVEL_RTL(level) == IsBidiLTR()) {
- mWritingMode ^= StyleWritingMode_RTL | StyleWritingMode_INLINE_REVERSED;
+ mWritingMode.bits ^= static_cast<uint8_t>(
+ (StyleWritingMode_RTL | StyleWritingMode_INLINE_REVERSED).bits);
}
}
diff --git servo/ports/geckolib/cbindgen.toml servo/ports/geckolib/cbindgen.toml
index bed86498ea125..8a7a9cd7998f1 100644
--- servo/ports/geckolib/cbindgen.toml
+++ servo/ports/geckolib/cbindgen.toml
@@ -616,13 +616,3 @@ renaming_overrides_prefixing = true
// Get the layout rect, replacing auto right / bottom values for aAutoSize.
inline nsRect ToLayoutRect(nscoord aAutoSize = NS_MAXSIZE) const;
"""
-
-"WritingMode" = """
- StyleWritingMode operator^(const StyleWritingMode& other) const {
- return {static_cast<decltype(bits)>(this->bits ^ other.bits)};
- }
- StyleWritingMode& operator^=(const StyleWritingMode& other) {
- *this = (*this ^ other);
- return *this;
- }
-"""

View File

@ -38,6 +38,32 @@ index 8e19020315ae..2fcdbb6f7b42 100644
GeneratedFile('UseCounterList.h', script='gen-usecounters.py',
entry_point='use_counter_list', inputs=['UseCounters.conf'])
diff --git gfx/graphite2/geckoextra/moz.build gfx/graphite2/geckoextra/moz.build
new file mode 100644
index 0000000000000..24e8d7a03274a
--- /dev/null
+++ gfx/graphite2/geckoextra/moz.build
@@ -0,0 +1,20 @@
+# -*- Mode: python; 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/.
+
+EXPORTS.graphite2 += [
+ 'include/GraphiteExtra.h',
+]
+
+UNIFIED_SOURCES += [
+ '../geckoextra/src/GraphiteExtra.cpp',
+]
+
+CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
+
+# Match bundled graphite2 configuration
+AllowCompilerWarnings()
+
+FINAL_LIBRARY = 'gkmedias'
diff --git gfx/graphite2/moz-gr-update.sh gfx/graphite2/moz-gr-update.sh
index faaab1b17971..04eff5f09882 100644
--- gfx/graphite2/moz-gr-update.sh
@ -85,11 +111,13 @@ diff --git gfx/moz.build gfx/moz.build
index 771f652e837a..3b358d84e384 100644
--- gfx/moz.build
+++ gfx/moz.build
@@ -13,6 +13,12 @@ with Files('wr/**'):
@@ -13,6 +13,14 @@ with Files('wr/**'):
if CONFIG['MOZ_TREE_CAIRO']:
DIRS += ['cairo']
+if not CONFIG['MOZ_SYSTEM_GRAPHITE2']:
+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
+ DIRS += ['graphite2/geckoextra']
+else:
+ DIRS += ['graphite2/src' ]
+
+if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
@ -98,7 +126,7 @@ index 771f652e837a..3b358d84e384 100644
DIRS += [
'2d',
'ycbcr',
@@ -21,8 +27,6 @@ DIRS += [
@@ -21,8 +29,6 @@ DIRS += [
'qcms',
'gl',
'layers',