From nobody Wed Mar 1 13:11:58 2023 X-Original-To: dev-commits-ports-main@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 4PRZQ72BcWz3tr7Z; Wed, 1 Mar 2023 13:11:59 +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 4PRZQ71j1Tz3CGp; Wed, 1 Mar 2023 13:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677676319; 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=xvKjWCcT5o1fL/+6wy5EKD/MbyqMIrv+cq8oQTNHkyI=; b=ZYV4Qu8+9sDkpl2F0m4hki9UKk6XFgjaVLCbbRBd271G0+rmpXEq3czmg0UuXKn+O+aXKO wmF1hQOqDbMkPiwVzkmhmbAsy/AW4HJtXUI3sMLeM4PmD5DdjEKI0eiTwI5Cx0j++oktG9 6zgWhtzrvTsPuEQqJzDUfVlO8hRRbUc6Szpo/CE4MbEBuQ2Z4AOCsoXcFgrj263S+jJfPK F1I4UUoABW5cQMyn+xnsqniP3EKU8XbyXqxBq2qJoDwyLhWgXOD7yLf5K+7184to4yQUBN jdw9CSHQyllRBh8UqFKnhBMu6+B36kLs99e8XivjUf/6F8s+oHd4o3WqqQOm2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677676319; 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=xvKjWCcT5o1fL/+6wy5EKD/MbyqMIrv+cq8oQTNHkyI=; b=jWdUUhSS5IX2hqeN/i48448hiKom9g3oKMn3n2gGMaF1wUsKLCY47FvgV5FMIeLMMi+7uo 2Q70SHKoj/jz/8amczKelU1P2GIs0Ipg2azmJNYvqtnDlL7zzgYMaqZ7PedOdvEzHhyjTb HSRbRdZXDXJDHQu8YcJlj8G/rQ56/x5Cmye1kduFDQTOThfxCopQzcURNKMfOtUf+nKAoP 2arr9lqdEjIJvXtuR6VtRl/OBQZATsLkBVBnZtJxhSytT+7b9gm9D/J4BRWZDscB6tqO9x HP/O1OKL+WTavUWkyWYVutjL06gJ+oOse5rf7PScZGKnIN0Fl87VlfMtB2DBRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677676319; a=rsa-sha256; cv=none; b=jhBwTWzNnz5PNK3Z804B63rVdxVp3wiGyePvYbbhlQWT7tO0J7lYXBzNXJcqMVg7DswUVf UPpsRb+GW08lGcxc3Bp0lnCx+c0oGpiqjRo8pUrGYXSwh13npfudkP4DIsJmhbTR2wLJEv HzTR/O25dO6y5/RlI/VPAM06B9QGVKuIotTI38EVhqZCKyHjuhbzmfTBZq2wc3r1qstLOt Vo23tljYbnETe2Cf/nEmlk9mhL4v8MM/g0cjMxPmRUXfEixlx5d45y9LSVl+RMMBsbmepu NYx7Lp47FFJwJ4CqjpsBX7LGa+nJ9opl2JB3xSNdg7zCcD/AQG1Hx725owU1mw== 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 4PRZQ70TDTzZxp; Wed, 1 Mar 2023 13:11:59 +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 321DBw5v069433; Wed, 1 Mar 2023 13:11:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321DBwbt069432; Wed, 1 Mar 2023 13:11:58 GMT (envelope-from git) Date: Wed, 1 Mar 2023 13:11:58 GMT Message-Id: <202303011311.321DBwbt069432@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Nagy Subject: git: bf4345746390 - main - www/*chromium: add missing osreldate.h header tighten the version check List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf43457463908bd882fc20677eeae81de09506d7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf43457463908bd882fc20677eeae81de09506d7 commit bf43457463908bd882fc20677eeae81de09506d7 Author: Robert Nagy AuthorDate: 2023-03-01 05:43:17 +0000 Commit: Robert Nagy CommitDate: 2023-03-01 13:06:40 +0000 www/*chromium: add missing osreldate.h header tighten the version check PR: 269869 Approved by: rene (mentor) Submitted by: Tatsuki Makino --- .../files/patch-third__party_wayland_include_config.h | 15 +++++++++------ .../files/patch-third__party_wayland_include_config.h | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/www/chromium/files/patch-third__party_wayland_include_config.h b/www/chromium/files/patch-third__party_wayland_include_config.h index ee8277613a92..6b7e5c6c9d9a 100644 --- a/www/chromium/files/patch-third__party_wayland_include_config.h +++ b/www/chromium/files/patch-third__party_wayland_include_config.h @@ -1,18 +1,21 @@ ---- third_party/wayland/include/config.h.orig 2023-02-28 09:34:10 UTC +--- third_party/wayland/include/config.h.orig 2023-03-01 05:42:12 UTC +++ third_party/wayland/include/config.h -@@ -9,7 +9,11 @@ +@@ -9,7 +9,14 @@ #define HAVE_BROKEN_MSG_CMSG_CLOEXEC 0 -+#if __FreeBSD__version > 1300000 - #define HAVE_MEMFD_CREATE -+#else ++#if defined(__FreeBSD__) ++#include ++#if defined(__FreeBSD_version) && __FreeBSD_version < 1300048 +#undef HAVE_MEMFD_CREATE ++#else + #define HAVE_MEMFD_CREATE ++#endif +#endif #define HAVE_MKOSTEMP -@@ -25,7 +29,11 @@ +@@ -25,7 +32,11 @@ #undef HAVE_SYS_PROCCTL_H diff --git a/www/ungoogled-chromium/files/patch-third__party_wayland_include_config.h b/www/ungoogled-chromium/files/patch-third__party_wayland_include_config.h index ee8277613a92..6b7e5c6c9d9a 100644 --- a/www/ungoogled-chromium/files/patch-third__party_wayland_include_config.h +++ b/www/ungoogled-chromium/files/patch-third__party_wayland_include_config.h @@ -1,18 +1,21 @@ ---- third_party/wayland/include/config.h.orig 2023-02-28 09:34:10 UTC +--- third_party/wayland/include/config.h.orig 2023-03-01 05:42:12 UTC +++ third_party/wayland/include/config.h -@@ -9,7 +9,11 @@ +@@ -9,7 +9,14 @@ #define HAVE_BROKEN_MSG_CMSG_CLOEXEC 0 -+#if __FreeBSD__version > 1300000 - #define HAVE_MEMFD_CREATE -+#else ++#if defined(__FreeBSD__) ++#include ++#if defined(__FreeBSD_version) && __FreeBSD_version < 1300048 +#undef HAVE_MEMFD_CREATE ++#else + #define HAVE_MEMFD_CREATE ++#endif +#endif #define HAVE_MKOSTEMP -@@ -25,7 +29,11 @@ +@@ -25,7 +32,11 @@ #undef HAVE_SYS_PROCCTL_H