Date: Wed, 1 Mar 2023 13:11:58 GMT From: Robert Nagy <rnagy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: bf4345746390 - main - www/*chromium: add missing osreldate.h header tighten the version check Message-ID: <202303011311.321DBwbt069432@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf43457463908bd882fc20677eeae81de09506d7 commit bf43457463908bd882fc20677eeae81de09506d7 Author: Robert Nagy <rnagy@FreeBSD.org> AuthorDate: 2023-03-01 05:43:17 +0000 Commit: Robert Nagy <rnagy@FreeBSD.org> 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 <tatsuki_makino hotmail com> --- .../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 <osreldate.h> ++#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 <osreldate.h> ++#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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303011311.321DBwbt069432>