diff --git a/www/chromium/Makefile b/www/chromium/Makefile index c2b4250a65aa..f188d2a1c6f9 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,344 +1,346 @@ # Created by: Florent Thoumie 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 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= chromium@FreeBSD.org COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 i386 BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ gperf:devel/gperf \ flock:sysutils/flock \ node:www/node \ xcb-proto>0:x11/xcb-proto \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \ ${LOCALBASE}/include/va/va.h:multimedia/libva \ ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libatspi.so:accessibility/at-spi2-core \ libspeechd.so:accessibility/speech-dispatcher \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ 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 \ libnspr4.so:devel/nspr \ libre2.so:devel/re2 \ libcairo.so:graphics/cairo \ libdrm.so:graphics/libdrm \ libexif.so:graphics/libexif \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libopenh264.so:multimedia/openh264 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libgcrypt.so:security/libgcrypt \ libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon \ libxshmfence.so:x11/libxshmfence RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome jpeg localbase:ldflags \ ninja perl5 pkgconfig python:3.7+,build shebangfix tar:xz xorg CPE_VENDOR= google CPE_PRODUCT= chrome USE_GL= gbm gl USE_GNOME= atk dconf gdkpixbuf2 glib20 gtk30 libxml2 libxslt USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xorgproto xrandr xrender xscrnsaver xtst SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format MAKE_ARGS= -C out/${BUILDTYPE} ALL_TARGET= chrome BINARY_ALIAS= python3=${PYTHON_CMD} # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) # # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables. # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= clang_use_chrome_plugins=false \ enable_hangout_services_extension=true \ enable_js_type_check=false \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ enable_wmax_tokens=false \ fatal_linker_warnings=false \ is_clang=true \ optimize_webui=true \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ use_allocator_shim=false \ use_aura=true \ use_custom_libcxx=false \ use_gnome_keyring=false \ use_lld=true \ use_sysroot=false \ use_system_freetype=false \ use_system_harfbuzz=true \ use_system_libjpeg=true \ use_system_wayland_scanner=true \ use_udev=false \ extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" # TODO: investigate building with these options: # use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles # FreeBSD Chromium Api Key # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . # Note: these are for FreeBSD use ONLY. For your own distribution, # please get your own set of keys. GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO TEST OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS SNDIO OPTIONS_EXCLUDE_aarch64=LTO OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_RADIO= KERBEROS OPTIONS_RADIO_KERBEROS= HEIMDAL HEIMDAL_BASE MIT OPTIONS_SUB= yes CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver HEIMDAL_BASE_DESC= Heimdal Kerberos (base) HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) MIT_DESC= MIT Kerberos (security/krb5) ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ alsa-lib>=1.1.1_1:audio/alsa-lib ALSA_VARS= GN_ARGS+=use_alsa=true ALSA_VARS_OFF= GN_ARGS+=use_alsa=false CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \ GN_ARGS+=proprietary_codecs=true CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \ GN_ARGS+=proprietary_codecs=false CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true CUPS_VARS_OFF= GN_ARGS+=use_cups=false DEBUG_BUILD_DEPENDS= esbuild:devel/esbuild DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_debug=true \ GN_ARGS+=is_component_build=false \ GN_ARGS+=symbol_level=1 \ GN_BOOTSTRAP_FLAGS+=--debug \ WANTSPACE="21 GB" DEBUG_VARS_OFF= BUILDTYPE=Release \ GN_ARGS+=blink_symbol_level=0 \ GN_ARGS+=is_debug=false \ GN_ARGS+=is_official_build=true \ GN_ARGS+=symbol_level=0 \ WANTSPACE="14 GB" DRIVER_MAKE_ARGS= chromedriver HEIMDAL_LIB_DEPENDS= libkrb.so.26:security/heimdal KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false LTO_VARS= GN_ARGS+=use_thin_lto=true \ GN_ARGS+=thin_lto_enable_optimizations=true \ WANTSPACE="14 GB" LTO_VARS_OFF= GN_ARGS+=use_thin_lto=false MIT_LIB_DEPENDS= libkrb.so.3:security/krb5 PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false # With SNDIO=on we exclude audio_manager_linux from the build (see # media/audio/BUILD.gn) and use audio_manager_openbsd which does not # support falling back to ALSA or PulseAudio. SNDIO_PREVENTS= ALSA PULSEAUDIO SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .include "Makefile.tests" TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz:fonts TEST_ALL_TARGET= ${TEST_TARGETS} .include .include .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so) IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif .if ${COMPILER_VERSION} < 130 LLVM_DEFAULT= 13 BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \ ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \ nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \ ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT} .else BINARY_ALIAS+= ar=/usr/bin/llvm-ar \ nm=/usr/bin/llvm-nm .endif # swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only .if ${ARCH} == aarch64 PLIST_SUB+= NOT_AARCH64="@comment " .else PLIST_SUB+= NOT_AARCH64="" .endif # Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-znotext # TODO: -isystem, would be just as ugly as this approach, but more reliably # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set. MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Chromium, you should have around 2GB of memory" @${ECHO_MSG} "and around ${WANTSPACE} of free disk space." @${ECHO_MSG} post-extract-TEST-on: @${MKDIR} ${WRKSRC}/third_party/test_fonts/test_fonts @${MV} ${WRKDIR}/test_fonts ${WRKSRC}/third_party/test_fonts/ pre-configure: # We used to remove bundled libraries to be sure that chromium uses # system libraries and not shipped ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./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 \ ${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/linux/ \ ${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/freebsd .endfor do-configure: # GN generator bootstrapping and generating ninja files cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \ gen --args='${GN_ARGS}' out/${BUILDTYPE} # Setup nodejs dependency @${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin/node # Setup buildtools/freebsd @${MKDIR} ${WRKSRC}/buildtools/freebsd ${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd ${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd ${LN} -sf /usr/bin/strip ${WRKSRC}/buildtools/freebsd/strip do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ ${STAGEDIR}${MANPREFIX}/man/man1/chrome.1 @${SED} -i "" -e 's,\@\@PACKAGE\@\@,chromium,g;s,\@\@MENUNAME\@\@,Chromium Web Browser,g' \ ${STAGEDIR}${MANPREFIX}/man/man1/chrome.1 ${CP} ${WRKSRC}/chrome/app/theme/chromium/product_logo_22_mono.png ${WRKSRC}/chrome/app/theme/chromium/product_logo_22.png .for s in 22 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png .endfor ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR} .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 ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} # ANGLE, EGL, Vk .for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 \ ${STAGEDIR}${DATADIR}/libvulkan.so .if ${BUILDTYPE} == Debug ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libVkLayer_khronos_validation.so ${STAGEDIR}${DATADIR} .endif # SwiftShader .if ${ARCH} != aarch64 ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR} .endif post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ ${STAGEDIR}${DATADIR} post-install-DRIVER-on: ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver.unstripped \ ${STAGEDIR}${PREFIX}/bin/chromedriver do-test-TEST-on: .for t in ${TEST_TARGETS} cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} .endfor .include 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" ] + }