From nobody Tue Jul 19 19:57:19 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LnV3h1fRyz4WvhY; Tue, 19 Jul 2022 19:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LnV3h13Lhz4M0c; Tue, 19 Jul 2022 19:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658260640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rx7R2VQwxl4khRnSzF5DVtlSE/AzN7+iB8fIW8wrJZU=; b=Clf8YW8uqPudYnzMjic3U4Byi3dw952nxT102T+6cckIkK6RhFJpuI727UqtIydr5J/Hnh KlNxSx9VzDvq2wmS28QXaSBUCr+YY0XscdV7iRlMo2+etifQg3wn7M/UboHylMPF0hF+Vm wkgdBj11/89GdvVXaZXVNDaCwp3N9xqc8tLfJLx5RoNpxZ0zWVyMvOdCzaKZKtYMEVKXMr ALr3WoZpuejkyUFutY8LSyaxidjEGk0FhDOt6lL7iIiJSS2eu88bKKmWCexu5apv78jg1R 4tYQpIY0mZ7QPpcz/7YsgV3Hu5pIL6QAFTspFO97YHFV3O5OtCyVqz5g+zt/sA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LnV3h03tqzX7m; Tue, 19 Jul 2022 19:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26JJvJiE027215; Tue, 19 Jul 2022 19:57:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26JJvJIO027214; Tue, 19 Jul 2022 19:57:19 GMT (envelope-from git) Date: Tue, 19 Jul 2022 19:57:19 GMT Message-Id: <202207191957.26JJvJIO027214@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rene Ladan Subject: git: b2193c3c8010 - 2022Q3 - www/chromium: unbundle icu to use icu from ports List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: b2193c3c801075a5b0d985d50b2e25dba4c9b6b4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658260640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rx7R2VQwxl4khRnSzF5DVtlSE/AzN7+iB8fIW8wrJZU=; b=pau/Gm09xuC1E9Mb05oQYlpWpQodpLP+MsnB5i20yFkvtfMwzvUbWNmHIhxrUF07VhIqnw Sx4aYZ/EoQL5lIrRDyC+194n0rEwa303EJGRQ8FghQBMNOYB78I3appGK4XRgpZay11AVY +0OzXtIHxZbFNvS68+d5Jci86Rv8fJSpnmhtIK7mbs7qBV5MNryHrPgFs7DlS8kZaDxhEu hQf2+osgJ+IWHF9fyWlfsw5ty8ZZJ2d+dMtwTaNs9taPEL7UN/vlc60X/k2BKUooBpj3No ECnnN+yMdp4RKaTT+F0cZOE2JKWJAFPjpYAhGI2PHAw4SHf1IUMS5ja/7xwdXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658260640; a=rsa-sha256; cv=none; b=YM98uVw14FwhEIFXTKYX4HHg2dGffPRWIZXn9AO0salHrh6Ufh5YUsRIBLx72UU7RkGEBU ScEyXWnkS5Z+MJ2/YtMPpW0ireuso2GwjaP6uF2Pk3AbpPPZWLtfqP5jhrLOwHWtkY8J9B +y1QeusVtzNnlEuQqIqy0dooKjVguZ4DV3QydLDxoX+xPNPKn6+PrHuby/eqs5pUol9ijg VEq+0MitmsTV+YmxaYSxQQilBstmwLDHvs8pbhHz726CNIkdXEpE7Dwm41KKa5sp7cqBQT u3XvbHtduwEr1ASbkv3hG+1jxuDVPKzSj3JwXbNJyRwb+zc+ip9FmQw1usb+og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=b2193c3c801075a5b0d985d50b2e25dba4c9b6b4 commit b2193c3c801075a5b0d985d50b2e25dba4c9b6b4 Author: Robert Nagy AuthorDate: 2022-07-16 10:15:36 +0000 Commit: Rene Ladan CommitDate: 2022-07-19 19:56:43 +0000 www/chromium: unbundle icu to use icu from ports (cherry picked from commit 55b20cdeb6569e0e3c63d58aedd679901d15dc50) PR: 265180 --- www/chromium/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index e00dae9997eb..dcd4697f3768 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,7 +2,7 @@ PORTNAME= chromium PORTVERSION= 103.0.5060.114 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external @@ -99,6 +99,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \ enable_remoting=false \ enable_wmax_tokens=false \ fatal_linker_warnings=false \ + icu_use_data_file=false \ is_clang=true \ optimize_webui=true \ toolkit_views=true \ @@ -256,7 +257,7 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - flac fontconfig freetype harfbuzz-ng libdrm libevent libpng \ + flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \ libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE} # Chromium uses an unreleased version of FFmpeg, so configure it .for brand in Chrome Chromium @@ -300,7 +301,7 @@ do-install: .for d in protoc mksnapshot ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor -.for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin +.for d in snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \