sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-31 02:16:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/chromium: update to 87.0.4280.141

Browse source 
Clean up now unused GN_ONLY code from Makefile
Security:	https://www.vuxml.org/freebsd/d153c4d2-50f8-11eb-8046-3065ec8fd3ec.html
This commit is contained in:
Rene Ladan 2021-01-09 13:26:28 +00:00
parent a145c1c3d5
commit 391acded85
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=560862
2 changed files with 14 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
www/chromium/Makefile
View file

@ -2,24 +2,25 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= chromium PORTNAME= chromium
PORTVERSION= 87.0.4280.88 PORTVERSION= 87.0.4280.141
CATEGORIES?= www java CATEGORIES= www java
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
LOCAL/rene/chromium/:fonts LOCAL/rene/chromium/:fonts
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER?= chromium@FreeBSD.org MAINTAINER= chromium@FreeBSD.org
COMMENT?= Google web browser based on WebKit COMMENT= Google web browser based on WebKit
LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE= BSD3CLAUSE LGPL21 MPL11
LICENSE_COMB= multi LICENSE_COMB= multi
BROKEN_FreeBSD_11_aarch64= components/safe_browsing_db/v4_rice.cc:120:18: use of overloaded operator '&' is ambiguous
ONLY_FOR_ARCHS= aarch64 amd64 i386
BUILD_DEPENDS= bash:shells/bash \ BUILD_DEPENDS= bash:shells/bash \
${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
gperf:devel/gperf \
.if !defined(GN_ONLY)
BUILD_DEPENDS+= gperf:devel/gperf \
ffmpeg>=3.2.2,1:multimedia/ffmpeg \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \
flock:sysutils/flock \ flock:sysutils/flock \
node:www/node \ node:www/node \
@ -28,9 +29,7 @@ BUILD_DEPENDS+= gperf:devel/gperf \
${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
.endif
.if !defined(GN_ONLY)
LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \
libatspi.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \
libspeechd.so:accessibility/speech-dispatcher \ libspeechd.so:accessibility/speech-dispatcher \
@ -65,23 +64,13 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \
RUN_DEPENDS= xdg-open:devel/xdg-utils \ RUN_DEPENDS= xdg-open:devel/xdg-utils \
noto-basic>0:x11-fonts/noto-basic noto-basic>0:x11-fonts/noto-basic
BROKEN_FreeBSD_11_aarch64= components/safe_browsing_db/v4_rice.cc:120:18: use of overloaded operator '&' is ambiguous
ONLY_FOR_ARCHS= aarch64 amd64 i386
.endif
.if defined(GN_ONLY)
USES= compiler:c++14-lang dos2unix localbase:ldflags ninja pkgconfig \
python:2.7,build shebangfix tar:xz
.else
USES= bison cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ USES= bison cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \
ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg
.endif
MAKE_ARGS= -C out/${BUILDTYPE} MAKE_ARGS= -C out/${BUILDTYPE}
BINARY_ALIAS= python=${PYTHON_CMD} BINARY_ALIAS= python=${PYTHON_CMD}
DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
.if !defined(GN_ONLY)
CPE_VENDOR= google CPE_VENDOR= google
CPE_PRODUCT= chrome CPE_PRODUCT= chrome
USE_GL= gbm gl USE_GL= gbm gl
@ -94,8 +83,6 @@ SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-
ALL_TARGET= chrome ALL_TARGET= chrome
INSTALLS_ICONS= yes INSTALLS_ICONS= yes
.endif
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
# TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
@ -136,8 +123,6 @@ GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles
GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \ GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \
google_default_client_id="996322985003.apps.googleusercontent.com" \ google_default_client_id="996322985003.apps.googleusercontent.com" \
google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn" google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn"
.if !defined(GN_ONLY)
SUB_FILES= chromium-browser.desktop chrome SUB_FILES= chromium-browser.desktop chrome
SUB_LIST+= COMMENT="${COMMENT}" SUB_LIST+= COMMENT="${COMMENT}"
@ -195,8 +180,6 @@ SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS= GN_ARGS+=use_sndio=true
SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
.endif
.include "Makefile.tests" .include "Makefile.tests"
TEST_ALL_TARGET= ${TEST_TARGETS} TEST_ALL_TARGET= ${TEST_TARGETS}
TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \
@ -216,11 +199,9 @@ PLIST_SUB+= NOT_AARCH64=""
.endif .endif
# Make better javascript with java # Make better javascript with java
.if !defined(GN_ONLY)
JAVA_BUILD= yes JAVA_BUILD= yes
JAVA_VERSION= 1.8 JAVA_VERSION= 1.8
USE_JAVA= yes USE_JAVA= yes
.endif
# Allow relocations against read-only segments (override lld default) # Allow relocations against read-only segments (override lld default)
LDFLAGS_i386= -Wl,-znotext LDFLAGS_i386= -Wl,-znotext
@ -230,7 +211,6 @@ LDFLAGS_i386= -Wl,-znotext
MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \
CPLUS_INCLUDE_PATH=${LOCALBASE}/include CPLUS_INCLUDE_PATH=${LOCALBASE}/include
.if !defined(GN_ONLY)
pre-everything:: pre-everything::
@${ECHO_MSG} @${ECHO_MSG}
@${ECHO_MSG} "To build Chromium, you should have around 2GB of memory" @${ECHO_MSG} "To build Chromium, you should have around 2GB of memory"
@ -263,14 +243,12 @@ pre-configure:
@${MKDIR} ${WRKDIR}/site-packages/xcbgen @${MKDIR} ${WRKDIR}/site-packages/xcbgen
${CP} ${PYTHONBASE}/lib/python${PYTHON_DEFAULT}/site-packages/xcbgen/*.py \ ${CP} ${PYTHONBASE}/lib/python${PYTHON_DEFAULT}/site-packages/xcbgen/*.py \
${WRKDIR}/site-packages/xcbgen ${WRKDIR}/site-packages/xcbgen
.endif
do-configure: do-configure:
# GN generator bootstrapping and generating ninja files # GN generator bootstrapping and generating ninja files
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
.if !defined(GN_ONLY)
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \ cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \
gen --args='${GN_ARGS}' out/${BUILDTYPE} gen --args='${GN_ARGS}' out/${BUILDTYPE}
@ -288,7 +266,6 @@ do-configure:
@${MKDIR} ${WRKSRC}/buildtools/freebsd @${MKDIR} ${WRKSRC}/buildtools/freebsd
${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd ${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd ${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
.endif
do-test-TEST-on: do-test-TEST-on:
.for t in ${TEST_TARGETS} .for t in ${TEST_TARGETS}
@ -296,7 +273,6 @@ do-test-TEST-on:
./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
.endfor .endfor
.if !defined(GN_ONLY)
do-install: do-install:
@${MKDIR} ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \
@ -353,6 +329,5 @@ post-install-DEBUG-on:
post-install-DRIVER-on: post-install-DRIVER-on:
${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/bin
.endif
.include <bsd.port.mk> .include <bsd.port.mk>

10
www/chromium/distinfo
View file

@ -1,7 +1,7 @@
TIMESTAMP = 1606957721 TIMESTAMP = 1610013360
SHA256 (chromium-87.0.4280.88.tar.xz) = 3e4645328735ef60db78d1a313efb3770a3edeaede90d076414df52f567a09c0 SHA256 (chromium-87.0.4280.141.tar.xz) = 147591d7fc21e1a173701d28bbf35baddb91e64dd96ec16d8eee9a5113403375
SIZE (chromium-87.0.4280.88.tar.xz) = 856266548 SIZE (chromium-87.0.4280.141.tar.xz) = 856467564
SHA256 (chromium-87.0.4280.88-testdata.tar.xz) = 35c4676c9cb699aa76335757ec2a71a246102f2e6e6a3536e43c1c4afb04e494 SHA256 (chromium-87.0.4280.141-testdata.tar.xz) = 210492a8c704bf47b92039e2564f73ebfbcc5ab605d23f66ba16547235a64539
SIZE (chromium-87.0.4280.88-testdata.tar.xz) = 257423892 SIZE (chromium-87.0.4280.141-testdata.tar.xz) = 257414220
SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9 SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9
SIZE (test_fonts-85.tar.xz) = 9511984 SIZE (test_fonts-85.tar.xz) = 9511984