Date: Mon, 2 Dec 2019 18:09:54 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r518860 - in branches/2019Q4: Mk www/firefox www/firefox/files Message-ID: <201912021809.xB2I9s1G078466@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Dec 2 18:09:54 2019 New Revision: 518860 URL: https://svnweb.freebsd.org/changeset/ports/518860 Log: MFH: r518439 r518660 r518854 www/firefox: update to 71.0 Changes: https://www.mozilla.org/firefox/71.0/releasenotes/ PR: 241840 Security: 13b6433c-7aaf-477b-b96b-164924a005bb Approved by: ports-secteam (joneum) Differential Revision: https://reviews.freebsd.org/D22296 Added: branches/2019Q4/www/firefox/files/patch-Makefile.in - copied unchanged from r518439, head/www/firefox/files/patch-Makefile.in Deleted: branches/2019Q4/www/firefox/files/patch-cubeb-dlopen Modified: branches/2019Q4/Mk/bsd.gecko.mk branches/2019Q4/www/firefox/Makefile branches/2019Q4/www/firefox/distinfo branches/2019Q4/www/firefox/files/patch-bug847568 Directory Properties: branches/2019Q4/ (props changed) Modified: branches/2019Q4/Mk/bsd.gecko.mk ============================================================================== --- branches/2019Q4/Mk/bsd.gecko.mk Mon Dec 2 18:00:07 2019 (r518859) +++ branches/2019Q4/Mk/bsd.gecko.mk Mon Dec 2 18:09:54 2019 (r518860) @@ -270,10 +270,8 @@ MOZ_OPTIONS+= --disable-pulseaudio BUILD_DEPENDS+= ${LOCALBASE}/include/sndio.h:audio/sndio post-patch-SNDIO-on: @${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \ - ${MOZSRC}/media/libcubeb/src/moz.build \ - ${MOZSRC}/toolkit/library/moz.build - @${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \ - ${MOZSRC}/media/libcubeb/gtest/moz.build + -e '/DISABLE_LIBSNDIO_DLOPEN/d' \ + ${MOZSRC}/media/libcubeb/src/moz.build .endif .if ${PORT_OPTIONS:MDEBUG} Modified: branches/2019Q4/www/firefox/Makefile ============================================================================== --- branches/2019Q4/www/firefox/Makefile Mon Dec 2 18:00:07 2019 (r518859) +++ branches/2019Q4/www/firefox/Makefile Mon Dec 2 18:09:54 2019 (r518860) @@ -2,21 +2,22 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 70.0.1 +DISTVERSION= 71.0 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build5/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.21:devel/nspr \ - nss>=3.46.1:security/nss \ + nss>=3.47:security/nss \ icu>=64.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=2.6.1:print/harfbuzz \ + harfbuzz>=2.6.2:print/harfbuzz \ graphite2>=1.3.13:graphics/graphite2 \ png>=1.6.35:graphics/png \ libvpx>=1.5.0:multimedia/libvpx \ Modified: branches/2019Q4/www/firefox/distinfo ============================================================================== --- branches/2019Q4/www/firefox/distinfo Mon Dec 2 18:00:07 2019 (r518859) +++ branches/2019Q4/www/firefox/distinfo Mon Dec 2 18:09:54 2019 (r518860) @@ -1,3 +1,3 @@ -TIMESTAMP = 1572457039 -SHA256 (firefox-70.0.1.source.tar.xz) = f2e9bb26af7682b31e82fdfc3a4b3e04fd1caa8b004469ea608185d33e35691b -SIZE (firefox-70.0.1.source.tar.xz) = 326335800 +TIMESTAMP = 1575289476 +SHA256 (firefox-71.0.source.tar.xz) = 78304cd58229e7103b56b34718aad051c9a4db30c266512a64f501ba58da7fbe +SIZE (firefox-71.0.source.tar.xz) = 312341460 Copied: branches/2019Q4/www/firefox/files/patch-Makefile.in (from r518439, head/www/firefox/files/patch-Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q4/www/firefox/files/patch-Makefile.in Mon Dec 2 18:09:54 2019 (r518860, copy of r518439, head/www/firefox/files/patch-Makefile.in) @@ -0,0 +1,22 @@ +Don't force mach after https://bugzilla.mozilla.org/show_bug.cgi?id=1496746 + +diff --git Makefile.in Makefile.in +index 407e373573fb..16b8bb162d39 100644 +--- Makefile.in ++++ Makefile.in +@@ -55,15 +55,8 @@ $(RUNNABLE_TIERS) binaries:: CLOBBER $(BUILD_BACKEND_FILES) + endif + endif + +-ifdef JS_STANDALONE + .PHONY: CLOBBER + CLOBBER: +-else +-CLOBBER: $(topsrcdir)/CLOBBER +- @echo 'STOP! The CLOBBER file has changed.' +- @echo 'Please run the build through "mach build".' +- @exit 1 +-endif + + install_manifests := \ + $(addprefix dist/,branding include public private xpi-stage) \ Modified: branches/2019Q4/www/firefox/files/patch-bug847568 ============================================================================== --- branches/2019Q4/www/firefox/files/patch-bug847568 Mon Dec 2 18:00:07 2019 (r518859) +++ branches/2019Q4/www/firefox/files/patch-bug847568 Mon Dec 2 18:09:54 2019 (r518860) @@ -4,7 +4,7 @@ diff --git config/system-headers.mozbuild config/syste index 7620b4d00623..09d3db5ca8c0 100644 --- config/system-headers.mozbuild +++ config/system-headers.mozbuild -@@ -1295,6 +1295,19 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']: +@@ -1299,6 +1299,19 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']: 'proxy.h', ] @@ -28,16 +28,16 @@ diff --git dom/base/moz.build dom/base/moz.build index 8e19020315ae..2fcdbb6f7b42 100644 --- dom/base/moz.build +++ dom/base/moz.build -@@ -539,6 +539,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/andr +@@ -543,6 +543,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: if CONFIG['MOZ_X11']: CXXFLAGS += CONFIG['TK_CFLAGS'] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - GENERATED_FILES += [ - 'PropertyUseCounterMap.inc', - 'UseCounterList.h', + GeneratedFile('UseCounterList.h', script='gen-usecounters.py', + entry_point='use_counter_list', inputs=['UseCounters.conf']) + diff --git gfx/graphite2/moz-gr-update.sh gfx/graphite2/moz-gr-update.sh index faaab1b17971..04eff5f09882 100644 --- gfx/graphite2/moz-gr-update.sh @@ -170,7 +170,7 @@ diff --git netwerk/dns/moz.build netwerk/dns/moz.build index 79c26e3e7001..c4d93bc5f7dc 100644 --- netwerk/dns/moz.build +++ netwerk/dns/moz.build -@@ -90,3 +90,6 @@ USE_LIBS += ['icu'] +@@ -86,3 +86,6 @@ USE_LIBS += ['icu'] if CONFIG['CC_TYPE'] in ('clang', 'gcc'): CXXFLAGS += ['-Wno-error=shadow'] @@ -181,10 +181,11 @@ diff --git old-configure.in old-configure.in index 95a58b634593..b614eef85c89 100644 --- old-configure.in +++ old-configure.in -@@ -2665,5 +2665,26 @@ dnl ================================================== +@@ -2639,6 +2639,27 @@ dnl ======================================================== + AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) - dnl ======================================================== ++dnl ======================================================== +dnl Check for graphite2 +dnl ======================================================== +if test -n "$MOZ_SYSTEM_GRAPHITE2"; then @@ -205,14 +206,14 @@ index 95a58b634593..b614eef85c89 100644 + CFLAGS=$_SAVE_CFLAGS +fi + -+dnl ======================================================== + dnl ======================================================== dnl Check for pixman and cairo dnl ======================================================== diff --git toolkit/library/moz.build toolkit/library/moz.build index 24f940e1ed7e..079a575adec3 100644 --- toolkit/library/moz.build +++ toolkit/library/moz.build -@@ -254,6 +254,12 @@ if CONFIG['MOZ_SYSTEM_PNG']: +@@ -248,6 +248,12 @@ if CONFIG['MOZ_SYSTEM_PNG']: if CONFIG['MOZ_SYSTEM_WEBP']: OS_LIBS += CONFIG['MOZ_WEBP_LIBS'] @@ -229,7 +230,7 @@ diff --git toolkit/moz.configure toolkit/moz.configure index 9297e4d6f501..d8e273887e4b 100644 --- toolkit/moz.configure +++ toolkit/moz.configure -@@ -927,6 +927,25 @@ add_old_configure_assignment('FT2_LIBS', +@@ -937,6 +937,25 @@ add_old_configure_assignment('FT2_LIBS', add_old_configure_assignment('FT2_CFLAGS', ft2_info.cflags) @@ -248,7 +249,7 @@ index 9297e4d6f501..d8e273887e4b 100644 +option('--with-system-harfbuzz', + help="Use system harfbuzz (located with pkgconfig)") + -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.6.1', ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.6.2', + when='--with-system-harfbuzz') + +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912021809.xB2I9s1G078466>