diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile index b2e470b63b6d..bcfa094a5f4f 100644 --- a/archivers/gtar/Makefile +++ b/archivers/gtar/Makefile @@ -17,6 +17,8 @@ USES= charsetfix cpe iconv:${STATIC_ARGS} localbase tar:xz CPE_VENDOR= gnu GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g +# unbuckle safety belt: FreeBSD/i386 still has 32-bit time_t +CONFIGURE_ARGS+=--disable-year2038 CONFIGURE_ENV= DEFAULT_RMT_COMMAND=/etc/rmt # supply result to skip a test that will abort configure if run as root CONFIGURE_ENV+= gl_cv_func_mknod_works=yes diff --git a/archivers/libunrar/Makefile b/archivers/libunrar/Makefile index 85f1d4e9f8c7..036e69aa565d 100644 --- a/archivers/libunrar/Makefile +++ b/archivers/libunrar/Makefile @@ -1,5 +1,5 @@ PORTNAME= libunrar -PORTVERSION= 6.2.8 +PORTVERSION= 6.2.9 PORTEPOCH= 1 CATEGORIES= archivers MASTER_SITES= http://www.rarlab.com/rar/ diff --git a/archivers/libunrar/distinfo b/archivers/libunrar/distinfo index b35936afea0e..2ee181e7465f 100644 --- a/archivers/libunrar/distinfo +++ b/archivers/libunrar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686905718 -SHA256 (unrarsrc-6.2.8.tar.gz) = 1777e3d3b073815ff68a411ddb1ab76d0a4e1f58ecc7080035b27b52967ff911 -SIZE (unrarsrc-6.2.8.tar.gz) = 246249 +TIMESTAMP = 1689913695 +SHA256 (unrarsrc-6.2.9.tar.gz) = 477aecdad08062b20eb63e14f60dc70293dcb92ec7b1d80ab3ea8acec33c2cb4 +SIZE (unrarsrc-6.2.9.tar.gz) = 246388 diff --git a/archivers/p5-Gzip-Faster/Makefile b/archivers/p5-Gzip-Faster/Makefile index 56c94098ca40..d1fc8fcc61de 100644 --- a/archivers/p5-Gzip-Faster/Makefile +++ b/archivers/p5-Gzip-Faster/Makefile @@ -5,7 +5,7 @@ MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:BKB PKGNAMEPREFIX= p5- -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Simple and fast gzip and gunzip WWW= https://metacpan.org/release/Gzip-Faster diff --git a/audio/caps-lv2/Makefile b/audio/caps-lv2/Makefile index 6b9fad62011a..1bca1c704849 100644 --- a/audio/caps-lv2/Makefile +++ b/audio/caps-lv2/Makefile @@ -12,6 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= lv2>0:audio/lv2 USES= gmake localbase +USE_CXXSTD= c++14 USE_GITHUB= yes GH_ACCOUNT= moddevices GH_TAGNAME= 5d52a0c diff --git a/audio/fcplay/Makefile b/audio/fcplay/Makefile index eca88ac8c172..8f989e9c54bd 100644 --- a/audio/fcplay/Makefile +++ b/audio/fcplay/Makefile @@ -13,11 +13,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsidplay.so:audio/libsidplay -USES= gmake tar:tgz +USES= gmake localbase tar:tgz +USE_CXXSTD= c++14 + GNU_CONFIGURE= yes -CXXFLAGS+= -I${LOCALBASE}/include -PORTDOCS= ABOUT POINTER + PLIST_FILES= bin/fcplay +PORTDOCS= ABOUT POINTER OPTIONS_DEFINE= DOCS diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile index 5f93ad019308..9ab6479d5e05 100644 --- a/audio/mumble/Makefile +++ b/audio/mumble/Makefile @@ -3,7 +3,7 @@ PORTVERSION= 1.3.3 PORTREVISION= 10 CATEGORIES= audio -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Voice chat software primarily intended for use while gaming WWW= http://mumble.sourceforge.net/ diff --git a/audio/murmur-cli/Makefile b/audio/murmur-cli/Makefile index 923dea0e77c8..916dda1e2b20 100644 --- a/audio/murmur-cli/Makefile +++ b/audio/murmur-cli/Makefile @@ -3,7 +3,7 @@ PORTVERSION= 0.0.0.20200528 PORTREVISION= 12 CATEGORIES= audio -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= GRPC client for Murmur server WWW= https://github.com/layeh/murmur-cli diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile index e286c33d451c..6d813e3c4458 100644 --- a/audio/murmur/Makefile +++ b/audio/murmur/Makefile @@ -3,7 +3,7 @@ PORTVERSION= 1.3.3 PORTREVISION= 6 CATEGORIES= audio net -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Server component of Mumble WWW= http://mumble.sourceforge.net/ diff --git a/biology/canu/Makefile b/biology/canu/Makefile index d9b670ebf467..2f352aaf22d8 100644 --- a/biology/canu/Makefile +++ b/biology/canu/Makefile @@ -19,16 +19,15 @@ LIB_DEPENDS= libboost_regex.so:devel/boost-libs RUN_DEPENDS= gnuplot:math/gnuplot USES= compiler:c++11-lang gmake localbase perl5 tar:xz -USE_JAVA= yes - +USE_CXXSTD= c++14 +USE_JAVA= 8+ JAVA_RUN= yes -JAVA_VERSION= 8+ -WRKSRC_SUBDIR= src # Upstream Makefile compiles directly into ${DESTDIR}${PREFIX} rather than # using a separate install target. MAKE_ENV= DESTDIR=${WRKSRC} CANU_BUILD_ENV=ports -CXXFLAGS+= -std=c++14 + +WRKSRC_SUBDIR= src .include diff --git a/biology/ncbi-toolkit/Makefile b/biology/ncbi-toolkit/Makefile index 1b9dfa9d0f87..fe00defd475d 100644 --- a/biology/ncbi-toolkit/Makefile +++ b/biology/ncbi-toolkit/Makefile @@ -31,12 +31,16 @@ SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS -.include +.include .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=int-conversion .endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + post-patch: @${REINPLACE_CMD} -e \ 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/make/makedis.csh @@ -83,4 +87,4 @@ do-install-DOCS-on: @(cd ${WRKSRC}/doc && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} '-not ( -name man -o -path ./man\/* )') -.include +.include diff --git a/cad/gds3d/files/patch-manual-gdsparse.cpp b/cad/gds3d/files/patch-manual-gdsparse.cpp new file mode 100644 index 000000000000..5042567f1bf9 --- /dev/null +++ b/cad/gds3d/files/patch-manual-gdsparse.cpp @@ -0,0 +1,33 @@ +- workaround for error: reference to 'byte' is ambiguous, see https://github.com/trilomix/GDS3D/issues/23 + +--- ../libgdsto3d/gdsparse.cpp.orig 2023-07-20 10:59:11.684448000 -0700 ++++ ../libgdsto3d/gdsparse.cpp 2023-07-20 10:59:35.325794000 -0700 +@@ -127,7 +127,7 @@ + + bool GDSParse::ParseFile(char *topcell) + { +- byte recordtype, datatype; ++ ::byte recordtype, datatype; + char *tempstr; + //struct ProcessLayer *layer = NULL; + +@@ -1086,7 +1086,7 @@ + + short GDSParse::GetBitArray() + { +- byte byte1; ++ ::byte byte1; + + fread(&byte1, 1, 1, _iptr); + fread(&byte1, 1, 1, _iptr); +@@ -1097,8 +1097,8 @@ + + double GDSParse::GetEightByteReal() + { +- byte value; +- byte b8, b2, b3, b4, b5, b6, b7; ++ ::byte value; ++ ::byte b8, b2, b3, b4, b5, b6, b7; + double sign=1.0; + double exponent; + double mant; diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index 447a9426c000..3efc884cb2be 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -1,6 +1,6 @@ PORTNAME= opencascade DISTVERSION= 7.7.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= cad science MASTER_SITES= LOCAL/thierry @@ -166,8 +166,7 @@ post-build-DOXYGEN-on: post-install: ${MV} ${STAGEDIR}${OCCROOT}/bin/DRAWEXE-${DISTVERSION:C/-beta//} ${STAGEDIR}${PREFIX}/bin/DRAWEXE - (cd ${STAGEDIR}${PREFIX}/bin && \ - ${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bin/DRAWEXE) + ${RLN} ${STAGEDIR}${PREFIX}/bin/DRAWEXE ${STAGEDIR}${OCCROOT}/bin post-install-DOXYGEN-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/comms/uird/Makefile b/comms/uird/Makefile index 654b339dff90..b24194d0ead3 100644 --- a/comms/uird/Makefile +++ b/comms/uird/Makefile @@ -10,20 +10,29 @@ WWW= http://kbinstuff.googlepages.com/uirduniversalirreceiverdaemon USES= perl5 gmake tar:tgz -WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= ${PORTNAME} +WRKSRC= ${WRKDIR}/${PORTNAME} + PLIST_FILES= bin/uird PORTDOCS= Documentation OPTIONS_DEFINE= DOCS +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + post-patch: @${REINPLACE_CMD} -e 's|gcc|$${CC}\ $${CFLAGS}|; /strip/d' \ ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/uird ${STAGEDIR}${PREFIX}/bin + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} diff --git a/converters/p5-Bencode/Makefile b/converters/p5-Bencode/Makefile index 04d88a303060..07690832b335 100644 --- a/converters/p5-Bencode/Makefile +++ b/converters/p5-Bencode/Makefile @@ -6,7 +6,7 @@ MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:ARISTOTLE PKGNAMEPREFIX= p5- -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= BitTorrent bencode serialisation format WWW= https://metacpan.org/release/Bencode diff --git a/databases/Makefile b/databases/Makefile index 1e3bd886e531..b3cf3b7b7c56 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -652,6 +652,7 @@ SUBDIR += postgis32 SUBDIR += postgis33 SUBDIR += postgresql-cstore_fdw + SUBDIR += postgresql-idn SUBDIR += postgresql-jdbc SUBDIR += postgresql-libpgeasy SUBDIR += postgresql-libpqxx diff --git a/databases/postgresql-idn/Makefile b/databases/postgresql-idn/Makefile new file mode 100644 index 000000000000..0bee9a4b11cb --- /dev/null +++ b/databases/postgresql-idn/Makefile @@ -0,0 +1,41 @@ +PORTNAME= idn +PORTVERSION= 0.2 +CATEGORIES= databases +PKGNAMEPREFIX= postgresql${PGSQL_VER:S/.//}- + +MAINTAINER= bofh@FreeBSD.org +COMMENT= PostgreSQL extension for libidn2 +WWW= https://github.com/dyninc/postgresql-idn + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYRIGHT + +LIB_DEPENDS= libidn.so:dns/libidn \ + libidn2.so:dns/libidn2 + +USES= gmake pgsql +WANT_PGSQL= server +USE_GITHUB= yes +GH_ACCOUNT= dyninc +GH_PROJECT= postgresql-idn +GH_TAGNAME= d4ffaec + +BUILD_WRKSRC= ${WRKSRC}/sources + +PLIST_FILES= \ + lib/postgresql/idn.so \ + share/postgresql/extension/idn.control \ + share/postgresql/extension/idn--0.2.sql + +post-patch: + @${REINPLACE_CMD} -e 's|CreateTemplateTupleDesc(3, false)|CreateTemplateTupleDesc(3)|g' \ + ${BUILD_WRKSRC}/idn.c + +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/postgresql + ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql/extension + ${INSTALL_LIB} ${BUILD_WRKSRC}/idn.so ${STAGEDIR}${PREFIX}/lib/postgresql/idn.so + ${INSTALL_DATA} ${BUILD_WRKSRC}/idn--0.2.sql ${STAGEDIR}${PREFIX}/share/postgresql/extension + ${INSTALL_DATA} ${BUILD_WRKSRC}/idn.control ${STAGEDIR}${PREFIX}/share/postgresql/extension + +.include diff --git a/databases/postgresql-idn/distinfo b/databases/postgresql-idn/distinfo new file mode 100644 index 000000000000..3a8be0534f32 --- /dev/null +++ b/databases/postgresql-idn/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1689853106 +SHA256 (dyninc-postgresql-idn-0.2-d4ffaec_GH0.tar.gz) = 77648e741c96ae186dcd4ce835cada228877864e390e1854c5099277337a0b06 +SIZE (dyninc-postgresql-idn-0.2-d4ffaec_GH0.tar.gz) = 14784 diff --git a/databases/postgresql-idn/pkg-descr b/databases/postgresql-idn/pkg-descr new file mode 100644 index 000000000000..a3aca8a8234f --- /dev/null +++ b/databases/postgresql-idn/pkg-descr @@ -0,0 +1,6 @@ +At a fundamental level, this extension grants access to a number of +functions provided by the libidn and libidn2 libraries. Not all of the +functions provided by these libraries are exposed. + +Whenever possible, the code will transform the encoding of the data in +the database to UTF-8 before further processing. diff --git a/deskutils/copyq/Makefile b/deskutils/copyq/Makefile index ea34a73abb93..4a8d24d6d5eb 100644 --- a/deskutils/copyq/Makefile +++ b/deskutils/copyq/Makefile @@ -5,6 +5,9 @@ PORTREVISION= 2 CATEGORIES= deskutils PKGNAMESUFFIX= -${FLAVOR} +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 79d33dd337deeb357ce92c3d1e2b5b56b6f2c97d.patch:-p1 # Fix build with Qt 6.5.x + MAINTAINER= eduardo@FreeBSD.org COMMENT= Qt${FLAVOR:S/qt//} based clipboard manager WWW= https://github.com/hluk/CopyQ diff --git a/deskutils/copyq/distinfo b/deskutils/copyq/distinfo index 2955bd6d1c5f..7c7a3eb50671 100644 --- a/deskutils/copyq/distinfo +++ b/deskutils/copyq/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1680456044 +TIMESTAMP = 1689891691 SHA256 (hluk-CopyQ-v7.0.0_GH0.tar.gz) = 5898ba2025f8e9f61a4b4732e85adf3b1653fad20b5c1f1b0c879a7b72cd4d48 SIZE (hluk-CopyQ-v7.0.0_GH0.tar.gz) = 3323354 +SHA256 (79d33dd337deeb357ce92c3d1e2b5b56b6f2c97d.patch) = 1e35ffd348245b2ca74671e17e38ea77888c589730da69974f6440923226872e +SIZE (79d33dd337deeb357ce92c3d1e2b5b56b6f2c97d.patch) = 1734 diff --git a/devel/bacon/Makefile b/devel/bacon/Makefile index 1d0ad6bc6480..80a83fe3d02d 100644 --- a/devel/bacon/Makefile +++ b/devel/bacon/Makefile @@ -1,7 +1,7 @@ PORTNAME= bacon DISTVERSIONPREFIX= v -DISTVERSION= 2.11.1 -PORTREVISION= 1 +DISTVERSION= 2.12.0 +PORTREVISION= 0 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -20,14 +20,19 @@ CARGO_CRATES= adler-1.0.2 \ ahash-0.8.2 \ aho-corasick-1.0.2 \ android_system_properties-0.1.5 \ + anstream-0.3.2 \ + anstyle-1.0.1 \ + anstyle-parse-0.2.1 \ + anstyle-query-1.0.0 \ + anstyle-wincon-1.0.1 \ anyhow-1.0.68 \ arc-swap-1.6.0 \ arrayvec-0.5.2 \ arrayvec-0.7.2 \ atoi-2.0.0 \ - atty-0.2.14 \ autocfg-1.1.0 \ bitflags-1.3.2 \ + bitflags-2.3.3 \ bstr-1.3.0 \ btoi-0.4.2 \ bumpalo-3.11.1 \ @@ -40,12 +45,15 @@ CARGO_CRATES= adler-1.0.2 \ cc-1.0.78 \ cfg-if-1.0.0 \ chrono-0.4.23 \ - clap-3.2.23 \ - clap_derive-3.2.18 \ - clap_lex-0.2.4 \ + clap-4.3.15 \ + clap-help-0.5.0 \ + clap_builder-4.3.15 \ + clap_derive-4.3.12 \ + clap_lex-0.5.0 \ cli-log-2.0.0 \ clru-0.6.1 \ codespan-reporting-0.11.1 \ + colorchoice-1.0.0 \ compact_str-0.6.1 \ coolor-0.5.0 \ core-foundation-sys-0.8.3 \ @@ -71,6 +79,8 @@ CARGO_CRATES= adler-1.0.2 \ dirs-sys-next-0.1.2 \ dunce-1.0.3 \ either-1.8.0 \ + errno-0.3.1 \ + errno-dragonfly-0.1.2 \ fastrand-1.8.0 \ file-size-1.0.3 \ filetime-0.2.19 \ @@ -115,8 +125,8 @@ CARGO_CRATES= adler-1.0.2 \ hashbrown-0.12.3 \ hashbrown-0.13.2 \ heck-0.4.0 \ - hermit-abi-0.1.19 \ hermit-abi-0.2.6 \ + hermit-abi-0.3.2 \ hex-0.4.3 \ home-0.5.4 \ human_format-1.0.3 \ @@ -129,6 +139,7 @@ CARGO_CRATES= adler-1.0.2 \ inotify-sys-0.1.5 \ instant-0.1.12 \ io-close-0.3.7 \ + is-terminal-0.4.9 \ itoa-1.0.5 \ js-sys-0.3.60 \ jwalk-0.8.1 \ @@ -136,17 +147,20 @@ CARGO_CRATES= adler-1.0.2 \ kqueue-sys-1.0.3 \ lazy-regex-3.0.0 \ lazy-regex-proc_macros-3.0.0 \ - libc-0.2.139 \ + libc-0.2.147 \ link-cplusplus-1.0.8 \ + linux-raw-sys-0.4.3 \ lock_api-0.4.9 \ log-0.4.17 \ memchr-2.5.0 \ memmap2-0.5.8 \ + memoffset-0.6.5 \ memoffset-0.7.1 \ minimad-0.12.0 \ minimal-lexical-0.2.1 \ miniz_oxide-0.6.2 \ mio-0.8.5 \ + nix-0.22.3 \ nix-0.26.1 \ nom-7.1.2 \ notify-5.0.0 \ @@ -155,15 +169,12 @@ CARGO_CRATES= adler-1.0.2 \ num_cpus-1.15.0 \ num_threads-0.1.6 \ once_cell-1.17.0 \ - os_str_bytes-6.4.1 \ parking_lot-0.11.2 \ parking_lot-0.12.1 \ parking_lot_core-0.8.6 \ parking_lot_core-0.9.6 \ percent-encoding-2.2.0 \ pin-project-lite-0.2.9 \ - proc-macro-error-1.0.4 \ - proc-macro-error-attr-1.0.4 \ proc-macro2-1.0.60 \ proc-status-0.1.1 \ prodash-23.0.0 \ @@ -178,6 +189,7 @@ CARGO_CRATES= adler-1.0.2 \ regex-automata-0.3.1 \ regex-syntax-0.7.3 \ remove_dir_all-0.5.3 \ + rustix-0.38.4 \ rustversion-1.0.11 \ ryu-1.0.12 \ same-file-1.0.6 \ @@ -201,7 +213,7 @@ CARGO_CRATES= adler-1.0.2 \ tempfile-3.3.0 \ termcolor-1.1.3 \ termimad-0.23.1 \ - textwrap-0.16.0 \ + terminal-light-1.1.1 \ thiserror-1.0.38 \ thiserror-impl-1.0.38 \ time-0.1.45 \ @@ -222,7 +234,7 @@ CARGO_CRATES= adler-1.0.2 \ unicode-normalization-0.1.22 \ unicode-width-0.1.10 \ url-2.3.1 \ - utf8parse-0.2.0 \ + utf8parse-0.2.1 \ version_check-0.9.4 \ vte-0.8.0 \ vte_generate_state_changes-0.1.1 \ @@ -256,7 +268,8 @@ CARGO_CRATES= adler-1.0.2 \ windows_x86_64_gnullvm-0.48.0 \ windows_x86_64_msvc-0.42.0 \ windows_x86_64_msvc-0.48.0 \ - winnow-0.4.7 + winnow-0.4.7 \ + xterm-query-0.2.0 PLIST_FILES= bin/${PORTNAME} diff --git a/devel/bacon/distinfo b/devel/bacon/distinfo index cf078bfd61f7..a2187d59b1de 100644 --- a/devel/bacon/distinfo +++ b/devel/bacon/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1689316610 +TIMESTAMP = 1689917325 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe SIZE (rust/crates/adler-1.0.2.crate) = 12778 SHA256 (rust/crates/ahash-0.8.2.crate) = bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107 @@ -7,6 +7,16 @@ SHA256 (rust/crates/aho-corasick-1.0.2.crate) = 43f6cb1bf222025340178f382c426f13 SIZE (rust/crates/aho-corasick-1.0.2.crate) = 167694 SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311 SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243 +SHA256 (rust/crates/anstream-0.3.2.crate) = 0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163 +SIZE (rust/crates/anstream-0.3.2.crate) = 19504 +SHA256 (rust/crates/anstyle-1.0.1.crate) = 3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd +SIZE (rust/crates/anstyle-1.0.1.crate) = 13977 +SHA256 (rust/crates/anstyle-parse-0.2.1.crate) = 938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333 +SIZE (rust/crates/anstyle-parse-0.2.1.crate) = 24802 +SHA256 (rust/crates/anstyle-query-1.0.0.crate) = 5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b +SIZE (rust/crates/anstyle-query-1.0.0.crate) = 8620 +SHA256 (rust/crates/anstyle-wincon-1.0.1.crate) = 180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188 +SIZE (rust/crates/anstyle-wincon-1.0.1.crate) = 11718 SHA256 (rust/crates/anyhow-1.0.68.crate) = 2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61 SIZE (rust/crates/anyhow-1.0.68.crate) = 43882 SHA256 (rust/crates/arc-swap-1.6.0.crate) = bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6 @@ -17,12 +27,12 @@ SHA256 (rust/crates/arrayvec-0.7.2.crate) = 8da52d66c7071e2e3fa2a1e5c6d088fec47b SIZE (rust/crates/arrayvec-0.7.2.crate) = 29341 SHA256 (rust/crates/atoi-2.0.0.crate) = f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528 SIZE (rust/crates/atoi-2.0.0.crate) = 7785 -SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 -SIZE (rust/crates/atty-0.2.14.crate) = 5470 SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa SIZE (rust/crates/autocfg-1.1.0.crate) = 13272 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a SIZE (rust/crates/bitflags-1.3.2.crate) = 23021 +SHA256 (rust/crates/bitflags-2.3.3.crate) = 630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42 +SIZE (rust/crates/bitflags-2.3.3.crate) = 34320 SHA256 (rust/crates/bstr-1.3.0.crate) = 5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1 SIZE (rust/crates/bstr-1.3.0.crate) = 340998 SHA256 (rust/crates/btoi-0.4.2.crate) = 97c0869a9faa81f8bbf8102371105d6d0a7b79167a04c340b04ab16892246a11 @@ -47,18 +57,24 @@ SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582eb SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 SHA256 (rust/crates/chrono-0.4.23.crate) = 16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f SIZE (rust/crates/chrono-0.4.23.crate) = 187259 -SHA256 (rust/crates/clap-3.2.23.crate) = 71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5 -SIZE (rust/crates/clap-3.2.23.crate) = 219435 -SHA256 (rust/crates/clap_derive-3.2.18.crate) = ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65 -SIZE (rust/crates/clap_derive-3.2.18.crate) = 28208 -SHA256 (rust/crates/clap_lex-0.2.4.crate) = 2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5 -SIZE (rust/crates/clap_lex-0.2.4.crate) = 9652 +SHA256 (rust/crates/clap-4.3.15.crate) = 8f644d0dac522c8b05ddc39aaaccc5b136d5dc4ff216610c5641e3be5becf56c +SIZE (rust/crates/clap-4.3.15.crate) = 55021 +SHA256 (rust/crates/clap-help-0.5.0.crate) = 75dcee90dd4e260252e06bbc87de4d0383568a088317ca06ab9ea0925bade0b6 +SIZE (rust/crates/clap-help-0.5.0.crate) = 383482 +SHA256 (rust/crates/clap_builder-4.3.15.crate) = af410122b9778e024f9e0fb35682cc09cc3f85cad5e8d3ba8f47a9702df6e73d +SIZE (rust/crates/clap_builder-4.3.15.crate) = 161438 +SHA256 (rust/crates/clap_derive-4.3.12.crate) = 54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050 +SIZE (rust/crates/clap_derive-4.3.12.crate) = 29052 +SHA256 (rust/crates/clap_lex-0.5.0.crate) = 2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b +SIZE (rust/crates/clap_lex-0.5.0.crate) = 11792 SHA256 (rust/crates/cli-log-2.0.0.crate) = 3d2ab00dc4c82ec28af25ac085aecc11ffeabf353755715a3113a7aa044ca5cc SIZE (rust/crates/cli-log-2.0.0.crate) = 5302 SHA256 (rust/crates/clru-0.6.1.crate) = b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807 SIZE (rust/crates/clru-0.6.1.crate) = 16507 SHA256 (rust/crates/codespan-reporting-0.11.1.crate) = 3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e SIZE (rust/crates/codespan-reporting-0.11.1.crate) = 48963 +SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7 +SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857 SHA256 (rust/crates/compact_str-0.6.1.crate) = 5138945395949e7dfba09646dc9e766b548ff48e23deb5246890e6b64ae9e1b9 SIZE (rust/crates/compact_str-0.6.1.crate) = 54555 SHA256 (rust/crates/coolor-0.5.0.crate) = af4d7a805ca0d92f8c61a31c809d4323fdaa939b0b440e544d21db7797c5aaad @@ -109,6 +125,10 @@ SHA256 (rust/crates/dunce-1.0.3.crate) = 0bd4b30a6560bbd9b4620f4de34c3f14f60848e SIZE (rust/crates/dunce-1.0.3.crate) = 8035 SHA256 (rust/crates/either-1.8.0.crate) = 90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797 SIZE (rust/crates/either-1.8.0.crate) = 15992 +SHA256 (rust/crates/errno-0.3.1.crate) = 4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a +SIZE (rust/crates/errno-0.3.1.crate) = 10348 +SHA256 (rust/crates/errno-dragonfly-0.1.2.crate) = aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf +SIZE (rust/crates/errno-dragonfly-0.1.2.crate) = 1810 SHA256 (rust/crates/fastrand-1.8.0.crate) = a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499 SIZE (rust/crates/fastrand-1.8.0.crate) = 11369 SHA256 (rust/crates/file-size-1.0.3.crate) = 9544f10105d33957765016b8a9baea7e689bf1f0f2f32c2fa2f568770c38d2b3 @@ -197,10 +217,10 @@ SHA256 (rust/crates/hashbrown-0.13.2.crate) = 43a3c133739dddd0d2990f9a4bdf8eb4b2 SIZE (rust/crates/hashbrown-0.13.2.crate) = 105265 SHA256 (rust/crates/heck-0.4.0.crate) = 2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9 SIZE (rust/crates/heck-0.4.0.crate) = 11161 -SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33 -SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979 SHA256 (rust/crates/hermit-abi-0.2.6.crate) = ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7 SIZE (rust/crates/hermit-abi-0.2.6.crate) = 13027 +SHA256 (rust/crates/hermit-abi-0.3.2.crate) = 443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b +SIZE (rust/crates/hermit-abi-0.3.2.crate) = 13783 SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70 SIZE (rust/crates/hex-0.4.3.crate) = 13299 SHA256 (rust/crates/home-0.5.4.crate) = 747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408 @@ -225,6 +245,8 @@ SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0 SIZE (rust/crates/instant-0.1.12.crate) = 6128 SHA256 (rust/crates/io-close-0.3.7.crate) = 9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc SIZE (rust/crates/io-close-0.3.7.crate) = 8025 +SHA256 (rust/crates/is-terminal-0.4.9.crate) = cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b +SIZE (rust/crates/is-terminal-0.4.9.crate) = 8109 SHA256 (rust/crates/itoa-1.0.5.crate) = fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440 SIZE (rust/crates/itoa-1.0.5.crate) = 10622 SHA256 (rust/crates/js-sys-0.3.60.crate) = 49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47 @@ -239,10 +261,12 @@ SHA256 (rust/crates/lazy-regex-3.0.0.crate) = a10cfecab9e7e81981b6547d87bd96c38f SIZE (rust/crates/lazy-regex-3.0.0.crate) = 5715 SHA256 (rust/crates/lazy-regex-proc_macros-3.0.0.crate) = 4f746dfdd89dad7e689ed6542d65eb11f5af3e52d92708db74700b4449e2d558 SIZE (rust/crates/lazy-regex-proc_macros-3.0.0.crate) = 4171 -SHA256 (rust/crates/libc-0.2.139.crate) = 201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79 -SIZE (rust/crates/libc-0.2.139.crate) = 638983 +SHA256 (rust/crates/libc-0.2.147.crate) = b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3 +SIZE (rust/crates/libc-0.2.147.crate) = 686772 SHA256 (rust/crates/link-cplusplus-1.0.8.crate) = ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5 SIZE (rust/crates/link-cplusplus-1.0.8.crate) = 7674 +SHA256 (rust/crates/linux-raw-sys-0.4.3.crate) = 09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0 +SIZE (rust/crates/linux-raw-sys-0.4.3.crate) = 1116245 SHA256 (rust/crates/lock_api-0.4.9.crate) = 435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df SIZE (rust/crates/lock_api-0.4.9.crate) = 25685 SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e @@ -251,6 +275,8 @@ SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2c SIZE (rust/crates/memchr-2.5.0.crate) = 65812 SHA256 (rust/crates/memmap2-0.5.8.crate) = 4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc SIZE (rust/crates/memmap2-0.5.8.crate) = 26592 +SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce +SIZE (rust/crates/memoffset-0.6.5.crate) = 7686 SHA256 (rust/crates/memoffset-0.7.1.crate) = 5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4 SIZE (rust/crates/memoffset-0.7.1.crate) = 8556 SHA256 (rust/crates/minimad-0.12.0.crate) = 38b136454924e4d020e55c4992e07c105b40d5c41b84662862f0e15bc0a2efef @@ -261,6 +287,8 @@ SHA256 (rust/crates/miniz_oxide-0.6.2.crate) = b275950c28b37e794e8c55d88aeb5e139 SIZE (rust/crates/miniz_oxide-0.6.2.crate) = 54536 SHA256 (rust/crates/mio-0.8.5.crate) = e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de SIZE (rust/crates/mio-0.8.5.crate) = 93993 +SHA256 (rust/crates/nix-0.22.3.crate) = e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf +SIZE (rust/crates/nix-0.22.3.crate) = 230252 SHA256 (rust/crates/nix-0.26.1.crate) = 46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694 SIZE (rust/crates/nix-0.26.1.crate) = 277805 SHA256 (rust/crates/nom-7.1.2.crate) = e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c @@ -277,8 +305,6 @@ SHA256 (rust/crates/num_threads-0.1.6.crate) = 2819ce041d2ee131036f4fc9d6ae7ae12 SIZE (rust/crates/num_threads-0.1.6.crate) = 7334 SHA256 (rust/crates/once_cell-1.17.0.crate) = 6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66 SIZE (rust/crates/once_cell-1.17.0.crate) = 32736 -SHA256 (rust/crates/os_str_bytes-6.4.1.crate) = 9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee -SIZE (rust/crates/os_str_bytes-6.4.1.crate) = 23101 SHA256 (rust/crates/parking_lot-0.11.2.crate) = 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99 SIZE (rust/crates/parking_lot-0.11.2.crate) = 39869 SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f @@ -291,10 +317,6 @@ SHA256 (rust/crates/percent-encoding-2.2.0.crate) = 478c572c3d73181ff3c2539045f6 SIZE (rust/crates/percent-encoding-2.2.0.crate) = 10075 SHA256 (rust/crates/pin-project-lite-0.2.9.crate) = e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116 SIZE (rust/crates/pin-project-lite-0.2.9.crate) = 27713 -SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c -SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293 -SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869 -SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971 SHA256 (rust/crates/proc-macro2-1.0.60.crate) = dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406 SIZE (rust/crates/proc-macro2-1.0.60.crate) = 44160 SHA256 (rust/crates/proc-status-0.1.1.crate) = f0e0c0ac915e7b76b47850ba4ffc377abde6c6ff9eeace61d0a89623db449712 @@ -323,6 +345,8 @@ SHA256 (rust/crates/regex-syntax-0.7.3.crate) = 2ab07dc67230e4a4718e70fd5c20055a SIZE (rust/crates/regex-syntax-0.7.3.crate) = 343354 SHA256 (rust/crates/remove_dir_all-0.5.3.crate) = 3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7 SIZE (rust/crates/remove_dir_all-0.5.3.crate) = 9184 +SHA256 (rust/crates/rustix-0.38.4.crate) = 0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5 +SIZE (rust/crates/rustix-0.38.4.crate) = 323637 SHA256 (rust/crates/rustversion-1.0.11.crate) = 5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70 SIZE (rust/crates/rustversion-1.0.11.crate) = 17485 SHA256 (rust/crates/ryu-1.0.12.crate) = 7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde @@ -369,8 +393,8 @@ SHA256 (rust/crates/termcolor-1.1.3.crate) = bab24d30b911b2376f3a13cc2cd443142f0 SIZE (rust/crates/termcolor-1.1.3.crate) = 17242 SHA256 (rust/crates/termimad-0.23.1.crate) = e7df2ed35b86d796df56633f1bb1f0c15816134e221822d65bbc64d5265ce8d4 SIZE (rust/crates/termimad-0.23.1.crate) = 356236 -SHA256 (rust/crates/textwrap-0.16.0.crate) = 222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d -SIZE (rust/crates/textwrap-0.16.0.crate) = 53722 +SHA256 (rust/crates/terminal-light-1.1.1.crate) = 9077b39afb70f12391e4c1fcf46319999cfc32b45d605a668052bc4d1b4511af +SIZE (rust/crates/terminal-light-1.1.1.crate) = 39344 SHA256 (rust/crates/thiserror-1.0.38.crate) = 6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0 SIZE (rust/crates/thiserror-1.0.38.crate) = 18947 SHA256 (rust/crates/thiserror-impl-1.0.38.crate) = 1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f @@ -411,8 +435,8 @@ SHA256 (rust/crates/unicode-width-0.1.10.crate) = c0edd1e5b14653f783770bce4a4dab SIZE (rust/crates/unicode-width-0.1.10.crate) = 18968 SHA256 (rust/crates/url-2.3.1.crate) = 0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643 SIZE (rust/crates/url-2.3.1.crate) = 72777 -SHA256 (rust/crates/utf8parse-0.2.0.crate) = 936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372 -SIZE (rust/crates/utf8parse-0.2.0.crate) = 13392 +SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a +SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435 SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f SIZE (rust/crates/version_check-0.9.4.crate) = 14895 SHA256 (rust/crates/vte-0.8.0.crate) = 96cc8a191608603611e78c6ec11dafef37e3cca0775aeef1931824753e81711d @@ -481,5 +505,7 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 1a515f5799fe4961cb532f98 SIZE (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 671422 SHA256 (rust/crates/winnow-0.4.7.crate) = ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448 SIZE (rust/crates/winnow-0.4.7.crate) = 142640 -SHA256 (Canop-bacon-v2.11.1_GH0.tar.gz) = c0081bfe33064707e464bdeb7d569d818d90614adcb8f662e0acc8c5e1e0ccf3 -SIZE (Canop-bacon-v2.11.1_GH0.tar.gz) = 683437 +SHA256 (rust/crates/xterm-query-0.2.0.crate) = ec02abe9c7efbcb010adc0d90bc4a054653477cd4a3eb8eef5a689799c146a13 +SIZE (rust/crates/xterm-query-0.2.0.crate) = 6342 +SHA256 (Canop-bacon-v2.12.0_GH0.tar.gz) = 041fb411c013c66958da99114333af2b5474e805b490fbd1e6df8cc1f54c91b4 +SIZE (Canop-bacon-v2.12.0_GH0.tar.gz) = 684449 diff --git a/devel/criterion/Makefile b/devel/criterion/Makefile index fbd8e2a66be6..bf011f60e4f7 100644 --- a/devel/criterion/Makefile +++ b/devel/criterion/Makefile @@ -37,6 +37,12 @@ CFLAGS+= -fPIC \ MESON_ARGS= -Dtests=false -Dsamples=false +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + quick-test: @cd ${TEST_WRKSRC} && \ ${CC} ${CFLAGS} ${LDFLAGS} -I${STAGEDIR}${PREFIX}/include \ diff --git a/devel/easyloggingpp/Makefile b/devel/easyloggingpp/Makefile index d4f47b3eb6e8..1cad256824aa 100644 --- a/devel/easyloggingpp/Makefile +++ b/devel/easyloggingpp/Makefile @@ -1,6 +1,6 @@ PORTNAME= easyloggingpp DISTVERSIONPREFIX= v -DISTVERSION= 9.97.0 +DISTVERSION= 9.97.1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/easyloggingpp/distinfo b/devel/easyloggingpp/distinfo index 3b94fa9f030d..1456fa02b9c8 100644 --- a/devel/easyloggingpp/distinfo +++ b/devel/easyloggingpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609052128 -SHA256 (amrayn-easyloggingpp-v9.97.0_GH0.tar.gz) = 9110638e21ef02428254af8688bf9e766483db8cc2624144aa3c59006907ce22 -SIZE (amrayn-easyloggingpp-v9.97.0_GH0.tar.gz) = 750851 +TIMESTAMP = 1689917247 +SHA256 (amrayn-easyloggingpp-v9.97.1_GH0.tar.gz) = ebe473e17b13f1d1f16d0009689576625796947a711e14aec29530f39560c7c2 +SIZE (amrayn-easyloggingpp-v9.97.1_GH0.tar.gz) = 771149 diff --git a/devel/easyloggingpp/files/patch-CMakeLists.txt b/devel/easyloggingpp/files/patch-CMakeLists.txt index bdbacaacc699..fbc20a14441f 100644 --- a/devel/easyloggingpp/files/patch-CMakeLists.txt +++ b/devel/easyloggingpp/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2020-12-25 09:02:08 UTC +--- CMakeLists.txt.orig 2023-07-20 03:46:10 UTC +++ CMakeLists.txt -@@ -22,7 +22,7 @@ macro(require_cpp11) +@@ -22,7 +22,7 @@ macro(require_cpp14) endmacro() option(test "Build all tests" OFF) @@ -28,7 +28,7 @@ add_definitions(-DELPP_UTC_DATETIME) endif() - require_cpp11() + require_cpp14() - add_library(easyloggingpp STATIC src/easylogging++.cc) + add_library(easyloggingpp SHARED src/easylogging++.cc) set_property(TARGET easyloggingpp PROPERTY POSITION_INDEPENDENT_CODE ON) @@ -40,14 +40,14 @@ endif() export(PACKAGE ${PROJECT_NAME}) -@@ -98,7 +98,9 @@ if (test) +@@ -97,7 +97,9 @@ if (test) ) # Standard linking to gtest stuff. -- target_link_libraries(easyloggingpp-unit-tests gtest gtest_main) +- target_link_libraries(easyloggingpp-unit-tests ${GTEST_BOTH_LIBRARIES}) + target_include_directories(easyloggingpp-unit-tests PRIVATE ${CMAKE_INSTALL_PREFIX}/include) + target_link_directories(easyloggingpp-unit-tests PRIVATE ${CMAKE_INSTALL_PREFIX}/lib) -+ target_link_libraries(easyloggingpp-unit-tests gtest gtest_main execinfo) ++ target_link_libraries(easyloggingpp-unit-tests ${GTEST_BOTH_LIBRARIES} execinfo) add_test(NAME easyloggingppUnitTests COMMAND easyloggingpp-unit-tests -v) endif() diff --git a/devel/electron24/Makefile b/devel/electron24/Makefile index 3b253ec78a8c..6d7832865366 100644 --- a/devel/electron24/Makefile +++ b/devel/electron24/Makefile @@ -221,7 +221,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1689664324 +YARN_TIMESTAMP= 1689900986 .include "Makefile.version" .include diff --git a/devel/electron24/Makefile.version b/devel/electron24/Makefile.version index 39620a89324f..0013d25518bb 100644 --- a/devel/electron24/Makefile.version +++ b/devel/electron24/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 24.6.3 +ELECTRON_VER= 24.6.4 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron24/distinfo b/devel/electron24/distinfo index 9ecff3ca3705..75d81df9ed48 100644 --- a/devel/electron24/distinfo +++ b/devel/electron24/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1689666196 +TIMESTAMP = 1689901389 SHA256 (electron/chromium-112.0.5615.204.tar.xz) = 4eb23f689df9685fc4ce38fe751023ac98aab2ca21af1ee7ebe47fa5c095a09d SIZE (electron/chromium-112.0.5615.204.tar.xz) = 1572906744 SHA256 (electron/a98dcca3c46a718770b2cb3430785ea4ed7e3f09) = 386332ab89cbe19c427a3febcf2e93ee89a3007243da3e3e466823f50d00eba5 SIZE (electron/a98dcca3c46a718770b2cb3430785ea4ed7e3f09) = 9822544 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-24.6.3.tar.xz) = a5f9ed8a1174eb1205fba834cccc76614ec437c0ca4d3b51f08f57080d1fb611 -SIZE (electron/electron-yarn-cache-24.6.3.tar.xz) = 41635648 -SHA256 (electron/electron-electron-v24.6.3_GH0.tar.gz) = fd2483d705e7c3e0c2fd0d8b8a493c01dd318212a29c9e7896b0a92cacbc2b44 -SIZE (electron/electron-electron-v24.6.3_GH0.tar.gz) = 10496899 +SHA256 (electron/electron-yarn-cache-24.6.4.tar.xz) = f6abab7c855cca721f775bceca96b5089d4be5ffca826b6d041626b86abcc845 +SIZE (electron/electron-yarn-cache-24.6.4.tar.xz) = 41635676 +SHA256 (electron/electron-electron-v24.6.4_GH0.tar.gz) = e1666cd2fea0b6678da836c50871d37cbb677dd2a83a6581c8353b04f6447944 +SIZE (electron/electron-electron-v24.6.4_GH0.tar.gz) = 10498511 SHA256 (electron/nodejs-node-v18.14.0_GH0.tar.gz) = 31bbccdff73269baebcc9f32c2ffe428f28be79841527c63e95da93e8c630829 SIZE (electron/nodejs-node-v18.14.0_GH0.tar.gz) = 113058999 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron24/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron24/files/patch-electron_shell_browser_electron__browser__main__parts.cc index b389269ee3f7..afb08b5c40b3 100644 --- a/devel/electron24/files/patch-electron_shell_browser_electron__browser__main__parts.cc +++ b/devel/electron24/files/patch-electron_shell_browser_electron__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/electron_browser_main_parts.cc.orig 2023-04-03 22:25:21 UTC +--- electron/shell/browser/electron_browser_main_parts.cc.orig 2023-07-19 08:56:32 UTC +++ electron/shell/browser/electron_browser_main_parts.cc @@ -74,7 +74,7 @@ #include "ui/wm/core/wm_state.h" @@ -72,7 +72,7 @@ auto* linux_ui = ui::GetDefaultLinuxUi(); CHECK(linux_ui); linux_ui_getter_ = std::make_unique(); -@@ -536,7 +536,7 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop( +@@ -538,7 +538,7 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop( } void ElectronBrowserMainParts::PostCreateMainMessageLoop() { @@ -81,7 +81,7 @@ std::string app_name = electron::Browser::Get()->GetName(); #endif #if BUILDFLAG(IS_LINUX) -@@ -546,7 +546,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -548,7 +548,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo std::move(shutdown_cb), content::GetUIThreadTaskRunner({content::BrowserTaskType::kUserInput})); bluez::DBusBluezManagerWrapperLinux::Initialize(); @@ -91,7 +91,7 @@ // Set up crypt config. This needs to be done before anything starts the // network service, as the raw encryption key needs to be shared with the // network service for encrypted cookie storage. -@@ -638,7 +640,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( +@@ -640,7 +642,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( fake_browser_process_->PostMainMessageLoopRun(); content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler(); diff --git a/devel/electron24/files/patch-electron_spec_chromium-spec.ts b/devel/electron24/files/patch-electron_spec_chromium-spec.ts index bc1a516f4b49..257ddc7cda29 100644 --- a/devel/electron24/files/patch-electron_spec_chromium-spec.ts +++ b/devel/electron24/files/patch-electron_spec_chromium-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/chromium-spec.ts.orig 2023-06-27 15:34:12 UTC +--- electron/spec/chromium-spec.ts.orig 2023-07-19 08:56:32 UTC +++ electron/spec/chromium-spec.ts @@ -473,13 +473,13 @@ describe('command line switches', () => { it('should not set an invalid locale', async () => testLocale('asdfkl', `${currentLocale}|${currentSystemLocale}|${currentPreferredLanguages}`)); @@ -18,7 +18,7 @@ }); describe('--remote-debugging-pipe switch', () => { -@@ -2306,12 +2306,12 @@ describe('font fallback', () => { +@@ -2330,12 +2330,12 @@ describe('font fallback', () => { expect(fonts[0].familyName).to.equal('Arial'); } else if (process.platform === 'darwin') { expect(fonts[0].familyName).to.equal('Helvetica'); @@ -33,7 +33,7 @@ const html = ` -@@ -2706,7 +2706,7 @@ describe('navigator.clipboard.write', () => { +@@ -2730,7 +2730,7 @@ describe('navigator.clipboard.write', () => { }); }); diff --git a/devel/libiqxmlrpc/Makefile b/devel/libiqxmlrpc/Makefile index 1bf5c482fac0..1cc29ee6458f 100644 --- a/devel/libiqxmlrpc/Makefile +++ b/devel/libiqxmlrpc/Makefile @@ -12,19 +12,19 @@ LICENSE= BSD2CLAUSE LIB_DEPENDS= libboost_thread.so:devel/boost-libs +USES= cmake gnome localbase:ldflags ssl tar:bzip2 +USE_CXXSTD= c++14 +USE_GNOME= libxml2 +USE_LDCONFIG= yes + +PORTDOCS= * + OPTIONS_DEFINE= DOXYGEN DOCS DOXYGEN_IMPLIES= DOCS DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_CMAKE_OFF= -Dbuild_docs=off -USE_GNOME= libxml2 -USES= cmake gnome ssl tar:bzip2 -LDFLAGS+= -L${LOCALBASE}/lib -USE_LDCONFIG= yes - -PORTDOCS= * - post-patch: ${REINPLACE_CMD} -e 's,lib/pkgconfig,libdata/pkgconfig,' ${WRKSRC}/libiqxmlrpc/CMakeLists.txt ${REINPLACE_CMD} -e 's,share/doc/libiqxmlrpc-$${Libiqxmlrpc_VERSION},${DOCSDIR_REL},' ${WRKSRC}/doc/CMakeLists.txt diff --git a/devel/outcome/Makefile b/devel/outcome/Makefile index 0130caeda82d..bb9ef66bb468 100644 --- a/devel/outcome/Makefile +++ b/devel/outcome/Makefile @@ -26,6 +26,8 @@ CMAKE_ARGS= -Dquickcpplib_DIR=${LOCALBASE}/lib/cmake/quickcpplib NO_BUILD= yes NO_ARCH= yes +PORTSCOUT= limit:^.*[0-9]\.[0-9].* + post-patch: # remove the test folter until the problems are fixed by the upstream # tests have problems: # - they are unconditionally built, see https://github.com/ned14/outcome/issues/285 diff --git a/devel/p5-ExportTo/Makefile b/devel/p5-ExportTo/Makefile index 676f69722f35..0bb7ef516278 100644 --- a/devel/p5-ExportTo/Makefile +++ b/devel/p5-ExportTo/Makefile @@ -5,7 +5,7 @@ MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:KTAT PKGNAMEPREFIX= p5- -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Export any function/method to any namespace WWW= https://github.com/ktat/ExportTo diff --git a/devel/p5-List-Pairwise/Makefile b/devel/p5-List-Pairwise/Makefile index b96628a91fc8..064d107816b7 100644 --- a/devel/p5-List-Pairwise/Makefile +++ b/devel/p5-List-Pairwise/Makefile @@ -4,7 +4,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Map/grep arrays and hashes pairwise WWW= https://metacpan.org/pod/List::Pairwise diff --git a/devel/p5-Util-Any/Makefile b/devel/p5-Util-Any/Makefile index 6b93af16ae18..7132c6396ee3 100644 --- a/devel/p5-Util-Any/Makefile +++ b/devel/p5-Util-Any/Makefile @@ -5,7 +5,7 @@ MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:KTAT PKGNAMEPREFIX= p5- -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Export any utilities and create your own utility module WWW= https://github.com/ktat/Util-Any diff --git a/devel/pear-channel-htmlpurifier.org/Makefile b/devel/pear-channel-htmlpurifier.org/Makefile index f8e0bd31cb83..62068dd5d42e 100644 --- a/devel/pear-channel-htmlpurifier.org/Makefile +++ b/devel/pear-channel-htmlpurifier.org/Makefile @@ -4,7 +4,7 @@ PORTREVISION= 1 CATEGORIES= devel www pear MASTER_SITES= # -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= PEAR channel ${PEAR_CHANNEL_HOST} WWW= http://htmlpurifier.org/ diff --git a/devel/pear-htmlpurifier/Makefile b/devel/pear-htmlpurifier/Makefile index 612e562eff89..dff1b0a75066 100644 --- a/devel/pear-htmlpurifier/Makefile +++ b/devel/pear-htmlpurifier/Makefile @@ -7,7 +7,7 @@ MASTER_SITES= http://htmlpurifier.org/get/ \ DISTNAME= HTMLPurifier-${PORTVERSION} PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX} -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= PHP HTML filter library WWW= http://htmlpurifier.org/ diff --git a/devel/py-immutabledict/Makefile b/devel/py-immutabledict/Makefile index 59e323a7b5dd..8f9b4dbde031 100644 --- a/devel/py-immutabledict/Makefile +++ b/devel/py-immutabledict/Makefile @@ -1,6 +1,5 @@ PORTNAME= immutabledict -PORTVERSION= 2.2.4 -PORTREVISION= 1 +PORTVERSION= 2.2.5 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-immutabledict/distinfo b/devel/py-immutabledict/distinfo index 6e9568b86586..7ee22e54b2a4 100644 --- a/devel/py-immutabledict/distinfo +++ b/devel/py-immutabledict/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682174771 -SHA256 (immutabledict-2.2.4.tar.gz) = 3bedc0741faaa2846f6edf5c29183f993da3abaff6a5961bb70a5659bb9e68ab -SIZE (immutabledict-2.2.4.tar.gz) = 4314 +TIMESTAMP = 1689908896 +SHA256 (immutabledict-2.2.5.tar.gz) = 1ce423cf7861ba84eaa7c2eca482e46854eac07765ef4873b640eb67eea8b203 +SIZE (immutabledict-2.2.5.tar.gz) = 4316 diff --git a/devel/py-pyyaml5/Makefile b/devel/py-pyyaml5/Makefile index f67362350740..5e172b4a8147 100644 --- a/devel/py-pyyaml5/Makefile +++ b/devel/py-pyyaml5/Makefile @@ -38,6 +38,10 @@ PYDISTUTILS_SETUP+= --without-libyaml NO_ARCH= yes .endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + post-install-EXAMPLES-on: @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/) diff --git a/devel/py-qutip-qip/Makefile b/devel/py-qutip-qip/Makefile index bbe4bd086871..890d7615f662 100644 --- a/devel/py-qutip-qip/Makefile +++ b/devel/py-qutip-qip/Makefile @@ -1,5 +1,6 @@ PORTNAME= qutip-qip DISTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,9 +17,9 @@ RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qutip>=4.6:devel/py-qutip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} # optional dependency, but required for tests -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}qiskit>0:science/py-qiskit@${PY_FLAVOR} -#RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyqir>0:science/py-pyqir@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} # optional dependency required for tests +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}qiskit>0:science/py-qiskit@${PY_FLAVOR} # optional +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyqir>0:misc/py-pyqir@${PY_FLAVOR} # optional USES= python USE_PYTHON= distutils autoplist pytest # 1 test fails, see https://github.com/qutip/qutip-qip/issues/214 diff --git a/devel/py-recordclass/Makefile b/devel/py-recordclass/Makefile index 72cefe0b7838..832077067e23 100644 --- a/devel/py-recordclass/Makefile +++ b/devel/py-recordclass/Makefile @@ -1,5 +1,5 @@ PORTNAME= recordclass -PORTVERSION= 0.19 +PORTVERSION= 0.19.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,7 +10,7 @@ WWW= https://pypi.org/project/recordclass/ LICENSE= MIT -USES= python:3.9+ zip +USES= python:3.9+ USE_PYTHON= distutils .if ! defined(WITH_DEBUG) diff --git a/devel/py-recordclass/distinfo b/devel/py-recordclass/distinfo index e47398918da9..65a74766373b 100644 --- a/devel/py-recordclass/distinfo +++ b/devel/py-recordclass/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688652902 -SHA256 (recordclass-0.19.zip) = bee03aa6758256963add9e96c116cd63458447ca94fe5adc85eaf84d25e9f7b4 -SIZE (recordclass-0.19.zip) = 1332894 +TIMESTAMP = 1689871374 +SHA256 (recordclass-0.19.1.tar.gz) = c2649901e8a31dfa0c646882c96a75a69053ba28293850e5a68e7e3adafbd88e +SIZE (recordclass-0.19.1.tar.gz) = 1285148 diff --git a/devel/py-types-jsonschema/Makefile b/devel/py-types-jsonschema/Makefile index 58a6c8087c01..341f014ca39d 100644 --- a/devel/py-types-jsonschema/Makefile +++ b/devel/py-types-jsonschema/Makefile @@ -1,5 +1,5 @@ PORTNAME= types-jsonschema -PORTVERSION= 4.17.0.9 +PORTVERSION= 4.17.0.10 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-types-jsonschema/distinfo b/devel/py-types-jsonschema/distinfo index 8ab860013d27..30658866faf3 100644 --- a/devel/py-types-jsonschema/distinfo +++ b/devel/py-types-jsonschema/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689278705 -SHA256 (types-jsonschema-4.17.0.9.tar.gz) = ddbbf84a37ba19f486e43d2a4ab239c9e49aebb5cc99a17a5d59f54568373376 -SIZE (types-jsonschema-4.17.0.9.tar.gz) = 8799 +TIMESTAMP = 1689889045 +SHA256 (types-jsonschema-4.17.0.10.tar.gz) = 8e979db34d69bc9f9b3d6e8b89bdbc60b3a41cfce4e1fb87bf191d205c7f5098 +SIZE (types-jsonschema-4.17.0.10.tar.gz) = 8860 diff --git a/devel/py-types-python-dateutil/Makefile b/devel/py-types-python-dateutil/Makefile index a4b10ac5ab39..a5e7d467330a 100644 --- a/devel/py-types-python-dateutil/Makefile +++ b/devel/py-types-python-dateutil/Makefile @@ -1,5 +1,5 @@ PORTNAME= types-python-dateutil -DISTVERSION= 2.8.19.13 +DISTVERSION= 2.8.19.14 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-types-python-dateutil/distinfo b/devel/py-types-python-dateutil/distinfo index db4414beb593..f22fca989e1d 100644 --- a/devel/py-types-python-dateutil/distinfo +++ b/devel/py-types-python-dateutil/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686933367 -SHA256 (types-python-dateutil-2.8.19.13.tar.gz) = 09a0275f95ee31ce68196710ed2c3d1b9dc42e0b61cc43acc369a42cb939134f -SIZE (types-python-dateutil-2.8.19.13.tar.gz) = 8376 +TIMESTAMP = 1689920094 +SHA256 (types-python-dateutil-2.8.19.14.tar.gz) = 1f4f10ac98bb8b16ade9dbee3518d9ace017821d94b057a425b069f834737f4b +SIZE (types-python-dateutil-2.8.19.14.tar.gz) = 8720 diff --git a/devel/py-types-retry/Makefile b/devel/py-types-retry/Makefile index d1e525f8b387..e1c9e0466923 100644 --- a/devel/py-types-retry/Makefile +++ b/devel/py-types-retry/Makefile @@ -1,5 +1,5 @@ PORTNAME= types-retry -DISTVERSION= 0.9.9.3 +DISTVERSION= 0.9.9.4 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-types-retry/distinfo b/devel/py-types-retry/distinfo index 735325f77480..1653f3cbd877 100644 --- a/devel/py-types-retry/distinfo +++ b/devel/py-types-retry/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686933915 -SHA256 (types-retry-0.9.9.3.tar.gz) = 1b7a0a04adf12f21237e76833574a9a8f755f88889c226ad99d6e3bfa5b6e3c8 -SIZE (types-retry-0.9.9.3.tar.gz) = 2749 +TIMESTAMP = 1689920187 +SHA256 (types-retry-0.9.9.4.tar.gz) = e4731dc684b56b875d9746459ad665d3bc281a56b530acdf1c97730167799941 +SIZE (types-retry-0.9.9.4.tar.gz) = 2845 diff --git a/devel/py-zarr/Makefile b/devel/py-zarr/Makefile index 486c4aea2e63..1e231470fd84 100644 --- a/devel/py-zarr/Makefile +++ b/devel/py-zarr/Makefile @@ -1,5 +1,5 @@ PORTNAME= zarr -DISTVERSION= 2.15.0 +DISTVERSION= 2.16.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-zarr/distinfo b/devel/py-zarr/distinfo index 33ee2aa459be..4c5d860902a2 100644 --- a/devel/py-zarr/distinfo +++ b/devel/py-zarr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687191686 -SHA256 (zarr-2.15.0.tar.gz) = 3894001c0bb5d68d3d21a0562cc49e6ba14fee7d17ad2be8d088ab301665a4c6 -SIZE (zarr-2.15.0.tar.gz) = 3594788 +TIMESTAMP = 1689920448 +SHA256 (zarr-2.16.0.tar.gz) = 84e36b695bda0ecea52af9861271984cb22a5c864679907b7b9ba3f79b684f7e +SIZE (zarr-2.16.0.tar.gz) = 3596961 diff --git a/devel/rubygem-mmap2/Makefile b/devel/rubygem-mmap2/Makefile index b9a895914e1f..864ed2bac381 100644 --- a/devel/rubygem-mmap2/Makefile +++ b/devel/rubygem-mmap2/Makefile @@ -12,4 +12,10 @@ LICENSE= RUBY USES= gem +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CONFIGURE_ARGS+= --with-cflags="-Wno-error=incompatible-function-pointer-types" +.endif + .include diff --git a/dns/p5-Net-DRI/Makefile b/dns/p5-Net-DRI/Makefile index 595aeb5b59ef..73dd7a3e8f7b 100644 --- a/dns/p5-Net-DRI/Makefile +++ b/dns/p5-Net-DRI/Makefile @@ -5,7 +5,7 @@ CATEGORIES= dns perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl library to access Domain Name Registries/Registrars WWW= https://metacpan.org/release/Net-DRI diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index bb634a4412da..5391eb27a845 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -17,6 +17,7 @@ WWW= https://calligra.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= pstoedit:graphics/pstoedit LIB_DEPENDS= libImath.so:math/Imath \ libKPropertyCore3.so:x11-toolkits/kproperty \ libKReport3.so:textproc/kreport \ @@ -37,13 +38,12 @@ LIB_DEPENDS= libImath.so:math/Imath \ libwpd-0.10.so:textproc/libwpd010 \ libwpg-0.3.so:graphics/libwpg03 \ libwps-0.4.so:textproc/libwps - -BUILD_DEPENDS= pstoedit:graphics/pstoedit RUN_DEPENDS= pstoedit:graphics/pstoedit USES= cmake cpe compiler:c++17-lang desktop-file-utils eigen:3 \ gettext iconv:translit jpeg kde:5 localbase:ldflags perl5 \ pkgconfig qca qt:5 shared-mime-info sqlite tar:xz xorg +USE_LDCONFIG= yes USE_KDE= akonadicontacts activities archive auth bookmarks codecs completion \ config configwidgets contacts coreaddons crash dbusaddons doctools ecm \ emoticons guiaddons holidays i18n iconthemes init itemmodels itemviews \ @@ -56,7 +56,6 @@ USE_QT= buildtools:build concurrent core dbus declarative gui network opengl \ phonon4 printsupport qmake:build \ script sql svg testlib webkit widgets x11extras xml USE_XORG= ice sm x11 xext -USE_LDCONFIG= yes OPTIONS_DEFINE= OPENEXR OPTIONS_DEFAULT= OPENEXR @@ -74,4 +73,14 @@ CMAKE_ARGS+= -DCMAKE_CXX_FLAGS="-DKDE_NO_DEBUG_OUTPUT" PLIST_SUB+= SHLIB_VER=17.0.0 -.include +.include + +post-patch: +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 + @${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|g' \ + ${WRKSRC}/filters/words/msword-odf/wv2/src/word97_helper.cpp + @${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \ + ${WRKSRC}/filters/words/msword-odf/wv2/src/utilities.h +.endif + +.include diff --git a/editors/uzap/Makefile b/editors/uzap/Makefile index e2d886d7af99..c6d40adf57de 100644 --- a/editors/uzap/Makefile +++ b/editors/uzap/Makefile @@ -18,6 +18,13 @@ LICENSE_PERMS= dist-mirror pkg-mirror auto-accept USES= ncurses NO_WRKSUBDIR= yes + PLIST_FILES= bin/uzap man/man1/uzap.1.gz +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + .include diff --git a/finance/xtrader/Makefile b/finance/xtrader/Makefile index cd4ed32d33dd..db7b136c6d74 100644 --- a/finance/xtrader/Makefile +++ b/finance/xtrader/Makefile @@ -11,11 +11,15 @@ WWW= http://xtrader.sourceforge.net/ LIB_DEPENDS= libptypes.so:devel/ptypes \ libfltk.so.1:x11-toolkits/fltk -MAKEFILE= Makefile.linux USES= gmake xorg USE_XORG= x11 xpm -BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} + +MAKEFILE= Makefile.linux + +CFLAGS+= --std=c++14 + NO_WRKSUBDIR= yes +BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} PLIST_FILES= bin/xtrader \ %%DATADIR%%/sample.xt diff --git a/games/aquaria/Makefile b/games/aquaria/Makefile index aca4d2d93fc8..0190b93653c5 100644 --- a/games/aquaria/Makefile +++ b/games/aquaria/Makefile @@ -20,14 +20,12 @@ LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ libpng.so:graphics/png \ libtinyxml2.so:textproc/tinyxml2 +USES= cmake:insource compiler:c++11-lang lua:51 openal pkgconfig sdl +USE_CXXSTD= c++11 USE_GITHUB= yes GH_ACCOUNT= AquariaOSE GH_PROJECT= Aquaria -USES= cmake:insource compiler:c++11-lang lua:51 openal pkgconfig sdl -EXCLUDE= AL FTGL GL SDL* freetype2 glm glpng/png glpng/zlib \ - libogg-* libvorbis-* lua-* tinyxml2* -EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ExternalLibs/,} CMAKE_ARGS= -DAQUARIA_DEFAULT_DATA_DIR:PATH="${DATADIR}" CMAKE_OFF= AQUARIA_INTERNAL_FREETYPE \ AQUARIA_INTERNAL_FTGL \ @@ -38,11 +36,9 @@ CMAKE_OFF= AQUARIA_INTERNAL_FREETYPE \ AQUARIA_INTERNAL_SDL \ AQUARIA_INTERNAL_TINYXML2 \ AQUARIA_INTERNAL_ZLIB + LDFLAGS+= -Wl,--as-needed # avoid overlinking (vorbis deps) LDFLAGS_i386= -Wl,-z,notext -Wl,--no-check-dynamic-relocations -SUB_FILES= pkg-message -PLIST_FILES= bin/aquaria -PORTDATA= * DESKTOP_ENTRIES="${GH_PROJECT}" \ "" \ @@ -50,14 +46,23 @@ DESKTOP_ENTRIES="${GH_PROJECT}" \ "${PORTNAME}" \ "Game;ArcadeGame;" \ "" +EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ExternalLibs/,} +SUB_FILES= pkg-message + +PLIST_FILES= bin/aquaria +PORTDATA= * OPTIONS_DEFINE= SDL2 OPTIONS_DEFAULT=SDL2 SDL2_DESC= Use SDL 2.x instead of SDL 1.2.x -SDL2_CMAKE_BOOL=AQUARIA_USE_SDL2 + SDL2_USE= SDL=sdl2 SDL2_USE_OFF= SDL=sdl +SDL2_CMAKE_BOOL=AQUARIA_USE_SDL2 + +EXCLUDE= AL FTGL GL SDL* freetype2 glm glpng/png glpng/zlib \ + libogg-* libvorbis-* lua-* tinyxml2* do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin diff --git a/games/cuyo/Makefile b/games/cuyo/Makefile index 413f3dbd983c..0671b1381aa0 100644 --- a/games/cuyo/Makefile +++ b/games/cuyo/Makefile @@ -12,8 +12,10 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake gnome iconv localbase:ldflags sdl xorg +USE_CXXSTD= c++14 USE_SDL= mixer image USE_XORG= x11 xau xdmcp + GNU_CONFIGURE= yes # Do not use older versions @@ -22,10 +24,10 @@ PORTSCOUT= limit:[0-9]\.[0-9]\. OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes -NLS_CONFIGURE_ENABLE= nls NLS_BUILD_DEPENDS= gsed:textproc/gsed NLS_USES= gettext perl5 NLS_USE= perl5=build +NLS_CONFIGURE_ENABLE= nls NLS_LDFLAGS= -lintl post-install-DOCS-on: diff --git a/games/openglad/Makefile b/games/openglad/Makefile index cc87a901bd46..f60b0feff597 100644 --- a/games/openglad/Makefile +++ b/games/openglad/Makefile @@ -11,17 +11,16 @@ WWW= http://snowstorm.sourceforge.net LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake sdl +NOT_FOR_ARCHS= sparc64 + +USES= gmake localbase:ldflags sdl +USE_CXXSTD= c++14 USE_SDL= sdl mixer -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +GNU_CONFIGURE= yes DESKTOP_ENTRIES="OpenGlad" "" "" "${PORTNAME}" "" "" -NOT_FOR_ARCHS= sparc64 - OPTIONS_DEFINE= DOCS post-patch: diff --git a/games/prboom-plus/Makefile b/games/prboom-plus/Makefile index 62db9b0106ab..0b0c62e51e15 100644 --- a/games/prboom-plus/Makefile +++ b/games/prboom-plus/Makefile @@ -33,6 +33,12 @@ OPENGL_USES= gl OPENGL_USE= GL=glu OPENGL_CONFIGURE_ENABLE= gl +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ -e '/^gamesdir/s|/games|/bin|' \ diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile index 9fb1c5644d80..00e3542d40ee 100644 --- a/games/xbubble/Makefile +++ b/games/xbubble/Makefile @@ -13,17 +13,22 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png -USES= gmake xorg +USES= gmake localbase:ldflags xorg USE_XORG= x11 xmu -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +GNU_CONFIGURE= yes OPTIONS_DEFINE= NLS OPTIONS_SUB= yes + NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_LIBS= -lintl +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + .include diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile index a6b3b1541e9b..31795e8d60e9 100644 --- a/games/xpipeman/Makefile +++ b/games/xpipeman/Makefile @@ -1,5 +1,6 @@ PORTNAME= xpipeman PORTVERSION= 1.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SUNSITE/games/strategy DISTNAME= ${PORTNAME} @@ -7,10 +8,19 @@ DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Connect the pipes to stop the leaks +LICENSE= MIT + USES= imake tar:Z xorg USE_XORG= x11 xaw xext xmu xt sm ice + CFLAGS+= -Wno-error=return-type +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xpipeman ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/xpipeman.man ${STAGEDIR}${MANPREFIX}/man/man6/xpipeman.6 diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 2ed7e5048ac8..65f425c3f2e4 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -1,6 +1,5 @@ PORTNAME= darktable PORTVERSION= 4.4.1 -PORTREVISION= CATEGORIES= graphics MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/ diff --git a/graphics/glaxnimate/Makefile b/graphics/glaxnimate/Makefile index 3b7034b8f889..fa7a787d0b97 100644 --- a/graphics/glaxnimate/Makefile +++ b/graphics/glaxnimate/Makefile @@ -3,6 +3,9 @@ DISTVERSION= 0.5.3 CATEGORIES= graphics PKGNAMESUFFIX= -${FLAVOR} +PATCH_SITES= https://gitlab.com/${GL_ACCOUNT}/${PORTNAME}/-/commit/ +PATCHFILES+= 6f312a0b93208255b2903f6d3105cc36cfc6b6c7.patch:-p1 # Fix build with Qt 6.5.x + MAINTAINER= yuri@FreeBSD.org COMMENT= Simple vector animation program WWW= https://glaxnimate.mattbas.org/ diff --git a/graphics/glaxnimate/distinfo b/graphics/glaxnimate/distinfo index c11e1f0f492c..a2a0652b399a 100644 --- a/graphics/glaxnimate/distinfo +++ b/graphics/glaxnimate/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1685637754 +TIMESTAMP = 1689891265 SHA256 (KDE-breeze-icons-1a13b09adc7ebe0c4b5be6cc1add3869f3de8a1a_GH0.tar.gz) = 5d7d4437bb0c87ac5573b9ae05328379bbaf6229818579456ee7b2ec1a827a37 SIZE (KDE-breeze-icons-1a13b09adc7ebe0c4b5be6cc1add3869f3de8a1a_GH0.tar.gz) = 5573747 SHA256 (pybind-pybind11-80dc998efced8ceb2be59756668a7e90e8bef917_GH0.tar.gz) = aa4d57f8c3c4fb47d75e1d676167966a8aa7cbb014e4d20813adabc93bd6670a @@ -13,3 +13,5 @@ SHA256 (mattbas-Qt-History-LineEdit-5b761f436e8b31491e06b26460d28a2eaef0babc_GL0 SIZE (mattbas-Qt-History-LineEdit-5b761f436e8b31491e06b26460d28a2eaef0babc_GL0.tar.gz) = 7856 SHA256 (mattbas-python-lottie-9e742aadb5ca7d0e8c9b01b2553c0a81de238ae4_GL0.tar.gz) = 54de1e9507524d83d4035ac3a16bd29c40335c6f9eb0a8b6376c3a10267e1a56 SIZE (mattbas-python-lottie-9e742aadb5ca7d0e8c9b01b2553c0a81de238ae4_GL0.tar.gz) = 284790 +SHA256 (6f312a0b93208255b2903f6d3105cc36cfc6b6c7.patch) = 46df33643b05a0cbbbae6418292f46329a443b9c35cf65828007c65e61107a2e +SIZE (6f312a0b93208255b2903f6d3105cc36cfc6b6c7.patch) = 837 diff --git a/graphics/glslang/Makefile b/graphics/glslang/Makefile index 5f0a8cd4ac55..cab55c0d66a6 100644 --- a/graphics/glslang/Makefile +++ b/graphics/glslang/Makefile @@ -1,5 +1,5 @@ PORTNAME= glslang -DISTVERSION= 12.3.0 +DISTVERSION= 12.3.1 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/glslang/distinfo b/graphics/glslang/distinfo index fe4d8ee0e236..6655adec026e 100644 --- a/graphics/glslang/distinfo +++ b/graphics/glslang/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689793027 -SHA256 (KhronosGroup-glslang-12.3.0_GH0.tar.gz) = 45e0c7efad184206495aa1888c9008e168628fd1d3867a6975a7cd61dd11f53f -SIZE (KhronosGroup-glslang-12.3.0_GH0.tar.gz) = 3718594 +TIMESTAMP = 1689886431 +SHA256 (KhronosGroup-glslang-12.3.1_GH0.tar.gz) = a57836a583b3044087ac51bb0d5d2d803ff84591d55f89087fc29ace42a8b9a8 +SIZE (KhronosGroup-glslang-12.3.1_GH0.tar.gz) = 3718998 diff --git a/graphics/glslang/files/patch-StandAlone_CMakeLists.txt b/graphics/glslang/files/patch-StandAlone_CMakeLists.txt index 71df7ac264e5..8e13cee97354 100644 --- a/graphics/glslang/files/patch-StandAlone_CMakeLists.txt +++ b/graphics/glslang/files/patch-StandAlone_CMakeLists.txt @@ -1,9 +1,9 @@ ---- StandAlone/CMakeLists.txt.orig 2023-07-19 18:57:07 UTC +--- StandAlone/CMakeLists.txt.orig 2023-07-20 20:53:51 UTC +++ StandAlone/CMakeLists.txt -@@ -117,7 +117,7 @@ if(ENABLE_GLSLANG_INSTALL) +@@ -121,7 +121,7 @@ if(ENABLE_GLSLANG_INSTALL) # Create the same symlink at install time install(CODE "execute_process( \ - COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${legacy_glslang_name} \ + COMMAND ${CMAKE_COMMAND} -E ${link_method} $ ${legacy_glslang_name} \ - WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") + WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") diff --git a/graphics/librsvg2-rust/Makefile b/graphics/librsvg2-rust/Makefile index 5375cee052fd..1ae5b32c7874 100644 --- a/graphics/librsvg2-rust/Makefile +++ b/graphics/librsvg2-rust/Makefile @@ -1,6 +1,5 @@ PORTNAME= librsvg -PORTVERSION= 2.56.2 -PORTREVISION= 1 +PORTVERSION= 2.56.3 CATEGORIES= graphics gnome MASTER_SITES= GNOME PKGNAMESUFFIX= 2-rust diff --git a/graphics/librsvg2-rust/Makefile.crates b/graphics/librsvg2-rust/Makefile.crates index ad61f942dbf3..0e635c9c75b6 100644 --- a/graphics/librsvg2-rust/Makefile.crates +++ b/graphics/librsvg2-rust/Makefile.crates @@ -8,7 +8,7 @@ CARGO_CRATES= adler-1.0.2 \ anstyle-parse-0.2.1 \ anstyle-query-1.0.0 \ anstyle-wincon-1.0.1 \ - anyhow-1.0.71 \ + anyhow-1.0.72 \ approx-0.5.1 \ assert_cmd-2.0.11 \ atty-0.2.14 \ @@ -19,7 +19,7 @@ CARGO_CRATES= adler-1.0.2 \ bitflags-1.3.2 \ bitflags-2.3.3 \ block-0.1.6 \ - bstr-1.5.0 \ + bstr-1.6.0 \ bumpalo-3.13.0 \ bytemuck-1.13.1 \ byteorder-1.4.3 \ @@ -34,10 +34,10 @@ CARGO_CRATES= adler-1.0.2 \ ciborium-io-0.2.1 \ ciborium-ll-0.2.1 \ clap-3.2.25 \ - clap-4.3.10 \ - clap_builder-4.3.10 \ - clap_complete-4.3.1 \ - clap_derive-4.3.2 \ + clap-4.3.17 \ + clap_builder-4.3.17 \ + clap_complete-4.3.2 \ + clap_derive-4.3.12 \ clap_lex-0.2.4 \ clap_lex-0.5.0 \ colorchoice-1.0.0 \ @@ -60,7 +60,7 @@ CARGO_CRATES= adler-1.0.2 \ discard-1.0.4 \ dlib-0.5.2 \ doc-comment-0.3.3 \ - dtoa-1.0.6 \ + dtoa-1.0.9 \ dtoa-short-0.3.4 \ either-1.8.1 \ encoding-0.2.33 \ @@ -71,10 +71,10 @@ CARGO_CRATES= adler-1.0.2 \ encoding-index-tradchinese-1.20141219.5 \ encoding_index_tests-0.1.4 \ encoding_rs-0.8.32 \ - equivalent-1.0.0 \ + equivalent-1.0.1 \ errno-0.3.1 \ errno-dragonfly-0.1.2 \ - fastrand-1.9.0 \ + fastrand-2.0.0 \ fdeflate-0.3.0 \ flate2-1.0.26 \ float-cmp-0.9.0 \ @@ -104,17 +104,15 @@ CARGO_CRATES= adler-1.0.2 \ hashbrown-0.14.0 \ heck-0.4.1 \ hermit-abi-0.1.19 \ - hermit-abi-0.3.1 \ + hermit-abi-0.3.2 \ iana-time-zone-0.1.57 \ iana-time-zone-haiku-0.1.2 \ idna-0.4.0 \ indexmap-1.9.3 \ indexmap-2.0.0 \ - instant-0.1.12 \ - io-lifetimes-1.0.11 \ - is-terminal-0.4.8 \ + is-terminal-0.4.9 \ itertools-0.10.5 \ - itoa-1.0.6 \ + itoa-1.0.9 \ js-sys-0.3.64 \ language-tags-0.3.2 \ lazy_static-1.4.0 \ @@ -122,7 +120,6 @@ CARGO_CRATES= adler-1.0.2 \ libloading-0.8.0 \ libm-0.2.7 \ linked-hash-map-0.5.6 \ - linux-raw-sys-0.3.8 \ linux-raw-sys-0.4.3 \ locale_config-0.3.0 \ lock_api-0.4.10 \ @@ -136,8 +133,8 @@ CARGO_CRATES= adler-1.0.2 \ memchr-2.5.0 \ memoffset-0.9.0 \ miniz_oxide-0.7.1 \ - nalgebra-0.32.2 \ - nalgebra-macros-0.2.0 \ + nalgebra-0.32.3 \ + nalgebra-macros-0.2.1 \ new_debug_unreachable-1.0.4 \ nodrop-0.1.14 \ normalize-line-endings-0.3.0 \ @@ -158,7 +155,7 @@ CARGO_CRATES= adler-1.0.2 \ pangocairo-sys-0.17.10 \ parking_lot-0.12.1 \ parking_lot_core-0.9.8 \ - paste-1.0.12 \ + paste-1.0.14 \ percent-encoding-2.3.0 \ phf-0.8.0 \ phf-0.10.1 \ @@ -169,7 +166,7 @@ CARGO_CRATES= adler-1.0.2 \ phf_macros-0.10.0 \ phf_shared-0.8.0 \ phf_shared-0.10.0 \ - pin-project-lite-0.2.9 \ + pin-project-lite-0.2.10 \ pin-utils-0.1.0 \ pkg-config-0.3.27 \ plotters-0.3.5 \ @@ -187,10 +184,10 @@ CARGO_CRATES= adler-1.0.2 \ proc-macro-error-1.0.4 \ proc-macro-error-attr-1.0.4 \ proc-macro-hack-0.5.20+deprecated \ - proc-macro2-1.0.63 \ + proc-macro2-1.0.66 \ proptest-1.2.0 \ quick-error-1.2.3 \ - quote-1.0.29 \ + quote-1.0.31 \ rand-0.7.3 \ rand-0.8.5 \ rand_chacha-0.2.2 \ @@ -205,27 +202,26 @@ CARGO_CRATES= adler-1.0.2 \ rayon-core-1.11.0 \ rctree-0.5.0 \ redox_syscall-0.3.5 \ - regex-1.8.4 \ - regex-automata-0.1.10 \ + regex-1.9.1 \ + regex-automata-0.3.3 \ regex-syntax-0.6.29 \ - regex-syntax-0.7.2 \ + regex-syntax-0.7.4 \ rgb-0.8.36 \ rustc_version-0.2.3 \ rustc_version-0.4.0 \ - rustix-0.37.21 \ - rustix-0.38.1 \ + rustix-0.38.4 \ rusty-fork-0.3.0 \ - ryu-1.0.13 \ - safe_arch-0.7.0 \ + ryu-1.0.15 \ + safe_arch-0.7.1 \ same-file-1.0.6 \ - scopeguard-1.1.0 \ + scopeguard-1.2.0 \ selectors-0.24.0 \ semver-0.9.0 \ - semver-1.0.17 \ + semver-1.0.18 \ semver-parser-0.7.0 \ - serde-1.0.164 \ - serde_derive-1.0.164 \ - serde_json-1.0.99 \ + serde-1.0.173 \ + serde_derive-1.0.173 \ + serde_json-1.0.103 \ serde_spanned-0.6.3 \ servo_arc-0.2.0 \ sha1-0.6.1 \ @@ -234,7 +230,7 @@ CARGO_CRATES= adler-1.0.2 \ simd-adler32-0.3.5 \ siphasher-0.3.10 \ slab-0.4.8 \ - smallvec-1.10.0 \ + smallvec-1.11.0 \ stable_deref_trait-1.2.0 \ standback-0.2.17 \ stdweb-0.4.20 \ @@ -245,28 +241,28 @@ CARGO_CRATES= adler-1.0.2 \ string_cache_codegen-0.5.2 \ strsim-0.10.0 \ syn-1.0.109 \ - syn-2.0.22 \ + syn-2.0.26 \ system-deps-6.1.1 \ - target-lexicon-0.12.8 \ - tempfile-3.6.0 \ + target-lexicon-0.12.10 \ + tempfile-3.7.0 \ tendril-0.4.3 \ termtree-0.4.1 \ textwrap-0.16.0 \ - thiserror-1.0.40 \ - thiserror-impl-1.0.40 \ + thiserror-1.0.43 \ + thiserror-impl-1.0.43 \ time-0.2.27 \ time-macros-0.1.1 \ time-macros-impl-0.1.2 \ tinytemplate-1.2.1 \ tinyvec-1.6.0 \ tinyvec_macros-0.1.1 \ - toml-0.7.5 \ + toml-0.7.6 \ toml_datetime-0.6.3 \ - toml_edit-0.19.11 \ + toml_edit-0.19.14 \ typenum-1.16.0 \ unarray-0.1.4 \ unicode-bidi-0.3.13 \ - unicode-ident-1.0.9 \ + unicode-ident-1.0.11 \ unicode-normalization-0.1.22 \ url-2.4.0 \ utf-8-0.7.6 \ @@ -284,7 +280,7 @@ CARGO_CRATES= adler-1.0.2 \ wasm-bindgen-shared-0.2.87 \ web-sys-0.3.64 \ weezl-0.1.7 \ - wide-0.7.10 \ + wide-0.7.11 \ winapi-0.3.9 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.5 \ @@ -299,6 +295,6 @@ CARGO_CRATES= adler-1.0.2 \ windows_x86_64_gnu-0.48.0 \ windows_x86_64_gnullvm-0.48.0 \ windows_x86_64_msvc-0.48.0 \ - winnow-0.4.7 \ + winnow-0.5.0 \ xml5ever-0.17.0 \ yeslogic-fontconfig-sys-4.0.1 diff --git a/graphics/librsvg2-rust/distinfo b/graphics/librsvg2-rust/distinfo index 935d049c8246..d93bcbf01f43 100644 --- a/graphics/librsvg2-rust/distinfo +++ b/graphics/librsvg2-rust/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1688160278 -SHA256 (librsvg-2.56.2.tar.xz) = 3ec3c4d8f73e0ba4b9130026969e8371c092b734298d36e2fdb3eb4afcec1200 -SIZE (librsvg-2.56.2.tar.xz) = 5655912 +TIMESTAMP = 1689884930 +SHA256 (librsvg-2.56.3.tar.xz) = 5a328048a02d014645cd27f61140f4e0b11280fb2c7f2a21864fe0c59ac1ce88 +SIZE (librsvg-2.56.3.tar.xz) = 5641500 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe SIZE (rust/crates/adler-1.0.2.crate) = 12778 SHA256 (rust/crates/aho-corasick-1.0.2.crate) = 43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41 @@ -21,8 +21,8 @@ SHA256 (rust/crates/anstyle-query-1.0.0.crate) = 5ca11d4be1bab0c8bc8734a9aa7bf4e SIZE (rust/crates/anstyle-query-1.0.0.crate) = 8620 SHA256 (rust/crates/anstyle-wincon-1.0.1.crate) = 180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188 SIZE (rust/crates/anstyle-wincon-1.0.1.crate) = 11718 -SHA256 (rust/crates/anyhow-1.0.71.crate) = 9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8 -SIZE (rust/crates/anyhow-1.0.71.crate) = 43808 +SHA256 (rust/crates/anyhow-1.0.72.crate) = 3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854 +SIZE (rust/crates/anyhow-1.0.72.crate) = 43837 SHA256 (rust/crates/approx-0.5.1.crate) = cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6 SIZE (rust/crates/approx-0.5.1.crate) = 15100 SHA256 (rust/crates/assert_cmd-2.0.11.crate) = 86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151 @@ -43,8 +43,8 @@ SHA256 (rust/crates/bitflags-2.3.3.crate) = 630be753d4e58660abd17930c71b647fe46c SIZE (rust/crates/bitflags-2.3.3.crate) = 34320 SHA256 (rust/crates/block-0.1.6.crate) = 0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a SIZE (rust/crates/block-0.1.6.crate) = 4077 -SHA256 (rust/crates/bstr-1.5.0.crate) = a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5 -SIZE (rust/crates/bstr-1.5.0.crate) = 346060 +SHA256 (rust/crates/bstr-1.6.0.crate) = 6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05 +SIZE (rust/crates/bstr-1.6.0.crate) = 385877 SHA256 (rust/crates/bumpalo-3.13.0.crate) = a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1 SIZE (rust/crates/bumpalo-3.13.0.crate) = 82114 SHA256 (rust/crates/bytemuck-1.13.1.crate) = 17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea @@ -73,14 +73,14 @@ SHA256 (rust/crates/ciborium-ll-0.2.1.crate) = defaa24ecc093c77630e6c15e17c51f5e SIZE (rust/crates/ciborium-ll-0.2.1.crate) = 14649 SHA256 (rust/crates/clap-3.2.25.crate) = 4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123 SIZE (rust/crates/clap-3.2.25.crate) = 219403 -SHA256 (rust/crates/clap-4.3.10.crate) = 384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a -SIZE (rust/crates/clap-4.3.10.crate) = 54872 -SHA256 (rust/crates/clap_builder-4.3.10.crate) = ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d -SIZE (rust/crates/clap_builder-4.3.10.crate) = 160558 -SHA256 (rust/crates/clap_complete-4.3.1.crate) = 7f6b5c519bab3ea61843a7923d074b04245624bb84a64a8c150f5deb014e388b -SIZE (rust/crates/clap_complete-4.3.1.crate) = 34098 -SHA256 (rust/crates/clap_derive-4.3.2.crate) = b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f -SIZE (rust/crates/clap_derive-4.3.2.crate) = 29053 +SHA256 (rust/crates/clap-4.3.17.crate) = 5b0827b011f6f8ab38590295339817b0d26f344aa4932c3ced71b45b0c54b4a9 +SIZE (rust/crates/clap-4.3.17.crate) = 55022 +SHA256 (rust/crates/clap_builder-4.3.17.crate) = 9441b403be87be858db6a23edb493e7f694761acdc3343d5a0fcaafd304cbc9e +SIZE (rust/crates/clap_builder-4.3.17.crate) = 161080 +SHA256 (rust/crates/clap_complete-4.3.2.crate) = 5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce +SIZE (rust/crates/clap_complete-4.3.2.crate) = 34104 +SHA256 (rust/crates/clap_derive-4.3.12.crate) = 54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050 +SIZE (rust/crates/clap_derive-4.3.12.crate) = 29052 SHA256 (rust/crates/clap_lex-0.2.4.crate) = 2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5 SIZE (rust/crates/clap_lex-0.2.4.crate) = 9652 SHA256 (rust/crates/clap_lex-0.5.0.crate) = 2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b @@ -125,8 +125,8 @@ SHA256 (rust/crates/dlib-0.5.2.crate) = 330c60081dcc4c72131f8eb70510f1ac07223e5d SIZE (rust/crates/dlib-0.5.2.crate) = 5806 SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10 SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123 -SHA256 (rust/crates/dtoa-1.0.6.crate) = 65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169 -SIZE (rust/crates/dtoa-1.0.6.crate) = 16918 +SHA256 (rust/crates/dtoa-1.0.9.crate) = dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653 +SIZE (rust/crates/dtoa-1.0.9.crate) = 17002 SHA256 (rust/crates/dtoa-short-0.3.4.crate) = dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74 SIZE (rust/crates/dtoa-short-0.3.4.crate) = 8276 SHA256 (rust/crates/either-1.8.1.crate) = 7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91 @@ -147,14 +147,14 @@ SHA256 (rust/crates/encoding_index_tests-0.1.4.crate) = a246d82be1c9d791c5dfde9a SIZE (rust/crates/encoding_index_tests-0.1.4.crate) = 1631 SHA256 (rust/crates/encoding_rs-0.8.32.crate) = 071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394 SIZE (rust/crates/encoding_rs-0.8.32.crate) = 1370046 -SHA256 (rust/crates/equivalent-1.0.0.crate) = 88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1 -SIZE (rust/crates/equivalent-1.0.0.crate) = 6621 +SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5 +SIZE (rust/crates/equivalent-1.0.1.crate) = 6615 SHA256 (rust/crates/errno-0.3.1.crate) = 4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a SIZE (rust/crates/errno-0.3.1.crate) = 10348 SHA256 (rust/crates/errno-dragonfly-0.1.2.crate) = aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf SIZE (rust/crates/errno-dragonfly-0.1.2.crate) = 1810 -SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be -SIZE (rust/crates/fastrand-1.9.0.crate) = 11910 +SHA256 (rust/crates/fastrand-2.0.0.crate) = 6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764 +SIZE (rust/crates/fastrand-2.0.0.crate) = 14402 SHA256 (rust/crates/fdeflate-0.3.0.crate) = d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10 SIZE (rust/crates/fdeflate-0.3.0.crate) = 21790 SHA256 (rust/crates/flate2-1.0.26.crate) = 3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743 @@ -213,8 +213,8 @@ SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19 SIZE (rust/crates/heck-0.4.1.crate) = 11567 SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33 SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979 -SHA256 (rust/crates/hermit-abi-0.3.1.crate) = fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286 -SIZE (rust/crates/hermit-abi-0.3.1.crate) = 13793 +SHA256 (rust/crates/hermit-abi-0.3.2.crate) = 443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b +SIZE (rust/crates/hermit-abi-0.3.2.crate) = 13783 SHA256 (rust/crates/iana-time-zone-0.1.57.crate) = 2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613 SIZE (rust/crates/iana-time-zone-0.1.57.crate) = 19785 SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f @@ -225,16 +225,12 @@ SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb SIZE (rust/crates/indexmap-1.9.3.crate) = 54653 SHA256 (rust/crates/indexmap-2.0.0.crate) = d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d SIZE (rust/crates/indexmap-2.0.0.crate) = 64038 -SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c -SIZE (rust/crates/instant-0.1.12.crate) = 6128 -SHA256 (rust/crates/io-lifetimes-1.0.11.crate) = eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2 -SIZE (rust/crates/io-lifetimes-1.0.11.crate) = 37346 -SHA256 (rust/crates/is-terminal-0.4.8.crate) = 24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb -SIZE (rust/crates/is-terminal-0.4.8.crate) = 8103 +SHA256 (rust/crates/is-terminal-0.4.9.crate) = cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b +SIZE (rust/crates/is-terminal-0.4.9.crate) = 8109 SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473 SIZE (rust/crates/itertools-0.10.5.crate) = 115354 -SHA256 (rust/crates/itoa-1.0.6.crate) = 453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6 -SIZE (rust/crates/itoa-1.0.6.crate) = 10410 +SHA256 (rust/crates/itoa-1.0.9.crate) = af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38 +SIZE (rust/crates/itoa-1.0.9.crate) = 10492 SHA256 (rust/crates/js-sys-0.3.64.crate) = c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a SIZE (rust/crates/js-sys-0.3.64.crate) = 80313 SHA256 (rust/crates/language-tags-0.3.2.crate) = d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388 @@ -249,8 +245,6 @@ SHA256 (rust/crates/libm-0.2.7.crate) = f7012b1bbb0719e1097c47611d3898568c546d59 SIZE (rust/crates/libm-0.2.7.crate) = 115688 SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049 -SHA256 (rust/crates/linux-raw-sys-0.3.8.crate) = ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519 -SIZE (rust/crates/linux-raw-sys-0.3.8.crate) = 1013776 SHA256 (rust/crates/linux-raw-sys-0.4.3.crate) = 09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0 SIZE (rust/crates/linux-raw-sys-0.4.3.crate) = 1116245 SHA256 (rust/crates/locale_config-0.3.0.crate) = 08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934 @@ -277,10 +271,10 @@ SHA256 (rust/crates/memoffset-0.9.0.crate) = 5a634b1c61a95585bd15607c6ab0c4e5b22 SIZE (rust/crates/memoffset-0.9.0.crate) = 9033 SHA256 (rust/crates/miniz_oxide-0.7.1.crate) = e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7 SIZE (rust/crates/miniz_oxide-0.7.1.crate) = 55194 -SHA256 (rust/crates/nalgebra-0.32.2.crate) = d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511 -SIZE (rust/crates/nalgebra-0.32.2.crate) = 370862 -SHA256 (rust/crates/nalgebra-macros-0.2.0.crate) = d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766 -SIZE (rust/crates/nalgebra-macros-0.2.0.crate) = 6502 +SHA256 (rust/crates/nalgebra-0.32.3.crate) = 307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa +SIZE (rust/crates/nalgebra-0.32.3.crate) = 374117 +SHA256 (rust/crates/nalgebra-macros-0.2.1.crate) = 91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998 +SIZE (rust/crates/nalgebra-macros-0.2.1.crate) = 6378 SHA256 (rust/crates/new_debug_unreachable-1.0.4.crate) = e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54 SIZE (rust/crates/new_debug_unreachable-1.0.4.crate) = 2561 SHA256 (rust/crates/nodrop-0.1.14.crate) = 72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb @@ -321,8 +315,8 @@ SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff49129 SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967 SHA256 (rust/crates/parking_lot_core-0.9.8.crate) = 93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447 SIZE (rust/crates/parking_lot_core-0.9.8.crate) = 32383 -SHA256 (rust/crates/paste-1.0.12.crate) = 9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79 -SIZE (rust/crates/paste-1.0.12.crate) = 18156 +SHA256 (rust/crates/paste-1.0.14.crate) = de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c +SIZE (rust/crates/paste-1.0.14.crate) = 18157 SHA256 (rust/crates/percent-encoding-2.3.0.crate) = 9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94 SIZE (rust/crates/percent-encoding-2.3.0.crate) = 10196 SHA256 (rust/crates/phf-0.8.0.crate) = 3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12 @@ -343,8 +337,8 @@ SHA256 (rust/crates/phf_shared-0.8.0.crate) = c00cf8b9eafe68dde5e9eaa2cef8ee84a9 SIZE (rust/crates/phf_shared-0.8.0.crate) = 2860 SHA256 (rust/crates/phf_shared-0.10.0.crate) = b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096 SIZE (rust/crates/phf_shared-0.10.0.crate) = 4095 -SHA256 (rust/crates/pin-project-lite-0.2.9.crate) = e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116 -SIZE (rust/crates/pin-project-lite-0.2.9.crate) = 27713 +SHA256 (rust/crates/pin-project-lite-0.2.10.crate) = 4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57 +SIZE (rust/crates/pin-project-lite-0.2.10.crate) = 28026 SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184 SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580 SHA256 (rust/crates/pkg-config-0.3.27.crate) = 26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964 @@ -379,14 +373,14 @@ SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b1 SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971 SHA256 (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068 SIZE (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = 15045 -SHA256 (rust/crates/proc-macro2-1.0.63.crate) = 7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb -SIZE (rust/crates/proc-macro2-1.0.63.crate) = 44867 +SHA256 (rust/crates/proc-macro2-1.0.66.crate) = 18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9 +SIZE (rust/crates/proc-macro2-1.0.66.crate) = 43575 SHA256 (rust/crates/proptest-1.2.0.crate) = 4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65 SIZE (rust/crates/proptest-1.2.0.crate) = 194884 SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0 SIZE (rust/crates/quick-error-1.2.3.crate) = 15066 -SHA256 (rust/crates/quote-1.0.29.crate) = 573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105 -SIZE (rust/crates/quote-1.0.29.crate) = 28345 +SHA256 (rust/crates/quote-1.0.31.crate) = 5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0 +SIZE (rust/crates/quote-1.0.31.crate) = 27881 SHA256 (rust/crates/rand-0.7.3.crate) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03 SIZE (rust/crates/rand-0.7.3.crate) = 112246 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404 @@ -415,48 +409,46 @@ SHA256 (rust/crates/rctree-0.5.0.crate) = 3b42e27ef78c35d3998403c1d26f3efd9e135d SIZE (rust/crates/rctree-0.5.0.crate) = 8298 SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29 SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404 -SHA256 (rust/crates/regex-1.8.4.crate) = d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f -SIZE (rust/crates/regex-1.8.4.crate) = 249562 -SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132 -SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533 +SHA256 (rust/crates/regex-1.9.1.crate) = b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575 +SIZE (rust/crates/regex-1.9.1.crate) = 251978 +SHA256 (rust/crates/regex-automata-0.3.3.crate) = 39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310 +SIZE (rust/crates/regex-automata-0.3.3.crate) = 604301 SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1 SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752 -SHA256 (rust/crates/regex-syntax-0.7.2.crate) = 436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78 -SIZE (rust/crates/regex-syntax-0.7.2.crate) = 339778 +SHA256 (rust/crates/regex-syntax-0.7.4.crate) = e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2 +SIZE (rust/crates/regex-syntax-0.7.4.crate) = 343365 SHA256 (rust/crates/rgb-0.8.36.crate) = 20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59 SIZE (rust/crates/rgb-0.8.36.crate) = 16576 SHA256 (rust/crates/rustc_version-0.2.3.crate) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a SIZE (rust/crates/rustc_version-0.2.3.crate) = 10210 SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366 SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175 -SHA256 (rust/crates/rustix-0.37.21.crate) = 62f25693a73057a1b4cb56179dd3c7ea21a7c6c5ee7d85781f5749b46f34b79c -SIZE (rust/crates/rustix-0.37.21.crate) = 327800 -SHA256 (rust/crates/rustix-0.38.1.crate) = fbc6396159432b5c8490d4e301d8c705f61860b8b6c863bf79942ce5401968f3 -SIZE (rust/crates/rustix-0.38.1.crate) = 334655 +SHA256 (rust/crates/rustix-0.38.4.crate) = 0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5 +SIZE (rust/crates/rustix-0.38.4.crate) = 323637 SHA256 (rust/crates/rusty-fork-0.3.0.crate) = cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f SIZE (rust/crates/rusty-fork-0.3.0.crate) = 19881 -SHA256 (rust/crates/ryu-1.0.13.crate) = f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041 -SIZE (rust/crates/ryu-1.0.13.crate) = 46823 -SHA256 (rust/crates/safe_arch-0.7.0.crate) = 62a7484307bd40f8f7ccbacccac730108f2cae119a3b11c74485b48aa9ea650f -SIZE (rust/crates/safe_arch-0.7.0.crate) = 77097 +SHA256 (rust/crates/ryu-1.0.15.crate) = 1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741 +SIZE (rust/crates/ryu-1.0.15.crate) = 46906 +SHA256 (rust/crates/safe_arch-0.7.1.crate) = f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354 +SIZE (rust/crates/safe_arch-0.7.1.crate) = 76930 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502 SIZE (rust/crates/same-file-1.0.6.crate) = 10183 -SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd -SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470 +SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49 +SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619 SHA256 (rust/crates/selectors-0.24.0.crate) = 0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416 SIZE (rust/crates/selectors-0.24.0.crate) = 45204 SHA256 (rust/crates/semver-0.9.0.crate) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403 SIZE (rust/crates/semver-0.9.0.crate) = 17344 -SHA256 (rust/crates/semver-1.0.17.crate) = bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed -SIZE (rust/crates/semver-1.0.17.crate) = 29685 +SHA256 (rust/crates/semver-1.0.18.crate) = b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918 +SIZE (rust/crates/semver-1.0.18.crate) = 29703 SHA256 (rust/crates/semver-parser-0.7.0.crate) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3 SIZE (rust/crates/semver-parser-0.7.0.crate) = 10268 -SHA256 (rust/crates/serde-1.0.164.crate) = 9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d -SIZE (rust/crates/serde-1.0.164.crate) = 77057 -SHA256 (rust/crates/serde_derive-1.0.164.crate) = d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68 -SIZE (rust/crates/serde_derive-1.0.164.crate) = 54789 -SHA256 (rust/crates/serde_json-1.0.99.crate) = 46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3 -SIZE (rust/crates/serde_json-1.0.99.crate) = 145102 +SHA256 (rust/crates/serde-1.0.173.crate) = e91f70896d6720bc714a4a57d22fc91f1db634680e65c8efe13323f1fa38d53f +SIZE (rust/crates/serde-1.0.173.crate) = 77570 +SHA256 (rust/crates/serde_derive-1.0.173.crate) = a6250dde8342e0232232be9ca3db7aa40aceb5a3e5dd9bddbc00d99a007cde49 +SIZE (rust/crates/serde_derive-1.0.173.crate) = 385770 +SHA256 (rust/crates/serde_json-1.0.103.crate) = d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b +SIZE (rust/crates/serde_json-1.0.103.crate) = 146095 SHA256 (rust/crates/serde_spanned-0.6.3.crate) = 96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186 SIZE (rust/crates/serde_spanned-0.6.3.crate) = 7737 SHA256 (rust/crates/servo_arc-0.2.0.crate) = d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741 @@ -473,8 +465,8 @@ SHA256 (rust/crates/siphasher-0.3.10.crate) = 7bd3e3206899af3f8b12af284fafc038cc SIZE (rust/crates/siphasher-0.3.10.crate) = 9889 SHA256 (rust/crates/slab-0.4.8.crate) = 6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d SIZE (rust/crates/slab-0.4.8.crate) = 16928 -SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0 -SIZE (rust/crates/smallvec-1.10.0.crate) = 31564 +SHA256 (rust/crates/smallvec-1.11.0.crate) = 62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9 +SIZE (rust/crates/smallvec-1.11.0.crate) = 34680 SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3 SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054 SHA256 (rust/crates/standback-0.2.17.crate) = e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff @@ -495,24 +487,24 @@ SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f0 SIZE (rust/crates/strsim-0.10.0.crate) = 11355 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237 SIZE (rust/crates/syn-1.0.109.crate) = 237611 -SHA256 (rust/crates/syn-2.0.22.crate) = 2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616 -SIZE (rust/crates/syn-2.0.22.crate) = 241001 +SHA256 (rust/crates/syn-2.0.26.crate) = 45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970 +SIZE (rust/crates/syn-2.0.26.crate) = 241572 SHA256 (rust/crates/system-deps-6.1.1.crate) = 30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3 SIZE (rust/crates/system-deps-6.1.1.crate) = 24171 -SHA256 (rust/crates/target-lexicon-0.12.8.crate) = 1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac -SIZE (rust/crates/target-lexicon-0.12.8.crate) = 24518 -SHA256 (rust/crates/tempfile-3.6.0.crate) = 31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6 -SIZE (rust/crates/tempfile-3.6.0.crate) = 31812 +SHA256 (rust/crates/target-lexicon-0.12.10.crate) = 1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e +SIZE (rust/crates/target-lexicon-0.12.10.crate) = 24544 +SHA256 (rust/crates/tempfile-3.7.0.crate) = 5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998 +SIZE (rust/crates/tempfile-3.7.0.crate) = 31754 SHA256 (rust/crates/tendril-0.4.3.crate) = d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0 SIZE (rust/crates/tendril-0.4.3.crate) = 37210 SHA256 (rust/crates/termtree-0.4.1.crate) = 3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76 SIZE (rust/crates/termtree-0.4.1.crate) = 4557 SHA256 (rust/crates/textwrap-0.16.0.crate) = 222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d SIZE (rust/crates/textwrap-0.16.0.crate) = 53722 -SHA256 (rust/crates/thiserror-1.0.40.crate) = 978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac -SIZE (rust/crates/thiserror-1.0.40.crate) = 18709 -SHA256 (rust/crates/thiserror-impl-1.0.40.crate) = f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f -SIZE (rust/crates/thiserror-impl-1.0.40.crate) = 15138 +SHA256 (rust/crates/thiserror-1.0.43.crate) = a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42 +SIZE (rust/crates/thiserror-1.0.43.crate) = 18735 +SHA256 (rust/crates/thiserror-impl-1.0.43.crate) = 463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f +SIZE (rust/crates/thiserror-impl-1.0.43.crate) = 15062 SHA256 (rust/crates/time-0.2.27.crate) = 4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242 SIZE (rust/crates/time-0.2.27.crate) = 65167 SHA256 (rust/crates/time-macros-0.1.1.crate) = 957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1 @@ -525,20 +517,20 @@ SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a465126 SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865 -SHA256 (rust/crates/toml-0.7.5.crate) = 1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240 -SIZE (rust/crates/toml-0.7.5.crate) = 49069 +SHA256 (rust/crates/toml-0.7.6.crate) = c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542 +SIZE (rust/crates/toml-0.7.6.crate) = 49220 SHA256 (rust/crates/toml_datetime-0.6.3.crate) = 7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b SIZE (rust/crates/toml_datetime-0.6.3.crate) = 10770 -SHA256 (rust/crates/toml_edit-0.19.11.crate) = 266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7 -SIZE (rust/crates/toml_edit-0.19.11.crate) = 95642 +SHA256 (rust/crates/toml_edit-0.19.14.crate) = f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a +SIZE (rust/crates/toml_edit-0.19.14.crate) = 94875 SHA256 (rust/crates/typenum-1.16.0.crate) = 497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba SIZE (rust/crates/typenum-1.16.0.crate) = 42477 SHA256 (rust/crates/unarray-0.1.4.crate) = eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94 SIZE (rust/crates/unarray-0.1.4.crate) = 12895 SHA256 (rust/crates/unicode-bidi-0.3.13.crate) = 92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460 SIZE (rust/crates/unicode-bidi-0.3.13.crate) = 44477 -SHA256 (rust/crates/unicode-ident-1.0.9.crate) = b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0 -SIZE (rust/crates/unicode-ident-1.0.9.crate) = 41978 +SHA256 (rust/crates/unicode-ident-1.0.11.crate) = 301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c +SIZE (rust/crates/unicode-ident-1.0.11.crate) = 42067 SHA256 (rust/crates/unicode-normalization-0.1.22.crate) = 5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921 SIZE (rust/crates/unicode-normalization-0.1.22.crate) = 122604 SHA256 (rust/crates/url-2.4.0.crate) = 50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb @@ -573,8 +565,8 @@ SHA256 (rust/crates/web-sys-0.3.64.crate) = 9b85cbef8c220a6abc02aefd892dfc0fc23a SIZE (rust/crates/web-sys-0.3.64.crate) = 725584 SHA256 (rust/crates/weezl-0.1.7.crate) = 9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb SIZE (rust/crates/weezl-0.1.7.crate) = 42166 -SHA256 (rust/crates/wide-0.7.10.crate) = 40018623e2dba2602a9790faba8d33f2ebdebf4b86561b83928db735f8784728 -SIZE (rust/crates/wide-0.7.10.crate) = 78693 +SHA256 (rust/crates/wide-0.7.11.crate) = aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f +SIZE (rust/crates/wide-0.7.11.crate) = 78683 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 @@ -603,8 +595,8 @@ SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 7896dbc1f41e08872e9d5 SIZE (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 366536 SHA256 (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a SIZE (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 671422 -SHA256 (rust/crates/winnow-0.4.7.crate) = ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448 -SIZE (rust/crates/winnow-0.4.7.crate) = 142640 +SHA256 (rust/crates/winnow-0.5.0.crate) = 81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7 +SIZE (rust/crates/winnow-0.5.0.crate) = 142099 SHA256 (rust/crates/xml5ever-0.17.0.crate) = 4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650 SIZE (rust/crates/xml5ever-0.17.0.crate) = 41208 SHA256 (rust/crates/yeslogic-fontconfig-sys-4.0.1.crate) = ec657fd32bbcbeaef5c7bc8e10b3db95b143fab8db0a50079773dbf936fd4f73 diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile index b5fc4011a837..f78f6fa99b93 100644 --- a/graphics/osgearth/Makefile +++ b/graphics/osgearth/Makefile @@ -1,10 +1,9 @@ PORTNAME= osgearth -PORTVERSION= 3.2 +PORTVERSION= 3.4 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 7 CATEGORIES= graphics geography -MAINTAINER= lbartoletti@FreeBSD.org +MAINTAINER= zirias@FreeBSD.org COMMENT= C++ terrain rendering toolkit for OpenSceneGraph WWW= http://osgearth.org/ @@ -21,7 +20,9 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ USES= cmake gl pkgconfig sqlite USE_GITHUB= yes -GH_ACCOUNT= gwaldron +GH_ACCOUNT= gwaldron ocornut:imgui Esri:lerc Tencent:rapidjson +GH_PROJECT= imgui:imgui lerc:lerc rapidjson:rapidjson +GH_TAGNAME= 9e8e5ac:imgui 19542a0:lerc f54b0e4:rapidjson USE_CXXSTD= c++11 USE_LDCONFIG= yes @@ -33,6 +34,11 @@ CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:PATH=${LOCALBASE}/include \ PLIST_SUB= PORTVERSION=${PORTVERSION} +post-extract: +.for sm in imgui lerc rapidjson + @${MV} ${WRKSRC_${sm}}/* ${WRKSRC}/src/third_party/${sm}/ +.endfor + .include .if ${ARCH:Mpowerpc64*} @@ -42,10 +48,8 @@ USES+= compiler:gcc-c++11-lib USES+= compiler:c++11-lang .endif -.include - .if ${ARCH} == i386 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-i386 .endif -.include +.include diff --git a/graphics/osgearth/distinfo b/graphics/osgearth/distinfo index 52485837ad55..ae9a78f59d26 100644 --- a/graphics/osgearth/distinfo +++ b/graphics/osgearth/distinfo @@ -1,3 +1,9 @@ -TIMESTAMP = 1648530145 -SHA256 (gwaldron-osgearth-osgearth-3.2_GH0.tar.gz) = 7e1dd643b1f3b8d1ba9561b899c18176af988342b86c42d89a70be924cb747f6 -SIZE (gwaldron-osgearth-osgearth-3.2_GH0.tar.gz) = 121772329 +TIMESTAMP = 1689531343 +SHA256 (gwaldron-osgearth-osgearth-3.4_GH0.tar.gz) = 2a5aabd6950c598b2310842dfa1e9cf085d54692a0c787cef5627530fcbe682e +SIZE (gwaldron-osgearth-osgearth-3.4_GH0.tar.gz) = 119642993 +SHA256 (ocornut-imgui-9e8e5ac_GH0.tar.gz) = da877be818e7f4f20915c9982081f958bf5f68b26a5afde64c263427aff8097b +SIZE (ocornut-imgui-9e8e5ac_GH0.tar.gz) = 1592220 +SHA256 (Esri-lerc-19542a0_GH0.tar.gz) = 5d48ae91b45343c68da336ef6996af3b9495452970185244e21253f4c711e529 +SIZE (Esri-lerc-19542a0_GH0.tar.gz) = 4247805 +SHA256 (Tencent-rapidjson-f54b0e4_GH0.tar.gz) = 35c330d40ed9def99e8dea8f3b0e4fda7610b813b6f4aac9a70ffefcb9ab1f1e +SIZE (Tencent-rapidjson-f54b0e4_GH0.tar.gz) = 1019457 diff --git a/graphics/osgearth/files/extra-patch-i386 b/graphics/osgearth/files/extra-patch-i386 index ffcf26df680e..ae7e8a338d36 100644 --- a/graphics/osgearth/files/extra-patch-i386 +++ b/graphics/osgearth/files/extra-patch-i386 @@ -1,4 +1,4 @@ ---- src/osgEarthDrivers/fastdxt/CMakeLists.txt.orig 2018-11-12 18:17:36 UTC +--- src/osgEarthDrivers/fastdxt/CMakeLists.txt.orig 2023-05-16 14:53:59 UTC +++ src/osgEarthDrivers/fastdxt/CMakeLists.txt @@ -30,7 +30,6 @@ SET(TARGET_SRC dxt.cpp @@ -8,12 +8,12 @@ ) SETUP_PLUGIN(fastdxt) ---- src/osgEarthDrivers/fastdxt/dxt.cpp.orig 2018-11-12 18:17:36 UTC +--- src/osgEarthDrivers/fastdxt/dxt.cpp.orig 2023-05-16 14:53:59 UTC +++ src/osgEarthDrivers/fastdxt/dxt.cpp -@@ -7,7 +7,7 @@ +@@ -6,7 +6,7 @@ + #include "dxt.h" #include "util.h" - -#define DXT_INTR 1 +#define DXT_INTR 0 diff --git a/graphics/osgearth/files/patch-CMakeLists.txt b/graphics/osgearth/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..ab12b4b6f4f0 --- /dev/null +++ b/graphics/osgearth/files/patch-CMakeLists.txt @@ -0,0 +1,8 @@ +--- CMakeLists.txt.orig 2023-07-17 15:47:49 UTC ++++ CMakeLists.txt +@@ -335,4 +335,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConf + COMPATIBILITY SameMajorVersion ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConfigVersion.cmake +- DESTINATION ${CMAKE_INSTALL_PREFIX}/cmake ) ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules/osgEarth ) diff --git a/graphics/osgearth/files/patch-src_osgEarthDrivers_lerc_CMakeLists.txt b/graphics/osgearth/files/patch-src_osgEarthDrivers_lerc_CMakeLists.txt index 6c8bcc143041..7c50938eb372 100644 --- a/graphics/osgearth/files/patch-src_osgEarthDrivers_lerc_CMakeLists.txt +++ b/graphics/osgearth/files/patch-src_osgEarthDrivers_lerc_CMakeLists.txt @@ -1,8 +1,8 @@ ---- src/osgEarthDrivers/lerc/CMakeLists.txt.orig 2021-08-09 17:37:52 UTC +--- src/osgEarthDrivers/lerc/CMakeLists.txt.orig 2023-05-16 14:53:59 UTC +++ src/osgEarthDrivers/lerc/CMakeLists.txt @@ -1,4 +1,4 @@ --INCLUDE_DIRECTORIES( ../../third_party/lerc ) -+INCLUDE_DIRECTORIES( BEFORE ../../third_party/lerc ) +-INCLUDE_DIRECTORIES( ../../third_party/lerc/include ) ++INCLUDE_DIRECTORIES( BEFORE ../../third_party/lerc/include ) SET(TARGET_SRC ReaderWriterLERC.cpp diff --git a/graphics/osgearth/pkg-plist b/graphics/osgearth/pkg-plist index 26841690225c..05b9cb587be0 100644 --- a/graphics/osgearth/pkg-plist +++ b/graphics/osgearth/pkg-plist @@ -2,24 +2,19 @@ bin/osgEarth_tests bin/osgearth_3pv bin/osgearth_annotation bin/osgearth_atlas +bin/osgearth_bakefeaturetiles bin/osgearth_bindless bin/osgearth_boundarygen bin/osgearth_city bin/osgearth_clamp bin/osgearth_cluster -bin/osgearth_computerangecallback -bin/osgearth_controls bin/osgearth_conv bin/osgearth_createtile -bin/osgearth_decal bin/osgearth_drawables bin/osgearth_eci -bin/osgearth_elevation bin/osgearth_ephemeris bin/osgearth_featurefilter -bin/osgearth_featurequery bin/osgearth_features -bin/osgearth_geodetic_graticule bin/osgearth_graticule bin/osgearth_heatmap bin/osgearth_horizon @@ -29,16 +24,12 @@ bin/osgearth_los bin/osgearth_magnify bin/osgearth_manip bin/osgearth_map -bin/osgearth_measure bin/osgearth_minimap bin/osgearth_mrt bin/osgearth_mvtindex bin/osgearth_occlusionculling bin/osgearth_overlayviewer -bin/osgearth_scenegraphcallbacks -bin/osgearth_sequencecontrol bin/osgearth_shadercomp -bin/osgearth_shadergen bin/osgearth_skyview bin/osgearth_terrainprofile bin/osgearth_tfs @@ -48,7 +39,6 @@ bin/osgearth_transform bin/osgearth_version bin/osgearth_video bin/osgearth_viewer -bin/osgearth_wfs include/osgEarth/AGG.h include/osgEarth/ActivityMonitorTool include/osgEarth/AltitudeFilter @@ -77,7 +67,6 @@ include/osgEarth/BuildGeometryFilter include/osgEarth/BuildTextFilter include/osgEarth/Cache include/osgEarth/CacheBin -include/osgEarth/CacheEstimator include/osgEarth/CachePolicy include/osgEarth/CacheSeed include/osgEarth/Callouts @@ -86,6 +75,7 @@ include/osgEarth/Capabilities include/osgEarth/CascadeDrapingDecorator include/osgEarth/CentroidFilter include/osgEarth/CesiumIon +include/osgEarth/Chonk include/osgEarth/CircleNode include/osgEarth/ClampCallback include/osgEarth/ClampableNode @@ -102,6 +92,8 @@ include/osgEarth/Containers include/osgEarth/ContourMap include/osgEarth/Controls include/osgEarth/ConvertTypeFilter +include/osgEarth/Coverage +include/osgEarth/CoverageLayer include/osgEarth/CoverageSymbol include/osgEarth/CropFilter include/osgEarth/CssUtils @@ -127,7 +119,6 @@ include/osgEarth/ElevationQuery include/osgEarth/ElevationRanges include/osgEarth/EllipseNode include/osgEarth/Ellipsoid -include/osgEarth/EllipsoidIntersector include/osgEarth/Endian include/osgEarth/Ephemeris include/osgEarth/ExampleResources @@ -156,6 +147,7 @@ include/osgEarth/FileUtils include/osgEarth/Fill include/osgEarth/Filter include/osgEarth/FilterContext +include/osgEarth/FilteredFeatureSource include/osgEarth/FlatteningLayer include/osgEarth/Formatter include/osgEarth/FractalElevationLayer @@ -177,6 +169,7 @@ include/osgEarth/GeodeticLabelingEngine include/osgEarth/Geoid include/osgEarth/Geometry include/osgEarth/GeometryClamper +include/osgEarth/GeometryCloud include/osgEarth/GeometryCompiler include/osgEarth/GeometryFactory include/osgEarth/GeometryRasterizer @@ -199,7 +192,6 @@ include/osgEarth/ImageToHeightFieldConverter include/osgEarth/ImageUtils include/osgEarth/InstanceBuilder include/osgEarth/InstanceCloud -include/osgEarth/InstanceCloud.cpp include/osgEarth/InstanceResource include/osgEarth/InstanceSymbol include/osgEarth/IntersectionPicker @@ -228,12 +220,14 @@ include/osgEarth/MGRSFormatter include/osgEarth/MGRSGraticule include/osgEarth/MVT include/osgEarth/Map +include/osgEarth/MapboxGLGlyphManager include/osgEarth/MapCallback include/osgEarth/MapInfo include/osgEarth/MapModelChange include/osgEarth/MapNode include/osgEarth/MapNodeObserver include/osgEarth/MapboxGLImageLayer +include/osgEarth/MaterialLoader include/osgEarth/Math include/osgEarth/MeasureTool include/osgEarth/MemCache @@ -242,6 +236,7 @@ include/osgEarth/MeshConsolidator include/osgEarth/MeshFlattener include/osgEarth/MeshSubdivider include/osgEarth/MetaTile +include/osgEarth/MetadataNode include/osgEarth/Metrics include/osgEarth/ModelLayer include/osgEarth/ModelNode @@ -349,16 +344,17 @@ include/osgEarth/Text include/osgEarth/TextSymbol include/osgEarth/TextSymbolizer include/osgEarth/TextureArena -include/osgEarth/TextureArena.cpp include/osgEarth/TextureBuffer include/osgEarth/Threading include/osgEarth/ThreeDTilesLayer include/osgEarth/TileCache +include/osgEarth/TileEstimator include/osgEarth/TileHandler include/osgEarth/TileIndex include/osgEarth/TileIndexBuilder include/osgEarth/TileKey include/osgEarth/TileLayer +include/osgEarth/TileMesher include/osgEarth/TileRasterizer include/osgEarth/TileSource include/osgEarth/TileSourceElevationLayer @@ -367,6 +363,7 @@ include/osgEarth/TileVisitor include/osgEarth/TiledFeatureModelGraph include/osgEarth/TiledFeatureModelLayer include/osgEarth/TimeControl +include/osgEarth/TimeSeriesImage include/osgEarth/TopologyGraph include/osgEarth/TrackNode include/osgEarth/TransformFilter @@ -389,7 +386,10 @@ include/osgEarth/WingedEdgeMesh include/osgEarth/WireLines include/osgEarth/XYZ include/osgEarth/XYZFeatureSource +include/osgEarth/XYZModelGraph +include/osgEarth/XYZModelLayer include/osgEarth/XmlUtils +include/osgEarth/glyphs.pb.h include/osgEarth/optional include/osgEarth/rtree.h include/osgEarth/tinystr.h @@ -407,7 +407,6 @@ include/osgEarthDrivers/engine_rex/GeometryPool include/osgEarthDrivers/engine_rex/LayerDrawable include/osgEarthDrivers/engine_rex/LoadTileData include/osgEarthDrivers/engine_rex/Loader -include/osgEarthDrivers/engine_rex/MeshEditor include/osgEarthDrivers/engine_rex/RenderBindings include/osgEarthDrivers/engine_rex/RexTerrainEngineNode include/osgEarthDrivers/engine_rex/SelectionInfo @@ -431,7 +430,7 @@ include/osgEarthDrivers/scriptengine_javascript/duktape.h include/osgEarthDrivers/sky_gl/GLSkyOptions include/osgEarthDrivers/sky_simple/SimpleSkyOptions lib/libosgEarth.so -lib/libosgEarth.so.113 +lib/libosgEarth.so.148 lib/libosgEarth.so.%%PORTVERSION%%.0 lib/osgPlugins-3.6.5/osgdb_earth.so lib/osgPlugins-3.6.5/osgdb_fastdxt.so @@ -457,3 +456,5 @@ lib/osgPlugins-3.6.5/osgdb_osgearth_vdatum_egm96.so lib/osgPlugins-3.6.5/osgdb_osgearth_viewpoints.so lib/osgPlugins-3.6.5/osgdb_template.so lib/osgPlugins-3.6.5/osgdb_webp.so +share/cmake/Modules/osgEarth/osgEarthConfig.cmake +share/cmake/Modules/osgEarth/osgEarthConfigVersion.cmake diff --git a/graphics/py-pyvips/Makefile b/graphics/py-pyvips/Makefile index ffba6186f060..c8567d469065 100644 --- a/graphics/py-pyvips/Makefile +++ b/graphics/py-pyvips/Makefile @@ -22,6 +22,12 @@ USES= gnome python USE_GNOME= glib20 USE_PYTHON= autoplist concurrent distutils +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile index cb75f006c146..45c71ac286d5 100644 --- a/irc/bitchx/Makefile +++ b/irc/bitchx/Makefile @@ -1,6 +1,6 @@ PORTNAME= bitchx PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES+= irc MASTER_SITES= SF/${PORTNAME}/ircii-pana/${PORTNAME}-${DISTVERSION} @@ -13,40 +13,45 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT USES= cpe gmake ncurses + GNU_CONFIGURE= yes CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \ --bindir="${PREFIX}/bin" \ --datadir="${PREFIX}/share" \ --libdir="${PREFIX}/share" +MAKE_JOBS_UNSAFE= yes + CONFLICTS_INSTALL?= zh-bitchx -OPTIONS_SUB= yes +DATADIR= ${PREFIX}/share/bx +DOCSDIR= ${PREFIX}/share/bx/help PLIST_SUB+= DISTVERSION=${DISTVERSION} -DOCSDIR= ${PREFIX}/share/bx/help PORTDOCS= * -DATADIR= ${PREFIX}/share/bx - -MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DOCS LANG_HE IPV6 LATIN PLUGINS SSL TOGGLES OPTIONS_DEFAULT= PLUGINS SSL +OPTIONS_SUB= yes LATIN_DESC= Recommended for ISO-8859-1 display PLUGINS_DESC= Build a handful of BitchX plugins TOGGLES_DESC= Disable annoyance toggles IPV6_CONFIGURE_ENABLE= ipv6 - -SSL_CONFIGURE_WITH= ssl="${OPENSSLBASE}" -SSL_USES= ssl - PLUGINS_CONFIGURE_WITH= plugins="${PLUGIN_LIST:C/\$$/,/g}" +SSL_USES= ssl +SSL_CONFIGURE_WITH= ssl="${OPENSSLBASE}" PLUGIN_LIST= abot acro arcfour autocycle blowfish cavlink cdrom encrypt \ europa fserv hint nap nicklist pkga possum qbx qmail wavplay +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + post-patch: ${REINPLACE_CMD} -e 's|bzip2|true|g' ${WRKSRC}/Makefile.in ${REINPLACE_CMD} -e 's|SSLeay|ERR_get_error|' ${WRKSRC}/configure @@ -55,14 +60,14 @@ post-patch-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} -post-patch-LATIN-on: - ${REINPLACE_CMD} -e 's|#undef LATIN1|#define LATIN1|' \ - ${WRKSRC}/include/config.h - post-patch-LANG_HE-on: ${REINPLACE_CMD} -e 's|#undef WANT_HEBREW|#define WANT_HEBREW|' \ ${WRKSRC}/include/config.h +post-patch-LATIN-on: + ${REINPLACE_CMD} -e 's|#undef LATIN1|#define LATIN1|' \ + ${WRKSRC}/include/config.h + post-patch-TOGGLES-on: ${REINPLACE_CMD} -e 's|DEFAULT_AUTO_AWAY ON|DEFAULT_AUTO_AWAY OFF|' \ ${WRKSRC}/include/config.h @@ -71,4 +76,9 @@ post-patch-TOGGLES-on: ${REINPLACE_CMD} -e 's|DEFAULT_AUTO_REJOIN ON|DEFAULT_AUTO_REJOIN OFF|' \ ${WRKSRC}/include/config.h +post-stage: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/bx/plugins/*.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/bx/wserv + .include diff --git a/irc/bitchx/pkg-plist b/irc/bitchx/pkg-plist index c3bed8d5e068..d90c66f1e53e 100644 --- a/irc/bitchx/pkg-plist +++ b/irc/bitchx/pkg-plist @@ -1,4 +1,3 @@ -@unexec if [ -f %D/%%DATADIR%%/script/bxglobal.old ]; then rm -f %D/share/bx/script/bxglobal.old; fi bin/BitchX bin/BitchX-%%DISTVERSION%% bin/scr-bx @@ -76,3 +75,4 @@ man/man1/BitchX.1.gz %%DATADIR%%/translation/UNITED_KINGDOM %%DATADIR%%/translation/UNITED_KINGDOM_COM %%DATADIR%%/wserv +@rmtry %%DATADIR%%/script/bxglobal.old diff --git a/lang/php83/Makefile b/lang/php83/Makefile index 1d03dd084cdc..478f7ca0fd33 100644 --- a/lang/php83/Makefile +++ b/lang/php83/Makefile @@ -1,9 +1,9 @@ PORTNAME= php83 -DISTVERSION= 8.3.0alpha3 +DISTVERSION= 8.3.0beta1 PORTREVISION?= 0 CATEGORIES?= lang devel www -MASTER_SITES= https://downloads.php.net/~jakub/ -#MASTER_SITES= https://downloads.php.net/~eric/ +MASTER_SITES= https://downloads.php.net/~jakub/ \ + https://downloads.php.net/~eric/ DISTNAME= php-${DISTVERSION} MAINTAINER= bofh@FreeBSD.org diff --git a/lang/php83/distinfo b/lang/php83/distinfo index 338ba8d4b3e7..f101b8091555 100644 --- a/lang/php83/distinfo +++ b/lang/php83/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688707232 -SHA256 (php-8.3.0alpha3.tar.xz) = 2a8d12479648b1d33212678ceb9cc55386c253b7fbc6988304c7f4a1dfe4bfc9 -SIZE (php-8.3.0alpha3.tar.xz) = 12300908 +TIMESTAMP = 1689844560 +SHA256 (php-8.3.0beta1.tar.xz) = 7998e1c2a90fd51932ce9579b8c53151691788f1110601ad99a5fae56843765f +SIZE (php-8.3.0beta1.tar.xz) = 12369024 diff --git a/lang/php83/pkg-plist b/lang/php83/pkg-plist index b1b861ca8d01..a01d7361c7c7 100644 --- a/lang/php83/pkg-plist +++ b/lang/php83/pkg-plist @@ -61,6 +61,7 @@ include/php/Zend/zend_globals.h include/php/Zend/zend_globals_macros.h include/php/Zend/zend_hash.h include/php/Zend/zend_highlight.h +include/php/Zend/zend_hrtime.h include/php/Zend/zend_inheritance.h include/php/Zend/zend_ini.h include/php/Zend/zend_ini_parser.h @@ -207,7 +208,6 @@ include/php/ext/standard/file_arginfo.h include/php/ext/standard/flock_compat.h include/php/ext/standard/fsock.h include/php/ext/standard/head.h -include/php/ext/standard/hrtime.h include/php/ext/standard/html.h include/php/ext/standard/html_tables.h include/php/ext/standard/info.h diff --git a/mail/lurker/Makefile b/mail/lurker/Makefile index 3218df9bf0c7..9eec3949e8f1 100644 --- a/mail/lurker/Makefile +++ b/mail/lurker/Makefile @@ -14,17 +14,20 @@ WWW= http://lurker.sourceforge.net/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -MIMELIB_VERSION= 3.1.1 - USES= iconv localbase +USE_CXXSTD= c++14 + GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mimelib-local \ --with-default-www-dir=${PREFIX}/www/lurker \ --with-cgi-bin-dir=${PREFIX}/www/lurker + PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" OPTIONS_DEFINE= DOCS +MIMELIB_VERSION= 3.1.1 + post-extract: @cd ${WRKSRC} && ${TAR} ${EXTRACT_BEFORE_ARGS} \ ${DISTDIR}/mimelib-${MIMELIB_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} diff --git a/math/Makefile b/math/Makefile index 208191e8ea97..0d8c393b4db6 100644 --- a/math/Makefile +++ b/math/Makefile @@ -1035,6 +1035,7 @@ SUBDIR += py-python-picard SUBDIR += py-pytorchvideo SUBDIR += py-pyvtk + SUBDIR += py-qats SUBDIR += py-qdldl SUBDIR += py-quadprog SUBDIR += py-random2 diff --git a/math/alps/Makefile b/math/alps/Makefile index 162cd959d8f0..9180c3dffb4d 100644 --- a/math/alps/Makefile +++ b/math/alps/Makefile @@ -1,7 +1,6 @@ PORTNAME= alps DISTVERSIONPREFIX= releases/ -DISTVERSION= 2.0.1 -PORTREVISION= 2 +DISTVERSION= 2.0.2 CATEGORIES= math PKGNAMEPREFIX= coin-or- diff --git a/math/alps/distinfo b/math/alps/distinfo index 3df7f6506e57..1a0307123314 100644 --- a/math/alps/distinfo +++ b/math/alps/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620007130 -SHA256 (coin-or-CHiPPS-ALPS-releases-2.0.1_GH0.tar.gz) = 43f38b04699d4e70bde27f8dd024804e8a33ea7f521e5a5f121f373e2a60493a -SIZE (coin-or-CHiPPS-ALPS-releases-2.0.1_GH0.tar.gz) = 899878 +TIMESTAMP = 1689920856 +SHA256 (coin-or-CHiPPS-ALPS-releases-2.0.2_GH0.tar.gz) = 4ed8ef38a2e5f370470ba775b342b4bdd0108fd6de3f8dff426a682116f070a1 +SIZE (coin-or-CHiPPS-ALPS-releases-2.0.2_GH0.tar.gz) = 911514 diff --git a/math/alps/pkg-plist b/math/alps/pkg-plist index 3785bd00d35d..9a9fbe8c3351 100644 --- a/math/alps/pkg-plist +++ b/math/alps/pkg-plist @@ -24,6 +24,6 @@ include/coin/AlpsSubTreePool.h include/coin/AlpsTime.h include/coin/AlpsTreeNode.h lib/libAlps.so -lib/libAlps.so.0 -lib/libAlps.so.0.0.0 +lib/libAlps.so.10 +lib/libAlps.so.10.0.2 libdata/pkgconfig/alps.pc diff --git a/math/bcps/Makefile b/math/bcps/Makefile index 8d48137e1793..988a2dfac56d 100644 --- a/math/bcps/Makefile +++ b/math/bcps/Makefile @@ -1,7 +1,7 @@ PORTNAME= bcps DISTVERSIONPREFIX= releases/ DISTVERSION= 0.99.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math PKGNAMEPREFIX= coin-or- diff --git a/math/disco/Makefile b/math/disco/Makefile index 3eab4453427d..ce0b0359dddb 100644 --- a/math/disco/Makefile +++ b/math/disco/Makefile @@ -1,7 +1,7 @@ PORTNAME= disco DISTVERSIONPREFIX= releases/ DISTVERSION= 1.0.0-33 -PORTREVISION= 5 +PORTREVISION= 6 DISTVERSIONSUFFIX= -g68720be CATEGORIES= math PKGNAMEPREFIX= coin-or- diff --git a/math/gri/Makefile b/math/gri/Makefile index 38147dd9d81d..d4219c2da87a 100644 --- a/math/gri/Makefile +++ b/math/gri/Makefile @@ -4,25 +4,25 @@ PORTREVISION= 13 CATEGORIES= math MASTER_SITES= SF -LICENSE= GPLv2 - MAINTAINER= ports@FreeBSD.org COMMENT= Extensible plotting language for producing scientific graphs WWW= http://gri.sourceforge.net/ +LICENSE= GPLv2 + LIB_DEPENDS= libnetcdf.so:science/netcdf -USES= cpe gmake readline shebangfix makeinfo tex +USES= cpe gmake localbase:ldflags readline shebangfix makeinfo tex +CPE_VENDOR= gri_project +USE_CXXSTD= c++14 +USE_TEX= formats:build dvipsk:build + SHEBANG_FILES= doc/examples/FEM.pl src/gri_merge src/gri_unpage + GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-FreeBSD -CPE_VENDOR= gri_project - -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib INFO= gri -USE_TEX= formats:build dvipsk:build PORTDOCS= * PORTEXAMPLES= * @@ -49,11 +49,11 @@ post-build: (cd ${WRKSRC}/doc && makeinfo gri.texi) .endif -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: (cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) -.else + +post-install-DOCS-off: ${INSTALL_MAN} ${WRKSRC}/doc/gri-manpage.1 \ ${STAGEDIR}${MANPREFIX}/man/man1/gri.1 ${INSTALL_MAN} ${WRKSRC}/doc/gri_merge.1-skel \ @@ -61,13 +61,12 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/doc/gri_unpage.1-skel \ ${STAGEDIR}${MANPREFIX}/man/man1/gri_unpage.1 ${INSTALL_DATA} ${WRKSRC}/doc/gri.info* ${STAGEDIR}${PREFIX}/${INFO_PATH} -.endif -.if ${PORT_OPTIONS:MEXAMPLES} + +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} model* *.dat *.gri e*.ps \ ${STAGEDIR}${EXAMPLESDIR}) (cd ${WRKSRC}/doc/examples \ && ${INSTALL_SCRIPT} FEM.pl ${STAGEDIR}${EXAMPLESDIR}) -.endif .include diff --git a/math/kalker/Makefile b/math/kalker/Makefile index 9f0bc5a9dd12..8e0682344625 100644 --- a/math/kalker/Makefile +++ b/math/kalker/Makefile @@ -1,7 +1,6 @@ PORTNAME= kalker DISTVERSIONPREFIX= v -DISTVERSION= 2.0.3 -PORTREVISION= 6 +DISTVERSION= 2.0.4 CATEGORIES= math MAINTAINER= ashish@FreeBSD.org @@ -17,74 +16,6 @@ LIB_DEPENDS= libgmp.so:math/gmp \ USES= cargo USE_GITHUB= yes GH_ACCOUNT= PaddiM8 -CARGO_CRATES= aho-corasick-0.7.20 \ - ansi_term-0.12.1 \ - atty-0.2.14 \ - az-1.2.1 \ - bitflags-1.3.2 \ - bumpalo-3.12.0 \ - cc-1.0.78 \ - cfg-if-1.0.0 \ - console_error_panic_hook-0.1.7 \ - dirs-3.0.2 \ - dirs-next-2.0.0 \ - dirs-sys-0.3.7 \ - dirs-sys-next-0.1.2 \ - fs2-0.4.3 \ - getrandom-0.2.8 \ - gmp-mpfr-sys-1.5.0 \ - hermit-abi-0.1.19 \ - js-sys-0.3.60 \ - lazy_static-1.4.0 \ - libc-0.2.139 \ - log-0.4.17 \ - memchr-2.5.0 \ - nix-0.19.1 \ - once_cell-1.17.0 \ - proc-macro2-1.0.50 \ - quote-1.0.23 \ - redox_syscall-0.2.16 \ - redox_users-0.4.3 \ - regex-1.7.1 \ - regex-syntax-0.6.28 \ - rug-1.19.0 \ - rustyline-7.1.0 \ - scoped-tls-1.0.1 \ - scopeguard-1.1.0 \ - seahorse-1.1.2 \ - serde-1.0.152 \ - syn-1.0.107 \ - test-case-1.2.3 \ - thiserror-1.0.38 \ - thiserror-impl-1.0.38 \ - toml-0.5.11 \ - unicode-ident-1.0.6 \ - unicode-segmentation-1.10.0 \ - unicode-width-0.1.10 \ - utf8parse-0.2.0 \ - version_check-0.9.4 \ - wasi-0.11.0+wasi-snapshot-preview1 \ - wasm-bindgen-0.2.83 \ - wasm-bindgen-backend-0.2.83 \ - wasm-bindgen-futures-0.4.33 \ - wasm-bindgen-macro-0.2.83 \ - wasm-bindgen-macro-support-0.2.83 \ - wasm-bindgen-shared-0.2.83 \ - wasm-bindgen-test-0.3.33 \ - wasm-bindgen-test-macro-0.3.33 \ - web-sys-0.3.60 \ - winapi-0.3.9 \ - winapi-i686-pc-windows-gnu-0.4.0 \ - winapi-x86_64-pc-windows-gnu-0.4.0 \ - windows-sys-0.42.0 \ - windows_aarch64_gnullvm-0.42.1 \ - windows_aarch64_msvc-0.42.1 \ - windows_i686_gnu-0.42.1 \ - windows_i686_msvc-0.42.1 \ - windows_x86_64_gnu-0.42.1 \ - windows_x86_64_gnullvm-0.42.1 \ - windows_x86_64_msvc-0.42.1 \ - winres-0.1.12 CARGO_CARGOTOML= ${WRKSRC}/cli/Cargo.toml CARGO_INSTALL_PATH= ./cli PLIST_FILES= bin/kalker diff --git a/math/kalker/Makefile.crates b/math/kalker/Makefile.crates new file mode 100644 index 000000000000..9b227df5afc8 --- /dev/null +++ b/math/kalker/Makefile.crates @@ -0,0 +1,68 @@ +CARGO_CRATES= aho-corasick-0.7.20 \ + ansi_term-0.12.1 \ + atty-0.2.14 \ + az-1.2.1 \ + bitflags-1.3.2 \ + bumpalo-3.12.0 \ + cc-1.0.78 \ + cfg-if-1.0.0 \ + console_error_panic_hook-0.1.7 \ + dirs-3.0.2 \ + dirs-next-2.0.0 \ + dirs-sys-0.3.7 \ + dirs-sys-next-0.1.2 \ + fs2-0.4.3 \ + getrandom-0.2.8 \ + gmp-mpfr-sys-1.5.0 \ + hermit-abi-0.1.19 \ + js-sys-0.3.60 \ + lazy_static-1.4.0 \ + libc-0.2.139 \ + log-0.4.17 \ + memchr-2.5.0 \ + nix-0.19.1 \ + once_cell-1.17.0 \ + proc-macro2-1.0.50 \ + quote-1.0.23 \ + redox_syscall-0.2.16 \ + redox_users-0.4.3 \ + regex-1.7.1 \ + regex-syntax-0.6.28 \ + rug-1.19.0 \ + rustyline-7.1.0 \ + scoped-tls-1.0.1 \ + scopeguard-1.1.0 \ + seahorse-1.1.2 \ + serde-1.0.152 \ + syn-1.0.107 \ + test-case-1.2.3 \ + thiserror-1.0.38 \ + thiserror-impl-1.0.38 \ + toml-0.5.11 \ + unicode-ident-1.0.6 \ + unicode-segmentation-1.10.0 \ + unicode-width-0.1.10 \ + utf8parse-0.2.0 \ + version_check-0.9.4 \ + wasi-0.11.0+wasi-snapshot-preview1 \ + wasm-bindgen-0.2.83 \ + wasm-bindgen-backend-0.2.83 \ + wasm-bindgen-futures-0.4.33 \ + wasm-bindgen-macro-0.2.83 \ + wasm-bindgen-macro-support-0.2.83 \ + wasm-bindgen-shared-0.2.83 \ + wasm-bindgen-test-0.3.33 \ + wasm-bindgen-test-macro-0.3.33 \ + web-sys-0.3.60 \ + winapi-0.3.9 \ + winapi-i686-pc-windows-gnu-0.4.0 \ + winapi-x86_64-pc-windows-gnu-0.4.0 \ + windows-sys-0.42.0 \ + windows_aarch64_gnullvm-0.42.1 \ + windows_aarch64_msvc-0.42.1 \ + windows_i686_gnu-0.42.1 \ + windows_i686_msvc-0.42.1 \ + windows_x86_64_gnu-0.42.1 \ + windows_x86_64_gnullvm-0.42.1 \ + windows_x86_64_msvc-0.42.1 \ + winres-0.1.12 diff --git a/math/kalker/distinfo b/math/kalker/distinfo index 7e44f89c8e46..1e1b4be9a156 100644 --- a/math/kalker/distinfo +++ b/math/kalker/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1674844062 +TIMESTAMP = 1689882974 SHA256 (rust/crates/aho-corasick-0.7.20.crate) = cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac SIZE (rust/crates/aho-corasick-0.7.20.crate) = 111440 SHA256 (rust/crates/ansi_term-0.12.1.crate) = d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2 @@ -135,5 +135,5 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.42.1.crate) = 447660ad36a13288b1db4d42 SIZE (rust/crates/windows_x86_64_msvc-0.42.1.crate) = 664606 SHA256 (rust/crates/winres-0.1.12.crate) = b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c SIZE (rust/crates/winres-0.1.12.crate) = 19772 -SHA256 (PaddiM8-kalker-v2.0.3_GH0.tar.gz) = d2904b5b537a2ec31570f83ac36da0fcf95b0b2957594edf8f07881a067bf8c2 -SIZE (PaddiM8-kalker-v2.0.3_GH0.tar.gz) = 1326318 +SHA256 (PaddiM8-kalker-v2.0.4_GH0.tar.gz) = f9ea40521f8e435adfc5db7f811c63bab7276407c6c0a95a40673f777f57c3bd +SIZE (PaddiM8-kalker-v2.0.4_GH0.tar.gz) = 1331308 diff --git a/math/octave-forge-audio/Makefile b/math/octave-forge-audio/Makefile index 552c86095aab..ae2893d0de67 100644 --- a/math/octave-forge-audio/Makefile +++ b/math/octave-forge-audio/Makefile @@ -1,9 +1,7 @@ PORTNAME= octave-forge-audio -PORTVERSION= 2.0.5 -PORTREVISION= 3 +DISTVERSIONPREFIX= release- +DISTVERSION= 2.0.6 CATEGORIES= math -MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases -DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL} MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} @@ -14,7 +12,12 @@ LICENSE_FILE= ${WRKSRC}/../COPYING LIB_DEPENDS+= librtmidi.so:audio/rtmidi -USES= compiler:c++11-lang octave pkgconfig +USES= compiler:c++11-lang octave pkgconfig autoreconf +USE_GITHUB= yes +GH_ACCOUNT= gnu-octave +GH_PROJECT= octave-audio + +OCTAVE_SRC= ${GH_PROJECT}-release-${DISTVERSION} GNU_CONFIGURE= yes diff --git a/math/octave-forge-audio/distinfo b/math/octave-forge-audio/distinfo index 9ee208b33a7f..35d7f6f6629d 100644 --- a/math/octave-forge-audio/distinfo +++ b/math/octave-forge-audio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658611794 -SHA256 (octave-forge/audio-2.0.5.tar.gz) = ff86a479e3909ef4e593d6a1f9ef1125fc091b612ad870063827a38622148c5e -SIZE (octave-forge/audio-2.0.5.tar.gz) = 480177 +TIMESTAMP = 1689903703 +SHA256 (octave-forge/gnu-octave-octave-audio-release-2.0.6_GH0.tar.gz) = ab42ed7aed5ed7fcd5b1f7a7a35374b6dee994b2e843d7acaca22774529a78fd +SIZE (octave-forge/gnu-octave-octave-audio-release-2.0.6_GH0.tar.gz) = 138614 diff --git a/math/py-qats/Makefile b/math/py-qats/Makefile new file mode 100644 index 000000000000..76c575f2bd2a --- /dev/null +++ b/math/py-qats/Makefile @@ -0,0 +1,36 @@ +PORTNAME= qats +DISTVERSION= 4.11.1 +CATEGORIES= math +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Library for efficient processing and visualization of time series +WWW= https://github.com/dnvgl/qats + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.3:devel/py-setuptools_scm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}QtPy>=1.9.0:devel/py-QtPy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}furo>=2022.12.7:textproc/py-furo@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}myst-parser>=0.18.1:textproc/py-myst-parser@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}npTDMS>=1.1.0:misc/py-npTDMS@${PY_FLAVOR} \ + ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}openpyxl>=3.0.5:textproc/py-openpyxl@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pymatreader>=0.0.24:misc/py-pymatreader@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyside2>=5.15.2:devel/pyside2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=1.7.2:science/py-scipy@${PY_FLAVOR} + +USES= pyqt:5 python +USE_PYTHON= distutils concurrent autoplist pytest +USE_PYQT= pyqt5 + +NO_ARCH= yes + +.include diff --git a/math/py-qats/distinfo b/math/py-qats/distinfo new file mode 100644 index 000000000000..ba36b59e21b9 --- /dev/null +++ b/math/py-qats/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1689899243 +SHA256 (qats-4.11.1.tar.gz) = 63766918714dc71087bf4af4d357eb11ce5dddd910d0dae3421134e91acb7a44 +SIZE (qats-4.11.1.tar.gz) = 51717904 diff --git a/math/py-qats/files/patch-qats_app_gui.py b/math/py-qats/files/patch-qats_app_gui.py new file mode 100644 index 000000000000..92c9af373967 --- /dev/null +++ b/math/py-qats/files/patch-qats_app_gui.py @@ -0,0 +1,11 @@ +--- qats/app/gui.py.orig 2023-01-03 17:37:48 UTC ++++ qats/app/gui.py +@@ -48,7 +48,7 @@ LOGGING_LEVELS = dict( + if sys.platform == "win32": + SETTINGS_FILE = os.path.join(os.getenv("APPDATA", os.getenv("USERPROFILE", "")), "qats.settings") + else: +- SETTINGS_FILE = os.path.join("var", "lib", "qats.settings") ++ SETTINGS_FILE = os.path.join("/home", os.getlogin(), ".config", "qats.settings") + ICON_FILE = resource_filename("qats.app", "qats.ico") + + STATS_ORDER = ["name", "min", "max", "mean", "std", "skew", "kurt", "tz", "wloc", "wscale", "wshape", diff --git a/math/py-qats/files/patch-requirements.txt b/math/py-qats/files/patch-requirements.txt new file mode 100644 index 000000000000..77be16a56eda --- /dev/null +++ b/math/py-qats/files/patch-requirements.txt @@ -0,0 +1,20 @@ +--- requirements.txt.orig 2023-07-21 05:35:07 UTC ++++ requirements.txt +@@ -1,12 +1,12 @@ +-h5py>=3.5.0, <=3.7.0 ++h5py>=3.5.0 + pymatreader==0.0.24 +-matplotlib>=3.3.3, <=3.6 ++matplotlib>=3.3.3 + npTDMS==1.1.0 +-numpy>=1.21.6, <=1.24.* ++numpy>=1.21.6 + openpyxl==3.0.5 +-pandas>=1.1.4, <=1.5 ++pandas>=1.1.4 + QtPy==1.9.0 +-pyside2>=5.15.2, <5.16 ++pyside2>=5.15.2 + PyQt5>=5.15.2, <=5.15.7 + scipy>=1.7.2, <=1.9.2 # in accordance with https://docs.scipy.org/doc/scipy/dev/toolchain.html#numpy + setuptools-scm>=7.1.0, <=8 diff --git a/math/py-qats/files/patch-setup.py b/math/py-qats/files/patch-setup.py new file mode 100644 index 000000000000..ccf1d7d950ae --- /dev/null +++ b/math/py-qats/files/patch-setup.py @@ -0,0 +1,27 @@ +--- setup.py.orig 2023-07-21 05:37:29 UTC ++++ setup.py +@@ -22,15 +22,15 @@ setup( + python_requires=">=3.7, <3.11", + setup_requires=["setuptools_scm"], + install_requires=[ +- "numpy>=1,<2", +- "openpyxl>=3,<4", +- "scipy>=1,<2", +- "matplotlib>=3,<4", +- "npTDMS>=1,<2", +- "h5py>=2.7,<4", +- "QtPy>=1,<2", +- "pandas>=1,<2", +- "pymatreader>=0.0.20,<1", ++ "numpy>=1", ++ "openpyxl>=3", ++ "scipy>=1", ++ "matplotlib>=3", ++ "npTDMS>=1", ++ "h5py>=2.7", ++ "QtPy>=1", ++ "pandas>=1", ++ "pymatreader>=0.0.20", + "pywin32; platform_system == 'Windows'" + ], + entry_points={ diff --git a/math/py-qats/pkg-descr b/math/py-qats/pkg-descr new file mode 100644 index 000000000000..cde244adfe49 --- /dev/null +++ b/math/py-qats/pkg-descr @@ -0,0 +1,20 @@ +QATS is a Python library and GUI for efficient processing and visualization +of time series. + +QATS provides tools for: +* Import and export from/to various pre-defined time series file formats +* Signal processing +* Inferring statistical distributions +* Cycle counting using the Rainflow algorithm + +It was originally created to handle time series files exported from SIMO and +RIFLEX. Now it also handles SIMA hdf5 (.h5) files, Matlab (version < 7.3) +.mat files, CSV files and more. + +QATS also features a GUI which offers efficient and low threshold processing +and visualization of time series. It is perfect for inspecting, comparing and +reporting: +* time series +* power spectral density distributions +* peak and extreme distributions +* cycle distributions diff --git a/math/verdict/Makefile b/math/verdict/Makefile index eac601bda5da..5f74094f09ac 100644 --- a/math/verdict/Makefile +++ b/math/verdict/Makefile @@ -1,5 +1,5 @@ PORTNAME= verdict -PORTVERSION= 1.4.1 +PORTVERSION= 1.4.2 CATEGORIES= math MAINTAINER= thierry@FreeBSD.org diff --git a/math/verdict/distinfo b/math/verdict/distinfo index 42a76268d174..fa73f58cfb62 100644 --- a/math/verdict/distinfo +++ b/math/verdict/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669383936 -SHA256 (sandialabs-verdict-1.4.1_GH0.tar.gz) = 26fa583265cb2ced2e9b30ed26260f6c9f89c3296221d96ccd5e7bfeec219de7 -SIZE (sandialabs-verdict-1.4.1_GH0.tar.gz) = 2193698 +TIMESTAMP = 1689872034 +SHA256 (sandialabs-verdict-1.4.2_GH0.tar.gz) = 225c8c5318f4b02e7215cefa61b5dc3f99e05147ad3fefe6ee5a3ee5b828964b +SIZE (sandialabs-verdict-1.4.2_GH0.tar.gz) = 2195976 diff --git a/math/verdict/pkg-plist b/math/verdict/pkg-plist index ce622d533308..8d1977a532ae 100644 --- a/math/verdict/pkg-plist +++ b/math/verdict/pkg-plist @@ -6,6 +6,6 @@ lib/cmake/verdict/VerdictTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/verdict/VerdictTargets.cmake lib/libverdict.so lib/libverdict.so.1.4 -lib/libverdict.so.1.4.1 +lib/libverdict.so.1.4.2 %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/SAND2007-2853p.pdf diff --git a/misc/Makefile b/misc/Makefile index d4f478cfee4a..2ccb33485131 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -428,6 +428,7 @@ SUBDIR += py-mffpy SUBDIR += py-molequeue SUBDIR += py-mxnet + SUBDIR += py-npTDMS SUBDIR += py-numcodecs SUBDIR += py-onnx SUBDIR += py-onnx-tf @@ -451,8 +452,10 @@ SUBDIR += py-pyct SUBDIR += py-pyfiglet SUBDIR += py-pykml + SUBDIR += py-pymatreader SUBDIR += py-pypatent SUBDIR += py-pyprind + SUBDIR += py-pyqir SUBDIR += py-python-geohash SUBDIR += py-python-utils SUBDIR += py-pytorch @@ -472,6 +475,7 @@ SUBDIR += py-tflearn SUBDIR += py-tflite SUBDIR += py-tflite-support + SUBDIR += py-thermocouples_reference SUBDIR += py-toil SUBDIR += py-torch-geometric SUBDIR += py-torchmetrics diff --git a/misc/py-npTDMS/Makefile b/misc/py-npTDMS/Makefile new file mode 100644 index 000000000000..effb76404917 --- /dev/null +++ b/misc/py-npTDMS/Makefile @@ -0,0 +1,29 @@ +PORTNAME= npTDMS +DISTVERSION= 1.7.0 +CATEGORIES= misc +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= NumPy based module for reading TDMS files produced by LabView +WWW= https://github.com/adamreeve/npTDMS + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= ${PY_SETUPTOOLS} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} # optional +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-benchmark>0:devel/py-pytest-benchmark@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}thermocouples_reference>0:misc/py-thermocouples_reference@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} + +USES= python +USE_PYTHON= pep517 autoplist pytest + +NO_ARCH= yes + +.include diff --git a/misc/py-npTDMS/distinfo b/misc/py-npTDMS/distinfo new file mode 100644 index 000000000000..b966141b1f4b --- /dev/null +++ b/misc/py-npTDMS/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1689904513 +SHA256 (npTDMS-1.7.0.tar.gz) = 2b1c802add05180db2f07a222cd5c3cd9b508441fb24e04438a76fc4ea7bc39c +SIZE (npTDMS-1.7.0.tar.gz) = 176422 diff --git a/misc/py-npTDMS/pkg-descr b/misc/py-npTDMS/pkg-descr new file mode 100644 index 000000000000..01b62f635eb2 --- /dev/null +++ b/misc/py-npTDMS/pkg-descr @@ -0,0 +1,9 @@ +npTDMS is a cross-platform Python package for reading and writing TDMS files +as produced by LabVIEW, and is built on top of the numpy package. Data is read +from TDMS files as numpy arrays, and npTDMS also allows writing numpy arrays +to TDMS files. + +TDMS files are structured in a hierarchy of groups and channels. A TDMS file can +contain multiple groups, which may each contain multiple channels. A file, group +and channel may all have properties associated with them, but only channels have +array data. diff --git a/misc/py-pymatreader/Makefile b/misc/py-pymatreader/Makefile new file mode 100644 index 000000000000..03d32152b84b --- /dev/null +++ b/misc/py-pymatreader/Makefile @@ -0,0 +1,24 @@ +PORTNAME= pymatreader +DISTVERSION= 0.0.32 +CATEGORIES= misc +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Convenient reader for Matlab mat files +WWW= https://gitlab.com/obob/pymatreader + +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ + ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=1.7.0:science/py-scipy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xmltodict>=0:devel/py-xmltodict@${PY_FLAVOR} + +USES= python +USE_PYTHON= distutils autoplist pytest # tests fail to run, see https://gitlab.com/obob/pymatreader/-/issues/20 + +NO_ARCH= yes + +.include diff --git a/misc/py-pymatreader/distinfo b/misc/py-pymatreader/distinfo new file mode 100644 index 000000000000..22c0063684dc --- /dev/null +++ b/misc/py-pymatreader/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1689900077 +SHA256 (pymatreader-0.0.32.tar.gz) = 34a5b4812635c98d3e5776fc21cd7f85b045784539363674d178dfb1158a617f +SIZE (pymatreader-0.0.32.tar.gz) = 7601 diff --git a/misc/py-pymatreader/pkg-descr b/misc/py-pymatreader/pkg-descr new file mode 100644 index 000000000000..d8983a9565b9 --- /dev/null +++ b/misc/py-pymatreader/pkg-descr @@ -0,0 +1,3 @@ +pymatreader is Python module to read Matlab files. This module works with both +the old (< 7.3) and the new (>= 7.3) HDF5 based format. The output should be +the same for both kinds of files. diff --git a/misc/py-pyqir/Makefile b/misc/py-pyqir/Makefile new file mode 100644 index 000000000000..1d744adee5dd --- /dev/null +++ b/misc/py-pyqir/Makefile @@ -0,0 +1,115 @@ +PORTNAME= pyqir +DISTVERSIONPREFIX= v +DISTVERSION= 0.8.2 +CATEGORIES= misc python # quantum-computing +#MASTER_SITES= PYPI # no tarballs +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= PyQIR parses, generates, evaluates Quantum Intermediate Representation +WWW= https://www.qir-alliance.org/pyqir/ + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maturin>0:devel/py-maturin@${PY_FLAVOR} + +USES= cargo gnome llvm:14 localbase:ldflags python +USE_PYTHON= pep517 pytest +USE_GNOME= libxml2 + +WRKSRC_SUBSIR= pyqir + +USE_GITHUB= yes +GH_ACCOUNT= qir-alliance + +CARGO_FEATURES= llvm14-0 +CARGO_CRATES= aho-corasick-0.7.19 \ + autocfg-1.1.0 \ + bitflags-1.3.2 \ + bitvec-1.0.1 \ + cc-1.0.76 \ + cfg-if-1.0.0 \ + cmake-0.1.49 \ + const-str-0.5.3 \ + dashmap-5.4.0 \ + error-chain-0.10.0 \ + funty-2.0.0 \ + futures-0.3.25 \ + futures-channel-0.3.25 \ + futures-core-0.3.25 \ + futures-executor-0.3.25 \ + futures-io-0.3.25 \ + futures-sink-0.3.25 \ + futures-task-0.3.25 \ + futures-util-0.3.25 \ + hashbrown-0.12.3 \ + indoc-1.0.7 \ + lazy_static-1.4.0 \ + libc-0.2.137 \ + llvm-sys-110.0.4 \ + llvm-sys-120.2.5 \ + llvm-sys-130.0.5 \ + llvm-sys-140.0.3 \ + lock_api-0.4.9 \ + log-0.4.17 \ + memchr-2.5.0 \ + memoffset-0.6.5 \ + mut_static-5.0.0 \ + normalize-line-endings-0.3.0 \ + once_cell-1.16.0 \ + parking_lot-0.12.1 \ + parking_lot_core-0.9.4 \ + pest-2.4.1 \ + pin-project-lite-0.2.9 \ + pin-utils-0.1.0 \ + proc-macro-error-1.0.4 \ + proc-macro-error-attr-1.0.4 \ + proc-macro2-1.0.47 \ + pyo3-0.17.3 \ + pyo3-build-config-0.17.3 \ + pyo3-ffi-0.17.3 \ + pyo3-macros-0.17.3 \ + pyo3-macros-backend-0.17.3 \ + quote-1.0.21 \ + radium-0.7.0 \ + redox_syscall-0.2.16 \ + regex-1.7.0 \ + regex-syntax-0.6.28 \ + scopeguard-1.1.0 \ + semver-0.11.0 \ + semver-1.0.14 \ + semver-parser-0.10.2 \ + serial_test-0.9.0 \ + serial_test_derive-0.9.0 \ + slab-0.4.7 \ + smallvec-1.10.0 \ + syn-1.0.103 \ + tap-1.0.1 \ + target-lexicon-0.12.5 \ + thiserror-1.0.37 \ + thiserror-impl-1.0.37 \ + ucd-trie-0.1.5 \ + unicode-ident-1.0.5 \ + unindent-0.1.10 \ + version_check-0.9.4 \ + windows-sys-0.42.0 \ + windows_aarch64_gnullvm-0.42.0 \ + windows_aarch64_msvc-0.42.0 \ + windows_i686_gnu-0.42.0 \ + windows_i686_msvc-0.42.0 \ + windows_x86_64_gnu-0.42.0 \ + windows_x86_64_gnullvm-0.42.0 \ + windows_x86_64_msvc-0.42.0 \ + wyz-0.5.0 + +MAKE_ENV= LLVM_SYS_140_PREFIX=${LLVM_PREFIX} + +TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + +do-install: + ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} + ${INSTALL_LIB} ${WRKDIR}/target/*-unknown-freebsd/release/libpyqir.so ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/_native.abi3.so + ${INSTALL_DATA} ${WRKSRC}/pyqir/pyqir/*.py ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} + +.include diff --git a/misc/py-pyqir/distinfo b/misc/py-pyqir/distinfo new file mode 100644 index 000000000000..46cc6b64532f --- /dev/null +++ b/misc/py-pyqir/distinfo @@ -0,0 +1,159 @@ +TIMESTAMP = 1689834318 +SHA256 (rust/crates/aho-corasick-0.7.19.crate) = b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e +SIZE (rust/crates/aho-corasick-0.7.19.crate) = 113070 +SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa +SIZE (rust/crates/autocfg-1.1.0.crate) = 13272 +SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a +SIZE (rust/crates/bitflags-1.3.2.crate) = 23021 +SHA256 (rust/crates/bitvec-1.0.1.crate) = 1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c +SIZE (rust/crates/bitvec-1.0.1.crate) = 224375 +SHA256 (rust/crates/cc-1.0.76.crate) = 76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f +SIZE (rust/crates/cc-1.0.76.crate) = 60132 +SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd +SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 +SHA256 (rust/crates/cmake-0.1.49.crate) = db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c +SIZE (rust/crates/cmake-0.1.49.crate) = 16717 +SHA256 (rust/crates/const-str-0.5.3.crate) = a5bc011a04793b8ce7bca0efd59e3697c2061760df6efbb8c895e8a81548db67 +SIZE (rust/crates/const-str-0.5.3.crate) = 25252 +SHA256 (rust/crates/dashmap-5.4.0.crate) = 907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc +SIZE (rust/crates/dashmap-5.4.0.crate) = 22862 +SHA256 (rust/crates/error-chain-0.10.0.crate) = d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8 +SIZE (rust/crates/error-chain-0.10.0.crate) = 18432 +SHA256 (rust/crates/funty-2.0.0.crate) = e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c +SIZE (rust/crates/funty-2.0.0.crate) = 13160 +SHA256 (rust/crates/futures-0.3.25.crate) = 38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0 +SIZE (rust/crates/futures-0.3.25.crate) = 51664 +SHA256 (rust/crates/futures-channel-0.3.25.crate) = 52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed +SIZE (rust/crates/futures-channel-0.3.25.crate) = 31974 +SHA256 (rust/crates/futures-core-0.3.25.crate) = 04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac +SIZE (rust/crates/futures-core-0.3.25.crate) = 14623 +SHA256 (rust/crates/futures-executor-0.3.25.crate) = 7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2 +SIZE (rust/crates/futures-executor-0.3.25.crate) = 17744 +SHA256 (rust/crates/futures-io-0.3.25.crate) = 00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb +SIZE (rust/crates/futures-io-0.3.25.crate) = 8911 +SHA256 (rust/crates/futures-sink-0.3.25.crate) = 39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9 +SIZE (rust/crates/futures-sink-0.3.25.crate) = 7854 +SHA256 (rust/crates/futures-task-0.3.25.crate) = 2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea +SIZE (rust/crates/futures-task-0.3.25.crate) = 11844 +SHA256 (rust/crates/futures-util-0.3.25.crate) = 197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6 +SIZE (rust/crates/futures-util-0.3.25.crate) = 155866 +SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888 +SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968 +SHA256 (rust/crates/indoc-1.0.7.crate) = adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3 +SIZE (rust/crates/indoc-1.0.7.crate) = 13716 +SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 +SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443 +SHA256 (rust/crates/libc-0.2.137.crate) = fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89 +SIZE (rust/crates/libc-0.2.137.crate) = 606185 +SHA256 (rust/crates/llvm-sys-110.0.4.crate) = 7abad6f4c44960941ebd7d26b97719f9b8dba379f971b48de919d03462527c3d +SIZE (rust/crates/llvm-sys-110.0.4.crate) = 47752 +SHA256 (rust/crates/llvm-sys-120.2.5.crate) = a1c9655eec036faf512507746ce70765bda72ed98e52b4328f0d7b93e970c6d8 +SIZE (rust/crates/llvm-sys-120.2.5.crate) = 48396 +SHA256 (rust/crates/llvm-sys-130.0.5.crate) = 7e12061782e78da1f5e5f7f758dcdda04bc97af90e8e55bef5f56f1162759ffc +SIZE (rust/crates/llvm-sys-130.0.5.crate) = 50967 +SHA256 (rust/crates/llvm-sys-140.0.3.crate) = 8b9eda9cc6f86672152125b1e112d66ab8797b7917fb202e2faee912caa76413 +SIZE (rust/crates/llvm-sys-140.0.3.crate) = 50867 +SHA256 (rust/crates/lock_api-0.4.9.crate) = 435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df +SIZE (rust/crates/lock_api-0.4.9.crate) = 25685 +SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e +SIZE (rust/crates/log-0.4.17.crate) = 38028 +SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d +SIZE (rust/crates/memchr-2.5.0.crate) = 65812 +SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce +SIZE (rust/crates/memoffset-0.6.5.crate) = 7686 +SHA256 (rust/crates/mut_static-5.0.0.crate) = 248cd8eb389a4e3618bba47c9a171a4bbb271c29c07e03c4ff4ff74946336f66 +SIZE (rust/crates/mut_static-5.0.0.crate) = 3038 +SHA256 (rust/crates/normalize-line-endings-0.3.0.crate) = 61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be +SIZE (rust/crates/normalize-line-endings-0.3.0.crate) = 5737 +SHA256 (rust/crates/once_cell-1.16.0.crate) = 86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860 +SIZE (rust/crates/once_cell-1.16.0.crate) = 32120 +SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f +SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967 +SHA256 (rust/crates/parking_lot_core-0.9.4.crate) = 4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0 +SIZE (rust/crates/parking_lot_core-0.9.4.crate) = 32359 +SHA256 (rust/crates/pest-2.4.1.crate) = a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8 +SIZE (rust/crates/pest-2.4.1.crate) = 93863 +SHA256 (rust/crates/pin-project-lite-0.2.9.crate) = e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116 +SIZE (rust/crates/pin-project-lite-0.2.9.crate) = 27713 +SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184 +SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580 +SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c +SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293 +SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869 +SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971 +SHA256 (rust/crates/proc-macro2-1.0.47.crate) = 5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725 +SIZE (rust/crates/proc-macro2-1.0.47.crate) = 41955 +SHA256 (rust/crates/pyo3-0.17.3.crate) = 268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543 +SIZE (rust/crates/pyo3-0.17.3.crate) = 408939 +SHA256 (rust/crates/pyo3-build-config-0.17.3.crate) = 28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8 +SIZE (rust/crates/pyo3-build-config-0.17.3.crate) = 29230 +SHA256 (rust/crates/pyo3-ffi-0.17.3.crate) = 0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc +SIZE (rust/crates/pyo3-ffi-0.17.3.crate) = 62854 +SHA256 (rust/crates/pyo3-macros-0.17.3.crate) = 94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28 +SIZE (rust/crates/pyo3-macros-0.17.3.crate) = 7257 +SHA256 (rust/crates/pyo3-macros-backend-0.17.3.crate) = c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f +SIZE (rust/crates/pyo3-macros-backend-0.17.3.crate) = 49992 +SHA256 (rust/crates/quote-1.0.21.crate) = bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179 +SIZE (rust/crates/quote-1.0.21.crate) = 28030 +SHA256 (rust/crates/radium-0.7.0.crate) = dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09 +SIZE (rust/crates/radium-0.7.0.crate) = 10906 +SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a +SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012 +SHA256 (rust/crates/regex-1.7.0.crate) = e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a +SIZE (rust/crates/regex-1.7.0.crate) = 239421 +SHA256 (rust/crates/regex-syntax-0.6.28.crate) = 456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848 +SIZE (rust/crates/regex-syntax-0.6.28.crate) = 299288 +SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd +SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470 +SHA256 (rust/crates/semver-0.11.0.crate) = f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6 +SIZE (rust/crates/semver-0.11.0.crate) = 20826 +SHA256 (rust/crates/semver-1.0.14.crate) = e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4 +SIZE (rust/crates/semver-1.0.14.crate) = 29813 +SHA256 (rust/crates/semver-parser-0.10.2.crate) = 00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7 +SIZE (rust/crates/semver-parser-0.10.2.crate) = 23176 +SHA256 (rust/crates/serial_test-0.9.0.crate) = 92761393ee4dc3ff8f4af487bd58f4307c9329bbedea02cac0089ad9c411e153 +SIZE (rust/crates/serial_test-0.9.0.crate) = 8396 +SHA256 (rust/crates/serial_test_derive-0.9.0.crate) = 4b6f5d1c3087fb119617cff2966fe3808a80e5eb59a8c1601d5994d66f4346a5 +SIZE (rust/crates/serial_test_derive-0.9.0.crate) = 6944 +SHA256 (rust/crates/slab-0.4.7.crate) = 4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef +SIZE (rust/crates/slab-0.4.7.crate) = 16647 +SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0 +SIZE (rust/crates/smallvec-1.10.0.crate) = 31564 +SHA256 (rust/crates/syn-1.0.103.crate) = a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d +SIZE (rust/crates/syn-1.0.103.crate) = 236495 +SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369 +SIZE (rust/crates/tap-1.0.1.crate) = 11316 +SHA256 (rust/crates/target-lexicon-0.12.5.crate) = 9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d +SIZE (rust/crates/target-lexicon-0.12.5.crate) = 23224 +SHA256 (rust/crates/thiserror-1.0.37.crate) = 10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e +SIZE (rust/crates/thiserror-1.0.37.crate) = 18752 +SHA256 (rust/crates/thiserror-impl-1.0.37.crate) = 982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb +SIZE (rust/crates/thiserror-impl-1.0.37.crate) = 15428 +SHA256 (rust/crates/ucd-trie-0.1.5.crate) = 9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81 +SIZE (rust/crates/ucd-trie-0.1.5.crate) = 45391 +SHA256 (rust/crates/unicode-ident-1.0.5.crate) = 6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3 +SIZE (rust/crates/unicode-ident-1.0.5.crate) = 35455 +SHA256 (rust/crates/unindent-0.1.10.crate) = 58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112 +SIZE (rust/crates/unindent-0.1.10.crate) = 7703 +SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f +SIZE (rust/crates/version_check-0.9.4.crate) = 14895 +SHA256 (rust/crates/windows-sys-0.42.0.crate) = 5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7 +SIZE (rust/crates/windows-sys-0.42.0.crate) = 3006791 +SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.0.crate) = 41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e +SIZE (rust/crates/windows_aarch64_gnullvm-0.42.0.crate) = 357917 +SHA256 (rust/crates/windows_aarch64_msvc-0.42.0.crate) = dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4 +SIZE (rust/crates/windows_aarch64_msvc-0.42.0.crate) = 659424 +SHA256 (rust/crates/windows_i686_gnu-0.42.0.crate) = fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7 +SIZE (rust/crates/windows_i686_gnu-0.42.0.crate) = 728570 +SHA256 (rust/crates/windows_i686_msvc-0.42.0.crate) = 84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246 +SIZE (rust/crates/windows_i686_msvc-0.42.0.crate) = 717477 +SHA256 (rust/crates/windows_x86_64_gnu-0.42.0.crate) = bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed +SIZE (rust/crates/windows_x86_64_gnu-0.42.0.crate) = 692493 +SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.0.crate) = 09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028 +SIZE (rust/crates/windows_x86_64_gnullvm-0.42.0.crate) = 357906 +SHA256 (rust/crates/windows_x86_64_msvc-0.42.0.crate) = f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5 +SIZE (rust/crates/windows_x86_64_msvc-0.42.0.crate) = 659377 +SHA256 (rust/crates/wyz-0.5.0.crate) = 30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e +SIZE (rust/crates/wyz-0.5.0.crate) = 18578 +SHA256 (qir-alliance-pyqir-v0.8.2_GH0.tar.gz) = bdbef3162cf0914cf94009bd82814ac5aa8f668fb267b670003c881d6ff3a690 +SIZE (qir-alliance-pyqir-v0.8.2_GH0.tar.gz) = 142074 diff --git a/misc/py-pyqir/pkg-descr b/misc/py-pyqir/pkg-descr new file mode 100644 index 000000000000..cacf9c57568e --- /dev/null +++ b/misc/py-pyqir/pkg-descr @@ -0,0 +1,2 @@ +PyQIR is a set of APIs for generating, parsing, and evaluating +Quantum Intermediate Representation (QIR). diff --git a/misc/py-pyqir/pkg-plist b/misc/py-pyqir/pkg-plist new file mode 100644 index 000000000000..95aefa391fe6 --- /dev/null +++ b/misc/py-pyqir/pkg-plist @@ -0,0 +1,6 @@ +%%PYTHON_SITELIBDIR%%/pyqir/__init__.py +%%PYTHON_SITELIBDIR%%/pyqir/_basicqis.py +%%PYTHON_SITELIBDIR%%/pyqir/_native.abi3.so +%%PYTHON_SITELIBDIR%%/pyqir/_simple.py +%%PYTHON_SITELIBDIR%%/pyqir/qis.py +%%PYTHON_SITELIBDIR%%/pyqir/rt.py diff --git a/misc/py-thermocouples_reference/Makefile b/misc/py-thermocouples_reference/Makefile new file mode 100644 index 000000000000..70d4b8ff867e --- /dev/null +++ b/misc/py-thermocouples_reference/Makefile @@ -0,0 +1,27 @@ +PORTNAME= thermocouples_reference +DISTVERSION= 0.20 +CATEGORIES= misc +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Thermocouple emf reference functions +WWW= https://pypi.org/project/thermocouples_reference/ + +LICENSE= PD + +#BUILD_DEPENDS= ${PY_SETUPTOOLS} +RUN_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} + +USES= python +USE_PYTHON= distutils autoplist pytest + +NO_ARCH= yes + +TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + +do-test: + @${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/test.py + +.include diff --git a/misc/py-thermocouples_reference/distinfo b/misc/py-thermocouples_reference/distinfo new file mode 100644 index 000000000000..2275128e3c26 --- /dev/null +++ b/misc/py-thermocouples_reference/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1689906306 +SHA256 (thermocouples_reference-0.20.tar.gz) = 94dd18ce6d44e92fffafbb0caf4ed2452efbc31a763850ff439929717f0f4f84 +SIZE (thermocouples_reference-0.20.tar.gz) = 17107 diff --git a/misc/py-thermocouples_reference/files/test.py b/misc/py-thermocouples_reference/files/test.py new file mode 100644 index 000000000000..d92aadd7ceb6 --- /dev/null +++ b/misc/py-thermocouples_reference/files/test.py @@ -0,0 +1,10 @@ +from thermocouples_reference import thermocouples + +typeK = thermocouples['K'] +print(f"typeK={typeK}") + +t1 = typeK.emf_mVC(42, Tref=0) +print(f"t1={t1}") + +t2 = typeK.emf_mVC([-3.14159, 42, 54], Tref=0) +print(f"t2={t2}") diff --git a/misc/py-thermocouples_reference/pkg-descr b/misc/py-thermocouples_reference/pkg-descr new file mode 100644 index 000000000000..288f27b513db --- /dev/null +++ b/misc/py-thermocouples_reference/pkg-descr @@ -0,0 +1,3 @@ +Python module containing calibration data and lookup functions for standard +thermocouples of types B, C, D, E, G, J, K, M, N, P, R, S, T, and some less +standard types too. diff --git a/net-mgmt/cdpd/Makefile b/net-mgmt/cdpd/Makefile index d444df72d2f4..a5f407016833 100644 --- a/net-mgmt/cdpd/Makefile +++ b/net-mgmt/cdpd/Makefile @@ -4,7 +4,7 @@ PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= http://snar.spb.ru/prog/cdpd/ -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Daemon to send CDP/LLDP announces over ethernet LICENSE= BSD2CLAUSE diff --git a/net-mgmt/devmon-templates/Makefile b/net-mgmt/devmon-templates/Makefile index 07b23bb73759..6325611069ce 100644 --- a/net-mgmt/devmon-templates/Makefile +++ b/net-mgmt/devmon-templates/Makefile @@ -3,7 +3,7 @@ DISTVERSION= 20080206 CATEGORIES= net-mgmt MASTER_SITES= SF/devmon/${PORTNAME}/templates/ -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Device templates for use with devmon WWW= http://devmon.sourceforge.net/ diff --git a/net-mgmt/devmon/Makefile b/net-mgmt/devmon/Makefile index ee1403131a78..9bc9c049e643 100644 --- a/net-mgmt/devmon/Makefile +++ b/net-mgmt/devmon/Makefile @@ -4,7 +4,7 @@ PORTREVISION= 4 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Device monitoring addition to Xymon/Hobbit/BigBrother WWW= http://devmon.sourceforge.net/ diff --git a/net-mgmt/metronome/Makefile b/net-mgmt/metronome/Makefile index 0d87faa828a8..df85123ff01b 100644 --- a/net-mgmt/metronome/Makefile +++ b/net-mgmt/metronome/Makefile @@ -1,6 +1,6 @@ PORTNAME= metronome DISTVERSION= 0.9.0 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= net-mgmt dns MAINTAINER= krion@FreeBSD.org diff --git a/net-mgmt/metronome/files/patch-iputils.hh b/net-mgmt/metronome/files/patch-iputils.hh new file mode 100644 index 000000000000..4f23138c8ca1 --- /dev/null +++ b/net-mgmt/metronome/files/patch-iputils.hh @@ -0,0 +1,11 @@ +--- iputils.hh.orig 2023-07-20 17:03:02 UTC ++++ iputils.hh +@@ -89,7 +89,7 @@ union ComboAddress { + return memcmp(&sin6.sin6_addr.s6_addr, &rhs.sin6.sin6_addr.s6_addr, 16) > 0; + } + +- struct addressOnlyLessThan: public std::binary_function ++ struct addressOnlyLessThan: public std::__binary_function + { + bool operator()(const ComboAddress& a, const ComboAddress& b) const + { diff --git a/net/afpfs-ng/Makefile b/net/afpfs-ng/Makefile index 0476ef54e02d..8e62727d885a 100644 --- a/net/afpfs-ng/Makefile +++ b/net/afpfs-ng/Makefile @@ -10,29 +10,30 @@ WWW= https://sourceforge.net/projects/afpfs-ng/ LICENSE= GPLv2 +USES= autoreconf gmake iconv libtool localbase readline shebangfix tar:bzip2 +USE_LDCONFIG= yes + +SHEBANG_FILES= fuse/afpfs + GNU_CONFIGURE= yes + INSTALL_TARGET= install-strip -USES= autoreconf gmake iconv libtool readline tar:bzip2 -USE_LDCONFIG= yes CFLAGS+= -Wno-return-type -CPPFLAGS+= -D_FILE_OFFSET_BITS=64 -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib +CPPFLAGS+= -D_FILE_OFFSET_BITS=64 OPTIONS_DEFINE= FUSE GCRYPT +OPTIONS_SUB= yes FUSE_LIB_DEPENDS= libfuse.so:sysutils/fusefs-libs FUSE_CONFIGURE_ENABLE= fuse - GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt GCRYPT_CONFIGURE_ENABLE=gcrypt .include -.if ${PORT_OPTIONS:MFUSE} -PLIST_FILES+= bin/afp_client bin/afpfs bin/afpfsd bin/mount_afp \ - man/man1/afp_client.1.gz man/man1/afpfsd.1.gz \ - man/man1/mount_afp.1.gz +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif post-configure: diff --git a/net/afpfs-ng/pkg-plist b/net/afpfs-ng/pkg-plist index 6b69d6e01c9e..80206ca93609 100644 --- a/net/afpfs-ng/pkg-plist +++ b/net/afpfs-ng/pkg-plist @@ -1,17 +1,24 @@ -lib/libafpclient.a -lib/libafpclient.so -lib/libafpclient.so.0 -lib/libafpclient.so.0.0.0 +%%FUSE%%bin/afp_client bin/afpcmd +%%FUSE%%bin/afpfs +%%FUSE%%bin/afpfsd bin/afpgetstatus -include/afpfs-ng/dsi.h +%%FUSE%%bin/mount_afp +include/afpfs-ng/afp.h include/afpfs-ng/afp_protocol.h -include/afpfs-ng/map_def.h include/afpfs-ng/codepage.h -include/afpfs-ng/midlevel.h +include/afpfs-ng/dsi.h include/afpfs-ng/libafpclient.h +include/afpfs-ng/map_def.h +include/afpfs-ng/midlevel.h include/afpfs-ng/uams_def.h -include/afpfs-ng/afp.h include/afpfs-ng/utils.h +lib/libafpclient.a +lib/libafpclient.so +lib/libafpclient.so.0 +lib/libafpclient.so.0.0.0 +%%FUSE%%man/man1/afp_client.1.gz man/man1/afpcmd.1.gz +%%FUSE%%man/man1/afpfsd.1.gz man/man1/afpgetstatus.1.gz +%%FUSE%%man/man1/mount_afp.1.gz diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile index 1847b5f4cf35..b708994f1937 100644 --- a/net/asterisk18/Makefile +++ b/net/asterisk18/Makefile @@ -1,5 +1,5 @@ PORTNAME= asterisk -PORTVERSION= 18.18.1 +PORTVERSION= 18.19.0 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ diff --git a/net/asterisk18/distinfo b/net/asterisk18/distinfo index f464b13666c9..6af5b928737f 100644 --- a/net/asterisk18/distinfo +++ b/net/asterisk18/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1688847548 -SHA256 (asterisk/asterisk-18.18.1.tar.gz) = d68b46512d0c321c83b8305184122a3c9bf7476b1f9385359533e590599dc9cb -SIZE (asterisk/asterisk-18.18.1.tar.gz) = 28407009 +TIMESTAMP = 1689884549 +SHA256 (asterisk/asterisk-18.19.0.tar.gz) = c7f87f7eafc87c8623efbb0ef4c26c8af5de1449fdd9c64dc6b035c6ddeb9afc +SIZE (asterisk/asterisk-18.19.0.tar.gz) = 28421253 SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9 SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123 SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585 diff --git a/net/mptsd/Makefile b/net/mptsd/Makefile index 798d9f62ba85..178cbe950052 100644 --- a/net/mptsd/Makefile +++ b/net/mptsd/Makefile @@ -18,6 +18,12 @@ GH_PROJECT= mptsd GH_TUPLE= gfto:libfuncs:0dc8d87080badd7a276316ad7ae6e6f1aed2331b:libfuncs/libfuncs \ gfto:libtsfuncs:45e7e999a17c1954915295bd13b242bbd937cf28:libtsfuncs/libtsfuncs +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${ETCDIR} diff --git a/net/ntimed/Makefile b/net/ntimed/Makefile index 7d74b7dbae9c..3f31bc8a9822 100644 --- a/net/ntimed/Makefile +++ b/net/ntimed/Makefile @@ -3,7 +3,7 @@ PORTVERSION= 0.0.2015.01.30 PORTREVISION= 1 CATEGORIES= net -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Network time synchronization client WWW= https://github.com/bsdphk/Ntimed diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile index ce462cf73082..f8fe592c6709 100644 --- a/science/gromacs/Makefile +++ b/science/gromacs/Makefile @@ -1,5 +1,6 @@ PORTNAME= gromacs DISTVERSION= 2023.2 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= ftp://ftp.gromacs.org/pub/gromacs/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # only for googletest @@ -14,9 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_i386= undefined reference to `__atomic_load' and `__atomic_compare_exchange' #` BUILD_DEPENDS= boost-libs>=1.44:devel/boost-libs -LIB_DEPENDS= libhwloc.so:devel/hwloc2 -USES= cmake compiler:c++17-lang gnome perl5 pkgconfig python:build shebangfix xorg +USES= cmake compiler:c++17-lang gnome perl5 pkgconfig python:build shebangfix USE_GNOME= libxml2 USE_LDCONFIG= yes @@ -28,14 +28,16 @@ bash_CMD= ${SH} CMAKE_OFF= GMX_USE_RDTSCP \ USE_PYTHON_SCRIPTS -CMAKE_ARGS= -DPython3_EXECUTABLE=${PYTHON_CMD} +CMAKE_ARGS= -DPython_EXECUTABLE=${PYTHON_CMD} \ + -DPython3_EXECUTABLE=${PYTHON_CMD} TEST_TARGET= check -OPTIONS_DEFINE= ATLAS FLOAT LEGACY OPENCL OPENMP SIMD X11 -OPTIONS_SINGLE= MP +OPTIONS_DEFINE= ATLAS FLOAT HWLOC LEGACY OPENMP SIMD +OPTIONS_SINGLE= MP OPENCL OPTIONS_SINGLE_MP= NOMP MPICH OPENMPI THREAD_MPI -OPTIONS_DEFAULT= LEGACY OPENMP THREAD_MPI X11 # FLOAT should not be a default because science/votca needs double precision. This is likely the same for many other uses. +OPTIONS_SINGLE_OPENCL= OPENCL_NONE OPENCL_ICD OPENCL_SYCL +OPTIONS_DEFAULT= HWLOC LEGACY OPENCL_NONE OPENMP THREAD_MPI # FLOAT should not be a default because science/votca needs double precision. This is likely the same for many other uses. OPTIONS_SUB= yes ATLAS_DESC= Use ATLAS for BLAS and LAPACK @@ -55,21 +57,33 @@ FLOAT_CMAKE_OFF= -DGMX_DOUBLE:BOOL=ON FLOAT_PLIST_SUB= SUFFIX_D="" FLOAT_PLIST_SUB_OFF= SUFFIX_D="_d" +HWLOC_DESC= Build with HWLOC2, portable hardware locality package +HWLOC_CMAKE_BOOL= GMX_HWLOC +HWLOC_LIB_DEPENDS= libhwloc.so:devel/hwloc2 + LEGACY_DESC= Install legacy API # expected by science/votca LEGACY_CMAKE_BOOL= GMX_INSTALL_LEGACY_API -OPENCL_CMAKE_BOOL= GMX_USE_OPENCL -OPENCL_CMAKE_ON= -DGMX_GPU:STRING=OpenCL # one of: OFF, CUDA, OpenCL, SYCL -OPENCL_CMAKE_OFF= -DGMX_GPU:STRING=OFF -OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd +OPENCL_NONE_DESC= No OpenCL +OPENCL_NONE_CMAKE_ON= -DGMX_GPU:STRING=OFF # one of: OFF, CUDA, OpenCL, SYCL -OPENMP_CMAKE_ON= -DGMX_CXX11:BOOL=OFF -OPENMP_CMAKE_OFF= -DGMX_OPENMP:BOOL=OFF +OPENCL_ICD_DESC= OpenCL via Installable Client Driver +OPENCL_ICD_CMAKE_ON= -DGMX_GPU:STRING=OpenCL -DGMX_GPU:STRING=OpenCL +OPENCL_ICD_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd \ + libclFFT.so:math/clfft +OPENCL_ICD_IMPLIES= FLOAT -SIMD_CMAKE_OFF= -DGMX_SIMD:STRING="None" +OPENCL_SYCL_DESC= OpenCL via the OpenSYCL implementation of SYCL +OPENCL_SYCL_USES= localbase +OPENCL_SYCL_CMAKE_ON= -DGMX_GPU:STRING=OpenCL -DGMX_GPU:STRING=SYCL -DGMX_SYCL_HIPSYCL=ON +OPENCL_SYCL_LIB_DEPENDS= libhipSYCL-rt.so:lang/opensycl +OPENCL_SYCL_IMPLIES= FLOAT +OPENCL_SYCL_BROKEN= configure uses a wrong namespace to find CYCL, see https://gitlab.com/gromacs/gromacs/-/issues/4838 -X11_USE= XORG=ice,sm,xext,x11 -X11_CMAKE_BOOL= GMX_X11 +OPENMP_CMAKE_BOOL= GMX_OPENMP + +SIMD_CMAKE_OFF= -DGMX_SIMD:STRING="None" +SIMD_CMAKE_ON= -DGMX_SIMD:STRING="AUTO" MP_DESC= Multiprocessing diff --git a/science/gromacs/pkg-plist b/science/gromacs/pkg-plist index 0cb8e4801e7b..131720261d2b 100644 --- a/science/gromacs/pkg-plist +++ b/science/gromacs/pkg-plist @@ -175,16 +175,22 @@ share/cmake/gromacs%%SUFFIX_D%%/libgromacs.cmake %%DATADIR%%/COPYING %%DATADIR%%/README.tutor %%DATADIR%%/README_FreeEnergyModifications.txt -%%OPENCL%%%%DATADIR%%/opencl/nbnxn_ocl_kernel_amd.clh -%%OPENCL%%%%DATADIR%%/opencl/nbnxn_ocl_kernel_nowarp.clh -%%OPENCL%%%%DATADIR%%/opencl/nbnxn_ocl_kernel_nvidia.clh -%%OPENCL%%%%DATADIR%%/opencl/nbnxn_ocl_kernel_pruneonly.clh -%%OPENCL%%%%DATADIR%%/opencl/nbnxn_ocl_kernel_utils.clh -%%OPENCL%%%%DATADIR%%/opencl/nbnxn_ocl_kernels.cl -%%OPENCL%%%%DATADIR%%/opencl/nbnxn_ocl_kernels.clh -%%OPENCL%%%%DATADIR%%/opencl/nbnxn_ocl_kernels_fastgen.clh -%%OPENCL%%%%DATADIR%%/opencl/nbnxn_ocl_kernels_fastgen_add_twincut.clh -%%OPENCL%%%%DATADIR%%/opencl/vectype_ops.clh +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/ewald/pme_gather.clh +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/ewald/pme_gpu_calculate_splines.clh +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/ewald/pme_gpu_types.h +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/ewald/pme_program.cl +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/ewald/pme_solve.clh +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/ewald/pme_spread.clh +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/gpu_utils/device_utils.clh +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/gpu_utils/vectype_ops.clh +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/nbnxm/opencl/nbnxm_ocl_consts.h +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/nbnxm/opencl/nbnxm_ocl_kernel.clh +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/nbnxm/opencl/nbnxm_ocl_kernel_pruneonly.clh +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/nbnxm/opencl/nbnxm_ocl_kernel_utils.clh +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/nbnxm/opencl/nbnxm_ocl_kernels.cl +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/nbnxm/opencl/nbnxm_ocl_kernels.clh +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/nbnxm/opencl/nbnxm_ocl_kernels_fastgen.clh +%%OPENCL_ICD%%%%DATADIR%%/opencl/gromacs/nbnxm/opencl/nbnxm_ocl_kernels_fastgen_add_twincut.clh %%LEGACY%%%%DATADIR%%/template/CMakeLists.txt %%LEGACY%%%%DATADIR%%/template/Makefile.pkg %%LEGACY%%%%DATADIR%%/template/README diff --git a/science/mbdyn/Makefile b/science/mbdyn/Makefile index f95b130809cd..7f34c109bcb3 100644 --- a/science/mbdyn/Makefile +++ b/science/mbdyn/Makefile @@ -11,7 +11,7 @@ WWW= https://www.mbdyn.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_powerpc= Does not compile on powerpc +BROKEN_powerpc= does not compile on powerpc BUILD_DEPENDS= libatomic_ops>0:devel/libatomic_ops LIB_DEPENDS= libltdl.so:devel/libltdl \ @@ -20,6 +20,7 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ USES= compiler:c++11-lib fortran gmake libtool:build localbase USE_LDCONFIG= yes +USE_CXXSTD= c++14 # fix build breakage with clang16 due to use of deprecated feature 'dynamic exception specifications', see https://public.gitlab.polimi.it/DAER/mbdyn/-/issues/339 CPPFLAGS+= -fpermissive -I${LOCALBASE}/include/suitesparse diff --git a/science/openbabel/Makefile b/science/openbabel/Makefile index 4f423feebcaf..1cde3a122d32 100644 --- a/science/openbabel/Makefile +++ b/science/openbabel/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libmaeparser.so:science/maeparser \ CONFLICTS_INSTALL= babel USES= cmake:testing compiler:c++11-lang eigen:3 gnome pkgconfig tar:bz2 -USE_CXXSTD= gnu++98 +USE_CXXSTD= c++11 USE_GNOME= libxml2 USE_LDCONFIG= yes USE_GITHUB= yes # temporary diff --git a/science/simlib/Makefile b/science/simlib/Makefile index a9aab480172a..a6a5f4633a4b 100644 --- a/science/simlib/Makefile +++ b/science/simlib/Makefile @@ -10,16 +10,17 @@ WWW= https://www.fit.vutbr.cz/~peringer/SIMLIB/index.html.en LICENSE= LGPL20 +BROKEN_riscv64= fails to compile: process.cc:53:3: module process.cc is not ported to this processor architecture +NOT_FOR_ARCHS= aarch64 armv6 armv7 mips mips64 powerpc powerpc64 sparc64 +NOT_FOR_ARCHS_REASON= contains not working ${ARCH}-dependent assembly code + USES= gmake +USE_CXXSTD= c++14 USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/${PORTNAME} - CXXFLAGS+= -fPIC -BROKEN_riscv64= fails to compile: process.cc:53:3: module process.cc is not ported to this processor architecture -NOT_FOR_ARCHS= aarch64 armv6 armv7 mips mips64 powerpc powerpc64 sparc64 -NOT_FOR_ARCHS_REASON= contains not working ${ARCH}-dependent assembly code +WRKSRC= ${WRKDIR}/${PORTNAME} .include diff --git a/security/minisign/Makefile b/security/minisign/Makefile index d807a20197f3..e1cd9bf9ee56 100644 --- a/security/minisign/Makefile +++ b/security/minisign/Makefile @@ -2,7 +2,7 @@ PORTNAME= minisign PORTVERSION= 0.9 CATEGORIES= security -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Simple tool to sign files and verify signatures WWW= https://github.com/jedisct1/minisign diff --git a/security/pam-modules/Makefile b/security/pam-modules/Makefile index aa9e892f2bcb..cfa01bc2a2c1 100644 --- a/security/pam-modules/Makefile +++ b/security/pam-modules/Makefile @@ -4,7 +4,7 @@ PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ftp://download.gnu.org.ua/pub/release/pam-modules/ -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Collection of modules for PAM WWW= https://puszcza.gnu.org.ua/software/pam-modules/pam-modules.html diff --git a/security/rubygem-pbkdf2-ruby/Makefile b/security/rubygem-pbkdf2-ruby/Makefile index 9394e63e547f..0cbac92f1238 100644 --- a/security/rubygem-pbkdf2-ruby/Makefile +++ b/security/rubygem-pbkdf2-ruby/Makefile @@ -3,7 +3,7 @@ PORTVERSION= 0.2.1 CATEGORIES= security rubygems MASTER_SITES= RG -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Password Based Key Derivation Function 2 for Ruby WWW= https://github.com/emerose/pbkdf2-ruby diff --git a/security/yapet/Makefile b/security/yapet/Makefile index 6d8bea89011d..ea6b9830794c 100644 --- a/security/yapet/Makefile +++ b/security/yapet/Makefile @@ -15,6 +15,7 @@ LIB_DEPENDS+= libargon2.so:security/libargon2 \ libcppunit.so:devel/cppunit USES= compiler:c++14-lang gmake ncurses ssl pkgconfig +USE_CXXSTD= c++14 GNU_CONFIGURE= yes diff --git a/sysutils/fusefs-rar2fs/Makefile b/sysutils/fusefs-rar2fs/Makefile index ab1dd062143b..48d5d9b1bee2 100644 --- a/sysutils/fusefs-rar2fs/Makefile +++ b/sysutils/fusefs-rar2fs/Makefile @@ -1,7 +1,7 @@ PORTNAME= rar2fs DISTVERSION= 1.29.5 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- diff --git a/sysutils/mfid/Makefile b/sysutils/mfid/Makefile index 7fc567144540..0d606d00743e 100644 --- a/sysutils/mfid/Makefile +++ b/sysutils/mfid/Makefile @@ -4,7 +4,7 @@ PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= LOCAL/feld -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Monitoring daemon for mfi RAID controllers WWW= https://www.freebsd.org/ diff --git a/sysutils/mptd/Makefile b/sysutils/mptd/Makefile index 4730db484ce9..6f21d68618d3 100644 --- a/sysutils/mptd/Makefile +++ b/sysutils/mptd/Makefile @@ -4,7 +4,7 @@ PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://www.glenbarber.us/ports/${CATEGORIES}/${PORTNAME}/ -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Monitoring daemon for mpt RAID controllers WWW= https://www.freebsd.org/ diff --git a/sysutils/shuf/Makefile b/sysutils/shuf/Makefile index 08f877f6c9ee..2b3921e3e5f3 100644 --- a/sysutils/shuf/Makefile +++ b/sysutils/shuf/Makefile @@ -3,7 +3,7 @@ DISTVERSION= 3.0 CATEGORIES= sysutils MASTER_SITES= https://github.com/ibara/shuf/releases/download/${PORTNAME}-${DISTVERSION}/ -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Randomly permute input lines WWW= https://github.com/ibara/shuf diff --git a/sysutils/ua/Makefile b/sysutils/ua/Makefile index 597cf54d6bfc..b935bb5d5560 100644 --- a/sysutils/ua/Makefile +++ b/sysutils/ua/Makefile @@ -8,14 +8,16 @@ WWW= https://github.com/euedge/ua/wiki LICENSE= MPL11 +USES= autoreconf ssl +USE_CXXSTD= c++14 USE_GITHUB= yes GH_ACCOUNT= euedge GH_TAGNAME= 7a35148 -USES= autoreconf ssl GNU_CONFIGURE= yes -LDFLAGS+= -L${OPENSSLLIB} + CFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} PLIST_FILES= bin/kua bin/ua \ man/man1/kua.1.gz man/man1/ua.1.gz diff --git a/sysutils/wmmemfree/Makefile b/sysutils/wmmemfree/Makefile index 13956535685d..37ffa81f9091 100644 --- a/sysutils/wmmemfree/Makefile +++ b/sysutils/wmmemfree/Makefile @@ -15,8 +15,8 @@ BROKEN_FreeBSD_14= fails to compile: read_mem.c: invalid use of undefined type ' BROKEN_mips= fails to compile: mem_freebsd.c: storage size of 'vm' isn't known BROKEN_mips64= fails to compile: mem_freebsd.c: storage size of 'vm' isn't known -USES= tar:bzip2 xorg -USE_XORG= xpm +USES= localbase tar:bzip2 xorg +USE_XORG= x11 xext xpm PLIST_FILES= "@(,kmem,2555) bin/wmmemfree" man/man1/${PORTNAME}.1.gz diff --git a/sysutils/wmmemfree/files/patch-Makefile b/sysutils/wmmemfree/files/patch-Makefile index ef220cc50a7b..26f34c806042 100644 --- a/sysutils/wmmemfree/files/patch-Makefile +++ b/sysutils/wmmemfree/files/patch-Makefile @@ -1,54 +1,24 @@ ---- Makefile.orig Sat Mar 22 02:59:07 2003 -+++ Makefile Fri Apr 11 12:50:48 2003 -@@ -1,38 +1,17 @@ --#Makefile -+CC ?= cc -+LDIR = -L${LOCALBASE}/lib -+IDIR = -I${LOCALBASE}/include +--- Makefile.orig 2003-03-21 20:59:07 UTC ++++ Makefile +@@ -1,18 +1,18 @@ + #Makefile --PROG=wmmemfree + PROG=wmmemfree -OBJS=dockapp.o draw.o mem_linux.o options.o wmmemfree.o -+LIBS = -lX11 -lXpm -lXext -lkvm ++OBJS=dockapp.o draw.o mem_freebsd.o options.o wmmemfree.o --PREFIX=/usr/local --BINDIR=$(PREFIX)/bin --MANUALDIR=$(PREFIX)/share/man/man1 + PREFIX=/usr/local + BINDIR=$(PREFIX)/bin + MANUALDIR=$(PREFIX)/share/man/man1 -CC=gcc --STRIP=strip --FLAGS=-Wall -O2 --RM=rm -f --INST=install --MANUAL=$(PROG).1 ++CC?=gcc + STRIP=strip + FLAGS=-Wall -O2 + RM=rm -f + INST=install + MANUAL=$(PROG).1 -LIBS=-L/usr/X11R6/lib -lX11 -lXext -lXpm -+OBJS = dockapp.o\ -+ draw.o\ -+ mem_freebsd.o\ -+ options.o\ -+ wmmemfree.o ++LIBS+=-lX11 -lXext -lXpm -lkvm --all: $(PROG) -+.c.o: -+ ${CC} ${CFLAGS} ${IDIR} ${DEFS} -c $< -o $*.o + all: $(PROG) --$(PROG): $(OBJS) -- $(CC) -o $(PROG) $(OBJS) $(LIBS) -- $(STRIP) $(PROG) --%.o: %.c -- $(CC) $(FLAGS) -c $< -o $@ --clean: -- $(RM) $(OBJS) $(PROG) --install: $(PROG) -- $(INST) -m 755 $(PROG) $(BINDIR) -- $(INST) -m 644 $(MANUAL) $(MANUALDIR) --uninstall: -- $(RM) $(BINDIR)/$(PROG) -- $(RM) $(MANUALDIR)/$(MANUAL) -- --dockapp.o: dockapp.c wmmemfree.h options.h draw.h xpm/bg.xpm xpm/on.xpm \ -- xpm/off.xpm xpm/numbers.xpm xpm/panel.xpm --draw.o: draw.c dockapp.h draw.h mem_linux.h options.h --mem_linux.o: mem_linux.c --options.o: options.c wmmemfree.h options.h --wmmemfree.o: wmmemfree.c wmmemfree.h dockapp.h draw.h options.h -+all: ${OBJS} -+ ${CC} ${CFLAGS} -o wmmemfree ${OBJS} ${LDIR} ${LIBS} diff --git a/www/chromium/Makefile b/www/chromium/Makefile index fb8e35f73896..cc8a8a945c3e 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= chromium -PORTVERSION= 114.0.5735.198 +PORTVERSION= 115.0.5790.98 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external @@ -101,6 +101,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \ enable_hangout_services_extension=true \ enable_nacl=false \ enable_remoting=false \ + enable_rust=false \ fatal_linker_warnings=false \ icu_use_data_file=false \ is_clang=true \ @@ -216,8 +217,8 @@ TEST_ALL_TARGET= ${TEST_TARGETS} IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif -.if ${COMPILER_VERSION} < 150 -LLVM_DEFAULT= 15 +.if ${COMPILER_VERSION} < 160 +LLVM_DEFAULT= 16 BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 0ea7956b1ca3..49db0549fc21 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1687851726 -SHA256 (chromium-114.0.5735.198.tar.xz) = a9f3440feeab51f56b199797b83b458ca545bf67e114c62b21470fadd5a41dea -SIZE (chromium-114.0.5735.198.tar.xz) = 1570630092 -SHA256 (chrome-linux-114.0.5735.198-llvm13.profdata.tar.xz) = b6e17600f30c3478e68b17afffae11182b8fc76b03bc6d462690c00cd7416586 -SIZE (chrome-linux-114.0.5735.198-llvm13.profdata.tar.xz) = 27294248 -SHA256 (chromium-114.0.5735.198-testdata.tar.xz) = 2c244b76c21c298e07719107e421b56715f020eb2c14aea1bafa90bd84c06887 -SIZE (chromium-114.0.5735.198-testdata.tar.xz) = 263496592 +TIMESTAMP = 1689685779 +SHA256 (chromium-115.0.5790.98.tar.xz) = ffbe630ecf8fc8a250be05fdbec6c94d5881b5fcbbc5fb2b93e54ddc78d56af1 +SIZE (chromium-115.0.5790.98.tar.xz) = 1594903988 +SHA256 (chrome-linux-115.0.5790.98-llvm13.profdata.tar.xz) = 4c37b245192217b100454036d5e8e31bce9c3c1ccd891bd4fa494833cddf92aa +SIZE (chrome-linux-115.0.5790.98-llvm13.profdata.tar.xz) = 27662716 +SHA256 (chromium-115.0.5790.98-testdata.tar.xz) = ed42d767a1056182d68cea5e5565f33904e328c51d943dfe14cde791f2e286ae +SIZE (chromium-115.0.5790.98-testdata.tar.xz) = 264829224 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index dafde345f6b8..c5341baa29e3 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ BUILD.gn @@ -61,7 +61,7 @@ declare_args() { root_extra_deps = [] @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms", -@@ -666,7 +674,7 @@ group("gn_all") { +@@ -665,7 +673,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -51,7 +51,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1096,7 +1104,7 @@ if (!is_ios && !is_cronet_build) { +@@ -1094,7 +1102,7 @@ if (!is_ios && !is_cronet_build) { ] } @@ -60,7 +60,7 @@ # WPT Webdriver tests runner # chrome/test/chromedriver/test/run_webdriver_tests.py script_test("webdriver_wpt_tests") { -@@ -1196,7 +1204,7 @@ if (!is_ios && !is_cronet_build) { +@@ -1194,7 +1202,7 @@ if (!is_ios && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1205,7 +1213,7 @@ if (!is_ios && !is_cronet_build) { +@@ -1203,7 +1211,7 @@ if (!is_ios && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -78,7 +78,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1672,7 +1680,7 @@ group("chromium_builder_perf") { +@@ -1671,7 +1679,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 99581eac42b8..c11cbff2d22f 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- base/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ base/BUILD.gn -@@ -197,7 +197,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] } @@ -9,7 +9,7 @@ buildflag_header("message_pump_buildflags") { header = "message_pump_buildflags.h" header_dir = "base/message_loop" -@@ -1100,11 +1100,23 @@ component("base") { +@@ -1099,11 +1099,23 @@ component("base") { # Needed for if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -34,7 +34,7 @@ if (use_allocator_shim) { sources += [ "allocator/partition_allocator/shim/allocator_shim.cc", -@@ -1132,7 +1144,7 @@ component("base") { +@@ -1131,7 +1143,7 @@ component("base") { ] configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] } @@ -43,7 +43,7 @@ sources += [ "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h", "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h", -@@ -1173,7 +1185,7 @@ component("base") { +@@ -1172,7 +1184,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -52,7 +52,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2127,6 +2139,43 @@ component("base") { +@@ -2130,6 +2142,43 @@ component("base") { } } @@ -96,7 +96,7 @@ # iOS if (is_ios) { sources += [ -@@ -2236,7 +2285,7 @@ component("base") { +@@ -2238,7 +2287,7 @@ component("base") { } if (dep_libevent) { @@ -105,7 +105,7 @@ } if (use_libevent) { -@@ -3559,7 +3608,7 @@ test("base_unittests") { +@@ -3552,7 +3601,7 @@ test("base_unittests") { ] } @@ -114,7 +114,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3608,7 +3657,7 @@ test("base_unittests") { +@@ -3601,7 +3650,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -123,7 +123,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3619,7 +3668,7 @@ test("base_unittests") { +@@ -3612,7 +3661,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -132,7 +132,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3843,7 +3892,7 @@ test("base_unittests") { +@@ -3837,7 +3886,7 @@ test("base_unittests") { } } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h index b4837778e5d5..a701e44b4d4b 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator.h.orig 2023-05-31 08:12:17 UTC +--- base/allocator/partition_allocator/page_allocator.h.orig 2023-07-16 15:47:57 UTC +++ base/allocator/partition_allocator/page_allocator.h -@@ -238,7 +238,7 @@ void DecommitAndZeroSystemPages(void* address, size_t +@@ -241,7 +241,7 @@ void DecommitAndZeroSystemPages(void* address, size_t // recommitted. Do not assume that this will not change over time. constexpr PA_COMPONENT_EXPORT( PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 7896aa46cbda..972462e38587 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-05-31 08:12:17 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-07-16 15:47:57 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -387,8 +387,12 @@ bool TryRecommitSystemPagesInternal( +@@ -394,8 +394,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast(address); diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc index 4ce7a61d34eb..64902138740f 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-04-05 11:05:06 UTC +--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-07-16 15:47:57 UTC +++ base/allocator/partition_allocator/partition_address_space.cc -@@ -417,7 +417,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting() +@@ -420,7 +420,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo } #endif diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index 1d6b8c5f9d65..0c2c47b1b30c 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-05-31 08:12:17 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-07-16 15:47:57 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -305,7 +305,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt - "AsanBackupRefPtr requires RawPtrHookableImpl") - - declare_args() { -- enable_pkeys = is_linux && target_cpu == "x64" -+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" +@@ -291,7 +291,7 @@ declare_args() { + # pkeys support is explicitly disabled in all Cronet builds, as some test dependencies that + # use partition_allocator are compiled in AOSP against a version of glibc that does not + # include pkeys syscall numbers. +- enable_pkeys = is_linux && target_cpu == "x64" && !is_cronet_build ++ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" && !is_cronet_build } assert(!enable_pkeys || (is_linux && target_cpu == "x64"), "Pkeys are only supported on x64 linux") diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h index 1869e2952cd0..086f8bbbbe9e 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-04-28 17:01:32 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-07-16 15:47:57 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h -@@ -104,7 +104,7 @@ static_assert(sizeof(void*) != 8, ""); +@@ -94,7 +94,7 @@ static_assert(sizeof(void*) != 8, ""); // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific // features such as futex(2). #define PA_CONFIG_HAS_LINUX_KERNEL() \ @@ -9,7 +9,7 @@ // On some platforms, we implement locking by spinning in userspace, then going // into the kernel only if there is contention. This requires platform support, -@@ -232,7 +232,7 @@ constexpr bool kUseLazyCommit = false; +@@ -234,7 +234,7 @@ constexpr bool kUseLazyCommit = false; // On these platforms, lock all the partitions before fork(), and unlock after. // This may be required on more platforms in the future. #define PA_CONFIG_HAS_ATFORK_HANDLER() \ @@ -18,7 +18,7 @@ // PartitionAlloc uses PartitionRootEnumerator to acquire all // PartitionRoots at BeforeFork and to release at AfterFork. -@@ -277,7 +277,7 @@ constexpr bool kUseLazyCommit = false; +@@ -279,7 +279,7 @@ constexpr bool kUseLazyCommit = false; // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to // larger slot spans. #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \ diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h index 0d4bdce491c5..be3b83392090 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-04-28 17:01:32 UTC +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-07-16 15:47:57 UTC +++ base/allocator/partition_allocator/partition_alloc_constants.h @@ -92,7 +92,7 @@ PartitionPageShift() { return 18; // 256 KiB @@ -9,12 +9,13 @@ PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t PartitionPageShift() { return PageAllocationGranularityShift() + 2; -@@ -293,7 +293,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; - // When pointer compression is enabled, we cannot use large pools (at most +@@ -294,7 +294,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; // 8GB for each of the glued pools). #if BUILDFLAG(HAS_64_BIT_POINTERS) --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \ +- BUILDFLAG(ENABLE_POINTER_COMPRESSION) ++ BUILDFLAG(ENABLE_POINTER_COMPRESSION) || \ ++ BUILDFLAG(IS_BSD) constexpr size_t kPoolMaxSize = 8 * kGiB; #else constexpr size_t kPoolMaxSize = 16 * kGiB; diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc index 62424268d4a0..7c955d52174c 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2023-05-31 08:12:17 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2023-07-16 15:47:57 UTC +++ base/allocator/partition_allocator/partition_root.cc @@ -46,7 +46,7 @@ #include "wow64apiset.h" @@ -9,7 +9,7 @@ #include #endif -@@ -287,7 +287,7 @@ void PartitionAllocMallocInitOnce() { +@@ -286,7 +286,7 @@ void PartitionAllocMallocInitOnce() { return; } @@ -18,7 +18,7 @@ // 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. -@@ -381,7 +381,7 @@ static size_t PartitionPurgeSlotSpan( +@@ -380,7 +380,7 @@ static size_t PartitionPurgeSlotSpan( constexpr size_t kMaxSlotCount = (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / MinPurgeableSlotSize(); @@ -27,7 +27,7 @@ // It's better for slot_usage to be stack-allocated and fixed-size, which // demands that its size be constexpr. On IS_APPLE and Linux on arm64, // PartitionPageSize() is always SystemPageSize() << 2, so regardless of -@@ -853,7 +853,7 @@ void PartitionRoot::Init(PartitionOptions +@@ -880,7 +880,7 @@ void PartitionRoot::Init(PartitionOptions // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc index 32d17e2e2bae..a71a256577f7 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2023-04-05 11:05:06 UTC +--- base/debug/stack_trace_posix.cc.orig 2023-07-16 15:47:57 UTC +++ base/debug/stack_trace_posix.cc @@ -41,7 +41,7 @@ // execinfo.h and backtrace(3) are really only present in glibc and in macOS @@ -18,7 +18,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -799,6 +799,9 @@ class SandboxSymbolizeHelper { +@@ -798,6 +798,9 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -28,7 +28,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -816,6 +819,7 @@ class SandboxSymbolizeHelper { +@@ -815,6 +818,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc index de8691c92fe6..751f6e06731f 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2023-05-31 08:12:17 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2023-07-16 15:47:57 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -473,7 +473,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -479,7 +479,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvent()); @@ -9,7 +9,7 @@ // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; -@@ -1275,7 +1275,7 @@ enum Permission { +@@ -1281,7 +1281,7 @@ enum Permission { Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -1306,7 +1306,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -1312,7 +1312,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi } #endif // BUILDFLAG(IS_APPLE) diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h index 852cc726f377..d70b1c797713 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,4 +1,4 @@ ---- base/memory/platform_shared_memory_region.h.orig 2022-06-17 14:20:10 UTC +--- base/memory/platform_shared_memory_region.h.orig 2023-07-16 15:47:57 UTC +++ base/memory/platform_shared_memory_region.h @@ -16,7 +16,7 @@ @@ -18,7 +18,7 @@ // Structure to limit access to executable region creation. struct ExecutableRegion { private: -@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -215,7 +215,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { CheckPlatformHandlePermissionsCorrespondToMode); static PlatformSharedMemoryRegion Create(Mode mode, size_t size diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index aedd549a2c36..c3946376bf5a 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,6 +1,6 @@ ---- base/process/process_metrics.h.orig 2023-03-09 06:31:50 UTC +--- base/process/process_metrics.h.orig 2023-07-16 15:47:57 UTC +++ base/process/process_metrics.h -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,16 +9,16 @@ #include #include #include -@@ -50,7 +50,7 @@ namespace base { - // Full declaration is in process_metrics_iocounters.h. - struct IoCounters; +@@ -53,7 +53,7 @@ struct IoCounters; + + class ProcessMetricsAppleInternal; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -108,7 +108,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr CreateCurrentProcessMetrics(); @@ -27,7 +27,7 @@ // 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; -@@ -163,7 +163,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -166,7 +166,7 @@ class BASE_EXPORT ProcessMetrics { #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -36,7 +36,7 @@ // Emits the cumulative CPU usage for all currently active threads since they // were started into the output parameter (replacing its current contents). // Threads that have already terminated will not be reported. Thus, the sum of -@@ -223,7 +223,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -226,7 +226,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; -@@ -244,7 +244,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -54,7 +54,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if BUILDFLAG(IS_APPLE) -@@ -263,9 +263,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -266,9 +266,7 @@ class BASE_EXPORT ProcessMetrics { // Used to store the previous times and CPU usage counts so we can // compute the CPU usage between calls. TimeTicks last_cpu_time_; @@ -64,7 +64,7 @@ #if BUILDFLAG(IS_WIN) TimeTicks last_cpu_time_for_precise_cpu_usage_; -@@ -273,7 +271,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -276,7 +274,7 @@ class BASE_EXPORT ProcessMetrics { #endif #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -73,7 +73,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -316,7 +314,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -313,7 +311,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \ @@ -82,7 +82,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -351,7 +349,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -348,7 +346,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -91,7 +91,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -366,7 +364,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -363,7 +361,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -100,7 +100,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -403,7 +401,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -400,7 +398,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -109,7 +109,7 @@ // Parse the data found in /proc//stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -591,7 +589,7 @@ class BASE_EXPORT SystemMetrics { +@@ -588,7 +586,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/chromium/files/patch-base_process_process__metrics__posix.cc b/www/chromium/files/patch-base_process_process__metrics__posix.cc index 278bd803c9f2..c7759118bacb 100644 --- a/www/chromium/files/patch-base_process_process__metrics__posix.cc +++ b/www/chromium/files/patch-base_process_process__metrics__posix.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_posix.cc.orig 2023-05-31 08:12:17 UTC +--- base/process/process_metrics_posix.cc.orig 2023-07-16 15:47:57 UTC +++ base/process/process_metrics_posix.cc -@@ -20,6 +20,8 @@ +@@ -21,6 +21,8 @@ #if BUILDFLAG(IS_APPLE) #include @@ -9,7 +9,7 @@ #else #include #endif -@@ -133,7 +135,7 @@ size_t ProcessMetrics::GetMallocUsage() { +@@ -134,7 +136,7 @@ size_t ProcessMetrics::GetMallocUsage() { return stats.size_in_use; #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) return GetMallocUsageMallinfo(); diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc index 68ea0347c4d2..093547cb4fa8 100644 --- a/www/chromium/files/patch-base_system_sys__info.cc +++ b/www/chromium/files/patch-base_system_sys__info.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info.cc.orig 2023-05-31 08:12:17 UTC +--- base/system/sys_info.cc.orig 2023-07-16 15:47:57 UTC +++ base/system/sys_info.cc -@@ -148,7 +148,7 @@ std::string SysInfo::HardwareModelName() { +@@ -155,7 +155,7 @@ std::string SysInfo::HardwareModelName() { #endif void SysInfo::GetHardwareInfo(base::OnceCallback callback) { diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index 5c9937f693ca..52fe8e99173b 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,15 +1,15 @@ ---- base/system/sys_info.h.orig 2023-05-31 08:12:17 UTC +--- base/system/sys_info.h.orig 2023-07-16 15:47:57 UTC +++ base/system/sys_info.h -@@ -253,6 +253,8 @@ class BASE_EXPORT SysInfo { +@@ -258,6 +258,8 @@ class BASE_EXPORT SysInfo { static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled); #endif + static uint64_t MaxSharedMemorySize(); + private: + friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); - FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -264,7 +266,7 @@ class BASE_EXPORT SysInfo { +@@ -270,7 +272,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc index 775dddef8bb0..dcffe9ef7752 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_unittest.cc.orig 2023-04-28 17:01:32 UTC +--- base/threading/platform_thread_unittest.cc.orig 2023-07-16 15:47:57 UTC +++ base/threading/platform_thread_unittest.cc @@ -32,7 +32,7 @@ #include "base/time/time.h" @@ -18,7 +18,7 @@ // 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; -@@ -704,12 +704,16 @@ INSTANTIATE_TEST_SUITE_P( +@@ -698,12 +698,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 5c87ed247ad9..cd7e373a54da 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- build/config/compiler/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ build/config/compiler/BUILD.gn -@@ -237,13 +237,16 @@ config("default_include_dirs") { +@@ -249,13 +249,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -18,7 +18,7 @@ } # compiler --------------------------------------------------------------------- -@@ -467,6 +470,10 @@ config("compiler") { +@@ -497,6 +500,10 @@ config("compiler") { } } @@ -29,7 +29,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -542,7 +549,7 @@ config("compiler") { +@@ -572,7 +579,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -38,7 +38,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -727,7 +734,7 @@ config("compiler") { +@@ -757,7 +764,7 @@ config("compiler") { ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ] @@ -47,7 +47,7 @@ # TODO(https://crbug.com/972449): turn on for ChromeOS when that # toolchain has this flag. # We only use one version of LLVM within a build so there's no need to -@@ -825,7 +832,7 @@ config("compiler") { +@@ -860,7 +867,7 @@ config("compiler") { # * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode # lldb doesn't have the needed changes yet. # TODO(crbug.com/1379070): Remove if the upstream default ever changes. @@ -56,7 +56,7 @@ cflags_cc += [ "-gsimple-template-names" ] } -@@ -1005,7 +1012,7 @@ config("compiler_cpu_abi") { +@@ -1095,7 +1102,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -65,7 +65,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1020,7 +1027,7 @@ config("compiler_cpu_abi") { +@@ -1110,7 +1117,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -74,7 +74,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1355,7 +1362,7 @@ config("compiler_deterministic") { +@@ -1445,7 +1452,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -83,7 +83,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1407,7 +1414,7 @@ config("compiler_deterministic") { +@@ -1497,7 +1504,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -92,7 +92,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1645,7 +1652,7 @@ config("default_warnings") { +@@ -1735,7 +1742,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -101,7 +101,7 @@ cflags += [ # TODO(crbug.com/1343975) Evaluate and possibly enable. "-Wno-deprecated-builtins", -@@ -1836,7 +1843,7 @@ config("no_chromium_code") { +@@ -1926,7 +1933,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -110,7 +110,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2346,7 +2353,7 @@ config("afdo_optimize_size") { +@@ -2436,7 +2443,7 @@ config("afdo_optimize_size") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -119,7 +119,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2365,7 +2372,7 @@ config("afdo") { +@@ -2455,7 +2462,7 @@ config("afdo") { } inputs = [ _clang_sample_profile ] } @@ -128,7 +128,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2523,7 +2530,8 @@ config("symbols") { +@@ -2613,7 +2620,8 @@ config("symbols") { configs += [ "//build/config:compress_debug_sections" ] } diff --git a/www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn b/www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn new file mode 100644 index 000000000000..d62341deffdb --- /dev/null +++ b/www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn @@ -0,0 +1,19 @@ +--- build/config/compiler/pgo/BUILD.gn.orig 2023-07-16 15:47:57 UTC ++++ build/config/compiler/pgo/BUILD.gn +@@ -121,13 +121,14 @@ config("pgo_optimization_flags") { + + # Enable basic block layout based on the extended TSP problem. This aims to + # improve icache utilization and reduce the binary size. +- if (use_thin_lto) { ++ # __clang_major__ >= 15 ++ if (use_thin_lto && !is_bsd) { + if (is_win) { + ldflags = [ "-mllvm:-enable-ext-tsp-block-placement=1" ] + } else { + ldflags = [ "-Wl,-mllvm,-enable-ext-tsp-block-placement=1" ] + } +- } else { ++ } else if (!is_bsd) { + cflags += [ + "-mllvm", + "-enable-ext-tsp-block-placement=1", diff --git a/www/chromium/files/patch-build_config_rust.gni b/www/chromium/files/patch-build_config_rust.gni deleted file mode 100644 index 19d053b81726..000000000000 --- a/www/chromium/files/patch-build_config_rust.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- build/config/rust.gni.orig 2023-05-31 08:12:17 UTC -+++ build/config/rust.gni -@@ -170,7 +170,7 @@ if (enable_rust) { - rust_sysroot = "//third_party/rust-toolchain" - use_unverified_rust_toolchain = false - } else { -- if (host_os != "linux") { -+ if (host_os != "linux" && host_os != "openbsd" && host_os != "freebsd") { - assert(false, - "Attempt to use Android Rust toolchain on an unsupported platform") - } diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index 9f88b28c852e..4ed0eee7d3e5 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2023-05-31 08:12:17 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2023-07-16 15:47:57 UTC +++ build/toolchain/gcc_toolchain.gni @@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -859,22 +866,12 @@ template("gcc_toolchain") { +@@ -869,22 +876,12 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/chromium/files/patch-chrome_app_app__management__strings.grdp b/www/chromium/files/patch-chrome_app_app__management__strings.grdp index 6c9bfa4a371a..1468f983b4a2 100644 --- a/www/chromium/files/patch-chrome_app_app__management__strings.grdp +++ b/www/chromium/files/patch-chrome_app_app__management__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/app_management_strings.grdp.orig 2023-05-31 08:12:17 UTC +--- chrome/app/app_management_strings.grdp.orig 2023-07-16 15:47:57 UTC +++ chrome/app/app_management_strings.grdp -@@ -176,7 +176,7 @@ +@@ -188,7 +188,7 @@ You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <a href="#">learn how to set default apps on your device</a>. diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h index 6f3fcf9ecf07..1d54541f1349 100644 --- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,11 +1,17 @@ ---- chrome/app/chrome_command_ids.h.orig 2023-03-09 06:31:50 UTC +--- chrome/app/chrome_command_ids.h.orig 2023-07-16 15:47:57 UTC +++ chrome/app/chrome_command_ids.h -@@ -70,7 +70,7 @@ +@@ -70,12 +70,12 @@ + #define IDC_TOGGLE_MULTITASK_MENU 34050 + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #define IDC_USE_SYSTEM_TITLE_BAR 34051 #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #define IDC_USE_SYSTEM_TITLE_BAR 34051 #define IDC_RESTORE_WINDOW 34052 #endif + diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index 59734c00d37e..fda51b850b03 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -137,7 +137,7 @@ +@@ -138,7 +138,7 @@ #include "components/about_ui/credit_utils.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -182,16 +182,16 @@ +@@ -183,16 +183,16 @@ #include "v8/include/v8.h" #endif @@ -29,7 +29,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -327,7 +327,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -328,7 +328,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -38,7 +38,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -412,7 +412,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -413,7 +413,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -47,7 +47,7 @@ // 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) || -@@ -526,7 +526,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -527,7 +527,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -56,7 +56,7 @@ // 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. -@@ -615,7 +615,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -616,7 +616,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -65,16 +65,16 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::RecordStartupProcessCreationTime( -@@ -956,7 +956,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { - +@@ -958,7 +958,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); + base::sequence_manager::internal::ThreadController::InitializeFeatures(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) base::PlatformThread::InitFeaturesPostFieldTrial(); -@@ -1094,7 +1094,7 @@ absl::optional ChromeMainDelegate::BasicStartupCo +@@ -1096,7 +1096,7 @@ absl::optional ChromeMainDelegate::BasicStartupCo // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -83,7 +83,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1124,7 +1124,7 @@ absl::optional ChromeMainDelegate::BasicStartupCo +@@ -1126,7 +1126,7 @@ absl::optional ChromeMainDelegate::BasicStartupCo #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -92,7 +92,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1498,7 +1498,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1500,7 +1500,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -101,7 +101,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1600,7 +1600,7 @@ absl::variant Chrome +@@ -1602,7 +1602,7 @@ absl::variant Chrome // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index 141a8edb84ee..4091596e90ab 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,4 +1,4 @@ ---- chrome/app/chromium_strings.grd.orig 2023-04-28 17:01:32 UTC +--- chrome/app/chromium_strings.grd.orig 2023-07-16 15:47:57 UTC +++ chrome/app/chromium_strings.grd @@ -296,7 +296,7 @@ If you update this file, be sure also to update google Welcome to Chromium; new browser window opened @@ -18,3 +18,21 @@ Chromium may not function correctly because it is no longer supported on this Linux distribution +@@ -812,7 +812,7 @@ Permissions you've already given to websites and apps + + + +- ++ + + Not used in Chromium. Placeholder to keep resource maps in sync. + +@@ -1170,7 +1170,7 @@ Permissions you've already given to websites and apps + + + +- ++ + + Not used in Chromium. Placeholder to keep resource maps in sync. + diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 07888c60362a..ec4f805c40cb 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2023-05-31 08:12:17 UTC +--- chrome/app/generated_resources.grd.orig 2023-07-16 15:47:57 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -9,7 +9,7 @@ for making strings OS specific. Other platform defines such as use_titlecase are declared in tools/grit/grit_rule.gni. --> -@@ -3258,7 +3258,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3304,7 +3304,7 @@ You can send it to Google to check if it's unsafe. Sca @@ -18,7 +18,7 @@ Device Credentials -@@ -5007,7 +5007,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -5036,7 +5036,7 @@ You can send it to Google to check if it's unsafe. Sca Read information about your browser, OS, device, installed software, registry values and files @@ -27,7 +27,7 @@ Read information about your browser, OS, device, installed software and files -@@ -5689,7 +5689,7 @@ Keep your key file in a safe place. You will need it t +@@ -5691,7 +5691,7 @@ Keep your key file in a safe place. You will need it t Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app. @@ -36,7 +36,7 @@ Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app. -@@ -5735,7 +5735,7 @@ Keep your key file in a safe place. You will need it t +@@ -5737,7 +5737,7 @@ Keep your key file in a safe place. You will need it t Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available. @@ -45,7 +45,16 @@ Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. -@@ -9841,7 +9841,7 @@ Check your passwords anytime in + Update + +- ++ + + Finish update + +@@ -9891,7 +9891,7 @@ Check your passwords anytime in Use system title bar and borders -@@ -11182,7 +11182,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -10856,7 +10856,7 @@ Check your passwords anytime in ++ + + Share device signals? + +@@ -11246,7 +11246,7 @@ Please help our engineers fix this problem. Tell us wh Set as default @@ -63,7 +81,7 @@ Minimize -@@ -13324,7 +13324,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -13426,7 +13426,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd index d87739da8527..8b2b57047749 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,4 +1,4 @@ ---- chrome/app/google_chrome_strings.grd.orig 2022-11-30 08:12:58 UTC +--- chrome/app/google_chrome_strings.grd.orig 2023-07-16 15:47:57 UTC +++ chrome/app/google_chrome_strings.grd @@ -301,7 +301,7 @@ chromium_strings.grd. --> Welcome to Chrome; new browser window opened @@ -18,3 +18,21 @@ Google Chrome may not function correctly because it is no longer supported on this Linux distribution +@@ -844,7 +844,7 @@ Permissions you've already given to websites and apps + + + +- ++ + + + Relaunch to Update - Your tabs will reopen +@@ -1249,7 +1249,7 @@ Permissions you've already given to websites and apps + + + +- ++ + + Relaunch to finish Chrome update + diff --git a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index 5ccb10f413a5..4472deb583d7 100644 --- a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-05-31 08:12:17 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-07-16 15:47:57 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd @@ -16,7 +16,7 @@ @@ -9,7 +9,7 @@ -@@ -67,7 +67,7 @@ +@@ -61,7 +61,7 @@ @@ -18,7 +18,7 @@ -@@ -81,7 +81,7 @@ +@@ -75,7 +75,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 4a2cb0b7ffaa..018660733e7e 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,4 +1,4 @@ ---- chrome/browser/about_flags.cc.orig 2023-06-14 09:23:57 UTC +--- chrome/browser/about_flags.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/about_flags.cc @@ -222,7 +222,7 @@ #include "ui/ui_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -315,7 +315,7 @@ +@@ -316,7 +316,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -18,7 +18,7 @@ #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -421,7 +421,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -422,7 +422,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -27,16 +27,16 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1448,7 +1448,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 +@@ -1478,7 +1478,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 std::size(kChromeRefresh2023Level1), nullptr}}; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - const FeatureEntry::FeatureParam - kOmniboxDocumentProviderCapLowQualitySuggestionsTo1[] = { - {"DocumentProviderMaxLowQualitySuggestions", "1"}, -@@ -4750,13 +4750,13 @@ const FeatureEntry kFeatureEntries[] = { + const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = { + {"ShortcutBoostSearchScore", "1414"}, + {"ShortcutBoostUrlScore", "1414"}}; +@@ -4974,13 +4974,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -52,8 +52,8 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5033,7 +5033,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)}, +@@ -5265,7 +5265,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(feed::kFeedDynamicColors)}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) @@ -61,16 +61,16 @@ {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -5683,7 +5683,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5911,7 +5911,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"omnibox-experimental-keyword-mode", - flag_descriptions::kOmniboxExperimentalKeywordModeName, - flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -6467,7 +6467,7 @@ const FeatureEntry kFeatureEntries[] = { + {"omnibox-domain-suggestions", + flag_descriptions::kOmniboxDomainSuggestionsName, + flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, +@@ -6674,7 +6674,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kParallelDownloadingDescription, kOsAll, FEATURE_VALUE_TYPE(download::features::kParallelDownloading)}, @@ -79,7 +79,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -7340,7 +7340,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7566,7 +7566,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -88,7 +88,7 @@ {"global-media-controls-modern-ui", flag_descriptions::kGlobalMediaControlsModernUIName, flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -8115,7 +8115,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8345,7 +8345,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -97,7 +97,7 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8360,7 +8360,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8600,7 +8600,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -106,7 +106,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8421,7 +8421,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8661,7 +8661,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -115,7 +115,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -8998,7 +8998,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9243,7 +9243,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -124,7 +124,7 @@ {"document-picture-in-picture-api", flag_descriptions::kDocumentPictureInPictureApiName, flag_descriptions::kDocumentPictureInPictureApiDescription, -@@ -9696,7 +9696,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9942,7 +9942,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)}, @@ -133,7 +133,7 @@ {"webui-system-font", flag_descriptions::kWebUiSystemFontName, flag_descriptions::kWebUiSystemFontDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebUiSystemFont)}, -@@ -9897,7 +9897,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10134,7 +10134,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc index 91327c635acf..c05cdcd656cd 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/browser_process_impl.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/browser_process_impl.cc -@@ -213,7 +213,7 @@ +@@ -215,7 +215,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1195,7 +1195,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1207,7 +1207,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1448,7 +1448,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1464,7 +1464,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h index bc37318396fa..016f1954177c 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.h.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/browser_process_impl.h.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/browser_process_impl.h -@@ -366,7 +366,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -378,7 +378,7 @@ class BrowserProcessImpl : public BrowserProcess, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index 4ea24d58d8ff..939479e241a9 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -117,13 +117,13 @@ +@@ -119,13 +119,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #endif -@@ -197,7 +197,7 @@ +@@ -199,7 +199,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,7 +25,7 @@ #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" #include "chrome/browser/ui/webui/discards/site_data.mojom.h" -@@ -881,7 +881,7 @@ void PopulateChromeFrameBinders( +@@ -886,7 +886,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -34,7 +34,7 @@ if (!render_frame_host->GetParent()) { map->Add( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -889,7 +889,7 @@ void PopulateChromeFrameBinders( +@@ -894,7 +894,7 @@ void PopulateChromeFrameBinders( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -43,7 +43,7 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -958,14 +958,14 @@ void PopulateChromeWebUIFrameBinders( +@@ -963,14 +963,14 @@ void PopulateChromeWebUIFrameBinders( commerce::CommerceInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -60,7 +60,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1420,7 +1420,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1428,7 +1428,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index 246bf78ce181..d199d3c54631 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -241,11 +241,11 @@ +@@ -244,11 +244,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #include "components/crash/core/app/crashpad.h" #endif -@@ -280,7 +280,7 @@ +@@ -283,14 +283,14 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -23,7 +23,15 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" -@@ -992,7 +992,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { + #include "ui/base/pointer/touch_ui_controller.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck + #include "chrome/browser/headless/headless_mode_util.h" // nogncheck + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +@@ -1005,7 +1005,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -32,7 +40,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1048,7 +1048,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1061,7 +1061,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -41,3 +49,12 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( +@@ -1295,7 +1295,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* + *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (headless::IsHeadlessMode()) { + headless::ReportHeadlessActionMetrics(); + } diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 8dbd05118f59..cb0ba74a8806 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -424,7 +424,7 @@ +@@ -427,7 +427,7 @@ #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "storage/browser/file_system/external_mount_points.h" @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif BUILDFLAG(IS_ANDROID) #include "base/android/application_status_listener.h" -@@ -512,12 +512,12 @@ +@@ -516,12 +516,12 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,14 +24,14 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -526,14 +526,14 @@ +@@ -530,14 +530,14 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h" - #include "chrome/browser/enterprise/profile_token_management/profile_token_navigation_throttle.h" + #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h" #include "chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.h" #endif @@ -41,7 +41,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -562,11 +562,11 @@ +@@ -566,11 +566,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -55,16 +55,16 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1609,7 +1609,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre - policy::policy_prefs::kPPAPISharedImagesSwapChainAllowed, true); - registry->RegisterBooleanPref( - policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI, false); +@@ -1583,7 +1583,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre + prefs::kThrottleNonVisibleCrossOriginIframesAllowed, true); + registry->RegisterBooleanPref(prefs::kNewBaseUrlInheritanceBehaviorAllowed, + true); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1722,7 +1722,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1697,7 +1697,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique( is_integration_test, &startup_data_); @@ -73,7 +73,7 @@ main_parts = std::make_unique( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1761,7 +1761,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1736,7 +1736,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -82,7 +82,7 @@ main_parts->AddParts( std::make_unique()); #else -@@ -1782,7 +1782,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1757,7 +1757,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique()); #endif @@ -91,7 +91,7 @@ main_parts->AddParts(std::make_unique()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique()); -@@ -1801,7 +1801,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1776,7 +1776,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -100,7 +100,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2626,6 +2626,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2599,6 +2599,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -109,7 +109,7 @@ #elif BUILDFLAG(IS_CHROMEOS) bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -3020,7 +3022,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2996,7 +2998,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -118,7 +118,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4574,7 +4576,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4468,7 +4470,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -127,7 +127,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5093,7 +5095,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4989,7 +4991,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -136,7 +136,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5103,7 +5105,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4999,7 +5001,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -145,7 +145,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5142,7 +5144,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5038,7 +5040,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } @@ -154,7 +154,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -6849,7 +6851,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -6755,7 +6757,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS } bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index 0ef812447655..2d92f0eba5ec 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -460,7 +460,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -459,7 +459,7 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/chromium/files/patch-chrome_browser_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc index d03a43578178..3f8246d6adad 100644 --- a/www/chromium/files/patch-chrome_browser_defaults.cc +++ b/www/chromium/files/patch-chrome_browser_defaults.cc @@ -1,8 +1,8 @@ ---- chrome/browser/defaults.cc.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/defaults.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/defaults.cc -@@ -52,7 +52,7 @@ const bool kSyncAutoStarts = true; - const bool kSyncAutoStarts = false; - #endif +@@ -46,7 +46,7 @@ const bool kShowHelpMenuItemIcon = false; + + const bool kDownloadPageHasShowInFolder = true; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd index ef2e38396831..55fbd4b9187c 100644 --- a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/dev_ui_browser_resources.grd -@@ -34,7 +34,7 @@ This file specifies browser resources for developer-fa +@@ -35,7 +35,7 @@ This file specifies browser resources for developer-fa diff --git a/www/chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.cc b/www/chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.cc index 828bbdeac89c..b90ec745b50f 100644 --- a/www/chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.cc +++ b/www/chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.cc @@ -1,18 +1,18 @@ ---- chrome/browser/download/bubble/download_bubble_update_service.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/download/bubble/download_bubble_update_service.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/download/bubble/download_bubble_update_service.cc -@@ -87,7 +87,11 @@ ItemSortKey GetSortKey(const Item& item) { +@@ -91,7 +91,11 @@ ItemSortKey GetSortKey(const Item& item) { // Helper to get an iterator to the last element in the cache. The cache // must not be empty. template +#if defined(__clang__) && (__clang_major__ >= 16) - SortedItems::iterator GetLastIter(SortedItems& cache) { + SortedItems::const_iterator GetLastIter(const SortedItems& cache) { +#else -+typename SortedItems::iterator GetLastIter(SortedItems& cache) { ++typename SortedItems::const_iterator GetLastIter(const SortedItems& cache) { +#endif CHECK(!cache.empty()); auto it = cache.end(); return std::prev(it); -@@ -789,9 +793,17 @@ bool DownloadBubbleUpdateService::RemoveItemFromCacheI +@@ -967,9 +971,17 @@ bool DownloadBubbleUpdateService::CacheManager::Remove } template @@ -21,7 +21,7 @@ +#else +typename SortedItems::iterator +#endif - DownloadBubbleUpdateService::RemoveItemFromCacheByIter( + DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter( +#if defined(__clang__) && (__clang_major__ >= 16) SortedItems::iterator iter, +#else diff --git a/www/chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.h b/www/chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.h deleted file mode 100644 index 47015ae059c0..000000000000 --- a/www/chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.h +++ /dev/null @@ -1,13 +0,0 @@ ---- chrome/browser/download/bubble/download_bubble_update_service.h.orig 2023-04-28 17:01:32 UTC -+++ chrome/browser/download/bubble/download_bubble_update_service.h -@@ -208,8 +208,8 @@ class DownloadBubbleUpdateService - - // Removes item if we already have the iterator to it. Returns next iterator. - template -- SortedItems::iterator RemoveItemFromCacheByIter( -- SortedItems::iterator iter, -+ typename SortedItems::iterator RemoveItemFromCacheByIter( -+ typename SortedItems::iterator iter, - SortedItems& cache, - IterMap& iter_map); - diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 1bb2951c0abd..58c59eaafed2 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1565,7 +1565,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1567,7 +1567,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1684,7 +1684,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1686,7 +1686,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ // Don't download pdf if it is a file URL, as that might cause an infinite // download loop if Chrome is not the system pdf viewer. if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) { -@@ -1730,7 +1730,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -1732,7 +1732,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index 71cf3353ba69..65a798f665cc 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_item_model.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/download/download_item_model.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/download/download_item_model.cc @@ -766,7 +766,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1234,7 +1234,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1232,7 +1232,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc index 63a33db14312..5e7eee2dbaef 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,9 +1,9 @@ ---- chrome/browser/download/download_prefs.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/download/download_prefs.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/download/download_prefs.cc @@ -11,6 +11,7 @@ + #include #include "base/check.h" - #include "base/cxx17_backports.h" +#include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_util.h" diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc new file mode 100644 index 000000000000..b166f15a3fe1 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig 2023-07-16 15:47:57 UTC ++++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc +@@ -52,7 +52,7 @@ + #include "ui/base/l10n/l10n_util.h" + #include "ui/base/ui_base_types.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/connectors/analysis/content_analysis_sdk_manager.h" // nogncheck + #endif + +@@ -555,7 +555,7 @@ void ContentAnalysisDelegate::PageRequestCallback( + bool ContentAnalysisDelegate::UploadData() { + upload_start_time_ = base::TimeTicks::Now(); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If this is a local content analysis, check if the local agent is ready. + // If not, abort early. This is to prevent doing a lot of work, like reading + // files into memory or calcuating SHA256 hashes and prevent a flash of the diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.cc new file mode 100644 index 000000000000..2de10f7d9984 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.cc @@ -0,0 +1,82 @@ +--- chrome/browser/enterprise/connectors/connectors_manager.cc.orig 2023-07-16 15:47:57 UTC ++++ chrome/browser/enterprise/connectors/connectors_manager.cc +@@ -16,7 +16,7 @@ + #include "components/prefs/pref_service.h" + #include "url/gurl.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/connectors/analysis/content_analysis_sdk_manager.h" // nogncheck + #include "chrome/browser/ui/browser.h" + #include "chrome/browser/ui/browser_list.h" +@@ -25,7 +25,7 @@ + + namespace enterprise_connectors { + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + namespace { + + static constexpr enterprise_connectors::AnalysisConnector +@@ -51,7 +51,7 @@ ConnectorsManager::ConnectorsManager( + DCHECK(browser_crash_event_router_) << "Crash event router is null"; + DCHECK(extension_install_event_router_) << "Extension event router is null"; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Start observing tab strip models for all browsers. + BrowserList* browser_list = BrowserList::GetInstance(); + for (Browser* browser : *browser_list) { +@@ -62,14 +62,14 @@ ConnectorsManager::ConnectorsManager( + + if (observe_prefs) { + StartObservingPrefs(pref_service); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + MaybeCloseLocalContentAnalysisAgentConnection(); + #endif + } + extension_install_event_router_->StartObserving(); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ConnectorsManager::~ConnectorsManager() { + BrowserList* browser_list = BrowserList::GetInstance(); + browser_list->RemoveObserver(this); +@@ -99,7 +99,7 @@ bool ConnectorsManager::IsConnectorEnabled(AnalysisCon + base::FeatureList::IsEnabled(kLocalContentAnalysisEnabled); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool ConnectorsManager::IsConnectorEnabledForLocalAgent( + AnalysisConnector connector) const { + if (!IsConnectorEnabled(connector)) { +@@ -178,7 +178,7 @@ absl::optional ConnectorsManager::Ge + } + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void ConnectorsManager::OnBrowserAdded(Browser* browser) { + browser->tab_strip_model()->AddObserver(this); + } +@@ -241,7 +241,7 @@ void ConnectorsManager::CacheAnalysisConnectorPolicy( + service_settings, *service_provider_config_); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void ConnectorsManager::MaybeCloseLocalContentAnalysisAgentConnection() { + for (auto connector : kLocalAnalysisConnectors) { + if (IsConnectorEnabledForLocalAgent(connector)) { +@@ -257,7 +257,7 @@ void ConnectorsManager::MaybeCloseLocalContentAnalysis + + void ConnectorsManager::OnPrefChanged(AnalysisConnector connector) { + CacheAnalysisConnectorPolicy(connector); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + MaybeCloseLocalContentAnalysisAgentConnection(); + #endif + } diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.h b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.h new file mode 100644 index 000000000000..2396333e34aa --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.h @@ -0,0 +1,56 @@ +--- chrome/browser/enterprise/connectors/connectors_manager.h.orig 2023-07-16 15:47:57 UTC ++++ chrome/browser/enterprise/connectors/connectors_manager.h +@@ -16,7 +16,7 @@ + #include "third_party/abseil-cpp/absl/types/optional.h" + #include "url/gurl.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/browser_list_observer.h" + #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -31,7 +31,7 @@ class BrowserCrashEventRouter; + // Manages access to Connector policies for a given profile. This class is + // responsible for caching the Connector policies, validate them against + // approved service providers and provide a simple interface to them. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + class ConnectorsManager : public BrowserListObserver, + public TabStripModelObserver { + #else +@@ -51,7 +51,7 @@ class ConnectorsManager { + PrefService* pref_service, + const ServiceProviderConfig* config, + bool observe_prefs = true); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ~ConnectorsManager() override; + #else + ~ConnectorsManager(); +@@ -81,7 +81,7 @@ class ConnectorsManager { + bool IsConnectorEnabled(AnalysisConnector connector) const; + bool IsConnectorEnabled(ReportingConnector connector) const; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Check if the corresponding connector is enabled for any local agent. + bool IsConnectorEnabledForLocalAgent(AnalysisConnector connector) const; + #endif +@@ -109,7 +109,7 @@ class ConnectorsManager { + const; + + private: +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // BrowserListObserver overrides: + void OnBrowserAdded(Browser* browser) override; + void OnBrowserRemoved(Browser* browser) override; +@@ -132,7 +132,7 @@ class ConnectorsManager { + void CacheAnalysisConnectorPolicy(AnalysisConnector connector) const; + void CacheReportingConnectorPolicy(ReportingConnector connector); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Close connection with local agent if all the relevant connectors are turned + // off for it. + void MaybeCloseLocalContentAnalysisAgentConnection(); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc index 379ceec2a909..2a1138dc1dd5 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-03-09 06:31:50 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc @@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile.h" @@ -7,7 +7,7 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "chrome/browser/browser_process.h" - #include "chrome/browser/enterprise/connectors/device_trust/browser/browser_device_trust_connector_service.h" + #include "chrome/browser/enterprise/connectors/device_trust/browser/signing_key_policy_observer.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" @@ -41,7 +41,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi @@ -20,7 +20,7 @@ return false; @@ -77,7 +77,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil - DeviceTrustConnectorService* service = nullptr; + auto* service = new DeviceTrustConnectorService(profile->GetPrefs()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc index c6d92cfcfb6d..d4f3a44d7122 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc @@ -21,7 +21,7 @@ #include "components/policy/core/common/management/management_service.h" @@ -9,7 +9,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/connectors/device_trust/attestation/desktop/desktop_attestation_service.h" #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" -@@ -75,7 +75,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() +@@ -78,7 +78,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() DependsOn(DeviceTrustConnectorServiceFactory::GetInstance()); DependsOn(policy::ManagementServiceFactory::GetInstance()); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc index 4cabc491a934..5590377ae638 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc @@ -1,18 +1,18 @@ ---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc -@@ -14,7 +14,7 @@ BrowserCrashEventRouter::BrowserCrashEventRouter( - if (!base::FeatureList::IsEnabled(kBrowserCrashEventsEnabled)) { - return; - } +@@ -11,7 +11,7 @@ namespace enterprise_connectors { + + BrowserCrashEventRouter::BrowserCrashEventRouter( + content::BrowserContext* context) { -#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) +#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD) CrashReportingContext* crash_reporting_context = CrashReportingContext::GetInstance(); Profile* profile = Profile::FromBrowserContext(context); -@@ -27,7 +27,7 @@ BrowserCrashEventRouter::~BrowserCrashEventRouter() { - if (!base::FeatureList::IsEnabled(kBrowserCrashEventsEnabled)) { - return; - } +@@ -21,7 +21,7 @@ BrowserCrashEventRouter::BrowserCrashEventRouter( + } + + BrowserCrashEventRouter::~BrowserCrashEventRouter() { -#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) +#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD) CrashReportingContext* crash_reporting_context = diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index 0aaab8f95393..2ace0098adcb 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1348,6 +1348,10 @@ static_library("extensions") { +@@ -1350,6 +1350,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc index ed30073a08d1..c799727df626 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -544,7 +544,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( +@@ -534,7 +534,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { @@ -8,4 +8,4 @@ +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) PasswordsPrivateEventRouter* router = PasswordsPrivateEventRouterFactory::GetForProfile(profile_); - if (router) + if (router) { diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 71220f078ea4..6ef479601b22 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -194,7 +194,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] = + settings_api::PrefType::PREF_TYPE_BOOLEAN; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -208,7 +208,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -206,7 +206,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist settings_api::PrefType::PREF_TYPE_STRING; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::PREF_TYPE_NUMBER; diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index 4db7fae37fde..f57d014bdaf0 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -828,7 +828,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -829,7 +829,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique( service, base::MakeRefCounted( -@@ -856,7 +856,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -857,7 +857,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index 0e633207bf4b..760751041c63 100644 --- a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,7 +1,7 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -313,7 +313,7 @@ const struct { - {base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"), +@@ -317,7 +317,7 @@ const struct { + FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), kDontBlockChildren}, #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index f282faf94365..0ce65be49048 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2023-06-14 09:23:57 UTC +--- chrome/browser/flag_descriptions.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2456,7 +2456,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P +@@ -2423,7 +2423,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P const char kWebUIOmniboxPopupDescription[] = "If enabled, shows the omnibox suggestions popup in WebUI."; @@ -9,7 +9,7 @@ const char kWebUiSystemFontName[] = "WebUI System font"; const char kWebUiSystemFontDescription[] = "If enabled, all WebUI surfaces will use the default UI font of the " -@@ -6599,7 +6599,7 @@ const char kLibAssistantV2MigrationDescription[] = +@@ -6695,7 +6695,7 @@ const char kLibAssistantV2MigrationDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -18,7 +18,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -6845,7 +6845,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -6926,7 +6926,7 @@ const char kSearchWebInSidePanelDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ const char kQuickCommandsName[] = "Quick Commands"; const char kQuickCommandsDescription[] = "Enable a text interface to browser features. Invoke with Ctrl-Space."; -@@ -6854,7 +6854,7 @@ const char kQuickCommandsDescription[] = +@@ -6935,7 +6935,7 @@ const char kQuickCommandsDescription[] = // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -6876,7 +6876,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] +@@ -6957,7 +6957,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] "instead of JSON."; #endif @@ -45,7 +45,7 @@ const char kUseOutOfProcessVideoDecodingName[] = "Use out-of-process video decoding (OOP-VD)"; const char kUseOutOfProcessVideoDecodingDescription[] = -@@ -6894,7 +6894,7 @@ const char kWebShareDescription[] = +@@ -6975,7 +6975,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -54,7 +54,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -6914,7 +6914,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -6995,7 +6995,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -63,7 +63,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -6928,7 +6928,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -7009,7 +7009,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -72,7 +72,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -7029,7 +7029,7 @@ const char kElasticOverscrollDescription[] = +@@ -7110,7 +7110,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -81,7 +81,7 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -7058,7 +7058,7 @@ const char kSigninInterceptBubbleV2Description[] = +@@ -7139,7 +7139,7 @@ const char kSigninInterceptBubbleV2Description[] = #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 4009aacfff47..05f1bf643acf 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2023-06-14 09:23:57 UTC +--- chrome/browser/flag_descriptions.h.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/flag_descriptions.h -@@ -1382,7 +1382,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd +@@ -1360,7 +1360,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd extern const char kWebUIOmniboxPopupName[]; extern const char kWebUIOmniboxPopupDescription[]; @@ -9,8 +9,8 @@ extern const char kWebUiSystemFontName[]; extern const char kWebUiSystemFontDescription[]; #endif -@@ -3818,7 +3818,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[ - extern const char kLacrosScreenCoordinatesEnabledDescription[]; +@@ -3856,7 +3856,7 @@ extern const char kLacrosMergeIcuDataFileName[]; + extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) @@ -18,7 +18,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -3945,14 +3945,14 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -3980,14 +3980,14 @@ extern const char kSearchWebInSidePanelDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -35,7 +35,7 @@ extern const char kWebShareName[]; extern const char kWebShareDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -3962,7 +3962,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -3997,7 +3997,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -44,7 +44,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -3972,7 +3972,7 @@ extern const char kOzonePlatformHintName[]; +@@ -4007,7 +4007,7 @@ extern const char kOzonePlatformHintName[]; extern const char kOzonePlatformHintDescription[]; #endif // BUILDFLAG(IS_LINUX) @@ -53,7 +53,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -3980,13 +3980,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -4015,13 +4015,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -69,7 +69,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4002,7 +4002,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; +@@ -4037,7 +4037,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; extern const char kEnableProtoApiForClassifyUrlDescription[]; #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -78,7 +78,7 @@ extern const char kUseOutOfProcessVideoDecodingName[]; extern const char kUseOutOfProcessVideoDecodingDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -4076,7 +4076,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -4111,7 +4111,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -87,7 +87,7 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; -@@ -4094,7 +4094,7 @@ extern const char kSigninInterceptBubbleV2Description[ +@@ -4129,7 +4129,7 @@ extern const char kSigninInterceptBubbleV2Description[ #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ diff --git a/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc index b201aeefaae0..d8f0b3e75e85 100644 --- a/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc +++ b/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/headless/headless_mode_util.cc.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/headless/headless_mode_util.cc @@ -10,12 +10,12 @@ // New headless mode is available on Linux, Windows and Mac platforms. @@ -15,10 +15,10 @@ #include "ui/gl/gl_switches.h" // nogncheck #include "ui/ozone/public/ozone_switches.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) -@@ -72,7 +72,7 @@ void SetUpCommandLine(const base::CommandLine* command - base::CommandLine::ForCurrentProcess()->AppendSwitch( - ::switches::kNoErrorDialogs); - } +@@ -78,7 +78,7 @@ void SetUpCommandLine(const base::CommandLine* command + base::CommandLine::ForCurrentProcess()->AppendSwitch( + switches::kDisableLazyLoading); + -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Headless mode on Linux relies on ozone/headless platform. diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc index 8e33f6757d7b..d20da39a3685 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc @@ -1,18 +1,18 @@ ---- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/media/webrtc/capture_policy_utils.cc -@@ -125,7 +125,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const +@@ -124,7 +124,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const + } - bool IsGetDisplayMediaSetSelectAllScreensAllowedForAnySite( - content::BrowserContext* context) { + bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) { -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) Profile* profile = Profile::FromBrowserContext(context); if (!profile) { return false; -@@ -162,7 +162,7 @@ bool IsGetDisplayMediaSetSelectAllScreensAllowedForAny - bool IsGetDisplayMediaSetSelectAllScreensAllowed( - content::BrowserContext* context, - const GURL& url) { +@@ -160,7 +160,7 @@ bool IsGetAllScreensMediaAllowedForAnySite(content::Br + + bool IsGetAllScreensMediaAllowed(content::BrowserContext* context, + const GURL& url) { -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) Profile* profile = Profile::FromBrowserContext(context); diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc index 9c3ae1596e5c..9590d856da07 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc @@ -21,7 +21,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) @@ -36,9 +36,9 @@ void ChromeScreenEnumerator::SetDesktopCapturerForTesting( std::unique_ptr capturer) { g_desktop_capturer_for_testing.Get() = std::move(capturer); -@@ -146,7 +146,7 @@ void ChromeScreenEnumerator::EnumerateScreens( - features::kGetDisplayMediaSetAutoSelectAllScreens)) || - base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia)); +@@ -143,7 +143,7 @@ void ChromeScreenEnumerator::EnumerateScreens( + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); + DCHECK(base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia)); -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc index 31c9b5208ea6..acef12a71c99 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2023-03-09 06:31:50 UTC +--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -41,7 +41,7 @@ const char kProduct[] = "Chrome"; +@@ -42,7 +42,7 @@ const char kProduct[] = "Chrome"; const char kProduct[] = "Chrome_Mac"; #elif BUILDFLAG(IS_CHROMEOS_ASH) const char kProduct[] = "Chrome_ChromeOS"; diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index 1a13efa5e189..881b2b99fc06 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -66,8 +66,10 @@ +@@ -67,8 +67,10 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -12,7 +12,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -101,7 +103,7 @@ +@@ -102,7 +104,7 @@ #include "chromeos/startup/startup_switches.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -21,7 +21,16 @@ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -528,7 +530,7 @@ void RecordStartupMetrics() { +@@ -111,7 +113,7 @@ + #include "components/user_manager/user_manager.h" + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/power_metrics/system_power_monitor.h" + #endif + +@@ -533,7 +535,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -30,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -728,7 +730,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -742,11 +744,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) @@ -39,3 +48,8 @@ pressure_metrics_reporter_ = std::make_unique(); #endif // BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::trace_event::TraceLog::GetInstance()->AddEnabledStateObserver( + power_metrics::SystemPowerMonitor::GetInstance()); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h index a1be9bde66c4..68b4480006d3 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h @@ -1,4 +1,4 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h @@ -32,7 +32,7 @@ class PowerMetricsReporter; class ProcessMonitor; @@ -9,7 +9,7 @@ class PressureMetricsReporter; #endif // BUILDFLAG(IS_LINUX) -@@ -132,7 +132,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro +@@ -133,7 +133,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro std::unique_ptr battery_discharge_reporter_; #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index b5480d5673b5..93b370294e33 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -178,7 +178,7 @@ +@@ -183,7 +183,7 @@ #include "chrome/notification_helper/notification_helper_constants.h" #endif @@ -9,7 +9,7 @@ #include "components/metrics/motherboard_metrics_provider.h" #endif -@@ -204,7 +204,7 @@ +@@ -209,7 +209,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ #include "chrome/browser/metrics/family_link_user_metrics_provider.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS_LACROS))||BUILDFLAG(IS_ANDROID)) -@@ -770,7 +770,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -795,7 +795,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique()); @@ -27,7 +27,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique()); #endif -@@ -849,7 +849,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -877,7 +877,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics_service_->RegisterMetricsProvider( std::make_unique()); -@@ -858,7 +858,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -886,7 +886,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic #if BUILDFLAG(ENABLE_SUPERVISED_USERS) && \ (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,7 +45,7 @@ if (base::FeatureList::IsEnabled( kExtendFamilyLinkUserLogSegmentToAllPlatforms)) { metrics_service_->RegisterMetricsProvider( -@@ -966,7 +966,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -1002,7 +1002,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique()); #endif @@ -54,7 +54,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1163,7 +1163,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1201,7 +1201,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index bb4cd439949e..0b66c74b7fcc 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -93,7 +93,7 @@ @@ -18,7 +18,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -456,7 +456,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -445,7 +445,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -27,7 +27,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -503,7 +503,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -492,7 +492,7 @@ SystemNetworkContextManager::SystemNetworkContextManag #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ pref_change_registrar_.Add( prefs::kEnforceLocalAnchorConstraintsEnabled, base::BindRepeating(&SystemNetworkContextManager:: -@@ -553,7 +553,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -541,7 +541,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -45,7 +45,7 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -582,7 +582,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -570,7 +570,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false); #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -54,7 +54,7 @@ // Note that the default value is not relevant because the pref is only // evaluated when it is managed. registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled, -@@ -1004,7 +1004,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor +@@ -992,7 +992,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc index e84dc4c7445c..e6649dc32884 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2023-02-08 09:03:45 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -101,7 +101,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic +@@ -106,7 +106,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index f6326517f71f..97717307baf3 100644 --- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,13 +1,13 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -206,12 +206,12 @@ +@@ -210,12 +210,12 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/idle/action.h" - #include "components/device_signals/core/browser/pref_names.h" + #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897 #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -15,7 +15,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -770,14 +770,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -780,14 +780,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -32,8 +32,8 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1431,7 +1431,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::BOOLEAN }, +@@ -1444,7 +1444,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) @@ -41,7 +41,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1501,18 +1501,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1514,18 +1514,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -63,7 +63,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1525,7 +1525,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1538,7 +1538,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ @@ -72,7 +72,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1629,7 +1629,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1642,7 +1642,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -81,7 +81,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1725,13 +1725,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1738,13 +1738,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) @@ -97,7 +97,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1762,7 +1762,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1775,7 +1775,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -106,25 +106,34 @@ { key::kEnforceLocalAnchorConstraintsEnabled, prefs::kEnforceLocalAnchorConstraintsEnabled, base::Value::Type::BOOLEAN }, -@@ -1844,7 +1844,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1857,7 +1857,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - { key::kHighEfficiencyModeEnabled, - performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled, - base::Value::Type::BOOLEAN }, -@@ -1889,7 +1889,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI, - base::Value::Type::BOOLEAN }, - #endif // BUILDFLAG(ENABLE_PPAPI) + { key::kBatterySaverModeAvailability, + performance_manager::user_tuning::prefs::kBatterySaverModeState, + base::Value::Type::INTEGER }, +@@ -1888,7 +1888,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kCloudApAuthEnabled, + base::Value::Type::INTEGER }, + #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2156,7 +2156,7 @@ std::unique_ptr BuildH +@@ -1978,7 +1978,7 @@ std::unique_ptr BuildH + // Policies for all platforms - End + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + handlers->AddHandler( + std::make_unique()); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -2177,7 +2177,7 @@ std::unique_ptr BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -133,7 +142,7 @@ handlers->AddHandler( std::make_unique()); handlers->AddHandler( -@@ -2213,7 +2213,7 @@ std::unique_ptr BuildH +@@ -2234,7 +2234,7 @@ std::unique_ptr BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -141,8 +150,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) handlers->AddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -2248,7 +2248,7 @@ std::unique_ptr BuildH + handlers->AddHandler( +@@ -2275,7 +2275,7 @@ std::unique_ptr BuildH std::vector> signin_legacy_policies; #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -151,7 +160,7 @@ signin_legacy_policies.push_back(std::make_unique( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -2604,7 +2604,7 @@ std::unique_ptr BuildH +@@ -2633,7 +2633,7 @@ std::unique_ptr BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -160,7 +169,7 @@ handlers->AddHandler(std::make_unique()); handlers->AddHandler( std::make_unique( -@@ -2612,7 +2612,7 @@ std::unique_ptr BuildH +@@ -2641,7 +2641,7 @@ std::unique_ptr BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -169,7 +178,7 @@ handlers->AddHandler(std::make_unique( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -2625,7 +2625,7 @@ std::unique_ptr BuildH +@@ -2654,7 +2654,7 @@ std::unique_ptr BuildH handlers->AddHandler( std::make_unique( chrome_schema)); diff --git a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc index 56bc422f9731..08f07bb81b92 100644 --- a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc +++ b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/device_management_service_configuration.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/policy/device_management_service_configuration.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/policy/device_management_service_configuration.cc -@@ -21,7 +21,7 @@ +@@ -22,7 +22,7 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ diff --git a/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc b/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc index 264a3cec6660..027b3b488fde 100644 --- a/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc +++ b/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/policy/policy_value_and_status_aggregator.cc -@@ -55,7 +55,7 @@ +@@ -52,7 +52,7 @@ #include "chrome/browser/policy/value_provider/extension_policies_value_provider.h" #endif // BUILDFLAG(ENABLE_EXTENSIONS) @@ -9,7 +9,7 @@ #include "components/policy/core/common/cloud/profile_cloud_policy_manager.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -106,7 +106,7 @@ std::unique_ptr GetUserP +@@ -98,7 +98,7 @@ std::unique_ptr GetUserP #else // BUILDFLAG(IS_CHROMEOS_ASH) policy::CloudPolicyManager* cloud_policy_manager = profile->GetUserCloudPolicyManager(); diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index b445a3781892..2721bb27c0d5 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,12 +1,12 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -465,13 +465,13 @@ - #include "components/os_crypt/sync/os_crypt.h" +@@ -464,13 +464,13 @@ #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "components/device_signals/core/browser/pref_names.h" + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897 #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch @@ -16,7 +16,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -504,7 +504,7 @@ +@@ -503,7 +503,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -25,7 +25,7 @@ #include "ui/color/system_theme.h" #endif -@@ -731,7 +731,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li +@@ -708,7 +708,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li const char kPluginsShowDetails[] = "plugins.show_details"; // Deprecated 02/2023. @@ -34,7 +34,7 @@ const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -872,7 +872,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS +@@ -902,7 +902,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Deprecated 02/2023. @@ -43,7 +43,7 @@ registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -987,7 +987,7 @@ void RegisterProfilePrefsForMigration( +@@ -1027,7 +1027,7 @@ void RegisterProfilePrefsForMigration( registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0); #endif @@ -52,21 +52,22 @@ // Deprecated 08/2022. registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false); #endif -@@ -1690,11 +1690,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync - safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); +@@ -1762,12 +1762,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) device_signals::RegisterProfilePrefs(registry); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif -@@ -1857,7 +1857,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local +@@ -1920,7 +1920,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Added 02/2023 @@ -75,7 +76,7 @@ local_state->ClearPref(kWebAppsUrlHandlerInfo); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1992,7 +1992,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { +@@ -2060,7 +2060,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { profile_prefs->ClearPref(kProfileAvatarTutorialShown); #endif diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index 9cb93df7856d..7b39985588f0 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,11 +1,11 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -167,7 +167,7 @@ const char* const kPersistentPrefNames[] = { +@@ -165,7 +165,7 @@ const char* const kPersistentPrefNames[] = { + prefs::kShowFullscreenToolbar, + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Toggleing custom frames affects all open windows in the profile, hence // should be written to the regular profile when changed in incognito mode. prefs::kUseCustomChromeFrame, diff --git a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc index e13e2da04e41..350f4687a6e8 100644 --- a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc +++ b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/printing/print_backend_service_manager.cc @@ -687,7 +687,7 @@ PrintBackendServiceManager::RegisterClient( query_clients_.insert(client_id); @@ -27,12 +27,3 @@ // No need to update if there were other query with UI clients. if (HasQueryWithUiClientForRemoteId(remote_id)) { return absl::nullopt; -@@ -1477,7 +1477,7 @@ template - void PrintBackendServiceManager::RunSavedCallbacks( - RemoteSavedCallbacks& saved_callbacks, - const RemoteId& remote_id, -- std::remove_reference::type... result) { -+ typename std::remove_reference::type... result) { - auto found_callbacks_map = saved_callbacks.find(remote_id); - if (found_callbacks_map == saved_callbacks.end()) - return; // No callbacks to run. diff --git a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h deleted file mode 100644 index d7c9307957bc..000000000000 --- a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/printing/print_backend_service_manager.h.orig 2023-05-31 08:12:17 UTC -+++ chrome/browser/printing/print_backend_service_manager.h -@@ -587,7 +587,7 @@ class PrintBackendServiceManager { - template - void RunSavedCallbacks(RemoteSavedCallbacks& saved_callbacks, - const RemoteId& remote_id, -- std::remove_reference::type... result); -+ typename std::remove_reference::type... result); - - // Test support for client ID management. - static void SetClientsForTesting( diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 59c95f5c6cc1..a2c6101720e9 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -363,17 +363,17 @@ +@@ -364,18 +364,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -8,6 +8,7 @@ + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.h" #include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h" + #include "chrome/browser/enterprise/signals/user_permission_service_factory.h" #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -21,7 +22,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" -@@ -543,7 +543,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -545,7 +545,7 @@ void ChromeBrowserMainExtraPartsProfiles:: BreadcrumbManagerKeyedServiceFactory::GetInstance(); } browser_sync::UserEventServiceFactory::GetInstance(); @@ -30,7 +31,7 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif BrowsingDataHistoryObserverService::Factory::GetInstance(); -@@ -614,16 +614,16 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -616,17 +616,17 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_ANDROID) DriveServiceFactory::GetInstance(); #endif @@ -42,6 +43,7 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + enterprise_signals::UserPermissionServiceFactory::GetInstance(); enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); #endif @@ -50,7 +52,7 @@ enterprise_connectors::LocalBinaryUploadServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -729,12 +729,12 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -732,12 +732,12 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -65,7 +67,7 @@ enterprise_idle::IdleServiceFactory::GetInstance(); #endif ModelTypeStoreServiceFactory::GetInstance(); -@@ -801,7 +801,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -805,7 +805,7 @@ void ChromeBrowserMainExtraPartsProfiles:: PredictionServiceFactory::GetInstance(); PrimaryAccountPolicyManagerFactory::GetInstance(); diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc index 1b0d866547c9..0f010b3b45e7 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -263,6 +263,10 @@ +@@ -262,6 +262,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -611,7 +615,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async +@@ -606,7 +610,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async #else { #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -20,7 +20,7 @@ ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage() -@@ -886,7 +890,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -881,7 +885,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index d98f1675fc4f..7b75e2403a56 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/renderer_preferences_util.cc @@ -36,7 +36,7 @@ #include "ui/views/controls/textfield/textfield.h" @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/linux/linux_ui.h" -@@ -155,7 +155,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -149,7 +149,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval(); #endif @@ -18,7 +18,7 @@ auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); if (linux_ui_theme) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -178,7 +178,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -172,7 +172,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html b/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html index faa9cd8cc5ea..4ef5cd50b516 100644 --- a/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html +++ b/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html @@ -1,38 +1,20 @@ ---- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html -@@ -492,7 +492,7 @@ - consent-confirmation autofocus> - $i18n{syncConfirmationConfirmLabel} - -- -+ - - $i18n{syncConfirmationSettingsLabel} -@@ -502,7 +502,7 @@ - disabled="[[anyButtonClicked_]]"> - $i18n{syncConfirmationUndoLabel} - -- -+ - - $i18n{syncConfirmationSettingsLabel} -@@ -546,7 +546,7 @@ - consent-confirmation> - $i18n{syncConfirmationConfirmLabel} - -- -+ - - $i18n{syncConfirmationSettingsLabel} -@@ -556,7 +556,7 @@ - disabled="[[anyButtonClicked_]]"> - $i18n{syncConfirmationUndoLabel} - -- -+ - - $i18n{syncConfirmationSettingsLabel} +@@ -290,7 +290,7 @@ + autofocus="[[isModalDialog_]]"> + $i18n{syncConfirmationConfirmLabel} + +- ++ + + $i18n{syncConfirmationSettingsLabel} +@@ -300,7 +300,7 @@ + disabled="[[anyButtonClicked_]]"> + $i18n{syncConfirmationUndoLabel} + +- ++ + + $i18n{syncConfirmationSettingsLabel} diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc index da2a6a7844ae..4645679da96e 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc @@ -18,7 +18,7 @@ #include "net/base/url_util.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #endif -@@ -368,7 +368,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil +@@ -383,7 +383,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil Profile* profile, const enterprise_connectors::AnalysisSettings& settings) { // Local content analysis is supported only on desktop platforms. diff --git a/www/chromium/files/patch-chrome_browser_signin_bound__session__credentials_bound__session__refresh__cookie__fetcher__impl.cc b/www/chromium/files/patch-chrome_browser_signin_bound__session__credentials_bound__session__refresh__cookie__fetcher__impl.cc new file mode 100644 index 000000000000..45a485329af7 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_signin_bound__session__credentials_bound__session__refresh__cookie__fetcher__impl.cc @@ -0,0 +1,11 @@ +--- chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc.orig 2023-07-16 15:47:57 UTC ++++ chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc +@@ -103,6 +103,6 @@ void BoundSessionRefreshCookieFetcherImpl::OnURLLoader + net::Error net_error = static_cast(url_loader_->NetError()); + + std::move(callback_).Run( +- Result(net_error, headers ? absl::optional(headers->response_code()) +- : absl::nullopt)); ++ Result({net_error, headers ? absl::optional(headers->response_code()) ++ : absl::nullopt})); + } diff --git a/www/chromium/files/patch-chrome_browser_signin_bound__session__credentials_fake__bound__session__refresh__cookie__fetcher.cc b/www/chromium/files/patch-chrome_browser_signin_bound__session__credentials_fake__bound__session__refresh__cookie__fetcher.cc new file mode 100644 index 000000000000..068a01efe47d --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_signin_bound__session__credentials_fake__bound__session__refresh__cookie__fetcher.cc @@ -0,0 +1,32 @@ +--- chrome/browser/signin/bound_session_credentials/fake_bound_session_refresh_cookie_fetcher.cc.orig 2023-07-16 15:47:57 UTC ++++ chrome/browser/signin/bound_session_credentials/fake_bound_session_refresh_cookie_fetcher.cc +@@ -51,7 +51,11 @@ void FakeBoundSessionRefreshCookieFetcher::SimulateCom + // Synchronous since tests use `BoundSessionTestCookieManager`. + OnRefreshCookieCompleted(CreateFakeCookie(cookie_expiration.value())); + } else { ++#if defined(__clang__) && (__clang_major__ >= 15) + std::move(callback_).Run(Result(net::Error::OK, net::HTTP_FORBIDDEN)); ++#else ++ std::move(callback_).Run(Result({net::Error::OK, net::HTTP_FORBIDDEN})); ++#endif + } + } + +@@ -83,9 +87,17 @@ void FakeBoundSessionRefreshCookieFetcher::OnCookieSet + net::CookieAccessResult access_result) { + bool success = access_result.status.IsInclude(); + if (!success) { ++#if defined(__clang__) && (__clang_major__ >= 15) + std::move(callback_).Run(Result(net::Error::OK, net::HTTP_FORBIDDEN)); ++#else ++ std::move(callback_).Run(Result({net::Error::OK, net::HTTP_FORBIDDEN})); ++#endif + } else { ++#if defined(__clang__) && (__clang_major__ >= 15) + std::move(callback_).Run(Result(net::Error::OK, net::HTTP_OK)); ++#else ++ std::move(callback_).Run(Result({net::Error::OK, net::HTTP_OK})); ++#endif + } + // |This| may be destroyed + } diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc index d5caa475b486..2746ca27f70f 100644 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/supervised_user/supervised_user_navigation_observer.cc -@@ -41,7 +41,7 @@ +@@ -44,7 +44,7 @@ #include "chrome/browser/supervised_user/android/supervised_user_web_content_handler_impl.h" #elif BUILDFLAG(IS_CHROMEOS) #include "chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.h" @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.h" #endif -@@ -61,7 +61,7 @@ std::unique_ptr Cr +@@ -64,7 +64,7 @@ std::unique_ptr Cr #elif BUILDFLAG(IS_ANDROID) return std::make_unique( web_contents, frame_id, navigation_id); diff --git a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc index 7b5d4c095569..5ccfd03a2f19 100644 --- a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/sync/sync_service_factory.cc @@ -74,7 +74,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -18,7 +18,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); -@@ -257,7 +257,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -244,7 +244,7 @@ SyncServiceFactory::SyncServiceFactory() DependsOn(ThemeServiceFactory::GetInstance()); #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc index e7208f340f50..492e7c4a6bf6 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2022-10-24 13:33:33 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/themes/theme_service_factory.cc @@ -23,11 +23,11 @@ @@ -14,7 +14,7 @@ #include "ui/linux/linux_ui_factory.h" #endif -@@ -81,7 +81,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; +@@ -86,7 +86,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; KeyedService* ThemeServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { @@ -23,7 +23,7 @@ using ThemeService = ThemeServiceAuraLinux; #endif -@@ -95,9 +95,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( +@@ -100,9 +100,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index e04055c2ec8c..dc3c23a46a60 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -110,7 +110,7 @@ - #include "components/user_manager/user_manager.h" +@@ -119,7 +119,7 @@ + #define ENABLED_VLOG_LEVEL 1 #endif -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -298,7 +298,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -310,7 +310,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -550,7 +550,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -561,7 +561,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,16 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -1151,7 +1151,7 @@ void BrowserCommandController::InitCommandState() { +@@ -573,7 +573,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo + break; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + case IDC_USE_SYSTEM_TITLE_BAR: { + PrefService* prefs = profile()->GetPrefs(); + prefs->SetBoolean(prefs::kUseCustomChromeFrame, +@@ -1175,12 +1175,12 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,3 +45,9 @@ command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true); + #endif +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool use_system_title_bar = true; + #if BUILDFLAG(IS_OZONE) + use_system_title_bar = ui::OzonePlatform::GetInstance() diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc index 12ee7704ad9e..b86b58a46dcd 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/ui/browser_view_prefs.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/browser_view_prefs.cc -@@ -17,7 +17,7 @@ namespace { +@@ -15,7 +15,7 @@ - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + namespace { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool GetCustomFramePrefDefault() { #if BUILDFLAG(IS_OZONE) return ui::OzonePlatform::GetInstance() -@@ -35,7 +35,7 @@ void RegisterBrowserViewProfilePrefs( +@@ -31,7 +31,7 @@ bool GetCustomFramePrefDefault() { + + void RegisterBrowserViewProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, GetCustomFramePrefDefault()); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc index 15ad283a6105..ac36ccd988cc 100644 --- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/chrome_pages.cc @@ -69,7 +69,7 @@ #endif @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -663,7 +663,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, +@@ -662,7 +662,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc b/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc new file mode 100644 index 000000000000..8511b1e8e5d9 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/managed_ui.cc.orig 2023-07-16 15:47:57 UTC ++++ chrome/browser/ui/managed_ui.cc +@@ -92,7 +92,7 @@ bool ShouldDisplayManagedByParentUi(Profile* profile) + return false; + #else + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // The EnableManagedByParentUiOnDesktop flag depends on + // EnableSupervisionOnDesktopAndIOS. + CHECK( diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index 4d5f2e2fffe3..d577ca7cd241 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -132,7 +132,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" @@ -9,7 +9,7 @@ #include "chrome/browser/headless/headless_mode_util.h" #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h" #include "components/headless/policy/headless_mode_policy.h" -@@ -961,7 +961,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -917,7 +917,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl"); ComputeAndRecordLaunchMode(command_line); @@ -18,7 +18,7 @@ if (headless::IsHeadlessMode() && headless::HeadlessModePolicy::IsHeadlessModeDisabled( g_browser_process->local_state())) { -@@ -1065,7 +1065,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1021,7 +1021,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( silent_launch = true; } @@ -27,7 +27,7 @@ // Writes open and installed web apps to the specified file without // launching a new browser window or tab. if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) && -@@ -1257,7 +1257,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1232,7 +1232,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow) << "Failed launch with app: couldn't pick a profile"; std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc index e4cc5440e9ee..173a532c0676 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -263,7 +263,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -260,7 +260,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( // at the state of the MessageLoop. Browser::CreateParams params = Browser::CreateParams(profile_, false); params.creation_source = Browser::CreationSource::kStartupCreator; diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index 49c368c8b738..72b8cb958dee 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -208,7 +208,7 @@ +@@ -211,7 +211,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -546,12 +546,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -560,12 +560,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc b/www/chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc new file mode 100644 index 000000000000..d5be3643cdb5 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/test/popup_browsertest.cc.orig 2023-07-16 15:47:57 UTC ++++ chrome/browser/ui/test/popup_browsertest.cc +@@ -74,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenLeftAndTopZeroCo + const display::Display display = GetDisplayNearestBrowser(popup); + gfx::Rect expected(popup->window()->GetBounds().size()); + expected.AdjustToFit(display.work_area()); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/1286870) Desktop Linux window bounds are inaccurate. + expected.Outset(50); + EXPECT_TRUE(expected.Contains(popup->window()->GetBounds())) +@@ -106,7 +106,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenClampedToCurrent + // The popup should be constrained to the opener's available display space. + EXPECT_EQ(display, GetDisplayNearestBrowser(popup)); + gfx::Rect work_area(display.work_area()); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/1286870) Desktop Linux bounds flakily extend outside the + // work area on trybots, when opening with excessive width and height, e.g.: + // width=${screen.availWidth+300},height=${screen.availHeight+300} yields: diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc new file mode 100644 index 000000000000..06ba75614acd --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/test/test_browser_ui.cc.orig 2023-07-16 15:47:57 UTC ++++ chrome/browser/ui/test/test_browser_ui.cc +@@ -22,7 +22,7 @@ + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + #include "ui/base/test/skia_gold_matching_algorithm.h" + #include "ui/compositor/compositor.h" +@@ -34,7 +34,7 @@ + // TODO(https://crbug.com/958242) support Mac for pixel tests. + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) + #define SUPPORTS_PIXEL_TEST + #endif + diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc index bd09c0c8074b..df4e5ff58bc6 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/ui_features.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/ui_features.cc -@@ -306,7 +306,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -298,7 +298,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, "TopChromeWebUIUsesSpareRenderer", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.h b/www/chromium/files/patch-chrome_browser_ui_ui__features.h index 6bce0fbfcc8c..fd96b2371070 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.h.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/ui_features.h.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/ui_features.h -@@ -203,7 +203,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); +@@ -201,7 +201,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index c27bdf08a931..dcde17f2a16a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2023-03-09 06:31:50 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -65,11 +65,11 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -69,11 +69,11 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, @@ -14,7 +14,7 @@ {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_PREVIOUS}, -@@ -97,7 +97,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -101,7 +101,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, @@ -23,7 +23,7 @@ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -142,7 +142,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -146,7 +146,7 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. @@ -32,7 +32,7 @@ {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, -@@ -243,7 +243,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -247,7 +247,7 @@ const AcceleratorMapping kAcceleratorMap[] = { #endif // !BUILDFLAG(IS_CHROMEOS) #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index 64b5e3c207d9..e4a228027064 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -51,7 +51,7 @@ #include "components/user_manager/user_manager.h" @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #include "ui/linux/linux_ui.h" #endif -@@ -59,7 +59,7 @@ +@@ -63,7 +63,7 @@ namespace { bool IsUsingLinuxSystemTheme(Profile* profile) { @@ -18,7 +18,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -298,7 +298,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -303,7 +303,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(), IsVisibleOnAllWorkspaces()); @@ -27,7 +27,7 @@ // If the window was sent to a different workspace, prioritize it if // it was sent to the current workspace and deprioritize it // otherwise. This is done by MoveBrowsersInWorkspaceToFront() -@@ -456,7 +456,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -490,7 +490,7 @@ void BrowserFrame::SelectNativeTheme() { return; } @@ -36,7 +36,7 @@ const auto* linux_ui_theme = ui::LinuxUiTheme::GetForWindow(GetNativeWindow()); // Ignore the system theme for web apps with window-controls-overlay as the -@@ -473,7 +473,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -507,7 +507,7 @@ void BrowserFrame::SelectNativeTheme() { bool BrowserFrame::RegenerateFrameOnThemeChange( BrowserThemeChangeType theme_change_type) { bool need_regenerate = false; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h index d1c3274d005e..cb2cd4f6e153 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/views/frame/browser_frame.h @@ -12,7 +12,7 @@ #include "ui/views/context_menu_controller.h" @@ -18,7 +18,7 @@ // Returns which edges of the frame are tiled. const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; } void set_tiled_edges(ui::WindowTiledEdges tiled_edges) { -@@ -232,7 +232,7 @@ class BrowserFrame : public views::Widget, public view +@@ -233,7 +233,7 @@ class BrowserFrame : public views::Widget, public view // contents for smoother dragging. TabDragKind tab_drag_kind_ = TabDragKind::kNone; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 1fcd3afadd3a..5c91256ff922 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1997,7 +1997,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2004,7 +2004,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc index c11de64711f0..24c65300a1bc 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -42,7 +42,7 @@ +@@ -45,7 +45,7 @@ #include "ui/aura/window.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h" #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h" #endif -@@ -63,7 +63,7 @@ constexpr int kBackToTabImageSize = 16; +@@ -67,7 +67,7 @@ constexpr int kBackToTabImageSize = 16; // The height of the controls bar at the top of the window. constexpr int kTopControlsHeight = 30; @@ -18,7 +18,7 @@ // Frame border when window shadow is not drawn. constexpr int kFrameBorderThickness = 4; #endif -@@ -153,7 +153,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -159,7 +159,7 @@ class WindowEventObserver : public ui::EventObserver { gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); @@ -27,7 +27,7 @@ // Calculate input bounds for Linux. This is needed because the input bounds // is not necessary the same as the local bounds on Linux. if (pip_browser_frame_view_->ShouldDrawFrameShadow()) { -@@ -350,7 +350,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -358,7 +358,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow hide_close_button_animation_.set_continuous(false); hide_close_button_animation_.set_delegate(this); @@ -36,7 +36,7 @@ frame_background_ = std::make_unique(); #endif -@@ -480,7 +480,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -491,7 +491,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( for (ContentSettingImageView* view : content_setting_views_) view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); @@ -45,7 +45,7 @@ // On Linux the top bar background will be drawn in OnPaint(). top_bar_container_view_->SetBackground(views::CreateSolidBackground( color_provider->GetColor(kColorPipWindowTopBarBackground))); -@@ -525,7 +525,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -536,7 +536,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -726,7 +726,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -743,7 +743,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre // views::View implementations: void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { @@ -63,7 +63,7 @@ // Draw the PiP window frame borders and shadows, including the top bar // background. if (window_frame_provider_) { -@@ -849,7 +849,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -866,7 +866,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -72,16 +72,16 @@ if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const auto tiled_edges = frame()->tiled_edges(); -@@ -870,7 +870,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -887,7 +887,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return FrameBorderInsets(); - #else - return gfx::Insets(kResizeBorder); -@@ -889,7 +889,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie + #elif BUILDFLAG(IS_CHROMEOS_ASH) + return gfx::Insets(chromeos::kResizeInsideBoundsSize); +@@ -908,7 +908,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h index 5440df2444b0..556410cb9d91 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h @@ -20,7 +20,7 @@ #include "ui/views/controls/image_view.h" @@ -18,7 +18,7 @@ gfx::Insets MirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -163,7 +163,7 @@ class PictureInPictureBrowserFrameView +@@ -164,7 +164,7 @@ class PictureInPictureBrowserFrameView // Called when mouse entered or exited the pip window. void OnMouseEnteredOrExitedWindow(bool entered); @@ -27,7 +27,7 @@ // Sets the window frame provider so that it will be used for drawing. void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider); -@@ -227,7 +227,7 @@ class PictureInPictureBrowserFrameView +@@ -239,7 +239,7 @@ class PictureInPictureBrowserFrameView gfx::MultiAnimation show_close_button_animation_; gfx::MultiAnimation hide_close_button_animation_; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc index f53f1ecaf5b6..9eacbec0e371 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc @@ -1,24 +1,24 @@ ---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc -@@ -23,7 +23,7 @@ +@@ -21,7 +21,7 @@ + #include "chromeos/ui/frame/desks/move_to_desks_menu_model.h" + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" #endif -@@ -40,7 +40,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() {} +@@ -36,7 +36,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate( + SystemMenuModelDelegate::~SystemMenuModelDelegate() {} + bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (command_id == IDC_USE_SYSTEM_TITLE_BAR) { PrefService* prefs = browser_->profile()->GetPrefs(); return !prefs->GetBoolean(prefs::kUseCustomChromeFrame); -@@ -62,7 +62,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c +@@ -58,7 +58,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index 08171e1acf5e..2c5a2c87c646 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -571,7 +571,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -605,7 +605,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index d729493d1e65..9b9ff2e49da7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -581,7 +581,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -582,7 +582,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc index 7ac96b559cde..f7e4232efae6 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc -@@ -751,7 +751,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -387,7 +387,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta // not become active. Setting this to false creates the need to explicitly // hide the hovercard on press, touch, and keyboard events. SetCanActivate(false); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc index b484a301ca3a..064cfcc4762a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc @@ -406,7 +406,7 @@ std::string GetFileExtension(FileExtension file_extens } @@ -9,7 +9,7 @@ SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -872,7 +872,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread +@@ -889,7 +889,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread LOG(INFO) << "TearDownOnMainThread: Deleting dangling shortcuts."; // TODO(crbug.com/1273568): Investigate the true source of flakiness instead // of papering over it here. @@ -18,7 +18,7 @@ ASSERT_TRUE(override_registration_->test_override->ForceDeleteAllShortcuts()); #endif LOG(INFO) -@@ -1812,7 +1812,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -1829,7 +1829,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc if (app_name.empty()) { app_name = GetSiteConfiguration(site).app_name; } @@ -27,7 +27,7 @@ ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated( profile(), app_id, app_name)); ASSERT_TRUE( -@@ -2992,7 +2992,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3009,7 +3009,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna app_state->id, app_state->name); ASSERT_TRUE(icon_color.has_value()); ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value())); @@ -36,7 +36,7 @@ ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3007,7 +3007,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3024,7 +3024,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site); ASSERT_TRUE(app_state); base::ScopedAllowBlockingForTesting allow_blocking; @@ -45,7 +45,7 @@ ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3017,7 +3017,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3034,7 +3034,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3033,7 +3033,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3050,7 +3050,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -63,7 +63,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3759,7 +3759,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -3799,7 +3799,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, const AppId& app_id) { @@ -72,7 +72,7 @@ return override_registration_->test_override->GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -3938,7 +3938,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -3982,7 +3982,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre const AppId& id) { base::ScopedAllowBlockingForTesting allow_blocking; bool is_shortcut_and_icon_correct = false; @@ -81,7 +81,7 @@ bool is_shortcut_correct = override_registration_->test_override->IsShortcutCreated(profile, id, name); -@@ -3982,7 +3982,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4026,7 +4026,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr do_icon_colors_match = (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc index 255ebdf7fdf0..305b07a883bd 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -603,7 +603,7 @@ std::string ChromeURLs() { +@@ -635,7 +635,7 @@ std::string ChromeURLs() { return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, -@@ -657,7 +657,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -689,7 +689,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 8f69ec21fe73..bab7c4b5501f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -325,7 +325,7 @@ +@@ -209,7 +209,7 @@ #include "chrome/browser/ui/webui/app_launcher_page_ui.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -351,17 +351,17 @@ +@@ -235,17 +235,17 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -30,7 +30,7 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -702,7 +702,7 @@ bool IsAboutUI(const GURL& url) { +@@ -391,7 +391,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,16 +39,16 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -982,7 +982,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - return &NewWebUI; - } +@@ -651,7 +651,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we + if (url.host_piece() == chrome::kChromeUIMobileSetupHost) + return &NewWebUI; #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI; #endif -@@ -1037,7 +1037,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -706,7 +706,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI; #endif @@ -57,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -1105,27 +1105,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -774,27 +774,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc index db0370606d04..0deea1a619e3 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.cc @@ -172,7 +172,7 @@ enum class ReportingType { kUserActivity @@ -9,12 +9,12 @@ const char kManagementScreenCaptureEvent[] = "managementScreenCaptureEvent"; const char kManagementScreenCaptureData[] = "managementScreenCaptureData"; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -974,7 +974,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec +@@ -973,7 +973,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec kManagementOnPageVisitedVisibleData, &info); } -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (capture_policy::IsGetDisplayMediaSetSelectAllScreensAllowedForAnySite( - profile)) { + if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) { AddThreatProtectionPermission(kManagementScreenCaptureEvent, + kManagementScreenCaptureData, &info); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc index d1b476022924..29bbfaea0aa6 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-03-09 06:31:50 UTC +--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -323,7 +323,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI +@@ -321,7 +321,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI bool is_deprecated_app = false; auto* context = extension_service_->GetBrowserContext(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc new file mode 100644 index 000000000000..07b46ec43e5d --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2023-07-16 15:47:57 UTC ++++ chrome/browser/ui/webui/realbox/realbox_handler.cc +@@ -141,7 +141,7 @@ constexpr char kMacShareIconResourceName[] = + #elif BUILDFLAG(IS_WIN) + constexpr char kWinShareIconResourceName[] = + "//resources/cr_components/omnibox/icons/win_share.svg"; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr char kLinuxShareIconResourceName[] = + "//resources/cr_components/omnibox/icons/share.svg"; + #else +@@ -688,7 +688,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN + icon.name == omnibox::kShareWinChromeRefreshIcon.name) { + return kWinShareIconResourceName; + } +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (icon.name == omnibox::kShareIcon.name || + icon.name == omnibox::kShareLinuxChromeRefreshIcon.name) { + return kLinuxShareIconResourceName; diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index f905f1c9bdbc..65cb588923da 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -129,7 +129,7 @@ +@@ -131,7 +131,7 @@ #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -149,7 +149,7 @@ +@@ -151,7 +151,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,7 +18,16 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -384,7 +384,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -243,7 +243,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s + html_source->AddBoolean( + "allowDeletingBrowserHistory", + profile->GetPrefs()->GetBoolean(prefs::kAllowDeletingBrowserHistory)); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt); + #else + bool allow_qt_theme = false; +@@ -389,7 +389,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT}, {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT}, @@ -27,7 +36,7 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -394,7 +394,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -399,7 +399,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -36,7 +45,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -416,7 +416,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -421,7 +421,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc b/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc index 6c52390507c0..de9378576d71 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/web_applications/commands/install_app_locally_command.cc -@@ -71,7 +71,7 @@ void InstallAppLocallyCommand::StartWithLock( +@@ -81,7 +81,7 @@ void InstallAppLocallyCommand::StartWithLock( options.os_hooks[OsHookType::kUninstallationViaOsSettings] = web_app->CanUserUninstallWebApp(); diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc index 0ba71e04047b..0127067a689a 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc -@@ -439,7 +439,7 @@ std::unique_ptr WebAppShortcutManager::B +@@ -436,7 +436,7 @@ std::unique_ptr WebAppShortcutManager::B } } diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 2330a2989d5c..58f41c471032 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/common/chrome_features.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/common/chrome_features.cc @@ -82,7 +82,7 @@ BASE_FEATURE(kAsyncDns, ); @@ -18,7 +18,7 @@ // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. -@@ -284,7 +284,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, +@@ -291,7 +291,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, // Enables or disables Desktop PWAs to be auto-started on OS login. BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -319,7 +319,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, +@@ -326,7 +326,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -346,7 +346,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati +@@ -353,7 +353,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati BASE_FEATURE(kDnsOverHttps, "DnsOverHttps", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -45,7 +45,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -362,7 +362,7 @@ const base::FeatureParam kDnsOverHttpsFallbackPa +@@ -369,7 +369,7 @@ const base::FeatureParam kDnsOverHttpsFallbackPa const base::FeatureParam kDnsOverHttpsShowUiParam { &kDnsOverHttps, "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -54,16 +54,16 @@ true #else false -@@ -766,7 +766,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -793,7 +793,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -779,7 +779,7 @@ constexpr base::FeatureParam kLinuxLowMemoryMonit +@@ -806,7 +806,7 @@ constexpr base::FeatureParam kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 8238cbcc334c..285c57156957 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.h.orig 2023-05-31 08:12:17 UTC +--- chrome/common/chrome_features.h.orig 2023-07-16 15:47:57 UTC +++ chrome/common/chrome_features.h @@ -64,13 +64,13 @@ BASE_DECLARE_FEATURE(kAppShimNewCloseBehavior); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns); @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -198,7 +198,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); +@@ -202,7 +202,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps); -@@ -450,7 +450,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -465,7 +465,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); @@ -34,7 +34,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam kLinuxLowMemoryMonitorModerateLevel; -@@ -458,7 +458,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -473,7 +473,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 7f76eb45653b..ed185b31c6c6 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/common/chrome_switches.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/common/chrome_switches.cc -@@ -860,14 +860,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -862,14 +862,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 02b3494fd241..a1ffb9988e07 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2023-05-31 08:12:17 UTC +--- chrome/common/chrome_switches.h.orig 2023-07-16 15:47:57 UTC +++ chrome/common/chrome_switches.h -@@ -268,12 +268,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -269,12 +269,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index d0da20d332c8..6caecd579442 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/common/pref_names.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/common/pref_names.cc -@@ -1181,7 +1181,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox +@@ -1193,7 +1193,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,16 +9,16 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemThemeDeprecated[] = "extensions.theme.use_system"; const char kSystemTheme[] = "extensions.theme.system_theme"; -@@ -1288,7 +1288,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1298,7 +1298,7 @@ const char kShowUpdatePromotionInfoBar[] = + "browser.show_update_promotion_info_bar"; + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1789,7 +1789,7 @@ const char kDownloadDirUpgraded[] = "download.director +@@ -1811,7 +1811,7 @@ const char kDownloadDirUpgraded[] = "download.director const char kDownloadLastCompleteTime[] = "download.last_complete_time"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2220,7 +2220,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2259,7 +2259,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -36,7 +36,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. const char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3248,7 +3248,7 @@ const char kFileOrDirectoryPickerWithoutGestureAllowed +@@ -3272,7 +3272,7 @@ const char kFileOrDirectoryPickerWithoutGestureAllowed const char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -45,7 +45,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. const char kAllowSystemNotifications[] = "system_notifications.allowed"; -@@ -3301,7 +3301,7 @@ const char kCACertificateManagementAllowed[] = +@@ -3325,7 +3325,7 @@ const char kCACertificateManagementAllowed[] = const char kChromeRootStoreEnabled[] = "chrome_root_store_enabled"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -54,7 +54,7 @@ const char kEnforceLocalAnchorConstraintsEnabled[] = "enforce_local_anchor_constraints_enabled"; #endif -@@ -3629,7 +3629,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe +@@ -3642,7 +3642,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe const char kNewBaseUrlInheritanceBehaviorAllowed[] = "new_base_url_inheritance_behavior_allowed"; diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 50c763ec26ef..7b1fc63f8fe6 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2023-05-31 08:12:17 UTC +--- chrome/common/pref_names.h.orig 2023-07-16 15:47:57 UTC +++ chrome/common/pref_names.h -@@ -377,7 +377,7 @@ extern const char kUseAshProxy[]; +@@ -378,7 +378,7 @@ extern const char kUseAshProxy[]; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,16 +9,16 @@ // TODO(https://crbug.com/1317782): Remove in M110. extern const char kUsesSystemThemeDeprecated[]; extern const char kSystemTheme[]; -@@ -399,7 +399,7 @@ extern const char kShowUpdatePromotionInfoBar[]; +@@ -398,7 +398,7 @@ extern const char kDefaultBrowserSettingEnabled[]; + #if BUILDFLAG(IS_MAC) + extern const char kShowUpdatePromotionInfoBar[]; #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kUseCustomChromeFrame[]; #endif extern const char kPartitionDefaultZoomLevel[]; -@@ -585,7 +585,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ +@@ -586,7 +586,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ extern const char kDownloadDirUpgraded[]; extern const char kDownloadLastCompleteTime[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ extern const char kOpenPdfDownloadInSystemReader[]; #endif #if BUILDFLAG(IS_ANDROID) -@@ -705,7 +705,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps +@@ -709,7 +709,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps extern const char kWebAppsPreferences[]; extern const char kWebAppsIsolationState[]; @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) extern const char kWebAppsUrlHandlerInfo[]; #endif -@@ -832,7 +832,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -836,7 +836,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] extern const char kAmbientAuthenticationInPrivateModesEnabled[]; extern const char kBasicAuthOverHttpEnabled[]; @@ -45,7 +45,7 @@ extern const char kAuthNegotiateDelegateByKdcPolicy[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -1111,7 +1111,7 @@ extern const char kFileOrDirectoryPickerWithoutGesture +@@ -1110,7 +1110,7 @@ extern const char kFileOrDirectoryPickerWithoutGesture #endif extern const char kSandboxExternalProtocolBlocked[]; @@ -54,7 +54,7 @@ extern const char kAllowSystemNotifications[]; #endif -@@ -1137,7 +1137,7 @@ extern const char kCACertificateManagementAllowed[]; +@@ -1136,7 +1136,7 @@ extern const char kCACertificateManagementAllowed[]; extern const char kChromeRootStoreEnabled[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -63,7 +63,7 @@ // TODO(https://crbug.com/1406103): delete this after a few milestones. extern const char kEnforceLocalAnchorConstraintsEnabled[]; #endif -@@ -1288,7 +1288,7 @@ extern const char kDIPSTimerLastUpdate[]; +@@ -1287,7 +1287,7 @@ extern const char kDIPSTimerLastUpdate[]; extern const char kThrottleNonVisibleCrossOriginIframesAllowed[]; extern const char kNewBaseUrlInheritanceBehaviorAllowed[]; diff --git a/www/chromium/files/patch-chrome_common_url__constants.cc b/www/chromium/files/patch-chrome_common_url__constants.cc index adab52f83ad1..8a2eec776dc8 100644 --- a/www/chromium/files/patch-chrome_common_url__constants.cc +++ b/www/chromium/files/patch-chrome_common_url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/common/url_constants.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/common/url_constants.cc -@@ -528,7 +528,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = +@@ -534,7 +534,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = "https://support.google.com/chromebook/?p=multidevice"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h index a718f714954c..e81f9c632d91 100644 --- a/www/chromium/files/patch-chrome_common_url__constants.h +++ b/www/chromium/files/patch-chrome_common_url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.h.orig 2023-05-31 08:12:17 UTC +--- chrome/common/url_constants.h.orig 2023-07-16 15:47:57 UTC +++ chrome/common/url_constants.h -@@ -504,7 +504,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; +@@ -512,7 +512,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; extern const char kPhoneHubPermissionLearnMoreURL[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc index 8ea3806e0bec..2f5a8371f969 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/common/webui_url_constants.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/common/webui_url_constants.cc -@@ -515,18 +515,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// +@@ -514,18 +514,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -541,14 +541,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -540,14 +540,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -39,7 +39,7 @@ const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -565,7 +565,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -564,7 +564,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -48,7 +48,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -644,7 +644,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -643,7 +643,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h index 54d212a68db5..2ef4d429d7b4 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2023-05-31 08:12:17 UTC +--- chrome/common/webui_url_constants.h.orig 2023-07-16 15:47:57 UTC +++ chrome/common/webui_url_constants.h -@@ -436,24 +436,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; +@@ -437,24 +437,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -468,14 +468,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -469,14 +469,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -489,7 +489,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -490,7 +490,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 845692889a0f..3537b42fc4fe 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- chrome/test/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ chrome/test/BUILD.gn -@@ -10376,7 +10376,7 @@ test("chrome_app_unittests") { +@@ -10596,7 +10596,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/www/chromium/files/patch-chrome_test_chromedriver_capabilities.cc b/www/chromium/files/patch-chrome_test_chromedriver_capabilities.cc new file mode 100644 index 000000000000..e43785fe91a1 --- /dev/null +++ b/www/chromium/files/patch-chrome_test_chromedriver_capabilities.cc @@ -0,0 +1,26 @@ +--- chrome/test/chromedriver/capabilities.cc.orig 2023-07-16 15:47:57 UTC ++++ chrome/test/chromedriver/capabilities.cc +@@ -355,7 +355,11 @@ Status ParseMobileEmulation(const base::Value& option, + "'version' field of type string"); + } + ++#if defined(__clang__) && (__clang_major__ >= 15) + brands.emplace_back(*brand, *version); ++#else ++ brands.emplace_back(BrandVersion{*brand, *version}); ++#endif + } + + client_hints.brands = std::move(brands); +@@ -392,7 +396,11 @@ Status ParseMobileEmulation(const base::Value& option, + "a 'version' field of type string"); + } + ++#if defined(__clang__) && (__clang_major__ >= 15) + full_version_list.emplace_back(*brand, *version); ++#else ++ full_version_list.emplace_back(BrandVersion{*brand, *version}); ++#endif + } + + client_hints.full_version_list = std::move(full_version_list); diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc index bcfa108e4ed3..de642082f665 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome_launcher.cc.orig 2023-02-08 09:03:45 UTC +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/test/chromedriver/chrome_launcher.cc -@@ -64,6 +64,7 @@ +@@ -66,6 +66,7 @@ #include #include #include diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome_client__hints.h b/www/chromium/files/patch-chrome_test_chromedriver_chrome_client__hints.h new file mode 100644 index 000000000000..dba7051c5ddc --- /dev/null +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome_client__hints.h @@ -0,0 +1,10 @@ +--- chrome/test/chromedriver/chrome/client_hints.h.orig 2023-07-16 15:47:57 UTC ++++ chrome/test/chromedriver/chrome/client_hints.h +@@ -7,6 +7,7 @@ + + #include + #include ++#include + + struct BrandVersion { + // Browser brand. diff --git a/www/chromium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc b/www/chromium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc deleted file mode 100644 index 334b76af3979..000000000000 --- a/www/chromium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/test/interaction/interaction_test_util_browser.cc.orig 2023-03-09 06:31:50 UTC -+++ chrome/test/interaction/interaction_test_util_browser.cc -@@ -35,7 +35,7 @@ - #include "ui/base/interaction/interaction_test_util_mac.h" - #endif - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #define SUPPORTS_PIXEL_TESTS 1 - #include "base/command_line.h" - #include "chrome/browser/ui/test/test_browser_ui.h" diff --git a/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc b/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc deleted file mode 100644 index c8d4ffe38ed7..000000000000 --- a/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/updater/app/app_uninstall.cc.orig 2023-05-31 08:12:17 UTC -+++ chrome/updater/app/app_uninstall.cc -@@ -39,7 +39,7 @@ - #include "chrome/updater/posix/setup.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1431487): Remove these includes after investigation. - #include "base/ranges/algorithm.h" - #include "url/gurl.h" -@@ -141,7 +141,7 @@ void AppUninstall::UninstallAll(int reason) { - uninstall_data.version = base::Version(kUpdaterVersion); - } - // TODO(crbug.com/1431487): Remove this code after investigation. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - CHECK(base::ranges::none_of(config_->PingUrl(), [](const GURL& url) { - return url.DomainIs("update.googleapis.com"); - })) << "Attempted to send an uninstall ping to non-local server"; diff --git a/www/chromium/files/patch-chrome_updater_configurator.cc b/www/chromium/files/patch-chrome_updater_configurator.cc index d54bd3f2453b..6dde4fa6365b 100644 --- a/www/chromium/files/patch-chrome_updater_configurator.cc +++ b/www/chromium/files/patch-chrome_updater_configurator.cc @@ -1,6 +1,6 @@ ---- chrome/updater/configurator.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/updater/configurator.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/updater/configurator.cc -@@ -64,7 +64,7 @@ Configurator::Configurator(scoped_refptr +@@ -63,7 +63,7 @@ Configurator::Configurator(scoped_refptr return absl::nullopt; #endif }()) { diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc index 68f23b10a999..301b5be4e8e5 100644 --- a/www/chromium/files/patch-chrome_utility_services.cc +++ b/www/chromium/files/patch-chrome_utility_services.cc @@ -1,4 +1,4 @@ ---- chrome/utility/services.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/utility/services.cc.orig 2023-07-16 15:47:57 UTC +++ chrome/utility/services.cc @@ -56,7 +56,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" @@ -36,7 +36,7 @@ auto RunDocumentAnalysis( mojo::PendingReceiver receiver) { return std::make_unique(std::move(receiver)); -@@ -463,7 +463,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -462,7 +462,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunWindowsIconReader); #endif // BUILDFLAG(IS_WIN) @@ -45,7 +45,7 @@ services.Add(RunSystemSignalsService); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -479,7 +479,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -478,7 +478,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunFileUtil); #endif diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index 614b0c01bb4c..06e27b938b36 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2023-03-09 06:31:50 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2023-07-16 15:47:57 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -89,7 +89,7 @@ +@@ -90,7 +90,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" @@ -9,7 +9,7 @@ #include #include #include -@@ -262,7 +262,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -263,7 +263,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) @@ -18,7 +18,7 @@ base::FilePath GetApplicationFontsDir() { std::unique_ptr env(base::Environment::Create()); -@@ -308,7 +308,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -309,7 +309,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index b6df326b313c..090600575ac1 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2023-03-09 06:31:50 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2023-07-16 15:47:57 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -427,7 +427,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -446,7 +446,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index f739fe285289..18f89586f6ba 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2023-05-31 08:12:17 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2023-07-16 15:47:57 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2317,7 +2317,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2311,7 +2311,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index f4732f691898..9660b486aa5a 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2023-05-31 08:12:17 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2023-07-16 15:47:57 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -274,7 +274,7 @@ const base::FeatureParam +@@ -281,7 +281,7 @@ const base::FeatureParam bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_crash_core_app_BUILD.gn b/www/chromium/files/patch-components_crash_core_app_BUILD.gn index 297b7b20c33a..a466bc2aae44 100644 --- a/www/chromium/files/patch-components_crash_core_app_BUILD.gn +++ b/www/chromium/files/patch-components_crash_core_app_BUILD.gn @@ -1,6 +1,6 @@ ---- components/crash/core/app/BUILD.gn.orig 2022-11-30 08:12:58 UTC +--- components/crash/core/app/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ components/crash/core/app/BUILD.gn -@@ -52,7 +52,7 @@ static_library("app") { +@@ -60,7 +60,7 @@ static_library("app") { "crashpad.h", ] @@ -9,7 +9,7 @@ sources += [ "crashpad_linux.cc" ] } -@@ -65,6 +65,10 @@ static_library("app") { +@@ -73,6 +73,10 @@ static_library("app") { ] } @@ -20,7 +20,7 @@ defines = [ "CRASH_IMPLEMENTATION" ] public_deps = [ ":lib" ] -@@ -96,7 +100,7 @@ static_library("app") { +@@ -101,7 +105,7 @@ static_library("app") { libs = [ "log" ] } @@ -29,7 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -224,11 +228,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -233,11 +237,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] diff --git a/www/chromium/files/patch-components_device__signals_core_browser_mock__signals__aggregator.h b/www/chromium/files/patch-components_device__signals_core_browser_mock__signals__aggregator.h new file mode 100644 index 000000000000..83f41b5e8cd7 --- /dev/null +++ b/www/chromium/files/patch-components_device__signals_core_browser_mock__signals__aggregator.h @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/mock_signals_aggregator.h.orig 2023-07-16 15:47:57 UTC ++++ components/device_signals/core/browser/mock_signals_aggregator.h +@@ -17,7 +17,7 @@ class MockSignalsAggregator : public SignalsAggregator + MockSignalsAggregator(); + ~MockSignalsAggregator() override; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + MOCK_METHOD(void, + GetSignalsForUser, + (const UserContext&, diff --git a/www/chromium/files/patch-components_device__signals_core_browser_signals__aggregator.h b/www/chromium/files/patch-components_device__signals_core_browser_signals__aggregator.h new file mode 100644 index 000000000000..36f820a613b3 --- /dev/null +++ b/www/chromium/files/patch-components_device__signals_core_browser_signals__aggregator.h @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/signals_aggregator.h.orig 2023-07-16 15:47:57 UTC ++++ components/device_signals/core/browser/signals_aggregator.h +@@ -22,7 +22,7 @@ class SignalsAggregator : public KeyedService { + + ~SignalsAggregator() override = default; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Will asynchronously collect signals whose names are specified in the + // `request` object, and will also use a `user_context` to validate that the + // user has permissions to the device's signals. Invokes `callback` with the diff --git a/www/chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc b/www/chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc new file mode 100644 index 000000000000..d8ca5ca16826 --- /dev/null +++ b/www/chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/signals_aggregator_impl.cc.orig 2023-07-16 15:47:57 UTC ++++ components/device_signals/core/browser/signals_aggregator_impl.cc +@@ -65,7 +65,7 @@ SignalsAggregatorImpl::SignalsAggregatorImpl( + + SignalsAggregatorImpl::~SignalsAggregatorImpl() = default; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void SignalsAggregatorImpl::GetSignalsForUser( + const UserContext& user_context, + const SignalsAggregationRequest& request, diff --git a/www/chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h b/www/chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h new file mode 100644 index 000000000000..908af99c54d0 --- /dev/null +++ b/www/chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/signals_aggregator_impl.h.orig 2023-07-16 15:47:57 UTC ++++ components/device_signals/core/browser/signals_aggregator_impl.h +@@ -29,7 +29,7 @@ class SignalsAggregatorImpl : public SignalsAggregator + ~SignalsAggregatorImpl() override; + + // SignalsAggregator: +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void GetSignalsForUser(const UserContext& user_context, + const SignalsAggregationRequest& request, + GetSignalsCallback callback) override; diff --git a/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service.h b/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service.h new file mode 100644 index 000000000000..70b9a8b68548 --- /dev/null +++ b/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service.h @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/user_permission_service.h.orig 2023-07-16 15:47:57 UTC ++++ components/device_signals/core/browser/user_permission_service.h +@@ -57,7 +57,7 @@ class UserPermissionService : public KeyedService { + // missing. + virtual bool ShouldCollectConsent() const = 0; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Will verify whether context-aware signals can be collected + // on behalf of the user represented by `user_context`. Returns `kGranted` if + // collection is allowed. diff --git a/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc b/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc new file mode 100644 index 000000000000..501693a1511b --- /dev/null +++ b/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/user_permission_service_impl.cc.orig 2023-07-16 15:47:57 UTC ++++ components/device_signals/core/browser/user_permission_service_impl.cc +@@ -74,7 +74,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent() + consent_required_by_dependent_policy; + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + UserPermission UserPermissionServiceImpl::CanUserCollectSignals( + const UserContext& user_context) const { + // Return "unknown user" if no user ID was given. diff --git a/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.h b/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.h new file mode 100644 index 000000000000..8bdca220f354 --- /dev/null +++ b/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.h @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/user_permission_service_impl.h.orig 2023-07-16 15:47:57 UTC ++++ components/device_signals/core/browser/user_permission_service_impl.h +@@ -39,7 +39,7 @@ class UserPermissionServiceImpl : public UserPermissio + + // UserPermissionService: + bool ShouldCollectConsent() const override; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + UserPermission CanUserCollectSignals( + const UserContext& user_context) const override; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX diff --git a/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc b/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc index a1c85f4c9372..30bedf94a17f 100644 --- a/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc +++ b/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc @@ -1,6 +1,6 @@ ---- components/embedder_support/user_agent_utils_unittest.cc.orig 2023-05-31 08:12:17 UTC +--- components/embedder_support/user_agent_utils_unittest.cc.orig 2023-07-16 15:47:57 UTC +++ components/embedder_support/user_agent_utils_unittest.cc -@@ -82,7 +82,7 @@ const char kDesktop[] = +@@ -83,7 +83,7 @@ const char kDesktop[] = "Safari/537.36"; #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ std::string GetMachine() { struct utsname unixinfo; uname(&unixinfo); -@@ -190,7 +190,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) +@@ -191,7 +191,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) int value; ASSERT_TRUE(base::StringToInt(pieces[i], &value)); } diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index aaa016190aa7..81ae8eac72e6 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2023-05-31 08:12:17 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2023-07-16 15:47:57 UTC +++ components/feature_engagement/public/feature_configurations.cc -@@ -39,7 +39,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe +@@ -40,7 +40,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe absl::optional GetClientSideFeatureConfig( const base::Feature* feature) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional config = FeatureConfig(); config->valid = true; -@@ -1140,7 +1140,8 @@ absl::optional GetClientSideFeatureConf +@@ -1197,7 +1197,8 @@ absl::optional GetClientSideFeatureConf #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc index 468f8ab6e9a2..bb57c7c5d8a4 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2023-05-31 08:12:17 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2023-07-16 15:47:57 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -20,7 +20,7 @@ BASE_FEATURE(kUseClientConfigIPH, BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature, "IPH_AutofillFeedbackNewBadge", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -480,7 +480,8 @@ BASE_FEATURE(kIPHiOSPromoDefaultBrowserFeature, +@@ -498,7 +498,8 @@ BASE_FEATURE(kIPHiOSDefaultBrowserVideoPromoTriggerFea #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h index ad8fca07bcef..972cab291183 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2023-05-31 08:12:17 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2023-07-16 15:47:57 UTC +++ components/feature_engagement/public/feature_constants.h @@ -22,7 +22,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH); BASE_DECLARE_FEATURE(kIPHDummyFeature); @@ -8,8 +8,8 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature); BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); - BASE_DECLARE_FEATURE(kIPHDesktopSharedHighlightingFeature); -@@ -196,7 +196,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoDefaultBrowserFeature + BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); +@@ -202,7 +202,8 @@ BASE_DECLARE_FEATURE(kIPHiOSDefaultBrowserVideoPromoTr #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc index 43fc1dc26854..27057f7ce13a 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,15 +1,15 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2023-05-31 08:12:17 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2023-07-16 15:47:57 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -134,7 +134,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSPromoDefaultBrowserFeature, +@@ -138,7 +138,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSDefaultBrowserVideoPromoTriggerFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) &kIPHAutofillFeedbackNewBadgeFeature, &kIPHBatterySaverModeFeature, - &kIPHDesktopTabGroupsNewGroupFeature, -@@ -173,7 +173,8 @@ const base::Feature* const kAllFeatures[] = { + &kIPHCompanionSidePanelFeature, +@@ -179,7 +179,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h index 2ccf3b5b572f..57016a992d40 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2023-05-31 08:12:17 UTC +--- components/feature_engagement/public/feature_list.h.orig 2023-07-16 15:47:57 UTC +++ components/feature_engagement/public/feature_list.h -@@ -246,7 +246,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoDefaultBrowserFeatu +@@ -255,7 +255,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSDefaultBrowserVideoPromo #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ DEFINE_VARIATION_PARAM(kIPHAutofillFeedbackNewBadgeFeature, "IPH_AutofillFeedbackNewBadge"); DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); -@@ -306,7 +306,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, +@@ -319,7 +319,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,16 +19,16 @@ DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature, "IPH_AutofillExternalAccountProfileSuggestion"); DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature, -@@ -437,7 +438,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSPromoCredentialProviderExtensionFeature), - VARIATION_ENTRY(kIPHiOSPromoDefaultBrowserFeature), +@@ -453,7 +454,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHiOSHistoryOnOverflowMenuFeature), + VARIATION_ENTRY(kIPHiOSShareToolbarItemFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHAutofillFeedbackNewBadgeFeature), VARIATION_ENTRY(kIPHBatterySaverModeFeature), - VARIATION_ENTRY(kIPHDesktopCustomizeChromeFeature), -@@ -477,7 +478,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHCompanionSidePanelFeature), +@@ -495,7 +496,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc index f6e6ec8fa5f5..60a9c4f31e02 100644 --- a/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc +++ b/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2022-10-12 09:56:26 UTC +--- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2023-07-16 15:47:57 UTC +++ components/feed/core/v2/feed_network_impl_unittest.cc -@@ -799,8 +799,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn +@@ -801,8 +801,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, client_info.app_type()); EXPECT_EQ(feedwire::Version::RELEASE, client_info.app_version().build_type()); diff --git a/www/chromium/files/patch-components_feed_core_v2_proto__util.cc b/www/chromium/files/patch-components_feed_core_v2_proto__util.cc index 5e1d4e3f7098..73d5ec0eb760 100644 --- a/www/chromium/files/patch-components_feed_core_v2_proto__util.cc +++ b/www/chromium/files/patch-components_feed_core_v2_proto__util.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/proto_util.cc.orig 2023-03-09 06:31:50 UTC +--- components/feed/core/v2/proto_util.cc.orig 2023-07-16 15:47:57 UTC +++ components/feed/core/v2/proto_util.cc -@@ -92,8 +92,8 @@ feedwire::Version GetPlatformVersionMessage() { +@@ -93,8 +93,8 @@ feedwire::Version GetPlatformVersionMessage() { int32_t major, minor, revision; base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &revision); @@ -11,7 +11,7 @@ result.set_revision(revision); #if BUILDFLAG(IS_ANDROID) result.set_api_version(base::android::BuildInfo::GetInstance()->sdk_int()); -@@ -108,8 +108,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf +@@ -109,8 +109,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf // Chrome's version is in the format: MAJOR,MINOR,BUILD,PATCH. const std::vector& numbers = chrome_info.version.components(); if (numbers.size() > 3) { diff --git a/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc b/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc index 131a8f272406..bd5454ca7845 100644 --- a/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc +++ b/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/test/proto_printer.cc.orig 2022-05-19 14:06:27 UTC +--- components/feed/core/v2/test/proto_printer.cc.orig 2023-07-16 15:47:57 UTC +++ components/feed/core/v2/test/proto_printer.cc -@@ -157,8 +157,8 @@ class TextProtoPrinter { +@@ -158,8 +158,8 @@ class TextProtoPrinter { } TextProtoPrinter& operator<<(const feedwire::Version& v) { BeginMessage(); diff --git a/www/chromium/files/patch-components_live__caption_caption__util.cc b/www/chromium/files/patch-components_live__caption_caption__util.cc index 4f676dab69e8..05d2735d02ec 100644 --- a/www/chromium/files/patch-components_live__caption_caption__util.cc +++ b/www/chromium/files/patch-components_live__caption_caption__util.cc @@ -1,6 +1,6 @@ ---- components/live_caption/caption_util.cc.orig 2022-07-22 17:30:31 UTC +--- components/live_caption/caption_util.cc.orig 2023-07-16 15:47:57 UTC +++ components/live_caption/caption_util.cc -@@ -140,7 +140,7 @@ bool IsLiveCaptionFeatureSupported() { +@@ -145,7 +145,7 @@ bool IsLiveCaptionFeatureSupported() { return false; #endif @@ -9,3 +9,12 @@ // Check if the CPU has the required instruction set to run the Speech // On-Device API (SODA) library. static bool has_sse41 = base::CPU().has_sse41(); +@@ -167,7 +167,7 @@ std::string GetCaptionSettingsUrl() { + return "chrome://os-settings/audioAndCaptions"; + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return "chrome://settings/captions"; + #endif // BUILDFLAG(IS_LINUX) + diff --git a/www/chromium/files/patch-components_live__caption_caption__util.h b/www/chromium/files/patch-components_live__caption_caption__util.h new file mode 100644 index 000000000000..0970da0c55e0 --- /dev/null +++ b/www/chromium/files/patch-components_live__caption_caption__util.h @@ -0,0 +1,11 @@ +--- components/live_caption/caption_util.h.orig 2023-07-16 15:47:57 UTC ++++ components/live_caption/caption_util.h +@@ -14,7 +14,7 @@ class PrefService; + namespace captions { + + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + extern const char kCaptionSettingsUrl[]; + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || + // BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h b/www/chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h new file mode 100644 index 000000000000..6d3a3f2782c1 --- /dev/null +++ b/www/chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h @@ -0,0 +1,14 @@ +--- components/optimization_guide/core/tflite_model_executor.h.orig 2023-07-16 15:47:57 UTC ++++ components/optimization_guide/core/tflite_model_executor.h +@@ -189,7 +189,11 @@ class TFLiteModelExecutor : public ModelExecutor= 15) + ModelExecutor::ConstRefInputVector inputs) ++#else ++ typename ModelExecutor::ConstRefInputVector inputs) ++#endif + override { + DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc index c4dc79c89ecd..319350bade40 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/login_database.cc.orig 2023-05-31 08:12:17 UTC +--- components/password_manager/core/browser/login_database.cc.orig 2023-07-16 15:47:57 UTC +++ components/password_manager/core/browser/login_database.cc -@@ -771,7 +771,7 @@ std::string GeneratePlaceholders(size_t count) { +@@ -842,7 +842,7 @@ std::string GeneratePlaceholders(size_t count) { return result; } @@ -9,7 +9,7 @@ // Fills |form| with necessary data required to be removed from the database // and returns it. PasswordForm GetFormForRemoval(sql::Statement& statement) { -@@ -788,7 +788,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme +@@ -859,7 +859,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme // Whether we should try to return the decryptable passwords while the // encryption service fails for some passwords. bool ShouldReturnPartialPasswords() { @@ -18,7 +18,7 @@ return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords); #else return false; -@@ -1617,7 +1617,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { +@@ -1716,7 +1716,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { } DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() { diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc index a030187c57ac..be40fc7fb8af 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-05-31 08:12:17 UTC +--- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-07-16 15:47:57 UTC +++ components/password_manager/core/browser/login_database_unittest.cc -@@ -2141,7 +2141,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2170,7 +2170,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd base::HistogramTester histogram_tester; ASSERT_TRUE(db.Init()); @@ -9,7 +9,7 @@ // Make sure that we can't get any logins when database is corrupted. // Disabling the checks in chromecast because encryption is unavailable. std::vector> result; -@@ -2168,7 +2168,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2197,7 +2197,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd #endif // Check histograms. @@ -18,7 +18,7 @@ histogram_tester.ExpectUniqueSample( "PasswordManager.DeleteUndecryptableLoginsReturnValue", metrics_util::DeleteCorruptedPasswordsResult::kSuccessPasswordsDeleted, -@@ -2211,7 +2211,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL +@@ -2240,7 +2240,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL } #endif // BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc index d97902e2976d..ca57ee797749 100644 --- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc +++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2023-05-31 08:12:17 UTC +--- components/password_manager/core/common/password_manager_features.cc.orig 2023-07-16 15:47:57 UTC +++ components/password_manager/core/common/password_manager_features.cc -@@ -95,7 +95,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal, +@@ -96,7 +96,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal, "PasswordManagerLogToTerminal", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ // When enabled, initial sync will be forced during startup if the password // store has encryption service failures. BASE_FEATURE(kForceInitialSyncWhenDecryptionFails, -@@ -218,7 +218,7 @@ BASE_FEATURE(kPasswordStrengthIndicator, +@@ -216,7 +216,7 @@ BASE_FEATURE(kPasswordStrengthIndicator, "PasswordStrengthIndicator", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index 5b673ee979f0..a9e895d61815 100644 --- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,4 +1,4 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2022-09-02 08:32:00 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2023-07-16 15:47:57 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc @@ -20,7 +20,7 @@ #endif @@ -23,9 +23,9 @@ +#define HOST_NAME_MAX MAXHOSTNAMELEN +#endif + + #include #include - #include "base/check.h" @@ -82,7 +87,7 @@ namespace em = enterprise_management; std::string GetMachineName() { diff --git a/www/chromium/files/patch-components_power__metrics_BUILD.gn b/www/chromium/files/patch-components_power__metrics_BUILD.gn new file mode 100644 index 000000000000..eafab62a6e56 --- /dev/null +++ b/www/chromium/files/patch-components_power__metrics_BUILD.gn @@ -0,0 +1,11 @@ +--- components/power_metrics/BUILD.gn.orig 2023-07-16 15:47:57 UTC ++++ components/power_metrics/BUILD.gn +@@ -42,7 +42,7 @@ static_library("power_metrics") { + ldflags = [ "/DELAYLOAD:setupapi.dll" ] + } + +- if (is_linux) { ++ if (is_linux && !is_bsd) { + sources += [ + "energy_metrics_provider_linux.cc", + "energy_metrics_provider_linux.h", diff --git a/www/chromium/files/patch-components_power__metrics_energy__metrics__provider.cc b/www/chromium/files/patch-components_power__metrics_energy__metrics__provider.cc index c8121adc61a2..091b2fe7321b 100644 --- a/www/chromium/files/patch-components_power__metrics_energy__metrics__provider.cc +++ b/www/chromium/files/patch-components_power__metrics_energy__metrics__provider.cc @@ -1,20 +1,21 @@ ---- components/power_metrics/energy_metrics_provider.cc.orig 2023-05-31 08:12:17 UTC +--- components/power_metrics/energy_metrics_provider.cc.orig 2023-07-16 15:47:57 UTC +++ components/power_metrics/energy_metrics_provider.cc -@@ -7,7 +7,7 @@ - #include "build/build_config.h" - #if BUILDFLAG(IS_WIN) +@@ -9,6 +9,8 @@ #include "components/power_metrics/energy_metrics_provider_win.h" --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #elif BUILDFLAG(IS_LINUX) #include "components/power_metrics/energy_metrics_provider_linux.h" ++#elif BUILDFLAG(IS_BSD) ++#include "base/notreached.h" #endif // BUILDFLAG(IS_WIN) -@@ -20,7 +20,7 @@ EnergyMetricsProvider::~EnergyMetricsProvider() = defa - std::unique_ptr EnergyMetricsProvider::Create() { - #if BUILDFLAG(IS_WIN) + namespace power_metrics { +@@ -22,6 +24,9 @@ std::unique_ptr EnergyMetricsPr return EnergyMetricsProviderWin::Create(); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #elif BUILDFLAG(IS_LINUX) return EnergyMetricsProviderLinux::Create(); ++#elif BUILDFLAG(IS_BSD) ++ NOTIMPLEMENTED(); ++ return nullptr; #else return nullptr; + #endif // BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-components_services_screen__ai_public_cpp_screen__ai__install__state.cc b/www/chromium/files/patch-components_services_screen__ai_public_cpp_screen__ai__install__state.cc deleted file mode 100644 index 8efbd51c9a28..000000000000 --- a/www/chromium/files/patch-components_services_screen__ai_public_cpp_screen__ai__install__state.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/services/screen_ai/public/cpp/screen_ai_install_state.cc.orig 2023-04-28 17:01:32 UTC -+++ components/services/screen_ai/public/cpp/screen_ai_install_state.cc -@@ -17,7 +17,7 @@ - #include "components/services/screen_ai/public/cpp/utilities.h" - #include "ui/accessibility/accessibility_features.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "base/cpu.h" - #endif - -@@ -31,7 +31,7 @@ namespace { - bool IsDeviceCompatible() { - // Check if the CPU has the required instruction set to run the Screen AI - // library. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (!base::CPU().has_sse41()) { - return false; - } diff --git a/www/chromium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc b/www/chromium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc new file mode 100644 index 000000000000..02c2dde6e4f9 --- /dev/null +++ b/www/chromium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc @@ -0,0 +1,29 @@ +--- components/services/screen_ai/screen_ai_library_wrapper.cc.orig 2023-07-16 15:47:57 UTC ++++ components/services/screen_ai/screen_ai_library_wrapper.cc +@@ -187,7 +187,7 @@ ScreenAILibraryWrapper::PerformOcr(const SkBitmap& ima + + // TODO(crbug.com/1278245): Remove this after fixing the crash issue on Linux + // official. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + free_library_allocated_char_array_(library_buffer.release()); + #endif + +@@ -219,7 +219,7 @@ ScreenAILibraryWrapper::ExtractLayout(const SkBitmap& + + // TODO(crbug.com/1278245): Remove this after fixing the crash issue on Linux + // official. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + free_library_allocated_char_array_(library_buffer.release()); + #endif + +@@ -253,7 +253,7 @@ absl::optional> ScreenAILibraryWr + + // TODO(crbug.com/1278245): Remove this after fixing the crash issue on Linux + // official. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + free_library_allocated_int32_array_(library_buffer.release()); + #endif + diff --git a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc new file mode 100644 index 000000000000..9bf6972e15a6 --- /dev/null +++ b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc @@ -0,0 +1,11 @@ +--- components/supervised_user/core/browser/supervised_user_service.cc.orig 2023-07-16 15:47:57 UTC ++++ components/supervised_user/core/browser/supervised_user_service.cc +@@ -69,7 +69,7 @@ void SupervisedUserService::Init() { + supervised_user::FirstTimeInterstitialBannerState banner_state = + static_cast( + user_prefs_->GetInteger(prefs::kFirstTimeInterstitialBannerState)); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (supervised_user::CanDisplayFirstTimeInterstitialBanner()) { + if (banner_state == + supervised_user::FirstTimeInterstitialBannerState::kUnknown && diff --git a/www/chromium/files/patch-components_update__client_update__query__params.cc b/www/chromium/files/patch-components_update__client_update__query__params.cc index 7a50db1faeea..34e21cc73c9a 100644 --- a/www/chromium/files/patch-components_update__client_update__query__params.cc +++ b/www/chromium/files/patch-components_update__client_update__query__params.cc @@ -1,6 +1,6 @@ ---- components/update_client/update_query_params.cc.orig 2023-05-31 08:12:17 UTC +--- components/update_client/update_query_params.cc.orig 2023-07-16 15:47:57 UTC +++ components/update_client/update_query_params.cc -@@ -41,6 +41,8 @@ const char kOs[] = +@@ -42,6 +42,8 @@ const char kOs[] = "fuchsia"; #elif BUILDFLAG(IS_OPENBSD) "openbsd"; diff --git a/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc b/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc new file mode 100644 index 000000000000..7442203355b9 --- /dev/null +++ b/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc @@ -0,0 +1,11 @@ +--- components/user_education/views/help_bubble_view.cc.orig 2023-07-16 15:47:57 UTC ++++ components/user_education/views/help_bubble_view.cc +@@ -766,7 +766,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { + void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, + views::Widget* widget) const { + BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Help bubbles anchored to menus may be clipped to their anchors' bounds, + // resulting in visual errors, unless they use accelerated rendering. See + // crbug.com/1445770 for details. diff --git a/www/chromium/files/patch-components_version__info_version__info.cc b/www/chromium/files/patch-components_version__info_version__info.cc deleted file mode 100644 index f0d8fb1c1bc4..000000000000 --- a/www/chromium/files/patch-components_version__info_version__info.cc +++ /dev/null @@ -1,131 +0,0 @@ ---- components/version_info/version_info.cc.orig 2023-04-28 17:01:32 UTC -+++ components/version_info/version_info.cc -@@ -4,15 +4,26 @@ - - #include "components/version_info/version_info.h" - --#include -- -+#include "base/check.h" - #include "base/no_destructor.h" -+#include "base/notreached.h" -+#include "base/sanitizer_buildflags.h" - #include "base/strings/strcat.h" - #include "base/strings/string_number_conversions.h" - #include "base/version.h" -+#include "build/branding_buildflags.h" -+#include "build/build_config.h" -+#include "build/chromeos_buildflags.h" -+#include "components/version_info/version_info_values.h" - - namespace version_info { - -+const std::string& GetProductNameAndVersionForUserAgent() { -+ static const base::NoDestructor product_and_version( -+ "Chrome/" + GetVersionNumber()); -+ return *product_and_version; -+} -+ - const std::string GetProductNameAndVersionForReducedUserAgent( - const std::string& build_version) { - std::string product_and_version; -@@ -21,6 +32,14 @@ const std::string GetProductNameAndVersionForReducedUs - return product_and_version; - } - -+std::string GetProductName() { -+ return PRODUCT_NAME; -+} -+ -+std::string GetVersionNumber() { -+ return PRODUCT_VERSION; -+} -+ - int GetMajorVersionNumberAsInt() { - DCHECK(GetVersion().IsValid()); - return GetVersion().components()[0]; -@@ -33,6 +52,84 @@ std::string GetMajorVersionNumber() { - const base::Version& GetVersion() { - static const base::NoDestructor version(GetVersionNumber()); - return *version; -+} -+ -+std::string GetLastChange() { -+ return LAST_CHANGE; -+} -+ -+bool IsOfficialBuild() { -+ return IS_OFFICIAL_BUILD; -+} -+ -+std::string GetOSType() { -+#if BUILDFLAG(IS_WIN) -+ return "Windows"; -+#elif BUILDFLAG(IS_IOS) -+ return "iOS"; -+#elif BUILDFLAG(IS_MAC) -+ return "Mac OS X"; -+#elif BUILDFLAG(IS_CHROMEOS) -+# if BUILDFLAG(GOOGLE_CHROME_BRANDING) -+ return "ChromeOS"; -+# else -+ return "ChromiumOS"; -+# endif -+#elif BUILDFLAG(IS_ANDROID) -+ return "Android"; -+#elif BUILDFLAG(IS_LINUX) -+ return "Linux"; -+#elif BUILDFLAG(IS_FREEBSD) -+ return "FreeBSD"; -+#elif BUILDFLAG(IS_OPENBSD) -+ return "OpenBSD"; -+#elif BUILDFLAG(IS_SOLARIS) -+ return "Solaris"; -+#elif BUILDFLAG(IS_FUCHSIA) -+ return "Fuchsia"; -+#else -+ return "Unknown"; -+#endif -+} -+ -+std::string GetChannelString(Channel channel) { -+ switch (channel) { -+ case Channel::STABLE: -+ return "stable"; -+ case Channel::BETA: -+ return "beta"; -+ case Channel::DEV: -+ return "dev"; -+ case Channel::CANARY: -+ return "canary"; -+ case Channel::UNKNOWN: -+ return "unknown"; -+ } -+ NOTREACHED(); -+ return std::string(); -+} -+ -+std::string GetSanitizerList() { -+ std::string sanitizers; -+#if defined(ADDRESS_SANITIZER) -+ sanitizers += "address "; -+#endif -+#if BUILDFLAG(IS_HWASAN) -+ sanitizers += "hwaddress "; -+#endif -+#if defined(LEAK_SANITIZER) -+ sanitizers += "leak "; -+#endif -+#if defined(MEMORY_SANITIZER) -+ sanitizers += "memory "; -+#endif -+#if defined(THREAD_SANITIZER) -+ sanitizers += "thread "; -+#endif -+#if defined(UNDEFINED_SANITIZER) -+ sanitizers += "undefined "; -+#endif -+ return sanitizers; - } - - } // namespace version_info diff --git a/www/chromium/files/patch-components_version__info_version__info.h b/www/chromium/files/patch-components_version__info_version__info.h deleted file mode 100644 index c346fda68902..000000000000 --- a/www/chromium/files/patch-components_version__info_version__info.h +++ /dev/null @@ -1,143 +0,0 @@ ---- components/version_info/version_info.h.orig 2023-05-31 08:12:17 UTC -+++ components/version_info/version_info.h -@@ -7,10 +7,6 @@ - - #include - --#include "base/notreached.h" --#include "base/sanitizer_buildflags.h" --#include "build/branding_buildflags.h" --#include "build/build_config.h" - #include "components/version_info/channel.h" - #include "components/version_info/version_info_values.h" - -@@ -20,6 +16,10 @@ class Version; - - namespace version_info { - -+// Returns the product name and version information for the User-Agent header, -+// in the format: Chrome/.... -+const std::string& GetProductNameAndVersionForUserAgent(); -+ - // Returns the product name and reduced version information for the User-Agent - // header, in the format: Chrome/.0.build_version.0, where - // `build_version` is a frozen BUILD number. -@@ -27,21 +27,11 @@ const std::string GetProductNameAndVersionForReducedUs - const std::string& build_version); - - // Returns the product name, e.g. "Chromium" or "Google Chrome". --constexpr std::string GetProductName() { -- return PRODUCT_NAME; --} -+std::string GetProductName(); - - // Returns the version number, e.g. "6.0.490.1". --constexpr std::string GetVersionNumber() { -- return PRODUCT_VERSION; --} -+std::string GetVersionNumber(); - --// Returns the product name and version information for the User-Agent header, --// in the format: Chrome/.... --constexpr std::string GetProductNameAndVersionForUserAgent() { -- return "Chrome/" + GetVersionNumber(); --} -- - // Returns the major component (aka the milestone) of the version as an int, - // e.g. 6 when the version is "6.0.490.1". - int GetMajorVersionNumberAsInt(); -@@ -53,89 +43,22 @@ std::string GetMajorVersionNumber(); - const base::Version& GetVersion(); - - // Returns a version control specific identifier of this release. --constexpr std::string GetLastChange() { -- return LAST_CHANGE; --} -+std::string GetLastChange(); - - // Returns whether this is an "official" release of the current version, i.e. - // whether knowing GetVersionNumber() is enough to completely determine what - // GetLastChange() is. --constexpr bool IsOfficialBuild() { -- return IS_OFFICIAL_BUILD; --} -+bool IsOfficialBuild(); - - // Returns the OS type, e.g. "Windows", "Linux", "FreeBSD", ... --constexpr std::string GetOSType() { --#if BUILDFLAG(IS_WIN) -- return "Windows"; --#elif BUILDFLAG(IS_IOS) -- return "iOS"; --#elif BUILDFLAG(IS_MAC) -- return "Mac OS X"; --#elif BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(GOOGLE_CHROME_BRANDING) -- return "ChromeOS"; --#else -- return "ChromiumOS"; --#endif --#elif BUILDFLAG(IS_ANDROID) -- return "Android"; --#elif BUILDFLAG(IS_LINUX) -- return "Linux"; --#elif BUILDFLAG(IS_FREEBSD) -- return "FreeBSD"; --#elif BUILDFLAG(IS_OPENBSD) -- return "OpenBSD"; --#elif BUILDFLAG(IS_SOLARIS) -- return "Solaris"; --#elif BUILDFLAG(IS_FUCHSIA) -- return "Fuchsia"; --#else -- return "Unknown"; --#endif --} -+std::string GetOSType(); - - // Returns a string equivalent of |channel|, independent of whether the build - // is branded or not and without any additional modifiers. --constexpr std::string GetChannelString(Channel channel) { -- switch (channel) { -- case Channel::STABLE: -- return "stable"; -- case Channel::BETA: -- return "beta"; -- case Channel::DEV: -- return "dev"; -- case Channel::CANARY: -- return "canary"; -- case Channel::UNKNOWN: -- return "unknown"; -- } -- NOTREACHED_NORETURN(); --} -+std::string GetChannelString(Channel channel); - - // Returns a list of sanitizers enabled in this build. --constexpr std::string GetSanitizerList() { -- return "" --#if defined(ADDRESS_SANITIZER) -- "address " --#endif --#if BUILDFLAG(IS_HWASAN) -- "hwaddress " --#endif --#if defined(LEAK_SANITIZER) -- "leak " --#endif --#if defined(MEMORY_SANITIZER) -- "memory " --#endif --#if defined(THREAD_SANITIZER) -- "thread " --#endif --#if defined(UNDEFINED_SANITIZER) -- "undefined " --#endif -- ; --} -+std::string GetSanitizerList(); - - } // namespace version_info - diff --git a/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc b/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc index a65ab432c3ce..bc6c3e67b2e0 100644 --- a/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc +++ b/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc @@ -1,9 +1,9 @@ ---- components/viz/common/gpu/dawn_context_provider.cc.orig 2023-05-31 08:12:17 UTC +--- components/viz/common/gpu/dawn_context_provider.cc.orig 2023-07-16 15:47:57 UTC +++ components/viz/common/gpu/dawn_context_provider.cc -@@ -23,7 +23,7 @@ namespace { +@@ -38,7 +38,7 @@ void LogFatal(WGPUDeviceLostReason reason, wgpu::BackendType GetDefaultBackendType() { #if BUILDFLAG(IS_WIN) - return wgpu::BackendType::D3D12; + return wgpu::BackendType::D3D11; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return wgpu::BackendType::Vulkan; diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index 3b733b461cb5..301902404409 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-05-31 08:12:17 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-07-16 15:47:57 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1289,7 +1289,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1433,7 +1433,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, ycbcr_info); diff --git a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc index d16c908ed1e8..ace40611e692 100644 --- a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2023-05-31 08:12:17 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2023-07-16 15:47:57 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1168,7 +1168,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1174,7 +1174,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index 52c9f71c708a..bdc553a362af 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-05-31 08:12:17 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-07-16 15:47:57 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -103,7 +103,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -107,7 +107,7 @@ RootCompositorFrameSinkImpl::Create( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -617,7 +617,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -628,7 +628,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw display_client_->DidCompleteSwapWithSize(pixel_size); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc index 48664b1499ff..ffcbe837b053 100644 --- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2023-05-31 08:12:17 UTC +--- content/app/content_main_runner_impl.cc.orig 2023-07-16 15:47:57 UTC +++ content/app/content_main_runner_impl.cc -@@ -143,13 +143,13 @@ +@@ -144,13 +144,13 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -16,7 +16,7 @@ #include "base/files/file_path_watcher_inotify.h" #include "base/native_library.h" #include "base/rand_util.h" -@@ -192,6 +192,10 @@ +@@ -193,6 +193,10 @@ #include "chromeos/startup/startup_switches.h" #endif @@ -27,7 +27,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -393,7 +397,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -394,7 +398,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -36,7 +36,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -431,7 +435,10 @@ void PreloadLibraryCdms() { +@@ -432,7 +436,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -47,7 +47,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -442,9 +449,16 @@ void PreSandboxInit() { +@@ -443,9 +450,16 @@ void PreSandboxInit() { // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -64,7 +64,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -829,11 +843,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -830,11 +844,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -78,7 +78,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1021,8 +1034,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1029,8 +1042,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -99,7 +99,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1090,7 +1115,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1098,7 +1123,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { ->ReconfigureAfterFeatureListInit(process_type); } @@ -108,7 +108,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -1125,6 +1150,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1133,6 +1158,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index fb12b530c777..99f8da8b1250 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,7 +1,7 @@ ---- content/browser/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- content/browser/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ content/browser/BUILD.gn -@@ -2389,6 +2389,13 @@ source_set("browser") { - ] +@@ -2414,6 +2414,13 @@ source_set("browser") { + deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] } + if (is_bsd) { diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc index 7baf4c66e50a..d98bbea8b0a7 100644 --- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2023-04-28 17:01:32 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2023-07-16 15:47:57 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -319,6 +319,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo +@@ -321,6 +321,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kDisableBestEffortTasks, switches::kDisableLogging, switches::kEnableLogging, diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index a09c9e78d89f..f7462bda96c0 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2023-05-31 08:12:17 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2023-07-16 15:47:57 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1706,7 +1706,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1713,7 +1713,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc index a672fce3c85e..7822589ed17d 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,4 +1,4 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2023-04-28 17:01:32 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2023-07-16 15:47:57 UTC +++ content/browser/gpu/gpu_process_host.cc @@ -252,6 +252,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, @@ -8,7 +8,7 @@ switches::kDoubleBufferCompositing, switches::kHeadless, switches::kLoggingLevel, -@@ -285,7 +286,7 @@ static const char* const kSwitchNames[] = { +@@ -284,7 +285,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kDisableBufferBWCompression, #endif diff --git a/www/chromium/files/patch-content_browser_network__service__instance__impl.cc b/www/chromium/files/patch-content_browser_network__service__instance__impl.cc index 8a0798108e84..2f2234d56101 100644 --- a/www/chromium/files/patch-content_browser_network__service__instance__impl.cc +++ b/www/chromium/files/patch-content_browser_network__service__instance__impl.cc @@ -1,4 +1,4 @@ ---- content/browser/network_service_instance_impl.cc.orig 2023-05-31 08:12:17 UTC +--- content/browser/network_service_instance_impl.cc.orig 2023-07-16 15:47:57 UTC +++ content/browser/network_service_instance_impl.cc @@ -78,7 +78,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" @@ -9,7 +9,7 @@ #include "content/browser/system_dns_resolution/system_dns_resolver.h" #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" #endif -@@ -422,7 +422,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -458,7 +458,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index c0258a2af880..387395deef82 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-05-31 08:12:17 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-07-16 15:47:57 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -215,7 +215,7 @@ +@@ -219,7 +219,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1179,7 +1179,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1217,7 +1217,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1271,7 +1271,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1309,7 +1309,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,7 +27,7 @@ if (auto font_receiver = receiver.As()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1360,7 +1360,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1398,7 +1398,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public std::unique_ptr binders_; mojo::Receiver receiver_{this}; @@ -36,29 +36,11 @@ mojo::Remote video_encode_accelerator_factory_remote_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -2182,7 +2182,7 @@ void RenderProcessHostImpl::ReinitializeLogging( - } - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RenderProcessHostImpl::CreateStableVideoDecoder( - mojo::PendingReceiver receiver) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); -@@ -3387,6 +3387,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3461,6 +3461,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, + switches::kDisableUnveil, - switches::kDisableUseMojoVideoDecoderForPepper, switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, -@@ -4908,7 +4909,7 @@ void RenderProcessHostImpl::ResetIPC() { - coordinator_connector_receiver_.reset(); - tracing_registration_.reset(); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - stable_video_decoder_factory_remote_.reset(); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - + switches::kDisableWebGLImageChromium, diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 56c0da22a0b8..ed5a6502c4e0 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,15 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2023-05-31 08:12:17 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2023-07-16 15:47:57 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -86,7 +86,7 @@ - #include "content/public/browser/android/child_process_importance.h" - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - -@@ -499,7 +499,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -502,7 +502,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); @@ -18,21 +9,3 @@ // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) -@@ -708,7 +708,7 @@ class CONTENT_EXPORT RenderProcessHostImpl - mojo::PendingReceiver receiver) - override; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void CreateStableVideoDecoder( - mojo::PendingReceiver receiver) - override; -@@ -1188,7 +1188,7 @@ class CONTENT_EXPORT RenderProcessHostImpl - // RenderProcessHost. This is destroyed early in ResetIPC() method. - std::unique_ptr permission_service_context_; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Connection to the StableVideoDecoderFactory that lives in a utility - // process. This is only used for out-of-process video decoding. - mojo::Remote diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index d62e916df95a..7a8e0881d2aa 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2023-05-31 08:12:17 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2023-07-16 15:47:57 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -272,7 +272,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -273,7 +273,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index a68767489ae1..f632e9ad260d 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-05-31 08:12:17 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-07-16 15:47:57 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -121,7 +121,7 @@ #include "ui/gfx/gdi_util.h" @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1620,7 +1620,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1634,7 +1634,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector& ui_ime_text_spans) { -@@ -2452,7 +2452,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2466,7 +2466,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2628,7 +2628,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2642,7 +2642,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h index f5977e126ba9..11c58ce33ffe 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2023-05-31 08:12:17 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2023-07-16 15:47:57 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -246,7 +246,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -251,7 +251,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index ed61b8b2d69a..a3923feffd32 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2022-02-28 16:54:41 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2023-07-16 15:47:57 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -596,7 +596,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -597,7 +597,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; diff --git a/www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc b/www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc new file mode 100644 index 000000000000..6a9baa628bfd --- /dev/null +++ b/www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc @@ -0,0 +1,14 @@ +--- content/browser/service_worker/service_worker_context_wrapper.cc.orig 2023-07-16 15:47:57 UTC ++++ content/browser/service_worker/service_worker_context_wrapper.cc +@@ -1396,9 +1396,11 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW + auto [document_url, key, callback] = std::move(*request); + + DCHECK(document_url.is_valid()); ++#if defined(__clang__) && (__clang_major__ >= 16) + TRACE_EVENT1("ServiceWorker", + "ServiceWorkerContextWrapper::MaybeProcessPendingWarmUpRequest", + "document_url", document_url.spec()); ++#endif + + context_core_->registry()->FindRegistrationForClientUrl( + ServiceWorkerRegistry::Purpose::kNotForNavigation, diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc index 7555b877f57e..92a6f5c47bdf 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host.cc @@ -1,4 +1,4 @@ ---- content/browser/utility_process_host.cc.orig 2023-05-31 08:12:17 UTC +--- content/browser/utility_process_host.cc.orig 2023-07-16 15:47:57 UTC +++ content/browser/utility_process_host.cc @@ -59,7 +59,7 @@ #include "content/browser/v8_snapshot_files.h" @@ -36,7 +36,7 @@ gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)), #endif client_(std::move(client)) { -@@ -409,7 +409,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -420,7 +420,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload()); #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -420,7 +420,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -431,7 +431,7 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-content_browser_utility__process__host.h b/www/chromium/files/patch-content_browser_utility__process__host.h index 2c0f740f0490..94e0fb18931b 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.h +++ b/www/chromium/files/patch-content_browser_utility__process__host.h @@ -1,4 +1,4 @@ ---- content/browser/utility_process_host.h.orig 2023-05-31 08:12:17 UTC +--- content/browser/utility_process_host.h.orig 2023-07-16 15:47:57 UTC +++ content/browser/utility_process_host.h @@ -39,7 +39,7 @@ namespace base { class Thread; @@ -9,7 +9,7 @@ namespace viz { class GpuClient; } // namespace viz -@@ -210,7 +210,7 @@ class CONTENT_EXPORT UtilityProcessHost +@@ -225,7 +225,7 @@ class CONTENT_EXPORT UtilityProcessHost std::vector pending_run_service_callbacks_; #endif diff --git a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc index 5b5b0a7b87e7..16deee98dc96 100644 --- a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2023-05-31 08:12:17 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2023-07-16 15:47:57 UTC +++ content/browser/utility_sandbox_delegate.cc -@@ -64,13 +64,13 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -63,13 +63,13 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(ENABLE_PPAPI) sandbox_type_ == sandbox::mojom::Sandbox::kPpapi || #endif @@ -17,7 +17,7 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -125,10 +125,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe +@@ -124,10 +124,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe // unsandboxed zygote and then apply their actual sandboxes in the forked // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || diff --git a/www/chromium/files/patch-content_child_child__process.cc b/www/chromium/files/patch-content_child_child__process.cc index dac7351e14c4..a39c2b8db463 100644 --- a/www/chromium/files/patch-content_child_child__process.cc +++ b/www/chromium/files/patch-content_child_child__process.cc @@ -1,11 +1,11 @@ ---- content/child/child_process.cc.orig 2023-04-28 17:01:32 UTC +--- content/child/child_process.cc.orig 2023-07-16 15:47:57 UTC +++ content/child/child_process.cc -@@ -63,7 +63,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ - thread_pool_init_params) - : resetter_(&child_process, this, nullptr), +@@ -67,7 +67,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ io_thread_(std::make_unique()) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const bool is_embedded_in_browser_process = + !command_line.HasSwitch(switches::kProcessType); + if (IsMojoCoreSharedLibraryEnabled() && !is_embedded_in_browser_process) { diff --git a/www/chromium/files/patch-content_public_browser_render__process__host.h b/www/chromium/files/patch-content_public_browser_render__process__host.h deleted file mode 100644 index e092947641fb..000000000000 --- a/www/chromium/files/patch-content_public_browser_render__process__host.h +++ /dev/null @@ -1,20 +0,0 @@ ---- content/public/browser/render_process_host.h.orig 2023-05-31 08:12:17 UTC -+++ content/public/browser/render_process_host.h -@@ -54,7 +54,7 @@ - #include "services/network/public/mojom/attribution.mojom-forward.h" - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "media/mojo/mojom/stable/stable_video_decoder.mojom-forward.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - -@@ -651,7 +651,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S - const blink::StorageKey& storage_key, - mojo::PendingReceiver receiver) = 0; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - virtual void CreateStableVideoDecoder( - mojo::PendingReceiver - receiver) = 0; diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index b7ae5608c416..f160d2391ba2 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2023-05-31 08:12:17 UTC +--- content/public/common/content_features.cc.orig 2023-07-16 15:47:57 UTC +++ content/public/common/content_features.cc -@@ -44,7 +44,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -52,7 +52,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -56,7 +56,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -64,7 +64,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, // kAudioServiceOutOfProcess feature is enabled. BASE_FEATURE(kAudioServiceSandbox, "AudioServiceSandbox", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -549,7 +549,7 @@ BASE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens, +@@ -539,7 +539,7 @@ BASE_FEATURE(kNetworkQualityEstimatorWebHoldback, // (activated by kUserAgentClientHint) BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT); @@ -27,7 +27,7 @@ // Supports proxying thread type changes of renderer processes to browser // process and having browser process handle adjusting thread properties (nice // value, c-group, latency sensitivity...) for renderers which have sandbox -@@ -1414,7 +1414,7 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1420,7 +1420,7 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -36,7 +36,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1472,7 +1472,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1483,7 +1483,11 @@ BASE_FEATURE(kWebUICodeCache, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/chromium/files/patch-content_public_common_content__features.h b/www/chromium/files/patch-content_public_common_content__features.h index 17e295e35be5..5205d3485b38 100644 --- a/www/chromium/files/patch-content_public_common_content__features.h +++ b/www/chromium/files/patch-content_public_common_content__features.h @@ -1,8 +1,8 @@ ---- content/public/common/content_features.h.orig 2023-05-31 08:12:17 UTC +--- content/public/common/content_features.h.orig 2023-07-16 15:47:57 UTC +++ content/public/common/content_features.h -@@ -117,7 +117,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollO - CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSet); - CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens); +@@ -115,7 +115,7 @@ CONTENT_EXPORT extern const base::FeatureParam + kFledgeLimitNumAuctionsParam; + CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollOffsets); CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index 5280e17fc60f..90bbbca0b8a4 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.cc.orig 2023-05-31 08:12:17 UTC +--- content/public/common/content_switches.cc.orig 2023-07-16 15:47:57 UTC +++ content/public/common/content_switches.cc @@ -367,6 +367,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. @@ -9,7 +9,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -1012,7 +1014,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -993,7 +995,7 @@ const char kEnableAutomation[] = "enable-automation"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h index 777d0252a63d..eb23ff5d2db1 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.h.orig 2023-05-31 08:12:17 UTC +--- content/public/common/content_switches.h.orig 2023-07-16 15:47:57 UTC +++ content/public/common/content_switches.h @@ -116,6 +116,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -268,7 +269,7 @@ CONTENT_EXPORT extern const char kUserLevelMemoryPress +@@ -265,7 +266,7 @@ CONTENT_EXPORT extern const char kUserLevelMemoryPress // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_public_test_mock__render__process__host.h b/www/chromium/files/patch-content_public_test_mock__render__process__host.h deleted file mode 100644 index c11bbea2f858..000000000000 --- a/www/chromium/files/patch-content_public_test_mock__render__process__host.h +++ /dev/null @@ -1,11 +0,0 @@ ---- content/public/test/mock_render_process_host.h.orig 2023-04-28 17:01:32 UTC -+++ content/public/test/mock_render_process_host.h -@@ -278,7 +278,7 @@ class MockRenderProcessHost : public RenderProcessHost - const blink::StorageKey& storage_key, - mojo::PendingReceiver receiver) - override {} --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void CreateStableVideoDecoder( - mojo::PendingReceiver receiver) - override {} diff --git a/www/chromium/files/patch-content_renderer_BUILD.gn b/www/chromium/files/patch-content_renderer_BUILD.gn index cc8deff6e554..af25f86bb4f6 100644 --- a/www/chromium/files/patch-content_renderer_BUILD.gn +++ b/www/chromium/files/patch-content_renderer_BUILD.gn @@ -1,7 +1,7 @@ ---- content/renderer/BUILD.gn.orig 2023-03-09 06:31:50 UTC +--- content/renderer/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ content/renderer/BUILD.gn -@@ -200,6 +200,13 @@ target(link_target_type, "renderer") { - ] +@@ -204,6 +204,13 @@ target(link_target_type, "renderer") { + configs += [ "//build/config/compiler:enable_arc" ] } + if (is_bsd) { diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index db02200c0af7..ed3dd364e830 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2023-05-31 08:12:17 UTC +--- content/renderer/render_thread_impl.cc.orig 2023-07-16 15:47:57 UTC +++ content/renderer/render_thread_impl.cc -@@ -202,6 +202,8 @@ +@@ -204,6 +204,8 @@ #if BUILDFLAG(IS_APPLE) #include @@ -9,7 +9,7 @@ #else #include #endif -@@ -1061,7 +1063,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1070,7 +1072,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = @@ -18,7 +18,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1070,7 +1072,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1079,7 +1081,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1848,7 +1850,7 @@ std::unique_ptr RenderThreadImpl::Create +@@ -1868,7 +1870,7 @@ std::unique_ptr RenderThreadImpl::Create bool enable_video_encode_accelerator) { mojo::PendingRemote vea_provider; diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 653da295dd4b..2652b25ed401 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2023-05-31 08:12:17 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2023-07-16 15:47:57 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -239,7 +239,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -238,7 +238,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 11483d6a7259..cd3fca68f201 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- content/shell/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ content/shell/BUILD.gn -@@ -995,7 +995,7 @@ group("content_shell_crash_test") { +@@ -1017,7 +1017,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index 8ac9dca103da..e86690eaf2ad 100644 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ b/www/chromium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- content/test/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ content/test/BUILD.gn -@@ -2164,7 +2164,7 @@ static_library("run_all_unittests") { +@@ -2181,7 +2181,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3214,7 +3214,7 @@ test("content_unittests") { +@@ -3234,7 +3234,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/chromium/files/patch-content_utility_services.cc b/www/chromium/files/patch-content_utility_services.cc index 60e54ce32cf4..5e71781eb54e 100644 --- a/www/chromium/files/patch-content_utility_services.cc +++ b/www/chromium/files/patch-content_utility_services.cc @@ -1,4 +1,4 @@ ---- content/utility/services.cc.orig 2023-05-31 08:12:17 UTC +--- content/utility/services.cc.orig 2023-07-16 15:47:57 UTC +++ content/utility/services.cc @@ -65,7 +65,7 @@ extern sandbox::TargetServices* g_utility_target_services; @@ -18,7 +18,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && -@@ -104,7 +104,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -110,7 +110,7 @@ extern sandbox::TargetServices* g_utility_target_servi #include "ui/accessibility/accessibility_features.h" #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE) @@ -27,7 +27,7 @@ #include "media/capture/capture_switches.h" #include "services/viz/public/cpp/gpu/gpu.h" #endif // BUILDFLAG(IS_LINUX) -@@ -221,7 +221,7 @@ auto RunAudio(mojo::PendingReceiver receiver) { auto service = std::make_unique( std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault()); @@ -45,7 +45,7 @@ if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { mojo::PendingRemote remote_gpu; content::UtilityThread::Get()->BindHostReceiver( -@@ -337,7 +337,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -343,7 +343,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -54,7 +54,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryProcessService( mojo::PendingReceiver< -@@ -348,7 +348,7 @@ auto RunStableVideoDecoderFactoryProcessService( +@@ -354,7 +354,7 @@ auto RunStableVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) @@ -63,7 +63,7 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver receiver) { -@@ -406,13 +406,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -419,13 +419,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc index 5e0491de9d28..26c01c3bd766 100644 --- a/www/chromium/files/patch-content_utility_utility__main.cc +++ b/www/chromium/files/patch-content_utility_utility__main.cc @@ -1,4 +1,4 @@ ---- content/utility/utility_main.cc.orig 2023-05-31 08:12:17 UTC +--- content/utility/utility_main.cc.orig 2023-07-16 15:47:57 UTC +++ content/utility/utility_main.cc @@ -31,7 +31,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" @@ -44,7 +44,7 @@ #include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck #endif -@@ -87,7 +93,7 @@ namespace content { +@@ -91,7 +97,7 @@ namespace content { namespace { @@ -53,7 +53,7 @@ std::vector GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -115,7 +121,7 @@ std::vector GetNetworkContextsParentDirec +@@ -119,7 +125,7 @@ std::vector GetNetworkContextsParentDirec bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) { const bool obtain_gpu_info = @@ -62,7 +62,7 @@ sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; -@@ -197,7 +203,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -235,7 +241,7 @@ int UtilityMain(MainFunctionParams parameters) { } } @@ -71,7 +71,7 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -226,7 +232,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -264,7 +270,7 @@ int UtilityMain(MainFunctionParams parameters) { pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook); break; #endif @@ -80,7 +80,7 @@ case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -253,6 +259,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -291,6 +297,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -88,7 +88,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox::policy::SandboxLinux::Options sandbox_options; -@@ -261,6 +268,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -299,6 +306,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } @@ -99,4 +99,4 @@ +#endif #elif BUILDFLAG(IS_WIN) g_utility_target_services = parameters.sandbox_info->target_services; - #endif + diff --git a/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc index 8c5ce617db8e..713305f51ab3 100644 --- a/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2023-05-17 10:17:13 UTC +--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2023-07-16 15:47:57 UTC +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc -@@ -96,7 +96,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -104,7 +104,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt MessageService::GetFactoryInstance(); MessagingAPIMessageFilter::EnsureAssociatedFactoryBuilt(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc index ecc89313825e..a7591ead79f6 100644 --- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2023-05-31 08:12:17 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2023-07-16 15:47:57 UTC +++ extensions/browser/api/messaging/message_service.cc @@ -71,7 +71,7 @@ namespace { const char kReceivingEndDoesntExistError[] = @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -483,7 +483,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -484,7 +484,7 @@ void MessageService::OpenChannelToNativeApp( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-extensions_common_api___permission__features.json b/www/chromium/files/patch-extensions_common_api___permission__features.json index 4773d1017668..1e286d6e747c 100644 --- a/www/chromium/files/patch-extensions_common_api___permission__features.json +++ b/www/chromium/files/patch-extensions_common_api___permission__features.json @@ -1,15 +1,15 @@ ---- extensions/common/api/_permission_features.json.orig 2023-04-28 17:01:32 UTC +--- extensions/common/api/_permission_features.json.orig 2023-07-16 15:47:57 UTC +++ extensions/common/api/_permission_features.json @@ -138,7 +138,7 @@ { "channel": "stable", "extension_types": ["platform_app"], -- "platforms": ["chromeos", "win", "mac", "linux"], -+ "platforms": ["chromeos", "win", "mac", "linux", "openbsd", "freebsd"], +- "platforms": ["chromeos", "lacros", "win", "mac", "linux"], ++ "platforms": ["chromeos", "lacros", "win", "mac", "linux", "openbsd", "freebsd"], "allowlist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -431,7 +431,7 @@ +@@ -432,7 +432,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], @@ -18,7 +18,7 @@ "allowlist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -473,7 +473,7 @@ +@@ -474,7 +474,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index 45e0d45fcd9b..8a83f8646338 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-05-31 08:12:17 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-07-16 15:47:57 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc @@ -43,7 +43,7 @@ #include "ui/gl/gl_version_info.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #endif -@@ -592,7 +592,7 @@ std::unique_ptr ExternalVkIma +@@ -591,7 +591,7 @@ std::unique_ptr ExternalVkIma WGPUDevice wgpuDevice, WGPUBackendType backend_type, std::vector view_formats) { diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc index 7d1ab1a77b52..a75b1492b194 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-05-31 08:12:17 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-07-16 15:47:57 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc -@@ -201,7 +201,7 @@ bool ExternalVkImageBackingFactory::IsSupported( +@@ -209,7 +209,7 @@ bool ExternalVkImageBackingFactory::IsSupported( return false; } diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc index 4361e90a1929..619a1f1c7a35 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-05-31 08:12:17 UTC +--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-07-16 15:47:57 UTC +++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc -@@ -209,7 +209,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri +@@ -210,7 +210,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri constexpr GrRenderable is_renderable = GrRenderable::kYes; constexpr GrProtected is_protected = GrProtected::kNo; diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 3e16623acfe5..d747ac3ce46f 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,9 +1,9 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-05-31 08:12:17 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-07-16 15:47:57 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1231,7 +1231,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1245,7 +1245,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( if (gr_context_type_ != GrContextType::kVulkan && - use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { + use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) callback(WGPURequestAdapterStatus_Unavailable, nullptr, diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc index a2988d1fea4f..c0a24fa5f1ff 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2023-01-11 09:17:16 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2023-07-16 15:47:57 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc @@ -21,7 +21,7 @@ #include "ui/ozone/public/ozone_platform.h" @@ -9,7 +9,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #endif -@@ -50,7 +50,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() +@@ -51,7 +51,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() return gfx::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h index b3dfbddb0a5b..11ec3df268c6 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h @@ -1,6 +1,6 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2023-01-11 09:17:16 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2023-07-16 15:47:57 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.h -@@ -18,7 +18,7 @@ +@@ -20,7 +20,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) namespace gfx { class ClientNativePixmapFactory; - } + } // namespace gfx diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc index 4fcc6cadaf6d..9c548c0bd2ab 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,4 +1,4 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2022-04-21 18:48:31 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2023-07-16 15:47:57 UTC +++ gpu/vulkan/vulkan_function_pointers.cc @@ -1151,7 +1151,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } @@ -9,3 +9,12 @@ if (gfx::HasExtension(enabled_extensions, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) { vkGetImageDrmFormatModifierPropertiesEXT = +@@ -1339,7 +1339,7 @@ void VulkanFunctionPointers::ResetForTesting() { + vkGetSwapchainImagesKHR = nullptr; + vkQueuePresentKHR = nullptr; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + vkGetImageDrmFormatModifierPropertiesEXT = nullptr; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + } diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index 19b6ee367e23..588b6227690a 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2022-04-21 18:48:31 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2023-07-16 15:47:57 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -305,7 +305,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -307,7 +307,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction vkGetSwapchainImagesKHR; VulkanFunction vkQueuePresentKHR; @@ -9,7 +9,7 @@ VulkanFunction vkGetImageDrmFormatModifierPropertiesEXT; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -1212,7 +1212,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1214,7 +1214,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } @@ -18,7 +18,7 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1222,4 +1222,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1224,4 +1224,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn index df09b9e5d2b6..ed2b28747c6d 100644 --- a/www/chromium/files/patch-media_audio_BUILD.gn +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- media/audio/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ media/audio/BUILD.gn -@@ -270,9 +270,20 @@ source_set("audio") { +@@ -279,9 +279,20 @@ source_set("audio") { ] } diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index f57f8b513cbb..6de1fd418b8e 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2023-05-31 08:12:17 UTC +--- media/base/media_switches.cc.orig 2023-07-16 15:47:57 UTC +++ media/base/media_switches.cc @@ -15,7 +15,7 @@ #include "gpu/config/gpu_finch_features.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -620,7 +620,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -636,7 +636,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -18,7 +18,16 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -668,7 +668,7 @@ constexpr base::FeatureParam GetDefaultLayo +@@ -306,7 +306,7 @@ static absl::optional GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } @@ -27,7 +27,7 @@ // This class allows us to embed a vector into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -636,7 +636,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM +@@ -635,7 +635,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM for (size_t i = 0; i < num_planes; ++i) planes[i].stride = gpu_memory_buffer->stride(i); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; @@ -36,7 +36,7 @@ if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -682,7 +682,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM +@@ -681,7 +681,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -902,7 +902,7 @@ scoped_refptr VideoFrame::WrapVideoFrame( +@@ -901,7 +901,7 @@ scoped_refptr VideoFrame::WrapVideoFrame( } } @@ -54,7 +54,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1305,7 +1305,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1303,7 +1303,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ const std::vector& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1418,7 +1418,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1416,7 +1416,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index aa03f265c606..fd26da2ca0dc 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2023-05-31 08:12:17 UTC +--- media/base/video_frame.h.orig 2023-07-16 15:47:57 UTC +++ media/base/video_frame.h @@ -44,7 +44,7 @@ #include "base/mac/scoped_cftyperef.h" @@ -27,7 +27,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -599,7 +599,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -596,7 +596,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // mailbox, the caller must wait for the included sync point. const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; @@ -36,7 +36,7 @@ // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -817,7 +817,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -814,7 +814,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr gpu_memory_buffer_; diff --git a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc index 5b726a58c725..3ba801041ef9 100644 --- a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc +++ b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc @@ -1,6 +1,6 @@ ---- media/capture/video/linux/fake_v4l2_impl.cc.orig 2023-04-05 11:05:06 UTC +--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2023-07-16 15:47:57 UTC +++ media/capture/video/linux/fake_v4l2_impl.cc -@@ -486,7 +486,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -487,7 +487,7 @@ int FakeV4L2Impl::close(int fd) { return kSuccessReturnValue; } diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc index 78aa084853ef..b94a00d099c5 100644 --- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,4 +1,4 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-05-17 10:17:13 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-07-16 15:47:57 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ @@ -24,7 +24,16 @@ // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -727,7 +731,7 @@ base::WeakPtr V4L2CaptureDelegate +@@ -255,7 +259,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control + // static + bool V4L2CaptureDelegate::IsControllableControl( + int control_id, +- const base::RepeatingCallback& do_ioctl) { ++ const base::RepeatingCallback& do_ioctl) { + const int special_control_id = GetControllingSpecialControl(control_id); + if (!special_control_id) { + // The control is not controlled by a special control thus the control is +@@ -772,7 +776,7 @@ base::WeakPtr V4L2CaptureDelegate V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -33,7 +42,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -737,7 +741,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -782,7 +786,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } @@ -42,7 +51,7 @@ return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp)); } -@@ -777,6 +781,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co +@@ -793,6 +797,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co } void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() { @@ -50,7 +59,7 @@ constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS, V4L2_CID_AUTO_WHITE_BALANCE, V4L2_CID_BRIGHTNESS, -@@ -804,6 +809,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript +@@ -820,6 +825,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}"; } } @@ -58,7 +67,7 @@ } mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) { -@@ -984,7 +990,11 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1000,7 +1006,11 @@ void V4L2CaptureDelegate::DoCapture() { pollfd device_pfd = {}; device_pfd.fd = device_fd_.get(); @@ -70,7 +79,7 @@ const int result = HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs)); -@@ -1022,6 +1032,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1038,6 +1048,7 @@ void V4L2CaptureDelegate::DoCapture() { timeout_count_ = 0; } @@ -78,7 +87,7 @@ // Dequeue events if the driver has filled in some. if (device_pfd.revents & POLLPRI) { bool controls_changed = false; -@@ -1056,6 +1067,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1072,6 +1083,7 @@ void V4L2CaptureDelegate::DoCapture() { client_->OnCaptureConfigurationChanged(); } } diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h index aedf9b40f69e..9a8b7cd7a7fe 100644 --- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h +++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h @@ -1,6 +1,15 @@ ---- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-05-17 10:17:13 UTC +--- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-07-16 15:47:57 UTC +++ media/capture/video/linux/v4l2_capture_delegate.h -@@ -87,10 +87,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { +@@ -81,7 +81,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { + static bool IsBlockedControl(int control_id); + static bool IsControllableControl( + int control_id, +- const base::RepeatingCallback& do_ioctl); ++ const base::RepeatingCallback& do_ioctl); + + private: + friend class V4L2CaptureDelegateTest; +@@ -92,10 +92,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { // device file descriptor or (re)starting streaming, can fail but works after // retrying (https://crbug.com/670262). Returns false if the |request| ioctl // fails too many times. diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc index e390f76dad31..7209171cf29b 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,11 +1,11 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2023-04-28 17:01:32 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2023-07-16 15:47:57 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -321,7 +321,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( - // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. - // Windows RGB24 defines blue at lowest byte, - // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - fourcc_format = libyuv::FOURCC_RAW; - #elif BUILDFLAG(IS_WIN) - fourcc_format = libyuv::FOURCC_24BG; +@@ -149,7 +149,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( + CHECK(!is_width_odd && !is_height_odd); + return {libyuv::FOURCC_UYVY}; + case media::PIXEL_FORMAT_RGB24: +- if constexpr (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) { ++ if constexpr (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) { + // Linux RGB24 defines red at lowest byte address, + // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. + return {libyuv::FOURCC_RAW}; diff --git a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index b0cd56a4e07e..18cd434b5b11 100644 --- a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,15 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-05-31 08:12:17 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-07-16 15:47:57 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -212,7 +212,7 @@ std::unique_ptr VideoDecoderPipeline::Cr - #if BUILDFLAG(USE_VAAPI) - create_decoder_function_cb = base::BindOnce(&VaapiVideoDecoder::Create); - #elif BUILDFLAG(USE_V4L2_CODEC) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) - create_decoder_function_cb = base::BindOnce(&V4L2VideoDecoder::Create); - #else - return nullptr; -@@ -909,14 +909,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -979,14 +979,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } } @@ -26,7 +17,7 @@ // Linux w/ V4L2 should not use a custom allocator // Only tested with video_decode_accelerator_tests // TODO(wenst@) Test with full Chromium Browser -@@ -1046,7 +1046,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1117,7 +1117,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); diff --git a/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index d92668a19053..014c591029b8 100644 --- a/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2023-04-28 17:01:32 UTC +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2023-07-16 15:47:57 UTC +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc @@ -15,7 +15,9 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" @@ -18,15 +18,15 @@ void AllowAccessToRenderNodes(std::vector& permissions, bool include_sys_dev_char, bool read_write) { -@@ -168,6 +171,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( - return false; +@@ -165,6 +168,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( + NOTREACHED_NORETURN(); #endif // BUILDFLAG(USE_V4L2_CODEC) } +#endif } // namespace -@@ -183,6 +187,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -180,6 +184,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( // (at least). bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { @@ -34,7 +34,7 @@ using HardwareVideoDecodingProcessPolicy = sandbox::policy::HardwareVideoDecodingProcessPolicy; using PolicyType = -@@ -220,6 +225,7 @@ bool HardwareVideoDecodingPreSandboxHook( +@@ -217,6 +222,7 @@ bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess( command_set, permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options); diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index 805c4da7aa9a..5bc17788ac8f 100644 --- a/www/chromium/files/patch-media_media__options.gni +++ b/www/chromium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2023-05-31 08:12:17 UTC +--- media/media_options.gni.orig 2023-07-16 15:47:57 UTC +++ media/media_options.gni -@@ -173,12 +173,15 @@ declare_args() { +@@ -177,12 +177,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false @@ -17,7 +17,7 @@ (!is_castos || (target_cpu == "x86" || target_cpu == "x64") || is_cast_audio_only)) { use_alsa = true -@@ -194,6 +197,10 @@ declare_args() { +@@ -198,6 +201,10 @@ declare_args() { if (!use_cras && !is_castos && !is_asan && !is_tsan) { use_pulseaudio = true } diff --git a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h index 726ae5f93460..dfabedd0fa11 100644 --- a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h +++ b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h @@ -1,6 +1,6 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2023-05-31 08:12:17 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2023-07-16 15:47:57 UTC +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h -@@ -694,7 +694,7 @@ struct StructTraitsHasTextures(); @@ -9,7 +9,7 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1183,7 +1183,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo +@@ -1181,7 +1181,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo is_webgpu_compatible = (gpu_memory_buffer != nullptr); #endif @@ -18,7 +18,7 @@ is_webgpu_compatible = (gpu_memory_buffer != nullptr); if (is_webgpu_compatible) { is_webgpu_compatible &= -@@ -1202,7 +1202,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo +@@ -1200,7 +1200,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index ffc32220b46b..25dc240dabb8 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- net/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ net/BUILD.gn @@ -107,7 +107,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1386,7 +1399,7 @@ component("net") { +@@ -1387,7 +1400,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -38,7 +38,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2847,7 +2860,7 @@ test("net_unittests") { +@@ -2856,7 +2869,7 @@ test("net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2915,6 +2928,10 @@ test("net_unittests") { +@@ -2924,6 +2937,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -58,7 +58,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -2996,7 +3013,7 @@ test("net_unittests") { +@@ -3006,7 +3023,7 @@ test("net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3131,7 +3148,7 @@ test("net_unittests") { +@@ -3142,7 +3159,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc index 427db42d403a..0a8e66603d32 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_posix.cc.orig 2023-05-31 08:12:17 UTC +--- net/socket/udp_socket_posix.cc.orig 2023-07-16 15:47:57 UTC +++ net/socket/udp_socket_posix.cc -@@ -575,7 +575,7 @@ int UDPSocketPosix::SetDoNotFragment() { +@@ -591,7 +591,7 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -9,7 +9,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -596,7 +596,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -612,7 +612,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -18,7 +18,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -909,7 +909,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -925,7 +925,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) #if BUILDFLAG(IS_CHROMEOS_ASH) if (last_error == EINVAL) return ERR_ADDRESS_IN_USE; diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index afaa7c8b2678..62fd712cee7b 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2023-03-09 06:31:50 UTC +--- net/url_request/url_request_context_builder.cc.orig 2023-07-16 15:47:57 UTC +++ net/url_request/url_request_context_builder.cc -@@ -443,7 +443,7 @@ std::unique_ptr URLRequestContextBu +@@ -444,7 +444,7 @@ std::unique_ptr URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 427c2412caea..447e0fea38c1 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,4 +1,4 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2023-03-09 06:31:50 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2023-07-16 15:47:57 UTC +++ pdf/pdfium/pdfium_engine.cc @@ -84,7 +84,7 @@ #include "gin/public/cppgc.h" @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -526,7 +526,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon +@@ -526,7 +526,7 @@ void InitializeSDK(bool enable_v8, FPDF_InitLibraryWithConfig(&config); diff --git a/www/chromium/files/patch-printing_backend_cups__ipp__helper.cc b/www/chromium/files/patch-printing_backend_cups__ipp__helper.cc index 5fec7a5db4dd..45bd3431cf2b 100644 --- a/www/chromium/files/patch-printing_backend_cups__ipp__helper.cc +++ b/www/chromium/files/patch-printing_backend_cups__ipp__helper.cc @@ -1,6 +1,6 @@ ---- printing/backend/cups_ipp_helper.cc.orig 2023-04-28 17:01:32 UTC +--- printing/backend/cups_ipp_helper.cc.orig 2023-07-16 15:47:57 UTC +++ printing/backend/cups_ipp_helper.cc -@@ -211,7 +211,7 @@ void ExtractResolutions(const CupsOptionProvider& prin +@@ -213,7 +213,7 @@ void ExtractResolutions(const CupsOptionProvider& prin // Provide a default DPI if no valid DPI is found. #if BUILDFLAG(IS_MAC) constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi); diff --git a/www/chromium/files/patch-printing_print__settings.cc b/www/chromium/files/patch-printing_print__settings.cc index 9217116fc0c2..7cd972fa0689 100644 --- a/www/chromium/files/patch-printing_print__settings.cc +++ b/www/chromium/files/patch-printing_print__settings.cc @@ -1,6 +1,6 @@ ---- printing/print_settings.cc.orig 2023-04-05 11:05:06 UTC +--- printing/print_settings.cc.orig 2023-07-16 15:47:57 UTC +++ printing/print_settings.cc -@@ -309,7 +309,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet +@@ -314,7 +314,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet #endif is_modifiable_ = settings.is_modifiable_; pages_per_sheet_ = settings.pages_per_sheet_; @@ -9,7 +9,25 @@ for (const auto& item : settings.advanced_settings_) advanced_settings_.emplace(item.first, item.second.Clone()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -353,7 +353,7 @@ void PrintSettings::Clear() { +@@ -341,7 +341,7 @@ bool PrintSettings::operator==(const PrintSettings& ot + #endif + is_modifiable_, requested_custom_margins_in_points_, + pages_per_sheet_ +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + , + advanced_settings_ + #endif +@@ -366,7 +366,7 @@ bool PrintSettings::operator==(const PrintSettings& ot + other.is_modifiable_, + other.requested_custom_margins_in_points_, + other.pages_per_sheet_ +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + , + other.advanced_settings_ + #endif +@@ -405,7 +405,7 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; diff --git a/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc b/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc index 3f21cb3e83a4..6417a78541d8 100644 --- a/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc +++ b/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host_services_client.cc.orig 2023-05-31 08:12:17 UTC +--- remoting/host/chromoting_host_services_client.cc.orig 2023-07-16 15:47:57 UTC +++ remoting/host/chromoting_host_services_client.cc -@@ -64,7 +64,7 @@ mojo::PendingRemote Con +@@ -65,7 +65,7 @@ mojo::PendingRemote Con } // namespace @@ -9,7 +9,7 @@ // static constexpr char -@@ -142,7 +142,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic +@@ -144,7 +144,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic if (session_services_remote_.is_bound()) { return true; } diff --git a/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom b/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom index d8ceddb25cf9..c77a4d3a6489 100644 --- a/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom +++ b/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom @@ -1,8 +1,8 @@ ---- sandbox/policy/mojom/sandbox.mojom.orig 2023-03-09 06:31:50 UTC +--- sandbox/policy/mojom/sandbox.mojom.orig 2023-07-16 15:47:57 UTC +++ sandbox/policy/mojom/sandbox.mojom -@@ -76,6 +76,12 @@ enum Sandbox { - [EnableIf=is_win] - kFileUtil, +@@ -72,6 +72,12 @@ enum Sandbox { + [EnableIf=is_fuchsia] + kVideoCapture, + [EnableIf=is_openbsd] + kVideoCapture, diff --git a/www/chromium/files/patch-sandbox_policy_sandbox__type.cc b/www/chromium/files/patch-sandbox_policy_sandbox__type.cc index 0cfac53a885c..e98ffa00a0cb 100644 --- a/www/chromium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/chromium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/sandbox_type.cc.orig 2023-03-09 06:31:50 UTC +--- sandbox/policy/sandbox_type.cc.orig 2023-07-16 15:47:57 UTC +++ sandbox/policy/sandbox_type.cc -@@ -39,7 +39,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif case Sandbox::kAudio: return false; @@ -9,7 +9,7 @@ case Sandbox::kVideoCapture: return false; #endif -@@ -62,7 +62,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -61,7 +61,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { case Sandbox::kMirroring: case Sandbox::kNaClLoader: #endif @@ -18,7 +18,7 @@ case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -72,7 +72,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -71,7 +71,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { case Sandbox::kLibassistant: #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) #endif // // BUILDFLAG(IS_CHROMEOS_ASH) @@ -27,7 +27,7 @@ case Sandbox::kZygoteIntermediateSandbox: case Sandbox::kHardwareVideoEncoding: #endif -@@ -128,7 +128,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -127,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -36,9 +36,9 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -140,10 +140,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -138,10 +138,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi + case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: - case Sandbox::kFileUtil: #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) @@ -49,7 +49,7 @@ case Sandbox::kHardwareVideoEncoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -171,7 +171,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -169,7 +169,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kNaClLoader: break; #endif // BUILDFLAG(IS_MAC) @@ -58,7 +58,7 @@ case Sandbox::kZygoteIntermediateSandbox: break; #endif -@@ -218,7 +218,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( +@@ -216,7 +216,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( if (process_type == switches::kNaClBrokerProcess) return Sandbox::kNoSandbox; @@ -67,7 +67,7 @@ // Intermediate process gains a sandbox later. if (process_type == switches::kZygoteProcessType) return Sandbox::kZygoteIntermediateSandbox; -@@ -262,7 +262,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -260,7 +260,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; @@ -76,7 +76,7 @@ case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -292,11 +292,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -290,11 +290,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return switches::kMirroringSandbox; #endif @@ -90,7 +90,7 @@ case Sandbox::kHardwareVideoEncoding: return switches::kHardwareVideoEncodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -320,7 +320,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -314,7 +314,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb #if BUILDFLAG(IS_MAC) case Sandbox::kNaClLoader: #endif // BUILDFLAG(IS_MAC) @@ -99,7 +99,7 @@ case Sandbox::kZygoteIntermediateSandbox: #endif NOTREACHED(); -@@ -391,11 +391,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( +@@ -382,11 +382,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( if (sandbox_string == switches::kScreenAISandbox) return Sandbox::kScreenAI; #endif diff --git a/www/chromium/files/patch-sandbox_policy_switches.cc b/www/chromium/files/patch-sandbox_policy_switches.cc index 880f30609692..60396bfe797a 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.cc +++ b/www/chromium/files/patch-sandbox_policy_switches.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.cc.orig 2023-05-31 08:12:17 UTC +--- sandbox/policy/switches.cc.orig 2023-07-16 15:47:57 UTC +++ sandbox/policy/switches.cc -@@ -54,10 +54,10 @@ const char kFileUtilSandbox[] = "file_util"; +@@ -53,10 +53,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro const char kMirroringSandbox[] = "mirroring"; #endif // BUILDFLAG(IS_MAC) @@ -13,7 +13,7 @@ const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -96,7 +96,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -95,7 +95,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; diff --git a/www/chromium/files/patch-sandbox_policy_switches.h b/www/chromium/files/patch-sandbox_policy_switches.h index 514826d21e6e..d8879ff2d1e3 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.h +++ b/www/chromium/files/patch-sandbox_policy_switches.h @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.h.orig 2023-05-31 08:12:17 UTC +--- sandbox/policy/switches.h.orig 2023-07-16 15:47:57 UTC +++ sandbox/policy/switches.h -@@ -57,10 +57,10 @@ SANDBOX_POLICY_EXPORT extern const char kFileUtilSandb +@@ -56,10 +56,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[]; #endif // BUILDFLAG(IS_MAC) @@ -13,7 +13,7 @@ SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -81,7 +81,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -80,7 +80,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; diff --git a/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc b/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc index 918562c2bcb1..4e4dbfdd0f30 100644 --- a/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc +++ b/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc @@ -1,4 +1,4 @@ ---- services/cert_verifier/cert_verifier_creation.cc.orig 2023-05-31 08:12:17 UTC +--- services/cert_verifier/cert_verifier_creation.cc.orig 2023-07-16 15:47:57 UTC +++ services/cert_verifier/cert_verifier_creation.cc @@ -14,7 +14,7 @@ #include "net/cert_net/cert_net_fetcher_url_request.h" @@ -9,16 +9,16 @@ #include "net/cert/cert_verify_proc_builtin.h" #include "net/cert/internal/system_trust_store.h" #endif -@@ -114,7 +114,7 @@ class CertVerifyProcFactoryImpl : public net::CertVeri +@@ -113,7 +113,7 @@ class CertVerifyProcFactoryImpl : public net::CertVeri user_slot_restriction_ ? crypto::ScopedPK11Slot(PK11_ReferenceSlot( user_slot_restriction_.get())) : nullptr)); -#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - verify_proc = net::CreateCertVerifyProcBuiltin( - std::move(cert_net_fetcher), std::move(crl_set), - net::CreateSslSystemTrustStore()); -@@ -215,6 +215,7 @@ std::unique_ptr Cr + return net::CreateCertVerifyProcBuiltin(std::move(cert_net_fetcher), + std::move(crl_set), + net::CreateSslSystemTrustStore()); +@@ -213,6 +213,7 @@ std::unique_ptr Cr bool IsUsingCertNetFetcher() { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-services_device_hid_BUILD.gn b/www/chromium/files/patch-services_device_hid_BUILD.gn index 038d0c930127..8c84ac42b489 100644 --- a/www/chromium/files/patch-services_device_hid_BUILD.gn +++ b/www/chromium/files/patch-services_device_hid_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/hid/BUILD.gn.orig 2022-11-30 08:12:58 UTC +--- services/device/hid/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ services/device/hid/BUILD.gn -@@ -35,7 +35,26 @@ source_set("hid") { +@@ -34,7 +34,26 @@ source_set("hid") { "//services/device/public/mojom", ] diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index 8a752722ea5d..d9856f654c4c 100644 --- a/www/chromium/files/patch-services_network_BUILD.gn +++ b/www/chromium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- services/network/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ services/network/BUILD.gn -@@ -362,7 +362,6 @@ if (is_linux || is_chromeos) { +@@ -374,7 +374,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/chromium/files/patch-services_network_public_cpp_BUILD.gn b/www/chromium/files/patch-services_network_public_cpp_BUILD.gn index b80b2eab62a7..1bbad9a61829 100644 --- a/www/chromium/files/patch-services_network_public_cpp_BUILD.gn +++ b/www/chromium/files/patch-services_network_public_cpp_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/cpp/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- services/network/public/cpp/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ services/network/public/cpp/BUILD.gn -@@ -469,7 +469,7 @@ component("cpp_base") { +@@ -474,7 +474,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn index 258f7e9b1f27..706fab3e4b55 100644 --- a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn +++ b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/mojom/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- services/network/public/mojom/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ services/network/public/mojom/BUILD.gn -@@ -460,11 +460,11 @@ mojom("url_loader_base") { +@@ -464,11 +464,11 @@ mojom("url_loader_base") { } enabled_features = [] @@ -14,7 +14,7 @@ # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1377,7 +1377,7 @@ mojom("mojom") { +@@ -1386,7 +1386,7 @@ mojom("mojom") { } } diff --git a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index 1e058daeb509..8f67fb94068f 100644 --- a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,6 +1,6 @@ ---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2022-11-30 08:12:58 UTC +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2023-07-16 15:47:57 UTC +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc -@@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO +@@ -53,7 +53,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO uint32_t shared_resident_kb) { DCHECK(os_dump.platform_private_footprint); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,7 +9,7 @@ uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; return (rss_anon_bytes + vm_swap_bytes) / 1024; -@@ -82,7 +82,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl +@@ -81,7 +81,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; os_dump->private_footprint_kb = CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); @@ -18,7 +18,7 @@ os_dump->private_footprint_swap_kb = internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; #endif -@@ -261,7 +261,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -220,7 +220,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // On most platforms each process can dump data about their own process // so ask each process to do so Linux is special see below. @@ -27,7 +27,7 @@ request->pending_responses.insert({client_info.pid, ResponseType::kOSDump}); client->RequestOSMemoryDump(request->memory_map_option(), {base::kNullProcessId}, -@@ -276,7 +276,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -235,7 +235,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // In some cases, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -36,7 +36,7 @@ std::vector pids; mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = base::kNullProcessId; -@@ -322,7 +322,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion +@@ -281,7 +281,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion const OsCallback& os_callback) { // On Linux, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -45,7 +45,7 @@ mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = 0; for (const auto& client_info : clients) { -@@ -372,7 +372,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( +@@ -331,7 +331,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( // each client process provides 1 OS dump, % the case where the client is // disconnected mid dump. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; @@ -54,7 +54,7 @@ for (auto& kv : extra_os_dumps) { auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; DCHECK(results.find(pid) == results.end()); -@@ -434,7 +434,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* +@@ -392,7 +392,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* // crash). In the latter case (OS_LINUX) we expect the full map to come // from the browser process response. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; diff --git a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc index fec4820ffbf8..19926568c950 100644 --- a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc +++ b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc @@ -1,4 +1,4 @@ ---- services/video_capture/video_capture_service_impl.cc.orig 2023-05-31 08:12:17 UTC +--- services/video_capture/video_capture_service_impl.cc.orig 2023-07-16 15:47:57 UTC +++ services/video_capture/video_capture_service_impl.cc @@ -43,7 +43,7 @@ #include "services/video_capture/lacros/device_factory_adapter_lacros.h" @@ -27,7 +27,7 @@ if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { if (!viz_gpu_context_provider_) { viz_gpu_context_provider_ = -@@ -344,7 +344,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH +@@ -345,7 +345,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH } #endif diff --git a/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc b/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc new file mode 100644 index 000000000000..745e69c82f92 --- /dev/null +++ b/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc @@ -0,0 +1,11 @@ +--- skia/ext/skcolorspace_trfn.cc.orig 2023-07-16 15:47:57 UTC ++++ skia/ext/skcolorspace_trfn.cc +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include ++ + #include "skia/ext/skcolorspace_trfn.h" + + namespace skia { diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index 435fb9c032e0..73ed89d6c1b4 100644 --- a/www/chromium/files/patch-third__party_angle_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- third_party/angle/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ third_party/angle/BUILD.gn -@@ -292,7 +292,6 @@ config("extra_warnings") { +@@ -298,7 +298,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -463,7 +462,7 @@ template("angle_common_lib") { +@@ -469,7 +468,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -618,6 +617,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -624,6 +623,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index f76f7109af85..d56933571369 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2023-05-31 08:12:17 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2023-07-16 15:47:57 UTC +++ third_party/angle/src/libANGLE/Display.cpp -@@ -57,7 +57,7 @@ +@@ -62,7 +62,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" # elif ANGLE_ENABLE_EAGL # include "libANGLE/renderer/gl/eagl/DisplayEAGL.h" @@ -9,7 +9,7 @@ # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_X11) # include "libANGLE/renderer/gl/glx/DisplayGLX.h" -@@ -352,7 +352,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -392,7 +392,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = new rx::DisplayEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -393,7 +393,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -433,7 +433,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); @@ -27,7 +27,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0 || platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE) -@@ -442,7 +442,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -482,7 +482,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2050,7 +2050,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2093,7 +2093,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h index eb0fd0e14172..1ddadeff87be 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2023-03-09 06:31:50 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2023-07-16 15:47:57 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -206,7 +206,7 @@ inline bool IsWindows() +@@ -212,7 +212,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/chromium/files/patch-third__party_angle_util_BUILD.gn b/www/chromium/files/patch-third__party_angle_util_BUILD.gn index 462c887bf52b..0e6532d89817 100644 --- a/www/chromium/files/patch-third__party_angle_util_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_util_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/util/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- third_party/angle/util/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ third_party/angle/util/BUILD.gn -@@ -302,7 +302,7 @@ foreach(is_shared_library, +@@ -309,7 +309,7 @@ foreach(is_shared_library, ] libs = [] diff --git a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h index 38d43155bb49..2c3918f765fc 100644 --- a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h +++ b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2022-03-25 21:59:56 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2023-07-16 15:47:57 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h -@@ -50,7 +50,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { +@@ -63,7 +63,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { bool webrtc_allow_legacy_tls_protocols{false}; UserAgentOverride user_agent_override; std::string accept_languages; diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 5ddd8675c063..e2c38452d35c 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-04-28 17:01:32 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-07-16 15:47:57 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -408,7 +408,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3348,7 +3348,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3286,7 +3286,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_parser_html__document__parser__fastpath.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_parser_html__document__parser__fastpath.cc new file mode 100644 index 000000000000..4b80f12d9aad --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_parser_html__document__parser__fastpath.cc @@ -0,0 +1,14 @@ +--- third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.orig 2023-07-16 15:47:57 UTC ++++ third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc +@@ -169,7 +169,11 @@ class HTMLFastPathParser { + using Span = base::span; + using USpan = base::span; + // 32 matches that used by HTMLToken::Attribute. ++#if defined(__clang__) && (__clang_major__ >= 16) + typedef std::conditional, ++#else ++ typedef typename std::conditional, ++#endif + UCharLiteralBuffer<32>, + LCharLiteralBuffer<32>>::type LiteralBufferType; + typedef UCharLiteralBuffer<32> UCharLiteralBufferType; diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 847ee024e568..4ce657b80f4b 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2023-05-31 08:12:17 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2023-07-16 15:47:57 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -66,7 +66,7 @@ +@@ -68,7 +68,7 @@ #include "ui/display/screen_info.h" #include "ui/gfx/geometry/quad_f.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -305,7 +305,7 @@ void LayoutView::UpdateLayout() { +@@ -323,7 +323,7 @@ void LayoutView::UpdateLayout() { fragmentation_context_.Clear(); } diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc deleted file mode 100644 index f3ec67adea28..000000000000 --- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc +++ /dev/null @@ -1,49 +0,0 @@ ---- third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.orig 2023-05-31 08:12:17 UTC -+++ third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc -@@ -520,8 +520,15 @@ wtf_size_t NGGridLayoutAlgorithm::BuildGridSizingSubtr - row_auto_repetitions); - - bool has_nested_subgrid = false; -+#if defined(__clang__) && (__clang_major__ >= 16) - auto& [grid_items, layout_data, subtree_size] = - sizing_tree->CreateSizingData(opt_subgrid_data); -+#else -+ auto& sizing_data = sizing_tree->CreateSizingData(opt_subgrid_data); -+ auto& layout_data = sizing_data.layout_data; -+ auto& grid_items = sizing_data.grid_items; -+ auto& subtree_size = sizing_data.subtree_size; -+#endif - - if (!must_ignore_children) { - // Construct grid items that are not subgridded. -@@ -650,8 +657,14 @@ NGGridSizingTree NGGridLayoutAlgorithm::BuildGridSizin - NGGridSizingTree sizing_tree; - - if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) { -+#if defined(__clang__) && (__clang_major__ >= 16) - auto& [grid_items, layout_data, subtree_size] = - sizing_tree.CreateSizingData(); -+#else -+ auto& sizing_data = sizing_tree.CreateSizingData(); -+ auto& layout_data = sizing_data.layout_data; -+ auto& grid_items = sizing_data.grid_items; -+#endif - - const auto& node = Node(); - grid_items = -@@ -1640,8 +1653,15 @@ void NGGridLayoutAlgorithm::InitializeTrackSizes( - const absl::optional& opt_track_direction) const { - DCHECK(sizing_subtree); - -+#if defined(__clang__) && (__clang_major__ >= 16) - auto& [grid_items, layout_data, subtree_size] = - sizing_subtree.SubtreeRootData(); -+#else -+ auto& sizing_data = sizing_subtree.SubtreeRootData(); -+ auto& layout_data = sizing_data.layout_data; -+ auto& grid_items = sizing_data.grid_items; -+ auto& subtree_size = sizing_data.subtree_size; -+#endif - - auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) { - InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index ae3a05a8a0e3..df5ca2a68e78 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-04-28 17:01:32 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-07-16 15:47:57 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -115,7 +115,7 @@ namespace blink { +@@ -116,7 +116,7 @@ namespace blink { namespace { diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc new file mode 100644 index 000000000000..476cb3d2292d --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc @@ -0,0 +1,23 @@ +--- third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.orig 2023-07-16 15:47:57 UTC ++++ third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc +@@ -91,12 +91,20 @@ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags, + case kGradient: + GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(), + ImageDrawOptions()); ++#if defined(__clang__) && (__clang_major__ >= 16) + flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha)); ++#else ++ flags.setColor(SkColor4f({0.0f, 0.0f, 0.0f, global_alpha})); ++#endif + break; + case kImagePattern: + GetCanvasPattern()->GetPattern()->ApplyToFlags( + flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform())); ++#if defined(__clang__) && (__clang_major__ >= 16) + flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha)); ++#else ++ flags.setColor(SkColor4f({0.0f, 0.0f, 0.0f, global_alpha})); ++#endif + break; + default: + NOTREACHED(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc index d886e10f1111..9fe37877e228 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-05-31 08:12:17 UTC +--- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-07-16 15:47:57 UTC +++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc -@@ -183,7 +183,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount +@@ -185,7 +185,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount ~SharedXnnpackContext() { base::AutoLock auto_lock(SharedXnnpackContextLock()); diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index 8afc71b09fb1..84f7758391a9 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2023-04-05 11:05:06 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2023-07-16 15:47:57 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -290,7 +290,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -297,7 +297,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 9d4792f24ac4..cef3776a6e2b 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-05-31 08:12:17 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-07-16 15:47:57 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6228,7 +6228,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6219,7 +6219,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 4631ae4ce5be..f804432260cb 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1919,7 +1919,7 @@ static_library("test_support") { +@@ -1928,7 +1928,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index 65ef29a48b3f..406ce81a169d 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-05-31 08:12:17 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-07-16 15:47:57 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1381,7 +1381,7 @@ +@@ -1418,7 +1418,7 @@ { name: "DocumentPictureInPictureAPI", origin_trial_feature_name: "DocumentPictureInPictureAPI", @@ -9,7 +9,7 @@ status: { "Android": "", "ChromeOS_Lacros": "", -@@ -2590,7 +2590,7 @@ +@@ -2647,7 +2647,7 @@ name: "PaymentHandlerMinimalHeaderUX", origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX", origin_trial_allows_third_party: true, @@ -18,7 +18,7 @@ }, { name: "PaymentInstruments", -@@ -3478,7 +3478,7 @@ +@@ -3607,7 +3607,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -27,7 +27,7 @@ }, { // A kill switch for crbug.com/1410332. -@@ -3509,7 +3509,7 @@ +@@ -3638,7 +3638,7 @@ origin_trial_feature_name: "UserAgentReduction", origin_trial_allows_third_party: true, // iOS not included as it should not send a reduced User-Agent string. @@ -36,7 +36,7 @@ base_feature: "ReduceUserAgent", }, { -@@ -3660,12 +3660,12 @@ +@@ -3794,12 +3794,12 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni b/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni deleted file mode 100644 index 7829cbf8daf7..000000000000 --- a/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni +++ /dev/null @@ -1,18 +0,0 @@ ---- third_party/boringssl/BUILD.generated.gni.orig 2023-04-28 17:01:32 UTC -+++ third_party/boringssl/BUILD.generated.gni -@@ -87,6 +87,7 @@ crypto_sources = [ - "src/crypto/cpu_aarch64_freebsd.c", - "src/crypto/cpu_aarch64_fuchsia.c", - "src/crypto/cpu_aarch64_linux.c", -+ "src/crypto/cpu_aarch64_openbsd.c", - "src/crypto/cpu_aarch64_win.c", - "src/crypto/cpu_arm.c", - "src/crypto/cpu_arm_freebsd.c", -@@ -195,6 +196,7 @@ crypto_sources = [ - "src/crypto/rand_extra/deterministic.c", - "src/crypto/rand_extra/forkunsafe.c", - "src/crypto/rand_extra/fuchsia.c", -+ "src/crypto/rand_extra/arc4random.c", - "src/crypto/rand_extra/passive.c", - "src/crypto/rand_extra/rand_extra.c", - "src/crypto/rand_extra/windows.c", diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl new file mode 100644 index 000000000000..5d8f93fcdf65 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl @@ -0,0 +1,10 @@ +--- third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl.orig 2023-07-16 15:47:57 UTC ++++ third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl +@@ -231,6 +231,7 @@ $code.=<<___; + .align 64 + ChaCha20_ctr32: + .cfi_startproc ++ _CET_ENDBR + cmp \$0,$len + je .Lno_data + mov OPENSSL_ia32cap_P+4(%rip),%r10 diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl new file mode 100644 index 000000000000..a82ee970a504 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl @@ -0,0 +1,138 @@ +--- third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl.orig 2023-07-16 15:47:57 UTC ++++ third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl +@@ -134,6 +134,7 @@ $code.=<<___; + .align 16 + aesgcmsiv_htable_init: + .cfi_startproc ++ _CET_ENDBR + vmovdqa ($H), $T + vmovdqa $T, $TMP0 + vmovdqa $T, ($Htbl) # H +@@ -174,6 +175,7 @@ sub aesgcmsiv_htable6_init { + .align 16 + aesgcmsiv_htable6_init: + .cfi_startproc ++ _CET_ENDBR + vmovdqa ($H), $T + vmovdqa $T, $TMP0 + vmovdqa $T, ($Htbl) # H +@@ -235,6 +237,7 @@ ___ + .align 16 + aesgcmsiv_htable_polyval: + .cfi_startproc ++ _CET_ENDBR + test $len, $len + jnz .Lhtable_polyval_start + ret +@@ -420,6 +423,7 @@ sub aesgcmsiv_polyval_horner { + .align 16 + aesgcmsiv_polyval_horner: + .cfi_startproc ++ _CET_ENDBR + test $L, $L + jnz .Lpolyval_horner_start + ret +@@ -460,6 +464,7 @@ $code.=<<___; + .align 16 + aes128gcmsiv_aes_ks: + .cfi_startproc ++ _CET_ENDBR + vmovdqu (%rdi), %xmm1 # xmm1 = user key + vmovdqa %xmm1, (%rsi) # rsi points to output + +@@ -521,6 +526,7 @@ $code.=<<___; + .align 16 + aes256gcmsiv_aes_ks: + .cfi_startproc ++ _CET_ENDBR + vmovdqu (%rdi), %xmm1 + vmovdqu 16(%rdi), %xmm3 + vmovdqa %xmm1, (%rsi) +@@ -614,6 +620,7 @@ ___ + .align 16 + aes128gcmsiv_aes_ks_enc_x1: + .cfi_startproc ++ _CET_ENDBR + vmovdqa (%rcx), %xmm1 # xmm1 = first 16 bytes of random key + vmovdqa 0*16(%rdi), $BLOCK1 + +@@ -687,6 +694,7 @@ ___ + .align 16 + aes128gcmsiv_kdf: + .cfi_startproc ++ _CET_ENDBR + # parameter 1: %rdi Pointer to NONCE + # parameter 2: %rsi Pointer to CT + # parameter 4: %rdx Pointer to keys +@@ -787,6 +795,7 @@ ___ + .align 16 + aes128gcmsiv_enc_msg_x4: + .cfi_startproc ++ _CET_ENDBR + test $LEN, $LEN + jnz .L128_enc_msg_x4_start + ret +@@ -984,6 +993,7 @@ ___ + .align 16 + aes128gcmsiv_enc_msg_x8: + .cfi_startproc ++ _CET_ENDBR + test $LEN, $LEN + jnz .L128_enc_msg_x8_start + ret +@@ -1239,6 +1249,7 @@ ___ + + $code.=<<___; + .cfi_startproc ++ _CET_ENDBR + test \$~15, $LEN + jnz .L${labelPrefix}_dec_start + ret +@@ -1578,6 +1589,7 @@ sub aes128gcmsiv_ecb_enc_block { + .align 16 + aes128gcmsiv_ecb_enc_block: + .cfi_startproc ++ _CET_ENDBR + vmovdqa (%rdi), $STATE_1 + + vpxor ($KSp), $STATE_1, $STATE_1 +@@ -1670,6 +1682,7 @@ ___ + .align 16 + aes256gcmsiv_aes_ks_enc_x1: + .cfi_startproc ++ _CET_ENDBR + vmovdqa con1(%rip), $CON_MASK # CON_MASK = 1,1,1,1 + vmovdqa mask(%rip), $MASK_256 # MASK_256 + vmovdqa ($PT), $BLOCK1 +@@ -1711,6 +1724,7 @@ sub aes256gcmsiv_ecb_enc_block { + .align 16 + aes256gcmsiv_ecb_enc_block: + .cfi_startproc ++ _CET_ENDBR + vmovdqa (%rdi), $STATE_1 + vpxor ($KSp), $STATE_1, $STATE_1 + vaesenc 1*16($KSp), $STATE_1, $STATE_1 +@@ -1794,6 +1808,7 @@ ___ + .align 16 + aes256gcmsiv_enc_msg_x4: + .cfi_startproc ++ _CET_ENDBR + test $LEN, $LEN + jnz .L256_enc_msg_x4_start + ret +@@ -1994,6 +2009,7 @@ ___ + .align 16 + aes256gcmsiv_enc_msg_x8: + .cfi_startproc ++ _CET_ENDBR + test $LEN, $LEN + jnz .L256_enc_msg_x8_start + ret +@@ -2200,6 +2216,7 @@ ___ + .align 16 + aes256gcmsiv_kdf: + .cfi_startproc ++ _CET_ENDBR + # parameter 1: %rdi Pointer to NONCE + # parameter 2: %rsi Pointer to CT + # parameter 4: %rdx Pointer to keys diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl new file mode 100644 index 000000000000..e17794352ab7 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl.orig 2023-07-16 15:47:57 UTC ++++ third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl +@@ -449,6 +449,7 @@ $code.=" + .align 64 + chacha20_poly1305_open: + .cfi_startproc ++ _CET_ENDBR + push %rbp + .cfi_push %rbp + push %rbx +@@ -871,6 +872,7 @@ $code.=" + .align 64 + chacha20_poly1305_seal: + .cfi_startproc ++ _CET_ENDBR + push %rbp + .cfi_push %rbp + push %rbx diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c index b39339d2b999..3123c5fc19ac 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c.orig 2022-03-25 21:59:56 UTC +--- third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c.orig 2023-07-16 15:47:57 UTC +++ third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c -@@ -0,0 +1,57 @@ +@@ -1,3 +1,60 @@ +/* Copyright (c) 2022, Robert Nagy + * + * Permission to use, copy, modify, and/or distribute this software for any @@ -58,3 +58,6 @@ +} + +#endif // OPENSSL_AARCH64 && OPENSSL_OPENBSD && !OPENSSL_STATIC_ARMCAP + /* Copyright (c) 2022, Robert Nagy + * + * Permission to use, copy, modify, and/or distribute this software for any diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl new file mode 100644 index 000000000000..f278e7c9d4a0 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl @@ -0,0 +1,74 @@ +--- third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl.orig 2023-07-16 15:47:57 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl +@@ -275,6 +275,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_encrypt: + .cfi_startproc ++ _CET_ENDBR + #ifdef BORINGSSL_DISPATCH_TEST + .extern BORINGSSL_function_hit + movb \$1,BORINGSSL_function_hit+1(%rip) +@@ -297,6 +298,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_decrypt: + .cfi_startproc ++ _CET_ENDBR + movups ($inp),$inout0 # load input + mov 240($key),$rounds # key->rounds + ___ +@@ -617,6 +619,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_ecb_encrypt: + .cfi_startproc ++ _CET_ENDBR + ___ + $code.=<<___ if ($win64); + lea -0x58(%rsp),%rsp +@@ -1203,6 +1206,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_ctr32_encrypt_blocks: + .cfi_startproc ++ _CET_ENDBR + #ifdef BORINGSSL_DISPATCH_TEST + movb \$1,BORINGSSL_function_hit(%rip) + #endif +@@ -1779,6 +1783,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_xts_encrypt: + .cfi_startproc ++ _CET_ENDBR + lea (%rsp),%r11 # frame pointer + .cfi_def_cfa_register %r11 + push %rbp +@@ -2262,6 +2267,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_xts_decrypt: + .cfi_startproc ++ _CET_ENDBR + lea (%rsp),%r11 # frame pointer + .cfi_def_cfa_register %r11 + push %rbp +@@ -2780,6 +2786,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_cbc_encrypt: + .cfi_startproc ++ _CET_ENDBR + test $len,$len # check length + jz .Lcbc_ret + +@@ -3329,6 +3336,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_set_decrypt_key: + .cfi_startproc ++ _CET_ENDBR + .byte 0x48,0x83,0xEC,0x08 # sub rsp,8 + .cfi_adjust_cfa_offset 8 + call __aesni_set_encrypt_key +@@ -3401,6 +3409,7 @@ $code.=<<___; + ${PREFIX}_set_encrypt_key: + __aesni_set_encrypt_key: + .cfi_startproc ++ _CET_ENDBR + #ifdef BORINGSSL_DISPATCH_TEST + movb \$1,BORINGSSL_function_hit+3(%rip) + #endif diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl new file mode 100644 index 000000000000..c422e9126bc1 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl @@ -0,0 +1,50 @@ +--- third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl.orig 2023-07-16 15:47:57 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl +@@ -871,6 +871,7 @@ _vpaes_schedule_mangle: + .align 16 + ${PREFIX}_set_encrypt_key: + .cfi_startproc ++ _CET_ENDBR + #ifdef BORINGSSL_DISPATCH_TEST + .extern BORINGSSL_function_hit + movb \$1, BORINGSSL_function_hit+5(%rip) +@@ -926,6 +927,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_set_decrypt_key: + .cfi_startproc ++ _CET_ENDBR + ___ + $code.=<<___ if ($win64); + lea -0xb8(%rsp),%rsp +@@ -981,6 +983,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_encrypt: + .cfi_startproc ++ _CET_ENDBR + #ifdef BORINGSSL_DISPATCH_TEST + .extern BORINGSSL_function_hit + movb \$1, BORINGSSL_function_hit+4(%rip) +@@ -1030,6 +1033,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_decrypt: + .cfi_startproc ++ _CET_ENDBR + ___ + $code.=<<___ if ($win64); + lea -0xb8(%rsp),%rsp +@@ -1081,6 +1085,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_cbc_encrypt: + .cfi_startproc ++ _CET_ENDBR + xchg $key,$len + ___ + ($len,$key)=($key,$len); +@@ -1166,6 +1171,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_ctr32_encrypt_blocks: + .cfi_startproc ++ _CET_ENDBR + # _vpaes_encrypt_core and _vpaes_encrypt_core_2x expect the key in %rdx. + xchg $key, $blocks + ___ diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2.pl new file mode 100644 index 000000000000..7f11b6334a37 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2.pl @@ -0,0 +1,50 @@ +--- third_party/boringssl/src/crypto/fipsmodule/bn/asm/rsaz-avx2.pl.orig 2023-07-16 15:47:57 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/bn/asm/rsaz-avx2.pl +@@ -112,6 +112,7 @@ $code.=<<___; + .align 64 + rsaz_1024_sqr_avx2: # 702 cycles, 14% faster than rsaz_1024_mul_avx2 + .cfi_startproc ++ _CET_ENDBR + lea (%rsp), %rax + .cfi_def_cfa_register %rax + push %rbx +@@ -863,6 +864,7 @@ $code.=<<___; + .align 64 + rsaz_1024_mul_avx2: + .cfi_startproc ++ _CET_ENDBR + lea (%rsp), %rax + .cfi_def_cfa_register %rax + push %rbx +@@ -1474,6 +1476,7 @@ $code.=<<___; + .align 32 + rsaz_1024_red2norm_avx2: + .cfi_startproc ++ _CET_ENDBR + sub \$-128,$inp # size optimization + xor %rax,%rax + ___ +@@ -1515,6 +1518,7 @@ $code.=<<___; + .align 32 + rsaz_1024_norm2red_avx2: + .cfi_startproc ++ _CET_ENDBR + sub \$-128,$out # size optimization + mov ($inp),@T[0] + mov \$0x1fffffff,%eax +@@ -1559,6 +1563,7 @@ $code.=<<___; + .align 32 + rsaz_1024_scatter5_avx2: + .cfi_startproc ++ _CET_ENDBR + vzeroupper + vmovdqu .Lscatter_permd(%rip),%ymm5 + shl \$4,$power +@@ -1586,6 +1591,7 @@ rsaz_1024_scatter5_avx2: + .align 32 + rsaz_1024_gather5_avx2: + .cfi_startproc ++ _CET_ENDBR + vzeroupper + mov %rsp,%r11 + .cfi_def_cfa_register %r11 diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont.pl new file mode 100644 index 000000000000..08859fbe2410 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont.pl @@ -0,0 +1,10 @@ +--- third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont.pl.orig 2023-07-16 15:47:57 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont.pl +@@ -92,6 +92,7 @@ $code=<<___; + .align 16 + bn_mul_mont: + .cfi_startproc ++ _CET_ENDBR + mov ${num}d,${num}d + mov %rsp,%rax + .cfi_def_cfa_register %rax diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl new file mode 100644 index 000000000000..3917e9d26823 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl @@ -0,0 +1,50 @@ +--- third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl.orig 2023-07-16 15:47:57 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl +@@ -79,6 +79,7 @@ $code=<<___; + .align 64 + bn_mul_mont_gather5: + .cfi_startproc ++ _CET_ENDBR + mov ${num}d,${num}d + mov %rsp,%rax + .cfi_def_cfa_register %rax +@@ -1098,6 +1099,7 @@ $code.=<<___; + .align 32 + bn_power5: + .cfi_startproc ++ _CET_ENDBR + mov %rsp,%rax + .cfi_def_cfa_register %rax + ___ +@@ -1240,6 +1242,7 @@ $code.=<<___; + bn_sqr8x_internal: + __bn_sqr8x_internal: + .cfi_startproc ++ _CET_ENDBR + ############################################################## + # Squaring part: + # +@@ -2737,6 +2740,7 @@ bn_powerx5: + bn_sqrx8x_internal: + __bn_sqrx8x_internal: + .cfi_startproc ++ _CET_ENDBR + ################################################################## + # Squaring part: + # +@@ -3448,6 +3452,7 @@ $code.=<<___; + .align 16 + bn_scatter5: + .cfi_startproc ++ _CET_ENDBR + cmp \$0, $num + jz .Lscatter_epilogue + +@@ -3478,6 +3483,7 @@ bn_scatter5: + bn_gather5: + .cfi_startproc + .LSEH_begin_bn_gather5: # Win64 thing, but harmless in other cases ++ _CET_ENDBR + # I can't trust assembler to use specific encoding:-( + .byte 0x4c,0x8d,0x14,0x24 #lea (%rsp),%r10 + .cfi_def_cfa_register %r10 diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl new file mode 100644 index 000000000000..5968c3c6e960 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl @@ -0,0 +1,98 @@ +--- third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl.orig 2023-07-16 15:47:57 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl +@@ -98,6 +98,7 @@ $code.=<<___; + .align 32 + ecp_nistz256_neg: + .cfi_startproc ++ _CET_ENDBR + push %r12 + .cfi_push %r12 + push %r13 +@@ -166,6 +167,7 @@ $code.=<<___; + .align 32 + ecp_nistz256_ord_mul_mont: + .cfi_startproc ++ _CET_ENDBR + ___ + $code.=<<___ if ($addx); + leaq OPENSSL_ia32cap_P(%rip), %rcx +@@ -497,6 +499,7 @@ $code.=<<___; + .align 32 + ecp_nistz256_ord_sqr_mont: + .cfi_startproc ++ _CET_ENDBR + ___ + $code.=<<___ if ($addx); + leaq OPENSSL_ia32cap_P(%rip), %rcx +@@ -1247,6 +1250,7 @@ $code.=<<___; + .align 32 + ecp_nistz256_mul_mont: + .cfi_startproc ++ _CET_ENDBR + ___ + $code.=<<___ if ($addx); + leaq OPENSSL_ia32cap_P(%rip), %rcx +@@ -1549,6 +1553,7 @@ __ecp_nistz256_mul_montq: + .align 32 + ecp_nistz256_sqr_mont: + .cfi_startproc ++ _CET_ENDBR + ___ + $code.=<<___ if ($addx); + leaq OPENSSL_ia32cap_P(%rip), %rcx +@@ -2098,6 +2103,7 @@ $code.=<<___; + .align 32 + ecp_nistz256_select_w5: + .cfi_startproc ++ _CET_ENDBR + ___ + $code.=<<___ if ($avx>1); + leaq OPENSSL_ia32cap_P(%rip), %rax +@@ -2198,6 +2204,7 @@ $code.=<<___; + .align 32 + ecp_nistz256_select_w7: + .cfi_startproc ++ _CET_ENDBR + ___ + $code.=<<___ if ($avx>1); + leaq OPENSSL_ia32cap_P(%rip), %rax +@@ -2403,6 +2410,7 @@ $code.=<<___; + ecp_nistz256_avx2_select_w7: + .cfi_startproc + .Lavx2_select_w7: ++ _CET_ENDBR + vzeroupper + ___ + $code.=<<___ if ($win64); +@@ -2514,6 +2522,7 @@ $code.=<<___; + .type ecp_nistz256_avx2_select_w7,\@function,3 + .align 32 + ecp_nistz256_avx2_select_w7: ++ _CET_ENDBR + .byte 0x0f,0x0b # ud2 + ret + .size ecp_nistz256_avx2_select_w7,.-ecp_nistz256_avx2_select_w7 +@@ -2718,6 +2727,7 @@ $code.=<<___; + .align 32 + ecp_nistz256_point_double: + .cfi_startproc ++ _CET_ENDBR + ___ + $code.=<<___ if ($addx); + leaq OPENSSL_ia32cap_P(%rip), %rcx +@@ -2970,6 +2980,7 @@ $code.=<<___; + .align 32 + ecp_nistz256_point_add: + .cfi_startproc ++ _CET_ENDBR + ___ + $code.=<<___ if ($addx); + leaq OPENSSL_ia32cap_P(%rip), %rcx +@@ -3368,6 +3379,7 @@ $code.=<<___; + .align 32 + ecp_nistz256_point_add_affine: + .cfi_startproc ++ _CET_ENDBR + ___ + $code.=<<___ if ($addx); + leaq OPENSSL_ia32cap_P(%rip), %rcx diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256__beeu-x86__64-asm.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256__beeu-x86__64-asm.pl new file mode 100644 index 000000000000..ca78ae92282f --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256__beeu-x86__64-asm.pl @@ -0,0 +1,10 @@ +--- third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256_beeu-x86_64-asm.pl.orig 2023-07-16 15:47:57 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256_beeu-x86_64-asm.pl +@@ -154,6 +154,7 @@ $code.=<<___; + .align 32 + beeu_mod_inverse_vartime: + .cfi_startproc ++ _CET_ENDBR + push %rbp + .cfi_push rbp + push %r12 diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86__64.pl new file mode 100644 index 000000000000..1d4b5476db40 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86__64.pl @@ -0,0 +1,10 @@ +--- third_party/boringssl/src/crypto/fipsmodule/md5/asm/md5-x86_64.pl.orig 2023-07-16 15:47:57 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/md5/asm/md5-x86_64.pl +@@ -131,6 +131,7 @@ $code .= < ++#else ++#define _CET_ENDBR ++#endif ++ ++___ ++} ++ + if ($gas) { + my $target; + if ($elf) { diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_rand__extra_arc4random.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_rand__extra_arc4random.c deleted file mode 100644 index 42d35499cc94..000000000000 --- a/www/chromium/files/patch-third__party_boringssl_src_crypto_rand__extra_arc4random.c +++ /dev/null @@ -1,36 +0,0 @@ ---- third_party/boringssl/src/crypto/rand_extra/arc4random.c.orig 2022-02-07 13:39:41 UTC -+++ third_party/boringssl/src/crypto/rand_extra/arc4random.c -@@ -0,0 +1,33 @@ -+/* Copyright (c) 2018, Robert Nagy -+ * -+ * Permission to use, copy, modify, and/or distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -+ -+#define _BSD_SOURCE 1 -+ -+#include -+ -+#if defined(OPENSSL_ARC4RANDOM) && !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE) -+ -+#include -+ -+#include "../fipsmodule/rand/internal.h" -+ -+void CRYPTO_sysrand_for_seed(uint8_t *out, size_t requested) { -+ CRYPTO_sysrand(out, requested); -+} -+ -+void CRYPTO_sysrand(uint8_t *out, size_t requested) { -+ arc4random_buf(out, requested); -+} -+ -+#endif // OPENSSL_ARC4RANDOM && !BORINGSSL_UNSAFE_DETERMINISTIC_MODE diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c deleted file mode 100644 index 242082f7dfa1..000000000000 --- a/www/chromium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c +++ /dev/null @@ -1,12 +0,0 @@ ---- third_party/boringssl/src/crypto/refcount_c11.c.orig 2022-09-24 10:57:32 UTC -+++ third_party/boringssl/src/crypto/refcount_c11.c -@@ -22,6 +22,9 @@ - #include - #include - -+#if !defined(__cplusplus) && !defined(static_assert) -+#define static_assert _Static_assert -+#endif - - // See comment above the typedef of CRYPTO_refcount_t about these tests. - static_assert(alignof(CRYPTO_refcount_t) == alignof(_Atomic CRYPTO_refcount_t), diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_test_asm_trampoline-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_test_asm_trampoline-x86__64.pl new file mode 100644 index 000000000000..2d8a8d0fc020 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_test_asm_trampoline-x86__64.pl @@ -0,0 +1,58 @@ +--- third_party/boringssl/src/crypto/test/asm/trampoline-x86_64.pl.orig 2023-07-16 15:47:57 UTC ++++ third_party/boringssl/src/crypto/test/asm/trampoline-x86_64.pl +@@ -141,6 +141,7 @@ my $code = <<____; + abi_test_trampoline: + .cfi_startproc + .seh_startproc ++ _CET_ENDBR + # Stack layout: + # 8 bytes - align + # $caller_state_size bytes - saved caller registers +@@ -307,6 +308,7 @@ foreach ("ax", "bx", "cx", "dx", "di", "si", "bp", 8.. + .globl abi_test_clobber_r$_ + .align 16 + abi_test_clobber_r$_: ++ _CET_ENDBR + xorq %r$_, %r$_ + ret + .size abi_test_clobber_r$_,.-abi_test_clobber_r$_ +@@ -319,6 +321,7 @@ foreach (0..15) { + .globl abi_test_clobber_xmm$_ + .align 16 + abi_test_clobber_xmm$_: ++ _CET_ENDBR + pxor %xmm$_, %xmm$_ + ret + .size abi_test_clobber_xmm$_,.-abi_test_clobber_xmm$_ +@@ -335,6 +338,7 @@ $code .= <<____; + abi_test_bad_unwind_wrong_register: + .cfi_startproc + .seh_startproc ++ _CET_ENDBR + pushq %r12 + .cfi_push %r13 # This should be %r13 + .seh_pushreg %r13 # This should be %r13 +@@ -358,6 +362,7 @@ abi_test_bad_unwind_wrong_register: + abi_test_bad_unwind_temporary: + .cfi_startproc + .seh_startproc ++ _CET_ENDBR + pushq %r12 + .cfi_push %r12 + .seh_pushreg %r12 +@@ -384,6 +389,7 @@ abi_test_bad_unwind_temporary: + .type abi_test_set_direction_flag, \@abi-omnipotent + .globl abi_test_get_and_clear_direction_flag + abi_test_get_and_clear_direction_flag: ++ _CET_ENDBR + pushfq + popq %rax + andq \$0x400, %rax +@@ -397,6 +403,7 @@ abi_test_get_and_clear_direction_flag: + .type abi_test_set_direction_flag, \@abi-omnipotent + .globl abi_test_set_direction_flag + abi_test_set_direction_flag: ++ _CET_ENDBR + std + ret + .size abi_test_set_direction_flag,.-abi_test_set_direction_flag diff --git a/www/chromium/files/patch-third__party_boringssl_src_include_openssl_base.h b/www/chromium/files/patch-third__party_boringssl_src_include_openssl_base.h deleted file mode 100644 index a3ba68cd0975..000000000000 --- a/www/chromium/files/patch-third__party_boringssl_src_include_openssl_base.h +++ /dev/null @@ -1,14 +0,0 @@ ---- third_party/boringssl/src/include/openssl/base.h.orig 2023-04-05 11:05:06 UTC -+++ third_party/boringssl/src/include/openssl/base.h -@@ -151,6 +151,11 @@ extern "C" { - #define OPENSSL_FUCHSIA - #endif - -+#if defined(__OpenBSD__) -+#define OPENSSL_OPENBSD -+#define OPENSSL_ARC4RANDOM -+#endif -+ - #if defined(__TRUSTY__) - #define OPENSSL_TRUSTY - #define OPENSSL_NO_THREADS_CORRUPT_MEMORY_AND_LEAK_SECRETS_IF_THREADED diff --git a/www/chromium/files/patch-third__party_boringssl_src_include_openssl_thread.h b/www/chromium/files/patch-third__party_boringssl_src_include_openssl_thread.h deleted file mode 100644 index 4a3c9a829e59..000000000000 --- a/www/chromium/files/patch-third__party_boringssl_src_include_openssl_thread.h +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/boringssl/src/include/openssl/thread.h.orig 2022-05-19 14:06:27 UTC -+++ third_party/boringssl/src/include/openssl/thread.h -@@ -78,6 +78,7 @@ typedef union crypto_mutex_st { - void *handle; - } CRYPTO_MUTEX; - #elif !defined(__GLIBC__) -+#include - typedef pthread_rwlock_t CRYPTO_MUTEX; - #else - // On glibc, |pthread_rwlock_t| is hidden under feature flags, and we can't diff --git a/www/chromium/files/patch-third__party_ruy_BUILD.gn b/www/chromium/files/patch-third__party_cpuinfo_cpuinfo.gni similarity index 64% rename from www/chromium/files/patch-third__party_ruy_BUILD.gn rename to www/chromium/files/patch-third__party_cpuinfo_cpuinfo.gni index 0f9c51354947..f6fb40365266 100644 --- a/www/chromium/files/patch-third__party_ruy_BUILD.gn +++ b/www/chromium/files/patch-third__party_cpuinfo_cpuinfo.gni @@ -1,11 +1,11 @@ ---- third_party/ruy/BUILD.gn.orig 2023-04-28 17:01:32 UTC -+++ third_party/ruy/BUILD.gn -@@ -9,7 +9,7 @@ use_cpuinfo = +--- third_party/cpuinfo/cpuinfo.gni.orig 2023-07-16 15:47:57 UTC ++++ third_party/cpuinfo/cpuinfo.gni +@@ -7,7 +7,7 @@ use_cpuinfo = current_cpu != "ppc64" && current_cpu != "ppc64le" && current_cpu != "s390" && current_cpu != "s390x" && # cpuinfo is not supported on fuchsia. - !is_fuchsia && + !is_fuchsia && !is_bsd && - # cpuinfo doesn't support the Windows Arm64 chips. + # cpuinfo is crashy on the Windows Arm64 chips. !(is_win && current_cpu == "arm64") && # There's a few arm architectures that are not supported by cpuinfo, diff --git a/www/chromium/files/patch-third__party_ffmpeg_libavcodec_x86_fft.asm b/www/chromium/files/patch-third__party_ffmpeg_libavcodec_x86_fft.asm new file mode 100644 index 000000000000..20c7241fb4a9 --- /dev/null +++ b/www/chromium/files/patch-third__party_ffmpeg_libavcodec_x86_fft.asm @@ -0,0 +1,108 @@ +--- third_party/ffmpeg/libavcodec/x86/fft.asm.orig 2023-07-16 15:47:57 UTC ++++ third_party/ffmpeg/libavcodec/x86/fft.asm +@@ -296,6 +296,7 @@ INIT_YMM avx + %if HAVE_AVX_EXTERNAL + align 16 + fft8_avx: ++ _CET_ENDBR + mova m0, Z(0) + mova m1, Z(1) + T8_AVX m0, m1, m2, m3, m4 +@@ -306,6 +307,7 @@ fft8_avx: + + align 16 + fft16_avx: ++ _CET_ENDBR + mova m2, Z(2) + mova m3, Z(3) + T4_SSE m2, m3, m7 +@@ -343,6 +345,7 @@ fft16_avx: + + align 16 + fft32_avx: ++ _CET_ENDBR + call fft16_avx + + mova m0, Z(4) +@@ -367,6 +370,7 @@ fft32_avx: + ret + + fft32_interleave_avx: ++ _CET_ENDBR + call fft32_avx + mov r2d, 32 + .deint_loop: +@@ -390,6 +394,7 @@ INIT_XMM sse + align 16 + fft4_avx: + fft4_sse: ++ _CET_ENDBR + mova m0, Z(0) + mova m1, Z(1) + T4_SSE m0, m1, m2 +@@ -399,6 +404,7 @@ fft4_sse: + + align 16 + fft8_sse: ++ _CET_ENDBR + mova m0, Z(0) + mova m1, Z(1) + T4_SSE m0, m1, m2 +@@ -413,6 +419,7 @@ fft8_sse: + + align 16 + fft16_sse: ++ _CET_ENDBR + mova m0, Z(0) + mova m1, Z(1) + T4_SSE m0, m1, m2 +@@ -441,6 +448,7 @@ fft16_sse: + %macro DECL_PASS 2+ ; name, payload + align 16 + %1: ++ _CET_ENDBR + DEFINE_ARGS zc, w, n, o1, o3 + lea o3q, [nq*3] + lea o1q, [nq*8] +@@ -457,10 +465,6 @@ DEFINE_ARGS zc, w, n, o1, o3 + %macro FFT_DISPATCH 2; clobbers 5 GPRs, 8 XMMs + lea r2, [dispatch_tab%1] + mov r2, [r2 + (%2q-2)*gprsize] +-%ifdef PIC +- lea r3, [$$] +- add r2, r3 +-%endif + call r2 + %endmacro ; FFT_DISPATCH + +@@ -585,11 +589,7 @@ cglobal imdct_calc, 3,5,3 + jl .loop + RET + +-%ifdef PIC +-%define SECTION_REL - $$ +-%else + %define SECTION_REL +-%endif + + %macro DECL_FFT 1-2 ; nbits, suffix + %ifidn %0, 1 +@@ -613,6 +613,7 @@ cglobal imdct_calc, 3,5,3 + + align 16 + fft %+ n %+ fullsuffix: ++ _CET_ENDBR + call fft %+ n2 %+ SUFFIX + add r0, n*4 - (n&(-2<<%1)) + call fft %+ n4 %+ SUFFIX +@@ -627,8 +628,10 @@ fft %+ n %+ fullsuffix: + %endrep + %undef n + ++[SECTION .data.rel.ro write] + align 8 + dispatch_tab %+ fullsuffix: pointer list_of_fft ++__?SECT?__ + %endmacro ; DECL_FFT + + %if HAVE_AVX_EXTERNAL diff --git a/www/chromium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm b/www/chromium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm new file mode 100644 index 000000000000..4a5c4d459bc5 --- /dev/null +++ b/www/chromium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm @@ -0,0 +1,23 @@ +--- third_party/ffmpeg/libavutil/x86/x86inc.asm.orig 2023-07-16 15:47:57 UTC ++++ third_party/ffmpeg/libavutil/x86/x86inc.asm +@@ -53,6 +53,12 @@ + %endif + %endif + ++%if ARCH_X86_64 ++ %define _CET_ENDBR endbr64 ++%else ++ %define _CET_ENDBR ++%endif ++ + %define WIN64 0 + %define UNIX64 0 + %if ARCH_X86_64 +@@ -768,6 +774,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, + %endif + align function_align + %2: ++ _CET_ENDBR + RESET_MM_PERMUTATION ; needed for x86-64, also makes disassembly somewhat nicer + %xdefine rstk rsp ; copy of the original stack pointer, used when greater alignment than the known stack alignment is required + %assign stack_offset 0 ; stack pointer offset relative to the return address diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp index f5b3d21404d0..9a957008842f 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp +++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2022-09-24 10:57:32 UTC +--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2023-07-16 15:47:57 UTC +++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp -@@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { +@@ -158,7 +158,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { {"ForteMT", "Forte"}, }; diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index e372440afaec..83059a6b04a9 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-05-31 08:12:17 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-07-16 15:47:57 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -3098,7 +3098,8 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -3149,7 +3149,8 @@ bool TracingServiceImpl::SnapshotClocks( #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn index 11c830270768..fc88bc9cd506 100644 --- a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn +++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2023-01-11 09:17:16 UTC +--- third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ third_party/vulkan-deps/vulkan-loader/src/BUILD.gn @@ -59,7 +59,7 @@ config("vulkan_internal_config") { defines += [ @@ -8,4 +8,4 @@ + "FALLBACK_DATA_DIRS=\"/usr/X11R6/share:/usr/local/share:/usr/share\"", ] } - } + if (!vulkan_loader_shared) { diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h index 331b5473ebec..a6d4542f555c 100644 --- a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-05-31 08:12:17 UTC +--- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-07-16 15:47:57 UTC +++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h -@@ -298,7 +298,15 @@ static inline char *loader_platform_executable_path(ch +@@ -300,7 +300,15 @@ static inline char *loader_platform_executable_path(ch return buffer; } diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp new file mode 100644 index 000000000000..ea387f1300ac --- /dev/null +++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp @@ -0,0 +1,17 @@ +--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp.orig 2023-07-16 15:47:57 UTC ++++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp +@@ -46,12 +46,12 @@ bool StatelessValidation::ValidateApiVersion(uint32_t + skip |= LogError(instance, "VUID-VkApplicationInfo-apiVersion-04010", + "Invalid CreateInstance->pCreateInfo->pApplicationInfo.apiVersion number (0x%08x). " + "Using VK_API_VERSION_%" PRIu32 "_%" PRIu32 ".", +- api_version, effective_api_version.major(), effective_api_version.minor()); ++ api_version, effective_api_version.vk_major(), effective_api_version.vk_minor()); + } else { + skip |= LogWarning(instance, kVUIDUndefined, + "Unrecognized CreateInstance->pCreateInfo->pApplicationInfo.apiVersion number (0x%08x). " + "Assuming VK_API_VERSION_%" PRIu32 "_%" PRIu32 ".", +- api_version, effective_api_version.major(), effective_api_version.minor()); ++ api_version, effective_api_version.vk_major(), effective_api_version.vk_minor()); + } + } + return skip; diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk__layer__utils.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk__layer__utils.h new file mode 100644 index 000000000000..d0444e52e9ba --- /dev/null +++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk__layer__utils.h @@ -0,0 +1,11 @@ +--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.h.orig 2023-07-16 15:47:57 UTC ++++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.h +@@ -69,7 +69,7 @@ static inline std::string StringAPIVersion(APIVersion + if (!version.valid()) { + return ""; + } +- version_name << version.major() << "." << version.minor() << "." << version.patch() << " (0x" << std::setfill('0') ++ version_name << version.vk_major() << "." << version.vk_minor() << "." << version.vk_patch() << " (0x" << std::setfill('0') + << std::setw(8) << std::hex << version.value() << ")"; + return version_name.str(); + } diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h new file mode 100644 index 000000000000..5bda17d3467a --- /dev/null +++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h @@ -0,0 +1,15 @@ +--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h.orig 2023-07-16 15:47:57 UTC ++++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h +@@ -68,9 +68,9 @@ class APIVersion { + + bool valid() const { return api_version_ != VVL_UNRECOGNIZED_API_VERSION; } + uint32_t value() const { return api_version_; } +- uint32_t major() const { return VK_API_VERSION_MAJOR(api_version_); } +- uint32_t minor() const { return VK_API_VERSION_MINOR(api_version_); } +- uint32_t patch() const { return VK_API_VERSION_PATCH(api_version_); } ++ uint32_t vk_major() const { return VK_API_VERSION_MAJOR(api_version_); } ++ uint32_t vk_minor() const { return VK_API_VERSION_MINOR(api_version_); } ++ uint32_t vk_patch() const { return VK_API_VERSION_PATCH(api_version_); } + + bool operator<(APIVersion api_version) const { return api_version_ < api_version.api_version_; } + bool operator<=(APIVersion api_version) const { return api_version_ <= api_version.api_version_; } diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index 4e28312a5fb5..1c5a34127e4f 100644 --- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2023-03-09 06:31:50 UTC +--- third_party/webrtc/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ third_party/webrtc/BUILD.gn -@@ -211,6 +211,9 @@ config("common_inherited_config") { +@@ -212,6 +212,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index c4bca3043609..a7de6e6b21f0 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -328,7 +328,7 @@ rtc_library("audio_device_impl") { +@@ -330,7 +330,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py index 413aadccc5eb..3ddf71893324 100644 --- a/www/chromium/files/patch-tools_gn_build_gen.py +++ b/www/chromium/files/patch-tools_gn_build_gen.py @@ -1,4 +1,4 @@ ---- tools/gn/build/gen.py.orig 2022-06-17 14:20:10 UTC +--- tools/gn/build/gen.py.orig 2023-07-16 15:47:57 UTC +++ tools/gn/build/gen.py @@ -92,6 +92,12 @@ class Platform(object): def is_solaris(self): @@ -13,7 +13,7 @@ def is_solaris(self): def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd'] -@@ -279,7 +285,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -283,7 +289,7 @@ def WriteGenericNinja(path, static_libraries, executab 'linux': 'build_linux.ninja.template', 'freebsd': 'build_linux.ninja.template', 'aix': 'build_aix.ninja.template', @@ -22,7 +22,7 @@ def is_posix(self): 'haiku': 'build_haiku.ninja.template', 'solaris': 'build_linux.ninja.template', 'netbsd': 'build_linux.ninja.template', -@@ -494,6 +500,9 @@ def WriteGNNinja(path, platform, host, options, args_l +@@ -506,6 +512,9 @@ def WriteGNNinja(path, platform, host, options, args_l if platform.is_posix() and not platform.is_haiku(): ldflags.append('-pthread') diff --git a/www/chromium/files/patch-ui_base_ime_text__input__client.h b/www/chromium/files/patch-ui_base_ime_text__input__client.h index d2ead46cf852..42f87d362249 100644 --- a/www/chromium/files/patch-ui_base_ime_text__input__client.h +++ b/www/chromium/files/patch-ui_base_ime_text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/text_input_client.h.orig 2023-05-31 08:12:17 UTC +--- ui/base/ime/text_input_client.h.orig 2023-07-16 15:47:57 UTC +++ ui/base/ime/text_input_client.h -@@ -249,7 +249,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient +@@ -265,7 +265,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient // fields that are considered 'private' (e.g. in incognito tabs). virtual bool ShouldDoLearning() = 0; diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index 8cdd2fa4661c..dfd3de7c74d6 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2023-05-31 08:12:17 UTC +--- ui/base/resource/resource_bundle.cc.orig 2023-07-16 15:47:57 UTC +++ ui/base/resource/resource_bundle.cc -@@ -885,7 +885,7 @@ void ResourceBundle::ReloadFonts() { +@@ -916,7 +916,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { diff --git a/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc index bdd58cc83ae1..c1ff5c24a336 100644 --- a/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc +++ b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc @@ -1,6 +1,6 @@ ---- ui/base/test/skia_gold_pixel_diff.cc.orig 2023-05-31 08:12:17 UTC +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2023-07-16 15:47:57 UTC +++ ui/base/test/skia_gold_pixel_diff.cc -@@ -153,7 +153,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() { +@@ -104,7 +104,7 @@ const char* GetPlatformName() { return "macOS"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index 24ec8f8a7bf4..0da6425bdb60 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2023-05-31 08:12:17 UTC +--- ui/base/ui_base_features.cc.orig 2023-07-16 15:47:57 UTC +++ ui/base/ui_base_features.cc -@@ -199,7 +199,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -206,7 +206,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -306,7 +306,7 @@ bool IsForcedColorsEnabled() { +@@ -313,7 +313,7 @@ bool IsForcedColorsEnabled() { // milestones. BASE_FEATURE(kEyeDropper, "EyeDropper", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -486,7 +486,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() { +@@ -500,7 +500,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() { return level; } @@ -26,4 +26,4 @@ +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) BASE_FEATURE(kWebUiSystemFont, "WebUiSystemFont", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-ui_base_ui__base__features.h b/www/chromium/files/patch-ui_base_ui__base__features.h index 6bcaaaa079f1..f7cbaff92621 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.h +++ b/www/chromium/files/patch-ui_base_ui__base__features.h @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.h.orig 2023-05-31 08:12:17 UTC +--- ui/base/ui_base_features.h.orig 2023-07-16 15:47:57 UTC +++ ui/base/ui_base_features.h -@@ -238,7 +238,7 @@ enum class ChromeRefresh2023Level { +@@ -242,7 +242,7 @@ enum class ChromeRefresh2023Level { COMPONENT_EXPORT(UI_BASE_FEATURES) ChromeRefresh2023Level GetChromeRefresh2023Level(); diff --git a/www/chromium/files/patch-ui_color_color__id.h b/www/chromium/files/patch-ui_color_color__id.h index 14683838c393..a99d0c1f8d7c 100644 --- a/www/chromium/files/patch-ui_color_color__id.h +++ b/www/chromium/files/patch-ui_color_color__id.h @@ -1,6 +1,6 @@ ---- ui/color/color_id.h.orig 2023-05-31 08:12:17 UTC +--- ui/color/color_id.h.orig 2023-07-16 15:47:57 UTC +++ ui/color/color_id.h -@@ -478,7 +478,7 @@ +@@ -496,7 +496,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index 986519fbfe05..253e0ff5b8be 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.cc +++ b/www/chromium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2023-05-31 08:12:17 UTC +--- ui/compositor/compositor.cc.orig 2023-07-16 15:47:57 UTC +++ ui/compositor/compositor.cc -@@ -894,7 +894,7 @@ void Compositor::OnResume() { +@@ -897,7 +897,7 @@ void Compositor::OnResume() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc index 40e199ed2f8b..0a4ce44c9e58 100644 --- a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc @@ -1,10 +1,10 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2023-01-11 09:17:16 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2023-07-16 15:47:57 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -875,6 +875,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -876,6 +876,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) { + NOTIMPLEMENTED(); blocked_devices_.set(static_cast(deviceid), true); // TODO(rsadam@): Support blocking touchscreen devices. - std::vector keyboards = GetKeyboardDevices(); + std::vector keyboards = GetKeyboardDevices(); diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 7aae037c9417..7eae3c130fce 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- ui/gfx/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ ui/gfx/BUILD.gn -@@ -621,7 +621,7 @@ source_set("memory_buffer_sources") { +@@ -627,7 +627,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_switches.cc b/www/chromium/files/patch-ui_gfx_switches.cc index c3eb86a7ed90..4ea96b097698 100644 --- a/www/chromium/files/patch-ui_gfx_switches.cc +++ b/www/chromium/files/patch-ui_gfx_switches.cc @@ -1,6 +1,6 @@ ---- ui/gfx/switches.cc.orig 2023-01-11 09:17:16 UTC +--- ui/gfx/switches.cc.orig 2023-07-16 15:47:57 UTC +++ ui/gfx/switches.cc -@@ -33,7 +33,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe +@@ -28,7 +28,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe // Run in headless mode, i.e., without a UI or display server dependencies. const char kHeadless[] = "headless"; diff --git a/www/chromium/files/patch-ui_gfx_switches.h b/www/chromium/files/patch-ui_gfx_switches.h index 39e0dc94dd4b..0bb851bf3e95 100644 --- a/www/chromium/files/patch-ui_gfx_switches.h +++ b/www/chromium/files/patch-ui_gfx_switches.h @@ -1,6 +1,6 @@ ---- ui/gfx/switches.h.orig 2023-04-05 11:05:06 UTC +--- ui/gfx/switches.h.orig 2023-07-16 15:47:57 UTC +++ ui/gfx/switches.h -@@ -19,7 +19,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu +@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[]; GFX_SWITCHES_EXPORT extern const char kHeadless[]; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc index d22bd42bc13c..f3b99aa9c303 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-05-31 08:12:17 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-07-16 15:47:57 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -452,7 +452,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -516,7 +516,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur const bool did_active_change = is_active_ != window_states.is_activated; is_active_ = window_states.is_activated; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h index b3c7ee62bb35..09f420339f3e 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-05-31 08:12:17 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-07-16 15:47:57 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -251,7 +251,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -244,7 +244,7 @@ class WaylandToplevelWindow : public WaylandWindow, // Contains the previous state of the window. PlatformWindowState previous_state_ = PlatformWindowState::kUnknown; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h index dfc6634bb7fd..c6e41914cdde 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-03-09 06:31:50 UTC +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-07-16 15:47:57 UTC +++ ui/ozone/platform/wayland/host/wayland_window.h -@@ -231,7 +231,7 @@ class WaylandWindow : public PlatformWindow, +@@ -235,7 +235,7 @@ class WaylandWindow : public PlatformWindow, bool is_snapped_primary = false; bool is_snapped_secondary = false; bool is_floated = false; diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index 40bc71f4938e..73c8c6123d34 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2023-05-31 08:12:17 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2023-07-16 15:47:57 UTC +++ ui/views/controls/textfield/textfield.cc @@ -75,7 +75,7 @@ #include "base/win/win_util.h" @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -705,7 +705,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -715,7 +715,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -27,7 +27,7 @@ auto* linux_ui = ui::LinuxUi::instance(); std::vector commands; if (!handled && linux_ui && -@@ -925,7 +925,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -938,7 +938,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector commands; -@@ -1867,7 +1867,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1935,7 +1935,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(https://crbug.com/952355): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2380,14 +2380,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2448,14 +2448,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h index b1cd0124d2a6..2aedccccd9b0 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.h.orig 2023-05-31 08:12:17 UTC +--- ui/views/controls/textfield/textfield.h.orig 2023-07-16 15:47:57 UTC +++ ui/views/controls/textfield/textfield.h @@ -43,7 +43,7 @@ #include "ui/views/view.h" @@ -9,7 +9,7 @@ #include #endif -@@ -443,7 +443,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -448,7 +448,7 @@ class VIEWS_EXPORT Textfield : public View, // Set whether the text should be used to improve typing suggestions. void SetShouldDoLearning(bool value) { should_do_learning_ = value; } diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index abd66cd520d5..0eaf89f2fc84 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-05-31 08:12:17 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-07-16 15:47:57 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -43,7 +43,7 @@ +@@ -44,7 +44,7 @@ #include "ui/wm/core/window_util.h" #include "ui/wm/public/window_move_client.h" @@ -9,7 +9,7 @@ #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" #endif -@@ -258,7 +258,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: +@@ -259,7 +259,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: if (params.type == Widget::InitParams::TYPE_WINDOW) GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true); @@ -18,7 +18,7 @@ const bool requires_accelerated_widget = params.requires_accelerated_widget; #else const bool requires_accelerated_widget = false; -@@ -330,7 +330,7 @@ std::unique_ptr +@@ -336,7 +336,7 @@ std::unique_ptr DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr drag_drop_client = @@ -27,7 +27,7 @@ std::make_unique(window(), drag_handler); #else std::make_unique(window(), drag_handler); -@@ -1033,7 +1033,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis +@@ -1039,7 +1039,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/chromium/files/patch-ui_views_widget_widget.cc b/www/chromium/files/patch-ui_views_widget_widget.cc index 2f75dc839543..1ed725c94983 100644 --- a/www/chromium/files/patch-ui_views_widget_widget.cc +++ b/www/chromium/files/patch-ui_views_widget_widget.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/widget.cc.orig 2023-05-31 08:12:17 UTC +--- ui/views/widget/widget.cc.orig 2023-07-16 15:47:57 UTC +++ ui/views/widget/widget.cc @@ -53,7 +53,7 @@ #include "ui/views/window/custom_frame_view.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2027,7 +2027,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2048,7 +2048,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc index ccb15c1781b5..2ce70bc957ff 100644 --- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/window/dialog_delegate.cc.orig 2023-03-09 06:31:50 UTC +--- ui/views/window/dialog_delegate.cc.orig 2023-07-16 15:47:57 UTC +++ ui/views/window/dialog_delegate.cc -@@ -73,7 +73,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -72,7 +72,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index b3fce41c6c2a..f7b90a7e9d0a 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- v8/BUILD.gn.orig 2023-07-16 15:47:57 UTC +++ v8/BUILD.gn -@@ -1351,6 +1351,14 @@ config("toolchain") { +@@ -1356,6 +1356,14 @@ config("toolchain") { } else if (target_os == "chromeos") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -15,7 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -5839,7 +5847,7 @@ v8_component("v8_libbase") { +@@ -5876,7 +5884,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5850,6 +5858,18 @@ v8_component("v8_libbase") { +@@ -5887,6 +5895,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index 22555c826ed1..900f65a2dcab 100644 --- a/www/chromium/files/patch-v8_src_api_api.cc +++ b/www/chromium/files/patch-v8_src_api_api.cc @@ -1,4 +1,4 @@ ---- v8/src/api/api.cc.orig 2023-05-31 08:12:17 UTC +--- v8/src/api/api.cc.orig 2023-07-16 15:47:57 UTC +++ v8/src/api/api.cc @@ -143,7 +143,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include #include -@@ -6454,7 +6454,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6465,7 +6465,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index 009badb5eb25..89234eb176f4 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,4 +1,4 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2023-05-31 08:12:17 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2023-07-16 15:47:57 UTC +++ v8/src/base/platform/platform-posix.cc @@ -53,7 +53,7 @@ #if V8_OS_DARWIN @@ -42,7 +42,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -664,7 +672,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor +@@ -666,7 +674,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor // static bool OS::HasLazyCommits() { @@ -51,7 +51,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1241,7 +1249,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1243,7 +1251,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* // keep this version in POSIX as most Linux-compatible derivatives will // support it. MacOS and FreeBSD are different here. #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \ diff --git a/www/chromium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h b/www/chromium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h new file mode 100644 index 000000000000..277df4a71a38 --- /dev/null +++ b/www/chromium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h @@ -0,0 +1,13 @@ +--- v8/src/baseline/x64/baseline-assembler-x64-inl.h.orig 2023-07-16 15:47:57 UTC ++++ v8/src/baseline/x64/baseline-assembler-x64-inl.h +@@ -73,9 +73,7 @@ MemOperand BaselineAssembler::FeedbackVectorOperand() + + void BaselineAssembler::Bind(Label* label) { __ bind(label); } + +-void BaselineAssembler::JumpTarget() { +- // NOP on x64. +-} ++void BaselineAssembler::JumpTarget() { __ endbr64(); } + + void BaselineAssembler::Jump(Label* target, Label::Distance distance) { + __ jmp(target, distance); diff --git a/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc b/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc new file mode 100644 index 000000000000..e7de2368b775 --- /dev/null +++ b/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc @@ -0,0 +1,45 @@ +--- v8/src/builtins/x64/builtins-x64.cc.orig 2023-07-16 15:47:57 UTC ++++ v8/src/builtins/x64/builtins-x64.cc +@@ -43,6 +43,8 @@ namespace internal { + #define __ ACCESS_MASM(masm) + + void Builtins::Generate_Adaptor(MacroAssembler* masm, Address address) { ++ __ CodeEntry(); ++ + __ LoadAddress(kJavaScriptCallExtraArg1Register, + ExternalReference::Create(address)); + __ Jump(BUILTIN_CODE(masm->isolate(), AdaptorWithBuiltinExitFrame), +@@ -457,7 +459,7 @@ void Generate_JSEntryVariant(MacroAssembler* masm, Sta + // Jump to a faked try block that does the invoke, with a faked catch + // block that sets the pending exception. + __ jmp(&invoke); +- __ bind(&handler_entry); ++ __ BindExceptionHandler(&handler_entry); + + // Store the current pc as the handler offset. It's used later to create the + // handler table. +@@ -3801,6 +3803,8 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm + RestoreParentSuspender(masm, rbx, rcx); + } + __ bind(&suspend); ++ ++ __ endbr64(); + // No need to process the return value if the stack is suspended, there is a + // single 'externref' value (the promise) which doesn't require conversion. + +@@ -4165,6 +4169,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma + LoadJumpBuffer(masm, jmpbuf, true); + __ Trap(); + __ bind(&resume); ++ __ endbr64(); + __ LeaveFrame(StackFrame::STACK_SWITCH); + __ ret(0); + } +@@ -4310,6 +4315,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w + } + __ Trap(); + __ bind(&suspend); ++ __ endbr64(); + __ LeaveFrame(StackFrame::STACK_SWITCH); + // Pop receiver + parameter. + __ ret(2 * kSystemPointerSize); diff --git a/www/chromium/files/patch-v8_src_codegen_x64_assembler-x64.cc b/www/chromium/files/patch-v8_src_codegen_x64_assembler-x64.cc new file mode 100644 index 000000000000..95112e097184 --- /dev/null +++ b/www/chromium/files/patch-v8_src_codegen_x64_assembler-x64.cc @@ -0,0 +1,42 @@ +--- v8/src/codegen/x64/assembler-x64.cc.orig 2023-07-16 15:47:57 UTC ++++ v8/src/codegen/x64/assembler-x64.cc +@@ -1313,6 +1313,14 @@ void Assembler::hlt() { + emit(0xF4); + } + ++void Assembler::endbr64() { ++ EnsureSpace ensure_space(this); ++ emit(0xF3); ++ emit(0x0f); ++ emit(0x1e); ++ emit(0xfa); ++} ++ + void Assembler::emit_idiv(Register src, int size) { + EnsureSpace ensure_space(this); + emit_rex(src, size); +@@ -1580,16 +1588,22 @@ void Assembler::jmp(Handle target, RelocInfo::Mo + emitl(code_target_index); + } + +-void Assembler::jmp(Register target) { ++void Assembler::jmp(Register target, bool notrack) { + EnsureSpace ensure_space(this); ++ if (notrack) { ++ emit(0x3e); ++ } + // Opcode FF/4 r64. + emit_optional_rex_32(target); + emit(0xFF); + emit_modrm(0x4, target); + } + +-void Assembler::jmp(Operand src) { ++void Assembler::jmp(Operand src, bool notrack) { + EnsureSpace ensure_space(this); ++ if (notrack) { ++ emit(0x3e); ++ } + // Opcode FF/4 m64. + emit_optional_rex_32(src); + emit(0xFF); diff --git a/www/chromium/files/patch-v8_src_codegen_x64_assembler-x64.h b/www/chromium/files/patch-v8_src_codegen_x64_assembler-x64.h new file mode 100644 index 000000000000..2387a94d1bf2 --- /dev/null +++ b/www/chromium/files/patch-v8_src_codegen_x64_assembler-x64.h @@ -0,0 +1,21 @@ +--- v8/src/codegen/x64/assembler-x64.h.orig 2023-07-16 15:47:57 UTC ++++ v8/src/codegen/x64/assembler-x64.h +@@ -856,6 +856,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa + void ret(int imm16); + void ud2(); + void setcc(Condition cc, Register reg); ++ void endbr64(); + + void pblendw(XMMRegister dst, Operand src, uint8_t mask); + void pblendw(XMMRegister dst, XMMRegister src, uint8_t mask); +@@ -913,8 +914,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa + void jmp(Handle target, RelocInfo::Mode rmode); + + // Jump near absolute indirect (r64) +- void jmp(Register adr); +- void jmp(Operand src); ++ void jmp(Register adr, bool notrack = false); ++ void jmp(Operand src, bool notrack = false); + + // Unconditional jump relative to the current address. Low-level routine, + // use with caution! diff --git a/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc b/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc new file mode 100644 index 000000000000..d4800c461199 --- /dev/null +++ b/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc @@ -0,0 +1,20 @@ +--- v8/src/codegen/x64/macro-assembler-x64.cc.orig 2023-07-16 15:47:57 UTC ++++ v8/src/codegen/x64/macro-assembler-x64.cc +@@ -50,6 +50,8 @@ Operand StackArgumentsAccessor::GetArgumentOperand(int + return Operand(rsp, kPCOnStackSize + index * kSystemPointerSize); + } + ++void MacroAssembler::CodeEntry() { endbr64(); } ++ + void MacroAssembler::Load(Register destination, ExternalReference source) { + if (root_array_available_ && options().enable_root_relative_access) { + intptr_t delta = RootRegisterOffsetForExternalReference(isolate(), source); +@@ -1874,7 +1876,7 @@ void MacroAssembler::Switch(Register scratch, Register + cmpq(reg, Immediate(num_labels)); + j(above_equal, &fallthrough); + leaq(table, MemOperand(&jump_table)); +- jmp(MemOperand(table, reg, times_8, 0)); ++ jmp(MemOperand(table, reg, times_8, 0), /*notrack=*/true); + // Emit the jump table inline, under the assumption that it's not too big. + Align(kSystemPointerSize); + bind(&jump_table); diff --git a/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h b/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h new file mode 100644 index 000000000000..87499a1ce214 --- /dev/null +++ b/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h @@ -0,0 +1,20 @@ +--- v8/src/codegen/x64/macro-assembler-x64.h.orig 2023-07-16 15:47:57 UTC ++++ v8/src/codegen/x64/macro-assembler-x64.h +@@ -613,11 +613,14 @@ class V8_EXPORT_PRIVATE MacroAssembler + + // Define a function entrypoint. This doesn't emit any code for this + // architecture, as control-flow integrity is not supported for it. +- void CodeEntry() {} ++ void CodeEntry(); + // Define an exception handler. +- void ExceptionHandler() {} ++ void ExceptionHandler() { CodeEntry(); } + // Define an exception handler and bind a label. +- void BindExceptionHandler(Label* label) { bind(label); } ++ void BindExceptionHandler(Label* label) { ++ bind(label); ++ CodeEntry(); ++ } + + // --------------------------------------------------------------------------- + // Pointer compression support diff --git a/www/chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc b/www/chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc index 89e56a811e8e..2e10a8b29918 100644 --- a/www/chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc +++ b/www/chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc @@ -1,6 +1,6 @@ ---- v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2023-04-28 17:01:32 UTC +--- v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2023-07-16 15:47:57 UTC +++ v8/src/compiler/backend/ia32/instruction-selector-ia32.cc -@@ -3041,6 +3041,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node +@@ -3043,6 +3043,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node Emit(opcode, 1, &dst, input_count, inputs, temp_count, temps); } @@ -8,7 +8,7 @@ void InstructionSelector::VisitI8x16Swizzle(Node* node) { InstructionCode op = kIA32I8x16Swizzle; -@@ -3094,6 +3095,9 @@ void VisitMinOrMax(InstructionSelector* selector, Node +@@ -3096,6 +3097,9 @@ void VisitMinOrMax(InstructionSelector* selector, Node void InstructionSelector::VisitF32x4Pmin(Node* node) { VisitMinOrMax(this, node, kIA32Minps, true); } diff --git a/www/chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc b/www/chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc new file mode 100644 index 000000000000..521907fe890c --- /dev/null +++ b/www/chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc @@ -0,0 +1,11 @@ +--- v8/src/compiler/backend/x64/code-generator-x64.cc.orig 2023-07-16 15:47:57 UTC ++++ v8/src/compiler/backend/x64/code-generator-x64.cc +@@ -6576,7 +6576,7 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio + __ cmpl(input, Immediate(case_count)); + __ j(above_equal, GetLabel(i.InputRpo(1))); + __ leaq(kScratchRegister, Operand(table)); +- __ jmp(Operand(kScratchRegister, input, times_8, 0)); ++ __ jmp(Operand(kScratchRegister, input, times_8, 0), /*notrack=*/true); + } + + void CodeGenerator::AssembleArchSelect(Instruction* instr, diff --git a/www/chromium/files/patch-v8_src_deoptimizer_x64_deoptimizer-x64.cc b/www/chromium/files/patch-v8_src_deoptimizer_x64_deoptimizer-x64.cc new file mode 100644 index 000000000000..a837694c748d --- /dev/null +++ b/www/chromium/files/patch-v8_src_deoptimizer_x64_deoptimizer-x64.cc @@ -0,0 +1,11 @@ +--- v8/src/deoptimizer/x64/deoptimizer-x64.cc.orig 2023-07-16 15:47:57 UTC ++++ v8/src/deoptimizer/x64/deoptimizer-x64.cc +@@ -21,7 +21,7 @@ ASSERT_OFFSET(Builtin::kDeoptimizationEntry_Lazy); + #undef ASSERT_OFFSET + + const int Deoptimizer::kEagerDeoptExitSize = 4; +-const int Deoptimizer::kLazyDeoptExitSize = 4; ++const int Deoptimizer::kLazyDeoptExitSize = 8; + + Float32 RegisterValues::GetFloatRegister(unsigned n) const { + return Float32::FromBits( diff --git a/www/chromium/files/patch-v8_src_execution_isolate.cc b/www/chromium/files/patch-v8_src_execution_isolate.cc index 076b3776cc7f..31eac2448b9b 100644 --- a/www/chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/chromium/files/patch-v8_src_execution_isolate.cc @@ -1,6 +1,6 @@ ---- v8/src/execution/isolate.cc.orig 2023-05-31 08:12:17 UTC +--- v8/src/execution/isolate.cc.orig 2023-07-16 15:47:57 UTC +++ v8/src/execution/isolate.cc -@@ -145,6 +145,10 @@ +@@ -146,6 +146,10 @@ #include "src/execution/simulator-base.h" #endif @@ -11,7 +11,7 @@ extern "C" const uint8_t v8_Default_embedded_blob_code_[]; extern "C" uint32_t v8_Default_embedded_blob_code_size_; extern "C" const uint8_t v8_Default_embedded_blob_data_[]; -@@ -3903,6 +3907,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -3935,6 +3939,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); diff --git a/www/chromium/files/patch-v8_src_flags_flags.cc b/www/chromium/files/patch-v8_src_flags_flags.cc new file mode 100644 index 000000000000..402d5c88d929 --- /dev/null +++ b/www/chromium/files/patch-v8_src_flags_flags.cc @@ -0,0 +1,36 @@ +--- v8/src/flags/flags.cc.orig 2023-07-16 15:47:57 UTC ++++ v8/src/flags/flags.cc +@@ -12,6 +12,10 @@ + #include + #include + ++#if V8_OS_OPENBSD ++#include ++#endif ++ + #include "src/base/functional.h" + #include "src/base/logging.h" + #include "src/base/platform/platform.h" +@@ -31,7 +35,11 @@ + namespace v8::internal { + + // Define {v8_flags}, declared in flags.h. ++#if V8_OS_OPENBSD ++FlagValues v8_flags __attribute__((section(".openbsd.mutable"))); ++#else + FlagValues v8_flags; ++#endif + + // {v8_flags} needs to be aligned to a memory page, and the size needs to be a + // multiple of a page size. This is required for memory-protection of the memory +@@ -822,6 +830,10 @@ void FlagList::FreezeFlags() { + // Note that for string flags we only protect the pointer itself, but not the + // string storage. TODO(12887): Fix this. + base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags)); ++#if V8_OS_OPENBSD ++ if (mimmutable(&v8_flags, sizeof(v8_flags)) == -1) ++ FATAL("unable to set immutability of v8_flags"); ++#endif + } + + // static diff --git a/www/chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h b/www/chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h new file mode 100644 index 000000000000..84bee1cd371e --- /dev/null +++ b/www/chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h @@ -0,0 +1,14 @@ +--- v8/src/maglev/x64/maglev-assembler-x64-inl.h.orig 2023-07-16 15:47:57 UTC ++++ v8/src/maglev/x64/maglev-assembler-x64-inl.h +@@ -207,7 +207,10 @@ void MaglevAssembler::PushReverse(T... vals) { + detail::PushAllHelper::PushReverse(this, vals...); + } + +-inline void MaglevAssembler::BindJumpTarget(Label* label) { bind(label); } ++inline void MaglevAssembler::BindJumpTarget(Label* label) { ++ bind(label); ++ endbr64(); ++} + + inline void MaglevAssembler::BindBlock(BasicBlock* block) { + bind(block->label()); diff --git a/www/chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc b/www/chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc new file mode 100644 index 000000000000..1e3e0be02c47 --- /dev/null +++ b/www/chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc @@ -0,0 +1,14 @@ +--- v8/src/maglev/x64/maglev-assembler-x64.cc.orig 2023-07-16 15:47:57 UTC ++++ v8/src/maglev/x64/maglev-assembler-x64.cc +@@ -636,8 +636,10 @@ void MaglevAssembler::TryTruncateDoubleToInt32(Registe + void MaglevAssembler::Prologue(Graph* graph) { + BailoutIfDeoptimized(rbx); + ++ CodeEntry(); ++ + if (graph->has_recursive_calls()) { +- bind(code_gen_state()->entry_label()); ++ BindJumpTarget(code_gen_state()->entry_label()); + } + + // Tiering support. diff --git a/www/chromium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.cc b/www/chromium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.cc new file mode 100644 index 000000000000..55e9e8fbb65a --- /dev/null +++ b/www/chromium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.cc @@ -0,0 +1,22 @@ +--- v8/src/regexp/x64/regexp-macro-assembler-x64.cc.orig 2023-07-16 15:47:57 UTC ++++ v8/src/regexp/x64/regexp-macro-assembler-x64.cc +@@ -110,6 +110,7 @@ RegExpMacroAssemblerX64::RegExpMacroAssemblerX64(Isola + backtrack_label_(), + exit_label_() { + DCHECK_EQ(0, registers_to_save % 2); ++ __ CodeEntry(); + __ jmp(&entry_label_); // We'll write the entry code when we know more. + __ bind(&start_label_); // And then continue from here. + } +@@ -714,6 +715,11 @@ bool RegExpMacroAssemblerX64::CheckSpecialClassRanges( + // Match any character. + return true; + } ++} ++ ++void RegExpMacroAssemblerX64::BindJumpTarget(Label* label) { ++ Bind(label); ++ __ CodeEntry(); + } + + void RegExpMacroAssemblerX64::Fail() { diff --git a/www/chromium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.h b/www/chromium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.h new file mode 100644 index 000000000000..087470a5d640 --- /dev/null +++ b/www/chromium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.h @@ -0,0 +1,12 @@ +--- v8/src/regexp/x64/regexp-macro-assembler-x64.h.orig 2023-07-16 15:47:57 UTC ++++ v8/src/regexp/x64/regexp-macro-assembler-x64.h +@@ -59,6 +59,9 @@ class V8_EXPORT_PRIVATE RegExpMacroAssemblerX64 + void CheckPosition(int cp_offset, Label* on_outside_input) override; + bool CheckSpecialClassRanges(StandardCharacterSet type, + Label* on_no_match) override; ++ ++ void BindJumpTarget(Label* label) override; ++ + void Fail() override; + Handle GetCode(Handle source) override; + void GoTo(Label* label) override; diff --git a/www/chromium/files/patch-v8_src_wasm_jump-table-assembler.cc b/www/chromium/files/patch-v8_src_wasm_jump-table-assembler.cc new file mode 100644 index 000000000000..d9c22fbacabc --- /dev/null +++ b/www/chromium/files/patch-v8_src_wasm_jump-table-assembler.cc @@ -0,0 +1,51 @@ +--- v8/src/wasm/jump-table-assembler.cc.orig 2023-07-16 15:47:57 UTC ++++ v8/src/wasm/jump-table-assembler.cc +@@ -52,15 +52,21 @@ void JumpTableAssembler::InitializeJumpsToLazyCompileT + #if V8_TARGET_ARCH_X64 + void JumpTableAssembler::EmitLazyCompileJumpSlot(uint32_t func_index, + Address lazy_compile_target) { ++ intptr_t displacement = ++ static_cast(reinterpret_cast(lazy_compile_target) - ++ (pc_ + 9) - kNearJmpInstrSize); ++ if (!is_int32(displacement)) return; ++ CodeEntry(); // 4 bytes + // Use a push, because mov to an extended register takes 6 bytes. +- pushq_imm32(func_index); // 5 bytes +- EmitJumpSlot(lazy_compile_target); // 5 bytes ++ pushq_imm32(func_index); // 5 bytes ++ near_jmp(displacement, RelocInfo::NO_INFO); // 5 bytes + } + + bool JumpTableAssembler::EmitJumpSlot(Address target) { + intptr_t displacement = static_cast( +- reinterpret_cast(target) - pc_ - kNearJmpInstrSize); ++ reinterpret_cast(target) - (pc_ + 4) - kNearJmpInstrSize); + if (!is_int32(displacement)) return false; ++ CodeEntry(); // 4 bytes + near_jmp(displacement, RelocInfo::NO_INFO); // 5 bytes + return true; + } +@@ -68,11 +74,12 @@ bool JumpTableAssembler::EmitJumpSlot(Address target) + void JumpTableAssembler::EmitFarJumpSlot(Address target) { + Label data; + int start_offset = pc_offset(); ++ CodeEntry(); // 4 bytes + jmp(Operand(&data)); // 6 bytes +- Nop(2); // 2 bytes ++ Nop(6); // 6 bytes + // The data must be properly aligned, so it can be patched atomically (see + // {PatchFarJumpSlot}). +- DCHECK_EQ(start_offset + kSystemPointerSize, pc_offset()); ++ DCHECK_EQ(start_offset + kFarJumpTableSlotOffset, pc_offset()); + USE(start_offset); + bind(&data); + dq(target); // 8 bytes +@@ -83,7 +90,7 @@ void JumpTableAssembler::PatchFarJumpSlot(Address slot + // The slot needs to be pointer-size aligned so we can atomically update it. + DCHECK(IsAligned(slot, kSystemPointerSize)); + // Offset of the target is at 8 bytes, see {EmitFarJumpSlot}. +- reinterpret_cast*>(slot + kSystemPointerSize) ++ reinterpret_cast*>(slot + kFarJumpTableSlotOffset) + ->store(target, std::memory_order_relaxed); + // The update is atomic because the address is properly aligned. + // Because of cache coherence, the data update will eventually be seen by all diff --git a/www/chromium/files/patch-v8_src_wasm_jump-table-assembler.h b/www/chromium/files/patch-v8_src_wasm_jump-table-assembler.h new file mode 100644 index 000000000000..49156bc1b73b --- /dev/null +++ b/www/chromium/files/patch-v8_src_wasm_jump-table-assembler.h @@ -0,0 +1,16 @@ +--- v8/src/wasm/jump-table-assembler.h.orig 2023-07-16 15:47:57 UTC ++++ v8/src/wasm/jump-table-assembler.h +@@ -185,9 +185,10 @@ class V8_EXPORT_PRIVATE JumpTableAssembler : public Ma + // boundaries. The jump table line size has been chosen to satisfy this. + #if V8_TARGET_ARCH_X64 + static constexpr int kJumpTableLineSize = 64; +- static constexpr int kJumpTableSlotSize = 5; +- static constexpr int kFarJumpTableSlotSize = 16; +- static constexpr int kLazyCompileTableSlotSize = 10; ++ static constexpr int kJumpTableSlotSize = 5 + 4; ++ static constexpr int kFarJumpTableSlotOffset = 2 * kSystemPointerSize; ++ static constexpr int kFarJumpTableSlotSize = 16 + 8; ++ static constexpr int kLazyCompileTableSlotSize = 10 + 4; + #elif V8_TARGET_ARCH_IA32 + static constexpr int kJumpTableLineSize = 64; + static constexpr int kJumpTableSlotSize = 5; diff --git a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc index 868a36a80a59..a13d63173cef 100644 --- a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc +++ b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/browser/browser_main_parts_impl.cc.orig 2022-11-30 08:12:58 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2023-07-16 15:47:57 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -80,7 +80,7 @@ +@@ -81,7 +81,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -197,7 +197,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { +@@ -200,7 +200,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/p5-AnyEvent-WebSocket-Client/Makefile b/www/p5-AnyEvent-WebSocket-Client/Makefile index 962afde83d49..0038ad130632 100644 --- a/www/p5-AnyEvent-WebSocket-Client/Makefile +++ b/www/p5-AnyEvent-WebSocket-Client/Makefile @@ -6,7 +6,7 @@ MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:PLICEASE PKGNAMEPREFIX= p5- -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= WebSocket client for AnyEvent WWW= https://github.com/plicease/AnyEvent-WebSocket-Client diff --git a/www/varnish6/Makefile b/www/varnish6/Makefile index b564f5fba7e7..1996a249328e 100644 --- a/www/varnish6/Makefile +++ b/www/varnish6/Makefile @@ -5,7 +5,7 @@ PORTREVISION= 0 CATEGORIES= www PKGNAMESUFFIX= 6 -MAINTAINER= feld@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= High-performance HTTP accelerator WWW= https://www.varnish-cache.org/ diff --git a/x11-clocks/buici-clock/Makefile b/x11-clocks/buici-clock/Makefile index c4cda50ca91b..8f65566b32c7 100644 --- a/x11-clocks/buici-clock/Makefile +++ b/x11-clocks/buici-clock/Makefile @@ -14,22 +14,23 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcairo.so:graphics/cairo -WRKSRC= ${WRKDIR}/buici - -USES= tar:xz bison gmake pkgconfig autoreconf xorg +USES= autoreconf bison gmake pkgconfig tar:xz xorg +USE_CXXSTD= c++14 USE_XORG= x11 xext + GNU_CONFIGURE= yes -MAKE_JOBS_UNSAFE=yes -PLIST_FILES= bin/buici-clock man/man1/buici-clock.1.gz +MAKE_JOBS_UNSAFE= yes + +WRKSRC= ${WRKDIR}/buici + +PLIST_FILES= bin/buici-clock \ + man/man1/buici-clock.1.gz post-patch: @${REINPLACE_CMD} -e \ 's|echo -e|echo| ; \ s|-g | |' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e \ - 's|_=|+=| ; \ - s|-g | |' ${WRKSRC}/xo/Makefile.in do-install: ${INSTALL_PROGRAM} ${WRKSRC}/buici-clock ${STAGEDIR}${PREFIX}/bin diff --git a/x11/bbdock/Makefile b/x11/bbdock/Makefile index a7527191a0bf..94355aab72cc 100644 --- a/x11/bbdock/Makefile +++ b/x11/bbdock/Makefile @@ -13,12 +13,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png -GNU_CONFIGURE= yes USES= xorg +USE_CXXSTD= c++14 USE_XORG= x11 -PORTDOCS= README + +GNU_CONFIGURE= yes PLIST_FILES= bin/bbdock +PORTDOCS= README OPTIONS_DEFINE= DOCS diff --git a/x11/nvidia-hybrid-graphics/Makefile b/x11/nvidia-hybrid-graphics/Makefile index 5eea9fe8082a..7b385d28173b 100644 --- a/x11/nvidia-hybrid-graphics/Makefile +++ b/x11/nvidia-hybrid-graphics/Makefile @@ -1,5 +1,5 @@ PORTNAME= nvidia-hybrid-graphics -PORTVERSION= 0.5 +PORTVERSION= 0.6 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none diff --git a/x11/nvidia-hybrid-graphics/files/nvidia_xorg.in b/x11/nvidia-hybrid-graphics/files/nvidia_xorg.in index 34e3e0a5f95b..91a237cad4da 100644 --- a/x11/nvidia-hybrid-graphics/files/nvidia_xorg.in +++ b/x11/nvidia-hybrid-graphics/files/nvidia_xorg.in @@ -20,7 +20,7 @@ load_rc_config $name command=/usr/sbin/daemon pidfile=/var/run/${name}.pid -procname="%%LOCALBASE%%/bin/Xorg" +procname="%%LOCALBASE%%/libexec/Xorg" command_args="-p ${pidfile} -f %%PREFIX%%/bin/Xorg-nvidia-headless" start_precmd="${name}_prestart" stop_postcmd="${name}_poststop" diff --git a/x11/rio/Makefile b/x11/rio/Makefile index 5f98bc806801..a9303be72d54 100644 --- a/x11/rio/Makefile +++ b/x11/rio/Makefile @@ -1,6 +1,6 @@ PORTNAME= rio DISTVERSIONPREFIX= v -DISTVERSION= 0.0.11 +DISTVERSION= 0.0.12 CATEGORIES= x11 PKGNAMESUFFIX= -terminal-emulator diff --git a/x11/rio/distinfo b/x11/rio/distinfo index 787791011bd5..869982aae751 100644 --- a/x11/rio/distinfo +++ b/x11/rio/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1689826011 +TIMESTAMP = 1689919968 SHA256 (rust/crates/ab_glyph-0.2.17.crate) = 04a9283dace1c41c265496614998d5b9c4a97b3eb770e804f007c5144bf03f2b SIZE (rust/crates/ab_glyph-0.2.17.crate) = 17243 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.7.crate) = 330223a1aecc308757b9926e9391c9b47f8ef2dbd8aea9df88312aea18c5e8d6 @@ -695,5 +695,5 @@ SHA256 (rust/crates/yeslogic-fontconfig-sys-3.2.0.crate) = f2bbd69036d397ebbff67 SIZE (rust/crates/yeslogic-fontconfig-sys-3.2.0.crate) = 6759 SHA256 (rust/crates/zune-inflate-0.2.54.crate) = 73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02 SIZE (rust/crates/zune-inflate-0.2.54.crate) = 37973 -SHA256 (raphamorim-rio-v0.0.11-4636f43_GH0.tar.gz) = 77b64440c306818c7815be5edd70784b3b59882cce5dcbc9d855dc0681126937 -SIZE (raphamorim-rio-v0.0.11-4636f43_GH0.tar.gz) = 29312419 +SHA256 (raphamorim-rio-v0.0.12-4636f43_GH0.tar.gz) = 77b64440c306818c7815be5edd70784b3b59882cce5dcbc9d855dc0681126937 +SIZE (raphamorim-rio-v0.0.12-4636f43_GH0.tar.gz) = 29312419