svn commit: r560863 - branches/2021Q1/www/chromium
Rene Ladan
rene at FreeBSD.org
Sat Jan 9 13:28:16 UTC 2021
Author: rene
Date: Sat Jan 9 13:28:15 2021
New Revision: 560863
URL: https://svnweb.freebsd.org/changeset/ports/560863
Log:
MFH: r560862
www/chromium: update to 87.0.4280.141
Clean up now unused GN_ONLY code from Makefile
Security: https://www.vuxml.org/freebsd/d153c4d2-50f8-11eb-8046-3065ec8fd3ec.html
Modified:
branches/2021Q1/www/chromium/Makefile
branches/2021Q1/www/chromium/distinfo
Directory Properties:
branches/2021Q1/ (props changed)
Modified: branches/2021Q1/www/chromium/Makefile
==============================================================================
--- branches/2021Q1/www/chromium/Makefile Sat Jan 9 13:26:28 2021 (r560862)
+++ branches/2021Q1/www/chromium/Makefile Sat Jan 9 13:28:15 2021 (r560863)
@@ -2,24 +2,25 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 87.0.4280.88
-CATEGORIES?= www java
+PORTVERSION= 87.0.4280.141
+CATEGORIES= www java
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
LOCAL/rene/chromium/:fonts
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-MAINTAINER?= chromium at FreeBSD.org
-COMMENT?= Google web browser based on WebKit
+MAINTAINER= chromium at FreeBSD.org
+COMMENT= Google web browser based on WebKit
LICENSE= BSD3CLAUSE LGPL21 MPL11
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 \
${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
-
-.if !defined(GN_ONLY)
-BUILD_DEPENDS+= gperf:devel/gperf \
+ gperf:devel/gperf \
ffmpeg>=3.2.2,1:multimedia/ffmpeg \
flock:sysutils/flock \
node:www/node \
@@ -28,9 +29,7 @@ BUILD_DEPENDS+= gperf:devel/gperf \
${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
${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 \
libatspi.so:accessibility/at-spi2-core \
libspeechd.so:accessibility/speech-dispatcher \
@@ -65,23 +64,13 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi
RUN_DEPENDS= xdg-open:devel/xdg-utils \
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 \
ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg
-.endif
+
MAKE_ARGS= -C out/${BUILDTYPE}
BINARY_ALIAS= python=${PYTHON_CMD}
DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
-.if !defined(GN_ONLY)
CPE_VENDOR= google
CPE_PRODUCT= chrome
USE_GL= gbm gl
@@ -94,8 +83,6 @@ SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper
ALL_TARGET= chrome
INSTALLS_ICONS= yes
-.endif
-
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
# TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
@@ -136,8 +123,6 @@ GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-gen
GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \
google_default_client_id="996322985003.apps.googleusercontent.com" \
google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn"
-
-.if !defined(GN_ONLY)
SUB_FILES= chromium-browser.desktop chrome
SUB_LIST+= COMMENT="${COMMENT}"
@@ -195,8 +180,6 @@ SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
SNDIO_VARS= GN_ARGS+=use_sndio=true
SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
-.endif
-
.include "Makefile.tests"
TEST_ALL_TARGET= ${TEST_TARGETS}
TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \
@@ -216,11 +199,9 @@ PLIST_SUB+= NOT_AARCH64=""
.endif
# Make better javascript with java
-.if !defined(GN_ONLY)
JAVA_BUILD= yes
JAVA_VERSION= 1.8
USE_JAVA= yes
-.endif
# Allow relocations against read-only segments (override lld default)
LDFLAGS_i386= -Wl,-znotext
@@ -230,7 +211,6 @@ LDFLAGS_i386= -Wl,-znotext
MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \
CPLUS_INCLUDE_PATH=${LOCALBASE}/include
-.if !defined(GN_ONLY)
pre-everything::
@${ECHO_MSG}
@${ECHO_MSG} "To build Chromium, you should have around 2GB of memory"
@@ -263,14 +243,12 @@ pre-configure:
@${MKDIR} ${WRKDIR}/site-packages/xcbgen
${CP} ${PYTHONBASE}/lib/python${PYTHON_DEFAULT}/site-packages/xcbgen/*.py \
${WRKDIR}/site-packages/xcbgen
-.endif
do-configure:
# GN generator bootstrapping and generating ninja files
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
-.if !defined(GN_ONLY)
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \
gen --args='${GN_ARGS}' out/${BUILDTYPE}
@@ -288,7 +266,6 @@ do-configure:
@${MKDIR} ${WRKSRC}/buildtools/freebsd
${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
-.endif
do-test-TEST-on:
.for t in ${TEST_TARGETS}
@@ -296,7 +273,6 @@ do-test-TEST-on:
./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
.endfor
-.if !defined(GN_ONLY)
do-install:
@${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \
@@ -353,6 +329,5 @@ post-install-DEBUG-on:
post-install-DRIVER-on:
${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
${STAGEDIR}${PREFIX}/bin
-.endif
.include <bsd.port.mk>
Modified: branches/2021Q1/www/chromium/distinfo
==============================================================================
--- branches/2021Q1/www/chromium/distinfo Sat Jan 9 13:26:28 2021 (r560862)
+++ branches/2021Q1/www/chromium/distinfo Sat Jan 9 13:28:15 2021 (r560863)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1606957721
-SHA256 (chromium-87.0.4280.88.tar.xz) = 3e4645328735ef60db78d1a313efb3770a3edeaede90d076414df52f567a09c0
-SIZE (chromium-87.0.4280.88.tar.xz) = 856266548
-SHA256 (chromium-87.0.4280.88-testdata.tar.xz) = 35c4676c9cb699aa76335757ec2a71a246102f2e6e6a3536e43c1c4afb04e494
-SIZE (chromium-87.0.4280.88-testdata.tar.xz) = 257423892
+TIMESTAMP = 1610013360
+SHA256 (chromium-87.0.4280.141.tar.xz) = 147591d7fc21e1a173701d28bbf35baddb91e64dd96ec16d8eee9a5113403375
+SIZE (chromium-87.0.4280.141.tar.xz) = 856467564
+SHA256 (chromium-87.0.4280.141-testdata.tar.xz) = 210492a8c704bf47b92039e2564f73ebfbcc5ab605d23f66ba16547235a64539
+SIZE (chromium-87.0.4280.141-testdata.tar.xz) = 257414220
SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9
SIZE (test_fonts-85.tar.xz) = 9511984
More information about the svn-ports-branches
mailing list