cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

www/firefox: update to 74.0

Browse Source 
Changes:	https://www.mozilla.org/firefox/74.0/releasenotes/
PR:		244310
Security:	9f900456-0bfa-4da4-ad59-14b2933259a2
Differential Revision:	https://reviews.freebsd.org/D23646
This commit is contained in:
Jan Beich 2020-03-05 02:03:14 +00:00
parent 481f53104f
commit 09291dd82f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=527804
5 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mk/bsd.gecko.mk
View File

@ -76,7 +76,7 @@ LDFLAGS+= -Wl,--as-needed
BUNDLE_LIBS= yes
BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
rust-cbindgen>=0.12.0:devel/rust-cbindgen \
rust-cbindgen>=0.13.0:devel/rust-cbindgen \
${RUST_DEFAULT}>=1.39:lang/${RUST_DEFAULT} \
${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
node:www/node

12
www/firefox/Makefile
View File

@ -2,26 +2,24 @@
# $FreeBSD$
PORTNAME= firefox
DISTVERSION= 73.0.1
PORTREVISION= 2
DISTVERSION= 74.0
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/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.24:devel/nspr \
nss>=3.49.2:security/nss \
BUILD_DEPENDS= nspr>=4.25:devel/nspr \
nss>=3.50:security/nss \
icu>=64.1,1:devel/icu \
libevent>=2.1.8:devel/libevent \
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.30.1:databases/sqlite3 \
v4l_compat>0:multimedia/v4l_compat \
autoconf-2.13:devel/autoconf213 \
nasm:devel/nasm \
@ -29,7 +27,7 @@ BUILD_DEPENDS= nspr>=4.24:devel/nspr \
USE_GECKO= gecko
CONFLICTS_INSTALL= firefox-esr
USE_MOZILLA= -vpx
USE_MOZILLA= -sqlite -vpx
USES= tar:xz

6
www/firefox/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1581967287
SHA256 (firefox-73.0.1.source.tar.xz) = 53415180e74da60fc91700ce1ff33bf5b6f51e65353017a98270899a08e0c3d2
SIZE (firefox-73.0.1.source.tar.xz) = 326596084
TIMESTAMP = 1583372737
SHA256 (firefox-74.0.source.tar.xz) = 9ad2e5a6c7ab63bf53ee2a354d57e167ae929e3d3dd2b0d3afd1264e59fc1a2b
SIZE (firefox-74.0.source.tar.xz) = 322945996

22
www/firefox/files/patch-bug1288587
View File

@ -2,15 +2,15 @@ diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.confi
index 855214a..1e91d51 100644
--- build/moz.configure/init.configure
+++ build/moz.configure/init.configure
@@ -211,6 +211,7 @@ option(env='PYTHON', nargs=1, help='Python 2.7 interpr
@imports(_from='mozbuild.virtualenv', _import='VirtualenvManager')
@imports(_from='mozbuild.virtualenv', _import='verify_python_version')
@imports(_from='mozbuild.virtualenv', _import='PY2')
@@ -252,6 +252,7 @@ option(env='PYTHON', nargs=1, help='Python 2.7 interpr
@imports(_from='mozbuild.pythonutil', _import='find_python2_executable')
@imports(_from='mozbuild.pythonutil', _import='python_executable_version')
@imports(_from='six', _import='ensure_text')
+@imports(_from='__builtin__', _import='KeyError')
def virtualenv_python2(env_python, build_env, mozconfig, help):
def virtualenv_python2(env_python, build_env, mozillabuild, mozconfig, help):
if help:
return
@@ -242,6 +243,12 @@ def virtualenv_python2(env_python, build_env, mozconfi
@@ -283,6 +284,12 @@ def virtualenv_python2(env_python, build_env, mozillab
python = mozconfig['vars']['added']['PYTHON']
elif 'PYTHON' in mozconfig['vars']['modified']:
python = mozconfig['vars']['modified']['PYTHON'][1]
@ -23,7 +23,7 @@ index 855214a..1e91d51 100644
log.debug("python2: executable from configuration: %r" % python)
@@ -294,7 +301,10 @@ def virtualenv_python2(env_python, build_env, mozconfi
@@ -358,7 +365,10 @@ def virtualenv_python2(env_python, build_env, mozillab
sys.executable, manager.python_path))
log.info('Reexecuting in the virtualenv')
if env_python:
@ -35,15 +35,15 @@ index 855214a..1e91d51 100644
# One would prefer to use os.execl, but that's completely borked on
# Windows.
sys.exit(subprocess.call([python] + sys.argv))
@@ -430,6 +440,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre
@imports(_from='mozbuild.virtualenv', _import='PY3')
@@ -460,6 +470,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre
@imports(_from='mozbuild.pythonutil', _import='find_python3_executable')
@imports(_from='mozbuild.pythonutil', _import='python_executable_version')
@imports(_from='six', _import='ensure_text')
+@imports(_from='__builtin__', _import='KeyError')
def virtualenv_python3(env_python, build_env, mozillabuild, mozconfig, help):
if help:
return
@@ -465,6 +476,12 @@ def virtualenv_python3(env_python, build_env, mozillab
@@ -495,6 +506,12 @@ def virtualenv_python3(env_python, build_env, mozillab
python = mozconfig['vars']['added']['PYTHON3']
elif 'PYTHON3' in mozconfig['vars']['modified']:
python = mozconfig['vars']['modified']['PYTHON3'][1]
@ -56,7 +56,7 @@ index 855214a..1e91d51 100644
log.debug("python3: executable from configuration: %r" % python)
@@ -545,7 +562,10 @@ def virtualenv_python3(env_python, build_env, mozillab
@@ -575,7 +592,10 @@ def virtualenv_python3(env_python, build_env, mozillab
sys.executable, manager.python_path))
log.info('Re-executing in the virtualenv')
if env_python:

15
www/firefox/files/patch-cubeb-sndio
View File

@ -1,15 +0,0 @@
https://github.com/kinetiknz/cubeb/commit/3ab507569153
diff --git a/src/cubeb_sndio.c b/src/cubeb_sndio.c
index 4a05bd84..34b3513d 100644
--- media/libcubeb/src/cubeb_sndio.c
+++ media/libcubeb/src/cubeb_sndio.c
@@ -128,7 +128,7 @@ s16_to_float(void *ptr, long nsamp)
static const char *
sndio_get_device()
{
-#ifndef __OpenBSD__
+#ifdef __linux__
/*
* On other platforms default to sndio devices,
* so cubebs other backends can be used instead.