From nobody Thu May 26 10:55:21 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 1114D1B4696C; Thu, 26 May 2022 10:55:22 +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 4L84bF5DRvz50BD; Thu, 26 May 2022 10:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653562521; 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=Ib7E2sXje/egoKkQEQyrAFMQ2MfKrfPHIhDtu0Hp8qI=; b=Bgxu6dcGMDLDy6b6kapSjs59tvwxaZg4o4SGd2ctMNfCihoxukiFYz2cKuQzKHWtLw71SD frJC44oyHEdYReyYRIy/QArbqAVXRRXkCtrDDlmC0iTixnnQb3vYaTbYJoJaszx6aeKyqC qMYxtKg5PpHNsZbiTXOh1IqKopCTHQnWKSkkXSLDI4Z8BYGX8MVbCN5z+d6ZqyoFl/3DWq Adl6k60sj8BsufOzj5L9+0/fgOqlncMGKYFqqIkp6KeEDsTnc19tnUhNZ14IhUIfe4qxAJ h9vOu0hrXcDTfrZlirra3BzzQg/F8NHrpwyVOnwJtbcvHoLOsgYa1+EWiicshw== 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 922944840; Thu, 26 May 2022 10:55:21 +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 24QAtLqw009795; Thu, 26 May 2022 10:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24QAtL0u009794; Thu, 26 May 2022 10:55:21 GMT (envelope-from git) Date: Thu, 26 May 2022 10:55:21 GMT Message-Id: <202205261055.24QAtL0u009794@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: 8f9d8e7dcc91 - 2022Q2 - www/chromium: unbreak runtime by fixing up a bad merge in the bundled libevent 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/2022Q2 X-Git-Reftype: branch X-Git-Commit: 8f9d8e7dcc917412c00a43ca998361ef406cbc85 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653562521; 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=Ib7E2sXje/egoKkQEQyrAFMQ2MfKrfPHIhDtu0Hp8qI=; b=kulos2/xmCyds1HHtPVCcGywu6COYfCDipe/8ZvdGMbRJdK9SQtjFVh++wfSLr5pOIbIXS +3poxz8TLar/LkzBkrnKk5B1SnyK/oV73Duip9Zl5SeFAkOPogziwzMo2jRrhT25k9nRe1 H9Mj7qP0gWAcii11hkggcU4j58MvvIhY0oKejS6kFVRQ4KVKnAgpDK6ILyhxNqDIGdnuB/ NeWq459v/YAXDtYKK8BOQXh+QhAom7CFwWE4gLcT8yXI6AbdpLCqNBay4rdYKvuUpytekf /lVkznj3BBS5AXAadUiYSyxKtbH4Dsr4LR1aWVnmnhRXk0s+Wdww/Lk1Jh7gEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653562521; a=rsa-sha256; cv=none; b=ldZRgFSYxj6ak7IV84N61Wpufqdom3kSMhYhnBlOEgtNG5NR5bPH39TYD2ZQm6Pm/hpBq2 HixNZtLmDpZqXpitXPEPtR2YhsgEzBBLIZuCuRleofbjtigHCZKTDLbHI1YlkaFoVS+KY6 lq9ifhXxegtksDP/iPolQEBnxfqM77pxZw6SWcd3lcy4chZAWx42Qkp6LkH2IV8xyH3ISQ yA6cLp1aDeNprsowxELY0qLShNLYQX/EaA6UO4RtSCvWceBqz37HFW0ISDuNrI/NCih2T8 lvcbZ5ZIupFunQhv2u7KR3OLvb2lJ0In1Xdi+djUvHkwm7UdPc+xZTAopfNgUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f9d8e7dcc917412c00a43ca998361ef406cbc85 commit 8f9d8e7dcc917412c00a43ca998361ef406cbc85 Author: Robert Nagy AuthorDate: 2022-05-25 20:56:03 +0000 Commit: Rene Ladan CommitDate: 2022-05-26 10:55:07 +0000 www/chromium: unbreak runtime by fixing up a bad merge in the bundled libevent PR: 264236 Reported by: Oleh Hushchenkov Fixes: 6dc209ad0a87 "www/chromium: update to 102.0.5005.61" (cherry picked from commit d93692acad4c70e6818a7f0d6a27065b1497417b) --- www/chromium/Makefile | 1 + .../patch-base_third__party_libevent_BUILD.gn | 101 +++++---------------- 2 files changed, 23 insertions(+), 79 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 0f1af3a86296..c2b4250a65aa 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,6 +2,7 @@ PORTNAME= chromium PORTVERSION= 102.0.5005.61 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:fonts diff --git a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn index 46693612438d..22a313def647 100644 --- a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn +++ b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn @@ -1,81 +1,24 @@ ---- base/third_party/libevent/BUILD.gn.orig 2022-05-19 14:06:27 UTC +--- base/third_party/libevent/BUILD.gn.orig 2022-05-25 19:07:37 UTC +++ base/third_party/libevent/BUILD.gn -@@ -1,69 +1,15 @@ --# Copyright (c) 2013 The Chromium Authors. All rights reserved. -+# Copyright 2016 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import("//build/config/nacl/config.gni") -+import("//build/shim_headers.gni") - --static_library("libevent") { -- sources = [ -- "buffer.c", -- "evbuffer.c", -- "evdns.c", -- "evdns.h", -- "event-config.h", -- "event-internal.h", -- "event.c", -- "event.h", -- "event_tagging.c", -- "evhttp.h", -- "evrpc-internal.h", -- "evrpc.c", -- "evrpc.h", -- "evsignal.h", -- "evutil.c", -- "evutil.h", -- "http-internal.h", -- "http.c", -- "log.c", -- "log.h", -- "min_heap.h", -- "poll.c", -- "select.c", -- "signal.c", -- "strlcpy-internal.h", -- "strlcpy.c", -- ] -+shim_headers("libevent_shim") { -+ root_path = "." -+ headers = [ "event.h" ] -+} - -- defines = [ "HAVE_CONFIG_H" ] -- -- if (is_apple) { -- sources += [ -- "kqueue.c", -- "mac/config.h", -- "mac/event-config.h", -- ] -- include_dirs = [ "mac" ] +@@ -43,13 +43,20 @@ static_library("libevent") { + "mac/event-config.h", + ] + include_dirs = [ "mac" ] - } else if (is_linux || is_chromeos) { -- sources += [ -- "epoll.c", -- "linux/config.h", -- "linux/event-config.h", -- ] -- include_dirs = [ "linux" ] -- } else if (is_android) { -- sources += [ -- "android/config.h", -- "android/event-config.h", -- "epoll.c", -- ] -- include_dirs = [ "android" ] -- } -- -- if (!is_debug) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -+source_set("libevent") { -+ deps = [ ":libevent_shim" ] -+ libs = [ "event" ] - } ++ } else if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ + "epoll.c", + "linux/config.h", + "linux/event-config.h", + ] + include_dirs = [ "linux" ] ++ } else if (is_bsd) { ++ sources += [ ++ "kqueue.c", ++ "freebsd/config.h", ++ "freebsd/event-config.h", ++ ] ++ include_dirs = [ "freebsd" ] + } else if (is_android) { + sources += [ + "android/config.h",