From nobody Sun May 29 09:42:04 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 7660F1B3B64C; Sun, 29 May 2022 09:42:04 +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 4L9tqJ2PKBz53bX; Sun, 29 May 2022 09:42:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653817324; 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=7srSj7dFwrqGTwcog9jxDFs4uBUX0YemfCrnpy1ilJ8=; b=EVhz1XaiJYzcJ65cVqSuFb9cCocKPfD5cxj9S6kWE1gUTsRwzfxgD6tOlPaNxA0kdfCwOg Zn3G0OFAxOBfYTcx1AYk3uTd0miQ6A9zxBJUaJZay/7jM2odfbsmf6/i0CcIkOm2da6Kff yz5+tQ1/5I997sF8jE5miWLY6/VuiJyYqiGOuefF31bCL6kOFBjwWY9QE3woPeKAFatEpw IQEwxw8ER1SYZr24CeveuLtzQ9QNPgYJHL7soifhDwif16ipm18RmtyegvVGk+G/W2S8Tj Etqm/UprYtrV+HuDO+EUyPOc+0UjhLalnL3bqfZY6L/318gqM6LWu4VK6B1ZGw== 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 3223920A86; Sun, 29 May 2022 09:42:04 +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 24T9g476035854; Sun, 29 May 2022 09:42:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24T9g4s7035853; Sun, 29 May 2022 09:42:04 GMT (envelope-from git) Date: Sun, 29 May 2022 09:42:04 GMT Message-Id: <202205290942.24T9g4s7035853@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: ac7d5a0d225b - 2022Q2 - www/chromium: use libevent from ports and make sure it never mixes with the bundled one 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: ac7d5a0d225b9dcb10601b7bd3d7928f0fa14be9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653817324; 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=7srSj7dFwrqGTwcog9jxDFs4uBUX0YemfCrnpy1ilJ8=; b=yAwPJiYXyPqo6qI9sdL4xtL/M5UBOeDBgudVxs+vkSZG0wcBHvpShgF/YL/th4T2nlxh3c 0Bj78dy0PfsCgr5Wi98xQ7n7ZRes2AAIrevxP0Pu+ea6H6JF7kSlwdONWQzdGbu39u1K1g mGC+5mr5KFmznEpBK3u/QOCMJO2QGIhHTGfhBqBMfFWkap49FEW/YspXobat1UDgs5COj1 SD8USIhJyAP+r1FdWW6JvZibtO1ZZ0ldXKxb/PB9xcqVXevhEWKe/kWcAHpIpnwf+63Zya oPPxKO8wDADYdU2dyYlLYuKFbgN4li8ADxOUiN794kmJ/CnP9oa/FHgsYEZayg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653817324; a=rsa-sha256; cv=none; b=LpXUj3vMfwaDMcl8yZOLgYqM6Jz6mrEMBwHpuYO6yIU30gWFzH1YpouN5THFI3C0vHmgMp ln8ZOO5W1PeIoqscPZNJ433a+BSsIAI849QexlvNlmThSq/Fw9ddVzkI2DKIj2WLvTiZTG kJRbcM1zUJE6mLU6Uw6CBuNBxcTOYX3H9fPnL6+UVD0IHRZn3d9DAMpRLTnxzNCSePFgeL UsOhXMA+EuM/M8C8hY/i+Y/MCvELisp3wOWceLwByXWpsml11YOsBdqUmVZx4ap/HsMQfg j4hLurrwX3MyKlpEEJIUADkZsbjXLfUJUe7of9PPUzBl2p3QBLaoTfKY9kTpVw== 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=ac7d5a0d225b9dcb10601b7bd3d7928f0fa14be9 commit ac7d5a0d225b9dcb10601b7bd3d7928f0fa14be9 Author: Robert Nagy AuthorDate: 2022-05-28 08:42:08 +0000 Commit: Rene Ladan CommitDate: 2022-05-29 09:41:58 +0000 www/chromium: use libevent from ports and make sure it never mixes with the bundled one (cherry picked from commit f3f269d7d22396afde4d79d8315491dfb4501cb1) --- www/chromium/Makefile | 6 +- .../patch-base_third__party_libevent_BUILD.gn | 24 -- ...patch-base_third__party_libevent_event-config.h | 11 - .../files/patch-base_third__party_libevent_event.h | 14 + ...tch-base_third__party_libevent_openbsd_config.h | 279 -------------------- ...se_third__party_libevent_openbsd_event-config.h | 287 --------------------- .../files/patch-build_linux_unbundle_libevent.gn | 15 ++ 7 files changed, 33 insertions(+), 603 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index c2b4250a65aa..f188d2a1c6f9 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,7 +2,7 @@ PORTNAME= chromium PORTVERSION= 102.0.5005.61 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:fonts @@ -38,6 +38,7 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ + libevent.so:devel/libevent \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libpci.so:devel/libpci \ @@ -253,7 +254,8 @@ 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 libusb libdrm libpng libwebp libxml libxslt openh264 opus snappy || ${FALSE} + flac fontconfig freetype harfbuzz-ng 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 ${CP} -R \ diff --git a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn deleted file mode 100644 index 22a313def647..000000000000 --- a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ ---- base/third_party/libevent/BUILD.gn.orig 2022-05-25 19:07:37 UTC -+++ base/third_party/libevent/BUILD.gn -@@ -43,13 +43,20 @@ static_library("libevent") { - "mac/event-config.h", - ] - include_dirs = [ "mac" ] -- } else if (is_linux || is_chromeos) { -+ } 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", diff --git a/www/chromium/files/patch-base_third__party_libevent_event-config.h b/www/chromium/files/patch-base_third__party_libevent_event-config.h deleted file mode 100644 index eaa2383bbb97..000000000000 --- a/www/chromium/files/patch-base_third__party_libevent_event-config.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/third_party/libevent/event-config.h.orig 2022-02-07 13:39:41 UTC -+++ base/third_party/libevent/event-config.h -@@ -13,6 +13,8 @@ - #include "base/third_party/libevent/linux/event-config.h" - #elif defined(__FreeBSD__) - #include "base/third_party/libevent/freebsd/event-config.h" -+#elif defined(__OpenBSD__) -+#include "base/third_party/libevent/openbsd/event-config.h" - #elif defined(__sun) - #include "base/third_party/libevent/solaris/event-config.h" - #elif defined(_AIX) diff --git a/www/chromium/files/patch-base_third__party_libevent_event.h b/www/chromium/files/patch-base_third__party_libevent_event.h new file mode 100644 index 000000000000..282a35d03ee9 --- /dev/null +++ b/www/chromium/files/patch-base_third__party_libevent_event.h @@ -0,0 +1,14 @@ +--- base/third_party/libevent/event.h.orig 2022-05-28 07:21:18 UTC ++++ base/third_party/libevent/event.h +@@ -1,3 +1,6 @@ ++#if defined(USE_SYSTEM_LIBEVENT) ++#include ++#else + /* + * Copyright (c) 2000-2007 Niels Provos + * All rights reserved. +@@ -1210,3 +1213,4 @@ int evtag_unmarshal_timeval(struct evbuffer *evbuf, ev + #endif + + #endif /* _EVENT_H_ */ ++#endif diff --git a/www/chromium/files/patch-base_third__party_libevent_openbsd_config.h b/www/chromium/files/patch-base_third__party_libevent_openbsd_config.h deleted file mode 100644 index 6c3c65196f6d..000000000000 --- a/www/chromium/files/patch-base_third__party_libevent_openbsd_config.h +++ /dev/null @@ -1,279 +0,0 @@ ---- base/third_party/libevent/openbsd/config.h.orig 2022-02-07 13:39:41 UTC -+++ base/third_party/libevent/openbsd/config.h -@@ -0,0 +1,276 @@ -+/* config.h. Generated from config.h.in by configure. */ -+/* config.h.in. Generated from configure.in by autoheader. */ -+ -+/* Define if clock_gettime is available in libc */ -+#define DNS_USE_CPU_CLOCK_FOR_ID 1 -+ -+/* Define is no secure id variant is available */ -+/* #undef DNS_USE_GETTIMEOFDAY_FOR_ID */ -+ -+/* Define to 1 if you have the `clock_gettime' function. */ -+#define HAVE_CLOCK_GETTIME 1 -+ -+/* Define if /dev/poll is available */ -+/* #undef HAVE_DEVPOLL */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_DLFCN_H 1 -+ -+/* Define if your system supports the epoll system calls */ -+/* #undef HAVE_EPOLL */ -+ -+/* Define to 1 if you have the `epoll_ctl' function. */ -+/* #undef HAVE_EPOLL_CTL */ -+ -+/* Define if your system supports event ports */ -+/* #undef HAVE_EVENT_PORTS */ -+ -+/* Define to 1 if you have the `fcntl' function. */ -+#define HAVE_FCNTL 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_FCNTL_H 1 -+ -+/* Define to 1 if the system has the type `fd_mask'. */ -+#define HAVE_FD_MASK 1 -+ -+/* Define to 1 if you have the `getaddrinfo' function. */ -+#define HAVE_GETADDRINFO 1 -+ -+/* Define to 1 if you have the `getegid' function. */ -+#define HAVE_GETEGID 1 -+ -+/* Define to 1 if you have the `geteuid' function. */ -+#define HAVE_GETEUID 1 -+ -+/* Define to 1 if you have the `getnameinfo' function. */ -+#define HAVE_GETNAMEINFO 1 -+ -+/* Define to 1 if you have the `gettimeofday' function. */ -+#define HAVE_GETTIMEOFDAY 1 -+ -+/* Define to 1 if you have the `inet_ntop' function. */ -+#define HAVE_INET_NTOP 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_INTTYPES_H 1 -+ -+/* Define to 1 if you have the `issetugid' function. */ -+#define HAVE_ISSETUGID 1 -+ -+/* Define to 1 if you have the `kqueue' function. */ -+#define HAVE_KQUEUE 1 -+ -+/* Define to 1 if you have the `nsl' library (-lnsl). */ -+/* #undef HAVE_LIBNSL */ -+ -+/* Define to 1 if you have the `resolv' library (-lresolv). */ -+/* #undef HAVE_LIBRESOLV */ -+ -+/* Define to 1 if you have the `rt' library (-lrt). */ -+/* #undef HAVE_LIBRT */ -+ -+/* Define to 1 if you have the `socket' library (-lsocket). */ -+/* #undef HAVE_LIBSOCKET */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_MEMORY_H 1 -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_NETINET_IN6_H */ -+ -+/* Define to 1 if you have the `poll' function. */ -+#define HAVE_POLL 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_POLL_H 1 -+ -+/* Define to 1 if you have the `port_create' function. */ -+/* #undef HAVE_PORT_CREATE */ -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_PORT_H */ -+ -+/* Define to 1 if you have the `select' function. */ -+#define HAVE_SELECT 1 -+ -+/* Define if F_SETFD is defined in */ -+#define HAVE_SETFD 1 -+ -+/* Define to 1 if you have the `sigaction' function. */ -+#define HAVE_SIGACTION 1 -+ -+/* Define to 1 if you have the `signal' function. */ -+#define HAVE_SIGNAL 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SIGNAL_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STDARG_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STDINT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STRINGS_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the `strlcpy' function. */ -+#define HAVE_STRLCPY 1 -+ -+/* Define to 1 if you have the `strsep' function. */ -+#define HAVE_STRSEP 1 -+ -+/* Define to 1 if you have the `strtok_r' function. */ -+#define HAVE_STRTOK_R 1 -+ -+/* Define to 1 if you have the `strtoll' function. */ -+#define HAVE_STRTOLL 1 -+ -+/* Define to 1 if the system has the type `struct in6_addr'. */ -+#define HAVE_STRUCT_IN6_ADDR 1 -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_SYS_DEVPOLL_H */ -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_SYS_EPOLL_H */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_EVENT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_IOCTL_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_PARAM_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_QUEUE_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_SELECT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_SOCKET_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_TIME_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* Define if TAILQ_FOREACH is defined in */ -+#define HAVE_TAILQFOREACH 1 -+ -+/* Define if timeradd is defined in */ -+#define HAVE_TIMERADD 1 -+ -+/* Define if timerclear is defined in */ -+#define HAVE_TIMERCLEAR 1 -+ -+/* Define if timercmp is defined in */ -+#define HAVE_TIMERCMP 1 -+ -+/* Define if timerisset is defined in */ -+#define HAVE_TIMERISSET 1 -+ -+/* Define to 1 if the system has the type `uint16_t'. */ -+#define HAVE_UINT16_T 1 -+ -+/* Define to 1 if the system has the type `uint32_t'. */ -+#define HAVE_UINT32_T 1 -+ -+/* Define to 1 if the system has the type `uint64_t'. */ -+#define HAVE_UINT64_T 1 -+ -+/* Define to 1 if the system has the type `uint8_t'. */ -+#define HAVE_UINT8_T 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_UNISTD_H 1 -+ -+/* Define to 1 if you have the `vasprintf' function. */ -+#define HAVE_VASPRINTF 1 -+ -+/* Define if kqueue works correctly with pipes */ -+#define HAVE_WORKING_KQUEUE 1 -+ -+/* Define to the sub-directory in which libtool stores uninstalled libraries. -+ */ -+#define LT_OBJDIR ".libs/" -+ -+/* Numeric representation of the version */ -+#define NUMERIC_VERSION 0x01040f00 -+ -+/* Name of package */ -+#define PACKAGE "libevent" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define PACKAGE_BUGREPORT "" -+ -+/* Define to the full name of this package. */ -+#define PACKAGE_NAME "" -+ -+/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "" -+ -+/* Define to the one symbol short name of this package. */ -+#define PACKAGE_TARNAME "" -+ -+/* Define to the home page for this package. */ -+#define PACKAGE_URL "" -+ -+/* Define to the version of this package. */ -+#define PACKAGE_VERSION "" -+ -+/* The size of `int', as computed by sizeof. */ -+#define SIZEOF_INT 4 -+ -+/* The size of `long', as computed by sizeof. */ -+#define SIZEOF_LONG 8 -+ -+/* The size of `long long', as computed by sizeof. */ -+#define SIZEOF_LONG_LONG 8 -+ -+/* The size of `short', as computed by sizeof. */ -+#define SIZEOF_SHORT 2 -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define STDC_HEADERS 1 -+ -+/* Define to 1 if you can safely include both and . */ -+#define TIME_WITH_SYS_TIME 1 -+ -+/* Version number of package */ -+#define VERSION "1.4.15" -+ -+/* Define to appropriate substitue if compiler doesnt have __func__ */ -+/* #undef __func__ */ -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+/* #undef const */ -+ -+/* Define to `__inline__' or `__inline' if that's what the C compiler -+ calls it, or to nothing if 'inline' is not supported under any name. */ -+#ifndef __cplusplus -+/* #undef inline */ -+#endif -+ -+/* Define to `int' if does not define. */ -+/* #undef pid_t */ -+ -+/* Define to `unsigned int' if does not define. */ -+/* #undef size_t */ -+ -+/* Define to unsigned int if you dont have it */ -+/* #undef socklen_t */ diff --git a/www/chromium/files/patch-base_third__party_libevent_openbsd_event-config.h b/www/chromium/files/patch-base_third__party_libevent_openbsd_event-config.h deleted file mode 100644 index de5423361f24..000000000000 --- a/www/chromium/files/patch-base_third__party_libevent_openbsd_event-config.h +++ /dev/null @@ -1,287 +0,0 @@ ---- base/third_party/libevent/openbsd/event-config.h.orig 2022-02-07 13:39:41 UTC -+++ base/third_party/libevent/openbsd/event-config.h -@@ -0,0 +1,284 @@ -+/* event-config.h -+ * Generated by autoconf; post-processed by libevent. -+ * Do not edit this file. -+ * Do not rely on macros in this file existing in later versions. -+ */ -+#ifndef _EVENT_CONFIG_H_ -+#define _EVENT_CONFIG_H_ -+/* config.h. Generated from config.h.in by configure. */ -+/* config.h.in. Generated from configure.in by autoheader. */ -+ -+/* Define if clock_gettime is available in libc */ -+#define _EVENT_DNS_USE_CPU_CLOCK_FOR_ID 1 -+ -+/* Define is no secure id variant is available */ -+/* #undef _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID */ -+ -+/* Define to 1 if you have the `clock_gettime' function. */ -+#define _EVENT_HAVE_CLOCK_GETTIME 1 -+ -+/* Define if /dev/poll is available */ -+/* #undef _EVENT_HAVE_DEVPOLL */ -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_DLFCN_H 1 -+ -+/* Define if your system supports the epoll system calls */ -+/* #undef _EVENT_HAVE_EPOLL */ -+ -+/* Define to 1 if you have the `epoll_ctl' function. */ -+/* #undef _EVENT_HAVE_EPOLL_CTL */ -+ -+/* Define if your system supports event ports */ -+/* #undef _EVENT_HAVE_EVENT_PORTS */ -+ -+/* Define to 1 if you have the `fcntl' function. */ -+#define _EVENT_HAVE_FCNTL 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_FCNTL_H 1 -+ -+/* Define to 1 if the system has the type `fd_mask'. */ -+#define _EVENT_HAVE_FD_MASK 1 -+ -+/* Define to 1 if you have the `getaddrinfo' function. */ -+#define _EVENT_HAVE_GETADDRINFO 1 -+ -+/* Define to 1 if you have the `getegid' function. */ -+#define _EVENT_HAVE_GETEGID 1 -+ -+/* Define to 1 if you have the `geteuid' function. */ -+#define _EVENT_HAVE_GETEUID 1 -+ -+/* Define to 1 if you have the `getnameinfo' function. */ -+#define _EVENT_HAVE_GETNAMEINFO 1 -+ -+/* Define to 1 if you have the `gettimeofday' function. */ -+#define _EVENT_HAVE_GETTIMEOFDAY 1 -+ -+/* Define to 1 if you have the `inet_ntop' function. */ -+#define _EVENT_HAVE_INET_NTOP 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_INTTYPES_H 1 -+ -+/* Define to 1 if you have the `issetugid' function. */ -+#define _EVENT_HAVE_ISSETUGID 1 -+ -+/* Define to 1 if you have the `kqueue' function. */ -+#define _EVENT_HAVE_KQUEUE 1 -+ -+/* Define to 1 if you have the `nsl' library (-lnsl). */ -+/* #undef _EVENT_HAVE_LIBNSL */ -+ -+/* Define to 1 if you have the `resolv' library (-lresolv). */ -+/* #undef _EVENT_HAVE_LIBRESOLV */ -+ -+/* Define to 1 if you have the `rt' library (-lrt). */ -+/* #undef _EVENT_HAVE_LIBRT */ -+ -+/* Define to 1 if you have the `socket' library (-lsocket). */ -+/* #undef _EVENT_HAVE_LIBSOCKET */ -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_MEMORY_H 1 -+ -+/* Define to 1 if you have the header file. */ -+/* #undef _EVENT_HAVE_NETINET_IN6_H */ -+ -+/* Define to 1 if you have the `poll' function. */ -+#define _EVENT_HAVE_POLL 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_POLL_H 1 -+ -+/* Define to 1 if you have the `port_create' function. */ -+/* #undef _EVENT_HAVE_PORT_CREATE */ -+ -+/* Define to 1 if you have the header file. */ -+/* #undef _EVENT_HAVE_PORT_H */ -+ -+/* Define to 1 if you have the `select' function. */ -+#define _EVENT_HAVE_SELECT 1 -+ -+/* Define if F_SETFD is defined in */ -+#define _EVENT_HAVE_SETFD 1 -+ -+/* Define to 1 if you have the `sigaction' function. */ -+#define _EVENT_HAVE_SIGACTION 1 -+ -+/* Define to 1 if you have the `signal' function. */ -+#define _EVENT_HAVE_SIGNAL 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_SIGNAL_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_STDARG_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_STDINT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_STRINGS_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the `strlcpy' function. */ -+#define _EVENT_HAVE_STRLCPY 1 -+ -+/* Define to 1 if you have the `strsep' function. */ -+#define _EVENT_HAVE_STRSEP 1 -+ -+/* Define to 1 if you have the `strtok_r' function. */ -+#define _EVENT_HAVE_STRTOK_R 1 -+ -+/* Define to 1 if you have the `strtoll' function. */ -+#define _EVENT_HAVE_STRTOLL 1 -+ -+/* Define to 1 if the system has the type `struct in6_addr'. */ -+#define _EVENT_HAVE_STRUCT_IN6_ADDR 1 -+ -+/* Define to 1 if you have the header file. */ -+/* #undef _EVENT_HAVE_SYS_DEVPOLL_H */ -+ -+/* Define to 1 if you have the header file. */ -+/* #undef _EVENT_HAVE_SYS_EPOLL_H */ -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_SYS_EVENT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_SYS_IOCTL_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_SYS_PARAM_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_SYS_QUEUE_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_SYS_SELECT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_SYS_SOCKET_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_SYS_TIME_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_SYS_TYPES_H 1 -+ -+/* Define if TAILQ_FOREACH is defined in */ -+#define _EVENT_HAVE_TAILQFOREACH 1 -+ -+/* Define if timeradd is defined in */ -+#define _EVENT_HAVE_TIMERADD 1 -+ -+/* Define if timerclear is defined in */ -+#define _EVENT_HAVE_TIMERCLEAR 1 -+ -+/* Define if timercmp is defined in */ -+#define _EVENT_HAVE_TIMERCMP 1 -+ -+/* Define if timerisset is defined in */ -+#define _EVENT_HAVE_TIMERISSET 1 -+ -+/* Define to 1 if the system has the type `uint16_t'. */ -+#define _EVENT_HAVE_UINT16_T 1 -+ -+/* Define to 1 if the system has the type `uint32_t'. */ -+#define _EVENT_HAVE_UINT32_T 1 -+ -+/* Define to 1 if the system has the type `uint64_t'. */ -+#define _EVENT_HAVE_UINT64_T 1 -+ -+/* Define to 1 if the system has the type `uint8_t'. */ -+#define _EVENT_HAVE_UINT8_T 1 -+ -+/* Define to 1 if you have the header file. */ -+#define _EVENT_HAVE_UNISTD_H 1 -+ -+/* Define to 1 if you have the `vasprintf' function. */ -+#define _EVENT_HAVE_VASPRINTF 1 -+ -+/* Define if kqueue works correctly with pipes */ -+#define _EVENT_HAVE_WORKING_KQUEUE 1 -+ -+/* Define to the sub-directory in which libtool stores uninstalled libraries. -+ */ -+#define _EVENT_LT_OBJDIR ".libs/" -+ -+/* Numeric representation of the version */ -+#define _EVENT_NUMERIC_VERSION 0x01040f00 -+ -+/* Name of package */ -+#define _EVENT_PACKAGE "libevent" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define _EVENT_PACKAGE_BUGREPORT "" -+ -+/* Define to the full name of this package. */ -+#define _EVENT_PACKAGE_NAME "" -+ -+/* Define to the full name and version of this package. */ -+#define _EVENT_PACKAGE_STRING "" -+ -+/* Define to the one symbol short name of this package. */ -+#define _EVENT_PACKAGE_TARNAME "" -+ -+/* Define to the home page for this package. */ -+#define _EVENT_PACKAGE_URL "" -+ -+/* Define to the version of this package. */ -+#define _EVENT_PACKAGE_VERSION "" -+ -+/* The size of `int', as computed by sizeof. */ -+#define _EVENT_SIZEOF_INT 4 -+ -+/* The size of `long', as computed by sizeof. */ -+#define _EVENT_SIZEOF_LONG 8 -+ -+/* The size of `long long', as computed by sizeof. */ -+#define _EVENT_SIZEOF_LONG_LONG 8 -+ -+/* The size of `short', as computed by sizeof. */ -+#define _EVENT_SIZEOF_SHORT 2 -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define _EVENT_STDC_HEADERS 1 -+ -+/* Define to 1 if you can safely include both and . */ -+#define _EVENT_TIME_WITH_SYS_TIME 1 -+ -+/* Version number of package */ -+#define _EVENT_VERSION "1.4.15" -+ -+/* Define to appropriate substitue if compiler doesnt have __func__ */ -+/* #undef _EVENT___func__ */ -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+/* #undef _EVENT_const */ -+ -+/* Define to `__inline__' or `__inline' if that's what the C compiler -+ calls it, or to nothing if 'inline' is not supported under any name. */ -+#ifndef _EVENT___cplusplus -+/* #undef _EVENT_inline */ -+#endif -+ -+/* Define to `int' if does not define. */ -+/* #undef _EVENT_pid_t */ -+ -+/* Define to `unsigned int' if does not define. */ -+/* #undef _EVENT_size_t */ -+ -+/* Define to unsigned int if you dont have it */ -+/* #undef _EVENT_socklen_t */ -+#endif diff --git a/www/chromium/files/patch-build_linux_unbundle_libevent.gn b/www/chromium/files/patch-build_linux_unbundle_libevent.gn new file mode 100644 index 000000000000..d5f276de574d --- /dev/null +++ b/www/chromium/files/patch-build_linux_unbundle_libevent.gn @@ -0,0 +1,15 @@ +--- build/linux/unbundle/libevent.gn.orig 2022-05-28 07:21:18 UTC ++++ build/linux/unbundle/libevent.gn +@@ -9,7 +9,12 @@ shim_headers("libevent_shim") { + headers = [ "event.h" ] + } + ++config("system_libevent") { ++ defines = [ "USE_SYSTEM_LIBEVENT=1" ] ++} ++ + source_set("libevent") { + deps = [ ":libevent_shim" ] + libs = [ "event" ] ++ public_configs = [ ":system_libevent" ] + }