diff options
author | Rene Ladan <rene@FreeBSD.org> | 2022-06-30 20:48:41 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2022-06-30 20:48:41 +0000 |
commit | 30886720da7c75f76b70811c05c4e68950a7d8a7 (patch) | |
tree | 99f28b2fd7a707c5efea79e667d790a3e459b2dd | |
parent | 10b96277e5d911a7461dabfa9719d1a68bd33bf6 (diff) | |
download | ports-30886720da7c75f76b70811c05c4e68950a7d8a7.tar.gz ports-30886720da7c75f76b70811c05c4e68950a7d8a7.zip |
cleanup: Remove expired ports:
2022-06-30 databases/pgpool-II-36: Upstream support ended use databases/pgpool-II-43
2022-06-30 ftp/multiget: Last release in 2007, doesn't support https, depends on deprecated wxgtk28 and dead upstream. Please consider using net/uget
2022-06-30 devel/electron13: EOLed upstream, switch to newer version
2022-06-30 ftp/puf: Last release in 2006, doesn't support https and upstream is dead. Please consider using www/aria2
2022-06-30 security/gss: Abandonware, last release in 2014 and no development since
2022-06-30 security/shishi: Abandonware, last release in 2013 and no development since
2022-06-30 ftp/urlgfe
2022-06-30 www/nspluginwrapper: Abandonware, last release in 2011 and upstream is dead. NPAPI plugins are now obsolete and depends on deprecated library GTK 2
2022-06-30 devel/govendor: Use Go modules
2022-06-30 devel/racer: Racer is not actively developped now. Please consider using newer software such as devel/rust-analyzer.
2022-06-30 net-mgmt/unifi6: No longer maintained by upstream
2022-06-30 devel/dep: Use Go modules
2022-06-30 databases/libgda5-bdb: Depends on deprecated databases/db5
2022-06-30 emulators/qemu5: Use emulators/qemu6 or emulators/qemu
2022-06-30 deskutils/bitcollider: bitzi.com is no longer available, closed down in 2013
2022-06-30 converters/htx: XHTML is considered obsolete in favor of HTML5
2022-06-30 www/getleft: Abandonware last updated on 2008
2022-06-30 ftp/wxdfast: Last release in 2009, doesn't support https, depends on deprecated wxgtk28 and dead upstream. Please consider using net/uget
1160 files changed, 18 insertions, 39388 deletions
@@ -17462,3 +17462,21 @@ devel/psptoolchain-gcc-stage1||2022-06-30|Has expired: Security issues for multi devel/psptoolchain-pspsdk-stage1||2022-06-30|Has expired: Security issues for multiple years devel/psptoolchain-pspsdk-stage2||2022-06-30|Has expired: Security issues for multiple years devel/psptoolchain-gcc-stage2||2022-06-30|Has expired: Security issues for multiple years +databases/pgpool-II-36||2022-06-30|Has expired: Upstream support ended use databases/pgpool-II-43 +ftp/multiget||2022-06-30|Has expired: Last release in 2007, doesn't support https, depends on deprecated wxgtk28 and dead upstream. Please consider using net/uget +devel/electron13||2022-06-30|Has expired: EOLed upstream, switch to newer version +ftp/puf||2022-06-30|Has expired: Last release in 2006, doesn't support https and upstream is dead. Please consider using www/aria2 +security/gss||2022-06-30|Has expired: Abandonware, last release in 2014 and no development since +security/shishi||2022-06-30|Has expired: Abandonware, last release in 2013 and no development since +ftp/urlgfe||2022-06-30|Has expired +www/nspluginwrapper||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead. NPAPI plugins are now obsolete and depends on deprecated library GTK 2 +devel/govendor||2022-06-30|Has expired: Use Go modules +devel/racer||2022-06-30|Has expired: Racer is not actively developped now. Please consider using newer software such as devel/rust-analyzer. +net-mgmt/unifi6||2022-06-30|Has expired: No longer maintained by upstream +devel/dep||2022-06-30|Has expired: Use Go modules +databases/libgda5-bdb||2022-06-30|Has expired: Depends on deprecated databases/db5 +emulators/qemu5||2022-06-30|Has expired: Use emulators/qemu6 or emulators/qemu +deskutils/bitcollider||2022-06-30|Has expired: bitzi.com is no longer available, closed down in 2013 +converters/htx||2022-06-30|Has expired: XHTML is considered obsolete in favor of HTML5 +www/getleft||2022-06-30|Has expired: Abandonware last updated on 2008 +ftp/wxdfast||2022-06-30|Has expired: Last release in 2009, doesn't support https, depends on deprecated wxgtk28 and dead upstream. Please consider using net/uget diff --git a/converters/Makefile b/converters/Makefile index e06e62aee129..648ab17da4cc 100644 --- a/converters/Makefile +++ b/converters/Makefile @@ -32,7 +32,6 @@ SUBDIR += gbase SUBDIR += gbsdconv SUBDIR += hs-aeson-pretty - SUBDIR += htx SUBDIR += i18ntools SUBDIR += ical2html SUBDIR += iconv diff --git a/converters/htx/Makefile b/converters/htx/Makefile deleted file mode 100644 index 67aa494ca1b4..000000000000 --- a/converters/htx/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Created by: Vsevolod Stakhov <vsevolod@highsecure.ru> - -PORTNAME= htx -DISTVERSION= 0.7.8 -CATEGORIES= converters www -MASTER_SITES= http://stuff.myrealm.co.uk/htx/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= HTML to XHTML converter - -DEPRECATED= XHTML is considered obsolete in favor of HTML5 -EXPIRATION_DATE=2022-06-30 - -USES= perl5 shebangfix -SHEBANG_FILES= htx -NO_BUILD= yes -PLIST_FILES= bin/htx - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/htx ${STAGEDIR}${PREFIX}/bin - -.include <bsd.port.mk> diff --git a/converters/htx/distinfo b/converters/htx/distinfo deleted file mode 100644 index 36128ae0940b..000000000000 --- a/converters/htx/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (htx-0.7.8.tar.gz) = 667ba52d897165a84f5270a2ab6535c92e305e913530ab63e4ccf3cd252f46c1 -SIZE (htx-0.7.8.tar.gz) = 10975 diff --git a/converters/htx/pkg-descr b/converters/htx/pkg-descr deleted file mode 100644 index 4c6c7c49b493..000000000000 --- a/converters/htx/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -HTML to XHTML converter written in Perl - -WWW: http://stuff.myrealm.co.uk/htx/ diff --git a/databases/Makefile b/databases/Makefile index d355f483afe6..5718cc5a936b 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -129,7 +129,6 @@ SUBDIR += libdrizzle SUBDIR += libdrizzle-redux SUBDIR += libgda5 - SUBDIR += libgda5-bdb SUBDIR += libgda5-jdbc SUBDIR += libgda5-ldap SUBDIR += libgda5-mdb @@ -578,7 +577,6 @@ SUBDIR += pglogical SUBDIR += pgmetrics SUBDIR += pgmodeler - SUBDIR += pgpool-II-36 SUBDIR += pgpool-II-37 SUBDIR += pgpool-II-40 SUBDIR += pgpool-II-41 diff --git a/databases/libgda5-bdb/Makefile b/databases/libgda5-bdb/Makefile deleted file mode 100644 index f589e4ceaaac..000000000000 --- a/databases/libgda5-bdb/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> - -PORTREVISION= 2 -CATEGORIES= databases gnome -PKGNAMESUFFIX= 5-bdb - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Provides Berkeley DB backend for the libgda5 library - -MASTERDIR= ${.CURDIR}/../libgda5 -BUILD_WRKSRC= ${WRKSRC}/providers/bdb/ -INSTALL_WRKSRC= ${BUILD_WRKSRC} -PLIST= ${.CURDIR}/pkg-plist - -DEPRECATED= Depends on deprecated databases/db5 -EXPIRATION_DATE=2022-06-30 - -LIBGDA5_SLAVE= bdb - -.include "${MASTERDIR}/Makefile" diff --git a/databases/libgda5-bdb/pkg-plist b/databases/libgda5-bdb/pkg-plist deleted file mode 100644 index d8aee73c0c66..000000000000 --- a/databases/libgda5-bdb/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/libgda-%%VERSION%%/providers/libgda-bdb.so -libdata/pkgconfig/libgda-bdb-%%VERSION%%.pc -share/libgda-%%VERSION%%/bdb_specs_dsn.xml diff --git a/databases/pgpool-II-36/Makefile b/databases/pgpool-II-36/Makefile deleted file mode 100644 index 1c86f54545ed..000000000000 --- a/databases/pgpool-II-36/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -PORTNAME= pgpool-II -PORTVERSION= 3.6.28 -CATEGORIES= databases -MASTER_SITES= http://www.pgpool.net/mediawiki/images/ -PKGNAMESUFFIX= 36 - -MAINTAINER= tz@FreeBSD.org -COMMENT= Connection pool server for PostgreSQL - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -DEPRECATED= Upstream support ended use databases/pgpool-II-43 -EXPIRATION_DATE= 2022-06-30 - -USES= gmake libtool pgsql:9.3+ -USE_LDCONFIG= yes -USE_RC_SUBR= pgpool - -GNU_CONFIGURE= yes - -CONFLICTS_INSTALL= pgpool-II-[0-9][0-9] pgpool-II[0-9][0-9] # etc/pcp.conf.sample - -PORTSCOUT= limit:^3.6.[0-9]* - -PORTDOCS= * - -OPTIONS_DEFINE= DOCS SSL -OPTIONS_DEFAULT= SSL - -SSL_USES= ssl -SSL_CONFIGURE_WITH= openssl - -post-install: - @${MKDIR} ${STAGEDIR}/var/run/pgpool - ${INSTALL_LIB} ${WRKSRC}/src/libs/pcp/.libs/libpcp.so.1.0.0 ${STAGEDIR}${PREFIX}/lib - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR} "-not -name Makefile.\*" -.for f in AUTHORS ChangeLog NEWS TODO - ${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR} -.endfor - -.include <bsd.port.mk> diff --git a/databases/pgpool-II-36/distinfo b/databases/pgpool-II-36/distinfo deleted file mode 100644 index 0f6ab985a75a..000000000000 --- a/databases/pgpool-II-36/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1640293881 -SHA256 (pgpool-II-3.6.28.tar.gz) = b2b7c04e687d9205601d8a2e48413a50bd64bd4d30e3ac0ec553fba61f2678f6 -SIZE (pgpool-II-3.6.28.tar.gz) = 3363962 diff --git a/databases/pgpool-II-36/files/pgpool.in b/databases/pgpool-II-36/files/pgpool.in deleted file mode 100644 index ca1b4d136fe0..000000000000 --- a/databases/pgpool-II-36/files/pgpool.in +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -# PROVIDE: pgpool -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# pgpool_enable (bool): Set to NO by default. -# Set it to YES to enable pgpool. -# pgpool_conf (file): Set location of your config. -# Default is "%%PREFIX%%/etc/pgpool.conf" -# pgpool_user (uid): User ID to run as (default nobody) -# pgpool_stop_mode (string): Shutdown mode -# Default is "smart" -# Possibilities are "smart", "fast", or "immediate" -# - -. /etc/rc.subr - -name=pgpool -rcvar=pgpool_enable - -load_rc_config $name - -: ${pgpool_enable="NO"} -: ${pgpool_conf="%%PREFIX%%/etc/pgpool.conf"} -: ${pgpool_user="nobody"} -: ${pgpool_stop_mode="smart"} - -command="%%PREFIX%%/bin/pgpool" -command_args="-f ${pgpool_conf}" -stop_cmd="${command} -m ${pgpool_stop_mode} ${command_args} stop" - -required_files="${pgpool_conf}" - -run_rc_command "$1" diff --git a/databases/pgpool-II-36/pkg-descr b/databases/pgpool-II-36/pkg-descr deleted file mode 100644 index 474bcbe9a30e..000000000000 --- a/databases/pgpool-II-36/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -pgpool is a connection pool server for PostgreSQL. pgpool runs between -PostgreSQL's clients(front ends) and servers(back ends). A PostgreSQL client can -connect to pgpool as if it were a standard PostgreSQL server. - -pgpool caches the connection to PostgreSQL server to reduce the overhead to -establish the connection to it. - -WWW: https://pgpool.net/ diff --git a/databases/pgpool-II-36/pkg-message b/databases/pgpool-II-36/pkg-message deleted file mode 100644 index 1df287cd433a..000000000000 --- a/databases/pgpool-II-36/pkg-message +++ /dev/null @@ -1,15 +0,0 @@ -[ -{ type: install - message: <<EOM -In order to start pgpool you need some more configuration: - -# sysrc -f /etc/rc.conf pgpool_enable="YES" -# sysrc -f /etc/rc.conf pgpool_user="root" - -Please consider the usage of another user. The user is -required to have read/write access to /var/run/pgpool. - -Using the root user is - as always - an security issue. -EOM -} -] diff --git a/databases/pgpool-II-36/pkg-plist b/databases/pgpool-II-36/pkg-plist deleted file mode 100644 index b8c12002d758..000000000000 --- a/databases/pgpool-II-36/pkg-plist +++ /dev/null @@ -1,32 +0,0 @@ -bin/pcp_attach_node -bin/pcp_detach_node -bin/pcp_node_count -bin/pcp_node_info -bin/pcp_pool_status -bin/pcp_proc_count -bin/pcp_proc_info -bin/pcp_promote_node -bin/pcp_recovery_node -bin/pcp_stop_pgpool -bin/pcp_watchdog_info -bin/pg_md5 -bin/pgpool -bin/pgpool_setup -bin/watchdog_setup -@sample etc/pcp.conf.sample -@sample etc/pgpool.conf.sample -etc/pgpool.conf.sample-master-slave -etc/pgpool.conf.sample-replication -etc/pgpool.conf.sample-stream -@sample etc/pool_hba.conf.sample -include/libpcp_ext.h -include/pcp.h -include/pool_process_reporting.h -include/pool_type.h -lib/libpcp.a -lib/libpcp.so -lib/libpcp.so.1 -lib/libpcp.so.1.0.0 -%%DATADIR%%/insert_lock.sql -%%DATADIR%%/pgpool.pam -@dir /var/run/pgpool diff --git a/deskutils/Makefile b/deskutils/Makefile index 3b2d05123fcf..6075352451ac 100644 --- a/deskutils/Makefile +++ b/deskutils/Makefile @@ -17,7 +17,6 @@ SUBDIR += bigyear SUBDIR += bijiben SUBDIR += birdtray - SUBDIR += bitcollider SUBDIR += bookworm SUBDIR += cairo-dock SUBDIR += cairo-dock-plugins diff --git a/deskutils/bitcollider/Makefile b/deskutils/bitcollider/Makefile deleted file mode 100644 index edbe1837df1b..000000000000 --- a/deskutils/bitcollider/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> - -PORTNAME= bitcollider -PORTVERSION= 0.6.0 -PORTREVISION= 4 -CATEGORIES= deskutils multimedia -MASTER_SITES= SF/${PORTNAME}/Bitcollider/${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Bitzi metadata generator - -DEPRECATED= bitzi.com is no longer available, closed down in 2013 -EXPIRATION_DATE=2022-06-30 - -GNU_CONFIGURE= yes -USES= libtool -INSTALL_TARGET= install-strip -USE_LDCONFIG= yes - -CFLAGS+= -lm - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/bitcollider/plugins/*.bcp - -.include <bsd.port.mk> diff --git a/deskutils/bitcollider/distinfo b/deskutils/bitcollider/distinfo deleted file mode 100644 index 038983f3a1ae..000000000000 --- a/deskutils/bitcollider/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (bitcollider-0.6.0.tar.gz) = 733c6e4bb64ad25e114e1ae8d50514ff13b5246dc9307cd11447b3449a0f31f5 -SIZE (bitcollider-0.6.0.tar.gz) = 641374 diff --git a/deskutils/bitcollider/files/patch-Makefile.in b/deskutils/bitcollider/files/patch-Makefile.in deleted file mode 100644 index f441ffa681d7..000000000000 --- a/deskutils/bitcollider/files/patch-Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.in.orig 2014-03-01 18:35:51.000000000 +0100 -+++ Makefile.in 2014-03-01 18:36:24.000000000 +0100 -@@ -615,8 +615,8 @@ - $(SHELL) ./config.status --recheck - - install-data-local: -- mkdir -p $(libdir)/bitcollider/plugins -- $(INSTALL) -m 0655 plugins/*.bcp $(libdir)/bitcollider/plugins -+ mkdir -p $(DESTDIR)$(libdir)/bitcollider/plugins -+ $(INSTALL) -m 0655 plugins/*.bcp $(DESTDIR)$(libdir)/bitcollider/plugins - mkdir -p $(DESTDIR)$(bindir) - $(INSTALL) -s -m 0655 src/bitcollider $(DESTDIR)$(bindir) - mkdir -p $(DESTDIR)$(includedir)/bitcollider diff --git a/deskutils/bitcollider/pkg-descr b/deskutils/bitcollider/pkg-descr deleted file mode 100644 index 3e4f27f3793e..000000000000 --- a/deskutils/bitcollider/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -The bitcollider is a small utility that generates -bitprints and metadata tags from files for lookup -and submission at the Bitzi community metadata -project. For more details, please see http://bitzi.com. - -WWW: http://bitcollider.sourceforge.net/ diff --git a/deskutils/bitcollider/pkg-plist b/deskutils/bitcollider/pkg-plist deleted file mode 100644 index 751f281188c3..000000000000 --- a/deskutils/bitcollider/pkg-plist +++ /dev/null @@ -1,15 +0,0 @@ -bin/bitcollider -include/bitcollider/bitcollider.h -include/bitcollider/plugin.h -include/bitcollider/sha1.h -include/bitcollider/tiger.h -include/bitcollider/tigertree.h -include/bitcollider/defs.h -include/bitcollider/cache.h -lib/bitcollider/plugins/image.bcp -lib/bitcollider/plugins/video.bcp -lib/bitcollider/plugins/wav.bcp -lib/libbitcollider.a -lib/libbitcollider.so -lib/libbitcollider.so.1 -lib/libbitcollider.so.1.0.0 diff --git a/devel/Makefile b/devel/Makefile index bd23d27160e4..00a6211edb49 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -511,7 +511,6 @@ SUBDIR += deheader SUBDIR += delta SUBDIR += delve - SUBDIR += dep SUBDIR += deployer SUBDIR += derelict-sdl2 SUBDIR += derelict-util @@ -570,7 +569,6 @@ SUBDIR += efl SUBDIR += egypt SUBDIR += eiffelstudio - SUBDIR += electron13 SUBDIR += electron17 SUBDIR += electron18 SUBDIR += electron19 @@ -865,7 +863,6 @@ SUBDIR += gorm SUBDIR += goswagger SUBDIR += got - SUBDIR += govendor SUBDIR += gpds SUBDIR += gperf SUBDIR += gpm @@ -5578,7 +5575,6 @@ SUBDIR += quickcheck++ SUBDIR += quilt SUBDIR += rabs - SUBDIR += racer SUBDIR += radare2 SUBDIR += radian SUBDIR += ragel diff --git a/devel/dep/Makefile b/devel/dep/Makefile deleted file mode 100644 index 30bd72c8e54b..000000000000 --- a/devel/dep/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -PORTNAME= dep -DISTVERSIONPREFIX= v -DISTVERSION= 0.5.4 -PORTREVISION= 3 -CATEGORIES= devel - -# https://github.com/golang/dep/pull/2228 -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 6d3cf343515fe34645284b75819bed3de5ea930e.patch:-p1 - -MAINTAINER= dmgk@FreeBSD.org -COMMENT= Prototype dependency management tool for Go - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= Use Go modules -EXPIRATION_DATE= 2022-06-30 - -USES= go - -USE_GITHUB= yes -GH_ACCOUNT= golang - -GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} -GO_TARGET= ./cmd/dep - -PLIST_FILES= bin/dep - -.include <bsd.port.mk> diff --git a/devel/dep/distinfo b/devel/dep/distinfo deleted file mode 100644 index 9c54e7152019..000000000000 --- a/devel/dep/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1577447961 -SHA256 (golang-dep-v0.5.4_GH0.tar.gz) = 929c8f759838f98323211ba408a831ea80d93b75beda8584b6d950f393a3298a -SIZE (golang-dep-v0.5.4_GH0.tar.gz) = 3973452 -SHA256 (6d3cf343515fe34645284b75819bed3de5ea930e.patch) = 8f14cc0349743c2de8894fc35cba88a804dfbbfc0f101c18a1e2b09e42582722 -SIZE (6d3cf343515fe34645284b75819bed3de5ea930e.patch) = 5541303 diff --git a/devel/dep/pkg-descr b/devel/dep/pkg-descr deleted file mode 100644 index 3fe28e4fa553..000000000000 --- a/devel/dep/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -Dep is a Go tool for managing vendor dependencies (not to be confused -with godep, a different, deprecated tool). dep updates the vendor/ -directory contents based on a manifest, prunes unnecessary dependencies, -and adds missing dependencies to vendor/ as necessary. - -dep is the heir-apparent for vendor management and is being actively -driven by the Go core team with an eye toward inclusion in the Go tool. - -WWW: https://github.com/golang/dep diff --git a/devel/electron13/Makefile b/devel/electron13/Makefile deleted file mode 100644 index cdffc459c497..000000000000 --- a/devel/electron13/Makefile +++ /dev/null @@ -1,315 +0,0 @@ -PORTNAME= electron -DISTVERSIONPREFIX= v -DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} -PORTREVISION= 2 -CATEGORIES= devel -MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \ - https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts -PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR} -DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \ - ${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \ - electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch -DIST_SUBDIR= ${PORTNAME} - -MAINTAINER= tagattie@FreeBSD.org -COMMENT= Build cross-platform desktop apps with JavaScript, HTML, and CSS - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/electron/LICENSE - -DEPRECATED= EOLed upstream, switch to newer version -EXPIRATION_DATE= 2022-06-30 - -FETCH_DEPENDS= yarn-node14>0:www/yarn-node14 -EXTRACT_DEPENDS= yarn-node14>0:www/yarn-node14 -PATCH_DEPENDS= git:devel/git -BUILD_DEPENDS= ${LOCALBASE}/bin/ar:devel/binutils \ - gperf:devel/gperf \ - yasm:devel/yasm \ - ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ - node14>0:www/node14 \ - npm-node14>0:www/npm-node14 -LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ - libatspi.so:accessibility/at-spi2-core \ - libsnappy.so:archivers/snappy \ - libFLAC.so:audio/flac \ - libopus.so:audio/opus \ - libdbus-1.so:devel/dbus \ - libnotify.so:devel/libnotify \ - libpci.so:devel/libpci \ - libnspr4.so:devel/nspr \ - libre2.so:devel/re2 \ - libdrm.so:graphics/libdrm \ - libpng.so:graphics/png \ - libwebp.so:graphics/webp \ - libavcodec.so:multimedia/ffmpeg \ - libva.so:multimedia/libva \ - libopenh264.so:multimedia/openh264 \ - libfreetype.so:print/freetype2 \ - libharfbuzz.so:print/harfbuzz \ - libsecret-1.so:security/libsecret \ - libnss3.so:security/nss \ - libexpat.so:textproc/expat2 \ - libxkbcommon.so:x11/libxkbcommon \ - libxshmfence.so:x11/libxshmfence \ - libfontconfig.so:x11-fonts/fontconfig -RUN_DEPENDS= xdg-open:devel/xdg-utils -TEST_DEPENDS= git:devel/git \ - ${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \ - npm-node14>0:www/npm-node14 - -USES= bison cpe dos2unix gettext-tools gl gnome jpeg localbase:ldflags \ - ninja pkgconfig python:2.7,build,test shebangfix tar:xz xorg -CPE_VENDOR= electronjs -DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h \ - third_party/vulkan_memory_allocator/src/vk_mem_alloc.h -USE_GITHUB= yes -GH_TAGNAME= ${DISTVERSIONPREFIX}${ELECTRON_VER} -GH_TUPLE= nodejs:node:v${NODE_VER}:node \ - nodejs:nan:v${NAN_VER}:nan -USE_GL= gbm gl glesv2 -USE_GNOME= atk cairo gdkpixbuf2 gtk30 libxml2 libxslt pango -USE_LDCONFIG= ${DATADIR} -USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \ - xrender xscrnsaver xtst - -SHEBANG_FILES= buildtools/freebsd/clang-format - -MAKE_ARGS= -C out/${BUILDTYPE} -MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ - CPLUS_INCLUDE_PATH=${LOCALBASE}/include -ALL_TARGET= electron third_party/electron_node:headers -POST_BUILD_TARGETS= licenses version -POST_BUILD_DIST_TARGETS= electron_dist_zip electron_chromedriver_zip \ - electron_mksnapshot_zip - -DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} -BINARY_ALIAS= python=${PYTHON_CMD} - -NO_WRKSUBDIR= yes -WRKSRC_SUBDIR= src - -PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} \ - ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR} - -OPTIONS_DEFINE= CUPS DEBUG DIST DRIVER KERBEROS LTO -OPTIONS_DEFAULT= CUPS DRIVER KERBEROS ALSA -OPTIONS_GROUP= AUDIO -OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO -OPTIONS_SUB= yes - -DIST_DESC= Build distribution zip files -DRIVER_DESC= Install chromedriver - -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins -ALSA_VARS= GN_ARGS+=use_alsa=true -ALSA_VARS_OFF= GN_ARGS+=use_alsa=false -CUPS_LIB_DEPENDS= libcups.so:print/cups -CUPS_VARS= GN_ARGS+=use_cups=true -CUPS_VARS_OFF= GN_ARGS+=use_cups=false -DEBUG_VARS= BUILDTYPE=Debug \ - GN_FILE=testing.gn \ - GN_ARGS+=is_debug=true \ - GN_BOOTSTRAP_FLAGS+=--debug -DEBUG_VARS_OFF= BUILDTYPE=Release \ - GN_FILE=release.gn \ - GN_ARGS+=blink_symbol_level=0 \ - GN_ARGS+=is_debug=false \ - GN_ARGS+=symbol_level=0 -DIST_IMPLIES= DRIVER -DRIVER_ALL_TARGET= chromedriver -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 -LTO_VARS_OFF= GN_ARGS+=use_thin_lto=false -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true -PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false - -# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER -CHROMIUM_VER= 91.0.4472.164 -# See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH -CHROMIUM_TEST_FONTS_HASH= cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb -# See ${WRKSRC}/electron/DEPS for NODE_VER -NODE_VER= 14.16.0 -# See ${WRKSRC}/electron/DEPS for NAN_VER -NAN_VER= 2.14.2 - -YARN_TIMESTAMP= 1643790250 - -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 \ - fieldtrial_testing_like_official_build=true \ - is_clang=true \ - optimize_webui=false \ - 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=true \ - use_system_harfbuzz=true \ - use_system_libjpeg=true \ - extra_cxxflags="${CXXFLAGS}" \ - extra_ldflags="${LDFLAGS}" -GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles - -.include "Makefile.version" -.include <bsd.port.pre.mk> - -# Add extra-patch-no-mempcpy-nasm only when there's no mempcpy() in base. -# Nested variable expansion avoids executing the test when not needed for -# expanding EXTRA_PATCHES. -EXTRA_PATCHES+= ${"${:!${GREP} mempcpy ${CROSS_SYSROOT}/usr/include/string.h \ - || ${TRUE}!}" == "":?${PATCHDIR}/extra-patch-no-mempcpy-nasm:} - -.if ${ARCH} == "amd64" -PLIST_SUB+= AMD64="" -.else -PLIST_SUB+= AMD64="@comment " -.endif - -.if ${ARCH} == "i386" -PLIST_SUB+= I386="" -.else -PLIST_SUB+= I386="@comment " -.endif - -pre-fetch: - @${MKDIR} ${DISTDIR}/${DIST_SUBDIR} - if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} ]; \ - then ${MKDIR} ${WRKDIR}; \ - ${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \ - ${WRKDIR}/.yarnrc; \ - ${CP} ${FILESDIR}/package.json ${FILESDIR}/yarn.lock ${WRKDIR}; \ - cd ${WRKDIR} && ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache \ - yarn --frozen-lockfile --ignore-scripts; \ - ${MTREE_CMD} -cbnSp yarn-offline-cache | ${MTREE_CMD} -C | ${SED} \ - -e 's:time=[0-9.]*:time=${YARN_TIMESTAMP}.000000000:' \ - -e 's:\([gu]id\)=[0-9]*:\1=0:g' \ - -e 's:flags=.*:flags=none:' \ - -e 's:^\.:./yarn-offline-cache:' > yarn-offline-cache.mtree; \ - ${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} \ - @yarn-offline-cache.mtree; \ - ${RM} -r ${WRKDIR}; \ - fi - -post-extract: -# Move extracted sources to appropriate locations - ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC} - ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron - ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_nan}-${NAN_VER} \ - ${WRKSRC}/third_party/nan - ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${NODE_VER} \ - ${WRKSRC}/third_party/electron_node - ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts -# Take in clang-format from official chromium distribution - ${MKDIR} ${WRKSRC}/buildtools/freebsd - ${CP} ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd -# Copy FreeBSD-specific files from FILESDIR - ${MKDIR} ${WRKSRC}/sandbox/policy/freebsd - ${CP} ${FILESDIR}/dir_reader_freebsd.h ${WRKSRC}/base/files - ${CP} ${FILESDIR}/device_info_fetcher_freebsd.h ${WRKSRC}/chrome/browser/enterprise/signals - ${CP} ${FILESDIR}/device_info_fetcher_freebsd.cc ${WRKSRC}/chrome/browser/enterprise/signals - ${CP} ${FILESDIR}/sandbox_freebsd.h ${WRKSRC}/sandbox/policy/freebsd - ${CP} ${FILESDIR}/sandbox_freebsd.cc ${WRKSRC}/sandbox/policy/freebsd -# Install node modules for electron - ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR} - ${ECHO_CMD} 'yarn-offline-mirror "../../../yarn-offline-cache"' >> ${WRKSRC}/electron/.yarnrc - cd ${WRKSRC}/electron && \ - ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache yarn --frozen-lockfile --offline - -pre-patch: - ${SH} ${FILESDIR}/apply-electron-patches.sh ${WRKSRC} - # ${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete - # ${FIND} ${WRKSRC} -type f -name '*~' -print -delete - -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 \ - ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng \ - libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE} - -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 out/${BUILDTYPE} \ - --args='import("//electron/build/args/${GN_FILE}") ${GN_ARGS}' -# Setup nodejs dependency - ${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin - ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node - -post-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_TARGETS} - -post-build-DIST-on: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_DIST_TARGETS} - cd ${WRKSRC}/out/${BUILDTYPE} && \ - ${CP} chromedriver.zip chromedriver-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \ - ${CP} dist.zip electron-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \ - ${CP} mksnapshot.zip mksnapshot-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \ - ${SHA256} -r *-v${ELECTRON_VER}-freebsd-*.zip | ${SED} -e 's/ / */' > SHASUMS256.txt - -do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} -.for f in electron mksnapshot v8_context_snapshot_generator - ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} -.endfor -.for f in libEGL.so libGLESv2.so libvk_swiftshader.so libvulkan.so.1 - ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} -.endfor - ${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader -.for f in libEGL.so libGLESv2.so - ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${f} ${STAGEDIR}${DATADIR}/swiftshader -.endfor -.for f in LICENSE LICENSES.chromium.html icudtl.dat snapshot_blob.bin v8_context_snapshot.bin version vk_swiftshader_icd.json - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} -.endfor -.for f in chrome_100_percent.pak chrome_200_percent.pak resources.pak - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} -.endfor - ${MKDIR} ${STAGEDIR}${DATADIR}/locales - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/locales/*.pak ${STAGEDIR}${DATADIR}/locales - ${MKDIR} ${STAGEDIR}${DATADIR}/resources -.for f in default_app.asar - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources/${f} ${STAGEDIR}${DATADIR}/resources -.endfor - cd ${WRKSRC}/out/${BUILDTYPE}/gen && ${COPYTREE_SHARE} node_headers ${STAGEDIR}${DATADIR} - cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/electron/buildflags ${STAGEDIR}${DATADIR} - cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/v8/embedded.S ${STAGEDIR}${DATADIR} - ${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin/electron${PKGNAMESUFFIX} - -post-install-DIST-on: - ${MKDIR} ${STAGEDIR}${DATADIR}/releases - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/SHASUMS256.txt ${STAGEDIR}${DATADIR}/releases - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*-v${ELECTRON_VER}-freebsd-*.zip ${STAGEDIR}${DATADIR}/releases - -post-install-DRIVER-on: - ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver ${STAGEDIR}${DATADIR} - -do-test: -# Note 1: "npm install" will run before actual tests are executed -# Note 2: Xvfb or something similar is necessary for headless testing - cd ${WRKSRC}/electron && \ - ${SETENV} ${TEST_ENV} ELECTRON_OUT_DIR=${BUILDTYPE} LOCAL_GIT_DIRECTORY=${LOCALBASE} \ - npm run test -- --ci - -.include <bsd.port.post.mk> diff --git a/devel/electron13/Makefile.version b/devel/electron13/Makefile.version deleted file mode 100644 index ea7283db791b..000000000000 --- a/devel/electron13/Makefile.version +++ /dev/null @@ -1,2 +0,0 @@ -ELECTRON_VER= 13.6.9 -ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron13/distinfo b/devel/electron13/distinfo deleted file mode 100644 index 1145971d0e91..000000000000 --- a/devel/electron13/distinfo +++ /dev/null @@ -1,13 +0,0 @@ -TIMESTAMP = 1643791817 -SHA256 (electron/chromium-91.0.4472.164.tar.xz) = 84e56fa2ad96d910cab429c513eeaca7bfa94096fef057bd024be826ce8426bd -SIZE (electron/chromium-91.0.4472.164.tar.xz) = 950253100 -SHA256 (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492 -SIZE (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = 26759650 -SHA256 (electron/electron-yarn-cache-13.6.9.tar.xz) = 47379de3a855bdc07e595952776d362e1fe84643841defd0830c9f6144ecfa6c -SIZE (electron/electron-yarn-cache-13.6.9.tar.xz) = 34735428 -SHA256 (electron/electron-electron-v13.6.9_GH0.tar.gz) = c994d88a7d0854b590cf1d2f0b23bd366f8da4a03ee9cb93e4bef466c4392ccb -SIZE (electron/electron-electron-v13.6.9_GH0.tar.gz) = 10266097 -SHA256 (electron/nodejs-node-v14.16.0_GH0.tar.gz) = bcdf869b0743405515ee897b1047b5e851a717e426b4974d26537c9b10dfd53a -SIZE (electron/nodejs-node-v14.16.0_GH0.tar.gz) = 87850748 -SHA256 (electron/nodejs-nan-v2.14.2_GH0.tar.gz) = 26dce4db0194c4a7b51b33d0324f3cf36eb67be49dc43a043e0a2dffc9dcdd6d -SIZE (electron/nodejs-nan-v2.14.2_GH0.tar.gz) = 178650 diff --git a/devel/electron13/files/apply-electron-patches.sh b/devel/electron13/files/apply-electron-patches.sh deleted file mode 100644 index 9d974b536054..000000000000 --- a/devel/electron13/files/apply-electron-patches.sh +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh - -PATH=/bin:/usr/bin:/usr/local/bin - -GIT_CMD="git" -PATCH_CMD="${GIT_CMD} apply" -#PATCH_FLAGS="--numstat --check" # for debugging -PATCH_FLAGS="--verbose --reject" - -WRKSRC=$1 -PATCH_CONF=${WRKSRC}/electron/patches/config.json - -${GIT_CMD} status "${WRKSRC}" > /dev/null 2>&1 && IS_GIT_REPO=1 - -PATCHD_REPOD_PAIRS=$(sed -e '1d; $d; /^$/d; s/[",]//g; s/: */:/' "${PATCH_CONF}") -for prp in ${PATCHD_REPOD_PAIRS}; do - pd=$(echo "${prp}" | awk -F: '{print $1}' | sed -e 's/src/./') - rd=$(echo "${prp}" | awk -F: '{print $2}' | sed -e 's/src/./') - (cd "${WRKSRC}/${rd}" && \ - if [ -n "${IS_GIT_REPO}" ]; then - PATCH_FLAGS="${PATCH_FLAGS} --directory=$(${GIT_CMD} rev-parse --show-prefix)" - fi && \ - while read -r p; do - ${PATCH_CMD} ${PATCH_FLAGS} "${WRKSRC}/${pd}/${p}" - done < "${WRKSRC}/${pd}/.patches") -done diff --git a/devel/electron13/files/device_info_fetcher_freebsd.cc b/devel/electron13/files/device_info_fetcher_freebsd.cc deleted file mode 100644 index 021bc035966b..000000000000 --- a/devel/electron13/files/device_info_fetcher_freebsd.cc +++ /dev/null @@ -1,143 +0,0 @@ -// Copyright 2020 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. - -#include "chrome/browser/enterprise/signals/device_info_fetcher_freebsd.h" - -#if defined(USE_GIO) -#include <gio/gio.h> -#endif // defined(USE_GIO) -#include <sys/stat.h> -#include <sys/types.h> -#include <ifaddrs.h> -#include <net/if.h> -#include <net/if_dl.h> - -#include <string> - -#include "base/environment.h" -#include "base/files/dir_reader_posix.h" -#include "base/files/file.h" -#include "base/files/file_util.h" -#include "base/nix/xdg_util.h" -#include "base/strings/string_split.h" -#include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" -#include "base/system/sys_info.h" -#include "net/base/network_interfaces.h" - -using SettingValue = enterprise_signals::DeviceInfo::SettingValue; - -namespace enterprise_signals { - -namespace { - -std::string GetDeviceModel() { - return base::SysInfo::HardwareModelName(); -} - -std::string GetOsVersion() { - return base::SysInfo::OperatingSystemVersion(); -} - -std::string GetDeviceHostName() { - return net::GetHostName(); -} - -std::string GetSerialNumber() { - return std::string(); -} - -// Implements the logic from the native client setup script. It reads the -// setting value straight from gsettings but picks the schema relevant to the -// currently active desktop environment. -// The current implementation support Gnone and Cinnamon only. -SettingValue GetScreenlockSecured() { -#if defined(USE_GIO) - static constexpr char kLockScreenKey[] = "lock-enabled"; - - std::unique_ptr<base::Environment> env(base::Environment::Create()); - const base::nix::DesktopEnvironment desktop_env = - base::nix::GetDesktopEnvironment(env.get()); - if (desktop_env != base::nix::DESKTOP_ENVIRONMENT_CINNAMON && - desktop_env != base::nix::DESKTOP_ENVIRONMENT_GNOME) { - return SettingValue::UNKNOWN; - } - - const std::string settings_schema = base::StringPrintf( - "org.%s.desktop.screensaver", - desktop_env == base::nix::DESKTOP_ENVIRONMENT_CINNAMON ? "cinnamon" - : "gnome"); - - GSettingsSchema* screensaver_schema = g_settings_schema_source_lookup( - g_settings_schema_source_get_default(), settings_schema.c_str(), FALSE); - GSettings* screensaver_settings = nullptr; - if (!screensaver_schema || - !g_settings_schema_has_key(screensaver_schema, kLockScreenKey)) { - return SettingValue::UNKNOWN; - } - screensaver_settings = g_settings_new(settings_schema.c_str()); - if (!screensaver_settings) - return SettingValue::UNKNOWN; - gboolean lock_screen_enabled = - g_settings_get_boolean(screensaver_settings, kLockScreenKey); - g_object_unref(screensaver_settings); - - return lock_screen_enabled ? SettingValue::ENABLED : SettingValue::DISABLED; -#else - return SettingValue::UNKNOWN; -#endif // defined(USE_GIO) -} - -// Implements the logic from the native host installation script. First find the -// root device identifier, then locate its parent and get its type. -SettingValue GetDiskEncrypted() { - return SettingValue::UNKNOWN; -} - -std::vector<std::string> GetMacAddresses() { - std::vector<std::string> result; - struct ifaddrs* ifa = nullptr; - - if (getifaddrs(&ifa) != 0) - return result; - - struct ifaddrs* interface = ifa; - for (; interface != nullptr; interface = interface->ifa_next) { - if (interface->ifa_addr == nullptr || - interface->ifa_addr->sa_family != AF_LINK) { - continue; - } - struct sockaddr_dl* sdl = - reinterpret_cast<struct sockaddr_dl*>(interface->ifa_addr); - if (!sdl || sdl->sdl_alen != 6) - continue; - char* link_address = static_cast<char*>(LLADDR(sdl)); - result.push_back(base::StringPrintf( - "%02x:%02x:%02x:%02x:%02x:%02x", link_address[0] & 0xff, - link_address[1] & 0xff, link_address[2] & 0xff, link_address[3] & 0xff, - link_address[4] & 0xff, link_address[5] & 0xff)); - } - return result; -} - -} // namespace - -DeviceInfoFetcherFreeBSD::DeviceInfoFetcherFreeBSD() = default; - -DeviceInfoFetcherFreeBSD::~DeviceInfoFetcherFreeBSD() = default; - -DeviceInfo DeviceInfoFetcherFreeBSD::Fetch() { - DeviceInfo device_info; - device_info.os_name = "freebsd"; - device_info.os_version = GetOsVersion(); - device_info.device_host_name = GetDeviceHostName(); - device_info.device_model = GetDeviceModel(); - device_info.serial_number = GetSerialNumber(); - device_info.screen_lock_secured = GetScreenlockSecured(); - device_info.disk_encrypted = GetDiskEncrypted(); - device_info.mac_addresses = GetMacAddresses(); - return device_info; -} - -} // namespace enterprise_signals diff --git a/devel/electron13/files/device_info_fetcher_freebsd.h b/devel/electron13/files/device_info_fetcher_freebsd.h deleted file mode 100644 index 2cd2f213f828..000000000000 --- a/devel/electron13/files/device_info_fetcher_freebsd.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2021 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. - -#ifndef CHROME_BROWSER_ENTERPRISE_SIGNALS_DEVICE_INFO_FETCHER_FREEBSD_H_ -#define CHROME_BROWSER_ENTERPRISE_SIGNALS_DEVICE_INFO_FETCHER_FREEBSD_H_ - -#include "chrome/browser/enterprise/signals/device_info_fetcher.h" - -namespace enterprise_signals { - -// FreeBSD implementation of DeviceInfoFetcher. -class DeviceInfoFetcherFreeBSD : public DeviceInfoFetcher { - public: - DeviceInfoFetcherFreeBSD(); - DeviceInfoFetcherFreeBSD(const DeviceInfoFetcherFreeBSD&) = delete; - DeviceInfoFetcherFreeBSD& operator=(const DeviceInfoFetcherFreeBSD&) = delete; - ~DeviceInfoFetcherFreeBSD() override; - - // Overrides DeviceInfoFetcher: - DeviceInfo Fetch() override; -}; - -} // namespace enterprise_signals - -#endif // CHROME_BROWSER_ENTERPRISE_SIGNALS_DEVICE_INFO_FETCHER_FREEBSD_H_ diff --git a/devel/electron13/files/dir_reader_freebsd.h b/devel/electron13/files/dir_reader_freebsd.h deleted file mode 100644 index 7be73f000577..000000000000 --- a/devel/electron13/files/dir_reader_freebsd.h +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright (c) 2012 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. - -#ifndef BASE_FILES_DIR_READER_FREEBSD_H_ -#define BASE_FILES_DIR_READER_FREEBSD_H_ - -#include <errno.h> -#include <fcntl.h> -#include <stddef.h> -#include <stdint.h> -#include <string.h> -#include <unistd.h> -#include <sys/types.h> -#include <dirent.h> - -#include "base/logging.h" -#include "base/posix/eintr_wrapper.h" - -// See the comments in dir_reader_posix.h about this. - -namespace base { - -class DirReaderFreeBSD { - public: - explicit DirReaderFreeBSD(const char* directory_path) - : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)), - offset_(0), - size_(0) { - memset(buf_, 0, sizeof(buf_)); - } - - DirReaderFreeBSD(const DirReaderFreeBSD&) = delete; - DirReaderFreeBSD& operator=(const DirReaderFreeBSD&) = delete; - - ~DirReaderFreeBSD() { - if (fd_ >= 0) { - if (IGNORE_EINTR(close(fd_))) - RAW_LOG(ERROR, "Failed to close directory handle"); - } - } - - bool IsValid() const { - return fd_ >= 0; - } - - // Move to the next entry returning false if the iteration is complete. - bool Next() { - if (size_) { - struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]); - offset_ += dirent->d_reclen; - } - - if (offset_ != size_) - return true; - - ssize_t r = getdents(fd_, buf_, sizeof(buf_)); - if (r == 0) - return false; - if (r == -1) { - DPLOG(FATAL) << "getdents failed"; - return false; - } - size_ = r; - offset_ = 0; - return true; - } - - const char* name() const { - if (!size_) - return nullptr; - - const struct dirent* dirent = - reinterpret_cast<const struct dirent*>(&buf_[offset_]); - return dirent->d_name; - } - - int fd() const { - return fd_; - } - - static bool IsFallback() { - return false; - } - - private: - const int fd_; - alignas(struct dirent) unsigned char buf_[512]; - size_t offset_; - size_t size_; -}; - -} // namespace base - -#endif // BASE_FILES_DIR_READER_LINUX_H_ diff --git a/devel/electron13/files/extra-patch-no-mempcpy-nasm b/devel/electron13/files/extra-patch-no-mempcpy-nasm deleted file mode 100644 index d1ccea1bcd80..000000000000 --- a/devel/electron13/files/extra-patch-no-mempcpy-nasm +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/nasm/config/config-linux.h.orig 2021-01-07 00:39:33 UTC -+++ third_party/nasm/config/config-linux.h -@@ -336,7 +336,7 @@ - #define HAVE_MEMORY_H 1 - - /* Define to 1 if you have the `mempcpy' function. */ --#define HAVE_MEMPCPY 1 -+/* #undef HAVE_MEMPCPY */ - - /* Define to 1 if you have a working `mmap' system call. */ - #define HAVE_MMAP 1 diff --git a/devel/electron13/files/package.json b/devel/electron13/files/package.json deleted file mode 100644 index f21f7d26b00c..000000000000 --- a/devel/electron13/files/package.json +++ /dev/null @@ -1,150 +0,0 @@ -{ - "name": "electron", - "version": "13.6.9", - "repository": "https://github.com/electron/electron", - "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", - "devDependencies": { - "@electron/docs-parser": "^0.10.1", - "@electron/typescript-definitions": "^8.8.0", - "@octokit/auth-app": "^2.10.0", - "@octokit/rest": "^18.0.3", - "@primer/octicons": "^10.0.0", - "@types/basic-auth": "^1.1.3", - "@types/busboy": "^0.2.3", - "@types/chai": "^4.2.12", - "@types/chai-as-promised": "^7.1.3", - "@types/dirty-chai": "^2.0.2", - "@types/express": "^4.17.7", - "@types/fs-extra": "^9.0.1", - "@types/klaw": "^3.0.1", - "@types/minimist": "^1.2.0", - "@types/mocha": "^7.0.2", - "@types/node": "^14.6.2", - "@types/semver": "^7.3.3", - "@types/send": "^0.14.5", - "@types/split": "^1.0.0", - "@types/stream-json": "^1.5.1", - "@types/temp": "^0.8.34", - "@types/uuid": "^3.4.6", - "@types/webpack": "^4.41.21", - "@types/webpack-env": "^1.15.2", - "@typescript-eslint/eslint-plugin": "^4.4.1", - "@typescript-eslint/parser": "^4.4.1", - "asar": "^3.0.3", - "aws-sdk": "^2.727.1", - "check-for-leaks": "^1.2.1", - "colors": "1.4.0", - "dotenv-safe": "^4.0.4", - "dugite": "^1.45.0", - "eslint": "^7.4.0", - "eslint-config-standard": "^14.1.1", - "eslint-plugin-import": "^2.22.0", - "eslint-plugin-mocha": "^7.0.1", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-standard": "^4.0.1", - "eslint-plugin-typescript": "^0.14.0", - "express": "^4.16.4", - "folder-hash": "^2.1.1", - "fs-extra": "^9.0.1", - "got": "^6.3.0", - "husky": "^2.2.0", - "klaw": "^3.0.0", - "lint": "^1.1.2", - "lint-staged": "^10.2.11", - "markdownlint": "^0.21.1", - "markdownlint-cli": "^0.25.0", - "minimist": "^1.2.5", - "nugget": "^2.0.1", - "null-loader": "^4.0.0", - "pre-flight": "^1.1.0", - "remark-cli": "^4.0.0", - "remark-preset-lint-markdown-style-guide": "^2.1.1", - "request": "^2.88.2", - "semver": "^5.6.0", - "shx": "^0.3.2", - "standard-markdown": "^6.0.0", - "stream-json": "^1.7.1", - "tap-xunit": "^2.4.1", - "temp": "^0.8.3", - "timers-browserify": "1.4.2", - "ts-loader": "^8.0.2", - "ts-node": "6.2.0", - "typescript": "^4.1.3", - "webpack": "^4.43.0", - "webpack-cli": "^3.3.12", - "wrapper-webpack-plugin": "^2.1.0" - }, - "private": true, - "scripts": { - "asar": "asar", - "generate-version-json": "node script/generate-version-json.js", - "lint": "node ./script/lint.js && npm run lint:clang-format && npm run lint:docs", - "lint:js": "node ./script/lint.js --js", - "lint:clang-format": "python script/run-clang-format.py -r -c chromium_src/ shell/ || (echo \"\\nCode not formatted correctly.\" && exit 1)", - "lint:clang-tidy": "ts-node ./script/run-clang-tidy.ts", - "lint:cpp": "node ./script/lint.js --cc", - "lint:objc": "node ./script/lint.js --objc", - "lint:py": "node ./script/lint.js --py", - "lint:gn": "node ./script/lint.js --gn", - "lint:docs": "remark docs -qf && npm run lint:js-in-markdown && npm run create-typescript-definitions && npm run lint:docs-relative-links && npm run lint:markdownlint", - "lint:docs-relative-links": "python ./script/check-relative-doc-links.py", - "lint:markdownlint": "markdownlint \"*.md\" \"docs/**/*.md\"", - "lint:js-in-markdown": "standard-markdown docs", - "create-api-json": "electron-docs-parser --dir=./", - "create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --api=electron-api.json && node spec/ts-smoke/runner.js", - "gn-typescript-definitions": "npm run create-typescript-definitions && shx cp electron.d.ts", - "pre-flight": "pre-flight", - "gn-check": "node ./script/gn-check.js", - "preinstall": "node -e 'process.exit(0)'", - "prepack": "check-for-leaks", - "repl": "node ./script/start.js --interactive", - "start": "node ./script/start.js", - "test": "node ./script/spec-runner.js", - "tsc": "tsc", - "webpack": "webpack" - }, - "license": "MIT", - "author": "Electron Community", - "keywords": [ - "electron" - ], - "husky": { - "hooks": { - "pre-commit": "lint-staged", - "pre-push": "check-for-leaks" - } - }, - "lint-staged": { - "*.{js,ts}": [ - "node script/lint.js --js --fix --only --" - ], - "*.{js,ts,d.ts}": [ - "ts-node script/gen-filenames.ts" - ], - "*.{cc,mm,c,h}": [ - "python script/run-clang-format.py -r -c --fix" - ], - "*.md": [ - "npm run lint:docs" - ], - "*.{gn,gni}": [ - "npm run gn-check", - "python script/run-gn-format.py" - ], - "*.py": [ - "node script/lint.js --py --fix --only --" - ], - "docs/api/**/*.md": [ - "ts-node script/gen-filenames.ts", - "markdownlint --config .markdownlint.autofix.json --fix", - "git add filenames.auto.gni" - ], - "{*.patch,.patches}": [ - "node script/lint.js --patches --only --", - "ts-node script/check-patch-diff.ts" - ], - "DEPS": [ - "node script/gen-hunspell-filenames.js" - ] - } -} diff --git a/devel/electron13/files/patch-BUILD.gn b/devel/electron13/files/patch-BUILD.gn deleted file mode 100644 index 7a6a1200cfa6..000000000000 --- a/devel/electron13/files/patch-BUILD.gn +++ /dev/null @@ -1,96 +0,0 @@ ---- BUILD.gn.orig 2021-07-15 19:13:29 UTC -+++ BUILD.gn -@@ -429,7 +429,7 @@ group("gn_all") { - ] - } - -- if (is_linux || is_chromeos || is_android) { -+ if ((is_linux && !is_bsd) || is_chromeos || is_android) { - deps += [ - "//third_party/breakpad:breakpad_unittests", - "//third_party/breakpad:core-2-minidump", -@@ -474,8 +474,6 @@ group("gn_all") { - "//net:disk_cache_memory_test", - "//net:quic_client", - "//net:quic_server", -- "//sandbox/linux:chrome_sandbox", -- "//sandbox/linux:sandbox_linux_unittests", - "//testing:empty_main", - ] - -@@ -530,10 +528,6 @@ group("gn_all") { - "//chrome/test:load_library_perf_tests", - "//chrome/test:sync_performance_tests", - "//chrome/test/chromedriver:chromedriver", -- "//courgette:courgette", -- "//courgette:courgette_fuzz", -- "//courgette:courgette_minimal_tool", -- "//courgette:courgette_unittests", - "//media/cast:generate_barcode_video", - "//media/cast:generate_timecode_audio", - "//net:crash_cache", -@@ -592,10 +586,6 @@ group("gn_all") { - "//mojo:mojo_perftests", - "//services/service_manager/public/cpp", - "//testing/gmock:gmock_main", -- "//third_party/breakpad:dump_syms($host_toolchain)", -- "//third_party/breakpad:microdump_stackwalk($host_toolchain)", -- "//third_party/breakpad:minidump_dump($host_toolchain)", -- "//third_party/breakpad:minidump_stackwalk($host_toolchain)", - ] - - if (!is_android) { -@@ -673,7 +663,7 @@ group("gn_all") { - host_os == "win") { - deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] - } -- } else if (!is_android && !is_ios && !is_fuchsia) { -+ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) { - deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] - } - -@@ -688,7 +678,7 @@ group("gn_all") { - } - } - -- if (is_mac || is_win || is_android || is_linux || is_chromeos) { -+ if (is_mac || is_win || is_android || (is_linux && !is_bsd) || is_chromeos) { - deps += [ - "//third_party/crashpad/crashpad:crashpad_tests", - "//third_party/crashpad/crashpad/handler:crashpad_handler", -@@ -803,7 +793,6 @@ group("gn_all") { - "//chrome/browser/vr:vr_common_perftests", - "//chrome/browser/vr:vr_common_unittests", - "//chrome/browser/vr:vr_pixeltests", -- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests", - ] - if (is_android) { - deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] -@@ -1102,7 +1091,7 @@ if (!is_ios) { - data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] - } - -- if (!is_win && !is_android) { -+ if (!is_win && !is_android && !is_bsd) { - data_deps += - [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] - } -@@ -1111,7 +1100,7 @@ if (!is_ios) { - data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] - } - -- if (is_linux || is_chromeos) { -+ if ((is_linux && !is_bsd) || is_chromeos) { - data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] - } - -@@ -1355,9 +1344,6 @@ group("chromium_builder_perf") { - - if (is_win) { - data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] -- } else { -- data_deps += -- [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] - } - if (is_win || is_android) { - data_deps += [ diff --git a/devel/electron13/files/patch-apps_app__restore__service__browsertest.cc b/devel/electron13/files/patch-apps_app__restore__service__browsertest.cc deleted file mode 100644 index 140956b9810e..000000000000 --- a/devel/electron13/files/patch-apps_app__restore__service__browsertest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/app_restore_service_browsertest.cc.orig 2021-01-07 00:36:17 UTC -+++ apps/app_restore_service_browsertest.cc -@@ -148,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc - } - - // Flaky: crbug.com/269613 --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) - #define MAYBE_FileAccessIsRestored DISABLED_FileAccessIsRestored - #else - #define MAYBE_FileAccessIsRestored FileAccessIsRestored diff --git a/devel/electron13/files/patch-apps_ui_views_app__window__frame__view.cc b/devel/electron13/files/patch-apps_ui_views_app__window__frame__view.cc deleted file mode 100644 index d473ad1320fd..000000000000 --- a/devel/electron13/files/patch-apps_ui_views_app__window__frame__view.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2021-04-14 01:08:35 UTC -+++ apps/ui/views/app_window_frame_view.cc -@@ -137,7 +137,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient - gfx::Rect window_bounds = client_bounds; - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS) - // Get the difference between the widget's client area bounds and window - // bounds, and grow |window_bounds| by that amount. - gfx::Insets native_frame_insets = diff --git a/devel/electron13/files/patch-ash_display_mirror__window__controller.cc b/devel/electron13/files/patch-ash_display_mirror__window__controller.cc deleted file mode 100644 index 637b11b17ef0..000000000000 --- a/devel/electron13/files/patch-ash_display_mirror__window__controller.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- ash/display/mirror_window_controller.cc.orig 2021-04-14 01:08:35 UTC -+++ ash/display/mirror_window_controller.cc -@@ -286,7 +286,11 @@ void MirrorWindowController::UpdateWindow( - return info.id() == iter->first; - }) == display_info_list.end()) { - CloseAndDeleteHost(iter->second, true); -+#if defined(__llvm__) -+ mirroring_host_info_map_.erase(iter++); -+#else - iter = mirroring_host_info_map_.erase(iter); -+#endif - } else { - ++iter; - } diff --git a/devel/electron13/files/patch-base_BUILD.gn b/devel/electron13/files/patch-base_BUILD.gn deleted file mode 100644 index fb0f14a7e635..000000000000 --- a/devel/electron13/files/patch-base_BUILD.gn +++ /dev/null @@ -1,94 +0,0 @@ ---- base/BUILD.gn.orig 2021-07-15 19:13:29 UTC -+++ base/BUILD.gn -@@ -963,7 +963,7 @@ component("base") { - "timer/hi_res_timer_manager_posix.cc", - ] - -- if (!is_nacl && !is_apple) { -+ if (!is_nacl && !is_apple && !is_bsd) { - sources += [ - "cpu_affinity_posix.cc", - "cpu_affinity_posix.h", -@@ -974,6 +974,11 @@ component("base") { - "profiler/thread_delegate_posix.h", - ] - } -+ if (is_bsd) { -+ sources += [ -+ "profiler/stack_sampler_posix.cc", -+ ] -+ } - } - - if (is_win) { -@@ -1377,7 +1382,7 @@ component("base") { - # building inside the cros_sdk environment - use host_toolchain as a - # more robust check for this. - if (!use_sysroot && -- (is_android || ((is_linux || is_chromeos) && !is_chromecast)) && -+ (is_android || ((is_linux || is_chromeos) && !is_chromecast) && !is_clang) && - host_toolchain != "//build/toolchain/cros:host") { - libs += [ "atomic" ] - } -@@ -1430,7 +1435,7 @@ component("base") { - "allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc", - ] - } -- if (is_chromeos || is_linux) { -+ if ((is_chromeos || is_linux) && !is_bsd) { - sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] - } - if (is_win) { -@@ -2064,6 +2069,34 @@ component("base") { - } - } - -+ if (is_bsd) { -+ sources -= [ -+ "files/file_path_watcher_linux.cc", -+ "files/file_util_linux.cc", -+ "process/memory_linux.cc", -+ "process/process_handle_linux.cc", -+ "process/process_iterator_linux.cc", -+ "process/process_metrics_linux.cc", -+ "system/sys_info_linux.cc" -+ ] -+ sources += [ -+ "files/file_path_watcher_freebsd.cc", -+ "files/file_path_watcher_kqueue.cc", -+ "files/file_path_watcher_kqueue.h", -+ "process/memory_stubs.cc", -+ "process/process_handle_freebsd.cc", -+ "process/process_iterator_freebsd.cc", -+ "process/process_metrics_freebsd.cc", -+ "system/sys_info_freebsd.cc", -+ ] -+ libs = [ -+ "execinfo", # logging.cc -+ "kvm", # process_metrics_freebsd -+ "util" # process_metrics_freebsd -+ ] -+ } -+ -+ - # iOS - if (is_ios) { - sources -= [ -@@ -3273,7 +3306,7 @@ if (build_base_unittests) { - } - } - -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ "debug/proc_maps_linux_unittest.cc" ] - } - -@@ -3313,7 +3346,7 @@ if (build_base_unittests) { - "posix/unix_domain_socket_unittest.cc", - "task/thread_pool/task_tracker_posix_unittest.cc", - ] -- if (!is_nacl && !is_apple) { -+ if (!is_nacl && !is_apple && !is_bsd) { - sources += [ - "cpu_affinity_posix_unittest.cc", - "profiler/stack_copier_signal_unittest.cc", diff --git a/devel/electron13/files/patch-base_allocator_allocator.gni b/devel/electron13/files/patch-base_allocator_allocator.gni deleted file mode 100644 index 469f23401d74..000000000000 --- a/devel/electron13/files/patch-base_allocator_allocator.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/allocator.gni.orig 2021-07-15 19:13:29 UTC -+++ base/allocator/allocator.gni -@@ -63,7 +63,7 @@ declare_args() { - # not, and redesign or remove the flag accordingly. We may want to assert a - # possible conflict between |use_allocator = "partition"| and - # |use_partition_alloc = true| rather than prioritizing use_partition_alloc. -- use_partition_alloc = !is_ios # Never use PartitionAlloc on iOS. -+ use_partition_alloc = !is_ios # Never use PartitionAlloc on iOS. - } - - if (!use_partition_alloc && use_allocator == "partition") { diff --git a/devel/electron13/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/devel/electron13/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc deleted file mode 100644 index a9146e4fa403..000000000000 --- a/devel/electron13/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc +++ /dev/null @@ -1,76 +0,0 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2021-01-07 00:36:18 UTC -+++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc -@@ -6,18 +6,28 @@ - #include "base/compiler_specific.h" - - #include <dlfcn.h> --#include <malloc.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <malloc_np.h> - - // This translation unit defines a default dispatch for the allocator shim which - // routes allocations to libc functions. --// The code here is strongly inspired from tcmalloc's libc_override_glibc.h. -+// The code here is strongly inspired from tcmalloc's override_glibc.h. - - extern "C" { --void* __libc_malloc(size_t size); --void* __libc_calloc(size_t n, size_t size); --void* __libc_realloc(void* address, size_t size); --void* __libc_memalign(size_t alignment, size_t size); --void __libc_free(void* ptr); -+void* __malloc(size_t size); -+void* __calloc(size_t n, size_t size); -+void* __realloc(void* address, size_t len); -+void* __memalign(size_t alignment, size_t size) { -+ void *ret; -+ if (__posix_memalign(&ret, alignment, size) != 0) { -+ return nullptr; -+ } else { -+ return ret; -+ } -+} -+int __posix_memalign(void **ptr, size_t alignment, size_t size); -+void __free(void* ptr); - } // extern "C" - - namespace { -@@ -25,32 +35,32 @@ namespace { - using base::allocator::AllocatorDispatch; - - void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) { -- return __libc_malloc(size); -+ return __malloc(size); - } - - void* GlibcCalloc(const AllocatorDispatch*, - size_t n, - size_t size, - void* context) { -- return __libc_calloc(n, size); -+ return __calloc(n, size); - } - - void* GlibcRealloc(const AllocatorDispatch*, - void* address, - size_t size, - void* context) { -- return __libc_realloc(address, size); -+ return __realloc(address, size); - } - - void* GlibcMemalign(const AllocatorDispatch*, - size_t alignment, - size_t size, - void* context) { -- return __libc_memalign(alignment, size); -+ return __memalign(alignment, size); - } - - void GlibcFree(const AllocatorDispatch*, void* address, void* context) { -- __libc_free(address); -+ __free(address); - } - - NO_SANITIZE("cfi-icall") diff --git a/devel/electron13/files/patch-base_allocator_allocator__shim__override__libc__symbols.h b/devel/electron13/files/patch-base_allocator_allocator__shim__override__libc__symbols.h deleted file mode 100644 index 6643e1d84494..000000000000 --- a/devel/electron13/files/patch-base_allocator_allocator__shim__override__libc__symbols.h +++ /dev/null @@ -1,13 +0,0 @@ ---- base/allocator/allocator_shim_override_libc_symbols.h.orig 2021-04-14 01:08:36 UTC -+++ base/allocator/allocator_shim_override_libc_symbols.h -@@ -16,6 +16,10 @@ - #include <malloc.h> - #endif - -+#if defined(OS_BSD) -+#include <stdlib.h> -+#endif -+ - #include "base/allocator/allocator_shim_internals.h" - - extern "C" { diff --git a/devel/electron13/files/patch-base_allocator_allocator__shim__unittest.cc b/devel/electron13/files/patch-base_allocator_allocator__shim__unittest.cc deleted file mode 100644 index ac994c5ac536..000000000000 --- a/devel/electron13/files/patch-base_allocator_allocator__shim__unittest.cc +++ /dev/null @@ -1,47 +0,0 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2021-04-14 01:08:36 UTC -+++ base/allocator/allocator_shim_unittest.cc -@@ -369,7 +369,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { - - #endif // !OS_WIN - --#if !defined(OS_WIN) && !defined(OS_APPLE) -+#if !defined(OS_WIN) && !defined(OS_APPLE) && !defined(OS_BSD) - void* memalign_ptr = memalign(128, 53); - ASSERT_NE(nullptr, memalign_ptr); - ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128); -@@ -385,7 +385,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { - ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u); - #endif // !defined(OS_ANDROID) - --#endif // !OS_WIN && !OS_APPLE -+#endif // !OS_WIN && !OS_APPLE && !OS_BSD - - // See allocator_shim_override_glibc_weak_symbols.h for why we intercept - // internal libc symbols. -@@ -412,7 +412,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { - free(zero_alloc_ptr); - ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u); - --#if !defined(OS_WIN) && !defined(OS_APPLE) -+#if !defined(OS_WIN) && !defined(OS_APPLE) && !defined(OS_BSD) - free(memalign_ptr); - ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u); - -@@ -421,7 +421,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { - ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u); - #endif // !defined(OS_ANDROID) - --#endif // !OS_WIN && !OS_APPLE -+#endif // !OS_WIN && !OS_APPLE && !OS_BSD - - #if !defined(OS_WIN) - free(posix_memalign_ptr); -@@ -614,7 +614,7 @@ static size_t GetUsableSize(void* ptr) { - static size_t GetUsableSize(void* ptr) { - return malloc_size(ptr); - } --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - static size_t GetUsableSize(void* ptr) { - return malloc_usable_size(ptr); - } diff --git a/devel/electron13/files/patch-base_allocator_partition__allocator_address__pool__manager.cc b/devel/electron13/files/patch-base_allocator_partition__allocator_address__pool__manager.cc deleted file mode 100644 index 404e346613c4..000000000000 --- a/devel/electron13/files/patch-base_allocator_partition__allocator_address__pool__manager.cc +++ /dev/null @@ -1,31 +0,0 @@ ---- base/allocator/partition_allocator/address_pool_manager.cc.orig 2021-04-14 01:08:36 UTC -+++ base/allocator/partition_allocator/address_pool_manager.cc -@@ -8,6 +8,13 @@ - #include <sys/mman.h> - #endif - -+#if defined(OS_FREEBSD) -+#include <sys/mman.h> -+#include <fcntl.h> -+ -+#include "base/posix/eintr_wrapper.h" -+#endif -+ - #include <algorithm> - #include <limits> - -@@ -50,6 +57,14 @@ void DecommitPages(void* address, size_t size) { - void* ptr = mmap(address, size, PROT_NONE, - MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); - PA_CHECK(ptr == address); -+#elif defined(OS_FREEBSD) -+ int fd = HANDLE_EINTR(open("/dev/zero", O_RDONLY)); -+ PA_CHECK(fd != -1); -+ -+ void *ptr = mmap(address, size, PROT_NONE, -+ MAP_FIXED | MAP_PRIVATE, fd, 0); -+ PA_PCHECK(ptr == address); -+ HANDLE_EINTR(close(fd)); - #else - DecommitSystemPages(address, size, PageUpdatePermissions); - #endif diff --git a/devel/electron13/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/devel/electron13/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h deleted file mode 100644 index 597ff4c22fed..000000000000 --- a/devel/electron13/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ /dev/null @@ -1,58 +0,0 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-07-15 19:13:29 UTC -+++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -28,12 +28,16 @@ - #if defined(OS_ANDROID) - #include <sys/prctl.h> - #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #include <sys/resource.h> - - #include <algorithm> - #endif - -+#if defined(OS_FREEBSD) -+#include <fcntl.h> -+#endif -+ - #include "base/allocator/partition_allocator/page_allocator.h" - - #ifndef MAP_ANONYMOUS -@@ -153,12 +157,19 @@ void* SystemAllocPagesInternal(void* hint, - PA_DCHECK(PageTag::kFirst <= page_tag); - PA_DCHECK(PageTag::kLast >= page_tag); - int fd = VM_MAKE_TAG(static_cast<int>(page_tag)); -+#elif defined(OS_FREEBSD) -+ int fd = HANDLE_EINTR(open("/dev/zero", O_RDWR | O_CLOEXEC)); -+ PA_PCHECK(fd != -1); - #else - int fd = -1; - #endif - - int access_flag = GetAccessFlags(accessibility); -+#if defined(OS_FREEBSD) -+ int map_flags = MAP_PRIVATE; -+#else - int map_flags = MAP_ANONYMOUS | MAP_PRIVATE; -+#endif - - #if defined(OS_APPLE) - // On macOS 10.14 and higher, executables that are code signed with the -@@ -185,6 +196,8 @@ void* SystemAllocPagesInternal(void* hint, - prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, ret, length, - PageTagToName(page_tag)); - } -+#elif defined(OS_FREEBSD) -+ HANDLE_EINTR(close(fd)); - #endif - - return ret; -@@ -317,6 +330,8 @@ void DiscardSystemPagesInternal(void* address, size_t - ret = madvise(address, length, MADV_DONTNEED); - } - PA_PCHECK(ret == 0); -+#elif defined(OS_FREEBSD) -+ PA_PCHECK(0 == madvise(address, length, MADV_FREE)); - #else - // We have experimented with other flags, but with suboptimal results. - // diff --git a/devel/electron13/files/patch-base_allocator_partition__allocator_partition__alloc.cc b/devel/electron13/files/patch-base_allocator_partition__allocator_partition__alloc.cc deleted file mode 100644 index 502e3f0b00e3..000000000000 --- a/devel/electron13/files/patch-base_allocator_partition__allocator_partition__alloc.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-04-14 01:08:36 UTC -+++ base/allocator/partition_allocator/partition_alloc.cc -@@ -56,7 +56,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me - "maximum direct mapped allocation"); - - // Check that some of our zanier calculations worked out as expected. -+#if defined(__i386__) && defined(OS_FREEBSD) -+ // alignof(std::max_align_t) is only 4 on FreeBSD/i386 -+ static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket"); -+#else - static_assert(kSmallestBucket == kAlignment, "generic smallest bucket"); -+#endif - static_assert(kMaxBucketed == 983040, "generic max bucketed"); - STATIC_ASSERT_OR_PA_CHECK( - MaxSystemPagesPerSlotSpan() < (1 << 8), diff --git a/devel/electron13/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/devel/electron13/files/patch-base_allocator_partition__allocator_partition__alloc__config.h deleted file mode 100644 index 09c49a40af25..000000000000 --- a/devel/electron13/files/patch-base_allocator_partition__allocator_partition__alloc__config.h +++ /dev/null @@ -1,17 +0,0 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2021-07-15 19:13:29 UTC -+++ base/allocator/partition_allocator/partition_alloc_config.h -@@ -34,9 +34,13 @@ static_assert(sizeof(void*) != 8, ""); - #define PA_HAS_LINUX_KERNEL - #endif - -+#if defined(OS_FREEBSD) -+#define PA_HAS_FREEBSD_KERNEL -+#endif -+ - // SpinningMutex uses either futex(2) on Linux, or a fast userspace "try" - // operation, which is available on Windows. --#if defined(PA_HAS_LINUX_KERNEL) || defined(OS_WIN) -+#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) || defined(OS_WIN) - #define PA_HAS_SPINNING_MUTEX - #endif - diff --git a/devel/electron13/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc b/devel/electron13/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc deleted file mode 100644 index 2921ddc927a7..000000000000 --- a/devel/electron13/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-11-13 11:05:57 UTC -+++ base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -1659,7 +1659,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) { - // cause flake. - #if !defined(OS_WIN) && \ - (!defined(ARCH_CPU_64_BITS) || \ -- (defined(OS_POSIX) && !(defined(OS_APPLE) || defined(OS_ANDROID)))) -+ (defined(OS_POSIX) && !(defined(OS_APPLE) || defined(OS_ANDROID) || defined(OS_BSD)))) - - // The following four tests wrap a called function in an expect death statement - // to perform their test, because they are non-hermetic. Specifically they are -@@ -1710,7 +1710,7 @@ TEST_F(PartitionAllocDeathTest, DISABLED_RepeatedTryRe - } - - #endif // !defined(ARCH_CPU_64_BITS) || (defined(OS_POSIX) && -- // !(defined(OS_APPLE) || defined(OS_ANDROID))) -+ // !(defined(OS_APPLE) || defined(OS_ANDROID) || defined(OS_BSD))) - - // Make sure that malloc(-1) dies. - // In the past, we had an integer overflow that would alias malloc(-1) to diff --git a/devel/electron13/files/patch-base_allocator_partition__allocator_partition__root.cc b/devel/electron13/files/patch-base_allocator_partition__allocator_partition__root.cc deleted file mode 100644 index 6f259fe0bdba..000000000000 --- a/devel/electron13/files/patch-base_allocator_partition__allocator_partition__root.cc +++ /dev/null @@ -1,47 +0,0 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2021-07-15 19:13:29 UTC -+++ base/allocator/partition_allocator/partition_root.cc -@@ -22,7 +22,7 @@ - #include "wow64apiset.h" - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include <pthread.h> - #endif - -@@ -36,7 +36,7 @@ namespace { - - #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - - // NO_THREAD_SAFETY_ANALYSIS: acquires the lock and doesn't release it, by - // design. -@@ -89,7 +89,7 @@ void AfterForkInChild() { - internal::ThreadCacheRegistry::Instance() - .ForcePurgeAllThreadAfterForkUnsafe(); - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - std::atomic<bool> g_global_init_called; - void PartitionAllocMallocInitOnce() { -@@ -99,7 +99,7 @@ void PartitionAllocMallocInitOnce() { - if (!g_global_init_called.compare_exchange_strong(expected, true)) - return; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // When fork() is called, only the current thread continues to execute in the - // child process. If the lock is held, but *not* by this thread when fork() is - // called, we have a deadlock. -@@ -124,7 +124,7 @@ void PartitionAllocMallocInitOnce() { - int err = - pthread_atfork(BeforeForkInParent, AfterForkInParent, AfterForkInChild); - PA_CHECK(err == 0); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - } - #endif // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) - diff --git a/devel/electron13/files/patch-base_allocator_partition__allocator_spinning__mutex.cc b/devel/electron13/files/patch-base_allocator_partition__allocator_spinning__mutex.cc deleted file mode 100644 index 4dc4831a8cf0..000000000000 --- a/devel/electron13/files/patch-base_allocator_partition__allocator_spinning__mutex.cc +++ /dev/null @@ -1,49 +0,0 @@ ---- base/allocator/partition_allocator/spinning_mutex.cc.orig 2021-04-14 01:08:36 UTC -+++ base/allocator/partition_allocator/spinning_mutex.cc -@@ -16,9 +16,16 @@ - #include <unistd.h> - #endif // defined(PA_HAS_LINUX_KERNEL) - -+#if defined(PA_HAS_FREEBSD_KERNEL) -+#include <errno.h> -+#include <sys/types.h> -+#include <sys/thr.h> -+#include <sys/umtx.h> -+#endif // defined(PA_HAS_FREEBSD_KERNEL) -+ - namespace base { - namespace internal { --#if defined(PA_HAS_LINUX_KERNEL) -+#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) - - void SpinningMutex::FutexWait() { - // Save and restore errno. -@@ -42,8 +49,13 @@ void SpinningMutex::FutexWait() { - // |kLockedContended| anymore. Note that even without spurious wakeups, the - // value of |state_| is not guaranteed when this returns, as another thread - // may get the lock before we get to run. -+#if defined(PA_HAS_LINUX_KERNEL) - int err = syscall(SYS_futex, &state_, FUTEX_WAIT | FUTEX_PRIVATE_FLAG, - kLockedContended, nullptr, nullptr, 0); -+#elif defined(PA_HAS_FREEBSD_KERNEL) -+ int err = _umtx_op(&state_, UMTX_OP_WAIT_UINT_PRIVATE, -+ kLockedContended, nullptr, nullptr); -+#endif - - if (err) { - // These are programming error, check them. -@@ -55,8 +67,14 @@ void SpinningMutex::FutexWait() { - - void SpinningMutex::FutexWake() { - int saved_errno = errno; -+#if defined(PA_HAS_LINUX_KERNEL) - long retval = syscall(SYS_futex, &state_, FUTEX_WAKE | FUTEX_PRIVATE_FLAG, - 1 /* wake up a single waiter */, nullptr, nullptr, 0); -+#elif defined(PA_HAS_FREEBSD_KERNEL) -+ long retval = _umtx_op(&state_, UMTX_OP_WAKE_PRIVATE, -+ 1 /* wake up a single waiter */, nullptr, nullptr); -+#endif -+ - PA_CHECK(retval != -1); - errno = saved_errno; - } diff --git a/devel/electron13/files/patch-base_allocator_partition__allocator_spinning__mutex.h b/devel/electron13/files/patch-base_allocator_partition__allocator_spinning__mutex.h deleted file mode 100644 index 97972af0baac..000000000000 --- a/devel/electron13/files/patch-base_allocator_partition__allocator_spinning__mutex.h +++ /dev/null @@ -1,20 +0,0 @@ ---- base/allocator/partition_allocator/spinning_mutex.h.orig 2021-07-15 19:13:29 UTC -+++ base/allocator/partition_allocator/spinning_mutex.h -@@ -59,7 +59,7 @@ class LOCKABLE BASE_EXPORT SpinningMutex { - // as the slow path has better characteristics than SpinLocks's. - static constexpr int kSpinCount = 1000; - --#if defined(PA_HAS_LINUX_KERNEL) -+#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) - void FutexWait(); - void FutexWake(); - -@@ -104,7 +104,7 @@ ALWAYS_INLINE void SpinningMutex::Acquire() { - - inline constexpr SpinningMutex::SpinningMutex() = default; - --#if defined(PA_HAS_LINUX_KERNEL) -+#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) - - ALWAYS_INLINE bool SpinningMutex::Try() { - // Using the weak variant of compare_exchange(), which may fail spuriously. On diff --git a/devel/electron13/files/patch-base_allocator_partition__allocator_starscan_pcscan.cc b/devel/electron13/files/patch-base_allocator_partition__allocator_starscan_pcscan.cc deleted file mode 100644 index 27ca464e7f3b..000000000000 --- a/devel/electron13/files/patch-base_allocator_partition__allocator_starscan_pcscan.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/starscan/pcscan.cc.orig 2021-07-15 19:13:29 UTC -+++ base/allocator/partition_allocator/starscan/pcscan.cc -@@ -67,7 +67,7 @@ namespace internal { - - namespace { - --#if DCHECK_IS_ON() && defined(OS_LINUX) -+#if DCHECK_IS_ON() && (defined(OS_LINUX) || defined(OS_BSD)) - // Currently, check reentracy only on Linux. On Android TLS is emulated by the - // runtime lib, which can allocate and therefore cause reentrancy. - struct ReentrantScannerGuard final { diff --git a/devel/electron13/files/patch-base_base__switches.cc b/devel/electron13/files/patch-base_base__switches.cc deleted file mode 100644 index 74078a7b158a..000000000000 --- a/devel/electron13/files/patch-base_base__switches.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- base/base_switches.cc.orig 2021-07-15 19:13:29 UTC -+++ base/base_switches.cc -@@ -125,8 +125,8 @@ const char kDisableUsbKeyboardDetect[] = "disable - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -- !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_BSD) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -+ !BUILDFLAG(IS_CHROMEOS_LACROS)) - // The /dev/shm partition is too small in certain VM environments, causing - // Chrome to fail or crash (see http://crbug.com/715363). Use this flag to - // work-around this issue (a temporary directory will always be used to create -@@ -161,7 +161,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria - - #endif - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Controls whether or not retired instruction counts are surfaced for threads - // in trace events on Linux. - // diff --git a/devel/electron13/files/patch-base_base__switches.h b/devel/electron13/files/patch-base_base__switches.h deleted file mode 100644 index 2ba41d300080..000000000000 --- a/devel/electron13/files/patch-base_base__switches.h +++ /dev/null @@ -1,22 +0,0 @@ ---- base/base_switches.h.orig 2021-07-15 19:13:29 UTC -+++ base/base_switches.h -@@ -42,8 +42,8 @@ extern const char kDisableUsbKeyboardDetect[]; - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -- !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_BSD) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -+ !BUILDFLAG(IS_CHROMEOS_LACROS)) - extern const char kDisableDevShmUsage[]; - #endif - -@@ -59,7 +59,7 @@ extern const char kEnableIdleTracing[]; - extern const char kForceFieldTrialParams[]; - #endif - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - extern const char kEnableThreadInstructionCount[]; - - // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when diff --git a/devel/electron13/files/patch-base_check.h b/devel/electron13/files/patch-base_check.h deleted file mode 100644 index 8fa51062015d..000000000000 --- a/devel/electron13/files/patch-base_check.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/check.h.orig 2021-07-15 19:13:29 UTC -+++ base/check.h -@@ -85,7 +85,7 @@ class BASE_EXPORT CheckError { - // Stream for adding optional details to the error message. - std::ostream& stream(); - -- NOMERGE ~CheckError(); -+ ~CheckError(); - - CheckError(const CheckError& other) = delete; - CheckError& operator=(const CheckError& other) = delete; diff --git a/devel/electron13/files/patch-base_cpu.cc b/devel/electron13/files/patch-base_cpu.cc deleted file mode 100644 index 4d791960f88a..000000000000 --- a/devel/electron13/files/patch-base_cpu.cc +++ /dev/null @@ -1,35 +0,0 @@ ---- base/cpu.cc.orig 2021-07-15 19:13:29 UTC -+++ base/cpu.cc -@@ -16,7 +16,7 @@ - - #include "base/stl_util.h" - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ - defined(OS_AIX) - #include "base/containers/flat_set.h" - #include "base/files/file_util.h" -@@ -214,6 +214,14 @@ const ProcCpuInfo& ParseProcCpu() { - - return *info; - } -+#elif defined(OS_BSD) -+std::string* CpuInfoBrand() { -+ static std::string* brand = []() { -+ return new std::string(SysInfo::CPUModelName()); -+ }(); -+ -+ return brand; -+} - #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || - // defined(OS_LINUX) || defined(OS_CHROMEOS)) - -@@ -352,6 +360,8 @@ void CPU::Initialize(bool require_branding) { - has_bti_ = hwcap2 & HWCAP2_BTI; - #endif - -+#elif defined(OS_BSD) -+ cpu_brand_ = *CpuInfoBrand(); - #elif defined(OS_WIN) - // Windows makes high-resolution thread timing information available in - // user-space. diff --git a/devel/electron13/files/patch-base_cpu.h b/devel/electron13/files/patch-base_cpu.h deleted file mode 100644 index 6d51adca7bce..000000000000 --- a/devel/electron13/files/patch-base_cpu.h +++ /dev/null @@ -1,20 +0,0 @@ ---- base/cpu.h.orig 2021-07-15 19:13:29 UTC -+++ base/cpu.h -@@ -92,7 +92,7 @@ class BASE_EXPORT CPU final { - IntelMicroArchitecture GetIntelMicroArchitecture() const; - const std::string& cpu_brand() const { return cpu_brand_; } - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ - defined(OS_AIX) - enum class CoreType { - kUnknown = 0, -@@ -143,7 +143,7 @@ class BASE_EXPORT CPU final { - // cpuidle driver. - using CoreIdleTimes = std::vector<TimeDelta>; - static bool GetCumulativeCoreIdleTimes(CoreIdleTimes&); --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - // defined(OS_AIX) - - private: diff --git a/devel/electron13/files/patch-base_debug_debugger__posix.cc b/devel/electron13/files/patch-base_debug_debugger__posix.cc deleted file mode 100644 index f11b632af603..000000000000 --- a/devel/electron13/files/patch-base_debug_debugger__posix.cc +++ /dev/null @@ -1,56 +0,0 @@ ---- base/debug/debugger_posix.cc.orig 2021-01-07 00:36:18 UTC -+++ base/debug/debugger_posix.cc -@@ -98,7 +98,7 @@ bool BeingDebugged() { - KERN_PROC, - KERN_PROC_PID, - getpid() --#if defined(OS_OPENBSD) -+#if defined(OS_BSD) - , sizeof(struct kinfo_proc), - 0 - #endif -@@ -106,33 +106,35 @@ bool BeingDebugged() { - - // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and - // binary interfaces may change. -- struct kinfo_proc info; -- size_t info_size = sizeof(info); -+ struct kinfo_proc *info; -+ size_t info_size; - --#if defined(OS_OPENBSD) - if (sysctl(mib, base::size(mib), NULL, &info_size, NULL, 0) < 0) - return -1; - -+ info = (struct kinfo_proc *)malloc(info_size); - mib[5] = (info_size / sizeof(struct kinfo_proc)); --#endif - -- int sysctl_result = sysctl(mib, base::size(mib), &info, &info_size, NULL, 0); -+ int sysctl_result = sysctl(mib, base::size(mib), info, &info_size, NULL, 0); - DCHECK_EQ(sysctl_result, 0); - if (sysctl_result != 0) { - is_set = true; - being_debugged = false; -- return being_debugged; -+ goto out; - } - - // This process is being debugged if the P_TRACED flag is set. - is_set = true; - #if defined(OS_FREEBSD) -- being_debugged = (info.ki_flag & P_TRACED) != 0; -+ being_debugged = (info->ki_flag & P_TRACED) != 0; - #elif defined(OS_BSD) -- being_debugged = (info.p_flag & P_TRACED) != 0; -+ being_debugged = (info->p_flag & P_TRACED) != 0; - #else -- being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; -+ being_debugged = (info->kp_proc.p_flag & P_TRACED) != 0; - #endif -+ -+out: -+ free(info); - return being_debugged; - } - diff --git a/devel/electron13/files/patch-base_debug_elf__reader.cc b/devel/electron13/files/patch-base_debug_elf__reader.cc deleted file mode 100644 index beff29651e45..000000000000 --- a/devel/electron13/files/patch-base_debug_elf__reader.cc +++ /dev/null @@ -1,28 +0,0 @@ ---- base/debug/elf_reader.cc.orig 2021-07-15 19:13:29 UTC -+++ base/debug/elf_reader.cc -@@ -38,7 +38,9 @@ using Nhdr = Elf64_Nhdr; - using Word = Elf64_Word; - #endif - -+#if !defined(OS_BSD) - constexpr char kGnuNoteName[] = "GNU"; -+#endif - - // Returns a pointer to the header of the ELF binary mapped into memory, or a - // null pointer if the header is invalid. Here and below |elf_mapped_base| is a -@@ -75,6 +77,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, - bool found = false; - while (current_section < section_end) { - current_note = reinterpret_cast<const Nhdr*>(current_section); -+#if !defined(OS_BSD) - if (current_note->n_type == NT_GNU_BUILD_ID) { - StringPiece note_name(current_section + sizeof(Nhdr), - current_note->n_namesz); -@@ -84,6 +87,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, - break; - } - } -+#endif - - size_t section_size = bits::AlignUp(current_note->n_namesz, 4) + - bits::AlignUp(current_note->n_descsz, 4) + diff --git a/devel/electron13/files/patch-base_debug_proc__maps__linux.cc b/devel/electron13/files/patch-base_debug_proc__maps__linux.cc deleted file mode 100644 index 67a023f2e5af..000000000000 --- a/devel/electron13/files/patch-base_debug_proc__maps__linux.cc +++ /dev/null @@ -1,141 +0,0 @@ ---- base/debug/proc_maps_linux.cc.orig 2021-04-14 01:08:36 UTC -+++ base/debug/proc_maps_linux.cc -@@ -13,13 +13,18 @@ - #include "base/strings/string_split.h" - #include "build/build_config.h" - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - #include <inttypes.h> - #endif - - namespace base { - namespace debug { - -+#if defined(OS_BSD) -+const char kProcSelfMapsPath[] = "/proc/curproc/map"; -+#else -+const char kProcSelfMapsPath[] = "/proc/self/maps"; -+ - // Scans |proc_maps| starting from |pos| returning true if the gate VMA was - // found, otherwise returns false. - static bool ContainsGateVMA(std::string* proc_maps, size_t pos) { -@@ -35,15 +40,16 @@ static bool ContainsGateVMA(std::string* proc_maps, si - return false; - #endif - } -+#endif - - bool ReadProcMaps(std::string* proc_maps) { - // seq_file only writes out a page-sized amount on each call. Refer to header - // file for details. - const long kReadSize = sysconf(_SC_PAGESIZE); - -- base::ScopedFD fd(HANDLE_EINTR(open("/proc/self/maps", O_RDONLY))); -+ base::ScopedFD fd(HANDLE_EINTR(open(kProcSelfMapsPath, O_RDONLY))); - if (!fd.is_valid()) { -- DPLOG(ERROR) << "Couldn't open /proc/self/maps"; -+ DPLOG(ERROR) << "Couldn't open " << kProcSelfMapsPath; - return false; - } - proc_maps->clear(); -@@ -57,7 +63,7 @@ bool ReadProcMaps(std::string* proc_maps) { - - ssize_t bytes_read = HANDLE_EINTR(read(fd.get(), buffer, kReadSize)); - if (bytes_read < 0) { -- DPLOG(ERROR) << "Couldn't read /proc/self/maps"; -+ DPLOG(ERROR) << "Couldn't read " << kProcSelfMapsPath; - proc_maps->clear(); - return false; - } -@@ -68,6 +74,7 @@ bool ReadProcMaps(std::string* proc_maps) { - if (bytes_read == 0) - break; - -+#if !defined(OS_BSD) - // The gate VMA is handled as a special case after seq_file has finished - // iterating through all entries in the virtual memory table. - // -@@ -78,6 +85,7 @@ bool ReadProcMaps(std::string* proc_maps) { - // Avoid this by searching for the gate VMA and breaking early. - if (ContainsGateVMA(proc_maps, pos)) - break; -+#endif - } - - return true; -@@ -105,11 +113,32 @@ bool ParseProcMaps(const std::string& input, - - MappedMemoryRegion region; - const char* line = lines[i].c_str(); -- char permissions[5] = {'\0'}; // Ensure NUL-terminated string. -+ char permissions[6] = {'\0'}; // Ensure NUL-terminated string. -+ int path_index = 0; -+ -+#if defined(OS_BSD) -+ if (lines[i].empty()) -+ continue; -+ -+ char cow; -+ -+ // Format: -+ // -+ // start end resident private_resident obj perms ref_count shadow_count flags cow needs_copy type fullpath cred ruid -+ // 0x200000 0x202000 2 6 0xfffff80005be9000 r-- 3 1 0x1000 COW NC vnode /bin/cat NCH -1 -+ // -+ if (sscanf(line, "%" SCNxPTR " %" SCNxPTR " %*ld %*ld %*[^ ] %5[^ ] %*d %*d %*x %c%*s %*s %*s %n", -+ ®ion.start, ®ion.end, permissions, &cow, &path_index) < 4) { -+ DPLOG(WARNING) << "sscanf failed for line: " << line; -+ return false; -+ } -+ -+ const char* fullpath = line + path_index; -+ const char* cred = strchr(fullpath, ' '); -+#else - uint8_t dev_major = 0; - uint8_t dev_minor = 0; - long inode = 0; -- int path_index = 0; - - // Sample format from man 5 proc: - // -@@ -125,6 +154,7 @@ bool ParseProcMaps(const std::string& input, - DPLOG(WARNING) << "sscanf failed for line: " << line; - return false; - } -+#endif - - region.permissions = 0; - -@@ -143,14 +173,31 @@ bool ParseProcMaps(const std::string& input, - else if (permissions[2] != '-') - return false; - -+#if defined(OS_BSD) -+ if (cow == 'C') { -+ region.permissions |= MappedMemoryRegion::PRIVATE; -+ } else if (cow != 'N') { -+ DPLOG(WARNING) << "unknown value for COW in line " << line << ": " << cow; -+ return false; -+ } -+#else - if (permissions[3] == 'p') - region.permissions |= MappedMemoryRegion::PRIVATE; - else if (permissions[3] != 's' && permissions[3] != 'S') // Shared memory. - return false; -+#endif - - // Pushing then assigning saves us a string copy. - regions.push_back(region); -+#if defined(OS_BSD) -+ if (cred != nullptr) { -+ regions.back().path.assign(line + path_index, cred - fullpath); -+ } else { -+ regions.back().path.assign(line + path_index); -+ } -+#else - regions.back().path.assign(line + path_index); -+#endif - } - - regions_out->swap(regions); diff --git a/devel/electron13/files/patch-base_debug_stack__trace.cc b/devel/electron13/files/patch-base_debug_stack__trace.cc deleted file mode 100644 index b07d3f6b2a52..000000000000 --- a/devel/electron13/files/patch-base_debug_stack__trace.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/debug/stack_trace.cc.orig 2021-01-07 00:36:18 UTC -+++ base/debug/stack_trace.cc -@@ -15,7 +15,7 @@ - - #if BUILDFLAG(CAN_UNWIND_WITH_FRAME_POINTERS) - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - #include <pthread.h> - #include "base/process/process_handle.h" - #include "base/threading/platform_thread.h" diff --git a/devel/electron13/files/patch-base_debug_stack__trace.h b/devel/electron13/files/patch-base_debug_stack__trace.h deleted file mode 100644 index dab645bd1f21..000000000000 --- a/devel/electron13/files/patch-base_debug_stack__trace.h +++ /dev/null @@ -1,10 +0,0 @@ ---- base/debug/stack_trace.h.orig 2021-01-07 00:36:18 UTC -+++ base/debug/stack_trace.h -@@ -19,6 +19,7 @@ - #if !defined(OS_NACL) - #include <signal.h> - #endif -+#include <sys/stdint.h> - #include <unistd.h> - #endif - diff --git a/devel/electron13/files/patch-base_debug_stack__trace__posix.cc b/devel/electron13/files/patch-base_debug_stack__trace__posix.cc deleted file mode 100644 index 7ff121c882b3..000000000000 --- a/devel/electron13/files/patch-base_debug_stack__trace__posix.cc +++ /dev/null @@ -1,45 +0,0 @@ ---- base/debug/stack_trace_posix.cc.orig 2021-04-14 01:08:36 UTC -+++ base/debug/stack_trace_posix.cc -@@ -35,7 +35,7 @@ - #include <AvailabilityMacros.h> - #endif - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #include "base/debug/proc_maps_linux.h" - #endif - -@@ -659,13 +659,21 @@ class SandboxSymbolizeHelper { - // Reads /proc/self/maps. - std::string contents; - if (!ReadProcMaps(&contents)) { -+#if defined(OS_BSD) -+ LOG(ERROR) << "Failed to read /proc/curproc/map"; -+#else - LOG(ERROR) << "Failed to read /proc/self/maps"; -+#endif - return false; - } - - // Parses /proc/self/maps. - if (!ParseProcMaps(contents, ®ions_)) { -+#if defined(OS_BSD) -+ LOG(ERROR) << "Failed to parse the contents of /proc/curproc/map"; -+#else - LOG(ERROR) << "Failed to parse the contents of /proc/self/maps"; -+#endif - return false; - } - -@@ -696,7 +704,11 @@ class SandboxSymbolizeHelper { - // Skip regions with empty file names. - continue; - } -+#if defined(OS_BSD) -+ if (region.path[0] == '-') { -+#else - if (region.path[0] == '[') { -+#endif - // Skip pseudo-paths, like [stack], [vdso], [heap], etc ... - continue; - } diff --git a/devel/electron13/files/patch-base_debug_stack__trace__unittest.cc b/devel/electron13/files/patch-base_debug_stack__trace__unittest.cc deleted file mode 100644 index 74aa2e122db1..000000000000 --- a/devel/electron13/files/patch-base_debug_stack__trace__unittest.cc +++ /dev/null @@ -1,40 +0,0 @@ ---- base/debug/stack_trace_unittest.cc.orig 2021-04-14 01:08:36 UTC -+++ base/debug/stack_trace_unittest.cc -@@ -88,6 +88,7 @@ TEST_F(StackTraceTest, OutputToStream) { - std::string::npos) - << "Unable to resolve symbols."; - -+#if !defined(OS_BSD) - // Expect a demangled symbol. - // Note that Windows Release builds omit the function parameters from the - // demangled stack output, otherwise this could be "testing::UnitTest::Run()". -@@ -106,9 +107,10 @@ TEST_F(StackTraceTest, OutputToStream) { - EXPECT_TRUE(backtrace_message.find(__func__) != std::string::npos) - << "Expected to find " << __func__ << " in backtrace:\n" - << backtrace_message; -+#endif - } - --#if !defined(OFFICIAL_BUILD) && !defined(NO_UNWIND_TABLES) -+#if !defined(OFFICIAL_BUILD) && !defined(NO_UNWIND_TABLES) && !defined(OS_BSD) - // Disabled in Official builds, where Link-Time Optimization can result in two - // or fewer stack frames being available, causing the test to fail. - TEST_F(StackTraceTest, TruncatedTrace) { -@@ -122,7 +124,7 @@ TEST_F(StackTraceTest, TruncatedTrace) { - truncated.Addresses(&count); - EXPECT_EQ(2u, count); - } --#endif // !defined(OFFICIAL_BUILD) && !defined(NO_UNWIND_TABLES) -+#endif // !defined(OFFICIAL_BUILD) && !defined(NO_UNWIND_TABLES) && !defined(OS_BSD) - - // The test is used for manual testing, e.g., to see the raw output. - TEST_F(StackTraceTest, DebugOutputToStream) { -@@ -361,7 +363,7 @@ TEST_F(StackTraceTest, MAYBE_TraceStackFramePointers) - // sometimes we read fp / pc from the place that previously held - // uninitialized value. - // TODO(crbug.com/1132511): Enable this test on Fuchsia. --#if defined(MEMORY_SANITIZER) || defined(OS_FUCHSIA) -+#if defined(MEMORY_SANITIZER) || defined(OS_FUCHSIA) || defined(OS_BSD) - #define MAYBE_TraceStackFramePointersFromBuffer \ - DISABLED_TraceStackFramePointersFromBuffer - #else diff --git a/devel/electron13/files/patch-base_files_file__path__unittest.cc b/devel/electron13/files/patch-base_files_file__path__unittest.cc deleted file mode 100644 index 5e0addc47adc..000000000000 --- a/devel/electron13/files/patch-base_files_file__path__unittest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/files/file_path_unittest.cc.orig 2021-07-15 19:13:29 UTC -+++ base/files/file_path_unittest.cc -@@ -1179,7 +1179,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) - "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, - }; - --#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) -+#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) - ScopedLocale locale("en_US.UTF-8"); - #endif - diff --git a/devel/electron13/files/patch-base_files_file__path__watcher__freebsd.cc b/devel/electron13/files/patch-base_files_file__path__watcher__freebsd.cc deleted file mode 100644 index 439dd5ab3191..000000000000 --- a/devel/electron13/files/patch-base_files_file__path__watcher__freebsd.cc +++ /dev/null @@ -1,64 +0,0 @@ ---- base/files/file_path_watcher_freebsd.cc.orig 2021-04-22 07:53:22 UTC -+++ base/files/file_path_watcher_freebsd.cc -@@ -0,0 +1,61 @@ -+// Copyright (c) 2012 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. -+ -+// This file exists for Unix systems which don't have the inotify headers, and -+// thus cannot build file_watcher_inotify.cc -+ -+#include <memory> -+ -+#include "base/files/file_path_watcher.h" -+#include "base/files/file_path_watcher_kqueue.h" -+ -+#include "base/memory/ptr_util.h" -+#include "build/build_config.h" -+ -+namespace base { -+ -+namespace { -+ -+class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate { -+ public: -+ FilePathWatcherImpl() = default; -+ FilePathWatcherImpl(const FilePathWatcherImpl&) = delete; -+ FilePathWatcherImpl& operator=(const FilePathWatcherImpl&) = delete; -+ ~FilePathWatcherImpl() override = default; -+ -+ bool Watch(const FilePath& path, -+ Type type, -+ const FilePathWatcher::Callback& callback) override { -+ DCHECK(!impl_.get()); -+ -+ if (type == Type::kRecursive) { -+ return false; -+ } else { -+ impl_ = std::make_unique<FilePathWatcherKQueue>(); -+ } -+ -+ DCHECK(impl_.get()); -+ -+ return impl_->Watch(path, type, callback); -+ } -+ -+ void Cancel() override { -+ if (impl_.get()) -+ impl_->Cancel(); -+ -+ set_cancelled(); -+ } -+ -+ private: -+ std::unique_ptr<PlatformDelegate> impl_; -+}; -+ -+} // namespace -+ -+FilePathWatcher::FilePathWatcher() { -+ sequence_checker_.DetachFromSequence(); -+ impl_ = std::make_unique<FilePathWatcherImpl>(); -+} -+ -+} // namespace base diff --git a/devel/electron13/files/patch-base_files_file__path__watcher__kqueue.h b/devel/electron13/files/patch-base_files_file__path__watcher__kqueue.h deleted file mode 100644 index b8fb6918f2b4..000000000000 --- a/devel/electron13/files/patch-base_files_file__path__watcher__kqueue.h +++ /dev/null @@ -1,13 +0,0 @@ ---- base/files/file_path_watcher_kqueue.h.orig 2021-01-07 00:36:18 UTC -+++ base/files/file_path_watcher_kqueue.h -@@ -5,6 +5,10 @@ - #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ - #define BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ - -+#ifdef __FreeBSD__ -+#include <sys/stdint.h> -+#include <sys/types.h> -+#endif - #include <sys/event.h> - - #include <memory> diff --git a/devel/electron13/files/patch-base_files_file__path__watcher__unittest.cc b/devel/electron13/files/patch-base_files_file__path__watcher__unittest.cc deleted file mode 100644 index 7d57324c7396..000000000000 --- a/devel/electron13/files/patch-base_files_file__path__watcher__unittest.cc +++ /dev/null @@ -1,56 +0,0 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2021-07-15 19:13:29 UTC -+++ base/files/file_path_watcher_unittest.cc -@@ -452,12 +452,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { - VLOG(1) << "Waiting for file1 creation"; - ASSERT_TRUE(WaitForEvents()); - --#if !defined(OS_APPLE) -+#if !defined(OS_APPLE) && !defined(OS_BSD) - // Mac implementation does not detect files modified in a directory. - ASSERT_TRUE(WriteFile(file1, "content v2")); - VLOG(1) << "Waiting for file1 modification"; - ASSERT_TRUE(WaitForEvents()); --#endif // !OS_APPLE -+#endif // !OS_APPLE && !OS_BSD - - ASSERT_TRUE(base::DeleteFile(file1)); - VLOG(1) << "Waiting for file1 deletion"; -@@ -1034,7 +1034,7 @@ TEST_F(FilePathWatcherTest, InotifyLimitInUpdateRecurs - } - } - --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - enum Permission { - Read, -@@ -1042,7 +1042,7 @@ enum Permission { - Execute - }; - --#if defined(OS_APPLE) -+#if defined(OS_APPLE) || defined(OS_BSD) - bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { - struct stat stat_buf; - -@@ -1071,9 +1071,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi - } - return chmod(path.value().c_str(), stat_buf.st_mode) == 0; - } --#endif // defined(OS_APPLE) -+#endif // defined(OS_APPLE) || defined(OS_BSD) - --#if defined(OS_APPLE) -+#if defined(OS_APPLE) || defined(OS_BSD) - // Linux implementation of FilePathWatcher doesn't catch attribute changes. - // http://crbug.com/78043 - // Windows implementation of FilePathWatcher catches attribute changes that -@@ -1109,7 +1109,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { - ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); - } - --#endif // OS_APPLE -+#endif // OS_APPLE || OS_BSD - - #if defined(OS_MAC) - diff --git a/devel/electron13/files/patch-base_files_file__util.h b/devel/electron13/files/patch-base_files_file__util.h deleted file mode 100644 index d2593c5248e8..000000000000 --- a/devel/electron13/files/patch-base_files_file__util.h +++ /dev/null @@ -1,28 +0,0 @@ ---- base/files/file_util.h.orig 2021-07-15 19:13:29 UTC -+++ base/files/file_util.h -@@ -283,14 +283,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat - BASE_EXPORT bool ExecutableExistsInPath(Environment* env, - const FilePath::StringType& executable); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) - // Determine if files under a given |path| can be mapped and then mprotect'd - // PROT_EXEC. This depends on the mount options used for |path|, which vary - // among different Linux distributions and possibly local configuration. It also - // depends on details of kernel--ChromeOS uses the noexec option for /dev/shm - // but its kernel allows mprotect with PROT_EXEC anyway. - BASE_EXPORT bool IsPathExecutable(const FilePath& path); --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) - - #endif // OS_POSIX - -@@ -602,7 +602,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas - // the directory |path|, in the number of FilePath::CharType, or -1 on failure. - BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) - // Broad categories of file systems as returned by statfs() on Linux. - enum FileSystemType { - FILE_SYSTEM_UNKNOWN, // statfs failed. diff --git a/devel/electron13/files/patch-base_files_file__util__posix.cc b/devel/electron13/files/patch-base_files_file__util__posix.cc deleted file mode 100644 index 147d89a916b1..000000000000 --- a/devel/electron13/files/patch-base_files_file__util__posix.cc +++ /dev/null @@ -1,78 +0,0 @@ ---- base/files/file_util_posix.cc.orig 2021-07-15 19:13:29 UTC -+++ base/files/file_util_posix.cc -@@ -384,7 +384,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, - } - - bool CreateLocalNonBlockingPipe(int fds[2]) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0; - #else - int raw_fds[2]; -@@ -932,8 +932,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si - // space. It can fail because the filesystem doesn't support it. In that case, - // use the manual method below. - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) -+#if defined(OS_BSD) -+ if (HANDLE_EINTR(posix_fallocate(file->GetPlatformFile(), offset, size)) != -1) -+#else - if (HANDLE_EINTR(fallocate(file->GetPlatformFile(), 0, offset, size)) != -1) -+#endif - return true; - DPLOG(ERROR) << "fallocate"; - #elif defined(OS_APPLE) -@@ -1103,7 +1107,7 @@ int GetMaximumPathComponentLength(const FilePath& path - #if !defined(OS_ANDROID) - // This is implemented in file_util_android.cc for that platform. - bool GetShmemTempDir(bool executable, FilePath* path) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) - bool disable_dev_shm = false; - #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS) - disable_dev_shm = CommandLine::ForCurrentProcess()->HasSwitch( -@@ -1119,7 +1123,7 @@ bool GetShmemTempDir(bool executable, FilePath* path) - *path = FilePath("/dev/shm"); - return true; - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) - return GetTempDir(path); - } - #endif // !defined(OS_ANDROID) -@@ -1157,7 +1161,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, - // posix_fadvise() is only available in the Android NDK in API 21+. Older - // versions may have the required kernel support, but don't have enough usage - // to justify backporting. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - (defined(OS_ANDROID) && __ANDROID_API__ >= 21) - File file(file_path, File::FLAG_OPEN | File::FLAG_READ); - if (!file.IsValid()) -@@ -1193,7 +1197,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, - return internal::PreReadFileSlow(file_path, max_bytes) - ? PrefetchResult{PrefetchResultCode::kSlowSuccess} - : PrefetchResult{PrefetchResultCode::kSlowFailed}; --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || (defined(OS_ANDROID) && -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || (defined(OS_ANDROID) && - // __ANDROID_API__ >= 21) - } - -@@ -1263,7 +1267,7 @@ bool CopyFileContentsWithSendfile(File& infile, - - #endif // !defined(OS_NACL_NONSFI) - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) - BASE_EXPORT bool IsPathExecutable(const FilePath& path) { - bool result = false; - FilePath tmp_file_path; -@@ -1284,6 +1288,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path - } - return result; - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) - - } // namespace base diff --git a/devel/electron13/files/patch-base_files_file__util__unittest.cc b/devel/electron13/files/patch-base_files_file__util__unittest.cc deleted file mode 100644 index 453baff33d89..000000000000 --- a/devel/electron13/files/patch-base_files_file__util__unittest.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- base/files/file_util_unittest.cc.orig 2021-04-14 01:08:36 UTC -+++ base/files/file_util_unittest.cc -@@ -1638,7 +1638,7 @@ TEST_F(FileUtilTest, DeleteDirRecursiveWithOpenFile) { - #endif - } - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // This test will validate that files which would block when read result in a - // failure on a call to ReadFileToStringNonBlocking. To accomplish this we will - // use a named pipe because it appears as a file on disk and we can control how -@@ -1671,7 +1671,7 @@ TEST_F(FileUtilTest, TestNonBlockingFileReadLinux) { - ASSERT_EQ(result.size(), 1u); - EXPECT_EQ(result[0], 'a'); - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - TEST_F(FileUtilTest, MoveFileNew) { - // Create a file -@@ -3506,7 +3506,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { - } - #endif // defined(OS_WIN) - --#if defined(OS_POSIX) && !defined(OS_APPLE) -+#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_BSD) - TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { - FilePath file_path("/proc/cpuinfo"); - std::string data = "temp"; -@@ -3524,7 +3524,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste - - EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, nullptr, 4)); - } --#endif // defined(OS_POSIX) && !defined(OS_APPLE) -+#endif // defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_BSD) - - TEST_F(FileUtilTest, ReadFileToStringWithLargeFile) { - std::string data(kLargeFileSize, 'c'); diff --git a/devel/electron13/files/patch-base_files_scoped__file.cc b/devel/electron13/files/patch-base_files_scoped__file.cc deleted file mode 100644 index f6fa3d00d2f1..000000000000 --- a/devel/electron13/files/patch-base_files_scoped__file.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/files/scoped_file.cc.orig 2021-01-07 00:36:18 UTC -+++ base/files/scoped_file.cc -@@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) { - // a single open directory would bypass the entire security model. - int ret = IGNORE_EINTR(close(fd)); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_APPLE) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(OS_APPLE) || \ - defined(OS_FUCHSIA) || defined(OS_ANDROID) - // NB: Some file descriptors can return errors from close() e.g. network - // filesystems such as NFS and Linux input devices. On Linux, macOS, and diff --git a/devel/electron13/files/patch-base_i18n_icu__util.cc b/devel/electron13/files/patch-base_i18n_icu__util.cc deleted file mode 100644 index f7e8fb2ca85a..000000000000 --- a/devel/electron13/files/patch-base_i18n_icu__util.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- base/i18n/icu_util.cc.orig 2021-07-15 19:13:29 UTC -+++ base/i18n/icu_util.cc -@@ -49,7 +49,7 @@ - #include "third_party/icu/source/common/unicode/unistr.h" - #endif - --#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -+#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ - ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST)) - #include "third_party/icu/source/i18n/unicode/timezone.h" - #endif -@@ -343,7 +343,7 @@ void InitializeIcuTimeZone() { - FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); - icu::TimeZone::adoptDefault( - icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); --#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST) -+#elif (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST) - // To respond to the time zone change properly, the default time zone - // cache in ICU has to be populated on starting up. - // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). diff --git a/devel/electron13/files/patch-base_linux__util.cc b/devel/electron13/files/patch-base_linux__util.cc deleted file mode 100644 index 9b7b80113341..000000000000 --- a/devel/electron13/files/patch-base_linux__util.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- base/linux_util.cc.orig 2021-04-14 01:08:36 UTC -+++ base/linux_util.cc -@@ -15,6 +15,7 @@ - - #include <iomanip> - #include <memory> -+#include <sstream> - - #include "base/files/dir_reader_posix.h" - #include "base/files/file_util.h" -@@ -79,6 +80,9 @@ class DistroNameGetter { - public: - DistroNameGetter() { - static const char* const kFilesToCheck[] = {"/etc/os-release", -+#if defined(OS_BSD) -+ "/usr/local/etc/os-release", -+#endif - "/usr/lib/os-release"}; - for (const char* file : kFilesToCheck) { - if (ReadDistroFromOSReleaseFile(file)) -@@ -135,6 +139,9 @@ void SetLinuxDistro(const std::string& distro) { - } - - bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { -+#if defined(OS_BSD) -+ return false; -+#else - // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 - char buf[25]; - strings::SafeSPrintf(buf, "/proc/%d/task", pid); -@@ -154,6 +161,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t - } - - return true; -+#endif - } - - pid_t FindThreadIDWithSyscall(pid_t pid, const std::string& expected_data, diff --git a/devel/electron13/files/patch-base_location__unittest.cc b/devel/electron13/files/patch-base_location__unittest.cc deleted file mode 100644 index 8391d10368cd..000000000000 --- a/devel/electron13/files/patch-base_location__unittest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/location_unittest.cc.orig 2021-01-07 00:36:18 UTC -+++ base/location_unittest.cc -@@ -32,7 +32,7 @@ TEST(LocationTest, CurrentYieldsCorrectValue) { - EXPECT_EQ(here.line_number(), previous_line + 1); - EXPECT_STREQ("TestBody", here.function_name()); - #endif --#elif defined(OFFICIAL_BUILD) -+#elif defined(OFFICIAL_BUILD) && !defined(OS_BSD) - #error Location builtins must be supported in official builds. - #elif BUILDFLAG(FROM_HERE_USES_LOCATION_BUILTINS) - #error FROM_HERE requires location builtins to be supported. diff --git a/devel/electron13/files/patch-base_logging__unittest.cc b/devel/electron13/files/patch-base_logging__unittest.cc deleted file mode 100644 index 64a91b086be6..000000000000 --- a/devel/electron13/files/patch-base_logging__unittest.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- base/logging_unittest.cc.orig 2021-07-15 19:13:29 UTC -+++ base/logging_unittest.cc -@@ -32,7 +32,7 @@ - #include "base/posix/eintr_wrapper.h" - #endif // OS_POSIX - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - #include <ucontext.h> - #endif - -@@ -557,7 +557,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo - // need the arch-specific boilerplate below, which is inspired by breakpad. - // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. - uintptr_t crash_addr = 0; --#if defined(OS_MAC) -+#if defined(OS_MAC) || defined(OS_BSD) - crash_addr = reinterpret_cast<uintptr_t>(info->si_addr); - #else // OS_* - ucontext_t* context = reinterpret_cast<ucontext_t*>(context_ptr); diff --git a/devel/electron13/files/patch-base_memory_discardable__memory.cc b/devel/electron13/files/patch-base_memory_discardable__memory.cc deleted file mode 100644 index 8375c4827d8f..000000000000 --- a/devel/electron13/files/patch-base_memory_discardable__memory.cc +++ /dev/null @@ -1,63 +0,0 @@ ---- base/memory/discardable_memory.cc.orig 2021-07-15 19:13:29 UTC -+++ base/memory/discardable_memory.cc -@@ -24,7 +24,7 @@ const base::Feature kMadvFreeDiscardableMemory{ - "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT}; - #endif // defined(OS_POSIX) - --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - const base::Feature kDiscardableMemoryBackingTrial{ - "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT}; - -@@ -42,13 +42,13 @@ const base::FeatureParam<DiscardableMemoryTrialGroup> - DiscardableMemoryTrialGroup::kEmulatedSharedMemory, - &kDiscardableMemoryBackingParamOptions}; - --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - } // namespace features - - namespace { - --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - DiscardableMemoryBacking GetBackingForFieldTrial() { - DiscardableMemoryTrialGroup trial_group = -@@ -62,11 +62,11 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { - } - NOTREACHED(); - } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - } // namespace - --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - // Probe capabilities of this device to determine whether we should participate - // in the discardable memory backing trial. -@@ -88,18 +88,18 @@ DiscardableMemoryTrialGroup GetDiscardableMemoryBackin - DCHECK(DiscardableMemoryBackingFieldTrialIsEnabled()); - return features::kDiscardableMemoryBackingParam.Get(); - } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - DiscardableMemory::DiscardableMemory() = default; - - DiscardableMemory::~DiscardableMemory() = default; - - DiscardableMemoryBacking GetDiscardableMemoryBacking() { --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - if (DiscardableMemoryBackingFieldTrialIsEnabled()) { - return GetBackingForFieldTrial(); - } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - #if defined(OS_ANDROID) - if (ashmem_device_is_supported()) diff --git a/devel/electron13/files/patch-base_memory_discardable__memory__internal.h b/devel/electron13/files/patch-base_memory_discardable__memory__internal.h deleted file mode 100644 index 3fe9ec502716..000000000000 --- a/devel/electron13/files/patch-base_memory_discardable__memory__internal.h +++ /dev/null @@ -1,19 +0,0 @@ ---- base/memory/discardable_memory_internal.h.orig 2021-01-07 00:36:18 UTC -+++ base/memory/discardable_memory_internal.h -@@ -10,7 +10,7 @@ - #include "base/metrics/field_trial_params.h" - #include "build/build_config.h" - --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - namespace base { - -@@ -47,6 +47,6 @@ GetDiscardableMemoryBackingFieldTrialGroup(); - - } // namespace base - --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - - #endif // BASE_MEMORY_DISCARDABLE_MEMORY_INTERNAL_H_ diff --git a/devel/electron13/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/devel/electron13/files/patch-base_memory_madv__free__discardable__memory__posix.cc deleted file mode 100644 index bebd593980ed..000000000000 --- a/devel/electron13/files/patch-base_memory_madv__free__discardable__memory__posix.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2021-01-07 00:36:18 UTC -+++ base/memory/madv_free_discardable_memory_posix.cc -@@ -292,7 +292,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT - - bool MadvFreeDiscardableMemoryPosix::IsResident() const { - DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); --#if defined(OS_APPLE) -+#if defined(OS_APPLE) || defined(OS_BSD) - std::vector<char> vec(allocated_pages_); - #else - std::vector<unsigned char> vec(allocated_pages_); diff --git a/devel/electron13/files/patch-base_memory_platform__shared__memory__region.h b/devel/electron13/files/patch-base_memory_platform__shared__memory__region.h deleted file mode 100644 index 95c3f3248748..000000000000 --- a/devel/electron13/files/patch-base_memory_platform__shared__memory__region.h +++ /dev/null @@ -1,29 +0,0 @@ ---- base/memory/platform_shared_memory_region.h.orig 2021-01-07 00:36:18 UTC -+++ base/memory/platform_shared_memory_region.h -@@ -27,7 +27,7 @@ - #include "base/files/scoped_file.h" - #endif - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - namespace content { - class SandboxIPCHandler; - } -@@ -120,7 +120,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { - kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE - }; - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Structure to limit access to executable region creation. - struct ExecutableRegion { - private: -@@ -264,7 +264,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { - CheckPlatformHandlePermissionsCorrespondToMode); - static PlatformSharedMemoryRegion Create(Mode mode, - size_t size --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - , - bool executable = false - #endif diff --git a/devel/electron13/files/patch-base_memory_platform__shared__memory__region__posix.cc b/devel/electron13/files/patch-base_memory_platform__shared__memory__region__posix.cc deleted file mode 100644 index 5ff9a2f68bda..000000000000 --- a/devel/electron13/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ /dev/null @@ -1,100 +0,0 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2021-04-14 01:08:36 UTC -+++ base/memory/platform_shared_memory_region_posix.cc -@@ -23,7 +23,11 @@ struct ScopedPathUnlinkerTraits { - static const FilePath* InvalidValue() { return nullptr; } - - static void Free(const FilePath* path) { -+#if defined(OS_BSD) -+ if (shm_unlink(path->value().c_str())) -+#else - if (unlink(path->value().c_str())) -+#endif - PLOG(WARNING) << "unlink"; - } - }; -@@ -70,7 +74,7 @@ FDPair ScopedFDPair::get() const { - return {fd.get(), readonly_fd.get()}; - } - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // static - ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { - PlatformSharedMemoryRegion region = -@@ -79,7 +83,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: - return region.PassPlatformHandle().fd; - return ScopedFD(); - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - // static - PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take( -@@ -204,7 +208,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o - // static - PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, - size_t size --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - , - bool executable - #endif -@@ -242,6 +246,22 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: - return {}; - } - -+#if defined(OS_BSD) -+ UnguessableToken token = UnguessableToken::Create(); -+ FilePath path = directory.Append(token.ToString()); -+ ScopedFD fd{HANDLE_EINTR(shm_open(path.value().c_str(), O_CREAT | O_RDWR, 0700))}; -+ File shm_file(fd.release()); -+ -+ if (!shm_file.IsValid()) { -+ PLOG(ERROR) << "Creating shared memory failed"; -+ return {}; -+ } -+ -+ if (HANDLE_EINTR(ftruncate(shm_file.GetPlatformFile(), size)) == -1) { -+ PLOG(ERROR) << "Failed to extend shared memory object to size " << size; -+ return {}; -+ } -+#else - FilePath path; - ScopedFD fd = CreateAndOpenFdForTemporaryFileInDir(directory, &path); - File shm_file(fd.release()); -@@ -258,6 +278,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: - } - return {}; - } -+#endif // OS_BSD - - // Deleting the file prevents anyone else from mapping it in (making it - // private), and prevents the need for cleanup (once the last fd is -@@ -267,7 +288,11 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: - ScopedFD readonly_fd; - if (mode == Mode::kWritable) { - // Also open as readonly so that we can ConvertToReadOnly(). -+#if defined(OS_BSD) -+ readonly_fd.reset(HANDLE_EINTR(shm_open(path.value().c_str(), O_RDONLY, 0400))); -+#else - readonly_fd.reset(HANDLE_EINTR(open(path.value().c_str(), O_RDONLY))); -+#endif - if (!readonly_fd.is_valid()) { - DPLOG(ERROR) << "open(\"" << path.value() << "\", O_RDONLY) failed"; - return {}; -@@ -298,9 +323,15 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: - } - } - -+#if defined(OS_BSD) - return PlatformSharedMemoryRegion( - {ScopedFD(shm_file.TakePlatformFile()), std::move(readonly_fd)}, mode, -+ size, token); -+#else -+ return PlatformSharedMemoryRegion( -+ {ScopedFD(shm_file.TakePlatformFile()), std::move(readonly_fd)}, mode, - size, UnguessableToken::Create()); -+#endif // OS_BSD - #endif // !defined(OS_NACL) - } - diff --git a/devel/electron13/files/patch-base_memory_shared__memory__region__unittest.cc b/devel/electron13/files/patch-base_memory_shared__memory__region__unittest.cc deleted file mode 100644 index 390dc6366060..000000000000 --- a/devel/electron13/files/patch-base_memory_shared__memory__region__unittest.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- base/memory/shared_memory_region_unittest.cc.orig 2021-01-07 00:36:18 UTC -+++ base/memory/shared_memory_region_unittest.cc -@@ -188,10 +188,13 @@ TYPED_TEST(SharedMemoryRegionTest, MapAtNotAlignedOffs - std::tie(region, rw_mapping) = CreateMappedRegion<TypeParam>(kDataSize); - ASSERT_TRUE(region.IsValid()); - ASSERT_TRUE(rw_mapping.IsValid()); -+#if !defined(OS_BSD) -+ // On FreeBSD, mmap() does not require an aligned offset - off_t offset = kDataSize / 2; - typename TypeParam::MappingType mapping = - region.MapAt(offset, kDataSize - offset); - EXPECT_FALSE(mapping.IsValid()); -+#endif - } - - TYPED_TEST(SharedMemoryRegionTest, MapZeroBytesFails) { diff --git a/devel/electron13/files/patch-base_message__loop_message__pump__glib.cc b/devel/electron13/files/patch-base_message__loop_message__pump__glib.cc deleted file mode 100644 index cb8c43ece967..000000000000 --- a/devel/electron13/files/patch-base_message__loop_message__pump__glib.cc +++ /dev/null @@ -1,28 +0,0 @@ ---- base/message_loop/message_pump_glib.cc.orig 2021-01-07 00:36:18 UTC -+++ base/message_loop/message_pump_glib.cc -@@ -8,6 +8,11 @@ - #include <glib.h> - #include <math.h> - -+#if defined(OS_BSD) -+#include <pthread.h> -+#include <pthread_np.h> -+#endif -+ - #include "base/logging.h" - #include "base/numerics/safe_conversions.h" - #include "base/posix/eintr_wrapper.h" -@@ -48,9 +53,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti - } - - bool RunningOnMainThread() { -+#if defined(OS_BSD) -+ return pthread_main_np(); -+#else - auto pid = getpid(); - auto tid = PlatformThread::CurrentId(); - return pid > 0 && tid > 0 && pid == tid; -+#endif - } - - // A brief refresher on GLib: diff --git a/devel/electron13/files/patch-base_native__library__posix.cc b/devel/electron13/files/patch-base_native__library__posix.cc deleted file mode 100644 index 00088d5f79e3..000000000000 --- a/devel/electron13/files/patch-base_native__library__posix.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/native_library_posix.cc.orig 2021-07-15 19:13:29 UTC -+++ base/native_library_posix.cc -@@ -31,7 +31,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP - // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, - // and http://crbug.com/40794. - int flags = RTLD_LAZY; --#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND) -+#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND) || defined(OS_BSD) - // Certain platforms don't define RTLD_DEEPBIND. Android dlopen() requires - // further investigation, as it might vary across versions. Crash here to - // warn developers that they're trying to rely on uncertain behavior. diff --git a/devel/electron13/files/patch-base_native__library__unittest.cc b/devel/electron13/files/patch-base_native__library__unittest.cc deleted file mode 100644 index 2053f40ff4b5..000000000000 --- a/devel/electron13/files/patch-base_native__library__unittest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/native_library_unittest.cc.orig 2021-01-07 00:36:18 UTC -+++ base/native_library_unittest.cc -@@ -118,7 +118,7 @@ TEST(NativeLibraryTest, LoadLibrary) { - // Android dlopen() requires further investigation, as it might vary across - // versions with respect to symbol resolution scope. - // TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255 --#if !defined(OS_ANDROID) && !defined(THREAD_SANITIZER) && \ -+#if !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(THREAD_SANITIZER) && \ - !defined(MEMORY_SANITIZER) - - // Verifies that the |prefer_own_symbols| option satisfies its guarantee that diff --git a/devel/electron13/files/patch-base_numerics_safe__math__shared__impl.h b/devel/electron13/files/patch-base_numerics_safe__math__shared__impl.h deleted file mode 100644 index 435eabe4b5a4..000000000000 --- a/devel/electron13/files/patch-base_numerics_safe__math__shared__impl.h +++ /dev/null @@ -1,12 +0,0 @@ ---- base/numerics/safe_math_shared_impl.h.orig 2021-01-07 00:36:18 UTC -+++ base/numerics/safe_math_shared_impl.h -@@ -24,8 +24,7 @@ - // Where available use builtin math overflow support on Clang and GCC. - #elif !defined(__native_client__) && \ - ((defined(__clang__) && \ -- ((__clang_major__ > 3) || \ -- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ -+ (__clang_major__ > 6)) || \ - (defined(__GNUC__) && __GNUC__ >= 5)) - #include "base/numerics/safe_math_clang_gcc_impl.h" - #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) diff --git a/devel/electron13/files/patch-base_path__service__unittest.cc b/devel/electron13/files/patch-base_path__service__unittest.cc deleted file mode 100644 index aa49db8cb97f..000000000000 --- a/devel/electron13/files/patch-base_path__service__unittest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/path_service_unittest.cc.orig 2021-01-07 00:36:18 UTC -+++ base/path_service_unittest.cc -@@ -38,7 +38,7 @@ bool ReturnsValidPath(int dir_type) { - if (dir_type == DIR_CACHE) - check_path_exists = false; - #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // On the linux try-bots: a path is returned (e.g. /home/chrome-bot/Desktop), - // but it doesn't exist. - if (dir_type == DIR_USER_DESKTOP) diff --git a/devel/electron13/files/patch-base_posix_can__lower__nice__to.cc b/devel/electron13/files/patch-base_posix_can__lower__nice__to.cc deleted file mode 100644 index ea01e2805c24..000000000000 --- a/devel/electron13/files/patch-base_posix_can__lower__nice__to.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- base/posix/can_lower_nice_to.cc.orig 2021-01-07 00:36:18 UTC -+++ base/posix/can_lower_nice_to.cc -@@ -31,6 +31,9 @@ bool CanLowerNiceTo(int nice_value) { - if (geteuid() == 0) - return true; - -+#if defined(OS_BSD) -+ return false; -+#else - // 2. Skip checking the CAP_SYS_NICE permission because it would require - // libcap.so. - -@@ -54,6 +57,7 @@ bool CanLowerNiceTo(int nice_value) { - // And lowering niceness to |nice_value| is allowed if it is greater than or - // equal to the limit: - return nice_value >= lowest_nice_allowed; -+#endif - } - - } // namespace internal diff --git a/devel/electron13/files/patch-base_posix_unix__domain__socket.cc b/devel/electron13/files/patch-base_posix_unix__domain__socket.cc deleted file mode 100644 index 5bfb3e49cd74..000000000000 --- a/devel/electron13/files/patch-base_posix_unix__domain__socket.cc +++ /dev/null @@ -1,49 +0,0 @@ ---- base/posix/unix_domain_socket.cc.orig 2021-07-15 19:13:29 UTC -+++ base/posix/unix_domain_socket.cc -@@ -5,7 +5,10 @@ - #include "base/posix/unix_domain_socket.h" - - #include <errno.h> -+#include <sys/param.h> - #include <sys/socket.h> -+#include <sys/types.h> -+#include <sys/ucred.h> - #if !defined(OS_NACL_NONSFI) - #include <sys/un.h> - #endif -@@ -29,6 +32,14 @@ namespace base { - - const size_t UnixDomainSocket::kMaxFileDescriptors = 16; - -+#ifndef SCM_CREDENTIALS -+# define SCM_CREDENTIALS 0x9001 -+#endif -+ -+#ifndef SO_PASSCRED -+# define SO_PASSCRED 0x9002 -+#endif -+ - #if !defined(OS_NACL_NONSFI) - bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { - int raw_socks[2]; -@@ -151,7 +162,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, - #if !defined(OS_NACL_NONSFI) && !defined(OS_APPLE) - // The PNaCl toolchain for Non-SFI binary build and macOS do not support - // ucred. macOS supports xucred, but this structure is insufficient. -- + CMSG_SPACE(sizeof(struct ucred)) -+ + CMSG_SPACE(sizeof(struct cmsgcred)) - #endif // !defined(OS_NACL_NONSFI) && !defined(OS_APPLE) - ; - char control_buffer[kControlBufferSize]; -@@ -181,9 +192,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, - // SCM_CREDENTIALS. - if (cmsg->cmsg_level == SOL_SOCKET && - cmsg->cmsg_type == SCM_CREDENTIALS) { -- DCHECK_EQ(payload_len, sizeof(struct ucred)); -+ DCHECK_EQ(payload_len, sizeof(struct cmsgcred)); - DCHECK_EQ(pid, -1); -- pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid; -+ pid = getpid(); - } - #endif // !defined(OS_NACL_NONSFI) && !defined(OS_APPLE) - } diff --git a/devel/electron13/files/patch-base_posix_unix__domain__socket__unittest.cc b/devel/electron13/files/patch-base_posix_unix__domain__socket__unittest.cc deleted file mode 100644 index 5750575505c0..000000000000 --- a/devel/electron13/files/patch-base_posix_unix__domain__socket__unittest.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- base/posix/unix_domain_socket_unittest.cc.orig 2021-01-07 00:36:18 UTC -+++ base/posix/unix_domain_socket_unittest.cc -@@ -8,6 +8,9 @@ - #include <stdint.h> - #include <sys/socket.h> - #include <sys/types.h> -+#if defined(OS_BSD) -+#include <signal.h> -+#endif - #include <unistd.h> - - #include "base/bind.h" diff --git a/devel/electron13/files/patch-base_process_internal__linux.cc b/devel/electron13/files/patch-base_process_internal__linux.cc deleted file mode 100644 index 574d90c7c3b3..000000000000 --- a/devel/electron13/files/patch-base_process_internal__linux.cc +++ /dev/null @@ -1,97 +0,0 @@ ---- base/process/internal_linux.cc.orig 2021-01-07 00:36:18 UTC -+++ base/process/internal_linux.cc -@@ -30,7 +30,11 @@ namespace internal { - - const char kProcDir[] = "/proc"; - -+#if defined(OS_BSD) -+const char kStatFile[] = "status"; -+#else - const char kStatFile[] = "stat"; -+#endif - - FilePath GetProcPidDir(pid_t pid) { - return FilePath(kProcDir).Append(NumberToString(pid)); -@@ -66,6 +70,7 @@ bool ReadProcFile(const FilePath& file, std::string* b - DLOG(WARNING) << "Failed to read " << file.MaybeAsASCII(); - return false; - } -+ - return !buffer->empty(); - } - -@@ -81,6 +86,22 @@ bool ParseProcStats(const std::string& stats_data, - if (stats_data.empty()) - return false; - -+#if defined(OS_BSD) -+ proc_stats->clear(); -+ -+ std::vector<std::string> other_stats = SplitString( -+ stats_data, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); -+ -+ for (const auto& i : other_stats) { -+ auto pos = i.find(','); -+ -+ if (pos == std::string::npos) { -+ proc_stats->push_back(i); -+ } else { -+ proc_stats->push_back(i.substr(0, pos)); -+ } -+ } -+#else - // The stat file is formatted as: - // pid (process name) data1 data2 .... dataN - // Look for the closing paren by scanning backwards, to avoid being fooled by -@@ -110,6 +131,7 @@ bool ParseProcStats(const std::string& stats_data, - base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); - for (const auto& i : other_stats) - proc_stats->push_back(i); -+#endif - return true; - } - -@@ -157,7 +179,11 @@ int64_t ReadProcStatsAndGetFieldAsInt64(pid_t pid, Pro - } - - int64_t ReadProcSelfStatsAndGetFieldAsInt64(ProcStatsFields field_num) { -+#if defined(OS_BSD) -+ FilePath stat_file = FilePath(kProcDir).Append("curproc").Append(kStatFile); -+#else - FilePath stat_file = FilePath(kProcDir).Append("self").Append(kStatFile); -+#endif - return ReadStatFileAndGetFieldAsInt64(stat_file, field_num); - } - -@@ -173,6 +199,9 @@ size_t ReadProcStatsAndGetFieldAsSizeT(pid_t pid, - } - - Time GetBootTime() { -+#if defined(OS_BSD) -+ return Time(); -+#else - FilePath path("/proc/stat"); - std::string contents; - if (!ReadProcFile(path, &contents)) -@@ -186,9 +215,13 @@ Time GetBootTime() { - if (!StringToInt(btime_it->second, &btime)) - return Time(); - return Time::FromTimeT(btime); -+#endif - } - - TimeDelta GetUserCpuTimeSinceBoot() { -+#if defined(OS_BSD) -+ return TimeDelta(); -+#else - FilePath path("/proc/stat"); - std::string contents; - if (!ReadProcFile(path, &contents)) -@@ -212,6 +245,7 @@ TimeDelta GetUserCpuTimeSinceBoot() { - return TimeDelta(); - - return ClockTicksToTimeDelta(user + nice); -+#endif - } - - TimeDelta ClockTicksToTimeDelta(int clock_ticks) { diff --git a/devel/electron13/files/patch-base_process_internal__linux.h b/devel/electron13/files/patch-base_process_internal__linux.h deleted file mode 100644 index cca02ed6890e..000000000000 --- a/devel/electron13/files/patch-base_process_internal__linux.h +++ /dev/null @@ -1,34 +0,0 @@ ---- base/process/internal_linux.h.orig 2021-01-07 00:36:18 UTC -+++ base/process/internal_linux.h -@@ -18,6 +18,8 @@ - #include "base/strings/string_number_conversions.h" - #include "base/threading/platform_thread.h" - -+#include <unistd.h> /* pid_t */ -+ - namespace base { - - class Time; -@@ -59,6 +61,14 @@ bool ParseProcStats(const std::string& stats_data, - // If the ordering ever changes, carefully review functions that use these - // values. - enum ProcStatsFields { -+#if defined(OS_BSD) -+ VM_COMM = 0, // Command name. -+ VM_PPID = 2, // Parent process id. -+ VM_PGRP = 3, // Process group id. -+ VM_STARTTIME = 7, // The process start time. -+ VM_UTIME = 8, // The user time. -+ VM_STIME = 9, // The system time -+#else - VM_COMM = 1, // Filename of executable, without parentheses. - VM_STATE = 2, // Letter indicating the state of the process. - VM_PPID = 3, // PID of the parent. -@@ -71,6 +81,7 @@ enum ProcStatsFields { - VM_STARTTIME = 21, // The time the process started in clock ticks. - VM_VSIZE = 22, // Virtual memory size in bytes. - VM_RSS = 23, // Resident Set Size in pages. -+#endif - }; - - // Reads the |field_num|th field from |proc_stats|. Returns 0 on failure. diff --git a/devel/electron13/files/patch-base_process_kill.h b/devel/electron13/files/patch-base_process_kill.h deleted file mode 100644 index 64c5c7059748..000000000000 --- a/devel/electron13/files/patch-base_process_kill.h +++ /dev/null @@ -1,16 +0,0 @@ ---- base/process/kill.h.orig 2021-01-07 00:36:18 UTC -+++ base/process/kill.h -@@ -113,11 +113,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro - BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( - ProcessHandle handle, int* exit_code); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Spawns a thread to wait asynchronously for the child |process| to exit - // and then reaps it. - BASE_EXPORT void EnsureProcessGetsReaped(Process process); --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #endif // defined(OS_POSIX) - - // Registers |process| to be asynchronously monitored for termination, forcibly diff --git a/devel/electron13/files/patch-base_process_kill__posix.cc b/devel/electron13/files/patch-base_process_kill__posix.cc deleted file mode 100644 index 83d217de3b28..000000000000 --- a/devel/electron13/files/patch-base_process_kill__posix.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- base/process/kill_posix.cc.orig 2021-01-07 00:36:18 UTC -+++ base/process/kill_posix.cc -@@ -160,7 +160,7 @@ void EnsureProcessTerminated(Process process) { - 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2))); - } - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - void EnsureProcessGetsReaped(Process process) { - DCHECK(!process.is_current()); - -@@ -171,7 +171,7 @@ void EnsureProcessGetsReaped(Process process) { - PlatformThread::CreateNonJoinable( - 0, new BackgroundReaper(std::move(process), TimeDelta())); - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - #endif // !defined(OS_APPLE) - #endif // !defined(OS_NACL_NONSFI) diff --git a/devel/electron13/files/patch-base_process_launch.cc b/devel/electron13/files/patch-base_process_launch.cc deleted file mode 100644 index dc605270e330..000000000000 --- a/devel/electron13/files/patch-base_process_launch.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/process/launch.cc.orig 2021-01-07 00:36:18 UTC -+++ base/process/launch.cc -@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default; - - LaunchOptions LaunchOptionsForTest() { - LaunchOptions options; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // To prevent accidental privilege sharing to an untrusted child, processes - // are started with PR_SET_NO_NEW_PRIVS. Do not set that here, since this - // new child will be used for testing only. diff --git a/devel/electron13/files/patch-base_process_launch.h b/devel/electron13/files/patch-base_process_launch.h deleted file mode 100644 index 2ff16e9aa5e1..000000000000 --- a/devel/electron13/files/patch-base_process_launch.h +++ /dev/null @@ -1,29 +0,0 @@ ---- base/process/launch.h.orig 2021-07-15 19:13:29 UTC -+++ base/process/launch.h -@@ -190,7 +190,7 @@ struct BASE_EXPORT LaunchOptions { - bool clear_environment = false; - #endif // OS_WIN || OS_POSIX || OS_FUCHSIA - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // If non-zero, start the process using clone(), using flags as provided. - // Unlike in clone, clone_flags may not contain a custom termination signal - // that is sent to the parent when the child dies. The termination signal will -@@ -203,7 +203,7 @@ struct BASE_EXPORT LaunchOptions { - - // Sets parent process death signal to SIGKILL. - bool kill_on_parent_death = false; --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - #if defined(OS_MAC) - // Mach ports that will be accessible to the child process. These are not -@@ -415,7 +415,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); - // binary. This should not be called in production/released code. - BASE_EXPORT LaunchOptions LaunchOptionsForTest(); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_NACL_NONSFI) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_NACL_NONSFI) || defined(OS_BSD) - // A wrapper for clone with fork-like behavior, meaning that it returns the - // child's pid in the parent and 0 in the child. |flags|, |ptid|, and |ctid| are - // as in the clone system call (the CLONE_VM flag is not supported). diff --git a/devel/electron13/files/patch-base_process_launch__posix.cc b/devel/electron13/files/patch-base_process_launch__posix.cc deleted file mode 100644 index a64c5f0f8df3..000000000000 --- a/devel/electron13/files/patch-base_process_launch__posix.cc +++ /dev/null @@ -1,80 +0,0 @@ ---- base/process/launch_posix.cc.orig 2021-04-14 01:08:36 UTC -+++ base/process/launch_posix.cc -@@ -59,12 +59,14 @@ - #if defined(OS_FREEBSD) - #include <sys/event.h> - #include <sys/ucontext.h> -+#include <sys/procctl.h> - #endif - - #if defined(OS_APPLE) - #error "macOS should use launch_mac.cc" - #endif - -+#pragma weak environ - extern char** environ; - - namespace base { -@@ -221,6 +223,28 @@ void CloseSuperfluousFds(const base::InjectiveMultimap - DirReaderPosix fd_dir(kFDDir); - if (!fd_dir.IsValid()) { - // Fallback case: Try every possible fd. -+ -+#if defined(OS_FREEBSD) -+ // CEM: blast away most of the range with closefrom(). A common use case -+ // of this function only maps STDIN/STDOUT/STDERR and closefrom(3) is much -+ // cheaper than x00,000 close(2) invocations with a high RLIMIT_NOFILE. -+ // -+ // In the other caller, it is still very likely that the fds we care about -+ // are in relatively low number space and we can save hundreds of thousands -+ // of syscalls. -+ int max_valid_fd = -1; -+ for (size_t j = 0; j < saved_mapping.size(); j++) { -+ int fd = saved_mapping[j].dest; -+ if (fd > max_valid_fd) -+ max_valid_fd = fd; -+ } -+ if (max_valid_fd < STDERR_FILENO) -+ max_valid_fd = STDERR_FILENO; -+ -+ closefrom(max_valid_fd + 1); -+ max_fds = static_cast<size_t>(max_valid_fd) + 1; -+#endif -+ - for (size_t i = 0; i < max_fds; ++i) { - const int fd = static_cast<int>(i); - if (fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO) -@@ -444,22 +468,32 @@ Process LaunchProcess(const std::vector<std::string>& - - // Set NO_NEW_PRIVS by default. Since NO_NEW_PRIVS only exists in kernel - // 3.5+, do not check the return value of prctl here. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_FREEBSD) - #ifndef PR_SET_NO_NEW_PRIVS - #define PR_SET_NO_NEW_PRIVS 38 - #endif -+#if !defined(OS_FREEBSD) - if (!options.allow_new_privs) { - if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) && errno != EINVAL) { - // Only log if the error is not EINVAL (i.e. not supported). - RAW_LOG(FATAL, "prctl(PR_SET_NO_NEW_PRIVS) failed"); - } - } -+#endif - - if (options.kill_on_parent_death) { -+#if defined(OS_FREEBSD) -+ int procctl_value = SIGKILL; -+ if (procctl(P_PID, 0, PROC_PDEATHSIG_CTL, &procctl_value)) { -+ RAW_LOG(ERROR, "procctl(PROC_PDEATHSIG_CTL) failed"); -+ _exit(127); -+ } -+#else - if (prctl(PR_SET_PDEATHSIG, SIGKILL) != 0) { - RAW_LOG(ERROR, "prctl(PR_SET_PDEATHSIG) failed"); - _exit(127); - } -+#endif - } - #endif - diff --git a/devel/electron13/files/patch-base_process_memory.cc b/devel/electron13/files/patch-base_process_memory.cc deleted file mode 100644 index b2f58abfe555..000000000000 --- a/devel/electron13/files/patch-base_process_memory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/process/memory.cc.orig 2021-07-15 19:13:29 UTC -+++ base/process/memory.cc -@@ -69,7 +69,7 @@ void TerminateBecauseOutOfMemory(size_t size) { - } - - // Defined in memory_mac.mm for Mac. --#if !defined(OS_APPLE) -+#if !defined(OS_APPLE) && !defined(OS_BSD) - - bool UncheckedCalloc(size_t num_items, size_t size, void** result) { - const size_t alloc_size = num_items * size; diff --git a/devel/electron13/files/patch-base_process_memory.h b/devel/electron13/files/patch-base_process_memory.h deleted file mode 100644 index 8c26620bae56..000000000000 --- a/devel/electron13/files/patch-base_process_memory.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/process/memory.h.orig 2021-07-15 19:13:29 UTC -+++ base/process/memory.h -@@ -31,7 +31,7 @@ BASE_EXPORT void TerminateBecauseOutOfMemory(size_t si - // TODO: this can be removed when Breakpad is no longer supported. - BASE_EXPORT extern size_t g_oom_size; - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ - defined(OS_AIX) - // The maximum allowed value for the OOM score. - const int kMaxOomScore = 1000; diff --git a/devel/electron13/files/patch-base_process_memory__stubs.cc b/devel/electron13/files/patch-base_process_memory__stubs.cc deleted file mode 100644 index f24397609414..000000000000 --- a/devel/electron13/files/patch-base_process_memory__stubs.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- base/process/memory_stubs.cc.orig 2021-07-15 19:13:29 UTC -+++ base/process/memory_stubs.cc -@@ -19,9 +19,11 @@ bool AdjustOOMScore(ProcessId process, int score) { - return false; - } - -+#if !defined(OS_BSD) - void TerminateBecauseOutOfMemory(size_t size) { - abort(); - } -+#endif - - // UncheckedMalloc and Calloc exist so that platforms making use of - // EnableTerminationOnOutOfMemory have a way to allocate memory without diff --git a/devel/electron13/files/patch-base_process_memory__unittest.cc b/devel/electron13/files/patch-base_process_memory__unittest.cc deleted file mode 100644 index 1ef51c0ba2b5..000000000000 --- a/devel/electron13/files/patch-base_process_memory__unittest.cc +++ /dev/null @@ -1,66 +0,0 @@ ---- base/process/memory_unittest.cc.orig 2021-07-15 19:13:29 UTC -+++ base/process/memory_unittest.cc -@@ -38,6 +38,8 @@ - #if defined(OS_LINUX) || defined(OS_CHROMEOS) - #include <malloc.h> - #include "base/test/malloc_wrapper.h" -+#elif defined(OS_BSD) -+#include "base/test/malloc_wrapper.h" - #endif - - #if defined(OS_WIN) -@@ -110,9 +112,9 @@ TEST(MemoryTest, AllocatorShimWorking) { - #endif - } - --// OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan -+// BSD does not support these tests. Don't test these on ASan/TSan/MSan - // configurations: only test the real allocator. --#if !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \ -+#if !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \ - !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) - - namespace { -@@ -307,7 +309,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) { - #endif // defined(OS_WIN) - #endif // !defined(OS_MAC) && !defined(OS_ANDROID) - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - TEST_F(OutOfMemoryDeathTest, Valloc) { - ASSERT_OOM_DEATH({ -@@ -353,7 +355,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) { - value_ = MallocWrapper(test_size_); - }); - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - // Android doesn't implement posix_memalign(). - #if defined(OS_POSIX) && !defined(OS_ANDROID) -@@ -504,7 +506,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep - #endif // OS_WIN - - #if defined(ARCH_CPU_32_BITS) && \ -- (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)) -+ (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) - - void TestAllocationsReleaseReservation(void* (*alloc_fn)(size_t), - void (*free_fn)(void*)) { -@@ -562,7 +564,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation) - [](size_t size) { return static_cast<void*>(new char[size]); }, - [](void* ptr) { delete[] static_cast<char*>(ptr); }); - } --#endif // defined(ARCH_CPU_32_BITS) && (defined(OS_WIN) || defined(OS_LINUX) || -+#endif // defined(ARCH_CPU_32_BITS) && (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || - // defined(OS_CHROMEOS)) - - // See the comment in |UncheckedMalloc()|, it behaves as malloc() in these -@@ -624,5 +626,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { - - #endif // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) || defined(OS_ANDROID) - --#endif // !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && -+#endif // !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && - // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) diff --git a/devel/electron13/files/patch-base_process_process__handle.cc b/devel/electron13/files/patch-base_process_process__handle.cc deleted file mode 100644 index acc48a9b6ec4..000000000000 --- a/devel/electron13/files/patch-base_process_process__handle.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/process/process_handle.cc.orig 2021-01-07 00:36:18 UTC -+++ base/process/process_handle.cc -@@ -30,7 +30,7 @@ UniqueProcId GetUniqueIdForProcess() { - : UniqueProcId(GetCurrentProcId()); - } - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) - - void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) { - DCHECK(pid_outside_of_namespace != kNullProcessId); diff --git a/devel/electron13/files/patch-base_process_process__handle.h b/devel/electron13/files/patch-base_process_process__handle.h deleted file mode 100644 index a285186306f7..000000000000 --- a/devel/electron13/files/patch-base_process_process__handle.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/process/process_handle.h.orig 2021-01-07 00:36:18 UTC -+++ base/process/process_handle.h -@@ -103,7 +103,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); - // processes may be reused. - BASE_EXPORT UniqueProcId GetUniqueIdForProcess(); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // When a process is started in a different PID namespace from the browser - // process, this function must be called with the process's PID in the browser's - // PID namespace in order to initialize its unique ID. Not thread safe. diff --git a/devel/electron13/files/patch-base_process_process__handle__freebsd.cc b/devel/electron13/files/patch-base_process_process__handle__freebsd.cc deleted file mode 100644 index 4e7d19df3877..000000000000 --- a/devel/electron13/files/patch-base_process_process__handle__freebsd.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- base/process/process_handle_freebsd.cc.orig 2021-01-07 00:36:18 UTC -+++ base/process/process_handle_freebsd.cc -@@ -16,10 +16,13 @@ namespace base { - - ProcessId GetParentProcessId(ProcessHandle process) { - struct kinfo_proc info; -- size_t length; -+ size_t length = sizeof(struct kinfo_proc); - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process }; - - if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) -+ return -1; -+ -+ if (length < sizeof(struct kinfo_proc)) - return -1; - - return info.ki_ppid; diff --git a/devel/electron13/files/patch-base_process_process__iterator__freebsd.cc b/devel/electron13/files/patch-base_process_process__iterator__freebsd.cc deleted file mode 100644 index 54448477150b..000000000000 --- a/devel/electron13/files/patch-base_process_process__iterator__freebsd.cc +++ /dev/null @@ -1,53 +0,0 @@ ---- base/process/process_iterator_freebsd.cc.orig 2021-04-14 01:08:36 UTC -+++ base/process/process_iterator_freebsd.cc -@@ -10,6 +10,10 @@ - #include <sys/sysctl.h> - #include <unistd.h> - -+/* getuid() */ -+#include <unistd.h> -+#include <sys/types.h> -+ - #include "base/logging.h" - #include "base/stl_util.h" - #include "base/strings/string_split.h" -@@ -40,7 +44,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* - num_of_kinfo_proc += 16; - kinfo_procs_.resize(num_of_kinfo_proc); - len = num_of_kinfo_proc * sizeof(struct kinfo_proc); -- if (sysctl(mib, base::size(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) { -+ if (sysctl(mib, base::size(mib), kinfo_procs_.data(), &len, NULL, 0) < 0) { - // If we get a mem error, it just means we need a bigger buffer, so - // loop around again. Anything else is a real error and give up. - if (errno != ENOMEM) { -@@ -50,7 +54,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* - } - } else { - // Got the list, just make sure we're sized exactly right -- size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc); -+ num_of_kinfo_proc = len / sizeof(struct kinfo_proc); - kinfo_procs_.resize(num_of_kinfo_proc); - done = true; - } -@@ -72,18 +76,13 @@ bool ProcessIterator::CheckForNextProcess() { - for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { - size_t length; - struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; -- int mib[] = { CTL_KERN, KERN_PROC_ARGS, kinfo.ki_pid }; -+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, kinfo.ki_pid }; - - if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB)) - continue; - -- length = 0; -- if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) { -- LOG(ERROR) << "failed to figure out the buffer size for a command line"; -- continue; -- } -- -- data.resize(length); -+ data.resize(ARG_MAX); -+ length = ARG_MAX; - - if (sysctl(mib, base::size(mib), &data[0], &length, NULL, 0) < 0) { - LOG(ERROR) << "failed to fetch a commandline"; diff --git a/devel/electron13/files/patch-base_process_process__linux.cc b/devel/electron13/files/patch-base_process_process__linux.cc deleted file mode 100644 index d1707da456db..000000000000 --- a/devel/electron13/files/patch-base_process_process__linux.cc +++ /dev/null @@ -1,48 +0,0 @@ ---- base/process/process_linux.cc.orig 2021-07-15 19:13:29 UTC -+++ base/process/process_linux.cc -@@ -24,7 +24,9 @@ namespace base { - - namespace { - -+#if !defined(OS_BSD) - const int kForegroundPriority = 0; -+#endif - - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) - // We are more aggressive in our lowering of background process priority -@@ -69,7 +71,7 @@ struct CGroups { - return groups; - } - }; --#else -+#elif !defined(OS_BSD) - const int kBackgroundPriority = 5; - #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) - -@@ -85,13 +87,18 @@ Time Process::CreationTime() const { - if (!start_ticks) - return Time(); - -+#if defined(OS_BSD) -+ return Time::FromTimeT(start_ticks); -+#else - TimeDelta start_offset = internal::ClockTicksToTimeDelta(start_ticks); - Time boot_time = internal::GetBootTime(); - if (boot_time.is_null()) - return Time(); - return Time(boot_time + start_offset); -+#endif - } - -+#if !defined(OS_BSD) - // static - bool Process::CanBackgroundProcesses() { - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -143,6 +150,7 @@ bool Process::SetProcessBackgrounded(bool background) - DPCHECK(result == 0); - return result == 0; - } -+#endif // !defined(OS_BSD) - - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) - bool IsProcessBackgroundedCGroup(const StringPiece& cgroup_contents) { diff --git a/devel/electron13/files/patch-base_process_process__metrics.cc b/devel/electron13/files/patch-base_process_process__metrics.cc deleted file mode 100644 index 0c35504add85..000000000000 --- a/devel/electron13/files/patch-base_process_process__metrics.cc +++ /dev/null @@ -1,47 +0,0 @@ ---- base/process/process_metrics.cc.orig 2021-07-15 19:13:29 UTC -+++ base/process/process_metrics.cc -@@ -17,7 +17,7 @@ namespace base { - - namespace { - --#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_AIX) - int CalculateEventsPerSecond(uint64_t event_count, - uint64_t* last_event_count, -@@ -53,7 +53,7 @@ SystemMetrics SystemMetrics::Sample() { - SystemMetrics system_metrics; - - system_metrics.committed_memory_ = GetSystemCommitCharge(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - GetSystemMemoryInfo(&system_metrics.memory_info_); - GetVmStatInfo(&system_metrics.vmstat_info_); - GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -72,7 +72,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const - std::unique_ptr<DictionaryValue> res(new DictionaryValue()); - - res->SetIntKey("committed_memory", static_cast<int>(committed_memory_)); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - std::unique_ptr<DictionaryValue> meminfo = memory_info_.ToValue(); - std::unique_ptr<DictionaryValue> vmstat = vmstat_info_.ToValue(); - meminfo->MergeDictionary(vmstat.get()); -@@ -123,7 +123,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( - } - #endif - --#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_AIX) - int ProcessMetrics::CalculateIdleWakeupsPerSecond( - uint64_t absolute_idle_wakeups) { -@@ -136,7 +136,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { - NOTIMPLEMENTED(); // http://crbug.com/120488 - return 0; - } --#endif // defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || -+#endif // defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || - // defined(OS_AIX) - - #if defined(OS_APPLE) diff --git a/devel/electron13/files/patch-base_process_process__metrics.h b/devel/electron13/files/patch-base_process_process__metrics.h deleted file mode 100644 index b8874d46b820..000000000000 --- a/devel/electron13/files/patch-base_process_process__metrics.h +++ /dev/null @@ -1,163 +0,0 @@ ---- base/process/process_metrics.h.orig 2021-07-15 19:13:29 UTC -+++ base/process/process_metrics.h -@@ -47,7 +47,7 @@ namespace base { - // Full declaration is in process_metrics_iocounters.h. - struct IoCounters; - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - // Minor and major page fault counts since the process creation. - // Both counts are process-wide, and exclude child processes. - // -@@ -57,7 +57,7 @@ struct PageFaultCounts { - int64_t minor; - int64_t major; - }; --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - - // Convert a POSIX timeval to microseconds. - BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv); -@@ -98,7 +98,7 @@ class BASE_EXPORT ProcessMetrics { - // convenience wrapper for CreateProcessMetrics(). - static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - // Resident Set Size is a Linux/Android specific memory concept. Do not - // attempt to extend this to other platforms. - BASE_EXPORT size_t GetResidentSetSize() const; -@@ -124,7 +124,7 @@ class BASE_EXPORT ProcessMetrics { - // will result in a time delta of 2 seconds/per 1 wall-clock second. - TimeDelta GetCumulativeCPUUsage(); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ - defined(OS_AIX) - // Emits the cumulative CPU usage for all currently active threads since they - // were started into the output parameter (replacing its current contents). -@@ -159,7 +159,7 @@ class BASE_EXPORT ProcessMetrics { - bool ParseProcTimeInState(const std::string& content, - PlatformThreadId tid, - TimeInStatePerThread& time_in_state_per_thread); --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || - // defined(OS_AIX) - - // Returns the number of average idle cpu wakeups per second since the last -@@ -208,14 +208,14 @@ class BASE_EXPORT ProcessMetrics { - int GetOpenFdSoftLimit() const; - #endif // defined(OS_POSIX) - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - // Bytes of swap as reported by /proc/[pid]/status. - uint64_t GetVmSwapBytes() const; - - // Minor and major page fault count as reported by /proc/[pid]/stat. - // Returns true for success. - bool GetPageFaultCounts(PageFaultCounts* counts) const; --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - - // Returns total memory usage of malloc. - size_t GetMallocUsage(); -@@ -227,7 +227,7 @@ class BASE_EXPORT ProcessMetrics { - ProcessMetrics(ProcessHandle process, PortProvider* port_provider); - #endif // !defined(OS_MAC) - --#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_AIX) - int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); - #endif -@@ -238,10 +238,10 @@ class BASE_EXPORT ProcessMetrics { - uint64_t absolute_package_idle_wakeups); - #endif - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ - defined(OS_AIX) - CPU::CoreType GetCoreType(int core_index); --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || - // defined(OS_AIX) - - #if defined(OS_WIN) -@@ -263,7 +263,7 @@ class BASE_EXPORT ProcessMetrics { - // Number of bytes transferred to/from disk in bytes. - uint64_t last_cumulative_disk_usage_ = 0; - --#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_AIX) - // Same thing for idle wakeups. - TimeTicks last_idle_wakeups_time_; -@@ -315,7 +315,7 @@ BASE_EXPORT size_t GetHandleLimit(); - BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); - #endif // defined(OS_POSIX) - --#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_AIX) || \ - defined(OS_FUCHSIA) - // Data about system-wide memory consumption. Values are in KB. Available on -@@ -350,7 +350,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { - int avail_phys = 0; - #endif - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ - defined(OS_AIX) - // This provides an estimate of available memory as described here: - // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 -@@ -365,7 +365,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { - int swap_free = 0; - #endif - --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_AIX) || defined(OS_FUCHSIA) - int buffers = 0; - int cached = 0; -@@ -375,7 +375,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { - int inactive_file = 0; - int dirty = 0; - int reclaimable = 0; --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || - // defined(OS_AIX) defined(OS_FUCHSIA) - - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -398,11 +398,11 @@ struct BASE_EXPORT SystemMemoryInfoKB { - // Exposed for memory debugging widget. - BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); - --#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || - // defined(OS_CHROMEOS) defined(OS_ANDROID) || defined(OS_AIX) || - // defined(OS_FUCHSIA) - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ - defined(OS_AIX) - // Parse the data found in /proc/<pid>/stat and return the sum of the - // CPU-related ticks. Returns -1 on parse error. -@@ -477,7 +477,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis - // Returns the amount of time spent in user space since boot across all CPUs. - BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot(); - --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || - // defined(OS_AIX) - - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -589,7 +589,7 @@ class BASE_EXPORT SystemMetrics { - FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); - - size_t committed_memory_; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - SystemMemoryInfoKB memory_info_; - VmStatInfo vmstat_info_; - SystemDiskInfo disk_info_; diff --git a/devel/electron13/files/patch-base_process_process__metrics__freebsd.cc b/devel/electron13/files/patch-base_process_process__metrics__freebsd.cc deleted file mode 100644 index 93f441320d37..000000000000 --- a/devel/electron13/files/patch-base_process_process__metrics__freebsd.cc +++ /dev/null @@ -1,262 +0,0 @@ ---- base/process/process_metrics_freebsd.cc.orig 2021-01-07 00:36:18 UTC -+++ base/process/process_metrics_freebsd.cc -@@ -3,8 +3,10 @@ - // found in the LICENSE file. - - #include "base/process/process_metrics.h" -+#include "base/notreached.h" - - #include <stddef.h> -+#include <sys/types.h> - #include <sys/sysctl.h> - #include <sys/user.h> - #include <unistd.h> -@@ -14,11 +16,29 @@ - #include "base/process/process_metrics_iocounters.h" - #include "base/stl_util.h" - -+#include <unistd.h> /* getpagesize() */ -+#include <fcntl.h> /* O_RDONLY */ -+#include <kvm.h> -+#include <libutil.h> -+ - namespace base { -+namespace { - -+int GetPageShift() { -+ int pagesize = getpagesize(); -+ int pageshift = 0; -+ -+ while (pagesize > 1) { -+ pageshift++; -+ pagesize >>= 1; -+ } -+ -+ return pageshift; -+} -+} -+ - ProcessMetrics::ProcessMetrics(ProcessHandle process) -- : process_(process), -- last_cpu_(0) {} -+ : process_(process) {} - - // static - std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -69,4 +89,216 @@ size_t GetSystemCommitCharge() { - return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); - } - -+int GetNumberOfThreads(ProcessHandle process) { -+ // Taken from FreeBSD top (usr.bin/top/machine.c) -+ -+ kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open"); -+ if (kd == NULL) -+ return 0; -+ -+ struct kinfo_proc* pbase; -+ int nproc; -+ pbase = kvm_getprocs(kd, KERN_PROC_PID, process, &nproc); -+ if (pbase == NULL) -+ return 0; -+ -+ if (kvm_close(kd) == -1) -+ return 0; -+ -+ return nproc; -+} -+ -+bool GetSystemMemoryInfo(SystemMemoryInfoKB *meminfo) { -+ unsigned int mem_total, mem_free, swap_total, swap_used; -+ size_t length; -+ int pagesizeKB; -+ -+ pagesizeKB = getpagesize() / 1024; -+ -+ length = sizeof(mem_total); -+ if (sysctlbyname("vm.stats.vm.v_page_count", &mem_total, -+ &length, NULL, 0) != 0 || length != sizeof(mem_total)) -+ return false; -+ -+ length = sizeof(mem_free); -+ if (sysctlbyname("vm.stats.vm.v_free_count", &mem_free, &length, NULL, 0) -+ != 0 || length != sizeof(mem_free)) -+ return false; -+ -+ length = sizeof(swap_total); -+ if (sysctlbyname("vm.swap_size", &swap_total, &length, NULL, 0) -+ != 0 || length != sizeof(swap_total)) -+ return false; -+ -+ length = sizeof(swap_used); -+ if (sysctlbyname("vm.swap_anon_use", &swap_used, &length, NULL, 0) -+ != 0 || length != sizeof(swap_used)) -+ return false; -+ -+ meminfo->total = mem_total * pagesizeKB; -+ meminfo->free = mem_free * pagesizeKB; -+ meminfo->swap_total = swap_total * pagesizeKB; -+ meminfo->swap_free = (swap_total - swap_used) * pagesizeKB; -+ -+ return true; -+} -+ -+int ProcessMetrics::GetOpenFdCount() const { -+ struct kinfo_file * kif; -+ int cnt; -+ -+ if ((kif = kinfo_getfile(process_, &cnt)) == NULL) -+ return -1; -+ -+ free(kif); -+ -+ return cnt; -+} -+ -+int ProcessMetrics::GetOpenFdSoftLimit() const { -+ size_t length; -+ int total_count = 0; -+ int mib[] = { CTL_KERN, KERN_MAXFILESPERPROC }; -+ -+ length = sizeof(total_count); -+ -+ if (sysctl(mib, base::size(mib), &total_count, &length, NULL, 0) < 0) { -+ total_count = -1; -+ } -+ -+ return total_count; -+} -+ -+size_t ProcessMetrics::GetResidentSetSize() const { -+ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); -+ -+ if (kd == nullptr) -+ return 0; -+ -+ struct kinfo_proc *pp; -+ int nproc; -+ -+ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { -+ kvm_close(kd); -+ return 0; -+ } -+ -+ size_t rss; -+ -+ if (nproc > 0) { -+ rss = pp->ki_rssize << GetPageShift(); -+ } else { -+ rss = 0; -+ } -+ -+ kvm_close(kd); -+ return rss; -+} -+ -+uint64_t ProcessMetrics::GetVmSwapBytes() const { -+ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); -+ -+ if (kd == nullptr) -+ return 0; -+ -+ struct kinfo_proc *pp; -+ int nproc; -+ -+ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { -+ kvm_close(kd); -+ return 0; -+ } -+ -+ size_t swrss; -+ -+ if (nproc > 0) { -+ swrss = pp->ki_swrss > pp->ki_rssize -+ ? (pp->ki_swrss - pp->ki_rssize) << GetPageShift() -+ : 0; -+ } else { -+ swrss = 0; -+ } -+ -+ kvm_close(kd); -+ return swrss; -+} -+ -+int ProcessMetrics::GetIdleWakeupsPerSecond() { -+ NOTIMPLEMENTED(); -+ return 0; -+} -+ -+bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) { -+ NOTIMPLEMENTED(); -+ return false; -+} -+ -+bool GetVmStatInfo(VmStatInfo* vmstat) { -+ NOTIMPLEMENTED(); -+ return false; -+} -+ -+SystemDiskInfo::SystemDiskInfo() { -+ reads = 0; -+ reads_merged = 0; -+ sectors_read = 0; -+ read_time = 0; -+ writes = 0; -+ writes_merged = 0; -+ sectors_written = 0; -+ write_time = 0; -+ io = 0; -+ io_time = 0; -+ weighted_io_time = 0; -+} -+ -+SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo& other) = default; -+ -+std::unique_ptr<Value> SystemDiskInfo::ToValue() const { -+ auto res = std::make_unique<DictionaryValue>(); -+ -+ // Write out uint64_t variables as doubles. -+ // Note: this may discard some precision, but for JS there's no other option. -+ res->SetDouble("reads", static_cast<double>(reads)); -+ res->SetDouble("reads_merged", static_cast<double>(reads_merged)); -+ res->SetDouble("sectors_read", static_cast<double>(sectors_read)); -+ res->SetDouble("read_time", static_cast<double>(read_time)); -+ res->SetDouble("writes", static_cast<double>(writes)); -+ res->SetDouble("writes_merged", static_cast<double>(writes_merged)); -+ res->SetDouble("sectors_written", static_cast<double>(sectors_written)); -+ res->SetDouble("write_time", static_cast<double>(write_time)); -+ res->SetDouble("io", static_cast<double>(io)); -+ res->SetDouble("io_time", static_cast<double>(io_time)); -+ res->SetDouble("weighted_io_time", static_cast<double>(weighted_io_time)); -+ -+ return std::move(res); -+} -+ -+std::unique_ptr<DictionaryValue> SystemMemoryInfoKB::ToValue() const { -+ auto res = std::make_unique<DictionaryValue>(); -+ res->SetIntKey("total", total); -+ res->SetIntKey("free", free); -+ res->SetIntKey("available", available); -+ res->SetIntKey("buffers", buffers); -+ res->SetIntKey("cached", cached); -+ res->SetIntKey("active_anon", active_anon); -+ res->SetIntKey("inactive_anon", inactive_anon); -+ res->SetIntKey("active_file", active_file); -+ res->SetIntKey("inactive_file", inactive_file); -+ res->SetIntKey("swap_total", swap_total); -+ res->SetIntKey("swap_free", swap_free); -+ res->SetIntKey("swap_used", swap_total - swap_free); -+ res->SetIntKey("dirty", dirty); -+ res->SetIntKey("reclaimable", reclaimable); -+ -+ return res; -+} -+ -+std::unique_ptr<DictionaryValue> VmStatInfo::ToValue() const { -+ auto res = std::make_unique<DictionaryValue>(); -+ res->SetIntKey("pswpin", pswpin); -+ res->SetIntKey("pswpout", pswpout); -+ res->SetIntKey("pgmajfault", pgmajfault); -+ return res; -+} - } // namespace base diff --git a/devel/electron13/files/patch-base_process_process__metrics__posix.cc b/devel/electron13/files/patch-base_process_process__metrics__posix.cc deleted file mode 100644 index ef95705d21c3..000000000000 --- a/devel/electron13/files/patch-base_process_process__metrics__posix.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- base/process/process_metrics_posix.cc.orig 2021-01-07 00:36:18 UTC -+++ base/process/process_metrics_posix.cc -@@ -20,6 +20,8 @@ - - #if defined(OS_APPLE) - #include <malloc/malloc.h> -+#elif defined(OS_FREEBSD) -+#include <stdlib.h> - #else - #include <malloc.h> - #endif -@@ -126,7 +128,7 @@ size_t ProcessMetrics::GetMallocUsage() { - #else - return minfo.hblkhd + minfo.arena; - #endif --#elif defined(OS_FUCHSIA) -+#elif defined(OS_FUCHSIA) || defined(OS_BSD) - // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. - return 0; - #endif diff --git a/devel/electron13/files/patch-base_process_process__unittest.cc b/devel/electron13/files/patch-base_process_process__unittest.cc deleted file mode 100644 index e7a4a43484fa..000000000000 --- a/devel/electron13/files/patch-base_process_process__unittest.cc +++ /dev/null @@ -1,27 +0,0 @@ ---- base/process/process_unittest.cc.orig 2021-07-15 19:13:29 UTC -+++ base/process/process_unittest.cc -@@ -139,7 +139,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { - // was spawned and a time recorded after it was spawned. However, since the - // base::Time and process creation clocks don't match, tolerate some error. - constexpr base::TimeDelta kTolerance = --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // On Linux, process creation time is relative to boot time which has a - // 1-second resolution. Tolerate 1 second for the imprecise boot time and - // 100 ms for the imprecise clock. -@@ -287,6 +287,7 @@ TEST_F(ProcessTest, WaitForExitOrEventWithEventSet) { - } - #endif // OS_WIN - -+#if !defined(OS_BSD) - // Ensure that the priority of a process is restored correctly after - // backgrounding and restoring. - // Note: a platform may not be willing or able to lower the priority of -@@ -344,6 +345,7 @@ TEST_F(ProcessTest, SetProcessBackgroundedSelf) { - int new_priority = process.GetPriority(); - EXPECT_EQ(old_priority, new_priority); - } -+#endif - - // Consumers can use WaitForExitWithTimeout(base::TimeDelta(), nullptr) to check - // whether the process is still running. This may not be safe because of the diff --git a/devel/electron13/files/patch-base_process_process__util__unittest.cc b/devel/electron13/files/patch-base_process_process__util__unittest.cc deleted file mode 100644 index e143be9d9f2b..000000000000 --- a/devel/electron13/files/patch-base_process_process__util__unittest.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- base/process/process_util_unittest.cc.orig 2021-07-15 19:13:29 UTC -+++ base/process/process_util_unittest.cc -@@ -1337,11 +1337,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli - options.fds_to_remap.emplace_back(fds[1], STDOUT_FILENO); - #endif // defined(OS_WIN) - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - options.clone_flags = clone_flags; - #else - CHECK_EQ(0, clone_flags); --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - EXPECT_TRUE(LaunchProcess(cmdline, options).IsValid()); - write_pipe.Close(); diff --git a/devel/electron13/files/patch-base_profiler_register__context.h b/devel/electron13/files/patch-base_profiler_register__context.h deleted file mode 100644 index d3567c52cfc2..000000000000 --- a/devel/electron13/files/patch-base_profiler_register__context.h +++ /dev/null @@ -1,60 +0,0 @@ ---- base/profiler/register_context.h.orig 2021-01-07 00:36:18 UTC -+++ base/profiler/register_context.h -@@ -17,7 +17,7 @@ - #include <windows.h> - #elif defined(OS_APPLE) - #include <mach/machine/thread_status.h> --#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #include <sys/ucontext.h> - #endif - -@@ -190,6 +190,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc - } - - #endif // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS) -+ -+#elif defined(OS_FREEBSD) -+ -+using RegisterContext = mcontext_t; -+ -+#if defined(ARCH_CPU_X86_64) -+inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) { -+ return AsUintPtr(&context->mc_rsp); -+} -+ -+inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) { -+ return AsUintPtr(&context->mc_rbp); -+} -+ -+inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) { -+ return AsUintPtr(&context->mc_rip); -+} -+#elif defined(ARCH_CPU_X86) -+inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) { -+ return AsUintPtr(&context->mc_esp); -+} -+ -+inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) { -+ return AsUintPtr(&context->mc_ebp); -+} -+ -+inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) { -+ return AsUintPtr(&context->mc_eip); -+} -+#elif defined(ARCH_CPU_ARM64) -+inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) { -+ return AsUintPtr(&context->mc_gpregs.gp_sp); -+} -+ -+inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) { -+ return AsUintPtr(&context->mc_gpregs.gp_x[29]); -+} -+ -+inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) { -+ return AsUintPtr(&context->mc_gpregs.gp_elr); -+} -+#endif - - #else // #if defined(OS_WIN) - diff --git a/devel/electron13/files/patch-base_profiler_sampling__profiler__thread__token.cc b/devel/electron13/files/patch-base_profiler_sampling__profiler__thread__token.cc deleted file mode 100644 index db3ea5be4c96..000000000000 --- a/devel/electron13/files/patch-base_profiler_sampling__profiler__thread__token.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/profiler/sampling_profiler_thread_token.cc.orig 2021-01-07 00:36:18 UTC -+++ base/profiler/sampling_profiler_thread_token.cc -@@ -7,7 +7,7 @@ - namespace base { - - SamplingProfilerThreadToken GetSamplingProfilerCurrentThreadToken() { --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - return {PlatformThread::CurrentId(), pthread_self()}; - #else - return {PlatformThread::CurrentId()}; diff --git a/devel/electron13/files/patch-base_profiler_sampling__profiler__thread__token.h b/devel/electron13/files/patch-base_profiler_sampling__profiler__thread__token.h deleted file mode 100644 index 6e49a9589775..000000000000 --- a/devel/electron13/files/patch-base_profiler_sampling__profiler__thread__token.h +++ /dev/null @@ -1,20 +0,0 @@ ---- base/profiler/sampling_profiler_thread_token.h.orig 2021-01-07 00:36:18 UTC -+++ base/profiler/sampling_profiler_thread_token.h -@@ -9,7 +9,7 @@ - #include "base/threading/platform_thread.h" - #include "build/build_config.h" - --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #include <pthread.h> - #endif - -@@ -21,7 +21,7 @@ namespace base { - // functions used to obtain the stack base address. - struct SamplingProfilerThreadToken { - PlatformThreadId id; --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - pthread_t pthread_id; - #endif - }; diff --git a/devel/electron13/files/patch-base_profiler_stack__copier__signal.cc b/devel/electron13/files/patch-base_profiler_stack__copier__signal.cc deleted file mode 100644 index f6ff43b8395b..000000000000 --- a/devel/electron13/files/patch-base_profiler_stack__copier__signal.cc +++ /dev/null @@ -1,63 +0,0 @@ ---- base/profiler/stack_copier_signal.cc.orig 2021-07-15 19:13:29 UTC -+++ base/profiler/stack_copier_signal.cc -@@ -4,7 +4,14 @@ - - #include "base/profiler/stack_copier_signal.h" - -+#if defined(OS_LINUX) - #include <linux/futex.h> -+#include <syscall.h> -+#elif defined(OS_FREEBSD) -+#include <sys/types.h> -+#include <sys/thr.h> -+#include <sys/umtx.h> -+#endif - #include <signal.h> - #include <sys/ucontext.h> - #include <syscall.h> -@@ -36,8 +43,13 @@ class AsyncSafeWaitableEvent { - // for a pthread mutex. So, also check the condition. - while (true) { - int res = -+#if defined(OS_LINUX) - syscall(SYS_futex, futex_int_ptr(), FUTEX_WAIT | FUTEX_PRIVATE_FLAG, - 0, nullptr, nullptr, 0); -+#elif defined(OS_FREEBSD) -+ _umtx_op(futex_int_ptr(), UMTX_OP_WAIT_UINT_PRIVATE, 0, nullptr, -+ nullptr); -+#endif - if (futex_.load(std::memory_order_acquire) != 0) - return true; - if (res != 0) -@@ -47,8 +59,12 @@ class AsyncSafeWaitableEvent { - - void Signal() { - futex_.store(1, std::memory_order_release); -+#if defined(OS_LINUX) - syscall(SYS_futex, futex_int_ptr(), FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1, - nullptr, nullptr, 0); -+#elif defined(OS_FREEBSD) -+ _umtx_op(futex_int_ptr(), UMTX_OP_WAKE_PRIVATE, 1, nullptr, nullptr); -+#endif - } - - private: -@@ -222,11 +238,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b - if (!scoped_sigaction.succeeded()) - return false; - -+#if defined(OS_LINUX) - if (syscall(SYS_tgkill, getpid(), thread_delegate_->GetThreadId(), - SIGURG) != 0) { - NOTREACHED(); - return false; - } -+#elif defined(OS_FREEBSD) -+ if (thr_kill2(getpid(), thread_delegate_->GetThreadId(), SIGURG) != 0) { -+ NOTREACHED(); -+ return false; -+ } -+#endif - bool finished_waiting = wait_event.Wait(); - TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cpu_profiler.debug"), - "StackCopierSignal copy stack"); diff --git a/devel/electron13/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/devel/electron13/files/patch-base_profiler_stack__sampling__profiler__test__util.cc deleted file mode 100644 index a4d40f3a6bd4..000000000000 --- a/devel/electron13/files/patch-base_profiler_stack__sampling__profiler__test__util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/profiler/stack_sampling_profiler_test_util.cc.orig 2021-01-07 00:36:18 UTC -+++ base/profiler/stack_sampling_profiler_test_util.cc -@@ -32,7 +32,7 @@ - // Fortunately, it provides _alloca, which functions identically. - #include <malloc.h> - #define alloca _alloca --#else -+#elif !defined(OS_BSD) - #include <alloca.h> - #endif - diff --git a/devel/electron13/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/devel/electron13/files/patch-base_profiler_stack__sampling__profiler__unittest.cc deleted file mode 100644 index f70f0e8e027f..000000000000 --- a/devel/electron13/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2021-01-07 00:36:18 UTC -+++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -42,7 +42,7 @@ - #include <intrin.h> - #include <malloc.h> - #include <windows.h> --#else -+#elif !defined(OS_BSD) - #include <alloca.h> - #endif - diff --git a/devel/electron13/files/patch-base_profiler_thread__delegate__posix.cc b/devel/electron13/files/patch-base_profiler_thread__delegate__posix.cc deleted file mode 100644 index cc0fa699df7d..000000000000 --- a/devel/electron13/files/patch-base_profiler_thread__delegate__posix.cc +++ /dev/null @@ -1,67 +0,0 @@ ---- base/profiler/thread_delegate_posix.cc.orig 2021-01-07 00:36:18 UTC -+++ base/profiler/thread_delegate_posix.cc -@@ -12,6 +12,9 @@ - #include "base/profiler/thread_delegate_posix.h" - #include "base/stl_util.h" - #include "build/build_config.h" -+#if defined(OS_FREEBSD) -+#include <pthread_np.h> -+#endif - - #if defined(OS_ANDROID) - #include "base/files/file_util.h" -@@ -43,7 +46,12 @@ base::Optional<uintptr_t> GetAndroidMainThreadStackBas - uintptr_t GetThreadStackBaseAddressImpl( - SamplingProfilerThreadToken thread_token) { - pthread_attr_t attr; -+#if defined(OS_FREEBSD) -+ pthread_attr_init(&attr); -+ pthread_attr_get_np(thread_token.pthread_id, &attr); -+#elif defined(OS_LINUX) - pthread_getattr_np(thread_token.pthread_id, &attr); -+#endif - // See crbug.com/617730 for limitations of this approach on Linux. - void* address; - size_t size; -@@ -130,16 +138,33 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist - return { - // Return the set of callee-save registers per the i386 System V ABI - // section 2.2.3, plus the stack pointer. -+#if defined(OS_FREEBSD) -+ reinterpret_cast<uintptr_t*>(&thread_context->mc_ebx), -+ reinterpret_cast<uintptr_t*>(&thread_context->mc_ebp), -+ reinterpret_cast<uintptr_t*>(&thread_context->mc_esi), -+ reinterpret_cast<uintptr_t*>(&thread_context->mc_edi), -+ reinterpret_cast<uintptr_t*>(&thread_context->mc_esp), -+#else - reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_EBX]), - reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_EBP]), - reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_ESI]), - reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_EDI]), - reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_ESP]), -+#endif - }; - #elif defined(ARCH_CPU_X86_FAMILY) && defined(ARCH_CPU_64_BITS) - return { - // Return the set of callee-save registers per the x86-64 System V ABI - // section 3.2.1, plus the stack pointer. -+#if defined(OS_FREEBSD) -+ reinterpret_cast<uintptr_t*>(&thread_context->mc_rbp), -+ reinterpret_cast<uintptr_t*>(&thread_context->mc_rbx), -+ reinterpret_cast<uintptr_t*>(&thread_context->mc_r12), -+ reinterpret_cast<uintptr_t*>(&thread_context->mc_r13), -+ reinterpret_cast<uintptr_t*>(&thread_context->mc_r14), -+ reinterpret_cast<uintptr_t*>(&thread_context->mc_r15), -+ reinterpret_cast<uintptr_t*>(&thread_context->mc_rsp), -+#else - reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBP]), - reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBX]), - reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R12]), -@@ -147,6 +172,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist - reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R14]), - reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R15]), - reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RSP]), -+#endif - }; - #else // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS) - // Unimplemented for other architectures. diff --git a/devel/electron13/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc b/devel/electron13/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc deleted file mode 100644 index 8e2afb65b1c0..000000000000 --- a/devel/electron13/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc +++ /dev/null @@ -1,24 +0,0 @@ ---- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2021-01-07 00:36:18 UTC -+++ base/sampling_heap_profiler/sampling_heap_profiler.cc -@@ -30,6 +30,10 @@ - #include <sys/prctl.h> - #endif - -+#if defined(OS_BSD) -+#include <pthread_np.h> -+#endif -+ - #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \ - defined(OFFICIAL_BUILD) - #include "base/trace_event/cfi_backtrace_android.h" // no-presubmit-check -@@ -65,6 +69,10 @@ const char* GetAndLeakThreadName() { - #elif defined(OS_APPLE) - int err = pthread_getname_np(pthread_self(), name, kBufferLen); - if (err == 0 && *name != '\0') -+ return strdup(name); -+#elif defined(OS_BSD) && __FreeBSD__ >= 12 -+ pthread_get_name_np(pthread_self(), name, kBufferLen); -+ if (*name != '\0') - return strdup(name); - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) - diff --git a/devel/electron13/files/patch-base_security__unittest.cc b/devel/electron13/files/patch-base_security__unittest.cc deleted file mode 100644 index 2ea783870412..000000000000 --- a/devel/electron13/files/patch-base_security__unittest.cc +++ /dev/null @@ -1,28 +0,0 @@ ---- base/security_unittest.cc.orig 2021-01-07 00:36:18 UTC -+++ base/security_unittest.cc -@@ -61,7 +61,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu - void OverflowTestsSoftExpectTrue(bool overflow_detected) { - if (!overflow_detected) { - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_APPLE) -+ defined(OS_APPLE) || defined(OS_BSD) - // Sadly, on Linux, Android, and OSX we don't have a good story yet. Don't - // fail the test, but report. - printf("Platform has overflow: %s\n", -@@ -123,7 +123,7 @@ TEST(SecurityTest, MAYBE_NewOverflow) { - #endif // !defined(OS_WIN) || !defined(ARCH_CPU_64_BITS) - } - --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(__x86_64__) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(__x86_64__) - // Check if ptr1 and ptr2 are separated by less than size chars. - bool ArePointersToSameArea(void* ptr1, void* ptr2, size_t size) { - ptrdiff_t ptr_diff = reinterpret_cast<char*>(std::max(ptr1, ptr2)) - -@@ -177,6 +177,6 @@ TEST(SecurityTest, MALLOC_OVERFLOW_TEST(RandomMemoryAl - EXPECT_FALSE(impossible_random_address); - } - --#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(__x86_64__) -+#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(__x86_64__) - - } // namespace diff --git a/devel/electron13/files/patch-base_strings_safe__sprintf__unittest.cc b/devel/electron13/files/patch-base_strings_safe__sprintf__unittest.cc deleted file mode 100644 index 6ad41093b744..000000000000 --- a/devel/electron13/files/patch-base_strings_safe__sprintf__unittest.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- base/strings/safe_sprintf_unittest.cc.orig 2021-01-07 00:36:18 UTC -+++ base/strings/safe_sprintf_unittest.cc -@@ -730,6 +730,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { - } - - TEST(SafeSPrintfTest, EmitNULL) { -+/* Avoid compiler error: http://pastebin.com/1edWUE84 - char buf[40]; - #if defined(__GNUC__) - #pragma GCC diagnostic push -@@ -741,6 +742,7 @@ TEST(SafeSPrintfTest, EmitNULL) { - EXPECT_EQ("0x0", std::string(buf)); - EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL)); - EXPECT_EQ("<NULL>", std::string(buf)); -+*/ - #if defined(__GCC__) - #pragma GCC diagnostic pop - #endif diff --git a/devel/electron13/files/patch-base_strings_sys__string__conversions__unittest.cc b/devel/electron13/files/patch-base_strings_sys__string__conversions__unittest.cc deleted file mode 100644 index 9720e31491b4..000000000000 --- a/devel/electron13/files/patch-base_strings_sys__string__conversions__unittest.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- base/strings/sys_string_conversions_unittest.cc.orig 2021-01-07 00:36:18 UTC -+++ base/strings/sys_string_conversions_unittest.cc -@@ -76,7 +76,7 @@ TEST(SysStrings, SysUTF8ToWide) { - } - - // Tests depend on setting a specific Linux locale. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - TEST(SysStrings, SysWideToNativeMB) { - #if !defined(SYSTEM_NATIVE_UTF8) - ScopedLocale locale("en_US.UTF-8"); -@@ -191,6 +191,6 @@ TEST(SysStrings, SysNativeMBAndWide) { - EXPECT_EQ(wide, trip); - } - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - } // namespace base diff --git a/devel/electron13/files/patch-base_synchronization_lock__impl.h b/devel/electron13/files/patch-base_synchronization_lock__impl.h deleted file mode 100644 index 4fa02c88ed8d..000000000000 --- a/devel/electron13/files/patch-base_synchronization_lock__impl.h +++ /dev/null @@ -1,19 +0,0 @@ ---- base/synchronization/lock_impl.h.orig 2021-01-07 00:36:18 UTC -+++ base/synchronization/lock_impl.h -@@ -105,6 +105,8 @@ void LockImpl::Unlock() { - } - - #elif defined(OS_POSIX) || defined(OS_FUCHSIA) -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wthread-safety-analysis" - - bool LockImpl::Try() { - int rv = pthread_mutex_trylock(&native_handle_); -@@ -116,6 +118,7 @@ void LockImpl::Unlock() { - int rv = pthread_mutex_unlock(&native_handle_); - DCHECK_EQ(rv, 0) << ". " << strerror(rv); - } -+#pragma GCC diagnostic pop - #endif - - // This is an implementation used for AutoLock templated on the lock type. diff --git a/devel/electron13/files/patch-base_syslog__logging.cc b/devel/electron13/files/patch-base_syslog__logging.cc deleted file mode 100644 index 68701f77ea67..000000000000 --- a/devel/electron13/files/patch-base_syslog__logging.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- base/syslog_logging.cc.orig 2021-01-07 00:36:18 UTC -+++ base/syslog_logging.cc -@@ -13,7 +13,7 @@ - #include "base/strings/string_util.h" - #include "base/win/scoped_handle.h" - #include "base/win/win_util.h" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with - // base::LOG_INFO, base::LOG_WARNING. - #include <syslog.h> -@@ -134,7 +134,7 @@ EventLogMessage::~EventLogMessage() { - - if (user_sid != nullptr) - ::LocalFree(user_sid); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - const char kEventSource[] = "chrome"; - openlog(kEventSource, LOG_NOWAIT | LOG_PID, LOG_USER); - // We can't use the defined names for the logging severity from syslog.h diff --git a/devel/electron13/files/patch-base_system_sys__info.cc b/devel/electron13/files/patch-base_system_sys__info.cc deleted file mode 100644 index 89bb86970d2b..000000000000 --- a/devel/electron13/files/patch-base_system_sys__info.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/system/sys_info.cc.orig 2021-04-14 01:08:36 UTC -+++ base/system/sys_info.cc -@@ -94,7 +94,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void( - #if defined(OS_WIN) || defined(OS_ANDROID) || defined(OS_APPLE) - base::ThreadPool::PostTaskAndReplyWithResult( - FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback)); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - base::ThreadPool::PostTaskAndReplyWithResult( - FROM_HERE, {base::MayBlock()}, base::BindOnce(&GetHardwareInfoSync), - std::move(callback)); diff --git a/devel/electron13/files/patch-base_system_sys__info.h b/devel/electron13/files/patch-base_system_sys__info.h deleted file mode 100644 index 38527e6dff73..000000000000 --- a/devel/electron13/files/patch-base_system_sys__info.h +++ /dev/null @@ -1,20 +0,0 @@ ---- base/system/sys_info.h.orig 2021-07-15 19:13:29 UTC -+++ base/system/sys_info.h -@@ -209,6 +209,8 @@ class BASE_EXPORT SysInfo { - // On Desktop this returns true when memory <= 512MB. - static bool IsLowEndDevice(); - -+ static uint64_t MaxSharedMemorySize(); -+ - private: - FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); - FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -218,7 +220,7 @@ class BASE_EXPORT SysInfo { - static bool IsLowEndDeviceImpl(); - static HardwareInfo GetHardwareInfoSync(); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ - defined(OS_AIX) - static int64_t AmountOfAvailablePhysicalMemory( - const SystemMemoryInfoKB& meminfo); diff --git a/devel/electron13/files/patch-base_system_sys__info__freebsd.cc b/devel/electron13/files/patch-base_system_sys__info__freebsd.cc deleted file mode 100644 index f479b84ebdd5..000000000000 --- a/devel/electron13/files/patch-base_system_sys__info__freebsd.cc +++ /dev/null @@ -1,102 +0,0 @@ ---- base/system/sys_info_freebsd.cc.orig 2021-01-07 00:36:18 UTC -+++ base/system/sys_info_freebsd.cc -@@ -9,30 +9,95 @@ - #include <sys/sysctl.h> - - #include "base/notreached.h" -+#include "base/process/process_metrics.h" -+#include "base/strings/string_util.h" - - namespace base { - - int64_t SysInfo::AmountOfPhysicalMemoryImpl() { -- int pages, page_size; -+ int pages, page_size, r = 0; - size_t size = sizeof(pages); -- sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); -- sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); -- if (pages == -1 || page_size == -1) { -+ -+ if (r == 0) -+ r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); -+ if (r == 0) -+ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); -+ -+ if (r == -1) { - NOTREACHED(); - return 0; - } -+ - return static_cast<int64_t>(pages) * page_size; - } - -+int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { -+ int page_size, r = 0; -+ unsigned int pgfree, pginact, pgcache; -+ size_t size = sizeof(page_size); -+ size_t szpg = sizeof(pgfree); -+ -+ if (r == 0) -+ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); -+ if (r == 0) -+ r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0); -+ if (r == 0) -+ r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0); -+ if (r == 0) -+ r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0); -+ -+ if (r == -1) { -+ NOTREACHED(); -+ return 0; -+ } -+ -+ return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size); -+} -+ - // static -+int64_t SysInfo::AmountOfAvailablePhysicalMemory(const SystemMemoryInfoKB& info) { -+ int64_t res_kb = info.available != 0 -+ ? info.available - info.active_file -+ : info.free + info.reclaimable + info.inactive_file; -+ return res_kb * 1024; -+} -+ -+// static -+std::string SysInfo::CPUModelName() { -+ int mib[] = { CTL_HW, HW_MODEL }; -+ char name[256]; -+ size_t size = base::size(name); -+ -+ if (sysctl(mib, base::size(mib), &name, &size, NULL, 0) == 0) { -+ return name; -+ } -+ -+ return std::string(); -+} -+ -+// static - uint64_t SysInfo::MaxSharedMemorySize() { - size_t limit; - size_t size = sizeof(limit); -+ - if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) { - NOTREACHED(); - return 0; - } -+ - return static_cast<uint64_t>(limit); -+} -+ -+SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() { -+ HardwareInfo info; -+ -+ info.manufacturer = "FreeBSD"; -+ info.model = HardwareModelName(); -+ -+ DCHECK(IsStringUTF8(info.manufacturer)); -+ DCHECK(IsStringUTF8(info.model)); -+ -+ return info; - } - - } // namespace base diff --git a/devel/electron13/files/patch-base_system_sys__info__posix.cc b/devel/electron13/files/patch-base_system_sys__info__posix.cc deleted file mode 100644 index cc295253fdc0..000000000000 --- a/devel/electron13/files/patch-base_system_sys__info__posix.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- base/system/sys_info_posix.cc.orig 2021-07-15 19:13:29 UTC -+++ base/system/sys_info_posix.cc -@@ -26,6 +26,11 @@ - #if defined(OS_ANDROID) - #include <sys/vfs.h> - #define statvfs statfs // Android uses a statvfs-like statfs struct and call. -+#elif defined(OS_BSD) -+#include <sys/param.h> -+#include <sys/mount.h> -+#define statvfs statfs -+#define f_frsize f_bsize - #else - #include <sys/statvfs.h> - #endif -@@ -239,6 +244,8 @@ std::string SysInfo::OperatingSystemArchitecture() { - arch = "x86"; - } else if (arch == "amd64") { - arch = "x86_64"; -+ } else if (arch == "arm64") { -+ arch = "aarch64"; - } else if (std::string(info.sysname) == "AIX") { - arch = "ppc64"; - } diff --git a/devel/electron13/files/patch-base_system_sys__info__unittest.cc b/devel/electron13/files/patch-base_system_sys__info__unittest.cc deleted file mode 100644 index f56d241f5c1e..000000000000 --- a/devel/electron13/files/patch-base_system_sys__info__unittest.cc +++ /dev/null @@ -1,46 +0,0 @@ ---- base/system/sys_info_unittest.cc.orig 2021-07-15 19:13:29 UTC -+++ base/system/sys_info_unittest.cc -@@ -63,13 +63,13 @@ TEST_F(SysInfoTest, AmountOfMem) { - EXPECT_GE(SysInfo::AmountOfVirtualMemory(), 0); - } - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #define MAYBE_AmountOfAvailablePhysicalMemory \ - DISABLED_AmountOfAvailablePhysicalMemory - #else - #define MAYBE_AmountOfAvailablePhysicalMemory AmountOfAvailablePhysicalMemory --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMemory) { - // Note: info is in _K_bytes. - SystemMemoryInfoKB info; -@@ -100,7 +100,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMem - EXPECT_GT(amount, static_cast<int64_t>(info.free) * 1024); - EXPECT_LT(amount / 1024, info.total); - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - - TEST_F(SysInfoTest, AmountOfFreeDiskSpace) { - // We aren't actually testing that it's correct, just that it's sane. -@@ -150,7 +150,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac - } - #endif // defined(OS_FUCHSIA) - --#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) || defined(OS_FUCHSIA) - TEST_F(SysInfoTest, OperatingSystemVersionNumbers) { - int32_t os_major_version = -1; -@@ -236,7 +236,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) { - EXPECT_TRUE(IsStringUTF8(hardware_info->model)); - bool empty_result_expected = - #if defined(OS_ANDROID) || defined(OS_APPLE) || defined(OS_WIN) || \ -- defined(OS_LINUX) || defined(OS_CHROMEOS) -+ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - false; - #else - true; diff --git a/devel/electron13/files/patch-base_task_thread__pool_environment__config__unittest.cc b/devel/electron13/files/patch-base_task_thread__pool_environment__config__unittest.cc deleted file mode 100644 index e39f28a82636..000000000000 --- a/devel/electron13/files/patch-base_task_thread__pool_environment__config__unittest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/task/thread_pool/environment_config_unittest.cc.orig 2021-01-07 00:36:18 UTC -+++ base/task/thread_pool/environment_config_unittest.cc -@@ -14,7 +14,7 @@ namespace internal { - TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPriorityForWorker) { - #if defined(OS_WIN) || defined(OS_APPLE) - EXPECT_TRUE(CanUseBackgroundPriorityForWorkerThread()); --#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) || defined(OS_NACL) - EXPECT_FALSE(CanUseBackgroundPriorityForWorkerThread()); - #else diff --git a/devel/electron13/files/patch-base_test_BUILD.gn b/devel/electron13/files/patch-base_test_BUILD.gn deleted file mode 100644 index 77bae6d08070..000000000000 --- a/devel/electron13/files/patch-base_test_BUILD.gn +++ /dev/null @@ -1,15 +0,0 @@ ---- base/test/BUILD.gn.orig 2021-07-15 19:13:29 UTC -+++ base/test/BUILD.gn -@@ -423,7 +423,11 @@ if (is_linux || is_chromeos) { - - copy("fonts_conf") { - sources = [ "fonts.conf" ] -- outputs = [ "${root_build_dir}/etc/fonts/{{source_file_part}}" ] -+ if (is_bsd) { -+ outputs = [ "${root_build_dir}/usr/local/etc/fonts/{{source_file_part}}" ] -+ } else { -+ outputs = [ "${root_build_dir}/etc/fonts/{{source_file_part}}" ] -+ } - } - - if (current_toolchain == host_toolchain) { diff --git a/devel/electron13/files/patch-base_test_launcher_test__launcher.cc b/devel/electron13/files/patch-base_test_launcher_test__launcher.cc deleted file mode 100644 index 55bac7ae1fb8..000000000000 --- a/devel/electron13/files/patch-base_test_launcher_test__launcher.cc +++ /dev/null @@ -1,28 +0,0 @@ ---- base/test/launcher/test_launcher.cc.orig 2021-07-15 19:13:29 UTC -+++ base/test/launcher/test_launcher.cc -@@ -58,6 +58,7 @@ - #include "testing/gtest/include/gtest/gtest.h" - - #if defined(OS_POSIX) -+#include <signal.h> - #include <fcntl.h> - - #include "base/files/file_descriptor_watcher_posix.h" -@@ -599,7 +600,7 @@ ChildProcessResults DoLaunchChildTestProcess( - #if !defined(OS_FUCHSIA) - options.new_process_group = true; - #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - options.kill_on_parent_death = true; - #endif - -@@ -1515,7 +1516,7 @@ bool TestLauncher::Init(CommandLine* command_line) { - results_tracker_.AddGlobalTag("OS_IOS"); - #endif - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - results_tracker_.AddGlobalTag("OS_LINUX"); - #endif - diff --git a/devel/electron13/files/patch-base_test_test__file__util__posix.cc b/devel/electron13/files/patch-base_test_test__file__util__posix.cc deleted file mode 100644 index 95555a9ba8bb..000000000000 --- a/devel/electron13/files/patch-base_test_test__file__util__posix.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/test/test_file_util_posix.cc.orig 2021-01-07 00:36:18 UTC -+++ base/test/test_file_util_posix.cc -@@ -87,7 +87,7 @@ void SyncPageCacheToDisk() { - sync(); - } - --#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_APPLE) && \ -+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_APPLE) && !defined(OS_BSD) && \ - !defined(OS_ANDROID) - bool EvictFileFromSystemCache(const FilePath& file) { - // There doesn't seem to be a POSIX way to cool the disk cache. diff --git a/devel/electron13/files/patch-base_test_test__suite.cc b/devel/electron13/files/patch-base_test_test__suite.cc deleted file mode 100644 index 06e8f60b02f8..000000000000 --- a/devel/electron13/files/patch-base_test_test__suite.cc +++ /dev/null @@ -1,55 +0,0 @@ ---- base/test/test_suite.cc.orig 2021-07-15 19:13:29 UTC -+++ base/test/test_suite.cc -@@ -68,7 +68,7 @@ - #include "base/test/test_support_android.h" - #endif - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #include "base/test/fontconfig_util_linux.h" - #endif - -@@ -214,7 +214,7 @@ class CheckForLeakedGlobals : public testing::EmptyTes - }; - - // base::Process is not available on iOS --#if !defined(OS_IOS) -+#if !defined(OS_IOS) && !defined(OS_BSD) - class CheckProcessPriority : public testing::EmptyTestEventListener { - public: - CheckProcessPriority() { CHECK(!IsProcessBackgrounded()); } -@@ -399,14 +399,14 @@ void TestSuite::PreInitialize() { - testing::GTEST_FLAG(catch_exceptions) = false; - #endif - EnableTerminationOnHeapCorruption(); --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_AURA) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_AURA) - // When calling native char conversion functions (e.g wrctomb) we need to - // have the locale set. In the absence of such a call the "C" locale is the - // default. In the gtk code (below) gtk_init() implicitly sets a locale. - setlocale(LC_ALL, ""); - // We still need number to string conversions to be locale insensitive. - setlocale(LC_NUMERIC, "C"); --#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_AURA) -+#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_AURA) - - // On Android, AtExitManager is created in - // testing/android/native_test_wrapper.cc before main() is called. -@@ -680,7 +680,7 @@ void TestSuite::Initialize() { - // TODO(jshin): Should we set the locale via an OS X locale API here? - i18n::SetICUDefaultLocale("en_US"); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - SetUpFontconfig(); - #endif - -@@ -693,7 +693,7 @@ void TestSuite::Initialize() { - if (check_for_leaked_globals_) - listeners.Append(new CheckForLeakedGlobals); - if (check_for_thread_and_process_priority_) { --#if !defined(OS_IOS) -+#if !defined(OS_IOS) && !defined(OS_BSD) - listeners.Append(new CheckProcessPriority); - #endif - } diff --git a/devel/electron13/files/patch-base_third__party_libevent_BUILD.gn b/devel/electron13/files/patch-base_third__party_libevent_BUILD.gn deleted file mode 100644 index 54a799039c66..000000000000 --- a/devel/electron13/files/patch-base_third__party_libevent_BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ ---- base/third_party/libevent/BUILD.gn.orig 2021-01-07 00:36:18 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/devel/electron13/files/patch-base_threading_platform__thread.h b/devel/electron13/files/patch-base_threading_platform__thread.h deleted file mode 100644 index 2abef05beb90..000000000000 --- a/devel/electron13/files/patch-base_threading_platform__thread.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/threading/platform_thread.h.orig 2021-04-14 01:08:36 UTC -+++ base/threading/platform_thread.h -@@ -231,7 +231,7 @@ class BASE_EXPORT PlatformThread { - // Returns a realtime period provided by |delegate|. - static TimeDelta GetRealtimePeriod(Delegate* delegate); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Toggles a specific thread's priority at runtime. This can be used to - // change the priority of a thread in a different process and will fail - // if the calling process does not have proper permissions. The diff --git a/devel/electron13/files/patch-base_threading_platform__thread__internal__posix.h b/devel/electron13/files/patch-base_threading_platform__thread__internal__posix.h deleted file mode 100644 index 31bcbe8dbdcd..000000000000 --- a/devel/electron13/files/patch-base_threading_platform__thread__internal__posix.h +++ /dev/null @@ -1,18 +0,0 @@ ---- base/threading/platform_thread_internal_posix.h.orig 2021-01-07 00:36:18 UTC -+++ base/threading/platform_thread_internal_posix.h -@@ -47,13 +47,13 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit - // of CanIncreaseThreadPriority(). - Optional<ThreadPriority> GetCurrentThreadPriorityForPlatform(); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Current thread id is cached in thread local storage for performance reasons. - // In some rare cases it's important to clear that cache explicitly (e.g. after - // going through clone() syscall which does not call pthread_atfork() - // handlers). - BASE_EXPORT void ClearTidCache(); --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - } // namespace internal - diff --git a/devel/electron13/files/patch-base_threading_platform__thread__linux.cc b/devel/electron13/files/patch-base_threading_platform__thread__linux.cc deleted file mode 100644 index 4fabfe1ef524..000000000000 --- a/devel/electron13/files/patch-base_threading_platform__thread__linux.cc +++ /dev/null @@ -1,30 +0,0 @@ ---- base/threading/platform_thread_linux.cc.orig 2021-04-14 01:08:36 UTC -+++ base/threading/platform_thread_linux.cc -@@ -27,7 +27,9 @@ - - #if !defined(OS_NACL) && !defined(OS_AIX) - #include <pthread.h> -+#if !defined(OS_BSD) - #include <sys/prctl.h> -+#endif - #include <sys/resource.h> - #include <sys/time.h> - #include <sys/types.h> -@@ -298,7 +300,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN - - Optional<bool> CanIncreaseCurrentThreadPriorityForPlatform( - ThreadPriority priority) { --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) - // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke - // pthread_setschedparam in SetCurrentThreadPriorityForPlatform(). - struct rlimit rlim; -@@ -348,7 +350,7 @@ Optional<ThreadPriority> GetCurrentThreadPriorityForPl - void PlatformThread::SetName(const std::string& name) { - ThreadIdNameManager::GetInstance()->SetName(name); - --#if !defined(OS_NACL) && !defined(OS_AIX) -+#if !defined(OS_NACL) && !defined(OS_AIX) && !defined(OS_BSD) - // On linux we can get the thread names to show up in the debugger by setting - // the process name for the LWP. We don't want to do this for the main - // thread because that would rename the process, causing tools like killall diff --git a/devel/electron13/files/patch-base_threading_platform__thread__posix.cc b/devel/electron13/files/patch-base_threading_platform__thread__posix.cc deleted file mode 100644 index 017085d47edc..000000000000 --- a/devel/electron13/files/patch-base_threading_platform__thread__posix.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- base/threading/platform_thread_posix.cc.orig 2021-07-15 19:13:30 UTC -+++ base/threading/platform_thread_posix.cc -@@ -32,6 +32,10 @@ - #include <sys/syscall.h> - #endif - -+#if defined(OS_BSD) -+#include <pthread_np.h> -+#endif -+ - #if defined(OS_FUCHSIA) - #include <zircon/process.h> - #else -@@ -181,6 +185,8 @@ PlatformThreadId PlatformThread::CurrentId() { - // into the kernel. - #if defined(OS_APPLE) - return pthread_mach_thread_np(pthread_self()); -+#elif defined(OS_BSD) -+ return pthread_getthreadid_np(); - #elif defined(OS_LINUX) || defined(OS_CHROMEOS) - static NoDestructor<InitAtFork> init_at_fork; - if (g_thread_id == -1) { diff --git a/devel/electron13/files/patch-base_threading_platform__thread__unittest.cc b/devel/electron13/files/patch-base_threading_platform__thread__unittest.cc deleted file mode 100644 index 549e0e80dbee..000000000000 --- a/devel/electron13/files/patch-base_threading_platform__thread__unittest.cc +++ /dev/null @@ -1,24 +0,0 @@ ---- base/threading/platform_thread_unittest.cc.orig 2021-07-15 19:13:30 UTC -+++ base/threading/platform_thread_unittest.cc -@@ -313,7 +313,7 @@ TEST(PlatformThreadTest, - // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this - // proprerty changes for a given platform. - TEST(PlatformThreadTest, CanIncreaseThreadPriority) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be - // able to increase priority to any level. - constexpr bool kCanIncreasePriority = false; -@@ -407,9 +407,9 @@ TEST(PlatformThreadTest, SetHugeThreadName) { - - TEST(PlatformThreadTest, GetDefaultThreadStackSize) { - size_t stack_size = PlatformThread::GetDefaultThreadStackSize(); --#if defined(OS_WIN) || defined(OS_IOS) || defined(OS_FUCHSIA) || \ -- ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ -- !defined(THREAD_SANITIZER)) || \ -+#if defined(OS_WIN) || defined(OS_IOS) || defined(OS_FUCHSIA) || \ -+ ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \ -+ !defined(THREAD_SANITIZER)) || \ - (defined(OS_ANDROID) && !defined(ADDRESS_SANITIZER)) - EXPECT_EQ(0u, stack_size); - #else diff --git a/devel/electron13/files/patch-base_threading_scoped__blocking__call__unittest.cc b/devel/electron13/files/patch-base_threading_scoped__blocking__call__unittest.cc deleted file mode 100644 index 53ddbebe1f87..000000000000 --- a/devel/electron13/files/patch-base_threading_scoped__blocking__call__unittest.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- base/threading/scoped_blocking_call_unittest.cc.orig 2021-07-15 19:13:30 UTC -+++ base/threading/scoped_blocking_call_unittest.cc -@@ -274,7 +274,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA - } - - TEST_F(ScopedBlockingCallIOJankMonitoringTest, OverlappingMultipleWindows) { -- constexpr auto kJankTiming = -+ auto kJankTiming = - internal::IOJankMonitoringWindow::kMonitoringWindow * 3 + - internal::IOJankMonitoringWindow::kIOJankInterval * 5; - -@@ -531,7 +531,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, MultiTh - // First one starting at 10 seconds (can't start later than that or we'll trip - // the kTimeDiscrepancyTimeout per TaskEnvironment's inability to RunUntilIdle() - // with pending blocked tasks). --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // https://crbug.com/1071166 - #define MAYBE_MultiThreadedOverlappedWindows \ - DISABLED_MultiThreadedOverlappedWindows diff --git a/devel/electron13/files/patch-base_threading_thread__local__storage__unittest.cc b/devel/electron13/files/patch-base_threading_thread__local__storage__unittest.cc deleted file mode 100644 index 4be9426fa922..000000000000 --- a/devel/electron13/files/patch-base_threading_thread__local__storage__unittest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/threading/thread_local_storage_unittest.cc.orig 2021-01-07 00:36:18 UTC -+++ base/threading/thread_local_storage_unittest.cc -@@ -86,7 +86,7 @@ class ThreadLocalStorageRunner : public DelegateSimple - void ThreadLocalStorageCleanup(void *value) { - int *ptr = reinterpret_cast<int*>(value); - // Destructors should never be called with a NULL. -- ASSERT_NE(reinterpret_cast<int*>(NULL), ptr); -+ ASSERT_NE(static_cast<int*>(NULL), ptr); - if (*ptr == kFinalTlsValue) - return; // We've been called enough times. - ASSERT_LT(kFinalTlsValue, *ptr); diff --git a/devel/electron13/files/patch-base_threading_thread__task__runner__handle.cc b/devel/electron13/files/patch-base_threading_thread__task__runner__handle.cc deleted file mode 100644 index f5574c75fdbb..000000000000 --- a/devel/electron13/files/patch-base_threading_thread__task__runner__handle.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- base/threading/thread_task_runner_handle.cc.orig 2021-04-14 01:08:36 UTC -+++ base/threading/thread_task_runner_handle.cc -@@ -8,6 +8,7 @@ - #include <utility> - - #include "base/bind.h" -+#include "base/callback_helpers.h" - #include "base/check_op.h" - #include "base/lazy_instance.h" - #include "base/run_loop.h" -@@ -33,6 +34,7 @@ const scoped_refptr<SingleThreadTaskRunner>& ThreadTas - return current->task_runner_; - } - -+#if defined(OS_BSD) - // static - bool ThreadTaskRunnerHandle::IsSet() { - return !!thread_task_runner_tls.Pointer()->Get(); -@@ -80,6 +82,7 @@ ThreadTaskRunnerHandleOverride::ThreadTaskRunnerHandle - if (!allow_nested_runloop) - no_running_during_override_.emplace(); - } -+#endif - - ThreadTaskRunnerHandleOverride::~ThreadTaskRunnerHandleOverride() { - if (task_runner_to_restore_) { diff --git a/devel/electron13/files/patch-base_time_time__unittest.cc b/devel/electron13/files/patch-base_time_time__unittest.cc deleted file mode 100644 index 87c2444e1337..000000000000 --- a/devel/electron13/files/patch-base_time_time__unittest.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- base/time/time_unittest.cc.orig 2021-07-15 19:13:30 UTC -+++ base/time/time_unittest.cc -@@ -2074,6 +2074,7 @@ TEST(TimeDelta, Overflows) { - EXPECT_TRUE((kLargeDelta / 0.5).is_max()); - EXPECT_TRUE((kLargeDelta / -0.5).is_min()); - -+#if !defined(OS_BSD) - static_assert( - TimeDelta::Max() / kOneSecond == std::numeric_limits<double>::infinity(), - ""); -@@ -2102,6 +2103,7 @@ TEST(TimeDelta, Overflows) { - static_assert(TimeDelta::Max() % -kOneSecond == TimeDelta::Max(), ""); - static_assert(TimeDelta::Min() % kOneSecond == TimeDelta::Min(), ""); - static_assert(TimeDelta::Min() % -kOneSecond == TimeDelta::Min(), ""); -+#endif - - // Division by zero. - static_assert((kOneSecond / 0).is_max(), ""); diff --git a/devel/electron13/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc b/devel/electron13/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc deleted file mode 100644 index fe431e31b844..000000000000 --- a/devel/electron13/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- base/trace_event/heap_profiler_allocation_context_tracker.cc.orig 2021-04-14 01:08:36 UTC -+++ base/trace_event/heap_profiler_allocation_context_tracker.cc -@@ -30,6 +30,10 @@ - #include <sys/prctl.h> - #endif - -+#if defined(OS_BSD) -+#include <pthread_np.h> -+#endif -+ - namespace base { - namespace trace_event { - -@@ -61,13 +65,23 @@ ThreadLocalStorage::Slot& AllocationContextTrackerTLS( - // with id. This function intentionally leaks the allocated strings since they - // are used to tag allocations even after the thread dies. - const char* GetAndLeakThreadName() { -- char name[16]; -+#if defined(OS_BSD) -+ constexpr size_t kBufferLen = 64; -+#else -+ constexpr size_t kBufferLen = 16; -+#endif -+ char name[kBufferLen]; - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) - // If the thread name is not set, try to get it from prctl. Thread name might - // not be set in cases where the thread started before heap profiling was - // enabled. - int err = prctl(PR_GET_NAME, name); - if (!err) { -+ return strdup(name); -+ } -+#elif defined(OS_BSD) && __FreeBSD__ >= 12 -+ pthread_get_name_np(pthread_self(), name, kBufferLen); -+ if (*name != '\0') { - return strdup(name); - } - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) diff --git a/devel/electron13/files/patch-base_trace__event_malloc__dump__provider.cc b/devel/electron13/files/patch-base_trace__event_malloc__dump__provider.cc deleted file mode 100644 index d9d1cbbab376..000000000000 --- a/devel/electron13/files/patch-base_trace__event_malloc__dump__provider.cc +++ /dev/null @@ -1,21 +0,0 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2021-07-15 19:13:30 UTC -+++ base/trace_event/malloc_dump_provider.cc -@@ -20,6 +20,8 @@ - - #if defined(OS_APPLE) - #include <malloc/malloc.h> -+#elif defined(OS_BSD) -+#include <stdlib.h> - #else - #include <malloc.h> - #endif -@@ -199,6 +201,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump - } - #elif defined(OS_FUCHSIA) - // TODO(fuchsia): Port, see https://crbug.com/706592. -+#elif defined(OS_BSD) -+ total_virtual_size = 0; -+ allocated_objects_size = 0; - #else - struct mallinfo info = mallinfo(); - // In case of Android's jemalloc |arena| is 0 and the outer pages size is diff --git a/devel/electron13/files/patch-base_trace__event_process__memory__dump.cc b/devel/electron13/files/patch-base_trace__event_process__memory__dump.cc deleted file mode 100644 index fdb026a35c85..000000000000 --- a/devel/electron13/files/patch-base_trace__event_process__memory__dump.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/trace_event/process_memory_dump.cc.orig 2021-07-15 19:13:30 UTC -+++ base/trace_event/process_memory_dump.cc -@@ -102,7 +102,7 @@ base::Optional<size_t> ProcessMemoryDump::CountResiden - #if defined(OS_WIN) - std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( - new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); --#elif defined(OS_APPLE) -+#elif defined(OS_APPLE) || defined(OS_BSD) - std::unique_ptr<char[]> vec(new char[max_vec_size]); - #elif defined(OS_POSIX) || defined(OS_FUCHSIA) - std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]); diff --git a/devel/electron13/files/patch-build_config_BUILD.gn b/devel/electron13/files/patch-build_config_BUILD.gn deleted file mode 100644 index d13f33c18252..000000000000 --- a/devel/electron13/files/patch-build_config_BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ ---- build/config/BUILD.gn.orig 2021-07-15 19:13:30 UTC -+++ build/config/BUILD.gn -@@ -227,9 +227,7 @@ config("default_libs") { - ] - } else if (is_linux || is_chromeos) { - libs = [ -- "dl", - "pthread", -- "rt", - ] - } - } -@@ -308,7 +306,7 @@ config("executable_config") { - "//build/config/ios:ios_dynamic_flags", - "//build/config/ios:ios_executable_flags", - ] -- } else if (is_linux || is_chromeos || is_android || current_os == "aix") { -+ } else if (is_linux || is_bsd || is_chromeos || is_android || current_os == "aix") { - configs += [ "//build/config/gcc:executable_config" ] - if (is_chromecast) { - configs += [ "//build/config/chromecast:executable_config" ] diff --git a/devel/electron13/files/patch-build_config_BUILDCONFIG.gn b/devel/electron13/files/patch-build_config_BUILDCONFIG.gn deleted file mode 100644 index d4037de966c1..000000000000 --- a/devel/electron13/files/patch-build_config_BUILDCONFIG.gn +++ /dev/null @@ -1,35 +0,0 @@ ---- build/config/BUILDCONFIG.gn.orig 2021-11-13 11:05:57 UTC -+++ build/config/BUILDCONFIG.gn -@@ -187,8 +187,8 @@ if (host_toolchain == "") { - # TODO(dpranke): Add some sort of assert here that verifies that - # no toolchain omitted host_toolchain from its toolchain_args(). - -- if (host_os == "linux") { -- if (target_os != "linux") { -+ if (host_os == "linux" || host_os == "freebsd") { -+ if (target_os != "linux" && target_os != "freebsd") { - host_toolchain = "//build/toolchain/linux:clang_$host_cpu" - } else if (is_clang) { - host_toolchain = "//build/toolchain/linux:clang_$host_cpu" -@@ -225,7 +225,7 @@ if (target_os == "android") { - assert(host_os == "linux" || host_os == "mac", - "Android builds are only supported on Linux and Mac hosts.") - _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" --} else if (target_os == "chromeos" || target_os == "linux") { -+} else if (target_os == "chromeos" || target_os == "linux" || target_os == "freebsd") { - # See comments in build/toolchain/cros/BUILD.gn about board compiles. - if (is_clang) { - _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -287,10 +287,11 @@ if (custom_toolchain != "") { - # current_os value directly. - - is_android = current_os == "android" -+is_bsd = current_os == "freebsd" - is_chromeos = current_os == "chromeos" - is_fuchsia = current_os == "fuchsia" - is_ios = current_os == "ios" --is_linux = current_os == "linux" -+is_linux = current_os == "linux" || current_os == "freebsd" - is_mac = current_os == "mac" - is_nacl = current_os == "nacl" - is_win = current_os == "win" || current_os == "winuwp" diff --git a/devel/electron13/files/patch-build_config_compiler_BUILD.gn b/devel/electron13/files/patch-build_config_compiler_BUILD.gn deleted file mode 100644 index 88dda2bc5574..000000000000 --- a/devel/electron13/files/patch-build_config_compiler_BUILD.gn +++ /dev/null @@ -1,134 +0,0 @@ ---- build/config/compiler/BUILD.gn.orig 2021-07-15 19:13:30 UTC -+++ build/config/compiler/BUILD.gn -@@ -133,7 +133,7 @@ declare_args() { - # - # TODO(crbug.com/977230): Enabling this when 'use_xcode_clang' is true may - # call an old clang that doesn't support auto-init. -- init_stack_vars = !is_android && !use_xcode_clang -+ init_stack_vars = !is_android && !use_xcode_clang && !is_bsd - - # This argument is to control whether enabling text section splitting in the - # final binary. When enabled, the separated text sections with prefix -@@ -333,7 +333,7 @@ config("compiler") { - } - - # Linker warnings. -- if (fatal_linker_warnings && !is_apple && current_os != "aix") { -+ if (fatal_linker_warnings && !is_apple && !is_bsd && current_os != "aix") { - ldflags += [ "-Wl,--fatal-warnings" ] - } - if (fatal_linker_warnings && is_apple) { -@@ -428,7 +428,7 @@ config("compiler") { - - # Compiler instrumentation can introduce dependencies in DSOs to symbols in - # the executable they are loaded into, so they are unresolved at link-time. -- if (!using_sanitizer) { -+ if (!using_sanitizer && !is_bsd) { - ldflags += [ - "-Wl,-z,defs", - "-Wl,--as-needed", -@@ -518,7 +518,7 @@ config("compiler") { - ldflags += [ "-Wl,-z,keep-text-section-prefix" ] - } - -- if (is_clang && !is_nacl && !use_xcode_clang) { -+ if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) { - cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] - - # TODO(hans): Remove this once Clang generates better optimized debug info -@@ -661,7 +661,12 @@ config("compiler") { - # and let it use all cores. - # TODO(thakis): Check if '=0' (that is, number of cores, instead - # of "all" which means number of hardware threads) is faster. -- ldflags += [ "-Wl,--thinlto-jobs=all" ] -+ if (is_bsd) { -+ # FreeBSD < 13 uses LLVM 10, which doesn't support --thinlto-jobs=all -+ ldflags += [ "-Wl,--thinlto-jobs=2" ] -+ } else { -+ ldflags += [ "-Wl,--thinlto-jobs=all" ] -+ } - - ldflags += [ - "-Wl,--thinlto-cache-dir=" + -@@ -851,7 +856,7 @@ config("compiler_cpu_abi") { - cflags += [ "-mtune=$arm_tune" ] - } - } else if (current_cpu == "arm64") { -- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { -+ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { - cflags += [ "--target=aarch64-linux-gnu" ] - ldflags += [ "--target=aarch64-linux-gnu" ] - } -@@ -1201,7 +1206,7 @@ config("compiler_deterministic") { - "-Xclang", - ".", - ] -- if (!is_win) { -+ if (!is_win && !is_bsd) { - # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) - asmflags = [ "-Wa,-fdebug-compilation-dir,." ] - } -@@ -1584,7 +1589,7 @@ config("default_warnings") { - cflags += [ "-Wno-nonportable-include-path" ] - } - -- if (current_toolchain == host_toolchain || !use_xcode_clang) { -+ if ((current_toolchain == host_toolchain || !use_xcode_clang) && !is_bsd) { - # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not - # recognize. - cflags += [ -@@ -1625,6 +1630,18 @@ config("default_warnings") { - cflags += [ "-Wno-max-tokens" ] - } - } -+ -+ if (is_clang && is_bsd) { -+ cflags += [ -+ "-Wno-ignored-pragma-optimize", -+ "-Wno-implicit-int-float-conversion", -+ "-Wno-final-dtor-non-final-class", -+ "-Wno-builtin-assume-aligned-alignment", -+ "-Wno-deprecated-copy", -+ "-Wno-thread-safety-analysis", -+ "-Wno-thread-safety-attributes", -+ ] -+ } - } - } - } -@@ -1754,7 +1771,7 @@ config("no_chromium_code") { - # suppressing them individually, we just blanket suppress them here. - "-Wno-unused-variable", - ] -- if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang)) { -+ if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang) && !is_bsd) { - cflags += [ - # TODO(https://crbug.com/1031169): Clean up and enable. - "-Wno-misleading-indentation", -@@ -1832,7 +1849,7 @@ config("export_dynamic") { - config("thin_archive") { - # The macOS and iOS default linker ld64 does not support reading thin - # archives. -- if ((is_posix && !is_nacl && (!is_apple || use_lld)) || is_fuchsia) { -+ if ((is_posix && !is_nacl && (!is_apple || use_lld) && !is_bsd) || is_fuchsia) { - arflags = [ "-T" ] - } else if (is_win && use_lld) { - arflags = [ "/llvmlibthin" ] -@@ -2373,7 +2390,7 @@ config("symbols") { - # flag, so we can use use -g1 for pnacl and nacl-clang compiles. - # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. - if (!is_nacl || is_clang) { -- cflags += [ "-g2" ] -+ cflags += [ "-g0" ] - } - - # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. -@@ -2406,7 +2423,7 @@ config("symbols") { - # DWARF info may be corrupt; offsets in a range list entry are in different - # sections" there. Maybe just a bug in nacl_switch_32.S. - if (!is_apple && !is_nacl && current_cpu != "x86" && -- (use_gold || use_lld)) { -+ (use_gold || use_lld) && !is_bsd) { - if (is_clang) { - # This flag enables the GNU-format pubnames and pubtypes sections, - # which lld needs in order to generate a correct GDB index. diff --git a/devel/electron13/files/patch-build_config_compiler_compiler.gni b/devel/electron13/files/patch-build_config_compiler_compiler.gni deleted file mode 100644 index 290c12c2cd84..000000000000 --- a/devel/electron13/files/patch-build_config_compiler_compiler.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- build/config/compiler/compiler.gni.orig 2021-07-15 19:13:30 UTC -+++ build/config/compiler/compiler.gni -@@ -202,7 +202,7 @@ declare_args() { - - declare_args() { - # Whether to use the gold linker from binutils instead of lld or bfd. -- use_gold = !use_lld && !(is_chromecast && is_linux && -+ use_gold = !is_bsd && !use_lld && !(is_chromecast && is_linux && - (current_cpu == "arm" || current_cpu == "mipsel")) && - (((is_linux || is_chromeos_lacros) && - (current_cpu == "x64" || current_cpu == "x86" || diff --git a/devel/electron13/files/patch-build_config_compiler_pgo_pgo.gni b/devel/electron13/files/patch-build_config_compiler_pgo_pgo.gni deleted file mode 100644 index 02c05d65664d..000000000000 --- a/devel/electron13/files/patch-build_config_compiler_pgo_pgo.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- build/config/compiler/pgo/pgo.gni.orig 2021-04-14 01:08:36 UTC -+++ build/config/compiler/pgo/pgo.gni -@@ -16,7 +16,7 @@ declare_args() { - # TODO(crbug.com/1052397): Remove chromeos_is_browser_only once - # target_os switch for lacros-chrome is completed. - (is_win || is_mac || -- (is_linux && !chromeos_is_browser_only && !is_chromecast))) { -+ (is_linux && !chromeos_is_browser_only && !is_chromecast && !is_bsd))) { - chrome_pgo_phase = 2 - } - diff --git a/devel/electron13/files/patch-build_config_features.gni b/devel/electron13/files/patch-build_config_features.gni deleted file mode 100644 index b898e2f84de4..000000000000 --- a/devel/electron13/files/patch-build_config_features.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- build/config/features.gni.orig 2021-01-07 00:36:18 UTC -+++ build/config/features.gni -@@ -26,7 +26,7 @@ declare_args() { - proprietary_codecs = is_chrome_branded || is_chromecast - - # libudev usage. This currently only affects the content layer. -- use_udev = (is_linux || is_chromeos) && !is_chromecast -+ use_udev = (is_linux || is_chromeos) && !is_chromecast && !is_bsd - - use_dbus = (is_linux || is_chromeos) && !is_chromecast - diff --git a/devel/electron13/files/patch-build_config_freetype_freetype.gni b/devel/electron13/files/patch-build_config_freetype_freetype.gni deleted file mode 100644 index dfe82143481f..000000000000 --- a/devel/electron13/files/patch-build_config_freetype_freetype.gni +++ /dev/null @@ -1,9 +0,0 @@ ---- build/config/freetype/freetype.gni.orig 2021-04-14 01:08:36 UTC -+++ build/config/freetype/freetype.gni -@@ -10,5 +10,5 @@ declare_args() { - # than version 2.7.1 and have color bitmap support compiled in. WARNING: - # System FreeType configurations other than as described WILL INTRODUCE TEXT - # RENDERING AND SECURITY REGRESSIONS. -- use_system_freetype = false -+ use_system_freetype = true - } diff --git a/devel/electron13/files/patch-build_config_linux_BUILD.gn b/devel/electron13/files/patch-build_config_linux_BUILD.gn deleted file mode 100644 index 3742dc17197d..000000000000 --- a/devel/electron13/files/patch-build_config_linux_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- build/config/linux/BUILD.gn.orig 2021-07-15 19:13:30 UTC -+++ build/config/linux/BUILD.gn -@@ -30,7 +30,7 @@ config("runtime_library") { - - if ((!(is_chromeos_ash || is_chromeos_lacros) || - default_toolchain != "//build/toolchain/cros:target") && -- (!use_custom_libcxx || current_cpu == "mipsel")) { -+ (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) { - libs = [ "atomic" ] - } - } diff --git a/devel/electron13/files/patch-build_config_linux_pkg-config.py b/devel/electron13/files/patch-build_config_linux_pkg-config.py deleted file mode 100644 index 915819b16e80..000000000000 --- a/devel/electron13/files/patch-build_config_linux_pkg-config.py +++ /dev/null @@ -1,26 +0,0 @@ ---- build/config/linux/pkg-config.py.orig 2021-01-07 00:36:18 UTC -+++ build/config/linux/pkg-config.py -@@ -59,8 +59,12 @@ def SetConfigPath(options): - print("You must specify an architecture via -a if using a sysroot.") - sys.exit(1) - -- libdir = sysroot + '/usr/' + options.system_libdir + '/pkgconfig' -- libdir += ':' + sysroot + '/usr/share/pkgconfig' -+ if "linux" in sys.platform: -+ libdir = sysroot + '/libdata/' + options.system_libdir + '/pkgconfig' -+ libdir += ':' + sysroot + '/usr/share/pkgconfig' -+ elif "bsd" in sys.platform: -+ libdir = sysroot + '/libdata/pkgconfig' -+ libdir += ':' + '/usr/libdata/pkgconfig' - os.environ['PKG_CONFIG_LIBDIR'] = libdir - return libdir - -@@ -109,7 +113,7 @@ def main(): - # If this is run on non-Linux platforms, just return nothing and indicate - # success. This allows us to "kind of emulate" a Linux build from other - # platforms. -- if "linux" not in sys.platform: -+ if "bsd" not in sys.platform: - print("[[],[],[],[],[]]") - return 0 - diff --git a/devel/electron13/files/patch-build_config_ozone.gni b/devel/electron13/files/patch-build_config_ozone.gni deleted file mode 100644 index b758528c8da2..000000000000 --- a/devel/electron13/files/patch-build_config_ozone.gni +++ /dev/null @@ -1,12 +0,0 @@ ---- build/config/ozone.gni.orig 2021-07-15 19:13:30 UTC -+++ build/config/ozone.gni -@@ -79,6 +79,9 @@ declare_args() { - ozone_platform = "x11" - ozone_platform_drm = true - ozone_platform_x11 = true -+ } else if (is_bsd) { -+ ozone_platform = "x11" -+ ozone_platform_x11 = true - } else if (is_linux || is_chromeos_lacros) { - ozone_platform = "x11" - ozone_platform_wayland = true diff --git a/devel/electron13/files/patch-build_config_sysroot.gni b/devel/electron13/files/patch-build_config_sysroot.gni deleted file mode 100644 index 00774f40b563..000000000000 --- a/devel/electron13/files/patch-build_config_sysroot.gni +++ /dev/null @@ -1,14 +0,0 @@ ---- build/config/sysroot.gni.orig 2021-01-07 00:36:18 UTC -+++ build/config/sysroot.gni -@@ -21,9 +21,9 @@ declare_args() { - - # Controls default is_linux sysroot. If set to true, and sysroot - # is empty, default sysroot is calculated. -- use_sysroot = current_cpu == "x86" || current_cpu == "x64" || -+ use_sysroot = !is_bsd && (current_cpu == "x86" || current_cpu == "x64" || - current_cpu == "arm" || current_cpu == "arm64" || -- current_cpu == "mipsel" || current_cpu == "mips64el" -+ current_cpu == "mipsel" || current_cpu == "mips64el") - } - - if (sysroot == "") { diff --git a/devel/electron13/files/patch-build_detect__host__arch.py b/devel/electron13/files/patch-build_detect__host__arch.py deleted file mode 100644 index d09ac4de3025..000000000000 --- a/devel/electron13/files/patch-build_detect__host__arch.py +++ /dev/null @@ -1,11 +0,0 @@ ---- build/detect_host_arch.py.orig 2021-01-07 00:36:18 UTC -+++ build/detect_host_arch.py -@@ -21,6 +21,8 @@ def HostArch(): - host_arch = 'ia32' - elif host_arch in ['x86_64', 'amd64']: - host_arch = 'x64' -+ elif host_arch.startswith('arm64'): -+ host_arch = 'arm64' - elif host_arch.startswith('arm'): - host_arch = 'arm' - elif host_arch.startswith('aarch64'): diff --git a/devel/electron13/files/patch-build_gn__run__binary.py b/devel/electron13/files/patch-build_gn__run__binary.py deleted file mode 100644 index 9e8ff32f9735..000000000000 --- a/devel/electron13/files/patch-build_gn__run__binary.py +++ /dev/null @@ -1,11 +0,0 @@ ---- build/gn_run_binary.py.orig 2021-01-07 00:36:18 UTC -+++ build/gn_run_binary.py -@@ -24,7 +24,7 @@ if not os.path.isabs(path): - # The rest of the arguments are passed directly to the executable. - args = [path] + sys.argv[2:] - --ret = subprocess.call(args) -+ret = subprocess.call(args, env={"CHROME_EXE_PATH":"${WRKSRC}/out/Release/chrome"}) - if ret != 0: - if ret <= -100: - # Windows error codes such as 0xC0000005 and 0xC0000409 are much easier to diff --git a/devel/electron13/files/patch-build_linux_chrome.map b/devel/electron13/files/patch-build_linux_chrome.map deleted file mode 100644 index 8ee5a41f77dd..000000000000 --- a/devel/electron13/files/patch-build_linux_chrome.map +++ /dev/null @@ -1,29 +0,0 @@ ---- build/linux/chrome.map.orig 2021-04-14 01:08:36 UTC -+++ build/linux/chrome.map -@@ -1,4 +1,7 @@ - { -+local: -+ *; -+ - global: - __bss_start; - __data_start; -@@ -20,6 +23,10 @@ global: - # Program entry point. - _start; - -+ # FreeBSD specific variables. -+ __progname; -+ environ; -+ - # Memory allocation symbols. We want chrome and any libraries to - # share the same heap, so it is correct to export these symbols. - calloc; -@@ -83,7 +90,4 @@ global: - localtime_r; - - v8dbg_*; -- --local: -- *; - }; diff --git a/devel/electron13/files/patch-build_linux_libpci_BUILD.gn b/devel/electron13/files/patch-build_linux_libpci_BUILD.gn deleted file mode 100644 index 282c79c699c3..000000000000 --- a/devel/electron13/files/patch-build_linux_libpci_BUILD.gn +++ /dev/null @@ -1,53 +0,0 @@ ---- build/linux/libpci/BUILD.gn.orig 2021-01-07 00:36:18 UTC -+++ build/linux/libpci/BUILD.gn -@@ -3,20 +3,36 @@ - # found in the LICENSE file. - - import("//tools/generate_library_loader/generate_library_loader.gni") -+import("//build/config/linux/pkg_config.gni") - --# This generates a target named "libpci". --generate_library_loader("libpci") { -- name = "LibPciLoader" -- output_h = "libpci.h" -- output_cc = "libpci_loader.cc" -- header = "<pci/pci.h>" -+declare_args() { -+ use_system_libpci = is_bsd -+} - -- functions = [ -- "pci_alloc", -- "pci_init", -- "pci_cleanup", -- "pci_scan_bus", -- "pci_fill_info", -- "pci_lookup_name", -- ] -+if (use_system_libpci) { -+ pkg_config("system_libpci") { -+ packages = [ "libpci" ] -+ } -+ -+ source_set("libpci") { -+ public_configs = [ ":system_libpci" ] -+ } -+ -+} else { -+ # This generates a target named "libpci". -+ generate_library_loader("libpci") { -+ name = "LibPciLoader" -+ output_h = "libpci.h" -+ output_cc = "libpci_loader.cc" -+ header = "<pci/pci.h>" -+ -+ functions = [ -+ "pci_alloc", -+ "pci_init", -+ "pci_cleanup", -+ "pci_scan_bus", -+ "pci_fill_info", -+ "pci_lookup_name", -+ ] -+ } - } diff --git a/devel/electron13/files/patch-build_linux_unbundle_libusb.gn b/devel/electron13/files/patch-build_linux_unbundle_libusb.gn deleted file mode 100644 index 500e6b423ce6..000000000000 --- a/devel/electron13/files/patch-build_linux_unbundle_libusb.gn +++ /dev/null @@ -1,27 +0,0 @@ ---- build/linux/unbundle/libusb.gn.orig 2021-01-25 11:28:15 UTC -+++ build/linux/unbundle/libusb.gn -@@ -0,0 +1,24 @@ -+# 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/linux/pkg_config.gni") -+import("//build/shim_headers.gni") -+ -+pkg_config("system_libusb") { -+ packages = [ "libusb-1.0" ] -+} -+ -+shim_headers("libusb_shim") { -+ root_path = "src/libusb" -+ headers = [ -+ "libusb.h", -+ ] -+} -+ -+source_set("libusb") { -+ deps = [ -+ ":libusb_shim", -+ ] -+ public_configs = [ ":system_libusb" ] -+} diff --git a/devel/electron13/files/patch-build_linux_unbundle_replace__gn__files.py b/devel/electron13/files/patch-build_linux_unbundle_replace__gn__files.py deleted file mode 100644 index 87bbc422bcc2..000000000000 --- a/devel/electron13/files/patch-build_linux_unbundle_replace__gn__files.py +++ /dev/null @@ -1,10 +0,0 @@ ---- build/linux/unbundle/replace_gn_files.py.orig 2021-01-07 00:36:18 UTC -+++ build/linux/unbundle/replace_gn_files.py -@@ -27,6 +27,7 @@ REPLACEMENTS = { - 'libevent': 'base/third_party/libevent/BUILD.gn', - 'libjpeg': 'third_party/libjpeg.gni', - 'libpng': 'third_party/libpng/BUILD.gn', -+ 'libusb': 'third_party/libusb/BUILD.gn', - 'libvpx': 'third_party/libvpx/BUILD.gn', - 'libwebp': 'third_party/libwebp/BUILD.gn', - 'libxml': 'third_party/libxml/BUILD.gn', diff --git a/devel/electron13/files/patch-build_toolchain_gcc__toolchain.gni b/devel/electron13/files/patch-build_toolchain_gcc__toolchain.gni deleted file mode 100644 index 8af05dbb8ee2..000000000000 --- a/devel/electron13/files/patch-build_toolchain_gcc__toolchain.gni +++ /dev/null @@ -1,58 +0,0 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2021-07-15 19:13:30 UTC -+++ build/toolchain/gcc_toolchain.gni -@@ -51,6 +51,11 @@ if (enable_resource_allowlist_generation) { - "enable_resource_allowlist_generation=true does not work for target_os=$target_os") - } - -+declare_args() { -+ extra_cxxflags = "" -+ extra_ldflags = "" -+} -+ - # This template defines a toolchain for something that works like gcc - # (including clang). - # -@@ -647,20 +652,32 @@ template("gcc_toolchain") { - # actually just be doing a native compile. The invoker can optionally override - # use_gold too. - template("clang_toolchain") { -- if (defined(invoker.toolprefix)) { -- toolprefix = invoker.toolprefix -- } else { -- toolprefix = "" -+ if (!is_bsd) { -+ if (defined(invoker.toolprefix)) { -+ toolprefix = invoker.toolprefix -+ } else { -+ toolprefix = "" -+ } - } - - gcc_toolchain(target_name) { -- prefix = rebase_path("$clang_base_path/bin", root_build_dir) -- cc = "$prefix/clang" -- cxx = "$prefix/clang++" -- ld = cxx -- readelf = "${toolprefix}readelf" -- ar = "${prefix}/llvm-ar" -- nm = "${prefix}/llvm-nm" -+ if (is_bsd) { -+ prefix = "/usr/local/bin" -+ cc = "cc" -+ cxx = "c++" -+ ld = cxx -+ readelf = "readelf" -+ ar = "${prefix}/ar" -+ nm = "${prefix}/nm" -+ } else { -+ prefix = rebase_path("$clang_base_path/bin", root_build_dir) -+ cc = "$prefix/clang" -+ cxx = "$prefix/clang++" -+ ld = cxx -+ readelf = "${toolprefix}readelf" -+ ar = "${prefix}/llvm-ar" -+ nm = "${prefix}/llvm-nm" -+ } - - forward_variables_from(invoker, - [ diff --git a/devel/electron13/files/patch-build_toolchain_get__concurrent__links.py b/devel/electron13/files/patch-build_toolchain_get__concurrent__links.py deleted file mode 100644 index d1dd9c91ecae..000000000000 --- a/devel/electron13/files/patch-build_toolchain_get__concurrent__links.py +++ /dev/null @@ -1,17 +0,0 @@ ---- build/toolchain/get_concurrent_links.py.orig 2021-01-07 00:36:18 UTC -+++ build/toolchain/get_concurrent_links.py -@@ -53,6 +53,14 @@ def _GetTotalMemoryInBytes(): - return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) - except Exception: - return 0 -+ elif sys.platform.startswith('freebsd'): -+ try: -+ avail_bytes = int(subprocess.check_output(['sysctl', '-n', 'hw.physmem'])) -+ # With -fuse-lld it doesn't take a lot of ram, feel free to change that -+ # 1 * ... to needed amount -+ return max(1, avail_bytes / (1 * (2 ** 30))) # total / 4GB -+ except Exception: -+ return 1 - # TODO(scottmg): Implement this for other platforms. - return 0 - diff --git a/devel/electron13/files/patch-build_toolchain_linux_BUILD.gn b/devel/electron13/files/patch-build_toolchain_linux_BUILD.gn deleted file mode 100644 index e645c67c1b50..000000000000 --- a/devel/electron13/files/patch-build_toolchain_linux_BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ ---- build/toolchain/linux/BUILD.gn.orig 2021-07-15 19:13:30 UTC -+++ build/toolchain/linux/BUILD.gn -@@ -15,7 +15,9 @@ clang_toolchain("clang_ppc64") { - } - - clang_toolchain("clang_arm") { -- toolprefix = "arm-linux-gnueabihf-" -+ if (!is_bsd) { -+ toolprefix = "arm-linux-gnueabihf-" -+ } - toolchain_args = { - current_cpu = "arm" - current_os = "linux" -@@ -23,7 +25,6 @@ clang_toolchain("clang_arm") { - } - - clang_toolchain("clang_arm64") { -- toolprefix = "aarch64-linux-gnu-" - toolchain_args = { - current_cpu = "arm64" - current_os = "linux" diff --git a/devel/electron13/files/patch-cc_BUILD.gn b/devel/electron13/files/patch-cc_BUILD.gn deleted file mode 100644 index 3e4ceb563aa8..000000000000 --- a/devel/electron13/files/patch-cc_BUILD.gn +++ /dev/null @@ -1,19 +0,0 @@ ---- cc/BUILD.gn.orig 2021-07-15 19:13:30 UTC -+++ cc/BUILD.gn -@@ -640,7 +640,7 @@ cc_test_static_library("test_support") { - if (enable_vulkan) { - deps += [ "//gpu/vulkan/init" ] - } -- if (!is_android) { -+ if (!is_android && !is_bsd) { - data_deps = [ "//third_party/mesa_headers" ] - } - } -@@ -857,7 +857,6 @@ cc_test("cc_unittests") { - ] - data_deps = [ - "//testing/buildbot/filters:cc_unittests_filters", -- "//third_party/mesa_headers", - ] - - if (is_fuchsia) { diff --git a/devel/electron13/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/devel/electron13/files/patch-cc_layers_scrollbar__layer__impl__base.cc deleted file mode 100644 index 12c2fe002f0d..000000000000 --- a/devel/electron13/files/patch-cc_layers_scrollbar__layer__impl__base.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- cc/layers/scrollbar_layer_impl_base.cc.orig 2021-01-07 00:36:18 UTC -+++ cc/layers/scrollbar_layer_impl_base.cc -@@ -219,8 +219,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect - int thumb_offset = TrackStart(); - if (maximum > 0) { - float ratio = clamped_current_pos / maximum; -- float max_offset = track_length - thumb_length; -- thumb_offset += static_cast<int>(ratio * max_offset); -+ float _max_offset = track_length - thumb_length; -+ thumb_offset += static_cast<int>(ratio * _max_offset); - } - - float thumb_thickness_adjustment = diff --git a/devel/electron13/files/patch-cc_test_layer__tree__test.cc b/devel/electron13/files/patch-cc_test_layer__tree__test.cc deleted file mode 100644 index 1be91df71923..000000000000 --- a/devel/electron13/files/patch-cc_test_layer__tree__test.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- cc/test/layer_tree_test.cc.orig 2021-07-15 19:13:30 UTC -+++ cc/test/layer_tree_test.cc -@@ -674,7 +674,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere - init_vulkan = true; - } else if (renderer_type_ == viz::RendererType::kSkiaDawn) { - scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - init_vulkan = true; - #elif defined(OS_WIN) - // TODO(sgilhuly): Initialize D3D12 for Windows. diff --git a/devel/electron13/files/patch-cc_test_pixel__test.cc b/devel/electron13/files/patch-cc_test_pixel__test.cc deleted file mode 100644 index dc9b608181eb..000000000000 --- a/devel/electron13/files/patch-cc_test_pixel__test.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- cc/test/pixel_test.cc.orig 2021-07-15 19:13:30 UTC -+++ cc/test/pixel_test.cc -@@ -71,7 +71,7 @@ PixelTest::PixelTest(GraphicsBackend backend) - init_vulkan = true; - } else if (backend == kSkiaDawn) { - scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - init_vulkan = true; - #elif defined(OS_WIN) - // TODO(sgilhuly): Initialize D3D12 for Windows. diff --git a/devel/electron13/files/patch-cc_trees_property__tree.cc b/devel/electron13/files/patch-cc_trees_property__tree.cc deleted file mode 100644 index 9fdeeff317e4..000000000000 --- a/devel/electron13/files/patch-cc_trees_property__tree.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- cc/trees/property_tree.cc.orig 2021-07-15 19:13:30 UTC -+++ cc/trees/property_tree.cc -@@ -1299,13 +1299,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro - - gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); - -- gfx::ScrollOffset max_offset( -+ gfx::ScrollOffset _max_offset( - scaled_scroll_bounds.width() - clip_layer_bounds.width(), - scaled_scroll_bounds.height() - clip_layer_bounds.height()); - -- max_offset.Scale(1 / scale_factor); -- max_offset.SetToMax(gfx::ScrollOffset()); -- return max_offset; -+ _max_offset.Scale(1 / scale_factor); -+ _max_offset.SetToMax(gfx::ScrollOffset()); -+ return _max_offset; - } - - gfx::SizeF ScrollTree::scroll_bounds(int scroll_node_id) const { diff --git a/devel/electron13/files/patch-chrome_BUILD.gn b/devel/electron13/files/patch-chrome_BUILD.gn deleted file mode 100644 index 48204ba0e3a3..000000000000 --- a/devel/electron13/files/patch-chrome_BUILD.gn +++ /dev/null @@ -1,13 +0,0 @@ ---- chrome/BUILD.gn.orig 2021-11-13 11:05:57 UTC -+++ chrome/BUILD.gn -@@ -1335,6 +1335,10 @@ group("browser_dependencies") { - public_deps += [ "//chromeos/lacros" ] - } - -+ if (is_bsd) { -+ public_deps -= [ "//components/crash/core/app" ] -+ } -+ - if (is_chromeos_ash) { - public_deps += [ - "//ash/constants", diff --git a/devel/electron13/files/patch-chrome_app_BUILD.gn b/devel/electron13/files/patch-chrome_app_BUILD.gn deleted file mode 100644 index c90f9e2f8012..000000000000 --- a/devel/electron13/files/patch-chrome_app_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/app/BUILD.gn.orig 2021-07-15 19:13:30 UTC -+++ chrome/app/BUILD.gn -@@ -141,7 +141,7 @@ static_library("test_support") { - "//v8:v8_headers", - ] - -- if (!is_fuchsia) { -+ if (!is_fuchsia && !is_bsd) { - # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. - deps += [ - "//components/crash/core/app", diff --git a/devel/electron13/files/patch-chrome_app_chrome__command__ids.h b/devel/electron13/files/patch-chrome_app_chrome__command__ids.h deleted file mode 100644 index 69054f5f7553..000000000000 --- a/devel/electron13/files/patch-chrome_app_chrome__command__ids.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/app/chrome_command_ids.h.orig 2021-07-15 19:13:30 UTC -+++ chrome/app/chrome_command_ids.h -@@ -65,7 +65,7 @@ - #define IDC_NAME_WINDOW 34049 - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - #define IDC_USE_SYSTEM_TITLE_BAR 34051 - #define IDC_RESTORE_WINDOW 34052 - #endif diff --git a/devel/electron13/files/patch-chrome_app_chrome__main.cc b/devel/electron13/files/patch-chrome_app_chrome__main.cc deleted file mode 100644 index 10f6484948b9..000000000000 --- a/devel/electron13/files/patch-chrome_app_chrome__main.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- chrome/app/chrome_main.cc.orig 2021-04-14 01:08:37 UTC -+++ chrome/app/chrome_main.cc -@@ -130,12 +130,12 @@ int ChromeMain(int argc, const char** argv) { - MainThreadStackSamplingProfiler scoped_sampling_profiler; - - // Chrome-specific process modes. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ - defined(OS_WIN) - if (command_line->HasSwitch(switches::kHeadless)) { - return headless::HeadlessShellMain(params); - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || - // defined(OS_WIN) - - int rv = content::ContentMain(params); diff --git a/devel/electron13/files/patch-chrome_app_chrome__main__delegate.cc b/devel/electron13/files/patch-chrome_app_chrome__main__delegate.cc deleted file mode 100644 index 221e9993aedd..000000000000 --- a/devel/electron13/files/patch-chrome_app_chrome__main__delegate.cc +++ /dev/null @@ -1,170 +0,0 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2021-07-15 19:13:30 UTC -+++ chrome/app/chrome_main_delegate.cc -@@ -150,12 +150,12 @@ - #include "v8/include/v8.h" - #endif - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #include "base/environment.h" - #endif - - #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_ANDROID) || \ -- defined(OS_LINUX) || defined(OS_CHROMEOS) -+ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #include "chrome/browser/policy/policy_path_parser.h" - #include "components/crash/core/app/crashpad.h" - #endif -@@ -259,7 +259,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce - - #endif // defined(OS_WIN) - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) - void AdjustLinuxOOMScore(const std::string& process_type) { - int score = -1; - -@@ -294,7 +294,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty - if (score > -1) - base::AdjustOOMScore(base::GetCurrentProcId(), score); - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) - - // Returns true if this subprocess type needs the ResourceBundle initialized - // and resources loaded. -@@ -340,7 +340,7 @@ bool HandleVersionSwitches(const base::CommandLine& co - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - // Show the man page if --help or -h is on the command line. - void HandleHelpSwitches(const base::CommandLine& command_line) { - if (command_line.HasSwitch(switches::kHelp) || -@@ -350,7 +350,7 @@ void HandleHelpSwitches(const base::CommandLine& comma - PLOG(FATAL) << "execlp failed"; - } - } --#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - - #if !defined(OS_MAC) && !defined(OS_ANDROID) - void SIGTERMProfilingShutdown(int signal) { -@@ -404,7 +404,7 @@ void InitializeUserDataDir(base::CommandLine* command_ - std::string process_type = - command_line->GetSwitchValueASCII(switches::kProcessType); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // On Linux, Chrome does not support running multiple copies under different - // DISPLAYs, so the profile directory can be specified in the environment to - // support the virtual desktop use-case. -@@ -416,7 +416,7 @@ void InitializeUserDataDir(base::CommandLine* command_ - user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); - } - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if defined(OS_MAC) - policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); - #endif // OS_MAC -@@ -487,7 +487,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat - startup_metric_utils::RecordApplicationStartTime(now); - #endif - --#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ -+#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - // Record the startup process creation time on supported platforms. On Android - // this is recorded in ChromeMainDelegateAndroid. -@@ -735,7 +735,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi - v8_crashpad_support::SetUp(); - #endif - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) - if (!crash_reporter::IsCrashpadEnabled()) { - breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); - } -@@ -748,7 +748,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi - } - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - // This will directly exit if the user asked for help. - HandleHelpSwitches(command_line); - #endif -@@ -957,7 +957,7 @@ void ChromeMainDelegate::PreSandboxStartup() { - - crash_reporter::InitializeCrashKeys(); - --#if defined(OS_POSIX) -+#if defined(OS_POSIX) && !defined(OS_BSD) - ChromeCrashReporterClient::Create(); - #endif - -@@ -970,7 +970,7 @@ void ChromeMainDelegate::PreSandboxStartup() { - child_process_logging::Init(); - #endif - #if defined(ARCH_CPU_ARM_FAMILY) && \ -- (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)) -+ (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) - // Create an instance of the CPU class to parse /proc/cpuinfo and cache - // cpu_brand info. - base::CPU cpu_info; -@@ -1088,7 +1088,7 @@ void ChromeMainDelegate::PreSandboxStartup() { - locale; - } - --#if defined(OS_POSIX) && !defined(OS_MAC) -+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) - // Zygote needs to call InitCrashReporter() in RunZygote(). - if (process_type != switches::kZygoteProcess) { - #if defined(OS_ANDROID) -@@ -1109,7 +1109,7 @@ void ChromeMainDelegate::PreSandboxStartup() { - } - #endif // defined(OS_ANDROID) - } --#endif // defined(OS_POSIX) && !defined(OS_MAC) -+#endif // defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) - - #if defined(OS_ANDROID) - CHECK_EQ(base::android::GetLibraryProcessType(), -@@ -1129,7 +1129,7 @@ void ChromeMainDelegate::PreSandboxStartup() { - void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { - // Note: If you are adding a new process type below, be sure to adjust the - // AdjustLinuxOOMScore function too. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) - AdjustLinuxOOMScore(process_type); - #endif - #if defined(OS_WIN) -@@ -1171,7 +1171,7 @@ int ChromeMainDelegate::RunProcess( - - // This entry is not needed on Linux, where the NaCl loader - // process is launched via nacl_helper instead. --#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) - {switches::kNaClLoaderProcess, NaClMain}, - #else - {"<invalid>", nullptr}, // To avoid constant array of size 0 -@@ -1199,7 +1199,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str - #endif // !defined(OS_ANDROID) - } - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) - void ChromeMainDelegate::ZygoteStarting( - std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { - #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1236,7 +1236,7 @@ void ChromeMainDelegate::ZygoteForked() { - crash_keys::SetCrashKeysFromCommandLine(*command_line); - } - --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) - - content::ContentClient* ChromeMainDelegate::CreateContentClient() { - return &chrome_content_client_; diff --git a/devel/electron13/files/patch-chrome_app_chromium__strings.grd b/devel/electron13/files/patch-chrome_app_chromium__strings.grd deleted file mode 100644 index d993e86202be..000000000000 --- a/devel/electron13/files/patch-chrome_app_chromium__strings.grd +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/app/chromium_strings.grd.orig 2021-07-15 19:13:30 UTC -+++ chrome/app/chromium_strings.grd -@@ -703,7 +703,7 @@ Chromium is unable to recover your settings. - </if> - - <!-- about:browser-switch strings --> -- <if expr="is_win or is_macosx or (is_linux and not chromeos)"> -+ <if expr="is_win or is_macosx or (is_posix and not chromeos)"> - <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> - Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. - </message> -@@ -833,7 +833,7 @@ Chromium is unable to recover your settings. - </message> - - <!-- ProcessSingleton --> -- <if expr="is_linux or is_macosx"> -+ <if expr="is_linux or is_macosx or is_posix"> - <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> - The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. - </message> diff --git a/devel/electron13/files/patch-chrome_app_generated__resources.grd b/devel/electron13/files/patch-chrome_app_generated__resources.grd deleted file mode 100644 index 217b253d8af0..000000000000 --- a/devel/electron13/files/patch-chrome_app_generated__resources.grd +++ /dev/null @@ -1,29 +0,0 @@ ---- chrome/app/generated_resources.grd.orig 2021-07-15 19:13:30 UTC -+++ chrome/app/generated_resources.grd -@@ -5271,7 +5271,7 @@ Keep your key file in a safe place. You will need it t - </if> - - <!-- chrome://browser-switch strings --> -- <if expr="is_win or is_macosx or (is_linux and not chromeos)"> -+ <if expr="is_win or is_macosx or (is_posix and not chromeos)"> - <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title"> - Legacy Browser Support - </message> -@@ -7432,7 +7432,7 @@ Keep your key file in a safe place. You will need it t - Google Pay - </message> - -- <if expr="is_linux and not chromeos and not lacros"> -+ <if expr="is_posix and not chromeos and not lacros"> - <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> - Use system title bar and borders - </message> -@@ -8443,7 +8443,7 @@ Please help our engineers fix this problem. Tell us wh - Set as default - </message> - -- <if expr="is_linux and not chromeos and not lacros"> -+ <if expr="is_posix and not chromeos and not lacros"> - <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> - Minimize - </message> diff --git a/devel/electron13/files/patch-chrome_app_google__chrome__strings.grd b/devel/electron13/files/patch-chrome_app_google__chrome__strings.grd deleted file mode 100644 index 272664ab6210..000000000000 --- a/devel/electron13/files/patch-chrome_app_google__chrome__strings.grd +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/app/google_chrome_strings.grd.orig 2021-07-15 19:13:30 UTC -+++ chrome/app/google_chrome_strings.grd -@@ -711,7 +711,7 @@ Google Chrome is unable to recover your settings. - </if> - - <!-- about:browser-switch strings --> -- <if expr="is_win or is_macosx or (is_linux and not chromeos)"> -+ <if expr="is_win or is_macosx or (is_posix and not chromeos)"> - <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> - Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. - </message> -@@ -841,7 +841,7 @@ Google Chrome is unable to recover your settings. - </message> - - <!-- ProcessSingleton --> -- <if expr="is_linux or is_macosx"> -+ <if expr="is_linux or is_macosx or is_posix"> - <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> - The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. - </message> diff --git a/devel/electron13/files/patch-chrome_app_profiles__strings.grdp b/devel/electron13/files/patch-chrome_app_profiles__strings.grdp deleted file mode 100644 index 7b53003e2924..000000000000 --- a/devel/electron13/files/patch-chrome_app_profiles__strings.grdp +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/app/profiles_strings.grdp.orig 2021-07-15 19:13:30 UTC -+++ chrome/app/profiles_strings.grdp -@@ -81,7 +81,7 @@ - Add Profile... - </message> - </if> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_PROFILES_ADD_PROFILE_LABEL" desc="Menu item for adding a new profile."> - Add profile... - </message> diff --git a/devel/electron13/files/patch-chrome_app_settings__strings.grdp b/devel/electron13/files/patch-chrome_app_settings__strings.grdp deleted file mode 100644 index e188c4495426..000000000000 --- a/devel/electron13/files/patch-chrome_app_settings__strings.grdp +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/app/settings_strings.grdp.orig 2021-07-15 19:13:32 UTC -+++ chrome/app/settings_strings.grdp -@@ -123,7 +123,7 @@ - Theme - </message> - </if> -- <if expr="is_linux and not chromeos and not lacros"> -+ <if expr="is_posix and not chromeos and not lacros"> - <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux"> - GTK+ - </message> -@@ -137,7 +137,7 @@ - Use Classic - </message> - </if> -- <if expr="not is_linux or chromeos or lacros"> -+ <if expr="not is_posix or chromeos or lacros"> - <message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Name of the control which resets the browser theme back to the default theme."> - Reset to default - </message> diff --git a/devel/electron13/files/patch-chrome_app_shutdown__signal__handlers__posix.cc b/devel/electron13/files/patch-chrome_app_shutdown__signal__handlers__posix.cc deleted file mode 100644 index e04984bf40f6..000000000000 --- a/devel/electron13/files/patch-chrome_app_shutdown__signal__handlers__posix.cc +++ /dev/null @@ -1,21 +0,0 @@ ---- chrome/app/shutdown_signal_handlers_posix.cc.orig 2021-01-07 00:36:21 UTC -+++ chrome/app/shutdown_signal_handlers_posix.cc -@@ -186,12 +186,18 @@ void InstallShutdownSignalHandlers( - g_pipe_pid = getpid(); - g_shutdown_pipe_read_fd = pipefd[0]; - g_shutdown_pipe_write_fd = pipefd[1]; -+#if defined(OS_BSD) -+ // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD, -+ // we request the default pthread stack size by specifying 0 here. -+ const size_t kShutdownDetectorThreadStackSize = 0; -+#else - #if !defined(ADDRESS_SANITIZER) - const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; - #else - // ASan instrumentation bloats the stack frames, so we need to increase the - // stack size to avoid hitting the guard page. - const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; -+#endif - #endif - ShutdownDetector* detector = new ShutdownDetector( - g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner); diff --git a/devel/electron13/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/devel/electron13/files/patch-chrome_app_theme_chrome__unscaled__resources.grd deleted file mode 100644 index 77ff628b3405..000000000000 --- a/devel/electron13/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2021-01-07 00:36:21 UTC -+++ chrome/app/theme/chrome_unscaled_resources.grd -@@ -18,7 +18,7 @@ - <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_128.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_256" file="google_chrome/product_logo_256.png" type="BINDATA" /> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" /> - </if> diff --git a/devel/electron13/files/patch-chrome_app_theme_theme__resources.grd b/devel/electron13/files/patch-chrome_app_theme_theme__resources.grd deleted file mode 100644 index e74a4425f72d..000000000000 --- a/devel/electron13/files/patch-chrome_app_theme_theme__resources.grd +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/app/theme/theme_resources.grd.orig 2021-01-07 00:36:21 UTC -+++ chrome/app/theme/theme_resources.grd -@@ -25,7 +25,7 @@ - <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST - BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE - SAME CONDITIONALS. --> -- <if expr="is_linux or is_win or chromeos"> -+ <if expr="is_posix or is_win or chromeos"> - <structure type="chrome_scaled_image" name="IDR_ACCESSIBILITY_CAPTIONS_PREVIEW_BACKGROUND" file="common/captions-preview-bg.png" /> - </if> - <if expr="toolkit_views and not is_macosx"> diff --git a/devel/electron13/files/patch-chrome_browser_BUILD.gn b/devel/electron13/files/patch-chrome_browser_BUILD.gn deleted file mode 100644 index 323f0b805a4a..000000000000 --- a/devel/electron13/files/patch-chrome_browser_BUILD.gn +++ /dev/null @@ -1,49 +0,0 @@ ---- chrome/browser/BUILD.gn.orig 2021-11-13 11:05:57 UTC -+++ chrome/browser/BUILD.gn -@@ -2427,9 +2427,18 @@ static_library("browser") { - ] - } - } -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - deps += [ "//chrome/browser/error_reporting" ] - } -+ if (is_bsd) { -+ sources -= [ -+ "crash_upload_list/crash_upload_list.cc", -+ "crash_upload_list/crash_upload_list.h", -+ ] -+ deps -= [ -+ "//components/crash/core/browser", -+ ] -+ } - if (use_ozone) { - deps += [ - "//ui/events/ozone", -@@ -5134,6 +5143,17 @@ static_library("browser") { - } - } - -+ if (is_bsd) { -+ sources -= [ -+ "enterprise/signals/device_info_fetcher_linux.cc", -+ "enterprise/signals/device_info_fetcher_linux.h", -+ ] -+ sources += [ -+ "enterprise/signals/device_info_fetcher_freebsd.cc", -+ "enterprise/signals/device_info_fetcher_freebsd.h", -+ ] -+ } -+ - if (is_chromeos_ash) { - if (use_allocator == "tcmalloc") { - deps += [ "//chrome/common/performance_manager/mojom" ] -@@ -5361,7 +5381,7 @@ static_library("browser") { - ] - } - -- if (is_posix && !is_mac) { -+ if (is_posix && !is_mac && !is_bsd) { - # TODO(crbug.com / 753619): Enable crash reporting on Fuchsia. - sources += [ - "//chrome/app/chrome_crash_reporter_client.cc", diff --git a/devel/electron13/files/patch-chrome_browser_about__flags.cc b/devel/electron13/files/patch-chrome_browser_about__flags.cc deleted file mode 100644 index 75e1da71c93e..000000000000 --- a/devel/electron13/files/patch-chrome_browser_about__flags.cc +++ /dev/null @@ -1,225 +0,0 @@ ---- chrome/browser/about_flags.cc.orig 2021-07-15 19:13:32 UTC -+++ chrome/browser/about_flags.cc -@@ -937,7 +937,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ - heap_profiling::kMemlogSamplingRate5MB}, - }; - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ - defined(OS_WIN) - const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { - {"DocumentUseServerScore", "true"}, |