diff --git a/devel/Makefile b/devel/Makefile index 89923ecc9..30875678d 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -11,6 +11,7 @@ SUBDIR += angr SUBDIR += apache-ant SUBDIR += apktool + SUBDIR += appstream SUBDIR += appstream-glib SUBDIR += apr SUBDIR += apr-util diff --git a/devel/appstream/Makefile b/devel/appstream/Makefile new file mode 100644 index 000000000..53a55f9de --- /dev/null +++ b/devel/appstream/Makefile @@ -0,0 +1,90 @@ +# XXX if we start providing OpenBSD appstream data files into +# PREFIX/share/app-info, turn the @exec into a @tag (and add to portcheck); +# for an example, see: +# https://gitlab.archlinux.org/archlinux/packaging/packages/archlinux-appstream-data/-/blob/main/PKGBUILD + +COMMENT-main= standard for creating app stores across distributions +COMMENT-qt5= Qt5 interface for AppStream + +V= 0.16.3 +DISTNAME= AppStream-${V} +EXTRACT_SUFX= .tar.xz +PKGNAME-main= ${DISTNAME:L} +PKGNAME-qt5= appstream-qt5-${V} + +SHARED_LIBS += appstream 0.0 # 0.16.3 +SHARED_LIBS += appstream-compose 0.0 # 0.16.3 +SHARED_LIBS += AppStreamQt 0.0 # 0.16.3 + +CATEGORIES= devel + +MAINTAINER= Antoine Jacoutot + +HOMEPAGE= https://www.freedesktop.org/wiki/Distributions/AppStream/ + +# LGPLv2.1 +PERMIT_PACKAGE= Yes + +WANTLIB-main += c cairo curl fontconfig freetype gdk_pixbuf-2.0 gio-2.0 +WANTLIB-main += glib-2.0 gobject-2.0 intl m pango-1.0 rsvg-2 stemmer +WANTLIB-main += xml2 xmlb yaml-0 + +WANTLIB-qt5 += ${COMPILER_LIBCXX} Qt5Core appstream gio-2.0 glib-2.0 +WANTLIB-qt5 += gobject-2.0 + +MASTER_SITES= https://www.freedesktop.org/software/appstream/releases/ + +MULTI_PACKAGES= -main -qt5 + +MODULES= devel/meson \ + x11/qt5 + +BUILD_DEPENDS= devel/gettext,-tools \ + devel/gobject-introspection \ + lang/vala \ + textproc/gtk-doc + +LIB_DEPENDS-main= devel/libyaml \ + net/curl \ + textproc/libstemmer \ + textproc/libxml \ + textproc/libxmlb \ + x11/gnome/librsvg + +LIB_DEPENDS-qt5= ${BASE_PKGPATH},-main \ + ${MODQT5_LIB_DEPENDS} + +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" + +CONFIGURE_ARGS= -Dsystemd=false \ + -Dqt=true \ + -Dvapi=true \ + -Dcompose=true + +# /usr/include/sys/sysctl.h:504:2: error: unknown type name 'u_long' +# src/as-system-info.c:466:23: error: use of undeclared identifier 'DT_LNK' +# src/as-system-info.c:466:23: error: use of undeclared identifier 'DT_DIR' +CFLAGS += -D_BSD_SOURCE + +# needed for `make test' +PORTHOME= ${WRKDIST} + +pre-configure: + sed -i \ + -e "s,/usr/share,${LOCALBASE}/share,g" \ + -e "s,/var/lib,/var/db,g" \ + ${WRKSRC}/compose/asc-hint-tags.c \ + ${WRKSRC}/compose/asc-utils-fonts.c \ + ${WRKSRC}/src/as-distro-extras.c \ + ${WRKSRC}/src/as-pool.c \ + ${WRKSRC}/src/as-utils.c \ + ${WRKSRC}/src/as-utils.h \ + ${WRKSRC}/src/as-validator-issue-tag.h + sed -i "s,/usr,${LOCALBASE},g" ${WRKSRC}/tools/appstream-compose.c + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/appstream + mv ${WRKINST}${SYSCONFDIR}/appstream.conf ${PREFIX}/share/examples/appstream + +.include diff --git a/devel/appstream/distinfo b/devel/appstream/distinfo new file mode 100644 index 000000000..3f8f2a61a --- /dev/null +++ b/devel/appstream/distinfo @@ -0,0 +1,2 @@ +SHA256 (AppStream-0.16.3.tar.xz) = CByRdkbpTXIhyeSq5U2s2pWifGB/qTzY5jRKKzGLmLE= +SIZE (AppStream-0.16.3.tar.xz) = 2568192 diff --git a/devel/appstream/patches/patch-src_as-system-info_c b/devel/appstream/patches/patch-src_as-system-info_c new file mode 100644 index 000000000..c8345869f --- /dev/null +++ b/devel/appstream/patches/patch-src_as-system-info_c @@ -0,0 +1,23 @@ +Index: src/as-system-info.c +--- src/as-system-info.c.orig ++++ src/as-system-info.c +@@ -45,7 +45,7 @@ + + #if defined(__linux__) + #include +-#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined(__OpenBSD__) + #include + #include + #endif +@@ -408,6 +408,10 @@ as_get_physical_memory_total (void) + #elif defined(__FreeBSD__) + unsigned long physmem; + sysctl ((int[]){ CTL_HW, HW_PHYSMEM }, 2, &physmem, &(size_t){ sizeof (physmem) }, NULL, 0); ++ return physmem / MB_IN_BYTES; ++#elif defined(__OpenBSD__) ++ unsigned long physmem; ++ sysctl ((int[]){ CTL_HW, HW_PHYSMEM64 }, 2, &physmem, &(size_t){ sizeof (physmem) }, NULL, 0); + return physmem / MB_IN_BYTES; + #else + #error "Implementation of as_get_physical_memory_total() missing for this OS." diff --git a/devel/appstream/pkg/DESCR-main b/devel/appstream/pkg/DESCR-main new file mode 100644 index 000000000..a9d1d866e --- /dev/null +++ b/devel/appstream/pkg/DESCR-main @@ -0,0 +1,19 @@ +AppStream is a collaborative effort for making machine-readable software +metadata easily available to programs that need it. +It is part of the Freedesktop ecosystem and provides a convenient way to +retrieve information about available software, making it one of the building +blocks for modern software centers. + +AppStream consists of a specification to describe individual software component +metadata in XML (so-called MetaInfo files), as well as a derived specification +for a metadata-collection format to provide a list of these metadata entries in +XML or YAML for easy consumption by software centers and other tools which need +to know about available software in a repository. +In addition to the metadata specification, AppStream specifies a set of related +eatures to help providing better metadata for software repositories (primarily +in Linux distributions). + +This reference implementation of AppStream provides a shared library to work +with these metadata files, features to index and query their data quickly, as +well as other useful related functionality to make building programs which work +with software metadata very easy. diff --git a/devel/appstream/pkg/DESCR-qt5 b/devel/appstream/pkg/DESCR-qt5 new file mode 100644 index 000000000..40ce6bc20 --- /dev/null +++ b/devel/appstream/pkg/DESCR-qt5 @@ -0,0 +1 @@ +appstream-qt5 provides the Qt5 interface for AppStream. diff --git a/devel/appstream/pkg/PLIST-main b/devel/appstream/pkg/PLIST-main new file mode 100644 index 000000000..497fc8399 --- /dev/null +++ b/devel/appstream/pkg/PLIST-main @@ -0,0 +1,272 @@ +@bin bin/appstreamcli +include/appstream/ +include/appstream-compose/ +include/appstream-compose/appstream-compose.h +include/appstream-compose/asc-canvas.h +include/appstream-compose/asc-compose.h +include/appstream-compose/asc-directory-unit.h +include/appstream-compose/asc-enums-types.h +include/appstream-compose/asc-globals.h +include/appstream-compose/asc-hint.h +include/appstream-compose/asc-icon-policy.h +include/appstream-compose/asc-image.h +include/appstream-compose/asc-result.h +include/appstream-compose/asc-unit.h +include/appstream-compose/asc-utils.h +include/appstream/appstream.h +include/appstream/as-agreement-section.h +include/appstream/as-agreement.h +include/appstream/as-artifact.h +include/appstream/as-branding.h +include/appstream/as-bundle.h +include/appstream/as-category-gir.h +include/appstream/as-category.h +include/appstream/as-checksum.h +include/appstream/as-component.h +include/appstream/as-content-rating.h +include/appstream/as-context.h +include/appstream/as-distro-details.h +include/appstream/as-enum-types.h +include/appstream/as-enums.h +include/appstream/as-icon.h +include/appstream/as-image.h +include/appstream/as-issue.h +include/appstream/as-launchable.h +include/appstream/as-metadata.h +include/appstream/as-pool-gir.h +include/appstream/as-pool.h +include/appstream/as-provided.h +include/appstream/as-relation.h +include/appstream/as-release.h +include/appstream/as-review.h +include/appstream/as-screenshot.h +include/appstream/as-spdx.h +include/appstream/as-suggested.h +include/appstream/as-system-info.h +include/appstream/as-translation.h +include/appstream/as-utils.h +include/appstream/as-validator-issue.h +include/appstream/as-validator.h +include/appstream/as-vercmp.h +include/appstream/as-version.h +include/appstream/as-video.h +lib/girepository-1.0/AppStream-1.0.typelib +lib/girepository-1.0/AppStreamCompose-1.0.typelib +@lib lib/libappstream-compose.so.${LIBappstream-compose_VERSION} +@lib lib/libappstream.so.${LIBappstream_VERSION} +lib/pkgconfig/appstream-compose.pc +lib/pkgconfig/appstream.pc +@bin libexec/appstreamcli-compose +@man man/man1/appstreamcli-compose.1 +@man man/man1/appstreamcli.1 +share/doc/appstream/ +share/doc/appstream/html/ +share/doc/appstream/html/api/ +share/doc/appstream/html/api/annotation-glossary.html +share/doc/appstream/html/api/api-index-full.html +share/doc/appstream/html/api/appstream-AsAgreement.html +share/doc/appstream/html/api/appstream-AsAgreementSection.html +share/doc/appstream/html/api/appstream-AsArtifact.html +share/doc/appstream/html/api/appstream-AsBranding.html +share/doc/appstream/html/api/appstream-AsBundle.html +share/doc/appstream/html/api/appstream-AsCategory.html +share/doc/appstream/html/api/appstream-AsChecksum.html +share/doc/appstream/html/api/appstream-AsComponent.html +share/doc/appstream/html/api/appstream-AsContentRating.html +share/doc/appstream/html/api/appstream-AsContext.html +share/doc/appstream/html/api/appstream-AsDistroDetails.html +share/doc/appstream/html/api/appstream-AsIcon.html +share/doc/appstream/html/api/appstream-AsImage.html +share/doc/appstream/html/api/appstream-AsIssue.html +share/doc/appstream/html/api/appstream-AsLaunchable.html +share/doc/appstream/html/api/appstream-AsMetadata.html +share/doc/appstream/html/api/appstream-AsPool.html +share/doc/appstream/html/api/appstream-AsProvided.html +share/doc/appstream/html/api/appstream-AsRelation.html +share/doc/appstream/html/api/appstream-AsRelease.html +share/doc/appstream/html/api/appstream-AsReview.html +share/doc/appstream/html/api/appstream-AsScreenshot.html +share/doc/appstream/html/api/appstream-AsSuggested.html +share/doc/appstream/html/api/appstream-AsSystemInfo.html +share/doc/appstream/html/api/appstream-AsTranslation.html +share/doc/appstream/html/api/appstream-AsValidator.html +share/doc/appstream/html/api/appstream-AsValidatorIssue.html +share/doc/appstream/html/api/appstream-AsVideo.html +share/doc/appstream/html/api/appstream-as-enums.html +share/doc/appstream/html/api/appstream-as-spdx.html +share/doc/appstream/html/api/appstream-as-utils.html +share/doc/appstream/html/api/appstream.devhelp2 +share/doc/appstream/html/api/ch01.html +share/doc/appstream/html/api/deprecated-api-index.html +share/doc/appstream/html/api/home.png +share/doc/appstream/html/api/index.html +share/doc/appstream/html/api/left-insensitive.png +share/doc/appstream/html/api/left.png +share/doc/appstream/html/api/manpages.html +share/doc/appstream/html/api/re32.html +share/doc/appstream/html/api/re33.html +share/doc/appstream/html/api/right-insensitive.png +share/doc/appstream/html/api/right.png +share/doc/appstream/html/api/style.css +share/doc/appstream/html/api/up-insensitive.png +share/doc/appstream/html/api/up.png +share/doc/appstream/html/chap-AppStream-API.html +share/doc/appstream/html/chap-AppStream-About.html +share/doc/appstream/html/chap-AppStream-ManualPages.html +share/doc/appstream/html/chap-AppStream-Misc.html +share/doc/appstream/html/chap-CatalogData.html +share/doc/appstream/html/chap-Metadata.html +share/doc/appstream/html/chap-Quickstart.html +share/doc/appstream/html/compose-api/ +share/doc/appstream/html/compose-api/annotation-glossary.html +share/doc/appstream/html/compose-api/api-index-full.html +share/doc/appstream/html/compose-api/appstream-compose-AscCompose.html +share/doc/appstream/html/compose-api/appstream-compose-AscDirectoryUnit.html +share/doc/appstream/html/compose-api/appstream-compose-AscHint.html +share/doc/appstream/html/compose-api/appstream-compose-AscIconPolicy.html +share/doc/appstream/html/compose-api/appstream-compose-AscResult.html +share/doc/appstream/html/compose-api/appstream-compose-AscUnit.html +share/doc/appstream/html/compose-api/appstream-compose-asc-canvas.html +share/doc/appstream/html/compose-api/appstream-compose-asc-globals.html +share/doc/appstream/html/compose-api/appstream-compose-asc-image.html +share/doc/appstream/html/compose-api/appstream-compose-asc-utils.html +share/doc/appstream/html/compose-api/appstream-compose.devhelp2 +share/doc/appstream/html/compose-api/ch01.html +share/doc/appstream/html/compose-api/deprecated-api-index.html +share/doc/appstream/html/compose-api/home.png +share/doc/appstream/html/compose-api/index.html +share/doc/appstream/html/compose-api/left-insensitive.png +share/doc/appstream/html/compose-api/left.png +share/doc/appstream/html/compose-api/right-insensitive.png +share/doc/appstream/html/compose-api/right.png +share/doc/appstream/html/compose-api/style.css +share/doc/appstream/html/compose-api/up-insensitive.png +share/doc/appstream/html/compose-api/up.png +share/doc/appstream/html/images/ +share/doc/appstream/html/images/appstream-button1.svg +share/doc/appstream/html/images/appstream-button2.svg +share/doc/appstream/html/images/appstream-logo.svg +share/doc/appstream/html/images/architecture.png +share/doc/appstream/html/images/screxample_gameconqueror-bad.png +share/doc/appstream/html/images/screxample_geany-good.png +share/doc/appstream/html/images/screxample_wireshark-good.png +share/doc/appstream/html/images/screxample_xmedcon-bad.png +share/doc/appstream/html/images/screxample_xonotic-good.png +share/doc/appstream/html/images/screxample_xterm-bad.png +share/doc/appstream/html/index.html +share/doc/appstream/html/ix01.html +share/doc/appstream/html/sect-AppStream-IconCache.html +share/doc/appstream/html/sect-AppStream-Misc-URIHandler.html +share/doc/appstream/html/sect-AppStream-YAML.html +share/doc/appstream/html/sect-Metadata-Addon.html +share/doc/appstream/html/sect-Metadata-Application.html +share/doc/appstream/html/sect-Metadata-Codec.html +share/doc/appstream/html/sect-Metadata-ConsoleApplication.html +share/doc/appstream/html/sect-Metadata-Driver.html +share/doc/appstream/html/sect-Metadata-Firmware.html +share/doc/appstream/html/sect-Metadata-Fonts.html +share/doc/appstream/html/sect-Metadata-IconTheme.html +share/doc/appstream/html/sect-Metadata-InputMethod.html +share/doc/appstream/html/sect-Metadata-Localization.html +share/doc/appstream/html/sect-Metadata-OS.html +share/doc/appstream/html/sect-Metadata-Releases.html +share/doc/appstream/html/sect-Metadata-Repository.html +share/doc/appstream/html/sect-Metadata-Runtime.html +share/doc/appstream/html/sect-Metadata-Service.html +share/doc/appstream/html/sect-Metadata-WebApplication.html +share/doc/appstream/html/sect-Quickstart-Addons.html +share/doc/appstream/html/sect-Quickstart-Distros.html +share/doc/appstream/html/sect-Quickstart-Translation.html +share/doc/appstream/html/static/ +share/doc/appstream/html/static/css/ +share/doc/appstream/html/static/css/highlight.css +share/doc/appstream/html/static/css/style.css +share/doc/appstream/html/static/images/ +share/doc/appstream/html/static/images/arrow.png +share/doc/appstream/html/static/images/dots-blue.png +share/doc/appstream/html/static/images/dots-darkgray.png +share/doc/appstream/html/static/images/dots-gray.png +share/doc/appstream/html/static/images/dots-orange.png +share/doc/appstream/html/static/images/dots-red.png +share/doc/appstream/html/static/images/draft.png +share/doc/appstream/html/static/images/icon-important.png +share/doc/appstream/html/static/images/icon-note.png +share/doc/appstream/html/static/images/icon-tip.png +share/doc/appstream/html/static/images/icon-warning.png +share/doc/appstream/html/static/images/icons.png +share/doc/appstream/html/static/images/logo.png +share/doc/appstream/html/static/images/tick.png +share/doc/appstream/html/static/js/ +share/doc/appstream/html/static/js/INFO.md +share/examples/appstream/ +share/examples/appstream/appstream.conf +@sample ${SYSCONFDIR}/appstream.conf +share/gettext/its/metainfo.its +share/gettext/its/metainfo.loc +share/gir-1.0/AppStream-1.0.gir +share/gir-1.0/AppStreamCompose-1.0.gir +share/gtk-doc/html/appstream +share/gtk-doc/html/appstream-compose +share/installed-tests/appstream/ +share/installed-tests/appstream/metainfo-validate.test +share/locale/ain/ +share/locale/ain/LC_MESSAGES/ +share/locale/ain/LC_MESSAGES/appstream.mo +share/locale/ar/LC_MESSAGES/appstream.mo +share/locale/bn/LC_MESSAGES/appstream.mo +share/locale/bn_BD/ +share/locale/bn_BD/LC_MESSAGES/ +share/locale/bn_BD/LC_MESSAGES/appstream.mo +share/locale/ca/LC_MESSAGES/appstream.mo +share/locale/ckb/ +share/locale/ckb/LC_MESSAGES/ +share/locale/ckb/LC_MESSAGES/appstream.mo +share/locale/cs/LC_MESSAGES/appstream.mo +share/locale/da/LC_MESSAGES/appstream.mo +share/locale/de/LC_MESSAGES/appstream.mo +share/locale/en_GB/LC_MESSAGES/appstream.mo +share/locale/eo/LC_MESSAGES/appstream.mo +share/locale/es/LC_MESSAGES/appstream.mo +share/locale/et/LC_MESSAGES/appstream.mo +share/locale/eu/LC_MESSAGES/appstream.mo +share/locale/fi/LC_MESSAGES/appstream.mo +share/locale/fr/LC_MESSAGES/appstream.mo +share/locale/gd/LC_MESSAGES/appstream.mo +share/locale/gl/LC_MESSAGES/appstream.mo +share/locale/he/LC_MESSAGES/appstream.mo +share/locale/hi/LC_MESSAGES/appstream.mo +share/locale/hr/LC_MESSAGES/appstream.mo +share/locale/hu/LC_MESSAGES/appstream.mo +share/locale/id/LC_MESSAGES/appstream.mo +share/locale/it/LC_MESSAGES/appstream.mo +share/locale/ja/LC_MESSAGES/appstream.mo +share/locale/ka/LC_MESSAGES/appstream.mo +share/locale/ko/LC_MESSAGES/appstream.mo +share/locale/lt/LC_MESSAGES/appstream.mo +share/locale/nb/LC_MESSAGES/appstream.mo +share/locale/nl/LC_MESSAGES/appstream.mo +share/locale/oc/LC_MESSAGES/appstream.mo +share/locale/pl/LC_MESSAGES/appstream.mo +share/locale/pt/LC_MESSAGES/appstream.mo +share/locale/pt_BR/LC_MESSAGES/appstream.mo +share/locale/ro/LC_MESSAGES/appstream.mo +share/locale/rom/ +share/locale/rom/LC_MESSAGES/ +share/locale/rom/LC_MESSAGES/appstream.mo +share/locale/ru/LC_MESSAGES/appstream.mo +share/locale/sk/LC_MESSAGES/appstream.mo +share/locale/sl/LC_MESSAGES/appstream.mo +share/locale/sr/LC_MESSAGES/appstream.mo +share/locale/sr@latin/LC_MESSAGES/appstream.mo +share/locale/sv/LC_MESSAGES/appstream.mo +share/locale/tr/LC_MESSAGES/appstream.mo +share/locale/uk/LC_MESSAGES/appstream.mo +share/locale/zh_CN/LC_MESSAGES/appstream.mo +share/locale/zh_TW/LC_MESSAGES/appstream.mo +share/metainfo/ +share/metainfo/org.freedesktop.appstream.cli.metainfo.xml +share/metainfo/org.freedesktop.appstream.compose.metainfo.xml +share/vala/vapi/appstream.deps +share/vala/vapi/appstream.vapi +@exec %D/bin/appstreamcli refresh --force >/dev/null 2>&1 || true +@unexec rm -rf /var/cache/swcatalog diff --git a/devel/appstream/pkg/PLIST-qt5 b/devel/appstream/pkg/PLIST-qt5 new file mode 100644 index 000000000..3a88410d0 --- /dev/null +++ b/devel/appstream/pkg/PLIST-qt5 @@ -0,0 +1,26 @@ +include/AppStreamQt/ +include/AppStreamQt/appstreamqt_export.h +include/AppStreamQt/bundle.h +include/AppStreamQt/category.h +include/AppStreamQt/component.h +include/AppStreamQt/contentrating.h +include/AppStreamQt/icon.h +include/AppStreamQt/image.h +include/AppStreamQt/launchable.h +include/AppStreamQt/metadata.h +include/AppStreamQt/pool.h +include/AppStreamQt/provided.h +include/AppStreamQt/relation.h +include/AppStreamQt/release.h +include/AppStreamQt/screenshot.h +include/AppStreamQt/spdx.h +include/AppStreamQt/suggested.h +include/AppStreamQt/systeminfo.h +include/AppStreamQt/translation.h +include/AppStreamQt/utils.h +include/AppStreamQt/version.h +include/AppStreamQt/video.h +lib/cmake/AppStreamQt/ +lib/cmake/AppStreamQt/AppStreamQtConfig.cmake +lib/cmake/AppStreamQt/AppStreamQtConfigVersion.cmake +@lib lib/libAppStreamQt.so.${LIBAppStreamQt_VERSION} diff --git a/devel/arm-compute-library/Makefile b/devel/arm-compute-library/Makefile index ce74dd89a..d49f58674 100644 --- a/devel/arm-compute-library/Makefile +++ b/devel/arm-compute-library/Makefile @@ -2,7 +2,7 @@ ONLY_FOR_ARCHS = aarch64 COMMENT = Arm compute library -V = 23.05.1 +V = 23.08 PKGNAME = arm-compute-library-${V} GH_ACCOUNT = ARM-software @@ -16,8 +16,8 @@ HOMEPAGE = https://github.com/ARM-software/ComputeLibrary MAINTAINER = Kevin Lo CORE_SO_V = 2.0 -GRAPH_SO_V = 2.2 -COMPUTE_SO_V = 3.4 +GRAPH_SO_V = 2.3 +COMPUTE_SO_V = 3.5 SHARED_LIBS += arm_compute ${COMPUTE_SO_V} SHARED_LIBS += arm_compute_core ${CORE_SO_V} diff --git a/devel/arm-compute-library/distinfo b/devel/arm-compute-library/distinfo index 080710d4c..aa166ea73 100644 --- a/devel/arm-compute-library/distinfo +++ b/devel/arm-compute-library/distinfo @@ -1,2 +1,2 @@ -SHA256 (ComputeLibrary-23.05.1.tar.gz) = xMoymnjaOAFjsthukbpyg0m28O6X1m4mCmlO838LDZM= -SIZE (ComputeLibrary-23.05.1.tar.gz) = 13615969 +SHA256 (ComputeLibrary-23.08.tar.gz) = YvUUpVVAnUQB5SULKQzfjPFnbk63deW9YepqdAqM4k8= +SIZE (ComputeLibrary-23.08.tar.gz) = 13902839 diff --git a/devel/arm-compute-library/patches/patch-SConscript b/devel/arm-compute-library/patches/patch-SConscript index cac851861..291a3d83d 100644 --- a/devel/arm-compute-library/patches/patch-SConscript +++ b/devel/arm-compute-library/patches/patch-SConscript @@ -1,7 +1,7 @@ Index: SConscript --- SConscript.orig +++ SConscript -@@ -650,7 +650,7 @@ else: +@@ -700,7 +700,7 @@ else: elif 'sve' in env['arch']: lib_files += lib_files_sve @@ -10,7 +10,7 @@ Index: SConscript Export('arm_compute_a') -@@ -669,7 +669,7 @@ if env['os'] == 'macos': +@@ -719,7 +719,7 @@ if env['os'] == 'macos': # macos static library archiver fails if given an empty list of files arm_compute_core_a = build_library('arm_compute_core-static', arm_compute_env, lib_files, static=True) else: @@ -19,12 +19,12 @@ Index: SConscript Export('arm_compute_core_a') -@@ -682,7 +682,7 @@ arm_compute_graph_env = arm_compute_env.Clone() +@@ -732,7 +732,7 @@ arm_compute_graph_env = arm_compute_env.Clone() # Build graph libraries arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', '-Wno-pessimizing-move']) --arm_compute_graph_a = build_library('arm_compute_graph-static', arm_compute_graph_env, graph_files, static=True, libs = [ arm_compute_a ]) -+arm_compute_graph_a = build_library('arm_compute_graph', arm_compute_graph_env, graph_files, static=True, libs = [ arm_compute_a ]) +-arm_compute_graph_a = build_library('arm_compute_graph-static', arm_compute_graph_env, graph_files, static=True) ++arm_compute_graph_a = build_library('arm_compute_graph', arm_compute_graph_env, graph_files, static=True) Export('arm_compute_graph_a') if env['os'] != 'bare_metal' and not env['standalone']: diff --git a/devel/arm-compute-library/patches/patch-SConstruct b/devel/arm-compute-library/patches/patch-SConstruct index 9e1b54e4a..90fd4b64a 100644 --- a/devel/arm-compute-library/patches/patch-SConstruct +++ b/devel/arm-compute-library/patches/patch-SConstruct @@ -1,7 +1,7 @@ Index: SConstruct --- SConstruct.orig +++ SConstruct -@@ -253,17 +253,8 @@ c_compiler = os.environ.get('CC', default_c_compiler) +@@ -258,17 +258,8 @@ c_compiler = os.environ.get('CC', default_c_compiler) if env['os'] == 'android' and ( 'clang++' not in cpp_compiler or 'clang' not in c_compiler ): print( "WARNING: Only clang is officially supported to build the Compute Library for Android") @@ -20,7 +20,7 @@ Index: SConstruct if env['cppthreads']: env.Append(CPPDEFINES = [('ARM_COMPUTE_CPP_SCHEDULER', 1)]) -@@ -424,25 +415,6 @@ if not GetOption("help"): +@@ -474,25 +465,6 @@ if not GetOption("help"): except OSError: print("ERROR: Compiler '%s' not found" % env['CXX']) Exit(1) diff --git a/devel/arm-compute-library/pkg/PLIST b/devel/arm-compute-library/pkg/PLIST index 7aa55f571..9c11f5a70 100644 --- a/devel/arm-compute-library/pkg/PLIST +++ b/devel/arm-compute-library/pkg/PLIST @@ -49,6 +49,7 @@ include/arm_compute/core/CPP/kernels/CPPPermuteKernel.h include/arm_compute/core/CPP/kernels/CPPTopKVKernel.h include/arm_compute/core/CPP/kernels/CPPUpsampleKernel.h include/arm_compute/core/Coordinates.h +include/arm_compute/core/CoreTypes.h include/arm_compute/core/Dimensions.h include/arm_compute/core/Error.h include/arm_compute/core/GPUTarget.h @@ -85,7 +86,14 @@ include/arm_compute/core/experimental/IPostOp.h include/arm_compute/core/experimental/PostOps.h include/arm_compute/core/experimental/Types.h include/arm_compute/core/utils/ +include/arm_compute/core/utils/ActivationFunctionUtils.h +include/arm_compute/core/utils/DataLayoutUtils.h +include/arm_compute/core/utils/DataTypeUtils.h +include/arm_compute/core/utils/FormatUtils.h +include/arm_compute/core/utils/InterpolationPolicyUtils.h +include/arm_compute/core/utils/StringUtils.h include/arm_compute/core/utils/helpers/ +include/arm_compute/core/utils/helpers/AdjustVecSize.h include/arm_compute/core/utils/helpers/tensor_transform.h include/arm_compute/core/utils/io/ include/arm_compute/core/utils/io/FileHandler.h @@ -101,6 +109,7 @@ include/arm_compute/core/utils/logging/Printers.h include/arm_compute/core/utils/logging/StdPrinter.h include/arm_compute/core/utils/logging/Types.h include/arm_compute/core/utils/math/ +include/arm_compute/core/utils/math/Math.h include/arm_compute/core/utils/math/SafeOps.h include/arm_compute/core/utils/misc/ include/arm_compute/core/utils/misc/InfoHelpers.h @@ -145,6 +154,12 @@ include/arm_compute/dynamic_fusion/sketch/gpu/operators/GpuSigmoid.h include/arm_compute/dynamic_fusion/sketch/gpu/operators/GpuSoftmax.h include/arm_compute/dynamic_fusion/sketch/gpu/operators/GpuSub.h include/arm_compute/dynamic_fusion/sketch/gpu/operators/GpuTanh.h +include/arm_compute/function_info/ +include/arm_compute/function_info/ActivationLayerInfo.h +include/arm_compute/function_info/ConvolutionInfo.h +include/arm_compute/function_info/FullyConnectedLayerInfo.h +include/arm_compute/function_info/GEMMInfo.h +include/arm_compute/function_info/MatMulInfo.h include/arm_compute/graph/ include/arm_compute/graph.h include/arm_compute/graph/DataLayerVisitor.h diff --git a/devel/cargo/cargo.port.mk b/devel/cargo/cargo.port.mk index 5356ad120..74366f8a1 100644 --- a/devel/cargo/cargo.port.mk +++ b/devel/cargo/cargo.port.mk @@ -36,6 +36,9 @@ MODCARGO_WANTLIB += c++abi MODCARGO_WANTLIB += .endif +CHECK_LIB_DEPENDS_ARGS += -S MODCARGO_WANTLIB="${MODCARGO_WANTLIB}" +CHECK_LIB_DEPENDS_ARGS += -F c++abi + # Define MASTER_SITES_CRATESIO for crates.io MASTER_SITES.cargo = https://crates.io/api/v1/crates/ diff --git a/devel/cbindgen/Makefile b/devel/cbindgen/Makefile index 790e9c9bf..a936f8cf1 100644 --- a/devel/cbindgen/Makefile +++ b/devel/cbindgen/Makefile @@ -2,8 +2,7 @@ COMMENT = C bindings generator from rust code GH_ACCOUNT = eqrion GH_PROJECT = cbindgen -GH_TAGNAME = v0.24.3 -REVISION = 1 +GH_TAGNAME = v0.26.0 CATEGORIES = devel diff --git a/devel/cbindgen/crates.inc b/devel/cbindgen/crates.inc index 3dc283426..a5cfce165 100644 --- a/devel/cbindgen/crates.inc +++ b/devel/cbindgen/crates.inc @@ -2,41 +2,42 @@ MODCARGO_CRATES += atty 0.2.14 # MIT MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT MODCARGO_CRATES += bitflags 1.3.2 # MIT/Apache-2.0 MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0 -MODCARGO_CRATES += clap 3.1.6 # MIT OR Apache-2.0 -MODCARGO_CRATES += fastrand 1.7.0 # Apache-2.0 OR MIT -MODCARGO_CRATES += hashbrown 0.11.2 # Apache-2.0/MIT -MODCARGO_CRATES += heck 0.4.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += clap 3.2.25 # MIT OR Apache-2.0 +MODCARGO_CRATES += clap_lex 0.2.4 # MIT OR Apache-2.0 +MODCARGO_CRATES += fastrand 1.9.0 # Apache-2.0 OR MIT +MODCARGO_CRATES += hashbrown 0.12.3 # MIT OR Apache-2.0 +MODCARGO_CRATES += heck 0.4.1 # MIT OR Apache-2.0 MODCARGO_CRATES += hermit-abi 0.1.19 # MIT/Apache-2.0 -MODCARGO_CRATES += indexmap 1.8.0 # Apache-2.0/MIT +MODCARGO_CRATES += indexmap 1.9.3 # Apache-2.0 OR MIT MODCARGO_CRATES += instant 0.1.12 # BSD-3-Clause -MODCARGO_CRATES += itoa 1.0.1 # MIT OR Apache-2.0 +MODCARGO_CRATES += itoa 1.0.6 # MIT OR Apache-2.0 MODCARGO_CRATES += lazy_static 1.4.0 # MIT/Apache-2.0 -MODCARGO_CRATES += libc 0.2.121 # MIT OR Apache-2.0 -MODCARGO_CRATES += lock_api 0.4.6 # Apache-2.0/MIT -MODCARGO_CRATES += log 0.4.16 # MIT OR Apache-2.0 -MODCARGO_CRATES += memchr 2.4.1 # Unlicense/MIT -MODCARGO_CRATES += os_str_bytes 6.0.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += libc 0.2.144 # MIT OR Apache-2.0 +MODCARGO_CRATES += lock_api 0.4.9 # MIT OR Apache-2.0 +MODCARGO_CRATES += log 0.4.17 # MIT OR Apache-2.0 +MODCARGO_CRATES += os_str_bytes 6.5.0 # MIT OR Apache-2.0 MODCARGO_CRATES += parking_lot 0.11.2 # Apache-2.0/MIT -MODCARGO_CRATES += parking_lot_core 0.8.5 # Apache-2.0/MIT -MODCARGO_CRATES += proc-macro2 1.0.36 # MIT OR Apache-2.0 -MODCARGO_CRATES += quote 1.0.17 # MIT OR Apache-2.0 -MODCARGO_CRATES += redox_syscall 0.2.12 # MIT +MODCARGO_CRATES += parking_lot_core 0.8.6 # Apache-2.0/MIT +MODCARGO_CRATES += proc-macro2 1.0.66 # MIT OR Apache-2.0 +MODCARGO_CRATES += quote 1.0.27 # MIT OR Apache-2.0 +MODCARGO_CRATES += redox_syscall 0.2.16 # MIT MODCARGO_CRATES += remove_dir_all 0.5.3 # MIT/Apache-2.0 -MODCARGO_CRATES += ryu 1.0.9 # Apache-2.0 OR BSL-1.0 +MODCARGO_CRATES += ryu 1.0.13 # Apache-2.0 OR BSL-1.0 MODCARGO_CRATES += scopeguard 1.1.0 # MIT/Apache-2.0 -MODCARGO_CRATES += serde 1.0.136 # MIT OR Apache-2.0 -MODCARGO_CRATES += serde_derive 1.0.136 # MIT OR Apache-2.0 -MODCARGO_CRATES += serde_json 1.0.79 # MIT OR Apache-2.0 +MODCARGO_CRATES += serde 1.0.163 # MIT OR Apache-2.0 +MODCARGO_CRATES += serde_derive 1.0.163 # MIT OR Apache-2.0 +MODCARGO_CRATES += serde_json 1.0.96 # MIT OR Apache-2.0 MODCARGO_CRATES += serial_test 0.5.1 # MIT MODCARGO_CRATES += serial_test_derive 0.5.1 # MIT -MODCARGO_CRATES += smallvec 1.8.0 # MIT/Apache-2.0 +MODCARGO_CRATES += smallvec 1.10.0 # MIT OR Apache-2.0 MODCARGO_CRATES += strsim 0.10.0 # MIT -MODCARGO_CRATES += syn 1.0.89 # MIT OR Apache-2.0 +MODCARGO_CRATES += syn 1.0.109 # MIT OR Apache-2.0 +MODCARGO_CRATES += syn 2.0.16 # MIT OR Apache-2.0 MODCARGO_CRATES += tempfile 3.3.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += termcolor 1.1.3 # Unlicense OR MIT -MODCARGO_CRATES += textwrap 0.15.0 # MIT -MODCARGO_CRATES += toml 0.5.8 # MIT/Apache-2.0 -MODCARGO_CRATES += unicode-xid 0.2.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += termcolor 1.2.0 # Unlicense OR MIT +MODCARGO_CRATES += textwrap 0.16.0 # MIT +MODCARGO_CRATES += toml 0.5.11 # MIT/Apache-2.0 +MODCARGO_CRATES += unicode-ident 1.0.8 # (MIT OR Apache-2.0) AND Unicode-DFS-2016 MODCARGO_CRATES += winapi 0.3.9 # MIT/Apache-2.0 MODCARGO_CRATES += winapi-i686-pc-windows-gnu 0.4.0 # MIT/Apache-2.0 MODCARGO_CRATES += winapi-util 0.1.5 # Unlicense/MIT diff --git a/devel/cbindgen/distinfo b/devel/cbindgen/distinfo index b5db4706c..5d4527966 100644 --- a/devel/cbindgen/distinfo +++ b/devel/cbindgen/distinfo @@ -2,87 +2,89 @@ SHA256 (cargo/atty-0.2.14.tar.gz) = 2bOb4Ydw0RQhzbG5lHpF3T836TCSy/N3YUgooxnV/ug= SHA256 (cargo/autocfg-1.1.0.tar.gz) = 1GiAK6sXy8DMV16bBT9B5yqja/prf1XjUp/6QxYbl/o= SHA256 (cargo/bitflags-1.3.2.tar.gz) = vvONRRY8Lx3eCUp9/TPM9ZXJKQXI+PT9wY0G+xA3cYo= SHA256 (cargo/cfg-if-1.0.0.tar.gz) = uvHeQzl2FYi8Bhnjy8ASDuWC67dLU7Tvv3kRe9LaQP0= -SHA256 (cargo/clap-3.1.6.tar.gz) = 2Mk0NsIeRpi6yt9CkX2yiyMBcCek3syzXb5Hp+eEASM= -SHA256 (cargo/fastrand-1.7.0.tar.gz) = w/zwzuU1GchmwJtd4fbFb/nWRxAfgcGWT6Yy4UiJbN8= -SHA256 (cargo/hashbrown-0.11.2.tar.gz) = q17w1JCe83JMyMzmzMhXLFyBdZLpKF9UZPjob4vTcm4= -SHA256 (cargo/heck-0.4.0.tar.gz) = JUB3HmX8jLg81uiiN/cMMZvVwp947RCEul1Q7qyG9/k= +SHA256 (cargo/clap-3.2.25.tar.gz) = TqGBv1ZvccuaXRelnhhxr2OBgKGPsANckq5itwUgcSM= +SHA256 (cargo/clap_lex-0.2.4.tar.gz) = KFDy9agsv0N91a9NSYSPvfwnwVfD0BA0V3b5UnZSYcU= +SHA256 (cargo/fastrand-1.9.0.tar.gz) = 5RCT4nsHl8NZeDKUyk8KkRwnAYTLEPhXg7EYYUoVAb4= +SHA256 (cargo/hashbrown-0.12.3.tar.gz) = ip7nDEOq9BfJFDlmRaD6hSYkgBsk67eueP6CcoiayIg= +SHA256 (cargo/heck-0.4.1.tar.gz) = lVBcOLRXKy2RDOywKBVg9UtEChkzbLvLJ79s5q3G9ag= SHA256 (cargo/hermit-abi-0.1.19.tar.gz) = YrRnNDuUukdtyyUA0kLa27OVV9+IkxCsd8XZkQCqrDM= -SHA256 (cargo/indexmap-1.8.0.tar.gz) = KCpiR3Isq6QEwGUBa7+lIoBuUXFMNPXfw+SjpG/LQiM= +SHA256 (cargo/indexmap-1.9.3.tar.gz) = vQcOOTNTeW6AHSCa0znolZbrTI1DDRjt5qHM7Y+vvZk= SHA256 (cargo/instant-0.1.12.tar.gz) = elu+gkxQfF2llWNV6Gp0bYLg4UZPZdhizF5x2nDpSyw= -SHA256 (cargo/itoa-1.0.1.tar.gz) = GquPw2dYi4nc7oOrD9ZrcrULcvoZBNcJUEWs4rDIHDU= +SHA256 (cargo/itoa-1.0.6.tar.gz) = RTrZ9YKkQZWeXw0IiwLOBM/o1RqOrwd/EqxtPpQWTKY= SHA256 (cargo/lazy_static-1.4.0.tar.gz) = 4qutI/vEKzcA8vJ5hE3IMq2ysusGmy35GPRVxOGMxkY= -SHA256 (cargo/libc-0.2.121.tar.gz) = 76p7MA87X+jra/Ic44leF1HZZlCGry1ktC8ZcBAV/08= -SHA256 (cargo/lock_api-0.4.6.tar.gz) = iJQ91+9KLlpL+idTqqswE+NM4lM9GZb7GO9ZHjFeKzs= -SHA256 (cargo/log-0.4.16.tar.gz) = Y4nEkISf9bwWvpBa4kvJE6nIiS4ZsjQdvBdeFMNBwrg= -SHA256 (cargo/memchr-2.4.1.tar.gz) = MIzDm+Abc9DRj4Kg57Kj34UkX4Svlv3dxdIC0n5HuGo= -SHA256 (cargo/os_str_bytes-6.0.0.tar.gz) = jiJEPRZDqQRgJZW6HNj32Jav5W0mcSUxxf9zoVsvv2Q= +SHA256 (cargo/libc-0.2.144.tar.gz) = KwDMHCKKZ4LQ8HbnsjKALgxWidQbtd82byprZiHP3+E= +SHA256 (cargo/lock_api-0.4.9.tar.gz) = Q1ARNm/lZYOxbPlW+d8AlbQFuC12QlvImBwOIuYOxN8= +SHA256 (cargo/log-0.4.17.tar.gz) = q7EuaHz7RKpA9B/Dl473ZEj5tgOMrWrvQlnTwJWiOC4= +SHA256 (cargo/os_str_bytes-6.5.0.tar.gz) = zu30T7APLRmEsLyYECYnzmIuCD5JpbrNs+UU+kI44mc= SHA256 (cargo/parking_lot-0.11.2.tar.gz) = fRe3gDamBmO3l63q7kb1yd/ruGlI0SVQB6HWvgJx/5k= -SHA256 (cargo/parking_lot_core-0.8.5.tar.gz) = 126OFJO8rA0nZsQnN/NEWPHIxQwNI7yyTqlTr/snMhY= -SHA256 (cargo/proc-macro2-1.0.36.tar.gz) = xzQtWIP7zK4cw3ojU7Cch8mw86/XP1+5u6aHofczsCk= -SHA256 (cargo/quote-1.0.17.tar.gz) = Yy0Cv/f4dKNvM+qLtBbNSEuQzGbBGUsaERDQZ6cBP1g= -SHA256 (cargo/redox_syscall-0.2.12.tar.gz) = iuGD/BsGwUnwwXk+HrRHyLBL/kbUjp5Iv7jS1+1k7PA= +SHA256 (cargo/parking_lot_core-0.8.6.tar.gz) = YKLP5vCtK/wWrvpGO0l9XHpezUSiPvpyqjQtkBdzVtw= +SHA256 (cargo/proc-macro2-1.0.66.tar.gz) = GPsx2z+b3bLqghzeMKn3ARfj8RmTi17mMLdAOqbi6tk= +SHA256 (cargo/quote-1.0.27.tar.gz) = j08p0UUmXsHEg8fGVEUO3eC/4EPTk41pcmMGYzVtlQA= +SHA256 (cargo/redox_syscall-0.2.16.tar.gz) = +1pYwYVbS2gZ1ZASFVYD8LIq0wytdSYAqt/LaVJlUZo= SHA256 (cargo/remove_dir_all-0.5.3.tar.gz) = Os0SVmVCKXOjOsnT3S34XtrQ9K6bANr7GgXkOp9e+Oc= -SHA256 (cargo/ryu-1.0.9.tar.gz) = c7S3UMeCllwhG0LwIvWa8fvOq90CZiNxTxBBUvHsFJ8= +SHA256 (cargo/ryu-1.0.13.tar.gz) = +RM5wEZ95iNgZJ+NPhhcqN5CJP8oH2YADeXrKnenkEE= SHA256 (cargo/scopeguard-1.1.0.tar.gz) = 0pqwxtP8Dukv5m4tmfcA6rF6jVfRwdO3SDgPsguqeM0= -SHA256 (cargo/serde-1.0.136.tar.gz) = zjHiSwHh5STflvHC/dBUQF+Nc3YkmlEQiG+0tlhIR4k= -SHA256 (cargo/serde_derive-1.0.136.tar.gz) = CFl+cVL80wb0GDjtPje+nq7tK2HELiEXJmpVT6tGYvk= -SHA256 (cargo/serde_json-1.0.79.tar.gz) = jo2fpcOzBHZc4f2cTIo94sjbNlpbkb5S8YbvxnVoHZU= +SHA256 (cargo/serde-1.0.163.tar.gz) = IROrUbh6U5rgCLXGwC3AIP+jmv0tg8/8s/TrJyLOvsI= +SHA256 (cargo/serde_derive-1.0.163.tar.gz) = jIBXd+OTDIiDOJxgIxWiQiS8xzi2OQXvh80UIDU+qT4= +SHA256 (cargo/serde_json-1.0.96.tar.gz) = BX05SlBAO8rBJnKysY+zh6ttKJ2Vfatn3SAYdTkeUvE= SHA256 (cargo/serial_test-0.5.1.tar.gz) = 4LzLz0DIk4GWlEo9oOEz4DGjP01rcts72jzFVuNhkF0= SHA256 (cargo/serial_test_derive-0.5.1.tar.gz) = sqzW3v7dtB62C7Ro+IJdDP0MKna8A7/SNbah3E9qGtU= -SHA256 (cargo/smallvec-1.8.0.tar.gz) = 8t1XRiaDkQbDIKMjMIYp3LGs/JbjKoy6Nk3cYawj7oM= +SHA256 (cargo/smallvec-1.10.0.tar.gz) = pQe+/nlUBEVjQd+rEM72bq1MBB9iuLEbu5K//l0JU+A= SHA256 (cargo/strsim-0.10.0.tar.gz) = c0c8Dlnm1YEsXf4qBkpkRJSfCJ4g7smi5VBllklORiM= -SHA256 (cargo/syn-1.0.89.tar.gz) = 6il74iDVI5jcwHzhWiCfzkNtNhc1rB23AMqzts37n1Q= +SHA256 (cargo/syn-1.0.109.tar.gz) = crZBkbJ1tm/+JGnorywc/juvpntSnq15Km0BYIiLQjc= +SHA256 (cargo/syn-2.0.16.tar.gz) = pvZx1LX/246t7BnArmf+JjnfhoS9e8S4PZhrjbVJzwE= SHA256 (cargo/tempfile-3.3.0.tar.gz) = XNse9OrurdyPvTceUBcFcGSvCRGQLvNrOYAfZ8xteeQ= -SHA256 (cargo/termcolor-1.1.3.tar.gz) = urJNMLkRsjdvOhPMLNRDFC8Mgd2gTBGGk+NbODV1d1U= -SHA256 (cargo/textwrap-0.15.0.tar.gz) = sRQdTWEJWyhBniLLC78CdV9eVOBSb5fx49HRYOYIhfs= -SHA256 (cargo/toml-0.5.8.tar.gz) = oxFClwgmcz34JB7zXcBA75jGeasU18PlTYJwmbOs7Ko= -SHA256 (cargo/unicode-xid-0.2.2.tar.gz) = jMuC1h+ApmPv4feHpRsWtaUeMxTWrDZbCGOfUjh7M/M= +SHA256 (cargo/termcolor-1.2.0.tar.gz) = vlXPiUL+rFx2XCyZNCKAaEPJqaRdTVxAetbdLqleubY= +SHA256 (cargo/textwrap-0.16.0.tar.gz) = IioiKlv+G7pKd7RexIinQbPLiHLl5JlFH9fQEpycfD0= +SHA256 (cargo/toml-0.5.11.tar.gz) = 9Pfw3Y1QqFOlMcQmNZBFsZmPBCGdiHmYEHYs1K0xQjQ= +SHA256 (cargo/unicode-ident-1.0.8.tar.gz) = 5UZKh7I58TpjpQHycBVldUuuktJD1Lt+sS9tV9Imm/Q= SHA256 (cargo/winapi-0.3.9.tar.gz) = XIOaZ0/NepiVLlkyQupACr6TmSdGdh44ZBQF0osA9Bk= SHA256 (cargo/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = rDuHxjYgQm3ZuZHlzgMp7/VFvMu7NPO+Cf9vtqtRt7Y= SHA256 (cargo/winapi-util-0.1.5.tar.gz) = cOxs6FuxWBUcrl5ch/lajpfSwMSwASI/M6M0485d4Xg= SHA256 (cargo/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = cS4ieEHQV8HuHNL7Ivp+WlRhro5I+iynnsQs/BkxGD8= -SHA256 (cbindgen-0.24.3.tar.gz) = XWk6tUrMCFufLbr7zwofCJc39+DLFob6M4wqqgXcdwU= +SHA256 (cbindgen-0.26.0.tar.gz) = tF4aZIdbYVcCqGrDCE72muMpJiQc0raHowwSR0vhUQU= SIZE (cargo/atty-0.2.14.tar.gz) = 5470 SIZE (cargo/autocfg-1.1.0.tar.gz) = 13272 SIZE (cargo/bitflags-1.3.2.tar.gz) = 23021 SIZE (cargo/cfg-if-1.0.0.tar.gz) = 7934 -SIZE (cargo/clap-3.1.6.tar.gz) = 202211 -SIZE (cargo/fastrand-1.7.0.tar.gz) = 11265 -SIZE (cargo/hashbrown-0.11.2.tar.gz) = 85713 -SIZE (cargo/heck-0.4.0.tar.gz) = 11161 +SIZE (cargo/clap-3.2.25.tar.gz) = 219403 +SIZE (cargo/clap_lex-0.2.4.tar.gz) = 9652 +SIZE (cargo/fastrand-1.9.0.tar.gz) = 11910 +SIZE (cargo/hashbrown-0.12.3.tar.gz) = 102968 +SIZE (cargo/heck-0.4.1.tar.gz) = 11567 SIZE (cargo/hermit-abi-0.1.19.tar.gz) = 9979 -SIZE (cargo/indexmap-1.8.0.tar.gz) = 52583 +SIZE (cargo/indexmap-1.9.3.tar.gz) = 54653 SIZE (cargo/instant-0.1.12.tar.gz) = 6128 -SIZE (cargo/itoa-1.0.1.tar.gz) = 11059 +SIZE (cargo/itoa-1.0.6.tar.gz) = 10410 SIZE (cargo/lazy_static-1.4.0.tar.gz) = 10443 -SIZE (cargo/libc-0.2.121.tar.gz) = 574702 -SIZE (cargo/lock_api-0.4.6.tar.gz) = 25215 -SIZE (cargo/log-0.4.16.tar.gz) = 37758 -SIZE (cargo/memchr-2.4.1.tar.gz) = 64977 -SIZE (cargo/os_str_bytes-6.0.0.tar.gz) = 21046 +SIZE (cargo/libc-0.2.144.tar.gz) = 682092 +SIZE (cargo/lock_api-0.4.9.tar.gz) = 25685 +SIZE (cargo/log-0.4.17.tar.gz) = 38028 +SIZE (cargo/os_str_bytes-6.5.0.tar.gz) = 23166 SIZE (cargo/parking_lot-0.11.2.tar.gz) = 39869 -SIZE (cargo/parking_lot_core-0.8.5.tar.gz) = 32466 -SIZE (cargo/proc-macro2-1.0.36.tar.gz) = 41411 -SIZE (cargo/quote-1.0.17.tar.gz) = 28629 -SIZE (cargo/redox_syscall-0.2.12.tar.gz) = 24081 +SIZE (cargo/parking_lot_core-0.8.6.tar.gz) = 32567 +SIZE (cargo/proc-macro2-1.0.66.tar.gz) = 43575 +SIZE (cargo/quote-1.0.27.tar.gz) = 28416 +SIZE (cargo/redox_syscall-0.2.16.tar.gz) = 24012 SIZE (cargo/remove_dir_all-0.5.3.tar.gz) = 9184 -SIZE (cargo/ryu-1.0.9.tar.gz) = 48391 +SIZE (cargo/ryu-1.0.13.tar.gz) = 46823 SIZE (cargo/scopeguard-1.1.0.tar.gz) = 11470 -SIZE (cargo/serde-1.0.136.tar.gz) = 76158 -SIZE (cargo/serde_derive-1.0.136.tar.gz) = 54776 -SIZE (cargo/serde_json-1.0.79.tar.gz) = 144451 +SIZE (cargo/serde-1.0.163.tar.gz) = 77030 +SIZE (cargo/serde_derive-1.0.163.tar.gz) = 54447 +SIZE (cargo/serde_json-1.0.96.tar.gz) = 144652 SIZE (cargo/serial_test-0.5.1.tar.gz) = 2993 SIZE (cargo/serial_test_derive-0.5.1.tar.gz) = 3609 -SIZE (cargo/smallvec-1.8.0.tar.gz) = 27992 +SIZE (cargo/smallvec-1.10.0.tar.gz) = 31564 SIZE (cargo/strsim-0.10.0.tar.gz) = 11355 -SIZE (cargo/syn-1.0.89.tar.gz) = 235966 +SIZE (cargo/syn-1.0.109.tar.gz) = 237611 +SIZE (cargo/syn-2.0.16.tar.gz) = 240928 SIZE (cargo/tempfile-3.3.0.tar.gz) = 27578 -SIZE (cargo/termcolor-1.1.3.tar.gz) = 17242 -SIZE (cargo/textwrap-0.15.0.tar.gz) = 52998 -SIZE (cargo/toml-0.5.8.tar.gz) = 54219 -SIZE (cargo/unicode-xid-0.2.2.tar.gz) = 14955 +SIZE (cargo/termcolor-1.2.0.tar.gz) = 17917 +SIZE (cargo/textwrap-0.16.0.tar.gz) = 53722 +SIZE (cargo/toml-0.5.11.tar.gz) = 54910 +SIZE (cargo/unicode-ident-1.0.8.tar.gz) = 41962 SIZE (cargo/winapi-0.3.9.tar.gz) = 1200382 SIZE (cargo/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815 SIZE (cargo/winapi-util-0.1.5.tar.gz) = 10164 SIZE (cargo/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998 -SIZE (cbindgen-0.24.3.tar.gz) = 207890 +SIZE (cbindgen-0.26.0.tar.gz) = 219975 diff --git a/devel/cbindgen/patches/patch-tests_tests_rs b/devel/cbindgen/patches/patch-tests_tests_rs index 9a1ad2b39..24e202e5c 100644 --- a/devel/cbindgen/patches/patch-tests_tests_rs +++ b/devel/cbindgen/patches/patch-tests_tests_rs @@ -3,7 +3,7 @@ supposed to read CXX & CC from env, but for some reason this doesnt work ? Index: tests/tests.rs --- tests/tests.rs.orig +++ tests/tests.rs -@@ -69,8 +69,8 @@ fn compile( +@@ -113,8 +113,8 @@ fn compile( skip_warning_as_error: bool, ) { let cc = match language { diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile index 001f71d72..8234cdde3 100644 --- a/devel/go-tools/Makefile +++ b/devel/go-tools/Makefile @@ -1,7 +1,7 @@ COMMENT = various tools for the Go programming language MODGO_MODNAME = golang.org/x/tools -MODGO_VERSION = v0.9.0 +MODGO_VERSION = v0.13.0 DISTNAME = go-tools-${MODGO_VERSION} EPOCH = 0 @@ -18,12 +18,16 @@ MODULES = lang/go RUN_DEPENDS = ${MODGO_RUN_DEPENDS} -_SUBPKGS = benchcmp \ +# deprecated in favour of golang.org/x/perf/cmd/benchstat +_SUBPKGS = benchcmp + +_SUBPKGS += bisect \ bundle \ callgraph \ compilebench \ digraph \ eg \ + file2fuzz \ fiximports \ go-contrib-init \ godex \ diff --git a/devel/go-tools/distinfo b/devel/go-tools/distinfo index d51e748b4..ebface7cb 100644 --- a/devel/go-tools/distinfo +++ b/devel/go-tools/distinfo @@ -1,32 +1,36 @@ -SHA256 (go-tools-v0.9.0.zip) = do5ITBH7lm16O50uesNx/2etMyoqI0EXAlOlKWjLFaM= +SHA256 (go-tools-v0.13.0.zip) = b9HiUBEiFXCUVEaOrVPDHFJLBcyQpi7YF9DUeA/bZCk= SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 7n/kRmIDoB06wZrcE0zeyZvG3nGZLCjz3Zp0SAv/BgM= SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = u0GmArF0NF/aOSyK2D/MkyF8KFx2NplndjC+kP63peM= -SHA256 (go_modules/golang.org/x/mod/@v/v0.10.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ= -SHA256 (go_modules/golang.org/x/mod/@v/v0.10.0.zip) = +HZHOsJ/HG47D/+XHIT7689nDbCz6PKB4DFJ/PY2/iU= -SHA256 (go_modules/golang.org/x/net/@v/v0.10.0.mod) = 07fiNv8J5jIr5IkXAhbgGNMiGGLxoFPctj5T6rhTPBc= -SHA256 (go_modules/golang.org/x/net/@v/v0.10.0.zip) = +S+bJlUiam0BWvenYnmhH7VWeOQQuFGxWPyEZUb4BzM= -SHA256 (go_modules/golang.org/x/sync/@v/v0.2.0.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw= -SHA256 (go_modules/golang.org/x/sync/@v/v0.2.0.zip) = 7g30Vy3XNmV2eWT/gJsS8NQeOgdAIg1E1BihmYmgNjs= -SHA256 (go_modules/golang.org/x/sys/@v/v0.8.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= -SHA256 (go_modules/golang.org/x/sys/@v/v0.8.0.zip) = JYizpkWDg5DjQfEAf4Z59eERe11ayUZ++DLRSLIhmjg= -SHA256 (go_modules/golang.org/x/term/@v/v0.8.0.mod) = XTYtaoNFP3Akcl6CTAXFlJYk749MsT9dfj1Lfxygsyc= -SHA256 (go_modules/golang.org/x/term/@v/v0.8.0.zip) = GWHf6lnOUx4tbmoyKHgfWViyfG2dnAmTL1/8VMTZzfk= -SHA256 (go_modules/golang.org/x/text/@v/v0.9.0.mod) = Q29ZLne1k7AvvqN04jrTNpyGI/8NKckd594eZnLbmkE= -SHA256 (go_modules/golang.org/x/text/@v/v0.9.0.zip) = wcvmhOrwHAU78SMnOGl9EEAyelyK1i2t/JULWF0bTKo= +SHA256 (go_modules/golang.org/x/crypto/@v/v0.13.0.mod) = 5/Nu6cqqredrdWX8aGItzI/a9tBd3uPn1cyuSWiNn00= +SHA256 (go_modules/golang.org/x/crypto/@v/v0.13.0.zip) = tY2QL0in9ZWihYm27UvoteLuGjSW7KR3A56A625+ulc= +SHA256 (go_modules/golang.org/x/mod/@v/v0.12.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ= +SHA256 (go_modules/golang.org/x/mod/@v/v0.12.0.zip) = ebf3n2i8gt/V3l9Yxam0dQEgvBsV+yAaGfJ/HX+071U= +SHA256 (go_modules/golang.org/x/net/@v/v0.15.0.mod) = PRBkbW8I2OioVtbyLyzXBsPivgES63dyY8/ROSx25LQ= +SHA256 (go_modules/golang.org/x/net/@v/v0.15.0.zip) = 6JGUHwqD38hfgpkOKcvxk53KWVLQQkFmbIoifUGf3tM= +SHA256 (go_modules/golang.org/x/sync/@v/v0.3.0.mod) = 7Q/wxQgadUz8vnaMvPYMY5dbNddufXuZxayb+m2YKFE= +SHA256 (go_modules/golang.org/x/sync/@v/v0.3.0.zip) = GHDnoZb3EZ1Mbtun3pzfxJ7hPIy3kh86lHVoFxxhUuA= +SHA256 (go_modules/golang.org/x/sys/@v/v0.12.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= +SHA256 (go_modules/golang.org/x/sys/@v/v0.12.0.zip) = iSJdnmYDwJD/2TKGt8oSSEn63+QyDDsYpr3MxKwIZyw= +SHA256 (go_modules/golang.org/x/term/@v/v0.12.0.mod) = wpIGWJdMmcgFJ4+azIRDYmbw9101cToIjB80DiZFM10= +SHA256 (go_modules/golang.org/x/term/@v/v0.12.0.zip) = 9LvEuqDJsFP30lKwbk6Lqr1oapqH2CAls0F5binznGA= +SHA256 (go_modules/golang.org/x/text/@v/v0.13.0.mod) = FR5qGDlJHEtQ3+nDNFHwYyjVUYvY7koAYd4Ct60zL7I= +SHA256 (go_modules/golang.org/x/text/@v/v0.13.0.zip) = 7VRPsBfpZ8BTiS33sGhhL85we6MrV/NYJMsEHjHGrg8= SHA256 (go_modules/golang.org/x/tools/@v/v0.1.12.mod) = KouTZYmPCCL6zmW6CJoTU+aKZdNC8wDKMXzOzN5kIfM= -SIZE (go-tools-v0.9.0.zip) = 3119578 +SIZE (go-tools-v0.13.0.zip) = 3071376 SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 41 SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = 229017 -SIZE (go_modules/golang.org/x/mod/@v/v0.10.0.mod) = 84 -SIZE (go_modules/golang.org/x/mod/@v/v0.10.0.zip) = 162521 -SIZE (go_modules/golang.org/x/net/@v/v0.10.0.mod) = 123 -SIZE (go_modules/golang.org/x/net/@v/v0.10.0.zip) = 1564890 -SIZE (go_modules/golang.org/x/sync/@v/v0.2.0.mod) = 25 -SIZE (go_modules/golang.org/x/sync/@v/v0.2.0.zip) = 27919 -SIZE (go_modules/golang.org/x/sys/@v/v0.8.0.mod) = 33 -SIZE (go_modules/golang.org/x/sys/@v/v0.8.0.zip) = 1894928 -SIZE (go_modules/golang.org/x/term/@v/v0.8.0.mod) = 67 -SIZE (go_modules/golang.org/x/term/@v/v0.8.0.zip) = 19924 -SIZE (go_modules/golang.org/x/text/@v/v0.9.0.mod) = 215 -SIZE (go_modules/golang.org/x/text/@v/v0.9.0.zip) = 8614767 +SIZE (go_modules/golang.org/x/crypto/@v/v0.13.0.mod) = 190 +SIZE (go_modules/golang.org/x/crypto/@v/v0.13.0.zip) = 1785967 +SIZE (go_modules/golang.org/x/mod/@v/v0.12.0.mod) = 84 +SIZE (go_modules/golang.org/x/mod/@v/v0.12.0.zip) = 166176 +SIZE (go_modules/golang.org/x/net/@v/v0.15.0.mod) = 155 +SIZE (go_modules/golang.org/x/net/@v/v0.15.0.zip) = 1791878 +SIZE (go_modules/golang.org/x/sync/@v/v0.3.0.mod) = 34 +SIZE (go_modules/golang.org/x/sync/@v/v0.3.0.zip) = 29766 +SIZE (go_modules/golang.org/x/sys/@v/v0.12.0.mod) = 33 +SIZE (go_modules/golang.org/x/sys/@v/v0.12.0.zip) = 1908262 +SIZE (go_modules/golang.org/x/term/@v/v0.12.0.mod) = 68 +SIZE (go_modules/golang.org/x/term/@v/v0.12.0.zip) = 19958 +SIZE (go_modules/golang.org/x/text/@v/v0.13.0.mod) = 197 +SIZE (go_modules/golang.org/x/text/@v/v0.13.0.zip) = 9237329 SIZE (go_modules/golang.org/x/tools/@v/v0.1.12.mod) = 327 diff --git a/devel/go-tools/modules.inc b/devel/go-tools/modules.inc index d14d610f1..376670bd1 100644 --- a/devel/go-tools/modules.inc +++ b/devel/go-tools/modules.inc @@ -1,11 +1,12 @@ MODGO_MODULES = \ github.com/yuin/goldmark v1.4.13 \ - golang.org/x/mod v0.10.0 \ - golang.org/x/net v0.10.0 \ - golang.org/x/sync v0.2.0 \ - golang.org/x/sys v0.8.0 \ - golang.org/x/term v0.8.0 \ - golang.org/x/text v0.9.0 + golang.org/x/crypto v0.13.0 \ + golang.org/x/mod v0.12.0 \ + golang.org/x/net v0.15.0 \ + golang.org/x/sync v0.3.0 \ + golang.org/x/sys v0.12.0 \ + golang.org/x/term v0.12.0 \ + golang.org/x/text v0.13.0 MODGO_MODFILES = \ golang.org/x/tools v0.1.12 diff --git a/devel/go-tools/pkg/PLIST b/devel/go-tools/pkg/PLIST index ec5a916fd..fcbd65092 100644 --- a/devel/go-tools/pkg/PLIST +++ b/devel/go-tools/pkg/PLIST @@ -3,11 +3,13 @@ @pkgpath textproc/godoc @rcscript ${RCDIR}/godoc @bin bin/benchcmp +@bin bin/bisect @bin bin/bundle @bin bin/callgraph @bin bin/compilebench @bin bin/digraph @bin bin/eg +@bin bin/file2fuzz @bin bin/fiximports @bin bin/go-contrib-init @bin bin/godex diff --git a/devel/kf5/Makefile.inc b/devel/kf5/Makefile.inc index f10b621ef..5cb667c88 100644 --- a/devel/kf5/Makefile.inc +++ b/devel/kf5/Makefile.inc @@ -13,9 +13,9 @@ MODULES := devel/kf5 ${MODULES} IS_PORTING_AID ?= No .if ${IS_PORTING_AID:L} == "yes" -MASTER_SITES ?= ${MASTER_SITE_KDE:=stable/frameworks/${VERSION:R}/portingAids/} +SITES ?= ${MASTER_SITE_KDE:=stable/frameworks/${VERSION:R}/portingAids/} .else -MASTER_SITES ?= ${MASTER_SITE_KDE:=stable/frameworks/${VERSION:R}/} +SITES ?= ${MASTER_SITE_KDE:=stable/frameworks/${VERSION:R}/} .endif DIST_SUBDIR = kde diff --git a/devel/kf5/attica/distinfo b/devel/kf5/attica/distinfo index 14c841c68..11d4312ca 100644 --- a/devel/kf5/attica/distinfo +++ b/devel/kf5/attica/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/attica-5.109.0.tar.xz) = cynsbaz9gUwOpqY9mwj0iWPC/SHX0LfRPLq8y+t0APE= -SIZE (kde/attica-5.109.0.tar.xz) = 69468 +SHA256 (kde/attica-5.110.0.tar.xz) = pvWrsYNK+gvMEuMxVIk3ekkrGKJvusDZHGlfOzLw59I= +SIZE (kde/attica-5.110.0.tar.xz) = 69476 diff --git a/devel/kf5/baloo/Makefile b/devel/kf5/baloo/Makefile index de9e40266..b3f51bbc9 100644 --- a/devel/kf5/baloo/Makefile +++ b/devel/kf5/baloo/Makefile @@ -2,7 +2,6 @@ COMMENT = KDE file search and metadata handling framework DISTNAME = baloo-${VERSION} PKGNAME = kf5-${DISTNAME} EPOCH = 0 -REVISION = 1 SHARED_LIBS += KF5Baloo 5.0 # 4.0 SHARED_LIBS += KF5BalooEngine 7.0 # 5.0 diff --git a/devel/kf5/baloo/distinfo b/devel/kf5/baloo/distinfo index 05912e6af..38c40d270 100644 --- a/devel/kf5/baloo/distinfo +++ b/devel/kf5/baloo/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/baloo-5.109.0.tar.xz) = k2+WWXuyWiP0/1643ysI5/5ER0GmgajXZvLyNHIKW+Y= -SIZE (kde/baloo-5.109.0.tar.xz) = 310124 +SHA256 (kde/baloo-5.110.0.tar.xz) = NqhdccrMc4RTHoT382PL9K0MQWN8oWePmjXcf6634i0= +SIZE (kde/baloo-5.110.0.tar.xz) = 310248 diff --git a/devel/kf5/bluez-qt/distinfo b/devel/kf5/bluez-qt/distinfo index a1332e3f4..775fe1dab 100644 --- a/devel/kf5/bluez-qt/distinfo +++ b/devel/kf5/bluez-qt/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/bluez-qt-5.109.0.tar.xz) = icI2kVLfyYzZVGFQNOAsCdCyfvg8VcGE9ws2kHGodJw= -SIZE (kde/bluez-qt-5.109.0.tar.xz) = 114800 +SHA256 (kde/bluez-qt-5.110.0.tar.xz) = n4Gat0k2T5dtolxNAfe/TB2mFean/UaMYrdNCmJBefc= +SIZE (kde/bluez-qt-5.110.0.tar.xz) = 114824 diff --git a/devel/kf5/breeze-icons/distinfo b/devel/kf5/breeze-icons/distinfo index f9c160879..537fcc999 100644 --- a/devel/kf5/breeze-icons/distinfo +++ b/devel/kf5/breeze-icons/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/breeze-icons-5.109.0.tar.xz) = 4HoL6F9P5nV2IEM5vprJxoCWGLFpY/sUfVmjJTgMVLI= -SIZE (kde/breeze-icons-5.109.0.tar.xz) = 2172836 +SHA256 (kde/breeze-icons-5.110.0.tar.xz) = GjztF6w097fLFlAX5s7ucaAYSmRf+WKs45vGnc9Dv9Q= +SIZE (kde/breeze-icons-5.110.0.tar.xz) = 2173008 diff --git a/devel/kf5/breeze-icons/pkg/PLIST b/devel/kf5/breeze-icons/pkg/PLIST index 3952d791a..a0ca07ff8 100644 --- a/devel/kf5/breeze-icons/pkg/PLIST +++ b/devel/kf5/breeze-icons/pkg/PLIST @@ -112,6 +112,8 @@ share/icons/breeze-dark/actions/16/bookmark-new-list.svg share/icons/breeze-dark/actions/16/bookmark-new.svg share/icons/breeze-dark/actions/16/bookmark-remove.svg share/icons/breeze-dark/actions/16/bookmark-toolbar.svg +share/icons/breeze-dark/actions/16/bookmarks-bookmarked-symbolic.svg +share/icons/breeze-dark/actions/16/bookmarks-bookmarked.svg share/icons/breeze-dark/actions/16/bookmarks-organize.svg share/icons/breeze-dark/actions/16/bookmarks.svg share/icons/breeze-dark/actions/16/borderpainter.svg @@ -1885,6 +1887,8 @@ share/icons/breeze-dark/actions/22/bookmark-new-list.svg share/icons/breeze-dark/actions/22/bookmark-new.svg share/icons/breeze-dark/actions/22/bookmark-remove.svg share/icons/breeze-dark/actions/22/bookmark-toolbar.svg +share/icons/breeze-dark/actions/22/bookmarks-bookmarked-symbolic.svg +share/icons/breeze-dark/actions/22/bookmarks-bookmarked.svg share/icons/breeze-dark/actions/22/bookmarks-organize.svg share/icons/breeze-dark/actions/22/bookmarks.svg share/icons/breeze-dark/actions/22/borderpainter.svg @@ -5651,6 +5655,8 @@ share/icons/breeze-dark/actions/32/autocorrection.svg share/icons/breeze-dark/actions/32/blurimage.svg share/icons/breeze-dark/actions/32/bookmark-new.svg share/icons/breeze-dark/actions/32/bookmark-remove.svg +share/icons/breeze-dark/actions/32/bookmarks-bookmarked-symbolic.svg +share/icons/breeze-dark/actions/32/bookmarks-bookmarked.svg share/icons/breeze-dark/actions/32/bookmarks.svg share/icons/breeze-dark/actions/32/bordertool.svg share/icons/breeze-dark/actions/32/call-start.svg @@ -11201,6 +11207,8 @@ share/icons/breeze/actions/16/bookmark-new-list.svg share/icons/breeze/actions/16/bookmark-new.svg share/icons/breeze/actions/16/bookmark-remove.svg share/icons/breeze/actions/16/bookmark-toolbar.svg +share/icons/breeze/actions/16/bookmarks-bookmarked-symbolic.svg +share/icons/breeze/actions/16/bookmarks-bookmarked.svg share/icons/breeze/actions/16/bookmarks-organize.svg share/icons/breeze/actions/16/bookmarks.svg share/icons/breeze/actions/16/borderpainter.svg @@ -12967,6 +12975,8 @@ share/icons/breeze/actions/22/bookmark-new-list.svg share/icons/breeze/actions/22/bookmark-new.svg share/icons/breeze/actions/22/bookmark-remove.svg share/icons/breeze/actions/22/bookmark-toolbar.svg +share/icons/breeze/actions/22/bookmarks-bookmarked-symbolic.svg +share/icons/breeze/actions/22/bookmarks-bookmarked.svg share/icons/breeze/actions/22/bookmarks-organize.svg share/icons/breeze/actions/22/bookmarks.svg share/icons/breeze/actions/22/borderpainter.svg @@ -14913,6 +14923,8 @@ share/icons/breeze/actions/24/bookmark-new-list.svg share/icons/breeze/actions/24/bookmark-new.svg share/icons/breeze/actions/24/bookmark-remove.svg share/icons/breeze/actions/24/bookmark-toolbar.svg +share/icons/breeze/actions/24/bookmarks-bookmarked-symbolic.svg +share/icons/breeze/actions/24/bookmarks-bookmarked.svg share/icons/breeze/actions/24/bookmarks-organize.svg share/icons/breeze/actions/24/bookmarks.svg share/icons/breeze/actions/24/borderpainter.svg @@ -16787,6 +16799,8 @@ share/icons/breeze/actions/32/autocorrection.svg share/icons/breeze/actions/32/blurimage.svg share/icons/breeze/actions/32/bookmark-new.svg share/icons/breeze/actions/32/bookmark-remove.svg +share/icons/breeze/actions/32/bookmarks-bookmarked-symbolic.svg +share/icons/breeze/actions/32/bookmarks-bookmarked.svg share/icons/breeze/actions/32/bookmarks.svg share/icons/breeze/actions/32/bordertool.svg share/icons/breeze/actions/32/call-start.svg diff --git a/devel/kf5/extra-cmake-modules/distinfo b/devel/kf5/extra-cmake-modules/distinfo index 1bee6a498..736471502 100644 --- a/devel/kf5/extra-cmake-modules/distinfo +++ b/devel/kf5/extra-cmake-modules/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/extra-cmake-modules-5.109.0.tar.xz) = FSa1V8+XGOTTvzH/JBV4F40e5gvfuGMRDJfUPUeLf7c= -SIZE (kde/extra-cmake-modules-5.109.0.tar.xz) = 331684 +SHA256 (kde/extra-cmake-modules-5.110.0.tar.xz) = d0b12z4jDuJIXmA1gMxMfOxjbDJYwKkJdm+ygZE/ZDg= +SIZE (kde/extra-cmake-modules-5.110.0.tar.xz) = 331584 diff --git a/devel/kf5/frameworkintegration/distinfo b/devel/kf5/frameworkintegration/distinfo index 4f7aef4e9..687628a7b 100644 --- a/devel/kf5/frameworkintegration/distinfo +++ b/devel/kf5/frameworkintegration/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/frameworkintegration-5.109.0.tar.xz) = nU0fG28YEQ2PEVQveqqKYDl/3vyxt8qfCnmhJeRiRCc= -SIZE (kde/frameworkintegration-5.109.0.tar.xz) = 1760448 +SHA256 (kde/frameworkintegration-5.110.0.tar.xz) = WIN/gOhq0dGM/MbNuUFG6QIKFsFc+s/LkU2OF8AtFD4= +SIZE (kde/frameworkintegration-5.110.0.tar.xz) = 1760436 diff --git a/devel/kf5/kactivities-stats/distinfo b/devel/kf5/kactivities-stats/distinfo index eb06ac5a2..6d834d051 100644 --- a/devel/kf5/kactivities-stats/distinfo +++ b/devel/kf5/kactivities-stats/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kactivities-stats-5.109.0.tar.xz) = 29AWxhkDWrzhxnj+I30nPh+WHWqWn0U3IS9bOXsy0nA= -SIZE (kde/kactivities-stats-5.109.0.tar.xz) = 84500 +SHA256 (kde/kactivities-stats-5.110.0.tar.xz) = pH/EUB9Sd2ZuUwdPa214yEHyGk6uEZ7e/Zm+ul7T+Kk= +SIZE (kde/kactivities-stats-5.110.0.tar.xz) = 84484 diff --git a/devel/kf5/kactivities/distinfo b/devel/kf5/kactivities/distinfo index 2609637ce..af7a6ed8b 100644 --- a/devel/kf5/kactivities/distinfo +++ b/devel/kf5/kactivities/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kactivities-5.109.0.tar.xz) = HH7vcaiHxhKviexoEygqE9zBqbB2LFlBKo74tUGaUvE= -SIZE (kde/kactivities-5.109.0.tar.xz) = 73576 +SHA256 (kde/kactivities-5.110.0.tar.xz) = RWX4IW+BNLkdWKBpfViS4MZnX75v1jmooOzowaQpJLA= +SIZE (kde/kactivities-5.110.0.tar.xz) = 73556 diff --git a/devel/kf5/kapidox/distinfo b/devel/kf5/kapidox/distinfo index 5907ec73d..f7ddec090 100644 --- a/devel/kf5/kapidox/distinfo +++ b/devel/kf5/kapidox/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kapidox-5.109.0.tar.xz) = G821B/XE1qS/ZwH8C/5e9lL/5S5NXPPFgd0eUi+hKsA= -SIZE (kde/kapidox-5.109.0.tar.xz) = 198848 +SHA256 (kde/kapidox-5.110.0.tar.xz) = RLRCMpNOS4sWvx64DhuSAbg4HqTo4HIN6/oBTjWrIuI= +SIZE (kde/kapidox-5.110.0.tar.xz) = 198852 diff --git a/devel/kf5/karchive/distinfo b/devel/kf5/karchive/distinfo index 98341a579..9b0ee3f69 100644 --- a/devel/kf5/karchive/distinfo +++ b/devel/kf5/karchive/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/karchive-5.109.0.tar.xz) = nEoBwuQZCCTpAdSHqqjOaycxqoJU/d2cGiXuHRu7yWY= -SIZE (kde/karchive-5.109.0.tar.xz) = 1022440 +SHA256 (kde/karchive-5.110.0.tar.xz) = /MZYPAvlq7uXRL+tjT5nOlsJB70Hh/faM4zD2YkEDN8= +SIZE (kde/karchive-5.110.0.tar.xz) = 1022448 diff --git a/devel/kf5/kauth/distinfo b/devel/kf5/kauth/distinfo index 83186464f..6bfbf6d56 100644 --- a/devel/kf5/kauth/distinfo +++ b/devel/kf5/kauth/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kauth-5.109.0.tar.xz) = P32B/MvJM2MGqIrlIBbN42RbO/n+0WrD0X/G74XXoK4= -SIZE (kde/kauth-5.109.0.tar.xz) = 2307448 +SHA256 (kde/kauth-5.110.0.tar.xz) = 4bNXs29TiOzZZDC7mHgNhCnQDMzKClb8bTw/DLev1fs= +SIZE (kde/kauth-5.110.0.tar.xz) = 2307544 diff --git a/devel/kf5/kbookmarks/distinfo b/devel/kf5/kbookmarks/distinfo index c19aba20f..a90f9a559 100644 --- a/devel/kf5/kbookmarks/distinfo +++ b/devel/kf5/kbookmarks/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kbookmarks-5.109.0.tar.xz) = TZebayUEyA8rTbdFHtgurAg9Z2QWBxRrn4l/PwTQHwY= -SIZE (kde/kbookmarks-5.109.0.tar.xz) = 1125032 +SHA256 (kde/kbookmarks-5.110.0.tar.xz) = cBP2lvZDw1GPQAQeQTLt3fGEwsF3vsIxwW/syByrBMw= +SIZE (kde/kbookmarks-5.110.0.tar.xz) = 1125036 diff --git a/devel/kf5/kcalendarcore/distinfo b/devel/kf5/kcalendarcore/distinfo index a2d92649d..f48388323 100644 --- a/devel/kf5/kcalendarcore/distinfo +++ b/devel/kf5/kcalendarcore/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kcalendarcore-5.109.0.tar.xz) = hYHg4qxUDOTI6nb7YcYSNMhcPJCOcLi1r9C4yiRO2tQ= -SIZE (kde/kcalendarcore-5.109.0.tar.xz) = 266968 +SHA256 (kde/kcalendarcore-5.110.0.tar.xz) = olD7G6AJE1LYhQoG67IDIJepUpcLGq/YJh7HRckL66c= +SIZE (kde/kcalendarcore-5.110.0.tar.xz) = 269040 diff --git a/devel/kf5/kcmutils/distinfo b/devel/kf5/kcmutils/distinfo index 3ce06a526..96327353c 100644 --- a/devel/kf5/kcmutils/distinfo +++ b/devel/kf5/kcmutils/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kcmutils-5.109.0.tar.xz) = AJ5rmwBlgzJbBEDR7OEOcpa8fkYcS/FNmzYt+lUBC0Y= -SIZE (kde/kcmutils-5.109.0.tar.xz) = 2483492 +SHA256 (kde/kcmutils-5.110.0.tar.xz) = WP2baQUs21hdHiJgE8adMRq8fdKBS7UtSIjzU07LjzE= +SIZE (kde/kcmutils-5.110.0.tar.xz) = 2483528 diff --git a/devel/kf5/kcodecs/distinfo b/devel/kf5/kcodecs/distinfo index 5c090cb58..fa54c53a9 100644 --- a/devel/kf5/kcodecs/distinfo +++ b/devel/kf5/kcodecs/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kcodecs-5.109.0.tar.xz) = lkj+BSIsB1VEGiCR5Pl/17ZWSby6ovuMEg6Q2ciTTKU= -SIZE (kde/kcodecs-5.109.0.tar.xz) = 2505732 +SHA256 (kde/kcodecs-5.110.0.tar.xz) = O2yPMV+yNHnBX8Npu19OEMNKYHpbtvS6Fse28CbCJcQ= +SIZE (kde/kcodecs-5.110.0.tar.xz) = 2506168 diff --git a/devel/kf5/kcompletion/distinfo b/devel/kf5/kcompletion/distinfo index 2820647ca..2c8adc24b 100644 --- a/devel/kf5/kcompletion/distinfo +++ b/devel/kf5/kcompletion/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kcompletion-5.109.0.tar.xz) = csSmAmZLiPFtE4zTanCa++6GpVVgkjIITindsMKkqvE= -SIZE (kde/kcompletion-5.109.0.tar.xz) = 2337908 +SHA256 (kde/kcompletion-5.110.0.tar.xz) = TwTxpB9OSaFbBqYDBNdfeUW1BrEtZfA7Jwc8N9M1NCk= +SIZE (kde/kcompletion-5.110.0.tar.xz) = 2337804 diff --git a/devel/kf5/kconfig/distinfo b/devel/kf5/kconfig/distinfo index 0adfe1487..63bb87dbd 100644 --- a/devel/kf5/kconfig/distinfo +++ b/devel/kf5/kconfig/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kconfig-5.109.0.tar.xz) = W6kVUftoLT4dU2vDc1tWzsqle7aYqzLdj2YuHMePetg= -SIZE (kde/kconfig-5.109.0.tar.xz) = 294128 +SHA256 (kde/kconfig-5.110.0.tar.xz) = rSuIvbt4jtDfXL3JXr0kwZfQ/uNcCPeKzz4jmAFsMcU= +SIZE (kde/kconfig-5.110.0.tar.xz) = 294168 diff --git a/devel/kf5/kconfigwidgets/distinfo b/devel/kf5/kconfigwidgets/distinfo index 154aec4b5..1df7c8643 100644 --- a/devel/kf5/kconfigwidgets/distinfo +++ b/devel/kf5/kconfigwidgets/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kconfigwidgets-5.109.0.tar.xz) = Hmf6lP0akc63gABhuA56SY2AMbddi6q+EJnp5izWFL8= -SIZE (kde/kconfigwidgets-5.109.0.tar.xz) = 2613840 +SHA256 (kde/kconfigwidgets-5.110.0.tar.xz) = Tw/JQbrk60FDaitdvEW/MRYmj36YsVrtw0ff1gPhtBI= +SIZE (kde/kconfigwidgets-5.110.0.tar.xz) = 2613772 diff --git a/devel/kf5/kcontacts/distinfo b/devel/kf5/kcontacts/distinfo index 91b015159..5948ececc 100644 --- a/devel/kf5/kcontacts/distinfo +++ b/devel/kf5/kcontacts/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kcontacts-5.109.0.tar.xz) = CR1XZ9FniyocrxDqOnRD2Re4dKVofK1y/WFm7m7Vzq8= -SIZE (kde/kcontacts-5.109.0.tar.xz) = 213864 +SHA256 (kde/kcontacts-5.110.0.tar.xz) = hAwDImEPEd/YuntckUlajfjdOVXGbdw8XDMVHalFKz4= +SIZE (kde/kcontacts-5.110.0.tar.xz) = 213944 diff --git a/devel/kf5/kcoreaddons/Makefile b/devel/kf5/kcoreaddons/Makefile index 8221cd91b..469424d78 100644 --- a/devel/kf5/kcoreaddons/Makefile +++ b/devel/kf5/kcoreaddons/Makefile @@ -1,6 +1,5 @@ COMMENT = core KDE extensions to Qt classes DISTNAME = kcoreaddons-${VERSION} -REVISION = 0 SHARED_LIBS = KF5CoreAddons 9.0 diff --git a/devel/kf5/kcoreaddons/distinfo b/devel/kf5/kcoreaddons/distinfo index dd4f9f5d8..abc1c7654 100644 --- a/devel/kf5/kcoreaddons/distinfo +++ b/devel/kf5/kcoreaddons/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kcoreaddons-5.109.0.tar.xz) = /2R/wdTdYjcPJhhUrwhw8qHHunq+fiduWkxC2SPxUwA= -SIZE (kde/kcoreaddons-5.109.0.tar.xz) = 2608396 +SHA256 (kde/kcoreaddons-5.110.0.tar.xz) = bo3oDMwANgavf4nDVHGdASvatd3hVsVQXfMoYeAVjXU= +SIZE (kde/kcoreaddons-5.110.0.tar.xz) = 2609812 diff --git a/devel/kf5/kcoreaddons/pkg/PLIST b/devel/kf5/kcoreaddons/pkg/PLIST index a07979d77..ecfc467e0 100644 --- a/devel/kf5/kcoreaddons/pkg/PLIST +++ b/devel/kf5/kcoreaddons/pkg/PLIST @@ -215,6 +215,9 @@ share/locale/sr@ijekavianlatin/LC_MESSAGES/ share/locale/sr@ijekavianlatin/LC_MESSAGES/kcoreaddons5_qt.qm share/locale/sr@latin/LC_MESSAGES/kcoreaddons5_qt.qm share/locale/sv/LC_MESSAGES/kcoreaddons5_qt.qm +share/locale/sw/ +share/locale/sw/LC_MESSAGES/ +share/locale/sw/LC_MESSAGES/kcoreaddons5_qt.qm share/locale/ta/LC_MESSAGES/kcoreaddons5_qt.qm share/locale/te/LC_MESSAGES/kcoreaddons5_qt.qm share/locale/tg/LC_MESSAGES/kcoreaddons5_qt.qm diff --git a/devel/kf5/kcrash/distinfo b/devel/kf5/kcrash/distinfo index da382e3e4..deb9e3ecd 100644 --- a/devel/kf5/kcrash/distinfo +++ b/devel/kf5/kcrash/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kcrash-5.109.0.tar.xz) = LpbRR4A/T7T5o6/8nr9pFJ0iGrSeePhWHvgM3PWydvs= -SIZE (kde/kcrash-5.109.0.tar.xz) = 28308 +SHA256 (kde/kcrash-5.110.0.tar.xz) = z0DVu4MIgg23j4mnAR3C8yUE6BH5EBDI8xQwp0wGR5Y= +SIZE (kde/kcrash-5.110.0.tar.xz) = 28300 diff --git a/devel/kf5/kdav/distinfo b/devel/kf5/kdav/distinfo index e5c775e83..6ec508893 100644 --- a/devel/kf5/kdav/distinfo +++ b/devel/kf5/kdav/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kdav-5.109.0.tar.xz) = yLadILonlK1RV+DtT/txCxMCZwCvMvX2IZDolmqQFiA= -SIZE (kde/kdav-5.109.0.tar.xz) = 66196 +SHA256 (kde/kdav-5.110.0.tar.xz) = ynSPrPz5Kpk9pcAevbO32wCW+zywccLPD3OH6BKO5WM= +SIZE (kde/kdav-5.110.0.tar.xz) = 66184 diff --git a/devel/kf5/kdbusaddons/distinfo b/devel/kf5/kdbusaddons/distinfo index 6fb045d6d..eda1cabec 100644 --- a/devel/kf5/kdbusaddons/distinfo +++ b/devel/kf5/kdbusaddons/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kdbusaddons-5.109.0.tar.xz) = JRh2vBoABnQaMkBr9S1PADT2nE3smEKkc1P1Ihll8DU= -SIZE (kde/kdbusaddons-5.109.0.tar.xz) = 48916 +SHA256 (kde/kdbusaddons-5.110.0.tar.xz) = EK0OwmsacHYRCg/UMeWkom289i2gcIiOk7mzAo+Zn0Y= +SIZE (kde/kdbusaddons-5.110.0.tar.xz) = 48916 diff --git a/devel/kf5/kdeclarative/distinfo b/devel/kf5/kdeclarative/distinfo index cd6868919..4df56f0ad 100644 --- a/devel/kf5/kdeclarative/distinfo +++ b/devel/kf5/kdeclarative/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kdeclarative-5.109.0.tar.xz) = oiVFuy5sL3KmDpJgvsmuyv2GN9d5BwUntL5Sz0sRN+M= -SIZE (kde/kdeclarative-5.109.0.tar.xz) = 2492048 +SHA256 (kde/kdeclarative-5.110.0.tar.xz) = UlrE9HVGgPhtcDgq88DPPJvIzwtX0LhL5SdFSUlsmO0= +SIZE (kde/kdeclarative-5.110.0.tar.xz) = 2492408 diff --git a/devel/kf5/kdeclarative/pkg/PLIST b/devel/kf5/kdeclarative/pkg/PLIST index 74c68cee0..50c68234f 100644 --- a/devel/kf5/kdeclarative/pkg/PLIST +++ b/devel/kf5/kdeclarative/pkg/PLIST @@ -70,6 +70,7 @@ lib/qt5/qml/org/kde/kcm/SettingStateBinding.qml lib/qt5/qml/org/kde/kcm/SimpleKCM.qml @so lib/qt5/qml/org/kde/kcm/libkcmcontrolsplugin.so lib/qt5/qml/org/kde/kcm/private/ +lib/qt5/qml/org/kde/kcm/private/GridDelegateMenu.qml lib/qt5/qml/org/kde/kcm/private/GridViewInternal.qml lib/qt5/qml/org/kde/kcm/qmldir lib/qt5/qml/org/kde/kconfig/ diff --git a/devel/kf5/kded/distinfo b/devel/kf5/kded/distinfo index f7b85abfc..313e4805c 100644 --- a/devel/kf5/kded/distinfo +++ b/devel/kf5/kded/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kded-5.109.0.tar.xz) = PjtdfRI6HHticTiAPvfdwijv8jrpBTkJKDrsXJwwYpM= -SIZE (kde/kded-5.109.0.tar.xz) = 40996 +SHA256 (kde/kded-5.110.0.tar.xz) = 1L/s1kC+0avcvVAI5QW6jOofgHrTYqjOqqRnDPn8ENk= +SIZE (kde/kded-5.110.0.tar.xz) = 41012 diff --git a/devel/kf5/kdelibs4support/distinfo b/devel/kf5/kdelibs4support/distinfo index 414cdfb0f..f8f1bd74e 100644 --- a/devel/kf5/kdelibs4support/distinfo +++ b/devel/kf5/kdelibs4support/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kdelibs4support-5.109.0.tar.xz) = IJqCxjIxz52+TgYWr8LmjCYQv1hAo+O5f95MryMp6hs= -SIZE (kde/kdelibs4support-5.109.0.tar.xz) = 3721824 +SHA256 (kde/kdelibs4support-5.110.0.tar.xz) = xCkxrzlqXQiaYmz2ojoOlNGOVnqXZupK/lMY5ACDMIU= +SIZE (kde/kdelibs4support-5.110.0.tar.xz) = 3722220 diff --git a/devel/kf5/kdesignerplugin/distinfo b/devel/kf5/kdesignerplugin/distinfo index c2da850b4..080b20a6c 100644 --- a/devel/kf5/kdesignerplugin/distinfo +++ b/devel/kf5/kdesignerplugin/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kdesignerplugin-5.109.0.tar.xz) = LcGoPXyeFKq36RQHZ+ifdU92n6lR6bQN7yjxPCGQyyk= -SIZE (kde/kdesignerplugin-5.109.0.tar.xz) = 2286768 +SHA256 (kde/kdesignerplugin-5.110.0.tar.xz) = zBJOngqGe2IXXKKAr7lvYdiGIkbkAxT6AFCqnJNF0ZA= +SIZE (kde/kdesignerplugin-5.110.0.tar.xz) = 2286860 diff --git a/devel/kf5/kdesu/distinfo b/devel/kf5/kdesu/distinfo index 5d85566b0..ee75adcff 100644 --- a/devel/kf5/kdesu/distinfo +++ b/devel/kf5/kdesu/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kdesu-5.109.0.tar.xz) = /iMAMwtJ4cPzUIgnDAoDoBn/wX2e8LazQ4GIrEhQ1BU= -SIZE (kde/kdesu-5.109.0.tar.xz) = 56800 +SHA256 (kde/kdesu-5.110.0.tar.xz) = KWcfGW44gTB9RNEmVLL4bsavMfBT8GIGW2QHeymZhVI= +SIZE (kde/kdesu-5.110.0.tar.xz) = 56808 diff --git a/devel/kf5/kdewebkit/distinfo b/devel/kf5/kdewebkit/distinfo index fe462759f..169066755 100644 --- a/devel/kf5/kdewebkit/distinfo +++ b/devel/kf5/kdewebkit/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kdewebkit-5.109.0.tar.xz) = lIfA6sWZ1Jn2dbXHyydbSuJpcOxHZrpK2/JuKK39VRQ= -SIZE (kde/kdewebkit-5.109.0.tar.xz) = 29788 +SHA256 (kde/kdewebkit-5.110.0.tar.xz) = u5iHrGIWA2FDUe18NgTxq/N4iJghVTpCkaNrdvyiCVw= +SIZE (kde/kdewebkit-5.110.0.tar.xz) = 29788 diff --git a/devel/kf5/kdnssd/distinfo b/devel/kf5/kdnssd/distinfo index 18b75eedd..d2cfc2c64 100644 --- a/devel/kf5/kdnssd/distinfo +++ b/devel/kf5/kdnssd/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kdnssd-5.109.0.tar.xz) = N1dqx/Owp6aQNJjguD5o1x2XFjoxryBZuGmC/XvliD0= -SIZE (kde/kdnssd-5.109.0.tar.xz) = 2280836 +SHA256 (kde/kdnssd-5.110.0.tar.xz) = hUgFSz1F5ocZl6XHcJLNU+RDGVVOkUaiRFCJU+yDqnY= +SIZE (kde/kdnssd-5.110.0.tar.xz) = 2280888 diff --git a/devel/kf5/kdoctools/distinfo b/devel/kf5/kdoctools/distinfo index 0b9992617..72410781e 100644 --- a/devel/kf5/kdoctools/distinfo +++ b/devel/kf5/kdoctools/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kdoctools-5.109.0.tar.xz) = pE5bXgK6WFfZ2r45FnLoiaHLzRjktqB5T5d4r1JQ5p0= -SIZE (kde/kdoctools-5.109.0.tar.xz) = 465404 +SHA256 (kde/kdoctools-5.110.0.tar.xz) = kjx+LtvpSCdTFwFKw8V4l+vGV/VWodDDU/Njw+59Bbw= +SIZE (kde/kdoctools-5.110.0.tar.xz) = 465388 diff --git a/devel/kf5/kemoticons/distinfo b/devel/kf5/kemoticons/distinfo index cd0e03d45..2bf29a6df 100644 --- a/devel/kf5/kemoticons/distinfo +++ b/devel/kf5/kemoticons/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kemoticons-5.109.0.tar.xz) = 8KId1LYh8jEtN3hlXngsLnpyf24+h7zJztAai/wyyGs= -SIZE (kde/kemoticons-5.109.0.tar.xz) = 1700800 +SHA256 (kde/kemoticons-5.110.0.tar.xz) = IvgPrgw1YSjTDy7tozOp1TKYlmCReJ7wHIZ/bvgcLeQ= +SIZE (kde/kemoticons-5.110.0.tar.xz) = 1700720 diff --git a/devel/kf5/kf5.port.mk b/devel/kf5/kf5.port.mk index d25abf12e..0a0894ba8 100644 --- a/devel/kf5/kf5.port.mk +++ b/devel/kf5/kf5.port.mk @@ -1,4 +1,4 @@ -MODKF5_VERSION = 5.109.0 +MODKF5_VERSION = 5.110.0 .if empty(GH_ACCOUNT) EXTRACT_SUFX ?= .tar.xz @@ -39,7 +39,9 @@ MODULES += x11/qt5 MODKF5_EXAMPLES_DIR = ${PREFIX}/share/examples/${PKGNAME:C/-[0-9].*//}/ MODKF5_post-install += \ cd ${WRKINST}; \ - find etc -type d -empty -delete; \ + if [ -d ${WRKINST}/etc ]; then \ + find etc -type d -empty -delete; \ + fi; \ if [ -d ${WRKINST}/etc ]; then \ cd ${WRKINST}/etc; \ ${INSTALL_DATA_DIR} ${MODKF5_EXAMPLES_DIR}; \ diff --git a/devel/kf5/kfilemetadata/distinfo b/devel/kf5/kfilemetadata/distinfo index 09cbad017..545960785 100644 --- a/devel/kf5/kfilemetadata/distinfo +++ b/devel/kf5/kfilemetadata/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kfilemetadata-5.109.0.tar.xz) = tSTagsu7ad7gCs8eMJErRIzMCu0ORV1AkeHpfQiQtOo= -SIZE (kde/kfilemetadata-5.109.0.tar.xz) = 473052 +SHA256 (kde/kfilemetadata-5.110.0.tar.xz) = iS7IgXq291/1vIbH76buEOdhVdKjQh3SkPbugiMiqh4= +SIZE (kde/kfilemetadata-5.110.0.tar.xz) = 472980 diff --git a/devel/kf5/kglobalaccel/distinfo b/devel/kf5/kglobalaccel/distinfo index 30a8a9883..4bf48a4d8 100644 --- a/devel/kf5/kglobalaccel/distinfo +++ b/devel/kf5/kglobalaccel/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kglobalaccel-5.109.0.tar.xz) = pY5ep7Nij01Wy+STkVE2rrHXYG4wtTRCRBiSuuLRqeI= -SIZE (kde/kglobalaccel-5.109.0.tar.xz) = 2339040 +SHA256 (kde/kglobalaccel-5.110.0.tar.xz) = 91Ml9fe55tJU6CxY7EOVCRUU0XWbBQI1+/eAmf0Wgsc= +SIZE (kde/kglobalaccel-5.110.0.tar.xz) = 2339028 diff --git a/devel/kf5/kguiaddons/distinfo b/devel/kf5/kguiaddons/distinfo index f07021e59..50217df6e 100644 --- a/devel/kf5/kguiaddons/distinfo +++ b/devel/kf5/kguiaddons/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kguiaddons-5.109.0.tar.xz) = IH1mw7GyYw82bLa6tAi+YOP4KZrFa+NbJKPI8zbOf70= -SIZE (kde/kguiaddons-5.109.0.tar.xz) = 78372 +SHA256 (kde/kguiaddons-5.110.0.tar.xz) = LKFV3sFrej15aMO33AG6ccHBHU6amMYhcUZHaJHsVSo= +SIZE (kde/kguiaddons-5.110.0.tar.xz) = 78360 diff --git a/devel/kf5/kholidays/distinfo b/devel/kf5/kholidays/distinfo index 3b42536a2..94dbecb40 100644 --- a/devel/kf5/kholidays/distinfo +++ b/devel/kf5/kholidays/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kholidays-5.109.0.tar.xz) = Aloao2U8eH4xe2zXN3k7zyNA5P0/ByOa/B+QBsM7b00= -SIZE (kde/kholidays-5.109.0.tar.xz) = 255152 +SHA256 (kde/kholidays-5.110.0.tar.xz) = TFY0a1BHxyLkOlRJ4f732tKmg3G3GJT8w3wkFqtUM34= +SIZE (kde/kholidays-5.110.0.tar.xz) = 255492 diff --git a/devel/kf5/khtml/distinfo b/devel/kf5/khtml/distinfo index a6c914e1b..369ee272c 100644 --- a/devel/kf5/khtml/distinfo +++ b/devel/kf5/khtml/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/khtml-5.109.0.tar.xz) = WannRIMhitSJTKdMTw07crBH/asua3TcXr0JgnonJec= -SIZE (kde/khtml-5.109.0.tar.xz) = 4011640 +SHA256 (kde/khtml-5.110.0.tar.xz) = Nh6G99D1ZfhQM7CbWDt5uColyEj0pxY0sFWMGuU+qJ0= +SIZE (kde/khtml-5.110.0.tar.xz) = 4011536 diff --git a/devel/kf5/ki18n/Makefile b/devel/kf5/ki18n/Makefile index fa70e053d..39b131111 100644 --- a/devel/kf5/ki18n/Makefile +++ b/devel/kf5/ki18n/Makefile @@ -4,7 +4,7 @@ DISTNAME = ki18n-${VERSION} SHARED_LIBS = KF5I18n 7.0 SHARED_LIBS += KF5I18nLocaleData 1.0 -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Qml intl m +WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Qml m MODULES += lang/python diff --git a/devel/kf5/ki18n/distinfo b/devel/kf5/ki18n/distinfo index 9ba50915f..4aa2de833 100644 --- a/devel/kf5/ki18n/distinfo +++ b/devel/kf5/ki18n/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/ki18n-5.109.0.tar.xz) = 3YtsuUsILB4uVkGZMVywjJgu2yKifsDbSBiExItc30U= -SIZE (kde/ki18n-5.109.0.tar.xz) = 3128912 +SHA256 (kde/ki18n-5.110.0.tar.xz) = vOqkyGHeNyt32l6FClDt8oFa/pPZ1/G5wF9tZmfSEw8= +SIZE (kde/ki18n-5.110.0.tar.xz) = 3129428 diff --git a/devel/kf5/kiconthemes/distinfo b/devel/kf5/kiconthemes/distinfo index f9d316150..ee81150b1 100644 --- a/devel/kf5/kiconthemes/distinfo +++ b/devel/kf5/kiconthemes/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kiconthemes-5.109.0.tar.xz) = 0xn7s9vo4IAiaQaDt/4nNZ3SsDbqUuEPdnpjNU9o5mw= -SIZE (kde/kiconthemes-5.109.0.tar.xz) = 1312048 +SHA256 (kde/kiconthemes-5.110.0.tar.xz) = DYSiEG1o/gQEWOoxqPtjZz0MxIiS5galh17aqeTJZi0= +SIZE (kde/kiconthemes-5.110.0.tar.xz) = 1312164 diff --git a/devel/kf5/kidletime/distinfo b/devel/kf5/kidletime/distinfo index 0438e0d76..441244208 100644 --- a/devel/kf5/kidletime/distinfo +++ b/devel/kf5/kidletime/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kidletime-5.109.0.tar.xz) = RDsapucDhnhzYqBFxuCnKjucQ5uNBBTGfFUPyIEiKt8= -SIZE (kde/kidletime-5.109.0.tar.xz) = 30944 +SHA256 (kde/kidletime-5.110.0.tar.xz) = hPwfD2t9GlUaql91jMTQ3K7ShmOoXI1J3WCGhs4Bg0E= +SIZE (kde/kidletime-5.110.0.tar.xz) = 30932 diff --git a/devel/kf5/kimageformats/Makefile b/devel/kf5/kimageformats/Makefile index fcc1b7596..f899c9229 100644 --- a/devel/kf5/kimageformats/Makefile +++ b/devel/kf5/kimageformats/Makefile @@ -1,6 +1,5 @@ COMMENT = KDE plugins for QImage supporting extra file formats DISTNAME = kimageformats-${VERSION} -REVISION = 0 WANTLIB += ${COMPILER_LIBCXX} Iex-3_2 IlmThread-3_2 Imath-3_1 WANTLIB += KF5Archive OpenEXR-3_2 Qt5Core Qt5Gui Qt5PrintSupport diff --git a/devel/kf5/kimageformats/distinfo b/devel/kf5/kimageformats/distinfo index 62edcbddf..85a59c1d3 100644 --- a/devel/kf5/kimageformats/distinfo +++ b/devel/kf5/kimageformats/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kimageformats-5.109.0.tar.xz) = FVM+G6D6GH8NoAlLjqE184qc6//ZEYoS/NIwA+tZFoc= -SIZE (kde/kimageformats-5.109.0.tar.xz) = 13161052 +SHA256 (kde/kimageformats-5.110.0.tar.xz) = jWn72Kj7YhK8Ne5cukXBtbaz4OhkAQvyNaK9KZjQc0c= +SIZE (kde/kimageformats-5.110.0.tar.xz) = 15652452 diff --git a/devel/kf5/kimageformats/pkg/PLIST b/devel/kf5/kimageformats/pkg/PLIST index 645f1034a..ba1de3495 100644 --- a/devel/kf5/kimageformats/pkg/PLIST +++ b/devel/kf5/kimageformats/pkg/PLIST @@ -9,6 +9,7 @@ @so lib/qt5/plugins/imageformats/kimg_pcx.so @so lib/qt5/plugins/imageformats/kimg_pic.so @so lib/qt5/plugins/imageformats/kimg_psd.so +@so lib/qt5/plugins/imageformats/kimg_qoi.so @so lib/qt5/plugins/imageformats/kimg_ras.so @so lib/qt5/plugins/imageformats/kimg_raw.so @so lib/qt5/plugins/imageformats/kimg_rgb.so @@ -29,6 +30,7 @@ share/kservices5/qimageioplugins/ora.desktop share/kservices5/qimageioplugins/pcx.desktop share/kservices5/qimageioplugins/pic.desktop share/kservices5/qimageioplugins/psd.desktop +share/kservices5/qimageioplugins/qoi.desktop share/kservices5/qimageioplugins/ras.desktop share/kservices5/qimageioplugins/raw.desktop share/kservices5/qimageioplugins/rgb.desktop diff --git a/devel/kf5/kinit/distinfo b/devel/kf5/kinit/distinfo index 5b1b57ddc..2bb89be68 100644 --- a/devel/kf5/kinit/distinfo +++ b/devel/kf5/kinit/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kinit-5.109.0.tar.xz) = XZEtT5gCypngYo9LvC+N+uiWLuXIPa3T2WgQ25dB4aI= -SIZE (kde/kinit-5.109.0.tar.xz) = 2405188 +SHA256 (kde/kinit-5.110.0.tar.xz) = ZdM475RaIQiw+biLWtlmq9Ul6SKLhZP0214AB1MSQl8= +SIZE (kde/kinit-5.110.0.tar.xz) = 2404984 diff --git a/devel/kf5/kio/distinfo b/devel/kf5/kio/distinfo index 57d1db232..debb0aea9 100644 --- a/devel/kf5/kio/distinfo +++ b/devel/kf5/kio/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kio-5.109.0.tar.xz) = 9lpp7xZ/WTLE8PZi/46xUKujZHb7y9gGdEMgoQScDGI= -SIZE (kde/kio-5.109.0.tar.xz) = 3794048 +SHA256 (kde/kio-5.110.0.tar.xz) = Io+avN/OGyPerMqX6d1o0BnmsgYH3f4ilQUDM+kPyWs= +SIZE (kde/kio-5.110.0.tar.xz) = 3795996 diff --git a/devel/kf5/kirigami2/distinfo b/devel/kf5/kirigami2/distinfo index 19c69ba45..578d5c6dc 100644 --- a/devel/kf5/kirigami2/distinfo +++ b/devel/kf5/kirigami2/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kirigami2-5.109.0.tar.xz) = zItrGIwYYwETVdvsiXHHVMLHW8Jof+AOUZIGb9DPwP0= -SIZE (kde/kirigami2-5.109.0.tar.xz) = 382956 +SHA256 (kde/kirigami2-5.110.0.tar.xz) = /T3ZsCIFcO5zTO5QoYx/V0bs1RpEznfVSZgPBS34SY4= +SIZE (kde/kirigami2-5.110.0.tar.xz) = 382524 diff --git a/devel/kf5/kitemmodels/distinfo b/devel/kf5/kitemmodels/distinfo index 309f2a5c2..d9f40ec80 100644 --- a/devel/kf5/kitemmodels/distinfo +++ b/devel/kf5/kitemmodels/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kitemmodels-5.109.0.tar.xz) = FvDlmnY2hSTr3JDM5i5M6tQRQpU4iTEqqw7hV7U6sPA= -SIZE (kde/kitemmodels-5.109.0.tar.xz) = 407360 +SHA256 (kde/kitemmodels-5.110.0.tar.xz) = Ejp/RRH3T0ogrr9NcZS/5GxxvfPTw8xIZNcSYsao/hk= +SIZE (kde/kitemmodels-5.110.0.tar.xz) = 407364 diff --git a/devel/kf5/kitemviews/distinfo b/devel/kf5/kitemviews/distinfo index 2c85e24b8..b2a1dec91 100644 --- a/devel/kf5/kitemviews/distinfo +++ b/devel/kf5/kitemviews/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kitemviews-5.109.0.tar.xz) = TVn7ufB3N6nRBKv2Z446w0M4heyjedGAsbIvJRTYwqk= -SIZE (kde/kitemviews-5.109.0.tar.xz) = 2264996 +SHA256 (kde/kitemviews-5.110.0.tar.xz) = 12O2k5Zi3J8jeBwxi9ziKC9cEXTgp9CRwmplBuz1C9s= +SIZE (kde/kitemviews-5.110.0.tar.xz) = 2264824 diff --git a/devel/kf5/kjobwidgets/distinfo b/devel/kf5/kjobwidgets/distinfo index 088be7ab2..e09ef6100 100644 --- a/devel/kf5/kjobwidgets/distinfo +++ b/devel/kf5/kjobwidgets/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kjobwidgets-5.109.0.tar.xz) = hg7VuA2GjEL/lXydEAPVQvm3/gJsh3eG3BSWnVCnwrc= -SIZE (kde/kjobwidgets-5.109.0.tar.xz) = 2301536 +SHA256 (kde/kjobwidgets-5.110.0.tar.xz) = AoYcZiqztw4TfrgFOVYByTsjHdJFv1hVvDHAOtWLh64= +SIZE (kde/kjobwidgets-5.110.0.tar.xz) = 2301408 diff --git a/devel/kf5/kjs/distinfo b/devel/kf5/kjs/distinfo index 2064f6786..655a34baf 100644 --- a/devel/kf5/kjs/distinfo +++ b/devel/kf5/kjs/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kjs-5.109.0.tar.xz) = pfS+yFZiwcVUz05//zxsfZ4M5X5GshOfnIFAiRaIEz4= -SIZE (kde/kjs-5.109.0.tar.xz) = 339880 +SHA256 (kde/kjs-5.110.0.tar.xz) = JWxSfnfgDPbCUxsC4XHxSFBi5V6nIniQu7EcjU9sk3Y= +SIZE (kde/kjs-5.110.0.tar.xz) = 339808 diff --git a/devel/kf5/kjsembed/distinfo b/devel/kf5/kjsembed/distinfo index e1002211d..18bb3e13d 100644 --- a/devel/kf5/kjsembed/distinfo +++ b/devel/kf5/kjsembed/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kjsembed-5.109.0.tar.xz) = Oa0LUbV63vF4CyVvTUQHjVBxjq5g5A+vL7e25S3AeN0= -SIZE (kde/kjsembed-5.109.0.tar.xz) = 2490940 +SHA256 (kde/kjsembed-5.110.0.tar.xz) = Fbs/a02O4pvNyEZEN8OvPGupj+PjSwq+rCq9xBSS1fo= +SIZE (kde/kjsembed-5.110.0.tar.xz) = 2491320 diff --git a/devel/kf5/kmediaplayer/distinfo b/devel/kf5/kmediaplayer/distinfo index 790437473..8fda3c437 100644 --- a/devel/kf5/kmediaplayer/distinfo +++ b/devel/kf5/kmediaplayer/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kmediaplayer-5.109.0.tar.xz) = jGKpd9MyrG4/GED+Qvvf7I/waaayO1TK20WGUlznVic= -SIZE (kde/kmediaplayer-5.109.0.tar.xz) = 9964 +SHA256 (kde/kmediaplayer-5.110.0.tar.xz) = 4wu0sqkbzbMxu3izdEuOXNjeavg2PK5hhiKuuPQbEMo= +SIZE (kde/kmediaplayer-5.110.0.tar.xz) = 9956 diff --git a/devel/kf5/knewstuff/distinfo b/devel/kf5/knewstuff/distinfo index 119e2e102..a76e6f616 100644 --- a/devel/kf5/knewstuff/distinfo +++ b/devel/kf5/knewstuff/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/knewstuff-5.109.0.tar.xz) = P8jnDB+KFOAsTwuV7FZMrETi8ssGaXZLtWFpiO+hB24= -SIZE (kde/knewstuff-5.109.0.tar.xz) = 3386440 +SHA256 (kde/knewstuff-5.110.0.tar.xz) = dK2V6hi0KwD0s9Ub/gvc/r9eQMJqJ8Vpw8D842VEjWI= +SIZE (kde/knewstuff-5.110.0.tar.xz) = 3386288 diff --git a/devel/kf5/knotifications/distinfo b/devel/kf5/knotifications/distinfo index b6a7587b4..a9b258a1a 100644 --- a/devel/kf5/knotifications/distinfo +++ b/devel/kf5/knotifications/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/knotifications-5.109.0.tar.xz) = ErG0HIBznc3aDP8dgSiDI7i1y4JJ2kXs7kt4XGBNwT0= -SIZE (kde/knotifications-5.109.0.tar.xz) = 2373104 +SHA256 (kde/knotifications-5.110.0.tar.xz) = 9RlfLW3pIeRSkjn1hBHA0D17uTBJXt7uWPi1tM1oo34= +SIZE (kde/knotifications-5.110.0.tar.xz) = 2372852 diff --git a/devel/kf5/knotifyconfig/distinfo b/devel/kf5/knotifyconfig/distinfo index 9440d6010..f10df8f81 100644 --- a/devel/kf5/knotifyconfig/distinfo +++ b/devel/kf5/knotifyconfig/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/knotifyconfig-5.109.0.tar.xz) = mp6e/WJI8ZkLYyfOfG/hpolCSq4RRGevmWs+Wx3vSNE= -SIZE (kde/knotifyconfig-5.109.0.tar.xz) = 2401840 +SHA256 (kde/knotifyconfig-5.110.0.tar.xz) = lx9rCHFdODUUvfflu9SE8Xq09I+yjVUzupiirQDMoZg= +SIZE (kde/knotifyconfig-5.110.0.tar.xz) = 2402024 diff --git a/devel/kf5/kpackage/distinfo b/devel/kf5/kpackage/distinfo index 6ab9c4530..23015017d 100644 --- a/devel/kf5/kpackage/distinfo +++ b/devel/kf5/kpackage/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kpackage-5.109.0.tar.xz) = eC2svmHJBLs++sI+3yYT1yL3FQnCER3QzeSY8GKtvzs= -SIZE (kde/kpackage-5.109.0.tar.xz) = 187520 +SHA256 (kde/kpackage-5.110.0.tar.xz) = LSZETc2AFha3IAHHmVdB3Ua9ubYi/rFMS1D9fk8tqMk= +SIZE (kde/kpackage-5.110.0.tar.xz) = 187512 diff --git a/devel/kf5/kparts/distinfo b/devel/kf5/kparts/distinfo index df62621c4..45ff52514 100644 --- a/devel/kf5/kparts/distinfo +++ b/devel/kf5/kparts/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kparts-5.109.0.tar.xz) = ax2l+MAMIgTp2h62dn4A9yqWbRFSBzUVu2d/Dnc0954= -SIZE (kde/kparts-5.109.0.tar.xz) = 2473692 +SHA256 (kde/kparts-5.110.0.tar.xz) = I6OB7jFnMO5fzHyu6dcbDw2M0JJWvW7R9nu9N8VGW40= +SIZE (kde/kparts-5.110.0.tar.xz) = 2473804 diff --git a/devel/kf5/kpeople/distinfo b/devel/kf5/kpeople/distinfo index feff4c888..b3a112959 100644 --- a/devel/kf5/kpeople/distinfo +++ b/devel/kf5/kpeople/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kpeople-5.109.0.tar.xz) = PV5xETKuP3zluEE60u4DUL6fUMIRGelgnoapl9D0ub4= -SIZE (kde/kpeople-5.109.0.tar.xz) = 63288 +SHA256 (kde/kpeople-5.110.0.tar.xz) = 9wDkgmn8XftfVuhFVvVITVsLD1idRadpgxgAzqRjuYE= +SIZE (kde/kpeople-5.110.0.tar.xz) = 63280 diff --git a/devel/kf5/kplotting/distinfo b/devel/kf5/kplotting/distinfo index c39231ea4..2cbc99037 100644 --- a/devel/kf5/kplotting/distinfo +++ b/devel/kf5/kplotting/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kplotting-5.109.0.tar.xz) = 0hFUB7x//9BrNhfVLrYCnktEpf5ZPWYvN3SQMaDiBhQ= -SIZE (kde/kplotting-5.109.0.tar.xz) = 33768 +SHA256 (kde/kplotting-5.110.0.tar.xz) = czWIjmKz+uELENZU4H0AbNCqsEMstKYxMiT0B2byf7k= +SIZE (kde/kplotting-5.110.0.tar.xz) = 33736 diff --git a/devel/kf5/kpty/distinfo b/devel/kf5/kpty/distinfo index 27923b168..dfcf194c8 100644 --- a/devel/kf5/kpty/distinfo +++ b/devel/kf5/kpty/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kpty-5.109.0.tar.xz) = mAZiuQLOr2J18yQIbaABliG8hq1unH+eYLuwdzwFHPA= -SIZE (kde/kpty-5.109.0.tar.xz) = 2416944 +SHA256 (kde/kpty-5.110.0.tar.xz) = +oq04DKaYOJXzf9brV83AOBV14Pp87Q28Ir+FL/mqbM= +SIZE (kde/kpty-5.110.0.tar.xz) = 2416804 diff --git a/devel/kf5/kquickcharts/distinfo b/devel/kf5/kquickcharts/distinfo index 6e51df2b2..263b1ed17 100644 --- a/devel/kf5/kquickcharts/distinfo +++ b/devel/kf5/kquickcharts/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kquickcharts-5.109.0.tar.xz) = dDOH9WNZtXFwjA/mj6TBK5jlmd1oZZ6AFOj2uj3Zoa0= -SIZE (kde/kquickcharts-5.109.0.tar.xz) = 113396 +SHA256 (kde/kquickcharts-5.110.0.tar.xz) = u8iXxwHcbTVqMW0X5Pcc2QvGLf+t1eqO5aaKDqu2HWk= +SIZE (kde/kquickcharts-5.110.0.tar.xz) = 113408 diff --git a/devel/kf5/kross/distinfo b/devel/kf5/kross/distinfo index 0e2312886..ab7c82c67 100644 --- a/devel/kf5/kross/distinfo +++ b/devel/kf5/kross/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kross-5.109.0.tar.xz) = D4aALSNRA1Qtrll0OR7iTx+c3/353Uy5/SMDuf5y9b8= -SIZE (kde/kross-5.109.0.tar.xz) = 2440840 +SHA256 (kde/kross-5.110.0.tar.xz) = pRfheyy4estAJOHQBxGy8OGhBA2ucqCN7WW3VXPXP5k= +SIZE (kde/kross-5.110.0.tar.xz) = 2440032 diff --git a/devel/kf5/krunner/distinfo b/devel/kf5/krunner/distinfo index 481e61945..6e1259c65 100644 --- a/devel/kf5/krunner/distinfo +++ b/devel/kf5/krunner/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/krunner-5.109.0.tar.xz) = XAyhx0VkShZZDzKZOE9AsEvXP0hCpj8ijhZq+rJG818= -SIZE (kde/krunner-5.109.0.tar.xz) = 88680 +SHA256 (kde/krunner-5.110.0.tar.xz) = oYwY4lL4o2u4ZrDfiEbVXWcDNv0R9tlykdhyzQSGcmA= +SIZE (kde/krunner-5.110.0.tar.xz) = 88708 diff --git a/devel/kf5/kservice/distinfo b/devel/kf5/kservice/distinfo index db550e47f..ca0f9dd23 100644 --- a/devel/kf5/kservice/distinfo +++ b/devel/kf5/kservice/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kservice-5.109.0.tar.xz) = Xu/oeggNiNLo1gvBnknvklq0wsPN/7Ke22Prkds6aZU= -SIZE (kde/kservice-5.109.0.tar.xz) = 2539140 +SHA256 (kde/kservice-5.110.0.tar.xz) = 78HW4zOIErIXCnqTGdoQBqFwnilcI/7bKLyyatI2NmY= +SIZE (kde/kservice-5.110.0.tar.xz) = 2539228 diff --git a/devel/kf5/ktexteditor/distinfo b/devel/kf5/ktexteditor/distinfo index d3d2a90ef..70c7f6178 100644 --- a/devel/kf5/ktexteditor/distinfo +++ b/devel/kf5/ktexteditor/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/ktexteditor-5.109.0.tar.xz) = 3KG8Up5xVuuxxM4jYa287T+OJhn9cg/anwQhtXmS8q0= -SIZE (kde/ktexteditor-5.109.0.tar.xz) = 2780188 +SHA256 (kde/ktexteditor-5.110.0.tar.xz) = ir7o+1ddydmVgOrFshNwzLG90u+VBLXbRLmOOkPhn0c= +SIZE (kde/ktexteditor-5.110.0.tar.xz) = 2789296 diff --git a/devel/kf5/ktextwidgets/distinfo b/devel/kf5/ktextwidgets/distinfo index 4e2d58a0a..10e39ee00 100644 --- a/devel/kf5/ktextwidgets/distinfo +++ b/devel/kf5/ktextwidgets/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/ktextwidgets-5.109.0.tar.xz) = OA0C597v4zywyoxRJd0eFjZRCghDtFWpmb4sRVceHaA= -SIZE (kde/ktextwidgets-5.109.0.tar.xz) = 2552512 +SHA256 (kde/ktextwidgets-5.110.0.tar.xz) = +FyZSSXrU6If2UqmPmNVIHEgb8gaYq99QyJNVVGxJzM= +SIZE (kde/ktextwidgets-5.110.0.tar.xz) = 2552540 diff --git a/devel/kf5/kunitconversion/distinfo b/devel/kf5/kunitconversion/distinfo index 6ceaa10fb..4da4f0daf 100644 --- a/devel/kf5/kunitconversion/distinfo +++ b/devel/kf5/kunitconversion/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kunitconversion-5.109.0.tar.xz) = FLoJYjzHyGw2lkiJvP9nYL/d757lJXyVeLOOqozEhtg= -SIZE (kde/kunitconversion-5.109.0.tar.xz) = 931936 +SHA256 (kde/kunitconversion-5.110.0.tar.xz) = qv0/u/d6OuGpYAwbgZlTHBXM8cB+gPoxekKeEv4DfCA= +SIZE (kde/kunitconversion-5.110.0.tar.xz) = 931736 diff --git a/devel/kf5/kwallet/distinfo b/devel/kf5/kwallet/distinfo index c9cce14ac..29831ad6f 100644 --- a/devel/kf5/kwallet/distinfo +++ b/devel/kf5/kwallet/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kwallet-5.109.0.tar.xz) = jGhwDE6DVe3dGXjschuYN1M4DS9+VxOax3FeQSKnZOg= -SIZE (kde/kwallet-5.109.0.tar.xz) = 349624 +SHA256 (kde/kwallet-5.110.0.tar.xz) = H0+7/MFXypzVnoXTWKg5pJol9NXX9uL94Efvvxny5VU= +SIZE (kde/kwallet-5.110.0.tar.xz) = 349616 diff --git a/devel/kf5/kwayland/distinfo b/devel/kf5/kwayland/distinfo index 269173131..9906f7bfb 100644 --- a/devel/kf5/kwayland/distinfo +++ b/devel/kf5/kwayland/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kwayland-5.109.0.tar.xz) = 2IsmaTjtCASWzX9MB6T12cXk2VKqE++CO/7Gr2EJJd4= -SIZE (kde/kwayland-5.109.0.tar.xz) = 337396 +SHA256 (kde/kwayland-5.110.0.tar.xz) = BWUEHvCrauwtKvvlE8edXFbAfQPJgjPKghA6vLnf/T0= +SIZE (kde/kwayland-5.110.0.tar.xz) = 337456 diff --git a/devel/kf5/kwidgetsaddons/distinfo b/devel/kf5/kwidgetsaddons/distinfo index 69b82fc44..5d334331c 100644 --- a/devel/kf5/kwidgetsaddons/distinfo +++ b/devel/kf5/kwidgetsaddons/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kwidgetsaddons-5.109.0.tar.xz) = 1oBy+fNRtxoJyG8oVqqmtog+RoHlQhEcQvqhIZaS4uI= -SIZE (kde/kwidgetsaddons-5.109.0.tar.xz) = 4271984 +SHA256 (kde/kwidgetsaddons-5.110.0.tar.xz) = ynSw6bGpN+5vkc7XDxa0FInUurGrpsjvSFvIkoGG17M= +SIZE (kde/kwidgetsaddons-5.110.0.tar.xz) = 4270960 diff --git a/devel/kf5/kwindowsystem/distinfo b/devel/kf5/kwindowsystem/distinfo index 6694839c8..22e7f133b 100644 --- a/devel/kf5/kwindowsystem/distinfo +++ b/devel/kf5/kwindowsystem/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kwindowsystem-5.109.0.tar.xz) = CIB1yf82e1tTtuzdNNz4pHpM9HRY7wL9nY3zJmZ5waI= -SIZE (kde/kwindowsystem-5.109.0.tar.xz) = 2406280 +SHA256 (kde/kwindowsystem-5.110.0.tar.xz) = 4Ahg5ZL87kLBjm2jUbMQy7E1ikXZQk8x/+njP7KdalA= +SIZE (kde/kwindowsystem-5.110.0.tar.xz) = 2406276 diff --git a/devel/kf5/kxmlgui/distinfo b/devel/kf5/kxmlgui/distinfo index d88e0cb0b..85d9fca9a 100644 --- a/devel/kf5/kxmlgui/distinfo +++ b/devel/kf5/kxmlgui/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kxmlgui-5.109.0.tar.xz) = tAlNM7+zgaB1BqwOtoROzuPUXmOrhZZYf9DogyWa2u4= -SIZE (kde/kxmlgui-5.109.0.tar.xz) = 2953380 +SHA256 (kde/kxmlgui-5.110.0.tar.xz) = WHZuu3APoYb3CgK6N0+JWQCj5bVP0M3MwWfr1KMoG8k= +SIZE (kde/kxmlgui-5.110.0.tar.xz) = 2953508 diff --git a/devel/kf5/kxmlrpcclient/distinfo b/devel/kf5/kxmlrpcclient/distinfo index 39823d0a7..e771d867b 100644 --- a/devel/kf5/kxmlrpcclient/distinfo +++ b/devel/kf5/kxmlrpcclient/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/kxmlrpcclient-5.109.0.tar.xz) = snWEKJ+4nZcXhiqqeA2gcv+icuuuDEa3JxTLnEdx0LQ= -SIZE (kde/kxmlrpcclient-5.109.0.tar.xz) = 32216 +SHA256 (kde/kxmlrpcclient-5.110.0.tar.xz) = Xd8SJ/Sem+Lw4kiFjKM2uqDj8GdvOYRJ4YtIIatK7Ts= +SIZE (kde/kxmlrpcclient-5.110.0.tar.xz) = 32224 diff --git a/devel/kf5/oxygen-icons/distinfo b/devel/kf5/oxygen-icons/distinfo index 437c1e442..d3dc95062 100644 --- a/devel/kf5/oxygen-icons/distinfo +++ b/devel/kf5/oxygen-icons/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/oxygen-icons5-5.109.0.tar.xz) = K9+0wWRF8s2D2uTjXPBur1vibTwfDSOPfQ/b/jZ1xgk= -SIZE (kde/oxygen-icons5-5.109.0.tar.xz) = 238637008 +SHA256 (kde/oxygen-icons5-5.110.0.tar.xz) = QsVpg7WcC/ZupIn3uN2V6xXKLQlFzpTW9YCuhwp5sbY= +SIZE (kde/oxygen-icons5-5.110.0.tar.xz) = 238635952 diff --git a/devel/kf5/plasma-framework/distinfo b/devel/kf5/plasma-framework/distinfo index 22f466965..59f3ebcf4 100644 --- a/devel/kf5/plasma-framework/distinfo +++ b/devel/kf5/plasma-framework/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/plasma-framework-5.109.0.tar.xz) = YQ7RwTbtm5pAPAmCHLyIaooRA67OIxGfR7agpDwAGY0= -SIZE (kde/plasma-framework-5.109.0.tar.xz) = 3310464 +SHA256 (kde/plasma-framework-5.110.0.tar.xz) = jh1wVfLFkPQOcGIMxnMRz8hWDS8yXkQhnpbVnymy1Ek= +SIZE (kde/plasma-framework-5.110.0.tar.xz) = 3310724 diff --git a/devel/kf5/prison/distinfo b/devel/kf5/prison/distinfo index f51c7d8e7..1d56b6e82 100644 --- a/devel/kf5/prison/distinfo +++ b/devel/kf5/prison/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/prison-5.109.0.tar.xz) = gQnX2q2iVzXkqpwPC1FkDzQ4aqUanQO7SbhKA1novN4= -SIZE (kde/prison-5.109.0.tar.xz) = 55288 +SHA256 (kde/prison-5.110.0.tar.xz) = Z3FwdApc2MgJF7MB8+h0/vfoyhqtFQfVWPbgh8IfKgU= +SIZE (kde/prison-5.110.0.tar.xz) = 55248 diff --git a/devel/kf5/purpose/distinfo b/devel/kf5/purpose/distinfo index 4cb3a5109..9eb3c384b 100644 --- a/devel/kf5/purpose/distinfo +++ b/devel/kf5/purpose/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/purpose-5.109.0.tar.xz) = MTNbL6PVAtjYR05n8vGmcenqNpOykKb/V7k7BHr9zBI= -SIZE (kde/purpose-5.109.0.tar.xz) = 180772 +SHA256 (kde/purpose-5.110.0.tar.xz) = TOdjvsEnu90cslJqTWFatvQgqywqcAywlXGwIg/Ehlo= +SIZE (kde/purpose-5.110.0.tar.xz) = 180760 diff --git a/devel/kf5/qqc2-desktop-style/distinfo b/devel/kf5/qqc2-desktop-style/distinfo index b6b479872..ac9b91a4b 100644 --- a/devel/kf5/qqc2-desktop-style/distinfo +++ b/devel/kf5/qqc2-desktop-style/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/qqc2-desktop-style-5.109.0.tar.xz) = cA663h/cB8MXJZp+uOLP22f59HhF0yoyOP6jyXSZDDs= -SIZE (kde/qqc2-desktop-style-5.109.0.tar.xz) = 69456 +SHA256 (kde/qqc2-desktop-style-5.110.0.tar.xz) = bzwvc7KDxzc7aV8z6qJHk0na4TX9ui79BPyrhDKF/hI= +SIZE (kde/qqc2-desktop-style-5.110.0.tar.xz) = 69460 diff --git a/devel/kf5/solid/distinfo b/devel/kf5/solid/distinfo index bf5abb9d8..91dc3ad0c 100644 --- a/devel/kf5/solid/distinfo +++ b/devel/kf5/solid/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/solid-5.109.0.tar.xz) = vE37bReScRpIdF3bNpjtdk2ob8ofeaG5MQcukQtL1Wk= -SIZE (kde/solid-5.109.0.tar.xz) = 306092 +SHA256 (kde/solid-5.110.0.tar.xz) = bbPmC8HVebzOLT7rOPjtulu31UnhcRZEnN0ezSlmxMw= +SIZE (kde/solid-5.110.0.tar.xz) = 306088 diff --git a/devel/kf5/sonnet/Makefile b/devel/kf5/sonnet/Makefile index 563c37121..ee3ed6537 100644 --- a/devel/kf5/sonnet/Makefile +++ b/devel/kf5/sonnet/Makefile @@ -7,12 +7,12 @@ DISTNAME = sonnet-${VERSION} SHARED_LIBS = KF5SonnetCore 7.0 SHARED_LIBS += KF5SonnetUi 6.0 -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Network Qt5Qml -WANTLIB += Qt5QmlModels Qt5Quick Qt5Widgets c m +WANTLIB-main += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Network Qt5Qml +WANTLIB-main += Qt5QmlModels Qt5Quick Qt5Widgets c m + +WANTLIB-aspell += ${COMPILER_LIBCXX} Qt5Core KF5SonnetCore m +WANTLIB-hunspell += ${COMPILER_LIBCXX} Qt5Core KF5SonnetCore hunspell-1.7 m -WANTLIB-aspell += ${COMPILER_LIBCXX} KF5SonnetCore Qt5Core aspell m -WANTLIB-hunspell += ${COMPILER_LIBCXX} KF5SonnetCore Qt5Core hunspell-1.7 -WANTLIB-hunspell += m MULTI_PACKAGES = -main -aspell -hunspell diff --git a/devel/kf5/sonnet/distinfo b/devel/kf5/sonnet/distinfo index b870ea90d..5667fcc20 100644 --- a/devel/kf5/sonnet/distinfo +++ b/devel/kf5/sonnet/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/sonnet-5.109.0.tar.xz) = WTumVKi19hr5X+w/0LJpqPXonb7VTWKq+0GgzgFG7ro= -SIZE (kde/sonnet-5.109.0.tar.xz) = 2438344 +SHA256 (kde/sonnet-5.110.0.tar.xz) = ERSh/oTzkPut0Dz0NMH3QbdaT/4YAUYz+QP44P0wE5s= +SIZE (kde/sonnet-5.110.0.tar.xz) = 2438240 diff --git a/devel/kf5/syndication/distinfo b/devel/kf5/syndication/distinfo index 2498b18f9..e6cf4a48e 100644 --- a/devel/kf5/syndication/distinfo +++ b/devel/kf5/syndication/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/syndication-5.109.0.tar.xz) = JWGiBrjh5RvuOliIQpM1zk2/TJ/R+MES9giaLdPYFco= -SIZE (kde/syndication-5.109.0.tar.xz) = 510484 +SHA256 (kde/syndication-5.110.0.tar.xz) = TaNz+rH3WJLZTQZtnL7Qbi161Io537eybS5tN1kBTTc= +SIZE (kde/syndication-5.110.0.tar.xz) = 510492 diff --git a/devel/kf5/syntax-highlighting/distinfo b/devel/kf5/syntax-highlighting/distinfo index bfb13b0dd..690f0853e 100644 --- a/devel/kf5/syntax-highlighting/distinfo +++ b/devel/kf5/syntax-highlighting/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/syntax-highlighting-5.109.0.tar.xz) = nmN66OktzjOrD2WOMNaqEy/DVDBPkP+wmc0nx3bQtcc= -SIZE (kde/syntax-highlighting-5.109.0.tar.xz) = 3430120 +SHA256 (kde/syntax-highlighting-5.110.0.tar.xz) = hSd8q4WM0E87SGHa9diFcG4OnaPggeCYhJ14Bqx6dT0= +SIZE (kde/syntax-highlighting-5.110.0.tar.xz) = 3430736 diff --git a/devel/kf5/threadweaver/distinfo b/devel/kf5/threadweaver/distinfo index ece1a9cce..a781b04b3 100644 --- a/devel/kf5/threadweaver/distinfo +++ b/devel/kf5/threadweaver/distinfo @@ -1,2 +1,2 @@ -SHA256 (kde/threadweaver-5.109.0.tar.xz) = cnRSlUDE9HhRknFlWkCeTYnCl2g+q1Madkzy5bjC0uA= -SIZE (kde/threadweaver-5.109.0.tar.xz) = 1413104 +SHA256 (kde/threadweaver-5.110.0.tar.xz) = oOpZNqr6AiZki4nYwSwlVXrkLJda0I/v1stn8E8lviA= +SIZE (kde/threadweaver-5.110.0.tar.xz) = 1413132 diff --git a/devel/libsoup3/Makefile b/devel/libsoup3/Makefile index 931f65b19..0c0bf1248 100644 --- a/devel/libsoup3/Makefile +++ b/devel/libsoup3/Makefile @@ -1,7 +1,7 @@ COMMENT = HTTP client/server library for GNOME GNOME_PROJECT = libsoup -GNOME_VERSION = 3.4.2 +GNOME_VERSION = 3.4.3 PKGNAME= libsoup3-${GNOME_VERSION} SHARED_LIBS += soup-3.0 0.3 # 0.7.0 diff --git a/devel/libsoup3/distinfo b/devel/libsoup3/distinfo index f24ce392b..3cb2a7c30 100644 --- a/devel/libsoup3/distinfo +++ b/devel/libsoup3/distinfo @@ -1,2 +1,2 @@ -SHA256 (libsoup-3.4.2.tar.xz) = eMj6N8sVLUDsjEoUjWFV4vaUfz8WAqfNo6Ma1A9e4vM= -SIZE (libsoup-3.4.2.tar.xz) = 1535992 +SHA256 (libsoup-3.4.3.tar.xz) = t/G7rutD9YEtq6PuJYpy4bSxTC/ZH0oaddTuoQ3PKI8= +SIZE (libsoup-3.4.3.tar.xz) = 1529884 diff --git a/devel/p5-MCE/Makefile b/devel/p5-MCE/Makefile index 5cf412596..666681e65 100644 --- a/devel/p5-MCE/Makefile +++ b/devel/p5-MCE/Makefile @@ -1,6 +1,6 @@ COMMENT = engine for Perl providing parallel processing capabilities -DISTNAME = MCE-1.879 +DISTNAME = MCE-1.889 CPAN_AUTHOR = MARIOROY CATEGORIES = devel diff --git a/devel/p5-MCE/distinfo b/devel/p5-MCE/distinfo index a19e99ff3..eaff8e336 100644 --- a/devel/p5-MCE/distinfo +++ b/devel/p5-MCE/distinfo @@ -1,2 +1,2 @@ -SHA256 (MCE-1.879.tar.gz) = nEzzmDi1wRNEh5mvRRs9ZLVODeOdY1U21+hei9xYiNw= -SIZE (MCE-1.879.tar.gz) = 224587 +SHA256 (MCE-1.889.tar.gz) = 22FT5HTQRvwlMFC/U8VAAthM1Mp30hwrnfVv7rgJu+0= +SIZE (MCE-1.889.tar.gz) = 230624 diff --git a/devel/protobuf-c/Makefile b/devel/protobuf-c/Makefile index a6745abe1..e8a06e6bd 100644 --- a/devel/protobuf-c/Makefile +++ b/devel/protobuf-c/Makefile @@ -2,6 +2,7 @@ COMMENT = c protocol buffers V = 1.4.1 DISTNAME = protobuf-c-$V +REVISION = 0 SHARED_LIBS = protobuf-c 2.0 # 1.0 @@ -17,11 +18,12 @@ PERMIT_PACKAGE = Yes WANTLIB = c m protobuf protoc pthread ${COMPILER_LIBCXX} z COMPILER = base-clang ports-gcc -CXXFLAGS += -std=gnu++11 +CXXFLAGS += -std=gnu++17 LIB_DEPENDS = devel/protobuf -CONFIGURE_STYLE = gnu +CONFIGURE_STYLE = autoconf +AUTOCONF_VERSION = 2.71 CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/protobuf-c/patches/patch-build-cmake_CMakeLists_txt b/devel/protobuf-c/patches/patch-build-cmake_CMakeLists_txt new file mode 100644 index 000000000..df2b58bce --- /dev/null +++ b/devel/protobuf-c/patches/patch-build-cmake_CMakeLists_txt @@ -0,0 +1,14 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: build-cmake/CMakeLists.txt +--- build-cmake/CMakeLists.txt.orig ++++ build-cmake/CMakeLists.txt +@@ -88,7 +88,7 @@ if (MSVC AND NOT BUILD_SHARED_LIBS) + endif (MSVC AND NOT BUILD_SHARED_LIBS) + + IF(BUILD_PROTOC) +-SET(CMAKE_CXX_STANDARD 11) ++SET(CMAKE_CXX_STANDARD 17) + SET(CMAKE_CXX_STANDARD_REQUIRED ON) + SET(CMAKE_CXX_EXTENSIONS OFF) + ADD_CUSTOM_COMMAND(OUTPUT protobuf-c/protobuf-c.pb.cc protobuf-c/protobuf-c.pb.h diff --git a/devel/protobuf-c/patches/patch-configure_ac b/devel/protobuf-c/patches/patch-configure_ac new file mode 100644 index 000000000..8ce688151 --- /dev/null +++ b/devel/protobuf-c/patches/patch-configure_ac @@ -0,0 +1,20 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: configure.ac +--- configure.ac.orig ++++ configure.ac +@@ -76,12 +76,8 @@ AC_ARG_ENABLE([protoc], + if test "x$enable_protoc" != "xno"; then + AC_LANG_PUSH([C++]) + +- AX_CXX_COMPILE_STDCXX(11, noext, mandatory) +- +- PKG_CHECK_MODULES([protobuf], [protobuf >= 3.0.0], +- [proto3_supported=yes], +- [PKG_CHECK_MODULES([protobuf], [protobuf >= 2.6.0])] +- ) ++ AX_CXX_COMPILE_STDCXX(17, noext, mandatory) ++ PKG_CHECK_MODULES([protobuf], [protobuf >= 3.0.0], [proto3_supported=yes]) + + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$save_CPPFLAGS $protobuf_CFLAGS" diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_bytes_field_h b/devel/protobuf-c/patches/patch-protoc-c_c_bytes_field_h new file mode 100644 index 000000000..7bd7e440a --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_bytes_field_h @@ -0,0 +1,14 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_bytes_field.h +--- protoc-c/c_bytes_field.h.orig ++++ protoc-c/c_bytes_field.h +@@ -87,8 +87,6 @@ class BytesFieldGenerator : public FieldGenerator { + + private: + std::map variables_; +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(BytesFieldGenerator); + }; + + diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_enum_field_h b/devel/protobuf-c/patches/patch-protoc-c_c_enum_field_h new file mode 100644 index 000000000..3323f28b9 --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_enum_field_h @@ -0,0 +1,14 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_enum_field.h +--- protoc-c/c_enum_field.h.orig ++++ protoc-c/c_enum_field.h +@@ -85,8 +85,6 @@ class EnumFieldGenerator : public FieldGenerator { + + private: + std::map variables_; +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumFieldGenerator); + }; + + diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_enum_h b/devel/protobuf-c/patches/patch-protoc-c_c_enum_h new file mode 100644 index 000000000..2c6f86dff --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_enum_h @@ -0,0 +1,14 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_enum.h +--- protoc-c/c_enum.h.orig ++++ protoc-c/c_enum.h +@@ -106,8 +106,6 @@ class EnumGenerator { + private: + const EnumDescriptor* descriptor_; + std::string dllexport_decl_; +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumGenerator); + }; + + } // namespace c diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_extension_h b/devel/protobuf-c/patches/patch-protoc-c_c_extension_h new file mode 100644 index 000000000..c8dee6f41 --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_extension_h @@ -0,0 +1,14 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_extension.h +--- protoc-c/c_extension.h.orig ++++ protoc-c/c_extension.h +@@ -98,8 +98,6 @@ class ExtensionGenerator { + const FieldDescriptor* descriptor_; + std::string type_traits_; + std::string dllexport_decl_; +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ExtensionGenerator); + }; + + } // namespace c diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_field_h b/devel/protobuf-c/patches/patch-protoc-c_c_field_h new file mode 100644 index 000000000..7bd48375e --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_field_h @@ -0,0 +1,24 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_field.h +--- protoc-c/c_field.h.orig ++++ protoc-c/c_field.h +@@ -103,9 +103,6 @@ class FieldGenerator { + const std::string &type_macro, + const std::string &descriptor_addr) const; + const FieldDescriptor *descriptor_; +- +- private: +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGenerator); + }; + + // Convenience class which constructs FieldGenerators for a Descriptor. +@@ -121,8 +118,6 @@ class FieldGeneratorMap { + std::unique_ptr[]> field_generators_; + + static FieldGenerator* MakeGenerator(const FieldDescriptor* field); +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGeneratorMap); + }; + + } // namespace c diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_file_cc b/devel/protobuf-c/patches/patch-protoc-c_c_file_cc new file mode 100644 index 000000000..deee8d14c --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_file_cc @@ -0,0 +1,17 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_file.cc +--- protoc-c/c_file.cc.orig ++++ protoc-c/c_file.cc +@@ -119,7 +119,11 @@ void FileGenerator::GenerateHeader(io::Printer* printe + + int min_header_version = 1000000; + #if defined(HAVE_PROTO3) ++# if GOOGLE_PROTOBUF_VERSION >= 4023000 ++ if (FileDescriptorLegacy(file_).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3) { ++# else + if (file_->syntax() == FileDescriptor::SYNTAX_PROTO3) { ++#endif + min_header_version = 1003000; + } + #endif diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_file_h b/devel/protobuf-c/patches/patch-protoc-c_c_file_h new file mode 100644 index 000000000..47b1787ed --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_file_h @@ -0,0 +1,14 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_file.h +--- protoc-c/c_file.h.orig ++++ protoc-c/c_file.h +@@ -103,8 +103,6 @@ class FileGenerator { + std::unique_ptr[]> enum_generators_; + std::unique_ptr[]> service_generators_; + std::unique_ptr[]> extension_generators_; +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator); + }; + + } // namespace c diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_generator_h b/devel/protobuf-c/patches/patch-protoc-c_c_generator_h new file mode 100644 index 000000000..cbd80f414 --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_generator_h @@ -0,0 +1,15 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_generator.h +--- protoc-c/c_generator.h.orig ++++ protoc-c/c_generator.h +@@ -93,9 +93,6 @@ class PROTOC_C_EXPORT CGenerator : public CodeGenerato + const std::string& parameter, + OutputDirectory* output_directory, + std::string* error) const; +- +- private: +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CGenerator); + }; + + } // namespace c diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_helpers_h b/devel/protobuf-c/patches/patch-protoc-c_c_helpers_h new file mode 100644 index 000000000..92a02577a --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_helpers_h @@ -0,0 +1,42 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_helpers.h +--- protoc-c/c_helpers.h.orig ++++ protoc-c/c_helpers.h +@@ -70,6 +70,10 @@ + #include + #include + ++#if GOOGLE_PROTOBUF_VERSION >= 4023000 ++# include ++#endif ++ + namespace google { + namespace protobuf { + namespace compiler { +@@ -172,11 +176,25 @@ int compare_name_indices_by_name(const void*, const vo + // This wrapper is needed to be able to compile against protobuf2. + inline int FieldSyntax(const FieldDescriptor* field) { + #ifdef HAVE_PROTO3 ++# if GOOGLE_PROTOBUF_VERSION >= 4023000 ++ return FileDescriptorLegacy(field->file()).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3 ? 3 : 2; ++# else + return field->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 ? 3 : 2; ++# endif + #else + return 2; + #endif + } ++ ++// Work around changes in protobuf >= 22.x without breaking compilation against ++// older protobuf versions. ++#if GOOGLE_PROTOBUF_VERSION >= 4022000 ++# define GOOGLE_ARRAYSIZE ABSL_ARRAYSIZE ++# define GOOGLE_CHECK_EQ ABSL_CHECK_EQ ++# define GOOGLE_CHECK_EQ ABSL_CHECK_EQ ++# define GOOGLE_DCHECK_GE ABSL_DCHECK_GE ++# define GOOGLE_LOG ABSL_LOG ++#endif + + } // namespace c + } // namespace compiler diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_message_cc b/devel/protobuf-c/patches/patch-protoc-c_c_message_cc new file mode 100644 index 000000000..bdea879ac --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_message_cc @@ -0,0 +1,23 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_message.cc +--- protoc-c/c_message.cc.orig ++++ protoc-c/c_message.cc +@@ -499,7 +499,7 @@ GenerateMessageDescriptor(io::Printer* printer, bool g + // NOTE: not supported by protobuf + vars["maybe_static"] = ""; + vars["field_dv_ctype"] = "{ ... }"; +- GOOGLE_LOG(DFATAL) << "Messages can't have default values!"; ++ GOOGLE_LOG(FATAL) << "Messages can't have default values!"; + break; + case FieldDescriptor::CPPTYPE_STRING: + if (fd->type() == FieldDescriptor::TYPE_BYTES || opt.string_as_bytes()) +@@ -521,7 +521,7 @@ GenerateMessageDescriptor(io::Printer* printer, bool g + break; + } + default: +- GOOGLE_LOG(DFATAL) << "Unknown CPPTYPE"; ++ GOOGLE_LOG(FATAL) << "Unknown CPPTYPE"; + break; + } + if (!already_defined) diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_message_field_h b/devel/protobuf-c/patches/patch-protoc-c_c_message_field_h new file mode 100644 index 000000000..dcd91fa59 --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_message_field_h @@ -0,0 +1,16 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_message_field.h +--- protoc-c/c_message_field.h.orig ++++ protoc-c/c_message_field.h +@@ -82,10 +82,6 @@ class MessageFieldGenerator : public FieldGenerator { + void GenerateDescriptorInitializer(io::Printer* printer) const; + std::string GetDefaultValue(void) const; + void GenerateStaticInit(io::Printer* printer) const; +- +- private: +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageFieldGenerator); + }; + + diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_message_h b/devel/protobuf-c/patches/patch-protoc-c_c_message_h new file mode 100644 index 000000000..e39ad6747 --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_message_h @@ -0,0 +1,14 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_message.h +--- protoc-c/c_message.h.orig ++++ protoc-c/c_message.h +@@ -136,8 +136,6 @@ class MessageGenerator { + std::unique_ptr[]> nested_generators_; + std::unique_ptr[]> enum_generators_; + std::unique_ptr[]> extension_generators_; +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator); + }; + + } // namespace c diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_primitive_field_cc b/devel/protobuf-c/patches/patch-protoc-c_c_primitive_field_cc new file mode 100644 index 000000000..c3fdff61d --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_primitive_field_cc @@ -0,0 +1,14 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_primitive_field.cc +--- protoc-c/c_primitive_field.cc.orig ++++ protoc-c/c_primitive_field.cc +@@ -143,7 +143,7 @@ std::string PrimitiveFieldGenerator::GetDefaultValue() + case FieldDescriptor::CPPTYPE_BOOL: + return descriptor_->default_value_bool() ? "1" : "0"; + default: +- GOOGLE_LOG(DFATAL) << "unexpected CPPTYPE in c_primitive_field"; ++ GOOGLE_LOG(FATAL) << "unexpected CPPTYPE in c_primitive_field"; + return "UNEXPECTED_CPPTYPE"; + } + } diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_primitive_field_h b/devel/protobuf-c/patches/patch-protoc-c_c_primitive_field_h new file mode 100644 index 000000000..82d7f3ba9 --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_primitive_field_h @@ -0,0 +1,16 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_primitive_field.h +--- protoc-c/c_primitive_field.h.orig ++++ protoc-c/c_primitive_field.h +@@ -82,10 +82,6 @@ class PrimitiveFieldGenerator : public FieldGenerator + void GenerateDescriptorInitializer(io::Printer* printer) const; + std::string GetDefaultValue(void) const; + void GenerateStaticInit(io::Printer* printer) const; +- +- private: +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(PrimitiveFieldGenerator); + }; + + } // namespace c diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_service_h b/devel/protobuf-c/patches/patch-protoc-c_c_service_h new file mode 100644 index 000000000..3eb792662 --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_service_h @@ -0,0 +1,14 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_service.h +--- protoc-c/c_service.h.orig ++++ protoc-c/c_service.h +@@ -100,8 +100,6 @@ class ServiceGenerator { + + const ServiceDescriptor* descriptor_; + std::map vars_; +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ServiceGenerator); + }; + + } // namespace c diff --git a/devel/protobuf-c/patches/patch-protoc-c_c_string_field_h b/devel/protobuf-c/patches/patch-protoc-c_c_string_field_h new file mode 100644 index 000000000..cada74792 --- /dev/null +++ b/devel/protobuf-c/patches/patch-protoc-c_c_string_field_h @@ -0,0 +1,14 @@ +https://github.com/protobuf-c/protobuf-c/pull/673 + +Index: protoc-c/c_string_field.h +--- protoc-c/c_string_field.h.orig ++++ protoc-c/c_string_field.h +@@ -87,8 +87,6 @@ class StringFieldGenerator : public FieldGenerator { + + private: + std::map variables_; +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StringFieldGenerator); + }; + + diff --git a/devel/qt-creator/Makefile b/devel/qt-creator/Makefile index ae54f4b33..d8d9cd291 100644 --- a/devel/qt-creator/Makefile +++ b/devel/qt-creator/Makefile @@ -5,7 +5,7 @@ COMMENT = cross-platform IDE for use with Qt V = 8.0.2 DISTNAME = qt-creator-opensource-src-${V} PKGNAME = qt-creator-${V} -REVISION = 4 +REVISION = 5 SHARED_LIBS += Aggregation 1.1 # 0.0 SHARED_LIBS += CPlusPlus 6.0 # 0.0 @@ -96,9 +96,7 @@ MODCMAKE_LDFLAGS += -lc pre-configure: cd ${WRKSRC}; sed -i 's,"gdb","egdb",g' ${GDB_ADJ_FILES} # use system qbs/syntax-highlighting (qtcreator.pro) - rm -rf ${WRKSRC}/src/shared/qbs \ - ${WRKSRC}/cmake/Findyaml-cpp.cmake \ - + rm -rf ${WRKSRC}/src/shared/qbs post-install: .for _l _v in ${SHARED_LIBS} diff --git a/devel/qt-creator/patches/patch-cmake_Findyaml-cpp_cmake b/devel/qt-creator/patches/patch-cmake_Findyaml-cpp_cmake new file mode 100644 index 000000000..0ad494a52 --- /dev/null +++ b/devel/qt-creator/patches/patch-cmake_Findyaml-cpp_cmake @@ -0,0 +1,30 @@ +ClangTools: Add support for yaml-cpp 0.8 + +They renamed their target from `yaml-cpp` +to `yaml-cpp::yaml-cpp` + +Still support < 0.8 though. + +Fixes: QTCREATORBUG-29537 +Change-Id: Iafa6e75998f0120610542b4c744b205aee3392a3 + +Index: cmake/Findyaml-cpp.cmake +--- cmake/Findyaml-cpp.cmake.orig ++++ cmake/Findyaml-cpp.cmake +@@ -15,7 +15,15 @@ if (yaml-cpp_FOUND) + unset(yaml_cpp_include_dir CACHE) + find_path(yaml_cpp_include_dir yaml-cpp/yaml.h) + endif() +- set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}") ++ if(TARGET yaml-cpp::yaml-cpp) ++ # yaml-cpp >= 0.8 ++ set_property(TARGET yaml-cpp::yaml-cpp PROPERTY IMPORTED_GLOBAL TRUE) ++ add_library(yaml-cpp ALIAS yaml-cpp::yaml-cpp) ++ set(yaml-cpp_TARGET yaml-cpp::yaml-cpp) ++ else() ++ set(yaml-cpp_TARGET yaml-cpp) ++ endif() ++ set_target_properties(${yaml-cpp_TARGET} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}") + else() + if(TARGET yaml-cpp) + return() diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index 76c65f4f1..91d6d027b 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -3,7 +3,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-6.150 +PKGNAME = quirks-6.152 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index 2a94a2d66..f908070c9 100644 --- a/devel/quirks/files/Quirks.pm +++ b/devel/quirks/files/Quirks.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: Quirks.pm,v 1.1546 2023/09/07 03:48:53 thfr Exp $ +# $OpenBSD: Quirks.pm,v 1.1548 2023/09/16 09:29:16 rsadowski Exp $ # # Copyright (c) 2009 Marc Espie # @@ -783,6 +783,7 @@ my $stem_extensions = { 'scons-py2' => 'scons', 'qxlsx' => 'qt5-qxlsx', 'py-altgraph' => 'py3-altgraph', + 'pymodbus' => 'py3-pymodbus', }; my $obsolete_reason = {}; @@ -1845,6 +1846,7 @@ setup_obsolete_reason( 3 => 'botan', 3 => 'bg5ps', 9 => 'haxe', + 1 => 'libxcvt', ); # though it's not yet used, these should be pkgnames, so that eventually diff --git a/devel/sdl2-ttf/Makefile b/devel/sdl2-ttf/Makefile index ca588e7c1..824590484 100644 --- a/devel/sdl2-ttf/Makefile +++ b/devel/sdl2-ttf/Makefile @@ -2,7 +2,7 @@ V = 2.20.2 COMMENT = SDL2 TrueType fonts library DISTNAME = SDL2_ttf-${V} PKGNAME = sdl2-ttf-${V} -REVISION = 0 +REVISION = 1 CATEGORIES = devel graphics fonts SHARED_LIBS += SDL2_ttf 0.1 # 10.2 @@ -25,4 +25,6 @@ LIB_DEPENDS = devel/sdl2 SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu +pre-configure: + ${SUBST_CMD} ${WRKSRC}/sdl2_ttf-config.cmake.in .include diff --git a/devel/sdl2-ttf/patches/patch-sdl2_ttf-config_cmake_in b/devel/sdl2-ttf/patches/patch-sdl2_ttf-config_cmake_in new file mode 100644 index 000000000..a92e0bbaf --- /dev/null +++ b/devel/sdl2-ttf/patches/patch-sdl2_ttf-config_cmake_in @@ -0,0 +1,12 @@ +Index: sdl2_ttf-config.cmake.in +--- sdl2_ttf-config.cmake.in.orig ++++ sdl2_ttf-config.cmake.in +@@ -55,7 +55,7 @@ if(NOT TARGET SDL2_ttf::SDL2_ttf) + unset(_sdl2ttf_dll) + unset(_sdl2ttf_imp) + else() +- set(_sdl2ttf_shl "${_sdl2ttf_libdir}/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2_ttf${CMAKE_SHARED_LIBRARY_SUFFIX}") ++ set(_sdl2ttf_shl "${_sdl2ttf_libdir}/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2_ttf${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIBSDL2_ttf_VERSION}") + if(EXISTS "${_sdl2ttf_shl}") + add_library(SDL2_ttf::SDL2_ttf SHARED IMPORTED) + set_target_properties(SDL2_ttf::SDL2_ttf diff --git a/devel/sqlc/Makefile b/devel/sqlc/Makefile index e4f3256de..fa2b859ac 100644 --- a/devel/sqlc/Makefile +++ b/devel/sqlc/Makefile @@ -3,8 +3,11 @@ ONLY_FOR_ARCHS = aarch64 amd64 COMMENT = create type safe go from SQL -MODGO_MODNAME = github.com/kyleconroy/sqlc -MODGO_VERSION = v1.15.0 +# 1.21.0 hits https://github.com/sqlc-dev/sqlc/issues/2726 +MODGO_MODNAME = github.com/sqlc-dev/sqlc +MODGO_VERSION = v1.20.0 +HOMEPAGE = https://sqlc.dev/ +PORTROACH = site:https://github.com/sqlc-dev/sqlc/releases/ DISTNAME = sqlc-${MODGO_VERSION} @@ -16,7 +19,7 @@ PERMIT_PACKAGE = Yes WANTLIB += c pthread MODULES = lang/go -MODGO_LDFLAGS = -X "github.com/kyleconroy/sqlc/internal/cmd.version=${MODGO_VERSION}" +MODGO_LDFLAGS = -X "github.com/sqlc-dev/sqlc/internal/cmd.version=${MODGO_VERSION}" NO_TEST = Yes diff --git a/devel/sqlc/distinfo b/devel/sqlc/distinfo index 3bbb2a959..6ac18f815 100644 --- a/devel/sqlc/distinfo +++ b/devel/sqlc/distinfo @@ -1,13 +1,26 @@ +SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.19.1.mod) = 9RfF0Dh/zS8oHGgkYReqyiILXJvFbxk+mk2faCqZ8jI= +SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.19.1.zip) = gCLK5nzK4zVvQiYt03IOfqlZrUA01O2YLQmx8d6vVjE= +SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.mod) = ABGpCmT7GqppqtQm/orJyeWjfkthmnvQTUCQlTZatIg= +SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.zip) = KShk29Cx3jepaOKF6UmIXlczhIN9gc02lb5c4uI5GIc= SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v0.3.1.mod) = KAIbQYClnDmTYHqVsY4jDdC8a+pSQv/o6ou/tPT3tNc= SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v0.3.1.zip) = gVxuWUdF8tiEL/mksFacZpXmzf1eB+Wz2Y0GtyykHjw= SHA256 (go_modules/github.com/!masterminds/semver/v3/@v/v3.1.1.mod) = DCK/ZFCN4IPcHolZNc/9kYjKVGrwgkTi8LeiHp6gI+Q= SHA256 (go_modules/github.com/!masterminds/semver/v3/@v/v3.1.1.zip) = CkbHQD3+2gmwgh6FH44c7I8epCdigeQuo5naW8W/BwQ= -SHA256 (go_modules/github.com/antlr/antlr4/runtime/!go/antlr/@v/v0.0.0-20220626175859-9abda183db8e.mod) = K9U0s0ODThbCTTE0suWLIXmEsh6eJOHsBnZJQXzJUsI= -SHA256 (go_modules/github.com/antlr/antlr4/runtime/!go/antlr/@v/v0.0.0-20220626175859-9abda183db8e.zip) = mjBw8XCxRDVxfaSbopnBPqCFopvcrpS7pVDTuP9v2Fo= +SHA256 (go_modules/github.com/antlr/antlr4/runtime/!go/antlr/v4/@v/v4.0.0-20230305170008-8188dc5388df.mod) = Ih/xxQdh/x/tX2i65AWtEtLu5Ug9jO124bz65vjUQwU= +SHA256 (go_modules/github.com/antlr/antlr4/runtime/!go/antlr/v4/@v/v4.0.0-20230321174746-8dcc6526cfb1.mod) = Ih/xxQdh/x/tX2i65AWtEtLu5Ug9jO124bz65vjUQwU= +SHA256 (go_modules/github.com/antlr/antlr4/runtime/!go/antlr/v4/@v/v4.0.0-20230321174746-8dcc6526cfb1.zip) = elKqlV78sjggfSK8CBI5GWIvJtkiHVGZuwhZlp1Hcbg= SHA256 (go_modules/github.com/benbjohnson/clock/@v/v1.1.0.mod) = G1p4mwlRuF91r2zJmyS44pM1CaTj+T8FSDGBkgWIvjE= SHA256 (go_modules/github.com/benbjohnson/clock/@v/v1.1.0.zip) = 0E5EHX9Xf3hh23IwVHgQXcdf1wMDB6D6Ml4yhQAoNEU= -SHA256 (go_modules/github.com/bytecodealliance/wasmtime-go/@v/v0.39.0.mod) = gAVkZIiNbxf20Soqm4Tx+i9a4CblplMCkoM7BaQdM4U= -SHA256 (go_modules/github.com/bytecodealliance/wasmtime-go/@v/v0.39.0.zip) = Fu3jZXajD/zirdOyqj1EfWwSXolipfbwL6jSAHVP2M0= +SHA256 (go_modules/github.com/bytecodealliance/wasmtime-go/v8/@v/v8.0.0.mod) = 5IcmYXSH30TVIAkgUqG8ck4Y5TpLOm5itbwN0PX8+Q4= +SHA256 (go_modules/github.com/bytecodealliance/wasmtime-go/v8/@v/v8.0.0.zip) = vn+PXfUUd7Rp5he44b+hr3OA3pkrxsxNUbI5E3Ne8o4= +SHA256 (go_modules/github.com/census-instrumentation/opencensus-proto/@v/v0.4.1.mod) = Yb98TmYveO0zUgjwhdRBydyqFbab3w7Hhu0GoSMCswM= +SHA256 (go_modules/github.com/census-instrumentation/opencensus-proto/@v/v0.4.1.zip) = b85mt9zSy6Ax7Z1z131rIcL+dJxd4ny7QWotLMHGhxk= +SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.2.0.mod) = oJD46q9ZzCrfFjKZ6+/nl+Hco/at0sjoimo7kLpTiwI= +SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.2.0.zip) = /BgM2wwA+/+9Obd0pyzbXwwyrOJTcNUTUZWRiow/vSU= +SHA256 (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20220112060539-c52dc94e7fbe.mod) = oO1tXDcKFHNnG4sOKIurF13+tkp69c4vyYdLE5rqAgc= +SHA256 (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20220112060539-c52dc94e7fbe.zip) = j+FYXyXUCl481CQ6khQ9ca5O6S6RXnGS5yOHBHU5Q44= +SHA256 (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20230607035331-e9ce68804cb4.mod) = OnJc+6NYLl390r2tlmLg/KPK3YqRu8sbSEJRUm9KyFc= +SHA256 (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20230607035331-e9ce68804cb4.zip) = oMbmbq3jV67aTtqp0JYSCFhg3EwLRO34ImV0k5vfYJE= SHA256 (go_modules/github.com/cockroachdb/apd/@v/v1.1.0.mod) = RuyeJ64NbrQW6wLiGetgl0dGE2I1j8F88y0bw/kpoNo= SHA256 (go_modules/github.com/cockroachdb/apd/@v/v1.1.0.zip) = /vfsL64iD4S/rLF/v8GwSmZqt/b8BPP/bSseBcOAd30= SHA256 (go_modules/github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod) = 3OsXLqsILMpqkxB9n73eWOHSE/yrG7gSd8WNpzgXfc0= @@ -17,6 +30,8 @@ SHA256 (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.mod) = FMOvou9iNVX SHA256 (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.zip) = cKfmCYCc8qksVTUQTbXrgtdcVL/P7S0iTofdL9lyn2I= SHA256 (go_modules/github.com/creack/pty/@v/v1.1.7.mod) = XsMdMbaMi5hU4SHgnVeUROt3CLK4FaB4v6RSwuJbexQ= SHA256 (go_modules/github.com/creack/pty/@v/v1.1.7.zip) = 5+o0A3hNGGrvvoTK7ZWPjLoucqBPMM2ykezhm+w5yPM= +SHA256 (go_modules/github.com/cubicdaiya/gonp/@v/v1.0.4.mod) = pH3kap8bu8/5zfIi2GnAmOXRExRlWAh08GDlWd8j+ys= +SHA256 (go_modules/github.com/cubicdaiya/gonp/@v/v1.0.4.zip) = 5z3LnZ7QC22Lgw1U8WIK52y0Z6JUwWXPyRI40i6pjJA= SHA256 (go_modules/github.com/cznic/mathutil/@v/v0.0.0-20181122101859-297441e03548.mod) = WclyTnlmboXVIGIayCYG5de1nXO/XWUMcjlU8q4wWJE= SHA256 (go_modules/github.com/cznic/mathutil/@v/v0.0.0-20181122101859-297441e03548.zip) = j2mjb2DYheARsKkLkSRqfogiPLKIPcbnHqs/QtZTIxs= SHA256 (go_modules/github.com/cznic/sortutil/@v/v0.0.0-20181122101858-f5f958428db8.mod) = itwWx3ly+9x1tGcJTHD8guvir3OPdbQVWoMbYGH9hKc= @@ -26,16 +41,23 @@ SHA256 (go_modules/github.com/cznic/strutil/@v/v0.0.0-20171016134553-529a34b1c18 SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.0.mod) = vLKTkyUSN7eaF7bBm/KRNPQ+j0OMMZiYj81GGhzfBcw= SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.mod) = vLKTkyUSN7eaF7bBm/KRNPQ+j0OMMZiYj81GGhzfBcw= SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.zip) = a0SoQ5UfNxtwEMdU7MPKvv6BXVztHFuUCfstaX6KiQ0= +SHA256 (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.11.1-0.20230524094728-9239064ad72f.mod) = Jo7S5xsErXu7CPLHgeoRjB5Gqrxo/izQC9GGmLlAoIg= +SHA256 (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.11.1-0.20230524094728-9239064ad72f.zip) = aCWt2znF4ebcTILV66TJUDpr5v0DX0wW3o61MW4UqBs= +SHA256 (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v0.10.1.mod) = RLmVGQPHFPQA8dIo7Qy43HYZNUjWNGukkOO1SP681iA= +SHA256 (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v0.10.1.zip) = 2YA8oJ1zKhXZlPFu8pf5AUluiGHqv75r36ANKA8dYI8= SHA256 (go_modules/github.com/go-kit/log/@v/v0.1.0.mod) = MQ5J162uiKtjKZmksiW+M2CmSsErapdpFLVC5kJWpBo= SHA256 (go_modules/github.com/go-kit/log/@v/v0.1.0.zip) = 4Gdt9zV2VKAAAI3607ayEcujWV8y0+Ig7dY6TJ0NklQ= SHA256 (go_modules/github.com/go-logfmt/logfmt/@v/v0.5.0.mod) = 4j0g0NnR5y4ELG4jQZW5+O9WIdp/i5hg1qMY15nJYNE= SHA256 (go_modules/github.com/go-logfmt/logfmt/@v/v0.5.0.zip) = Waa1muPahPelg3OETKjSmPUAfODhc0N/yFwm1Px2yos= SHA256 (go_modules/github.com/go-sql-driver/mysql/@v/v1.6.0.mod) = c9P9R6q2sN5RpE3yf+seOBuRQGDaMYrtP+1kYoBHSgg= -SHA256 (go_modules/github.com/go-sql-driver/mysql/@v/v1.6.0.zip) = B/BSuPP7TBu4yq8v25XA8T5CYccklKFpAHKK+fLu5wY= +SHA256 (go_modules/github.com/go-sql-driver/mysql/@v/v1.7.1.mod) = zuv0fh5pqw0f3a6F0M30slJpnyNvOg5VYGMF0sEuyk0= +SHA256 (go_modules/github.com/go-sql-driver/mysql/@v/v1.7.1.zip) = XTQ2yv5dFH0fVsymkX8VWw4ze31d+fL4uL4zWEp7Hi0= SHA256 (go_modules/github.com/go-stack/stack/@v/v1.8.0.mod) = WRVSp8pfQ1HZvva4aPLYWmHqAoJxRCWB9fSH3O0ZYSk= SHA256 (go_modules/github.com/go-stack/stack/@v/v1.8.0.zip) = eMJmfHEPgRMHA4Y0/6Q69EJhms/q8e+1k6pODe2d9I8= SHA256 (go_modules/github.com/gofrs/uuid/@v/v4.0.0+incompatible.mod) = 97Z+rXQeLZZFdA0cfveybeRvZw7ST9w5kJbvAR3AfVc= SHA256 (go_modules/github.com/gofrs/uuid/@v/v4.0.0+incompatible.zip) = jK2v2prqGX00iY1pRWkhc6wdir87VZxOWlmld/xg9V4= +SHA256 (go_modules/github.com/golang/glog/@v/v1.1.0.mod) = w/83RXwr4BIcrZMN4GLCwxQUn9LbtJ8wE6XkTOedcV0= +SHA256 (go_modules/github.com/golang/glog/@v/v1.1.0.zip) = ZovrXdkjN4sA/aS6DZZQAPPyWb5boF69NBopSejyDbY= SHA256 (go_modules/github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod) = eMlZE67p3+vR6E+Lhi6YuxhI0dPp8iqvkJxO9PfnKT0= SHA256 (go_modules/github.com/golang/protobuf/@v/v1.4.0-rc.1.mod) = 6zhu0Yu41gkpdFJL0M2mEK2HvuGkSFyfAbzLcT59qx4= SHA256 (go_modules/github.com/golang/protobuf/@v/v1.4.0-rc.2.mod) = 4mIgSLls2HFzvZrrgBoQEIB6QS6JUpUJ6aUJnx/GmrQ= @@ -44,18 +66,24 @@ SHA256 (go_modules/github.com/golang/protobuf/@v/v1.4.0.mod) = DQkveqKHf+ueVa7iZ SHA256 (go_modules/github.com/golang/protobuf/@v/v1.4.2.mod) = S/WIXR69xtJwlYN5p0HNO096ygFuh02OixBZEQ3+nhU= SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.0.mod) = c4y7HelrZ6YjisO4CBzYsb+w2uvPbJu+jL221zuuzRk= SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.2.mod) = fI52EFJ6/Xckx+i36EPxMrDbYejJ3UncWJ1DDokpvMQ= -SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.2.zip) = XRyBe+vBICqztCpBjlhOAAjoAnuvISzmnCrj6ee4xks= +SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.3.mod) = fI52EFJ6/Xckx+i36EPxMrDbYejJ3UncWJ1DDokpvMQ= +SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.3.zip) = k72m6I1KCkk6mLSB3mehAACnVdFfFqgAtJprltG9b4E= +SHA256 (go_modules/github.com/google/cel-go/@v/v0.17.1.mod) = SeDffA8/ZJQVBEj6PkUP76+YrEGWRu2fRhwJmk76zZE= +SHA256 (go_modules/github.com/google/cel-go/@v/v0.17.1.zip) = ZeVgDM3mp9sYDHvmYihsrSC8u63mBK4ZYFWnniaEDkM= SHA256 (go_modules/github.com/google/go-cmp/@v/v0.3.0.mod) = gd95F8Ilqdp2BLIw2VL6J4xgqIMsENeZOF0TSwXVsIc= SHA256 (go_modules/github.com/google/go-cmp/@v/v0.3.1.mod) = gd95F8Ilqdp2BLIw2VL6J4xgqIMsENeZOF0TSwXVsIc= SHA256 (go_modules/github.com/google/go-cmp/@v/v0.4.0.mod) = QDarVjaqQr0xMpbNO/y0yIkSdgxWqeZlWuQi2HZ8gNo= SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.1.mod) = QDarVjaqQr0xMpbNO/y0yIkSdgxWqeZlWuQi2HZ8gNo= SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.5.mod) = QDarVjaqQr0xMpbNO/y0yIkSdgxWqeZlWuQi2HZ8gNo= SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.8.mod) = 58dmnUod1Ym6PgJLon9D8pPbYR/gdc4g17iENw1j/r0= -SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.8.zip) = 0XV01abqn2Bu1zURcXDgKu/C8R+K4V44mO2Z0lW0bwY= +SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.9.mod) = 58dmnUod1Ym6PgJLon9D8pPbYR/gdc4g17iENw1j/r0= +SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.9.zip) = MkUIdKx1bvXUf2uBkwUQUwS5gZBFoW4/EFKJt88lLFE= SHA256 (go_modules/github.com/google/renameio/@v/v0.1.0.mod) = uptesIeACKiR4WsIwXkisD+Sx2oD57/hgyY16tocGjU= SHA256 (go_modules/github.com/google/renameio/@v/v0.1.0.zip) = uFELs0B4aRoguOSQLTca/g6xcbLa+VP2fLOWDRkmzPM= -SHA256 (go_modules/github.com/inconshreveable/mousetrap/@v/v1.0.0.mod) = OR2uvJOw35u4momxS/pgJo2eueJ2I+xBUEGrq6vdAFw= -SHA256 (go_modules/github.com/inconshreveable/mousetrap/@v/v1.0.0.zip) = w/oIE+ePXO8Q3A6ZEsQ+aOBv+XCpjpjEBQ/hTbv9GMc= +SHA256 (go_modules/github.com/google/uuid/@v/v1.3.0.mod) = c9pHtjOLAKCC/UUao1oyc9OtwJuOm7qY2rAQkeQCr24= +SHA256 (go_modules/github.com/google/uuid/@v/v1.3.0.zip) = Cl/MBepJKv6sqYSgEkhfahXiJZsy8SBtbzaojIivxgc= +SHA256 (go_modules/github.com/inconshreveable/mousetrap/@v/v1.1.0.mod) = HBsVkRqooL1c0PZnDsI9EIZJbzYV/fUzBq/ytHbOm+E= +SHA256 (go_modules/github.com/inconshreveable/mousetrap/@v/v1.1.0.zip) = UmZ03mJNfbEIz+dlPvEQzN/Ze8hQJiVCJIFVZ5KO0kM= SHA256 (go_modules/github.com/jackc/chunkreader/@v/v1.0.0.mod) = tPmEKzKtXB890DTWfhRc9X1zYWX4XxzTdJYRHj6snJo= SHA256 (go_modules/github.com/jackc/chunkreader/@v/v1.0.0.zip) = 4gTJF+JlL/4Ef1yLAxGSdXMh9WhlTj34QIvwQXjfFAg= SHA256 (go_modules/github.com/jackc/chunkreader/v2/@v/v2.0.0.mod) = vTI2vUsdZoM3Gh1qSuTIJVZSiQRhIqyjGPa+MFNLD+0= @@ -64,8 +92,9 @@ SHA256 (go_modules/github.com/jackc/chunkreader/v2/@v/v2.0.1.zip) = bj9LfZZH8xBh SHA256 (go_modules/github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod) = 1a54qyVDjuqiK9sj3we3wlkUdPteg7kC1yli1k0Ohu0= SHA256 (go_modules/github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod) = TGmJbh7yaTthUPc/JuoiPvpEqrkaXtjZnCCwHSJ3K/8= SHA256 (go_modules/github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod) = Wmx+awVy10JSbuL7Ef0QIFMdR19JETO509EAAwejNEI= -SHA256 (go_modules/github.com/jackc/pgconn/@v/v1.12.1.mod) = Nq3z3LWI0bcHhCWZZr6yLsUIC3plY5P11rBArhh3HIs= -SHA256 (go_modules/github.com/jackc/pgconn/@v/v1.12.1.zip) = SNNAZKH6z/d2ZxPZIkUC5zdqXZDBUG+Zo3xXv86vljY= +SHA256 (go_modules/github.com/jackc/pgconn/@v/v1.14.0.mod) = DoBvsArAOI+b6wauAT3NqkZ9lxnvqLCkynrwtM4Wt9Q= +SHA256 (go_modules/github.com/jackc/pgconn/@v/v1.14.1.mod) = DoBvsArAOI+b6wauAT3NqkZ9lxnvqLCkynrwtM4Wt9Q= +SHA256 (go_modules/github.com/jackc/pgconn/@v/v1.14.1.zip) = aojemqibMwHQQm+sN+SC8M7aNPmIOt2lx8MMa5RqmIs= SHA256 (go_modules/github.com/jackc/pgconn/@v/v1.8.0.mod) = We8sa+X239r2Rfi8Ov/2p21tWpydIm1pViaLAHudaa0= SHA256 (go_modules/github.com/jackc/pgconn/@v/v1.9.0.mod) = PPCGiAUQ9+yVAGImuQ1WBbjeZUFyqpnvx6YEdsLhZPc= SHA256 (go_modules/github.com/jackc/pgconn/@v/v1.9.1-0.20210724152538-d89c8390a530.mod) = iN6PiyIT0wZw3JNcwdV6V0jSbzMC8j4CEQ+sn7H+1GQ= @@ -85,27 +114,32 @@ SHA256 (go_modules/github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4 SHA256 (go_modules/github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod) = CuMxtobOZDYDbkY0bwgPGAi4xpCNDH0IQPj28Amu3T8= SHA256 (go_modules/github.com/jackc/pgproto3/v2/@v/v2.0.6.mod) = o7JEtibUybYoBm6NK91ZE5XcmGPqWUxeRcQIZ+Og+fU= SHA256 (go_modules/github.com/jackc/pgproto3/v2/@v/v2.1.1.mod) = o7JEtibUybYoBm6NK91ZE5XcmGPqWUxeRcQIZ+Og+fU= -SHA256 (go_modules/github.com/jackc/pgproto3/v2/@v/v2.3.0.mod) = o7JEtibUybYoBm6NK91ZE5XcmGPqWUxeRcQIZ+Og+fU= -SHA256 (go_modules/github.com/jackc/pgproto3/v2/@v/v2.3.0.zip) = a3AsNy4TUgY2JD075Ykilo8GMLZ+I7p3Mm727kytpGM= +SHA256 (go_modules/github.com/jackc/pgproto3/v2/@v/v2.3.2.mod) = o7JEtibUybYoBm6NK91ZE5XcmGPqWUxeRcQIZ+Og+fU= +SHA256 (go_modules/github.com/jackc/pgproto3/v2/@v/v2.3.2.zip) = 5rr6XDUiU0VXqBj1aTnd57SWxmaaXbmnSgyRq1KQYSw= SHA256 (go_modules/github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod) = qPRn3v79TXZVqLvOD/k8Z0COnhTMipXZAVM4dw7NUeE= -SHA256 (go_modules/github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip) = hCKiW50rC+BcZu4cz9uqsUTOmPGsZ4vGRwZMVg1M1uI= +SHA256 (go_modules/github.com/jackc/pgservicefile/@v/v0.0.0-20221227161230-091c0ba34f0a.mod) = X3ARG4ksF+7Oxvl+DNlhzDkitdrs5ZwJnIVeEGLtAnc= +SHA256 (go_modules/github.com/jackc/pgservicefile/@v/v0.0.0-20221227161230-091c0ba34f0a.zip) = H4vfdbKg11DlbCqUsdGwtb5LKdbfBWrr2ZcWLCm/2Ks= SHA256 (go_modules/github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod) = 9Ju2uWNDB+WqpJwNvQisWhH+seTkWY9wNxH9Ohb8TAU= SHA256 (go_modules/github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod) = 1gUe8UwnHdg+ez2d9v9xr4C+TA7a9HDaKLrG9GG/9ek= SHA256 (go_modules/github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod) = RqsMh0nC4z0L/iHLoIQKpHNIU81xfAS8UpeW1UxITl0= -SHA256 (go_modules/github.com/jackc/pgtype/@v/v1.11.0.mod) = 8hVo3O4HvrS29J6G2Rcd3SiEqZlyj7VI2yq/WQNvrqY= -SHA256 (go_modules/github.com/jackc/pgtype/@v/v1.11.0.zip) = aiV7gcC9OG1iQSGaFOvUHVdKAq6us5QmcMBkQbhk3K0= +SHA256 (go_modules/github.com/jackc/pgtype/@v/v1.14.0.mod) = 8hVo3O4HvrS29J6G2Rcd3SiEqZlyj7VI2yq/WQNvrqY= +SHA256 (go_modules/github.com/jackc/pgtype/@v/v1.14.0.zip) = fmf1uUTL1AECXGRz5iTvYe0Zbj7Q937UN7BiHPggwMk= SHA256 (go_modules/github.com/jackc/pgtype/@v/v1.8.1-0.20210724151600-32e20a603178.mod) = 7NBhFGheY9rOirAXrNDL2sbrRoAdQTdMoAxWAPEJYD4= SHA256 (go_modules/github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod) = gLtPcbiZUAPDfOltSqGugIAVD4QZ7qgA6b+tsfOge10= SHA256 (go_modules/github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod) = hC8Xdm9DkNKlhCJXZDu43QtVjiyBj99xoFq0QTMu6rQ= SHA256 (go_modules/github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod) = gGkiaAp6S4kYLZEmT7uOY071bA1zn7XJ0oTQioXjuUg= SHA256 (go_modules/github.com/jackc/pgx/v4/@v/v4.12.1-0.20210724153913-640aa07df17c.mod) = XftdWUt2HCcFAroJQvcRZRBSEc+s5PNqXHDLkWaajPw= -SHA256 (go_modules/github.com/jackc/pgx/v4/@v/v4.16.1.mod) = eIAeeVMZVPmVcUhYVWTj5xAWEFdIEOUPWVv2fFn/HKg= -SHA256 (go_modules/github.com/jackc/pgx/v4/@v/v4.16.1.zip) = w6Fppo/w5W+fge7k3k0v0qXsf01r4VkVkyX0hjyAvRA= +SHA256 (go_modules/github.com/jackc/pgx/v4/@v/v4.18.1.mod) = JpZ1n0LyIK90UJ0xiIlZaRBibphIFkv3k70Tr8EoMmg= +SHA256 (go_modules/github.com/jackc/pgx/v4/@v/v4.18.1.zip) = XKksW/WJednpePa4SeAusxnSWHVlN1/odaKdENhM+tw= +SHA256 (go_modules/github.com/jackc/pgx/v5/@v/v5.4.2.mod) = St7Dj86EqP0S6dxjHR28pkh9Ryj/gWV00VjhvlW6WjI= +SHA256 (go_modules/github.com/jackc/pgx/v5/@v/v5.4.2.zip) = GY7rrH6HW1FhYJD+LjaU5vJ+M1r8w8R66ZkUl63n9So= SHA256 (go_modules/github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod) = X8mfonP8XKyD9KV9c7aQdp7cQbWjQj4wxR+NKDi2zqI= SHA256 (go_modules/github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod) = X8mfonP8XKyD9KV9c7aQdp7cQbWjQj4wxR+NKDi2zqI= SHA256 (go_modules/github.com/jackc/puddle/@v/v1.1.3.mod) = X8mfonP8XKyD9KV9c7aQdp7cQbWjQj4wxR+NKDi2zqI= -SHA256 (go_modules/github.com/jackc/puddle/@v/v1.2.1.mod) = X8mfonP8XKyD9KV9c7aQdp7cQbWjQj4wxR+NKDi2zqI= -SHA256 (go_modules/github.com/jackc/puddle/@v/v1.2.1.zip) = QNc1UGhmZusfbfArZQCLKkyYz+0SVNxIZubr6V+8XJU= +SHA256 (go_modules/github.com/jackc/puddle/@v/v1.3.0.mod) = X8mfonP8XKyD9KV9c7aQdp7cQbWjQj4wxR+NKDi2zqI= +SHA256 (go_modules/github.com/jackc/puddle/@v/v1.3.0.zip) = setCuzz5pDAUavecsYOGC53d/KUYRMLUtEfcL0O+zFU= +SHA256 (go_modules/github.com/jackc/puddle/v2/@v/v2.2.0.mod) = sr6PQ3/fXFUFIsi8piGUwsGvsiGym7+YTbBZnTPFUiQ= +SHA256 (go_modules/github.com/jackc/puddle/v2/@v/v2.2.0.zip) = uZ6pXfDAKYyvK+eGyeulEb/eIEbsz6oG6Js+Rgq0BrA= SHA256 (go_modules/github.com/jinzhu/inflection/@v/v1.0.0.mod) = uuDj/QZt58y7X8C66TlblH8tZK/ujGHxwA5GIcfNn6k= SHA256 (go_modules/github.com/jinzhu/inflection/@v/v1.0.0.zip) = zxCHpvZlPtXzZvhc8BELu/WB1Om8ik0am1Z2XZS1RsM= SHA256 (go_modules/github.com/kisielk/gotool/@v/v1.0.0.mod) = d6ynv/wOwp/J8IjVliqzEo9AXXsQx865aT/3oIlYlV0= @@ -114,8 +148,8 @@ SHA256 (go_modules/github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1. SHA256 (go_modules/github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod) = a2na/Tz2TXtX6XiEin4nGivgoE2aJWTdJVZJHSfQoDQ= SHA256 (go_modules/github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip) = TQDXG43mC8r0VPj4ZyEOvNBedcCnwnJZBPcaovIPsI4= SHA256 (go_modules/github.com/kr/pretty/@v/v0.1.0.mod) = 49XUbS9qyUpmalS16GfsFr8ZnZ9LcAgnzXMWB+/dEJo= -SHA256 (go_modules/github.com/kr/pretty/@v/v0.2.1.mod) = wq4ovVu46PkHaVUSZ2irehR5Ut7qn9vLNzxTzBiHD4I= -SHA256 (go_modules/github.com/kr/pretty/@v/v0.2.1.zip) = gK8EUgggUtGzJl18uJhdRk1L4iLCfhRljpVjLCInYeU= +SHA256 (go_modules/github.com/kr/pretty/@v/v0.3.0.mod) = Qud4TgS5ZSWGtfne3/b5UYN2t0V2Gp/RoMIXjrhtyXo= +SHA256 (go_modules/github.com/kr/pretty/@v/v0.3.0.zip) = OsZeGF+VbYidd0hRc/rcww6Vm2vP2qisr67F9NrFzUg= SHA256 (go_modules/github.com/kr/pty/@v/v1.1.1.mod) = baTJxzZERolOXvh34Z+YXNUdZxzm6PTKh4YrRJ9t1/Y= SHA256 (go_modules/github.com/kr/pty/@v/v1.1.8.mod) = hP0yFnYKGX5yw3mSJJViVMULksIcFGhS9u9PV4Xj8V0= SHA256 (go_modules/github.com/kr/pty/@v/v1.1.8.zip) = 1m5vvGXnciiaf/jFirLN+4hiUwU7DOoRujyhc4sta8Y= @@ -124,8 +158,8 @@ SHA256 (go_modules/github.com/kr/text/@v/v0.1.0.zip) = k2OkyPHzOHo2AU3lG0d7gxoTm SHA256 (go_modules/github.com/lib/pq/@v/v1.0.0.mod) = TIrIOpiVeYUwFf3mEuZWOybLZ9G5N2SbvgoYd6wkkRQ= SHA256 (go_modules/github.com/lib/pq/@v/v1.1.0.mod) = TIrIOpiVeYUwFf3mEuZWOybLZ9G5N2SbvgoYd6wkkRQ= SHA256 (go_modules/github.com/lib/pq/@v/v1.10.2.mod) = lMFIhoiyuYIqluE3XjIAKmUswa7nFSD2v6h77I63nAY= -SHA256 (go_modules/github.com/lib/pq/@v/v1.10.6.mod) = lMFIhoiyuYIqluE3XjIAKmUswa7nFSD2v6h77I63nAY= -SHA256 (go_modules/github.com/lib/pq/@v/v1.10.6.zip) = ckfcQoS7Vy3Yuzkyqxv4o96VOIKt4YwxokCDivjHPuk= +SHA256 (go_modules/github.com/lib/pq/@v/v1.10.9.mod) = lMFIhoiyuYIqluE3XjIAKmUswa7nFSD2v6h77I63nAY= +SHA256 (go_modules/github.com/lib/pq/@v/v1.10.9.zip) = Z5Gnr2f4RqhjNTUAEsTvrdCFAJbr8iNQt7IOAeIW5vI= SHA256 (go_modules/github.com/lib/pq/@v/v1.2.0.mod) = TIrIOpiVeYUwFf3mEuZWOybLZ9G5N2SbvgoYd6wkkRQ= SHA256 (go_modules/github.com/mattn/go-colorable/@v/v0.1.1.mod) = 7qEgNlnoJxkCGvgh4fTGYzXpVfpjC+CffLP9sbsZNJc= SHA256 (go_modules/github.com/mattn/go-colorable/@v/v0.1.6.mod) = rf8+JDhLzS7PDG1qGp5OMQZUAem10pzmoSAlWrPAIxM= @@ -134,10 +168,12 @@ SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.12.mod) = GgYuVsAmbQBL6lER SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.12.zip) = B5QdJOCJTCncQrzSnWRIFc17XuhOPBS75tUa0T78vwc= SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.5.mod) = T3daib6agBiagm7yLcMD44lVfFWPFL/UC3W17yhF5W8= SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.7.mod) = T3daib6agBiagm7yLcMD44lVfFWPFL/UC3W17yhF5W8= -SHA256 (go_modules/github.com/mattn/go-sqlite3/@v/v1.14.13.mod) = odA8NpvbveDb1GzwuPAn+2XkVFxrp4juFC6DeZhF+9w= -SHA256 (go_modules/github.com/mattn/go-sqlite3/@v/v1.14.13.zip) = c/iT4n3lMdIpHlFaaIvvPNH0se3w81waX/3rUYpLX4k= -SHA256 (go_modules/github.com/pganalyze/pg_query_go/v2/@v/v2.1.2.mod) = p35basrbOTHoeD5IddCViRRidn6yq4yV/HIePT/iByE= -SHA256 (go_modules/github.com/pganalyze/pg_query_go/v2/@v/v2.1.2.zip) = JurKtBkIb8jT1mlkC7CJidLleY10MLQrCTkad7RBEQI= +SHA256 (go_modules/github.com/mattn/go-sqlite3/@v/v1.14.17.mod) = tmtIYA14NsYZ0AJP4f+zWZYQ2ffWahLVx+mCjk4YBHM= +SHA256 (go_modules/github.com/mattn/go-sqlite3/@v/v1.14.17.zip) = ZqQq71C24XFHOKrQUMceJURE+MqFStPgWX5dKpHwFQ0= +SHA256 (go_modules/github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod) = jxQBiQgBFlu9PaF1jGyWQ48SqjJIZmrBWBwYqGQkTUc= +SHA256 (go_modules/github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip) = LctwU/rxHCjK19hPz6Pdf5Pj0jaznYPP8JNPaR+GDXo= +SHA256 (go_modules/github.com/pganalyze/pg_query_go/v4/@v/v4.2.1.mod) = 1CEFJJLrTEWyxIBVbLM5liTj9bDaghj4LDZmImeCbzI= +SHA256 (go_modules/github.com/pganalyze/pg_query_go/v4/@v/v4.2.1.zip) = IsWqgr/PE2qALDREqUbb+BnoF68VvG7eNgDcIGjxtU8= SHA256 (go_modules/github.com/pingcap/errors/@v/v0.11.0.mod) = FnSoqEjCyjO2u3LeBJbS3VBS/sOU57QDq4AOqcM/rQ0= SHA256 (go_modules/github.com/pingcap/errors/@v/v0.11.5-0.20210425183316-da1aaba5fb63.mod) = nYHBJAVzjtUH0wYGDsHCoaBmdVWL5oq+AcriVuEa0xk= SHA256 (go_modules/github.com/pingcap/errors/@v/v0.11.5-0.20210425183316-da1aaba5fb63.zip) = krOmlZyitJPfQtipwUJ5FbtiXOHA/Uoy8ItlOFdZHas= @@ -153,8 +189,11 @@ SHA256 (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.mod) = dLLnZushU3eGTV SHA256 (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.zip) = 3gTOzBpLjVPkNXBRAmeUvLxU8uaiYM+sUIzmnV1kV6A= SHA256 (go_modules/github.com/remyoudompheng/bigfft/@v/v0.0.0-20200410134404-eec4a21b6bb0.mod) = ZAHavO2OA3eWEI0oVZv/wG0TUwXNYiLDzqFTdn6pVoA= SHA256 (go_modules/github.com/remyoudompheng/bigfft/@v/v0.0.0-20200410134404-eec4a21b6bb0.zip) = YMQiN1+sNuoWnrYGWvbBtIldhgi70/2pzd+Y3uAuXWo= +SHA256 (go_modules/github.com/riza-io/grpc-go/@v/v0.2.0.mod) = ouH1Ftbu89O+M7KzOKw4tNwuaI7Oaa0aw/Jn0vTG27Y= +SHA256 (go_modules/github.com/riza-io/grpc-go/@v/v0.2.0.zip) = WgaIN+0eXn5rrkoXzQjHGpnmskUPBN+pxcca1hcFQwg= +SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.10.0.mod) = ddufBjI3Ckrz4bglzekbNJzpLpm6JuGwXxaUv28JQds= +SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.10.0.zip) = h3dKqVFW4Q8a6GUAS9jyQLvpXxgWDmLBL9+i7OV/dFY= SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.3.0.mod) = M7Veg5sHVCg8Pu7B8z4WzGZDLf+4uKltJPU20B5RSVs= -SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.3.0.zip) = GRuVw12FpWg87m4wOgi00QO/nens7NxpBPIe2QwJSwo= SHA256 (go_modules/github.com/rs/xid/@v/v1.2.1.mod) = mCWmgvNFFCuH4NCj3hzod7RTGWHVMx8PjCy4aconPJE= SHA256 (go_modules/github.com/rs/xid/@v/v1.2.1.zip) = Sr3txN5prcuaRXX5nFnYq1QhkeGAC2qR4SpOnqjaACY= SHA256 (go_modules/github.com/rs/zerolog/@v/v1.13.0.mod) = we4hVTv+2UddE2QdSacjWF0OMFv0LQRANEW19EA8h/Y= @@ -170,22 +209,30 @@ SHA256 (go_modules/github.com/shopspring/decimal/@v/v1.2.0.zip) = ZcNMJI5/c2yt8D SHA256 (go_modules/github.com/sirupsen/logrus/@v/v1.4.1.mod) = IZhVqH+9xtsFniEEB1V/JGIZgbHxdQWpJKVYMqxwkRM= SHA256 (go_modules/github.com/sirupsen/logrus/@v/v1.4.2.mod) = bGu7yl+tfqm4Y9nsmcMMqneAV4VAWyHnDXV4O1GUxng= SHA256 (go_modules/github.com/sirupsen/logrus/@v/v1.4.2.zip) = mo5VgwJhpLHJNQ18RdsCnIWGwLLZNNEiTN5GlCUDHt0= -SHA256 (go_modules/github.com/spf13/cobra/@v/v1.5.0.mod) = 4sO4I6yXe8V+bKaPpbGSPit4TgGI2dWPPxMQy2ilpls= -SHA256 (go_modules/github.com/spf13/cobra/@v/v1.5.0.zip) = OwpD+W2F1DcLbtaeYbCHG08t3fd+kll+uWRwNWDM7pI= +SHA256 (go_modules/github.com/spf13/cobra/@v/v1.7.0.mod) = iXkezzf44QdTS3WVML6aJSpqUBCL1Faa+LbPgLm8GcE= +SHA256 (go_modules/github.com/spf13/cobra/@v/v1.7.0.zip) = nBa7iShqk2Du5rosI5PDiXfbduvZp/XWQ58/+YAxUFI= SHA256 (go_modules/github.com/spf13/pflag/@v/v1.0.5.mod) = FsbfwOtY6zyRE84ZfUYMZyXGR+RoisJtMcjtafHrvGg= SHA256 (go_modules/github.com/spf13/pflag/@v/v1.0.5.zip) = /G5wTy9qhN3Nzm3gQE5TQPogyGdhgb9dOBsXiIEHuoQ= +SHA256 (go_modules/github.com/stoewer/go-strcase/@v/v1.2.0.mod) = 5GstNFKnCbbCyT3QR3yH+TuHRT0IFho7PtS2cBXegKw= +SHA256 (go_modules/github.com/stoewer/go-strcase/@v/v1.2.0.zip) = jyTSw2pLydeMuKoEYYPAmOisrR2BKtt9r8nCn04q/9A= SHA256 (go_modules/github.com/stretchr/objx/@v/v0.1.0.mod) = E1A1TVLSKHpiM27MDVYjLUxHaZr5u6ScZ8K0glTamPE= SHA256 (go_modules/github.com/stretchr/objx/@v/v0.1.1.mod) = E1A1TVLSKHpiM27MDVYjLUxHaZr5u6ScZ8K0glTamPE= SHA256 (go_modules/github.com/stretchr/objx/@v/v0.2.0.mod) = J+OQHCMvgZ6NbgsyLBZnMrgUCzl3wGZZJbVWYTjof+w= -SHA256 (go_modules/github.com/stretchr/objx/@v/v0.2.0.zip) = VRfUPPt+YoucLGQBC5NONGzSRybj1urwK3+G4QdS6Wg= +SHA256 (go_modules/github.com/stretchr/objx/@v/v0.4.0.mod) = MbL9ze6HDw9hv/r6+5YiCWflvKCKdqkg1XQhb8H5E1U= +SHA256 (go_modules/github.com/stretchr/objx/@v/v0.5.0.mod) = yzJlQO/LEnSm5Olw1/yd4ugGLwigWPwpbYWQJeYugHo= +SHA256 (go_modules/github.com/stretchr/objx/@v/v0.5.0.zip) = GgCzu1rUHLcmNKzga36334V0BNd6fKtOQBp8cpVh/kw= SHA256 (go_modules/github.com/stretchr/testify/@v/v1.2.2.mod) = SrRj9ow3AEH5UMEMq1EEkD1FmMUM+CT5qtG3t/aSVa8= SHA256 (go_modules/github.com/stretchr/testify/@v/v1.3.0.mod) = qwY9UVSo6HMLztTFJpjldw61C/rjR768NeykiLjj9uM= SHA256 (go_modules/github.com/stretchr/testify/@v/v1.4.0.mod) = awx7cQMNT8VdTm5uJMC/wCViE0H3YUHjrsAETEzomVA= SHA256 (go_modules/github.com/stretchr/testify/@v/v1.5.1.mod) = 46EcKmxf4G+KIh5yiWhJF6xJrQEjP4G1HINgdzcH5wA= SHA256 (go_modules/github.com/stretchr/testify/@v/v1.7.0.mod) = //gWjZjmoHFWxFShtuklUJ8xd+lsFVUW1/lrQHnMo78= -SHA256 (go_modules/github.com/stretchr/testify/@v/v1.7.0.zip) = WkbM6+/1EN8+L204Qu550/aNDnsVVM1u6TOQ1otsazQ= +SHA256 (go_modules/github.com/stretchr/testify/@v/v1.7.1.mod) = //gWjZjmoHFWxFShtuklUJ8xd+lsFVUW1/lrQHnMo78= +SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.0.mod) = 4HYHTBVgrR3amLiwD+pjCMS2zNBt3QiNIttGJu1o9zg= +SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.1.mod) = rxpdyzMazno/n8G11+7pwLyCtKKhgv5M7CrdIX4oU9Y= +SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.1.zip) = NvZOTyKfh2cu+N4cdWZIxBZedqvQNDYlF1eDl+gkhWw= SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.3.5.mod) = 2rHWY7hg6+VF/NzsJOX5M9UXvSAZr2jXprWodkqmGw8= -SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.3.5.zip) = KZ83ljX6sY9KloHDcALcZnJwSaQaaPGbefnmpgT3Hgk= +SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 7n/kRmIDoB06wZrcE0zeyZvG3nGZLCjz3Zp0SAv/BgM= +SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = u0GmArF0NF/aOSyK2D/MkyF8KFx2NplndjC+kP63peM= SHA256 (go_modules/github.com/zenazn/goji/@v/v0.9.0.mod) = LlQ1do7rD/sVkxEQk/vENpFtXIW5fNpAT3eqVmQ+ebc= SHA256 (go_modules/github.com/zenazn/goji/@v/v0.9.0.zip) = CAeiVdnXFdGEJ6bu3Y5PWiJnCwnl9F/d0inBrjjaJak= SHA256 (go_modules/go.uber.org/atomic/@v/v1.3.2.mod) = 3P8wmPFEUgIueoSlJiS+gIK4dyj4zPC6rX4Go6KF87c= @@ -222,27 +269,42 @@ SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20201203163018-be400aefbc4c.mod) = 17hzPBCtcnC7bfMTGn29TLaTNqrWGYwDn9bE1eEp3xs= SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.mod) = zWMRYSoqpNDX4DxBs6ofvC1fiVqz9hCJ+rgL/p+PVIU= SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20210711020723-a769d52b0f97.mod) = zWMRYSoqpNDX4DxBs6ofvC1fiVqz9hCJ+rgL/p+PVIU= -SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.mod) = zWMRYSoqpNDX4DxBs6ofvC1fiVqz9hCJ+rgL/p+PVIU= -SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.zip) = xEtF206vwycEB/3Qs1vo89QhnPQid9QkmGRK7D/sRoE= +SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20210921155107-089bfa567519.mod) = zWMRYSoqpNDX4DxBs6ofvC1fiVqz9hCJ+rgL/p+PVIU= +SHA256 (go_modules/golang.org/x/crypto/@v/v0.6.0.mod) = G2poNFWjuIK2rFPyJ1KWDoe9kQQKlNbyxcthJh4jidg= +SHA256 (go_modules/golang.org/x/crypto/@v/v0.9.0.mod) = nSAXdDfn8DoYKFjPQHQ6ImKD1dQRrVyFp5TiS6AiYLE= +SHA256 (go_modules/golang.org/x/crypto/@v/v0.9.0.zip) = Zy68kWdAoEDV9UcrR34dGJjgawxsClqCC2VJW7sTPoI= SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20220428152302-39d4317da171.mod) = 2xLf5Sji5F9WmEsb0fzMU4xUTuJ8IVnzE3Jy/45ZULw= -SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20220428152302-39d4317da171.zip) = 3aPYUEAE7wlUyp11uN5dWvHqmrx9hIG3o/KjNVsOepo= +SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20220722155223-a9213eeb770e.mod) = KqbbzGUyHHFTSmOE7NZqsrIERkRKV3BwZjFFGY3Rnas= +SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20220722155223-a9213eeb770e.zip) = o+6GO16mDpfWE+IoyuZ1sYAHLRVN+jR8x6+u4xNocSM= SHA256 (go_modules/golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod) = ed9DULkiqNGTeC5WAPiCgKK51BeBv7N2DAm/Uq0wI78= SHA256 (go_modules/golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip) = kTI/4ad/E95yKgzo78XF8tpPJiFthYrOxkyyPJVvoWM= SHA256 (go_modules/golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod) = rCIWR2R7C1lhiy4xK6JS/DbW5c8z0PLKZPH6xlodYDQ= SHA256 (go_modules/golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod) = 12u96oHRltCYWJZ6Z6yAXazs3R+zDFABoYfSTBKbFZc= SHA256 (go_modules/golang.org/x/mod/@v/v0.4.2.mod) = sojwiP2FGIWm00gzni9YjlipTmx25eY0rh1nwnSetBM= -SHA256 (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20211013180041-c96bc1413d57.mod) = CT1MzqEdCHW3jvAJ119ua0lGy5YRNQEqZC8SVR1ISNw= -SHA256 (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20211013180041-c96bc1413d57.zip) = blRU8jtOvGwYyNsHvBaMcZOCad65LCLJzkgQkDaA/Ms= +SHA256 (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220106191415-9b9b3d81d5e3.mod) = CT1MzqEdCHW3jvAJ119ua0lGy5YRNQEqZC8SVR1ISNw= +SHA256 (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220419223038-86c51ed26bb4.mod) = QtGQI/+PLq5wC8VJXzcezZmKItGbqYXQr19pkAslQIM= +SHA256 (go_modules/golang.org/x/mod/@v/v0.8.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ= +SHA256 (go_modules/golang.org/x/mod/@v/v0.8.0.zip) = SugXZ5nYzagZ5wcxumhVc1AD5+STBDbjRYTHXJbEluA= SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod) = 9wRnadqsAr61fLzEgSgN9Z+0A8lv6CYigquoWMf3+k0= SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod) = 9wRnadqsAr61fLzEgSgN9Z+0A8lv6CYigquoWMf3+k0= SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod) = 5u/a94opUD8IDPbSYV4onPsdnjq31XD1NmjsorSrQdo= SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod) = 5u/a94opUD8IDPbSYV4onPsdnjq31XD1NmjsorSrQdo= SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod) = /vWJbRA6C85QVf216W6DCUQzR5JDeGU0dxjtzrYzNIo= SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod) = 9rD5lo9afZhvy1fr4qFAlRGLvRy/Z4XQA/ev1xHcsb0= -SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.zip) = Z+H3VLD2p3AWAFZ9dNDi/Nmuihug3+XXx4KEKuF8Tfg= +SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20220722155237-a158d28d115b.mod) = sxXFJkfS2i925c2502fh1nJ3hCNqm/+2EhkrGbEKEo0= +SHA256 (go_modules/golang.org/x/net/@v/v0.10.0.mod) = 07fiNv8J5jIr5IkXAhbgGNMiGGLxoFPctj5T6rhTPBc= +SHA256 (go_modules/golang.org/x/net/@v/v0.10.0.zip) = +S+bJlUiam0BWvenYnmhH7VWeOQQuFGxWPyEZUb4BzM= +SHA256 (go_modules/golang.org/x/net/@v/v0.6.0.mod) = Qex26iFy8+4wMeOPmlNZOaWE1rs170gIVP3LjCAmcBs= +SHA256 (go_modules/golang.org/x/net/@v/v0.8.0.mod) = 6275vWQFrOPZnkOB0CVs5B+Dxm0aILTigwpMd2JF9xo= +SHA256 (go_modules/golang.org/x/net/@v/v0.9.0.mod) = xdaFHt5Q7BwAGvt2MEAZS2iWG/Bpl+JgXovwbc0q6y4= +SHA256 (go_modules/golang.org/x/oauth2/@v/v0.7.0.mod) = 2hj9v9bSpoSmI3MfXqI+PpFFlQVTaBRZdjZZHydjFb4= +SHA256 (go_modules/golang.org/x/oauth2/@v/v0.7.0.zip) = toL4z2LtNvO+yfioMv9hoq8RJPMfQsTh4/Pv0j2I+T8= SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw= SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw= -SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip) = kqhmOvA1poMdzJzJ2JWh9LtR/CHv6X8E+gZ2/BSZKkY= +SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20220722155255-886fb9371eb4.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw= +SHA256 (go_modules/golang.org/x/sync/@v/v0.1.0.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw= +SHA256 (go_modules/golang.org/x/sync/@v/v0.3.0.mod) = 7Q/wxQgadUz8vnaMvPYMY5dbNddufXuZxayb+m2YKFE= +SHA256 (go_modules/golang.org/x/sync/@v/v0.3.0.zip) = GHDnoZb3EZ1Mbtun3pzfxJ7hPIy3kh86lHVoFxxhUuA= SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod) = iWkRXko5EIhIMk55ob2KhEUjDm46rMvp+AV/tQ//yME= SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod) = iWkRXko5EIhIMk55ob2KhEUjDm46rMvp+AV/tQ//yME= SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod) = iWkRXko5EIhIMk55ob2KhEUjDm46rMvp+AV/tQ//yME= @@ -258,17 +320,29 @@ SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod) = SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20211019181941-9d821ace8654.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= -SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20211019181941-9d821ace8654.zip) = ED6zttcRQu4IpX/x1jrvHARbGMXhKoJNboj7ywNBAtg= +SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= +SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220722155257-8c9f86f7a55f.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= +SHA256 (go_modules/golang.org/x/sys/@v/v0.5.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= +SHA256 (go_modules/golang.org/x/sys/@v/v0.6.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= +SHA256 (go_modules/golang.org/x/sys/@v/v0.7.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= +SHA256 (go_modules/golang.org/x/sys/@v/v0.8.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= +SHA256 (go_modules/golang.org/x/sys/@v/v0.8.0.zip) = JYizpkWDg5DjQfEAf4Z59eERe11ayUZ++DLRSLIhmjg= SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod) = vpXkWnk4YOYeYLXUNzlG1zsl1uHULkRVqKze9sZl74Q= SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = TLqxT3cGdxsnHZlaGzzBMf5aJGqtx+5tG6bwvYlHgfo= -SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip) = R1qG8R3RSLR0zkBcXb3V9ryuBWw+ROUkRaRZJt1ppVI= +SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.mod) = dAeU4pFPXMh+JWVsWEMiKyxlZlghIF9FYyoEd8jT95s= +SHA256 (go_modules/golang.org/x/term/@v/v0.5.0.mod) = DW9YIoqtwaZSjmdV2gGFFlZuOuXFIB963hdz9W+o2TQ= +SHA256 (go_modules/golang.org/x/term/@v/v0.8.0.mod) = XTYtaoNFP3Akcl6CTAXFlJYk749MsT9dfj1Lfxygsyc= +SHA256 (go_modules/golang.org/x/term/@v/v0.8.0.zip) = GWHf6lnOUx4tbmoyKHgfWViyfG2dnAmTL1/8VMTZzfk= SHA256 (go_modules/golang.org/x/text/@v/v0.3.0.mod) = NoedWG/YAB6E2oeHGQoR5PeHSeKoHf6Lm2kxiZ//Mc8= SHA256 (go_modules/golang.org/x/text/@v/v0.3.2.mod) = bDx63ysK1xQ9kT9GmNGQhCI2ml5vGYYg+X8+UvmhuN0= SHA256 (go_modules/golang.org/x/text/@v/v0.3.3.mod) = +7eojtFAUV55Dsp6EP/TGcl4axHGpsfln4D3+ze7RUI= SHA256 (go_modules/golang.org/x/text/@v/v0.3.4.mod) = +7eojtFAUV55Dsp6EP/TGcl4axHGpsfln4D3+ze7RUI= SHA256 (go_modules/golang.org/x/text/@v/v0.3.6.mod) = +7eojtFAUV55Dsp6EP/TGcl4axHGpsfln4D3+ze7RUI= SHA256 (go_modules/golang.org/x/text/@v/v0.3.7.mod) = xF1mkIlCe8RjXQexhfm5aAMy0cSMdbPEnLcVuBoEpbA= -SHA256 (go_modules/golang.org/x/text/@v/v0.3.7.zip) = 4akRXmGjjai9yJPQuoO2X4nMERTxUqmOtXLF6mVR6NQ= +SHA256 (go_modules/golang.org/x/text/@v/v0.7.0.mod) = FZKedvzgSupMkqNUQmu0M3BoRkWk7gPy510MLrFGYwQ= +SHA256 (go_modules/golang.org/x/text/@v/v0.8.0.mod) = Q29ZLne1k7AvvqN04jrTNpyGI/8NKckd594eZnLbmkE= +SHA256 (go_modules/golang.org/x/text/@v/v0.9.0.mod) = Q29ZLne1k7AvvqN04jrTNpyGI/8NKckd594eZnLbmkE= +SHA256 (go_modules/golang.org/x/text/@v/v0.9.0.zip) = wcvmhOrwHAU78SMnOGl9EEAyelyK1i2t/JULWF0bTKo= SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod) = oOAvBnj+Ytw8S0vHf6kSybcN4Q+p988veq0DNzkrUq8= SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod) = ApY4Z0vfT850N+vCXNoMgXJnTsU0sdLt6wtHTH1hjwA= SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20190425163242-31fd60d6bfdc.mod) = E1GJ3wIxXXXWLidVHRrMrR21vTwaKodW9jpp9zsbUhc= @@ -279,9 +353,12 @@ SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod) SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod) = iNR5Jl+Ib15ZjXbAA9DyV7QtvxuJXYIKErWrCzUBrKE= SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod) = iNR5Jl+Ib15ZjXbAA9DyV7QtvxuJXYIKErWrCzUBrKE= SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod) = XqRpyAO2741B0VYbnjAaAD/dk5dkaL2lV0smsFbqf0k= +SHA256 (go_modules/golang.org/x/tools/@v/v0.1.10.mod) = c79ozX27JXU1ZYr+cyIARFoMm2RO95kQZnfLzRNvqqk= +SHA256 (go_modules/golang.org/x/tools/@v/v0.1.12.mod) = KouTZYmPCCL6zmW6CJoTU+aKZdNC8wDKMXzOzN5kIfM= SHA256 (go_modules/golang.org/x/tools/@v/v0.1.5.mod) = A2l2BTdO47D6m1AupFbZxq4YNdrCLjW6oqmcQFig/jE= SHA256 (go_modules/golang.org/x/tools/@v/v0.1.8-0.20211029000441-d6a9af8af023.mod) = EjpgkNo9ol+9FJgeNnHS6wagG0qf1pOVdYDlCYn17Po= -SHA256 (go_modules/golang.org/x/tools/@v/v0.1.8-0.20211029000441-d6a9af8af023.zip) = TKkEV66+ybVGv/OciWaceoGFtwx9wkJI9btXfABBYks= +SHA256 (go_modules/golang.org/x/tools/@v/v0.6.0.mod) = gw7Xjc0+mSfEEuJkEjAwhEd0nVE9MQJNJ24kQ7IBZgk= +SHA256 (go_modules/golang.org/x/tools/@v/v0.6.0.zip) = minIkEwqzUtlgl6RbL2vQXCG81u2jFSvmmKDoOE0HoU= SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U= SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U= SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U= @@ -289,6 +366,18 @@ SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mo SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U= SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U= SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip) = OAqqM2iuFlYou0h89OaVpVwUIAcri3pvWcEi9qI7slU= +SHA256 (go_modules/google.golang.org/appengine/@v/v1.6.7.mod) = R2/HdtKQbDK21vMGkd8JjNSnCtV5Z7OBj6pEQxnNkpQ= +SHA256 (go_modules/google.golang.org/appengine/@v/v1.6.7.zip) = efgN+sGGgXiPFBTiGkp3NO/0zfmSBwvpFjED642fks0= +SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20230525234025-438c736192d0.mod) = oy3ePLxLhUUDMmv6WAgDEReuQheGCRP4C2isDxuXkzQ= +SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20230526161137-0005af68ea54.mod) = 8thJlZS+dwc5gv1e9H2SRf4ACJxwTk2v88mDgHYUV8k= +SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20230526161137-0005af68ea54.zip) = 3TpQoLJ8mbUsm7zx7VRSm42V+XwR1/UNc0olkvLKp2Y= +SHA256 (go_modules/google.golang.org/genproto/googleapis/api/@v/v0.0.0-20230525234035-dd9d682886f9.mod) = Gx8v5bspJGHR5KWOsr8U7/MZplKoTh8bOkwZICu1U1g= +SHA256 (go_modules/google.golang.org/genproto/googleapis/api/@v/v0.0.0-20230525234035-dd9d682886f9.zip) = wKcdmGXD5l5YAGAwp/VKQmxIX8KKPMFEhTYKwhD7+SI= +SHA256 (go_modules/google.golang.org/genproto/googleapis/rpc/@v/v0.0.0-20230525234030-28d5490b6b19.mod) = GIKjspI0RNLxWvbE2IV1helsqyoWrc8kVOfD2JYZpls= +SHA256 (go_modules/google.golang.org/genproto/googleapis/rpc/@v/v0.0.0-20230525234030-28d5490b6b19.zip) = AbUXecpKxf9TaxO5vunvTfNrFGY9ZuJ/p6vgB1oNjoA= +SHA256 (go_modules/google.golang.org/grpc/@v/v1.54.0.mod) = bbzdMArBmVjiFko406/HcnsesdYDz1q9FfnTwYhh0C0= +SHA256 (go_modules/google.golang.org/grpc/@v/v1.57.0.mod) = LuTdlam4J6PfznRssm6ufJfrNWxTUjORSsOVvYv2uGU= +SHA256 (go_modules/google.golang.org/grpc/@v/v1.57.0.zip) = 29dAMIh/obR0d78/DVPEzqDy9kGK02DtL1n5BudST1U= SHA256 (go_modules/google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod) = ojmQ77Z+4QuxbR0ZNhCc76TkJirj2o0HSO+2kWFNu3g= SHA256 (go_modules/google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod) = ptlQ3Sp+uC5Rz0WdP2H2FLCdcwrbnoCU1b+WsEPzgXQ= SHA256 (go_modules/google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod) = O4CNGZR/sp5Nsk7Vy4iUGvwZJ/U42ArW+ICuRmSl0BY= @@ -298,10 +387,14 @@ SHA256 (go_modules/google.golang.org/protobuf/@v/v1.23.0.mod) = OUpJRiy/bcpN2G88 SHA256 (go_modules/google.golang.org/protobuf/@v/v1.26.0-rc.1.mod) = ssT+Gmb/W+brfAxTiPCA0IghwyesXPl13uUdiw+0np8= SHA256 (go_modules/google.golang.org/protobuf/@v/v1.26.0.mod) = COwuIPOO/LZRRigABp7OSJHiUqJhAH+p1aGxV/UW7l8= SHA256 (go_modules/google.golang.org/protobuf/@v/v1.28.1.mod) = P3xyYKmH3OL9+0jOKvi082SHNQfSGrzM66sKJ0N2Hic= -SHA256 (go_modules/google.golang.org/protobuf/@v/v1.28.1.zip) = vzhrzTaYf4mOcMgzDG962gPlESkJ8KkrdRCWFAO/Ydo= +SHA256 (go_modules/google.golang.org/protobuf/@v/v1.30.0.mod) = P3xyYKmH3OL9+0jOKvi082SHNQfSGrzM66sKJ0N2Hic= +SHA256 (go_modules/google.golang.org/protobuf/@v/v1.31.0.mod) = P3xyYKmH3OL9+0jOKvi082SHNQfSGrzM66sKJ0N2Hic= +SHA256 (go_modules/google.golang.org/protobuf/@v/v1.31.0.zip) = 8B598lx54S5DgbP3cLX9l9gpXlaOOpGyZ9rLWzYiwgM= SHA256 (go_modules/gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod) = XDBuDWM81moRtA4uX7vG2kIRDbfXLqPBUkzrRe5Awz8= SHA256 (go_modules/gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod) = XDBuDWM81moRtA4uX7vG2kIRDbfXLqPBUkzrRe5Awz8= -SHA256 (go_modules/gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip) = S8U17SqsSKIxr4tgBaC19gadrauaPWWx6fH+kcdNjmE= +SHA256 (go_modules/gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.mod) = XDBuDWM81moRtA4uX7vG2kIRDbfXLqPBUkzrRe5Awz8= +SHA256 (go_modules/gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.mod) = bm4vykDrj+FFXmoIzTmDPHwumiNBqB+xgbidCxxyX0g= +SHA256 (go_modules/gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.zip) = 9VVoTlxdrMKFDd2zRf7xuPk/VGtyaFWJeJ2m0rBicQ4= SHA256 (go_modules/gopkg.in/errgo.v2/@v/v2.1.0.mod) = 4wUgQkglZieWb/hcfcWRzy0OfeIJTQ9GWEnxtioQJ0g= SHA256 (go_modules/gopkg.in/errgo.v2/@v/v2.1.0.zip) = a4lUgZog7FKYKiBv0+uUYp/1PFeQqndTTm2Nr33gG+4= SHA256 (go_modules/gopkg.in/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod) = HVb6SNCY16Z3eICJLubPIXbL3B6GRbS/y9ZzCsk8NlU= @@ -310,11 +403,11 @@ SHA256 (go_modules/gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod) = O00WGLGo3nm SHA256 (go_modules/gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.zip) = jCaONmYNbONq+AjXS5voAgfAVGNnlwPpPYV+lUxjeqo= SHA256 (go_modules/gopkg.in/yaml.v2/@v/v2.2.2.mod) = iNl50vCT0jl/dWvIbvosoD9zpg1mjOs5GzUQAp8/fPw= SHA256 (go_modules/gopkg.in/yaml.v2/@v/v2.2.8.mod) = iNl50vCT0jl/dWvIbvosoD9zpg1mjOs5GzUQAp8/fPw= -SHA256 (go_modules/gopkg.in/yaml.v2/@v/v2.4.0.mod) = w7EbqaB3X/m8bxHbtYoeSMweaLrDeKjNxiC+zGYdTDM= -SHA256 (go_modules/gopkg.in/yaml.v2/@v/v2.4.0.zip) = 7eSeJ8TMps3S7HGa7Y6k02NxDM6z1BHnp4b73sDTkf0= +SHA256 (go_modules/gopkg.in/yaml.v2/@v/v2.2.8.zip) = wn8Zi02VgNRBjMb34Ku3Vuu0g0RTS+YB25VHbeUv5tE= SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod) = IVeYYKIDBvz0OxvSNNH7oxlJnHdhG3HAX5vzupDauTk= SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod) = IVeYYKIDBvz0OxvSNNH7oxlJnHdhG3HAX5vzupDauTk= -SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip) = UWm1Yl08NR8T6KTsSAL3CQcnAbRB7ZIYHGBR7OU2Fak= +SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.mod) = IVeYYKIDBvz0OxvSNNH7oxlJnHdhG3HAX5vzupDauTk= +SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.zip) = qrj7xOYwDqCOav4crqGKIckMefSJ9SxT4vIEMfGpoBU= SHA256 (go_modules/honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod) = WS6cVbsnJSWkaQDFVGn+uXra5QfnZJvqtNwTUNc19k8= SHA256 (go_modules/honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip) = U5glEUxIdoD5nfgPYQdBDh5Tu/1d65MbhNH68tIhY44= SHA256 (go_modules/modernc.org/golex/@v/v1.0.1.mod) = UAUjXte3Mgt6dmPUkg/Ur9VwUHw2VtTnKMLt6BBbaM0= @@ -329,17 +422,30 @@ SHA256 (go_modules/modernc.org/strutil/@v/v1.1.0.mod) = VBeBm+p6gIqm04NZqfdx/caH SHA256 (go_modules/modernc.org/strutil/@v/v1.1.0.zip) = LToG1Fd6aLwHbAMM4bUrP6elR8dVSdLZFhCyPOuagtw= SHA256 (go_modules/modernc.org/y/@v/v1.0.1.mod) = 0jIrxYkaJUVw6zALDpQA6gwuJwqeRKAABC8bQYfUOvs= SHA256 (go_modules/modernc.org/y/@v/v1.0.1.zip) = ZffA9dTTfif/SnQgwOvVFeL4tARGBzqRL/S8sIeokEc= -SHA256 (sqlc-v1.15.0.zip) = oFj3akWj0tBCutHhfnUB9BNTNkbw70Y8ne1b8cidJ6I= +SHA256 (sqlc-v1.20.0.zip) = 6s7Mmrm6X9rx3/BWhYl9Byk7GFTLeETOp+5VFoXBiPA= +SIZE (go_modules/cloud.google.com/go/compute/@v/v1.19.1.mod) = 763 +SIZE (go_modules/cloud.google.com/go/compute/@v/v1.19.1.zip) = 1703350 +SIZE (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.mod) = 98 +SIZE (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.zip) = 20855 SIZE (go_modules/github.com/!burnt!sushi/toml/@v/v0.3.1.mod) = 34 SIZE (go_modules/github.com/!burnt!sushi/toml/@v/v0.3.1.zip) = 56132 SIZE (go_modules/github.com/!masterminds/semver/v3/@v/v3.1.1.mod) = 49 SIZE (go_modules/github.com/!masterminds/semver/v3/@v/v3.1.1.zip) = 29723 -SIZE (go_modules/github.com/antlr/antlr4/runtime/!go/antlr/@v/v0.0.0-20220626175859-9abda183db8e.mod) = 57 -SIZE (go_modules/github.com/antlr/antlr4/runtime/!go/antlr/@v/v0.0.0-20220626175859-9abda183db8e.zip) = 138495 +SIZE (go_modules/github.com/antlr/antlr4/runtime/!go/antlr/v4/@v/v4.0.0-20230305170008-8188dc5388df.mod) = 121 +SIZE (go_modules/github.com/antlr/antlr4/runtime/!go/antlr/v4/@v/v4.0.0-20230321174746-8dcc6526cfb1.mod) = 121 +SIZE (go_modules/github.com/antlr/antlr4/runtime/!go/antlr/v4/@v/v4.0.0-20230321174746-8dcc6526cfb1.zip) = 147810 SIZE (go_modules/github.com/benbjohnson/clock/@v/v1.1.0.mod) = 45 SIZE (go_modules/github.com/benbjohnson/clock/@v/v1.1.0.zip) = 7287 -SIZE (go_modules/github.com/bytecodealliance/wasmtime-go/@v/v0.39.0.mod) = 56 -SIZE (go_modules/github.com/bytecodealliance/wasmtime-go/@v/v0.39.0.zip) = 81642424 +SIZE (go_modules/github.com/bytecodealliance/wasmtime-go/v8/@v/v8.0.0.mod) = 391 +SIZE (go_modules/github.com/bytecodealliance/wasmtime-go/v8/@v/v8.0.0.zip) = 87777008 +SIZE (go_modules/github.com/census-instrumentation/opencensus-proto/@v/v0.4.1.mod) = 502 +SIZE (go_modules/github.com/census-instrumentation/opencensus-proto/@v/v0.4.1.zip) = 223629 +SIZE (go_modules/github.com/cespare/xxhash/v2/@v/v2.2.0.mod) = 45 +SIZE (go_modules/github.com/cespare/xxhash/v2/@v/v2.2.0.zip) = 17183 +SIZE (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20220112060539-c52dc94e7fbe.mod) = 158 +SIZE (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20220112060539-c52dc94e7fbe.zip) = 7602 +SIZE (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20230607035331-e9ce68804cb4.mod) = 169 +SIZE (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20230607035331-e9ce68804cb4.zip) = 140361 SIZE (go_modules/github.com/cockroachdb/apd/@v/v1.1.0.mod) = 34 SIZE (go_modules/github.com/cockroachdb/apd/@v/v1.1.0.zip) = 319838 SIZE (go_modules/github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod) = 36 @@ -349,6 +455,8 @@ SIZE (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.mod) = 100 SIZE (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.zip) = 12539 SIZE (go_modules/github.com/creack/pty/@v/v1.1.7.mod) = 29 SIZE (go_modules/github.com/creack/pty/@v/v1.1.7.zip) = 19233 +SIZE (go_modules/github.com/cubicdaiya/gonp/@v/v1.0.4.mod) = 43 +SIZE (go_modules/github.com/cubicdaiya/gonp/@v/v1.0.4.zip) = 13832 SIZE (go_modules/github.com/cznic/mathutil/@v/v0.0.0-20181122101859-297441e03548.mod) = 33 SIZE (go_modules/github.com/cznic/mathutil/@v/v0.0.0-20181122101859-297441e03548.zip) = 129967 SIZE (go_modules/github.com/cznic/sortutil/@v/v0.0.0-20181122101858-f5f958428db8.mod) = 33 @@ -358,16 +466,23 @@ SIZE (go_modules/github.com/cznic/strutil/@v/v0.0.0-20171016134553-529a34b1c186. SIZE (go_modules/github.com/davecgh/go-spew/@v/v1.1.0.mod) = 34 SIZE (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.mod) = 34 SIZE (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.zip) = 60320 +SIZE (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.11.1-0.20230524094728-9239064ad72f.mod) = 813 +SIZE (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.11.1-0.20230524094728-9239064ad72f.zip) = 4039655 +SIZE (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v0.10.1.mod) = 515 +SIZE (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v0.10.1.zip) = 227197 SIZE (go_modules/github.com/go-kit/log/@v/v0.1.0.mod) = 121 SIZE (go_modules/github.com/go-kit/log/@v/v0.1.0.zip) = 45063 SIZE (go_modules/github.com/go-logfmt/logfmt/@v/v0.5.0.mod) = 44 SIZE (go_modules/github.com/go-logfmt/logfmt/@v/v0.5.0.zip) = 15925 SIZE (go_modules/github.com/go-sql-driver/mysql/@v/v1.6.0.mod) = 47 -SIZE (go_modules/github.com/go-sql-driver/mysql/@v/v1.6.0.zip) = 117011 +SIZE (go_modules/github.com/go-sql-driver/mysql/@v/v1.7.1.mod) = 47 +SIZE (go_modules/github.com/go-sql-driver/mysql/@v/v1.7.1.zip) = 119398 SIZE (go_modules/github.com/go-stack/stack/@v/v1.8.0.mod) = 33 SIZE (go_modules/github.com/go-stack/stack/@v/v1.8.0.zip) = 10204 SIZE (go_modules/github.com/gofrs/uuid/@v/v4.0.0+incompatible.mod) = 29 SIZE (go_modules/github.com/gofrs/uuid/@v/v4.0.0+incompatible.zip) = 37684 +SIZE (go_modules/github.com/golang/glog/@v/v1.1.0.mod) = 39 +SIZE (go_modules/github.com/golang/glog/@v/v1.1.0.zip) = 35815 SIZE (go_modules/github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod) = 151 SIZE (go_modules/github.com/golang/protobuf/@v/v1.4.0-rc.1.mod) = 151 SIZE (go_modules/github.com/golang/protobuf/@v/v1.4.0-rc.2.mod) = 151 @@ -376,18 +491,24 @@ SIZE (go_modules/github.com/golang/protobuf/@v/v1.4.0.mod) = 124 SIZE (go_modules/github.com/golang/protobuf/@v/v1.4.2.mod) = 124 SIZE (go_modules/github.com/golang/protobuf/@v/v1.5.0.mod) = 129 SIZE (go_modules/github.com/golang/protobuf/@v/v1.5.2.mod) = 192 -SIZE (go_modules/github.com/golang/protobuf/@v/v1.5.2.zip) = 206858 +SIZE (go_modules/github.com/golang/protobuf/@v/v1.5.3.mod) = 192 +SIZE (go_modules/github.com/golang/protobuf/@v/v1.5.3.zip) = 207048 +SIZE (go_modules/github.com/google/cel-go/@v/v0.17.1.mod) = 480 +SIZE (go_modules/github.com/google/cel-go/@v/v0.17.1.zip) = 620495 SIZE (go_modules/github.com/google/go-cmp/@v/v0.3.0.mod) = 40 SIZE (go_modules/github.com/google/go-cmp/@v/v0.3.1.mod) = 40 SIZE (go_modules/github.com/google/go-cmp/@v/v0.4.0.mod) = 105 SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.1.mod) = 105 SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.5.mod) = 105 SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.8.mod) = 41 -SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.8.zip) = 131550 +SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.9.mod) = 41 +SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.9.zip) = 130220 SIZE (go_modules/github.com/google/renameio/@v/v0.1.0.mod) = 34 SIZE (go_modules/github.com/google/renameio/@v/v0.1.0.zip) = 14941 -SIZE (go_modules/github.com/inconshreveable/mousetrap/@v/v1.0.0.mod) = 44 -SIZE (go_modules/github.com/inconshreveable/mousetrap/@v/v1.0.0.zip) = 3712 +SIZE (go_modules/github.com/google/uuid/@v/v1.3.0.mod) = 30 +SIZE (go_modules/github.com/google/uuid/@v/v1.3.0.zip) = 25027 +SIZE (go_modules/github.com/inconshreveable/mousetrap/@v/v1.1.0.mod) = 53 +SIZE (go_modules/github.com/inconshreveable/mousetrap/@v/v1.1.0.zip) = 6350 SIZE (go_modules/github.com/jackc/chunkreader/@v/v1.0.0.mod) = 45 SIZE (go_modules/github.com/jackc/chunkreader/@v/v1.0.0.zip) = 3438 SIZE (go_modules/github.com/jackc/chunkreader/v2/@v/v2.0.0.mod) = 48 @@ -396,8 +517,9 @@ SIZE (go_modules/github.com/jackc/chunkreader/v2/@v/v2.0.1.zip) = 4070 SIZE (go_modules/github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod) = 398 SIZE (go_modules/github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod) = 368 SIZE (go_modules/github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod) = 375 -SIZE (go_modules/github.com/jackc/pgconn/@v/v1.12.1.mod) = 441 -SIZE (go_modules/github.com/jackc/pgconn/@v/v1.12.1.zip) = 68062 +SIZE (go_modules/github.com/jackc/pgconn/@v/v1.14.0.mod) = 413 +SIZE (go_modules/github.com/jackc/pgconn/@v/v1.14.1.mod) = 413 +SIZE (go_modules/github.com/jackc/pgconn/@v/v1.14.1.zip) = 74954 SIZE (go_modules/github.com/jackc/pgconn/@v/v1.8.0.mod) = 498 SIZE (go_modules/github.com/jackc/pgconn/@v/v1.9.0.mod) = 441 SIZE (go_modules/github.com/jackc/pgconn/@v/v1.9.1-0.20210724152538-d89c8390a530.mod) = 441 @@ -417,27 +539,32 @@ SIZE (go_modules/github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4c0 SIZE (go_modules/github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod) = 128 SIZE (go_modules/github.com/jackc/pgproto3/v2/@v/v2.0.6.mod) = 164 SIZE (go_modules/github.com/jackc/pgproto3/v2/@v/v2.1.1.mod) = 164 -SIZE (go_modules/github.com/jackc/pgproto3/v2/@v/v2.3.0.mod) = 164 -SIZE (go_modules/github.com/jackc/pgproto3/v2/@v/v2.3.0.zip) = 62472 +SIZE (go_modules/github.com/jackc/pgproto3/v2/@v/v2.3.2.mod) = 164 +SIZE (go_modules/github.com/jackc/pgproto3/v2/@v/v2.3.2.zip) = 62529 SIZE (go_modules/github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod) = 91 -SIZE (go_modules/github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip) = 4552 +SIZE (go_modules/github.com/jackc/pgservicefile/@v/v0.0.0-20221227161230-091c0ba34f0a.mod) = 91 +SIZE (go_modules/github.com/jackc/pgservicefile/@v/v0.0.0-20221227161230-091c0ba34f0a.zip) = 4604 SIZE (go_modules/github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod) = 260 SIZE (go_modules/github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod) = 553 SIZE (go_modules/github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod) = 369 -SIZE (go_modules/github.com/jackc/pgtype/@v/v1.11.0.mod) = 352 -SIZE (go_modules/github.com/jackc/pgtype/@v/v1.11.0.zip) = 309969 +SIZE (go_modules/github.com/jackc/pgtype/@v/v1.14.0.mod) = 352 +SIZE (go_modules/github.com/jackc/pgtype/@v/v1.14.0.zip) = 319012 SIZE (go_modules/github.com/jackc/pgtype/@v/v1.8.1-0.20210724151600-32e20a603178.mod) = 164 SIZE (go_modules/github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod) = 872 SIZE (go_modules/github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod) = 745 SIZE (go_modules/github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod) = 1480 SIZE (go_modules/github.com/jackc/pgx/v4/@v/v4.12.1-0.20210724153913-640aa07df17c.mod) = 857 -SIZE (go_modules/github.com/jackc/pgx/v4/@v/v4.16.1.mod) = 602 -SIZE (go_modules/github.com/jackc/pgx/v4/@v/v4.16.1.zip) = 136819 +SIZE (go_modules/github.com/jackc/pgx/v4/@v/v4.18.1.mod) = 602 +SIZE (go_modules/github.com/jackc/pgx/v4/@v/v4.18.1.zip) = 142980 +SIZE (go_modules/github.com/jackc/pgx/v5/@v/v5.4.2.mod) = 598 +SIZE (go_modules/github.com/jackc/pgx/v5/@v/v5.4.2.zip) = 465043 SIZE (go_modules/github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod) = 84 SIZE (go_modules/github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod) = 84 SIZE (go_modules/github.com/jackc/puddle/@v/v1.1.3.mod) = 84 -SIZE (go_modules/github.com/jackc/puddle/@v/v1.2.1.mod) = 84 -SIZE (go_modules/github.com/jackc/puddle/@v/v1.2.1.zip) = 13853 +SIZE (go_modules/github.com/jackc/puddle/@v/v1.3.0.mod) = 84 +SIZE (go_modules/github.com/jackc/puddle/@v/v1.3.0.zip) = 14830 +SIZE (go_modules/github.com/jackc/puddle/v2/@v/v2.2.0.mod) = 265 +SIZE (go_modules/github.com/jackc/puddle/v2/@v/v2.2.0.zip) = 23936 SIZE (go_modules/github.com/jinzhu/inflection/@v/v1.0.0.mod) = 36 SIZE (go_modules/github.com/jinzhu/inflection/@v/v1.0.0.zip) = 5953 SIZE (go_modules/github.com/kisielk/gotool/@v/v1.0.0.mod) = 35 @@ -446,8 +573,8 @@ SIZE (go_modules/github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mo SIZE (go_modules/github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod) = 58 SIZE (go_modules/github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip) = 3968 SIZE (go_modules/github.com/kr/pretty/@v/v0.1.0.mod) = 67 -SIZE (go_modules/github.com/kr/pretty/@v/v0.2.1.mod) = 72 -SIZE (go_modules/github.com/kr/pretty/@v/v0.2.1.zip) = 11508 +SIZE (go_modules/github.com/kr/pretty/@v/v0.3.0.mod) = 117 +SIZE (go_modules/github.com/kr/pretty/@v/v0.3.0.zip) = 13000 SIZE (go_modules/github.com/kr/pty/@v/v1.1.1.mod) = 25 SIZE (go_modules/github.com/kr/pty/@v/v1.1.8.mod) = 72 SIZE (go_modules/github.com/kr/pty/@v/v1.1.8.zip) = 2820 @@ -456,8 +583,8 @@ SIZE (go_modules/github.com/kr/text/@v/v0.1.0.zip) = 12591 SIZE (go_modules/github.com/lib/pq/@v/v1.0.0.mod) = 25 SIZE (go_modules/github.com/lib/pq/@v/v1.1.0.mod) = 25 SIZE (go_modules/github.com/lib/pq/@v/v1.10.2.mod) = 34 -SIZE (go_modules/github.com/lib/pq/@v/v1.10.6.mod) = 34 -SIZE (go_modules/github.com/lib/pq/@v/v1.10.6.zip) = 127754 +SIZE (go_modules/github.com/lib/pq/@v/v1.10.9.mod) = 34 +SIZE (go_modules/github.com/lib/pq/@v/v1.10.9.zip) = 132435 SIZE (go_modules/github.com/lib/pq/@v/v1.2.0.mod) = 25 SIZE (go_modules/github.com/mattn/go-colorable/@v/v0.1.1.mod) = 80 SIZE (go_modules/github.com/mattn/go-colorable/@v/v0.1.6.mod) = 160 @@ -466,10 +593,12 @@ SIZE (go_modules/github.com/mattn/go-isatty/@v/v0.0.12.mod) = 104 SIZE (go_modules/github.com/mattn/go-isatty/@v/v0.0.12.zip) = 8902 SIZE (go_modules/github.com/mattn/go-isatty/@v/v0.0.5.mod) = 95 SIZE (go_modules/github.com/mattn/go-isatty/@v/v0.0.7.mod) = 95 -SIZE (go_modules/github.com/mattn/go-sqlite3/@v/v1.14.13.mod) = 44 -SIZE (go_modules/github.com/mattn/go-sqlite3/@v/v1.14.13.zip) = 2519658 -SIZE (go_modules/github.com/pganalyze/pg_query_go/v2/@v/v2.1.2.mod) = 169 -SIZE (go_modules/github.com/pganalyze/pg_query_go/v2/@v/v2.1.2.zip) = 2599882 +SIZE (go_modules/github.com/mattn/go-sqlite3/@v/v1.14.17.mod) = 146 +SIZE (go_modules/github.com/mattn/go-sqlite3/@v/v1.14.17.zip) = 2599934 +SIZE (go_modules/github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod) = 78 +SIZE (go_modules/github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip) = 13281 +SIZE (go_modules/github.com/pganalyze/pg_query_go/v4/@v/v4.2.1.mod) = 169 +SIZE (go_modules/github.com/pganalyze/pg_query_go/v4/@v/v4.2.1.zip) = 3080431 SIZE (go_modules/github.com/pingcap/errors/@v/v0.11.0.mod) = 33 SIZE (go_modules/github.com/pingcap/errors/@v/v0.11.5-0.20210425183316-da1aaba5fb63.mod) = 118 SIZE (go_modules/github.com/pingcap/errors/@v/v0.11.5-0.20210425183316-da1aaba5fb63.zip) = 31823 @@ -485,8 +614,11 @@ SIZE (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.mod) = 37 SIZE (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.zip) = 12433 SIZE (go_modules/github.com/remyoudompheng/bigfft/@v/v0.0.0-20200410134404-eec4a21b6bb0.mod) = 49 SIZE (go_modules/github.com/remyoudompheng/bigfft/@v/v0.0.0-20200410134404-eec4a21b6bb0.zip) = 24285 +SIZE (go_modules/github.com/riza-io/grpc-go/@v/v0.2.0.mod) = 191 +SIZE (go_modules/github.com/riza-io/grpc-go/@v/v0.2.0.zip) = 41133 +SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.10.0.mod) = 48 +SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.10.0.zip) = 219918 SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.3.0.mod) = 73 -SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.3.0.zip) = 180679 SIZE (go_modules/github.com/rs/xid/@v/v1.2.1.mod) = 25 SIZE (go_modules/github.com/rs/xid/@v/v1.2.1.zip) = 12755 SIZE (go_modules/github.com/rs/zerolog/@v/v1.13.0.mod) = 29 @@ -502,22 +634,30 @@ SIZE (go_modules/github.com/shopspring/decimal/@v/v1.2.0.zip) = 40827 SIZE (go_modules/github.com/sirupsen/logrus/@v/v1.4.1.mod) = 337 SIZE (go_modules/github.com/sirupsen/logrus/@v/v1.4.2.mod) = 337 SIZE (go_modules/github.com/sirupsen/logrus/@v/v1.4.2.zip) = 58627 -SIZE (go_modules/github.com/spf13/cobra/@v/v1.5.0.mod) = 194 -SIZE (go_modules/github.com/spf13/cobra/@v/v1.5.0.zip) = 136968 +SIZE (go_modules/github.com/spf13/cobra/@v/v1.7.0.mod) = 194 +SIZE (go_modules/github.com/spf13/cobra/@v/v1.7.0.zip) = 225593 SIZE (go_modules/github.com/spf13/pflag/@v/v1.0.5.mod) = 39 SIZE (go_modules/github.com/spf13/pflag/@v/v1.0.5.zip) = 88931 +SIZE (go_modules/github.com/stoewer/go-strcase/@v/v1.2.0.mod) = 90 +SIZE (go_modules/github.com/stoewer/go-strcase/@v/v1.2.0.zip) = 9378 SIZE (go_modules/github.com/stretchr/objx/@v/v0.1.0.mod) = 32 SIZE (go_modules/github.com/stretchr/objx/@v/v0.1.1.mod) = 32 SIZE (go_modules/github.com/stretchr/objx/@v/v0.2.0.mod) = 137 -SIZE (go_modules/github.com/stretchr/objx/@v/v0.2.0.zip) = 42547 +SIZE (go_modules/github.com/stretchr/objx/@v/v0.4.0.mod) = 137 +SIZE (go_modules/github.com/stretchr/objx/@v/v0.5.0.mod) = 85 +SIZE (go_modules/github.com/stretchr/objx/@v/v0.5.0.zip) = 44362 SIZE (go_modules/github.com/stretchr/testify/@v/v1.2.2.mod) = 35 SIZE (go_modules/github.com/stretchr/testify/@v/v1.3.0.mod) = 154 SIZE (go_modules/github.com/stretchr/testify/@v/v1.4.0.mod) = 179 SIZE (go_modules/github.com/stretchr/testify/@v/v1.5.1.mod) = 188 SIZE (go_modules/github.com/stretchr/testify/@v/v1.7.0.mod) = 216 -SIZE (go_modules/github.com/stretchr/testify/@v/v1.7.0.zip) = 105564 +SIZE (go_modules/github.com/stretchr/testify/@v/v1.7.1.mod) = 216 +SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.0.mod) = 188 +SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.1.mod) = 188 +SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.1.zip) = 113583 SIZE (go_modules/github.com/yuin/goldmark/@v/v1.3.5.mod) = 41 -SIZE (go_modules/github.com/yuin/goldmark/@v/v1.3.5.zip) = 268257 +SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 41 +SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = 229017 SIZE (go_modules/github.com/zenazn/goji/@v/v0.9.0.mod) = 30 SIZE (go_modules/github.com/zenazn/goji/@v/v0.9.0.zip) = 73570 SIZE (go_modules/go.uber.org/atomic/@v/v1.3.2.mod) = 26 @@ -554,27 +694,42 @@ SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod) SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20201203163018-be400aefbc4c.mod) = 209 SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.mod) = 247 SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20210711020723-a769d52b0f97.mod) = 247 -SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.mod) = 247 -SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.zip) = 1876172 +SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20210921155107-089bfa567519.mod) = 247 +SIZE (go_modules/golang.org/x/crypto/@v/v0.6.0.mod) = 171 +SIZE (go_modules/golang.org/x/crypto/@v/v0.9.0.mod) = 172 +SIZE (go_modules/golang.org/x/crypto/@v/v0.9.0.zip) = 1763182 SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20220428152302-39d4317da171.mod) = 309 -SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20220428152302-39d4317da171.zip) = 368934 +SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20220722155223-a9213eeb770e.mod) = 325 +SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20220722155223-a9213eeb770e.zip) = 365042 SIZE (go_modules/golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod) = 88 SIZE (go_modules/golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip) = 45710 SIZE (go_modules/golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod) = 97 SIZE (go_modules/golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod) = 159 SIZE (go_modules/golang.org/x/mod/@v/v0.4.2.mod) = 214 -SIZE (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20211013180041-c96bc1413d57.mod) = 214 -SIZE (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20211013180041-c96bc1413d57.zip) = 169083 +SIZE (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220106191415-9b9b3d81d5e3.mod) = 214 +SIZE (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220419223038-86c51ed26bb4.mod) = 157 +SIZE (go_modules/golang.org/x/mod/@v/v0.8.0.mod) = 84 +SIZE (go_modules/golang.org/x/mod/@v/v0.8.0.zip) = 161670 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod) = 119 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod) = 119 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod) = 181 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod) = 181 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod) = 179 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod) = 179 -SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.zip) = 1565731 +SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20220722155237-a158d28d115b.mod) = 179 +SIZE (go_modules/golang.org/x/net/@v/v0.10.0.mod) = 123 +SIZE (go_modules/golang.org/x/net/@v/v0.10.0.zip) = 1564890 +SIZE (go_modules/golang.org/x/net/@v/v0.6.0.mod) = 123 +SIZE (go_modules/golang.org/x/net/@v/v0.8.0.mod) = 123 +SIZE (go_modules/golang.org/x/net/@v/v0.9.0.mod) = 123 +SIZE (go_modules/golang.org/x/oauth2/@v/v0.7.0.mod) = 308 +SIZE (go_modules/golang.org/x/oauth2/@v/v0.7.0.zip) = 137700 SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod) = 25 SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod) = 25 -SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip) = 28693 +SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20220722155255-886fb9371eb4.mod) = 25 +SIZE (go_modules/golang.org/x/sync/@v/v0.1.0.mod) = 25 +SIZE (go_modules/golang.org/x/sync/@v/v0.3.0.mod) = 34 +SIZE (go_modules/golang.org/x/sync/@v/v0.3.0.zip) = 29766 SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod) = 24 SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod) = 24 SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod) = 24 @@ -590,17 +745,29 @@ SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod) = 3 SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod) = 33 SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod) = 33 SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20211019181941-9d821ace8654.mod) = 33 -SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20211019181941-9d821ace8654.zip) = 1667445 +SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 33 +SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220722155257-8c9f86f7a55f.mod) = 33 +SIZE (go_modules/golang.org/x/sys/@v/v0.5.0.mod) = 33 +SIZE (go_modules/golang.org/x/sys/@v/v0.6.0.mod) = 33 +SIZE (go_modules/golang.org/x/sys/@v/v0.7.0.mod) = 33 +SIZE (go_modules/golang.org/x/sys/@v/v0.8.0.mod) = 33 +SIZE (go_modules/golang.org/x/sys/@v/v0.8.0.zip) = 1894928 SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod) = 95 SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = 95 -SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip) = 23281 +SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.mod) = 95 +SIZE (go_modules/golang.org/x/term/@v/v0.5.0.mod) = 67 +SIZE (go_modules/golang.org/x/term/@v/v0.8.0.mod) = 67 +SIZE (go_modules/golang.org/x/term/@v/v0.8.0.zip) = 19924 SIZE (go_modules/golang.org/x/text/@v/v0.3.0.mod) = 25 SIZE (go_modules/golang.org/x/text/@v/v0.3.2.mod) = 88 SIZE (go_modules/golang.org/x/text/@v/v0.3.3.mod) = 97 SIZE (go_modules/golang.org/x/text/@v/v0.3.4.mod) = 97 SIZE (go_modules/golang.org/x/text/@v/v0.3.6.mod) = 97 SIZE (go_modules/golang.org/x/text/@v/v0.3.7.mod) = 97 -SIZE (go_modules/golang.org/x/text/@v/v0.3.7.zip) = 8610883 +SIZE (go_modules/golang.org/x/text/@v/v0.7.0.mod) = 258 +SIZE (go_modules/golang.org/x/text/@v/v0.8.0.mod) = 215 +SIZE (go_modules/golang.org/x/text/@v/v0.9.0.mod) = 215 +SIZE (go_modules/golang.org/x/text/@v/v0.9.0.zip) = 8614767 SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod) = 26 SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod) = 87 SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20190425163242-31fd60d6bfdc.mod) = 146 @@ -611,9 +778,12 @@ SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod) = SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod) = 212 SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod) = 212 SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod) = 267 +SIZE (go_modules/golang.org/x/tools/@v/v0.1.10.mod) = 383 +SIZE (go_modules/golang.org/x/tools/@v/v0.1.12.mod) = 327 SIZE (go_modules/golang.org/x/tools/@v/v0.1.5.mod) = 323 SIZE (go_modules/golang.org/x/tools/@v/v0.1.8-0.20211029000441-d6a9af8af023.mod) = 349 -SIZE (go_modules/golang.org/x/tools/@v/v0.1.8-0.20211029000441-d6a9af8af023.zip) = 3729865 +SIZE (go_modules/golang.org/x/tools/@v/v0.6.0.mod) = 211 +SIZE (go_modules/golang.org/x/tools/@v/v0.6.0.zip) = 3008760 SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod) = 37 SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod) = 37 SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod) = 37 @@ -621,6 +791,18 @@ SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod) SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod) = 37 SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod) = 37 SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip) = 22295 +SIZE (go_modules/google.golang.org/appengine/@v/v1.6.7.mod) = 171 +SIZE (go_modules/google.golang.org/appengine/@v/v1.6.7.zip) = 417823 +SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20230525234025-438c736192d0.mod) = 5073 +SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20230526161137-0005af68ea54.mod) = 5073 +SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20230526161137-0005af68ea54.zip) = 7090440 +SIZE (go_modules/google.golang.org/genproto/googleapis/api/@v/v0.0.0-20230525234035-dd9d682886f9.mod) = 452 +SIZE (go_modules/google.golang.org/genproto/googleapis/api/@v/v0.0.0-20230525234035-dd9d682886f9.zip) = 224459 +SIZE (go_modules/google.golang.org/genproto/googleapis/rpc/@v/v0.0.0-20230525234030-28d5490b6b19.mod) = 223 +SIZE (go_modules/google.golang.org/genproto/googleapis/rpc/@v/v0.0.0-20230525234030-28d5490b6b19.zip) = 39163 +SIZE (go_modules/google.golang.org/grpc/@v/v1.54.0.mod) = 901 +SIZE (go_modules/google.golang.org/grpc/@v/v1.57.0.mod) = 1166 +SIZE (go_modules/google.golang.org/grpc/@v/v1.57.0.zip) = 2110809 SIZE (go_modules/google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod) = 83 SIZE (go_modules/google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod) = 128 SIZE (go_modules/google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod) = 158 @@ -630,10 +812,14 @@ SIZE (go_modules/google.golang.org/protobuf/@v/v1.23.0.mod) = 123 SIZE (go_modules/google.golang.org/protobuf/@v/v1.26.0-rc.1.mod) = 83 SIZE (go_modules/google.golang.org/protobuf/@v/v1.26.0.mod) = 123 SIZE (go_modules/google.golang.org/protobuf/@v/v1.28.1.mod) = 124 -SIZE (go_modules/google.golang.org/protobuf/@v/v1.28.1.zip) = 1574540 +SIZE (go_modules/google.golang.org/protobuf/@v/v1.30.0.mod) = 124 +SIZE (go_modules/google.golang.org/protobuf/@v/v1.31.0.mod) = 124 +SIZE (go_modules/google.golang.org/protobuf/@v/v1.31.0.zip) = 1613098 SIZE (go_modules/gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod) = 25 SIZE (go_modules/gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod) = 25 -SIZE (go_modules/gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip) = 41465 +SIZE (go_modules/gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.mod) = 25 +SIZE (go_modules/gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.mod) = 71 +SIZE (go_modules/gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.zip) = 42835 SIZE (go_modules/gopkg.in/errgo.v2/@v/v2.1.0.mod) = 133 SIZE (go_modules/gopkg.in/errgo.v2/@v/v2.1.0.zip) = 15087 SIZE (go_modules/gopkg.in/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod) = 41 @@ -642,11 +828,11 @@ SIZE (go_modules/gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod) = 40 SIZE (go_modules/gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.zip) = 17854 SIZE (go_modules/gopkg.in/yaml.v2/@v/v2.2.2.mod) = 95 SIZE (go_modules/gopkg.in/yaml.v2/@v/v2.2.8.mod) = 95 -SIZE (go_modules/gopkg.in/yaml.v2/@v/v2.4.0.mod) = 95 -SIZE (go_modules/gopkg.in/yaml.v2/@v/v2.4.0.zip) = 81183 +SIZE (go_modules/gopkg.in/yaml.v2/@v/v2.2.8.zip) = 80666 SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod) = 95 SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod) = 95 -SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip) = 105245 +SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.mod) = 95 +SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.zip) = 104623 SIZE (go_modules/honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod) = 300 SIZE (go_modules/honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip) = 506912 SIZE (go_modules/modernc.org/golex/@v/v1.0.1.mod) = 194 @@ -661,4 +847,4 @@ SIZE (go_modules/modernc.org/strutil/@v/v1.1.0.mod) = 27 SIZE (go_modules/modernc.org/strutil/@v/v1.1.0.zip) = 11099 SIZE (go_modules/modernc.org/y/@v/v1.0.1.mod) = 275 SIZE (go_modules/modernc.org/y/@v/v1.0.1.zip) = 4352624 -SIZE (sqlc-v1.15.0.zip) = 783131 +SIZE (sqlc-v1.20.0.zip) = 864165 diff --git a/devel/sqlc/modules.inc b/devel/sqlc/modules.inc index 308322e16..15bf61e65 100644 --- a/devel/sqlc/modules.inc +++ b/devel/sqlc/modules.inc @@ -1,91 +1,114 @@ MODGO_MODULES = \ + cloud.google.com/go/compute v1.19.1 \ + cloud.google.com/go/compute/metadata v0.2.3 \ github.com/!burnt!sushi/toml v0.3.1 \ github.com/!masterminds/semver/v3 v3.1.1 \ - github.com/antlr/antlr4/runtime/!go/antlr v0.0.0-20220626175859-9abda183db8e \ + github.com/antlr/antlr4/runtime/!go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 \ github.com/benbjohnson/clock v1.1.0 \ - github.com/bytecodealliance/wasmtime-go v0.39.0 \ + github.com/bytecodealliance/wasmtime-go/v8 v8.0.0 \ + github.com/census-instrumentation/opencensus-proto v0.4.1 \ + github.com/cespare/xxhash/v2 v2.2.0 \ + github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe \ + github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 \ github.com/cockroachdb/apd v1.1.0 \ github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f \ github.com/cpuguy83/go-md2man/v2 v2.0.2 \ github.com/creack/pty v1.1.7 \ + github.com/cubicdaiya/gonp v1.0.4 \ github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 \ github.com/cznic/sortutil v0.0.0-20181122101858-f5f958428db8 \ github.com/cznic/strutil v0.0.0-20171016134553-529a34b1c186 \ github.com/davecgh/go-spew v1.1.1 \ + github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f \ + github.com/envoyproxy/protoc-gen-validate v0.10.1 \ github.com/go-kit/log v0.1.0 \ github.com/go-logfmt/logfmt v0.5.0 \ - github.com/go-sql-driver/mysql v1.6.0 \ + github.com/go-sql-driver/mysql v1.7.1 \ github.com/go-stack/stack v1.8.0 \ github.com/gofrs/uuid v4.0.0+incompatible \ - github.com/golang/protobuf v1.5.2 \ - github.com/google/go-cmp v0.5.8 \ + github.com/golang/glog v1.1.0 \ + github.com/golang/protobuf v1.5.3 \ + github.com/google/cel-go v0.17.1 \ + github.com/google/go-cmp v0.5.9 \ github.com/google/renameio v0.1.0 \ - github.com/inconshreveable/mousetrap v1.0.0 \ + github.com/google/uuid v1.3.0 \ + github.com/inconshreveable/mousetrap v1.1.0 \ github.com/jackc/chunkreader v1.0.0 \ github.com/jackc/chunkreader/v2 v2.0.1 \ - github.com/jackc/pgconn v1.12.1 \ + github.com/jackc/pgconn v1.14.1 \ github.com/jackc/pgio v1.0.0 \ github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 \ github.com/jackc/pgpassfile v1.0.0 \ github.com/jackc/pgproto3 v1.1.0 \ - github.com/jackc/pgproto3/v2 v2.3.0 \ - github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b \ - github.com/jackc/pgtype v1.11.0 \ - github.com/jackc/pgx/v4 v4.16.1 \ - github.com/jackc/puddle v1.2.1 \ + github.com/jackc/pgproto3/v2 v2.3.2 \ + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a \ + github.com/jackc/pgtype v1.14.0 \ + github.com/jackc/pgx/v4 v4.18.1 \ + github.com/jackc/pgx/v5 v5.4.2 \ + github.com/jackc/puddle v1.3.0 \ + github.com/jackc/puddle/v2 v2.2.0 \ github.com/jinzhu/inflection v1.0.0 \ github.com/kisielk/gotool v1.0.0 \ github.com/konsorten/go-windows-terminal-sequences v1.0.2 \ - github.com/kr/pretty v0.2.1 \ + github.com/kr/pretty v0.3.0 \ github.com/kr/pty v1.1.8 \ github.com/kr/text v0.1.0 \ - github.com/lib/pq v1.10.6 \ + github.com/lib/pq v1.10.9 \ github.com/mattn/go-colorable v0.1.6 \ github.com/mattn/go-isatty v0.0.12 \ - github.com/mattn/go-sqlite3 v1.14.13 \ - github.com/pganalyze/pg_query_go/v2 v2.1.2 \ + github.com/mattn/go-sqlite3 v1.14.17 \ + github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e \ + github.com/pganalyze/pg_query_go/v4 v4.2.1 \ github.com/pingcap/errors v0.11.5-0.20210425183316-da1aaba5fb63 \ github.com/pingcap/log v0.0.0-20210906054005-afc726e70354 \ github.com/pingcap/tidb/parser v0.0.0-20220725134311-c80026e61f00 \ github.com/pkg/errors v0.9.1 \ github.com/pmezard/go-difflib v1.0.0 \ github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 \ - github.com/rogpeppe/go-internal v1.3.0 \ + github.com/riza-io/grpc-go v0.2.0 \ + github.com/rogpeppe/go-internal v1.10.0 \ github.com/rs/xid v1.2.1 \ github.com/rs/zerolog v1.15.0 \ github.com/russross/blackfriday/v2 v2.1.0 \ github.com/satori/go.uuid v1.2.0 \ github.com/shopspring/decimal v1.2.0 \ github.com/sirupsen/logrus v1.4.2 \ - github.com/spf13/cobra v1.5.0 \ + github.com/spf13/cobra v1.7.0 \ github.com/spf13/pflag v1.0.5 \ - github.com/stretchr/objx v0.2.0 \ - github.com/stretchr/testify v1.7.0 \ - github.com/yuin/goldmark v1.3.5 \ + github.com/stoewer/go-strcase v1.2.0 \ + github.com/stretchr/objx v0.5.0 \ + github.com/stretchr/testify v1.8.1 \ + github.com/yuin/goldmark v1.4.13 \ github.com/zenazn/goji v0.9.0 \ go.uber.org/atomic v1.9.0 \ go.uber.org/goleak v1.1.11-0.20210813005559-691160354723 \ go.uber.org/multierr v1.7.0 \ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee \ go.uber.org/zap v1.19.1 \ - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 \ - golang.org/x/exp v0.0.0-20220428152302-39d4317da171 \ + golang.org/x/crypto v0.9.0 \ + golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e \ golang.org/x/lint v0.0.0-20190930215403-16217165b5de \ - golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57 \ - golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 \ - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c \ - golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 \ - golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 \ - golang.org/x/text v0.3.7 \ - golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023 \ + golang.org/x/mod v0.8.0 \ + golang.org/x/net v0.10.0 \ + golang.org/x/oauth2 v0.7.0 \ + golang.org/x/sync v0.3.0 \ + golang.org/x/sys v0.8.0 \ + golang.org/x/term v0.8.0 \ + golang.org/x/text v0.9.0 \ + golang.org/x/tools v0.6.0 \ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 \ - google.golang.org/protobuf v1.28.1 \ - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 \ + google.golang.org/appengine v1.6.7 \ + google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 \ + google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 \ + google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 \ + google.golang.org/grpc v1.57.0 \ + google.golang.org/protobuf v1.31.0 \ + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c \ gopkg.in/errgo.v2 v2.1.0 \ gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec \ gopkg.in/natefinch/lumberjack.v2 v2.0.0 \ - gopkg.in/yaml.v2 v2.4.0 \ - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b \ + gopkg.in/yaml.v2 v2.2.8 \ + gopkg.in/yaml.v3 v3.0.1 \ honnef.co/go/tools v0.0.1-2019.2.3 \ modernc.org/golex v1.0.1 \ modernc.org/mathutil v1.4.1 \ @@ -95,8 +118,10 @@ MODGO_MODULES = \ modernc.org/y v1.0.1 MODGO_MODFILES = \ + github.com/antlr/antlr4/runtime/!go/antlr/v4 v4.0.0-20230305170008-8188dc5388df \ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e \ github.com/davecgh/go-spew v1.1.0 \ + github.com/go-sql-driver/mysql v1.6.0 \ github.com/golang/protobuf v1.4.0 \ github.com/golang/protobuf v1.4.0-rc.1 \ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208 \ @@ -104,15 +129,18 @@ MODGO_MODFILES = \ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0 \ github.com/golang/protobuf v1.4.2 \ github.com/golang/protobuf v1.5.0 \ + github.com/golang/protobuf v1.5.2 \ github.com/google/go-cmp v0.3.0 \ github.com/google/go-cmp v0.3.1 \ github.com/google/go-cmp v0.4.0 \ github.com/google/go-cmp v0.5.1 \ github.com/google/go-cmp v0.5.5 \ + github.com/google/go-cmp v0.5.8 \ github.com/jackc/chunkreader/v2 v2.0.0 \ github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3 \ github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb \ github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7 \ + github.com/jackc/pgconn v1.14.0 \ github.com/jackc/pgconn v1.8.0 \ github.com/jackc/pgconn v1.9.0 \ github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530 \ @@ -124,6 +152,7 @@ MODGO_MODFILES = \ github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29 \ github.com/jackc/pgproto3/v2 v2.0.6 \ github.com/jackc/pgproto3/v2 v2.1.1 \ + github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b \ github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0 \ github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90 \ github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59 \ @@ -148,15 +177,22 @@ MODGO_MODFILES = \ github.com/pingcap/errors v0.11.0 \ github.com/pingcap/log v0.0.0-20210625125904-98ed8e2eb1c7 \ github.com/pkg/errors v0.8.1 \ + github.com/rogpeppe/go-internal v1.3.0 \ github.com/rs/zerolog v1.13.0 \ github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 \ github.com/sirupsen/logrus v1.4.1 \ github.com/stretchr/objx v0.1.0 \ github.com/stretchr/objx v0.1.1 \ + github.com/stretchr/objx v0.2.0 \ + github.com/stretchr/objx v0.4.0 \ github.com/stretchr/testify v1.2.2 \ github.com/stretchr/testify v1.3.0 \ github.com/stretchr/testify v1.4.0 \ github.com/stretchr/testify v1.5.1 \ + github.com/stretchr/testify v1.7.0 \ + github.com/stretchr/testify v1.7.1 \ + github.com/stretchr/testify v1.8.0 \ + github.com/yuin/goldmark v1.3.5 \ go.uber.org/atomic v1.3.2 \ go.uber.org/atomic v1.4.0 \ go.uber.org/atomic v1.5.0 \ @@ -181,15 +217,28 @@ MODGO_MODFILES = \ golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c \ golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e \ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 \ + golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 \ + golang.org/x/crypto v0.6.0 \ + golang.org/x/exp v0.0.0-20220428152302-39d4317da171 \ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e \ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee \ golang.org/x/mod v0.4.2 \ + golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 \ + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 \ golang.org/x/net v0.0.0-20190311183353-d8887717615a \ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 \ golang.org/x/net v0.0.0-20190620200207-3b0461eec859 \ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 \ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 \ + golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 \ + golang.org/x/net v0.0.0-20220722155237-a158d28d115b \ + golang.org/x/net v0.6.0 \ + golang.org/x/net v0.8.0 \ + golang.org/x/net v0.9.0 \ golang.org/x/sync v0.0.0-20190423024810-112230192c58 \ + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c \ + golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 \ + golang.org/x/sync v0.1.0 \ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 \ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a \ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 \ @@ -204,12 +253,24 @@ MODGO_MODFILES = \ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 \ golang.org/x/sys v0.0.0-20210510120138-977fb7262007 \ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 \ + golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 \ + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a \ + golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f \ + golang.org/x/sys v0.5.0 \ + golang.org/x/sys v0.6.0 \ + golang.org/x/sys v0.7.0 \ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 \ + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 \ + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 \ + golang.org/x/term v0.5.0 \ golang.org/x/text v0.3.0 \ golang.org/x/text v0.3.2 \ golang.org/x/text v0.3.3 \ golang.org/x/text v0.3.4 \ golang.org/x/text v0.3.6 \ + golang.org/x/text v0.3.7 \ + golang.org/x/text v0.7.0 \ + golang.org/x/text v0.8.0 \ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e \ golang.org/x/tools v0.0.0-20190311212946-11955173bddd \ golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc \ @@ -220,12 +281,17 @@ MODGO_MODFILES = \ golang.org/x/tools v0.0.0-20191108193012-7d206e10da11 \ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e \ golang.org/x/tools v0.0.0-20200103221440-774c71fcf114 \ + golang.org/x/tools v0.1.10 \ + golang.org/x/tools v0.1.12 \ golang.org/x/tools v0.1.5 \ + golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023 \ golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 \ golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522 \ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 \ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 \ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 \ + google.golang.org/genproto v0.0.0-20230525234025-438c736192d0 \ + google.golang.org/grpc v1.54.0 \ google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd \ google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64 \ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60 \ @@ -234,8 +300,12 @@ MODGO_MODFILES = \ google.golang.org/protobuf v1.23.0 \ google.golang.org/protobuf v1.26.0 \ google.golang.org/protobuf v1.26.0-rc.1 \ + google.golang.org/protobuf v1.28.1 \ + google.golang.org/protobuf v1.30.0 \ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 \ + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 \ + gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b \ gopkg.in/yaml.v2 v2.2.2 \ - gopkg.in/yaml.v2 v2.2.8 \ - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c \ + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 69eb36e01..6e1348d35 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -3,10 +3,10 @@ COMMENT-lang= vi clone, NLS subpackage # careful with PLISTs if updating; it usually works best if you use # a gui flavour rather than no_x11 -V= 9.0.1876 +V= 9.0.1897 # keep -current > -stable until 7.4 (guic moved to gtk+4) -REVISION-main= 0 +#REVISION-main= 0 DIST_TUPLE+= github vim vim v$V . \ github vim colorschemes 22986fa2a3d2f7229efd4019fcbca411caa6afbb . diff --git a/editors/vim/distinfo b/editors/vim/distinfo index 4b61ce47e..7899cf899 100644 --- a/editors/vim/distinfo +++ b/editors/vim/distinfo @@ -1,4 +1,4 @@ SHA256 (vim-colorschemes-22986fa2a3d2f7229efd4019fcbca411caa6afbb.tar.gz) = qBRiDk+6Lf3IMLBTpcAlLlqgVGTNZwmVw8mzYagcfp4= -SHA256 (vim-vim-v9.0.1876.tar.gz) = HsXxm+VDIi73mEwruNLeHC6hf6EV3SIwegD17wbqKwE= +SHA256 (vim-vim-v9.0.1897.tar.gz) = jJymsVwsp3WXYWnfrzGcc1/kqMdIoJfhiKVsrDBZM0A= SIZE (vim-colorschemes-22986fa2a3d2f7229efd4019fcbca411caa6afbb.tar.gz) = 124686 -SIZE (vim-vim-v9.0.1876.tar.gz) = 17253154 +SIZE (vim-vim-v9.0.1897.tar.gz) = 17267585 diff --git a/editors/vim/pkg/PLIST-main b/editors/vim/pkg/PLIST-main index 20255ed15..dcdf2ad18 100644 --- a/editors/vim/pkg/PLIST-main +++ b/editors/vim/pkg/PLIST-main @@ -1475,6 +1475,7 @@ share/vim/${P}/syntax/model.vim share/vim/${P}/syntax/modsim3.vim share/vim/${P}/syntax/modula2.vim share/vim/${P}/syntax/modula3.vim +share/vim/${P}/syntax/mojo.vim share/vim/${P}/syntax/monk.vim share/vim/${P}/syntax/moo.vim share/vim/${P}/syntax/mp.vim diff --git a/emulators/Makefile b/emulators/Makefile index efff3d13a..8021cde9a 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -35,6 +35,7 @@ SUBDIR += libretro-pcsx-rearmed SUBDIR += mame SUBDIR += mednafen + SUBDIR += mednaffe SUBDIR += mgba SUBDIR += mupen64plus SUBDIR += nestopia diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile index b770d448e..075f9e0c7 100644 --- a/emulators/mednafen/Makefile +++ b/emulators/mednafen/Makefile @@ -4,7 +4,7 @@ COMMENT = emulates numerous game consoles VERSION = 1.31.0-UNSTABLE DISTNAME = mednafen-${VERSION} PKGNAME = mednafen-${VERSION:C/-UNSTABLE//} -REVISION = 1 +REVISION = 2 CATEGORIES = emulators games HOMEPAGE = https://mednafen.github.io @@ -29,6 +29,7 @@ LIB_DEPENDS = audio/flac \ WRKDIST = ${WRKDIR}/mednafen USE_WXNEEDED = Yes +USE_NOBTCFI = Yes CONFIGURE_STYLE = gnu CONFIGURE_ENV = CFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2" \ diff --git a/emulators/mednaffe/Makefile b/emulators/mednaffe/Makefile new file mode 100644 index 000000000..94d73c182 --- /dev/null +++ b/emulators/mednaffe/Makefile @@ -0,0 +1,29 @@ +COMMENT = graphical frontend for mednafen + +DISTNAME = mednaffe-$V +V = 0.9.2 + +CATEGORIES = emulators + +HOMEPAGE = https://github.com/AmatCoder/mednaffe/ + +# GPLv3+ +PERMIT_PACKAGE = Yes + +WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 +WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 harfbuzz intl pango-1.0 +WANTLIB += pangocairo-1.0 + +SITES = https://github.com/AmatCoder/mednaffe/releases/download/$V/ + +RUN_DEPENDS = devel/desktop-file-utils \ + emulators/mednafen \ + x11/gtk+4,-guic +LIB_DEPENDS = x11/gtk+3 + +USE_GMAKE = Yes +CONFIGURE_STYLE = gnu + +DEBUG_PACKAGES = ${BUILD_PACKAGES} + +.include diff --git a/emulators/mednaffe/distinfo b/emulators/mednaffe/distinfo new file mode 100644 index 000000000..6d5c3935a --- /dev/null +++ b/emulators/mednaffe/distinfo @@ -0,0 +1,2 @@ +SHA256 (mednaffe-0.9.2.tar.gz) = /Z18z20wzREjSSUYvvnfRNZ8c/woF6hXUZGyR2TORDY= +SIZE (mednaffe-0.9.2.tar.gz) = 2020368 diff --git a/emulators/mednaffe/pkg/DESCR b/emulators/mednaffe/pkg/DESCR new file mode 100644 index 000000000..ca1418c6a --- /dev/null +++ b/emulators/mednaffe/pkg/DESCR @@ -0,0 +1,2 @@ +Mednaffe is a front-end (GUI) for the mednafen emulator, depending only on +GTK 3. diff --git a/emulators/mednaffe/pkg/PLIST b/emulators/mednaffe/pkg/PLIST new file mode 100644 index 000000000..a19bb06c8 --- /dev/null +++ b/emulators/mednaffe/pkg/PLIST @@ -0,0 +1,17 @@ +@bin bin/mednaffe +share/applications/mednaffe.desktop +share/doc/mednaffe/ +share/doc/mednaffe/AUTHORS +share/doc/mednaffe/COPYING +share/doc/mednaffe/ChangeLog +share/doc/mednaffe/README +share/icons/hicolor/128x128/apps/mednaffe.png +share/icons/hicolor/16x16/apps/mednaffe.png +share/icons/hicolor/32x32/apps/mednaffe.png +share/icons/hicolor/48x48/apps/mednaffe.png +share/icons/hicolor/64x64/apps/mednaffe.png +share/icons/hicolor/scalable/apps/mednaffe.svg +share/pixmaps/ +share/pixmaps/mednaffe.png +@tag update-desktop-database +@tag gtk-update-icon-cache %D/share/icons/hicolor diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile index 9c422d5bb..da35ebce6 100644 --- a/emulators/ppsspp/Makefile +++ b/emulators/ppsspp/Makefile @@ -1,19 +1,14 @@ # See https://github.com/hrydgard/ppsspp/issues/8823 NOT_FOR_ARCHS = ${BE_ARCHS} -# FakeJit fallback broken in (at least) 1.10.3 -# ppsspp-1.10.3/Core/MIPS/JitCommon/JitCommon.cpp:75:10: error: cannot initialize return object of type 'MIPSComp::JitInterface *' with an rvalue of type 'MIPSComp::FakeJit *' -PPSSPP_JIT_ARCHS = aarch64 amd64 arm i386 -ONLY_FOR_ARCHS = ${PPSSPP_JIT_ARCHS} - -V = 1.15.4 -DISTNAME = ppsspp-$V - COMMENT = Sony PlayStation Portable emulator -EXTRACT_SUFX = .tar.xz +DISTNAME = ppsspp-$V +V = 1.16.1 -MASTER_SITES = https://github.com/hrydgard/ppsspp/releases/download/v$V/ +SITES = https://github.com/hrydgard/ppsspp/releases/download/v$V/ + +EXTRACT_SUFX = .tar.xz CATEGORIES = emulators @@ -22,11 +17,10 @@ HOMEPAGE = https://www.ppsspp.org/ # GPLv2+ PERMIT_PACKAGE = Yes -DIST_SUBDIR = ppsspp - WANTLIB += ${COMPILER_LIBCXX} -WANTLIB += GL GLEW GLU SDL2 avcodec avformat avutil c m png snappy -WANTLIB += swresample swscale z zip +WANTLIB += GL GLEW GLU ICE SDL2 SDL2_ttf SM X11 Xext avcodec avformat +WANTLIB += avutil c fontconfig m png snappy swresample swscale z zip +WANTLIB += zstd MODULES = devel/cmake \ lang/python @@ -34,24 +28,31 @@ MODPY_RUNDEP = No LIB_DEPENDS = archivers/snappy \ archivers/libzip \ + archivers/zstd \ devel/sdl2 \ + devel/sdl2-ttf \ graphics/ffmpeg \ graphics/glew \ graphics/png + COMPILER = base-clang ports-gcc CONFIGURE_ARGS = -DUSE_SYSTEM_FFMPEG=ON \ -DUSE_SYSTEM_LIBZIP=ON \ -DUSE_SYSTEM_SNAPPY=ON \ + -DUSE_SYSTEM_ZSTD=ON \ -DUSE_DISCORD=OFF \ -DUSING_EGL=OFF -CXXFLAGS += -I${X11BASE}/include +DEBUG_PACKAGES = ${BUILD_PACKAGES} + +# MIPS CPU core JIT +USE_NOBTCFI = Yes NO_TEST = Yes pre-configure: - ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt ${WRKSRC}/UI/NativeApp.cpp + ${SUBST_CMD} ${WRKSRC}/UI/NativeApp.cpp do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/PPSSPPSDL ${PREFIX}/bin diff --git a/emulators/ppsspp/distinfo b/emulators/ppsspp/distinfo index 93c914b38..935fdf4b6 100644 --- a/emulators/ppsspp/distinfo +++ b/emulators/ppsspp/distinfo @@ -1,2 +1,2 @@ -SHA256 (ppsspp/ppsspp-1.15.4.tar.xz) = ogvSe0zagR1s0hgvv80W9wktal0H/LvQDMcjBTC99ow= -SIZE (ppsspp/ppsspp-1.15.4.tar.xz) = 51947468 +SHA256 (ppsspp-1.16.1.tar.xz) = sZ/NigQS2/UCDFhYIq3FnPo3EwSlKsWamBgR4w2AN9k= +SIZE (ppsspp-1.16.1.tar.xz) = 50656184 diff --git a/emulators/ppsspp/patches/patch-CMakeLists_txt b/emulators/ppsspp/patches/patch-CMakeLists_txt index 0e32bad26..7a772a4b8 100644 --- a/emulators/ppsspp/patches/patch-CMakeLists_txt +++ b/emulators/ppsspp/patches/patch-CMakeLists_txt @@ -1,24 +1,10 @@ -- Fix building on OpenBSD - 94aed7a1011ef48e6524fb16bfb7dfb025dc0746 - -- Fix includes - Honor CFLAGS and DEBUG - Use system libpng on arm platforms Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -258,6 +258,9 @@ if(MACOSX AND NOT IOS) - endif() - endif() - -+include_directories(${X11BASE}/include) -+include_directories(${LOCALBASE}/lib/libzip/include) -+ - include(FindThreads) - - if(APPLE) -@@ -358,13 +361,13 @@ if(NOT MSVC) +@@ -378,13 +378,13 @@ if(NOT MSVC) endif() endif() @@ -36,24 +22,7 @@ Index: CMakeLists.txt set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG") # Enable checking printf-like format strings (also works for logging functions) -@@ -404,7 +407,7 @@ if(NOT MSVC) - add_definitions(-Wno-psabi) - endif() - add_definitions(-D_XOPEN_SOURCE=700) -- add_definitions(-D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1) -+ add_definitions(-D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1 -D_BSD_SOURCE) - add_definitions(-D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64) - elseif(ANDROID) - add_definitions(-fsigned-char) -@@ -933,6 +936,7 @@ endif() - find_package(LIBZIP) - if(LIBZIP_FOUND AND USE_SYSTEM_LIBZIP) - add_definitions(-DSHARED_LIBZIP) -+ include_directories(${LIBZIP_INCLUDE_DIRS}) - else() - add_library(libzip STATIC - ext/libzip/zip_add.c -@@ -1070,7 +1074,7 @@ else() +@@ -1125,7 +1125,7 @@ else() endif() # Arm platforms require at least libpng17. diff --git a/emulators/ppsspp/patches/patch-UI_NativeApp_cpp b/emulators/ppsspp/patches/patch-UI_NativeApp_cpp index 201ff2454..fb25be34c 100644 --- a/emulators/ppsspp/patches/patch-UI_NativeApp_cpp +++ b/emulators/ppsspp/patches/patch-UI_NativeApp_cpp @@ -1,17 +1,16 @@ Index: UI/NativeApp.cpp --- UI/NativeApp.cpp.orig +++ UI/NativeApp.cpp -@@ -445,12 +445,7 @@ void NativeInit(int argc, const char *argv[], const ch +@@ -416,12 +416,7 @@ void NativeInit(int argc, const char *argv[], const ch g_VFS.Register("", new DirectoryReader(Path(ASSETS_DIR))); #endif #if !defined(MOBILE_DEVICE) && !defined(_WIN32) && !PPSSPP_PLATFORM(SWITCH) - g_VFS.Register("", new DirectoryReader(File::GetExeDirectory() / "assets")); - g_VFS.Register("", new DirectoryReader(File::GetExeDirectory())); -- g_VFS.Register("", new DirectoryReader(Path("/usr/local/share/ppsspp/assets"))); + g_VFS.Register("", new DirectoryReader(Path("/usr/local/share/ppsspp/assets"))); - g_VFS.Register("", new DirectoryReader(Path("/usr/local/share/games/ppsspp/assets"))); - g_VFS.Register("", new DirectoryReader(Path("/usr/share/ppsspp/assets"))); - g_VFS.Register("", new DirectoryReader(Path("/usr/share/games/ppsspp/assets"))); -+ g_VFS.Register("", new DirectoryReader(Path("${PREFIX}/share/ppsspp/assets"))); #endif #if PPSSPP_PLATFORM(SWITCH) diff --git a/emulators/ppsspp/pkg/PLIST b/emulators/ppsspp/pkg/PLIST index 959f7c37d..f44aca3e2 100644 --- a/emulators/ppsspp/pkg/PLIST +++ b/emulators/ppsspp/pkg/PLIST @@ -99,8 +99,10 @@ share/ppsspp/assets/mime/ppsspp.xml share/ppsspp/assets/ppge_atlas.meta share/ppsspp/assets/ppge_atlas.zim share/ppsspp/assets/rargray.png +share/ppsspp/assets/sfx_achievement_unlocked.wav share/ppsspp/assets/sfx_back.wav share/ppsspp/assets/sfx_confirm.wav +share/ppsspp/assets/sfx_leaderbord_submitted.wav share/ppsspp/assets/sfx_select.wav share/ppsspp/assets/sfx_toggle_off.wav share/ppsspp/assets/sfx_toggle_on.wav @@ -114,12 +116,14 @@ share/ppsspp/assets/shaders/GaussianDownscale.fsh share/ppsspp/assets/shaders/aacolor.fsh share/ppsspp/assets/shaders/aacolor.vsh share/ppsspp/assets/shaders/bloom.fsh +share/ppsspp/assets/shaders/bloomnoblur.fsh share/ppsspp/assets/shaders/cartoon.fsh share/ppsspp/assets/shaders/cartoon.vsh share/ppsspp/assets/shaders/checkers.fsh share/ppsspp/assets/shaders/colorcorrection.fsh share/ppsspp/assets/shaders/crt.fsh share/ppsspp/assets/shaders/defaultshaders.ini +share/ppsspp/assets/shaders/fakereflections.fsh share/ppsspp/assets/shaders/fxaa.fsh share/ppsspp/assets/shaders/fxaa.vsh share/ppsspp/assets/shaders/natural.fsh diff --git a/emulators/retroarch/Makefile b/emulators/retroarch/Makefile index 59744265d..6f51609f6 100644 --- a/emulators/retroarch/Makefile +++ b/emulators/retroarch/Makefile @@ -5,7 +5,10 @@ PKGNAME = retroarch-${GH_TAGNAME:S/v//} GH_ACCOUNT = libretro GH_PROJECT = RetroArch GH_TAGNAME = v1.10.3 -REVISION = 2 +REVISION = 3 + +# crashes when recording videos due to ffmpeg +USE_NOBTCFI-amd64 = Yes CATEGORIES = emulators @@ -56,6 +59,8 @@ CONFIGURE_ARGS = --disable-discord \ --disable-flac \ --enable-al +DEBUG_PACKAGES = ${BUILD_PACKAGES} + NO_TEST = Yes # strip out byte order marks that break GCC 4.2 diff --git a/emulators/vbam/Makefile b/emulators/vbam/Makefile index 36ff7351b..f1a3ad745 100644 --- a/emulators/vbam/Makefile +++ b/emulators/vbam/Makefile @@ -5,7 +5,7 @@ COMMENT = emulator for Nintendo Game Boy (Color/Advance) GH_ACCOUNT = visualboyadvance-m GH_PROJECT = ${GH_ACCOUNT} -GH_TAGNAME = v2.1.6 +GH_TAGNAME = v2.1.7 PKGNAME = vbam-${GH_TAGNAME:S/v//} CATEGORIES = emulators diff --git a/emulators/vbam/distinfo b/emulators/vbam/distinfo index 655a06adc..989aaaaa9 100644 --- a/emulators/vbam/distinfo +++ b/emulators/vbam/distinfo @@ -1,2 +1,2 @@ -SHA256 (visualboyadvance-m-2.1.6.tar.gz) = BW1Egr3Sl0RaY9SWB54LDPOBlRzV74zjCHUMdziUb8o= -SIZE (visualboyadvance-m-2.1.6.tar.gz) = 4799276 +SHA256 (visualboyadvance-m-2.1.7.tar.gz) = 99CBWmVnf3lO5oiSyVZiVAI69kHHL54GtCMLbGF5B0M= +SIZE (visualboyadvance-m-2.1.7.tar.gz) = 4804929 diff --git a/emulators/vbam/patches/patch-CMakeLists_txt b/emulators/vbam/patches/patch-CMakeLists_txt index 4d9688a33..886bdc82b 100644 --- a/emulators/vbam/patches/patch-CMakeLists_txt +++ b/emulators/vbam/patches/patch-CMakeLists_txt @@ -4,7 +4,7 @@ eg++: error: libgomp.spec: No such file or directory Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -594,7 +594,7 @@ include(SetCompilerLinkerFlags) +@@ -596,7 +596,7 @@ include(SetCompilerLinkerFlags) if(CMAKE_C_COMPILER_ID STREQUAL Clang AND CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT MSVC) # TODO: This should also be done for clang-cl. @@ -13,7 +13,7 @@ Index: CMakeLists.txt endif() if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT MSVC) -@@ -721,7 +721,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID S +@@ -723,7 +723,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID S endif() endif() diff --git a/fonts/atkinson-hyperlegible/Makefile b/fonts/atkinson-hyperlegible/Makefile index 0aa0d3bfd..cc4634acb 100644 --- a/fonts/atkinson-hyperlegible/Makefile +++ b/fonts/atkinson-hyperlegible/Makefile @@ -1,10 +1,10 @@ COMMENT = greater legibility and readability for low vision readers -TYPEFACE = Atkinson-Hyperlegible -V = 2020-0514 -VPDF = 2020-1104 -REVISION = 0 -PKGNAME = ${TYPEFACE:L}-${V:S/-/./} +TYPEFACE = atkinson-hyperlegible +VDIST = 2020-0514 +V = ${VDIST:S/-/./} +REVISION = 1 +DISTNAME = Atkinson-Hyperlegible-Font-Print-and-Web-${VDIST} CATEGORIES = fonts HOMEPAGE = https://brailleinstitute.org/freefont @@ -15,23 +15,21 @@ PERMIT_PACKAGE = Yes MODULES = font FONTTYPES = otf -MASTER_SITES = https://brailleinstitute.org/wp-content/uploads/atkinson-hyperlegible-font/ -MASTER_SITES0 = https://brailleinstitute.org/wp-content/uploads/2020/11/ -DISTFILES = Atkinson-Hyperlegible-Font-Print-and-Web-${V}.zip \ - Atkinson-Hyperlegible-Font-License-${VPDF}.pdf:0 +SITES = https://brailleinstitute.org/wp-content/uploads/atkinson-hyperlegible-font/ +SITES.doc = https://brailleinstitute.org/wp-content/uploads/2020/11/ +DISTFILES.doc = Atkinson-Hyperlegible-Font-License-2020-1104.pdf -EXTRACT_ONLY = Atkinson-Hyperlegible-Font-Print-and-Web-${V}.zip +EXTRACT_ONLY = ${DISTFILES} NO_BUILD = Yes NO_TEST = Yes -SUBST_VARS += VPDF -WRKSRC = ${WRKDIR}/${TYPEFACE}-Font-Print-and-Web-${V}/Print\ Fonts -DOCDIR = ${PREFIX}/share/doc/hyperlegible +WRKSRC = ${WRKDIST}/Print\ Fonts +DOCDIR = ${PREFIX}/share/doc/${TYPEFACE} post-install: ${INSTALL_DATA_DIR} ${DOCDIR} - ${INSTALL_DATA} ${FULLDISTDIR}/${TYPEFACE}-Font-License-${VPDF}.pdf \ - ${DOCDIR} + ${INSTALL_DATA} ${FULLDISTDIR}/${DISTFILES.doc} \ + ${DOCDIR}/Atkinson-Hyperlegible-Font-License.pdf .include diff --git a/fonts/atkinson-hyperlegible/pkg/PLIST b/fonts/atkinson-hyperlegible/pkg/PLIST index 90990df07..76c99d4c2 100644 --- a/fonts/atkinson-hyperlegible/pkg/PLIST +++ b/fonts/atkinson-hyperlegible/pkg/PLIST @@ -1,8 +1,8 @@ -share/doc/hyperlegible/ -share/doc/hyperlegible/Atkinson-Hyperlegible-Font-License-${VPDF}.pdf +share/doc/atkinson-hyperlegible/ +share/doc/atkinson-hyperlegible/Atkinson-Hyperlegible-Font-License.pdf share/fonts/ -@fontdir share/fonts/Atkinson-Hyperlegible/ -share/fonts/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Bold-102.otf -share/fonts/Atkinson-Hyperlegible/Atkinson-Hyperlegible-BoldItalic-102.otf -share/fonts/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Italic-102.otf -share/fonts/Atkinson-Hyperlegible/Atkinson-Hyperlegible-Regular-102.otf +@fontdir share/fonts/atkinson-hyperlegible/ +share/fonts/atkinson-hyperlegible/Atkinson-Hyperlegible-Bold-102.otf +share/fonts/atkinson-hyperlegible/Atkinson-Hyperlegible-BoldItalic-102.otf +share/fonts/atkinson-hyperlegible/Atkinson-Hyperlegible-Italic-102.otf +share/fonts/atkinson-hyperlegible/Atkinson-Hyperlegible-Regular-102.otf diff --git a/fonts/ja-kanjistrokeorders-ttf/Makefile b/fonts/ja-kanjistrokeorders-ttf/Makefile index 44558419b..ac415df8b 100644 --- a/fonts/ja-kanjistrokeorders-ttf/Makefile +++ b/fonts/ja-kanjistrokeorders-ttf/Makefile @@ -2,7 +2,7 @@ PKG_ARCH = * COMMENT = font to view stroke order diagrams for Kanji, Kana and etc -DISTNAME = KanjiStrokeOrders_v4.003 +DISTNAME = KanjiStrokeOrders_v4.004 PKGNAME = ja-${DISTNAME:L:S/_v/-ttf-/} CATEGORIES = fonts japanese x11 @@ -12,7 +12,7 @@ HOMEPAGE = https://www.nihilist.org.uk/ PERMIT_PACKAGE = Yes MASTER_SITES = https://drive.google.com/ -DISTFILES = KanjiStrokeOrders_v4.003.zip{uc?export=download&id=1gd5vUzwgfUSggn8ZbEG2m03x3bbwYPfL} +DISTFILES = KanjiStrokeOrders_v4.004.zip{uc?export=download&id=1snpD-IQmT6fGGQjEePHdDzE2aiwuKrz4} EXTRACT_SUFX = .zip diff --git a/fonts/ja-kanjistrokeorders-ttf/distinfo b/fonts/ja-kanjistrokeorders-ttf/distinfo index 5480220bc..18c7f09ee 100644 --- a/fonts/ja-kanjistrokeorders-ttf/distinfo +++ b/fonts/ja-kanjistrokeorders-ttf/distinfo @@ -1,2 +1,2 @@ -SHA256 (KanjiStrokeOrders_v4.003.zip) = CL+jM/APViAGQdEcXmwxotMfFUWkNeoU9zrl81saQQA= -SIZE (KanjiStrokeOrders_v4.003.zip) = 9117999 +SHA256 (KanjiStrokeOrders_v4.004.zip) = UwYdNuLHQAsrlBvWMoxA04ZYbVxaP4nEOCWi1pedXu4= +SIZE (KanjiStrokeOrders_v4.004.zip) = 9028084 diff --git a/fonts/ja-kanjistrokeorders-ttf/pkg/PLIST b/fonts/ja-kanjistrokeorders-ttf/pkg/PLIST index 3b443e1a2..8d5f62fae 100644 --- a/fonts/ja-kanjistrokeorders-ttf/pkg/PLIST +++ b/fonts/ja-kanjistrokeorders-ttf/pkg/PLIST @@ -1,6 +1,6 @@ @pkgpath japanese/kanjistrokeorders-ttf share/fonts/ @fontdir share/fonts/KanjiStrokeOrders/ -share/fonts/KanjiStrokeOrders/KanjiStrokeOrders_v4.003.ttf +share/fonts/KanjiStrokeOrders/KanjiStrokeOrders_v4.004.ttf share/fonts/KanjiStrokeOrders/copyright.txt -share/fonts/KanjiStrokeOrders/readme_en_v4.003.txt +share/fonts/KanjiStrokeOrders/readme_en_v4.004.txt diff --git a/games/Makefile b/games/Makefile index fc535ce27..1b8a38cbc 100644 --- a/games/Makefile +++ b/games/Makefile @@ -232,6 +232,7 @@ SUBDIR += openttd-data SUBDIR += opentyrian SUBDIR += openxcom + SUBDIR += orthorobot SUBDIR += pacman-arena SUBDIR += pathological SUBDIR += pentobi diff --git a/games/orthorobot/Makefile b/games/orthorobot/Makefile new file mode 100644 index 000000000..9cd0ff276 --- /dev/null +++ b/games/orthorobot/Makefile @@ -0,0 +1,30 @@ +COMMENT = perspective puzzle game + +GH_ACCOUNT = Stabyourself +GH_PROJECT = orthorobot +GH_TAGNAME = v1.1.1 + +CATEGORIES = games + +HOMEPAGE = https://stabyourself.net/orthorobot/ + +# WTFPL +PERMIT_PACKAGE = Yes + +EXTRACT_SUFX = .zip + +BUILD_DEPENDS = archivers/zip +RUN_DEPENDS = games/love/0.10 + +NO_BUILD = Yes +NO_TEST = Yes + +PKG_ARCH = * + +do-install: + ${INSTALL_SCRIPT} ${FILESDIR}/orthorobot ${PREFIX}/bin + sed -i -e "s,\$${LOCALBASE},${LOCALBASE},g" ${PREFIX}/bin/orthorobot + ${INSTALL_DATA_DIR} ${PREFIX}/share/orthorobot + cd ${WRKSRC} && zip -r ${PREFIX}/share/orthorobot/orthorobot.love * + +.include diff --git a/games/orthorobot/distinfo b/games/orthorobot/distinfo new file mode 100644 index 000000000..432d3cd8c --- /dev/null +++ b/games/orthorobot/distinfo @@ -0,0 +1,2 @@ +SHA256 (orthorobot-1.1.1.zip) = USSRf4lgQVuKSf3NV0TnFWB0TTETgAq8ZAMghf/tGm8= +SIZE (orthorobot-1.1.1.zip) = 3439866 diff --git a/games/orthorobot/files/orthorobot b/games/orthorobot/files/orthorobot new file mode 100644 index 000000000..2d96c1d10 --- /dev/null +++ b/games/orthorobot/files/orthorobot @@ -0,0 +1,3 @@ +#!/bin/sh + +${LOCALBASE}/bin/love-0.10 ${LOCALBASE}/share/orthorobot/orthorobot.love diff --git a/games/orthorobot/pkg/DESCR b/games/orthorobot/pkg/DESCR new file mode 100644 index 000000000..3a07ce5b7 --- /dev/null +++ b/games/orthorobot/pkg/DESCR @@ -0,0 +1,6 @@ +Literally bridging the gap between 2D and 3D games, Ortho Robot is a +perspective based puzzle game, where you flatten the view to move across +gaps. Your objective is to reach the ending green block (either by +standing directly on it or standing on it in relative space). For some +extra challenge, try to collect all coins and perfect your time, steps +and number of warps. diff --git a/games/orthorobot/pkg/PLIST b/games/orthorobot/pkg/PLIST new file mode 100644 index 000000000..5f30649e5 --- /dev/null +++ b/games/orthorobot/pkg/PLIST @@ -0,0 +1,3 @@ +bin/orthorobot +share/orthorobot/ +share/orthorobot/orthorobot.love diff --git a/geo/gdal/Makefile b/geo/gdal/Makefile index 01cf4bf2f..d086cf98a 100644 --- a/geo/gdal/Makefile +++ b/geo/gdal/Makefile @@ -1,11 +1,10 @@ COMMENT-main = translator library for geospatial data formats COMMENT-python =python bindings and utilities for GDAL -V = 3.7.1 +V = 3.7.2 DISTNAME = gdal-${V} DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \ gdalautotest-${V}${EXTRACT_SUFX} -REVISION = 0 FULLPKGNAME-main = ${DISTNAME} FULLPKGPATH-main = geo/gdal,-main diff --git a/geo/gdal/distinfo b/geo/gdal/distinfo index fbb8761df..e361c0ac7 100644 --- a/geo/gdal/distinfo +++ b/geo/gdal/distinfo @@ -1,4 +1,4 @@ -SHA256 (gdal-3.7.1.tar.gz) = wTGjnQ98KnbwLdZI8pBhed2ziVhnNGHu4dpPnJoWbnY= -SHA256 (gdalautotest-3.7.1.tar.gz) = s79Q7CBRgLMzPck/eW6msPWlwHpV6hOCvxkuc8A6naI= -SIZE (gdal-3.7.1.tar.gz) = 13668693 -SIZE (gdalautotest-3.7.1.tar.gz) = 13830135 +SHA256 (gdal-3.7.2.tar.gz) = /Yqrxj4CvM4q7MAjSvWBcbkfR4thEfdbSyNpGdrDaaU= +SHA256 (gdalautotest-3.7.2.tar.gz) = //Pm6d0KkC7bl2+/GLHE1zv2b+ikeNpnW8plphCntc4= +SIZE (gdal-3.7.2.tar.gz) = 13678172 +SIZE (gdalautotest-3.7.2.tar.gz) = 13835621 diff --git a/geo/geoclue2/Makefile b/geo/geoclue2/Makefile index c35de2f77..7aa1b4056 100644 --- a/geo/geoclue2/Makefile +++ b/geo/geoclue2/Makefile @@ -1,6 +1,6 @@ COMMENT= modular geoinformation service on top of D-Bus -VERSION= 2.7.0 +VERSION= 2.7.1 DISTNAME= geoclue-${VERSION} PKGNAME= geoclue2-${VERSION} @@ -48,7 +48,7 @@ CONFIGURE_ARGS += -D3g-source=false \ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/geoclue2 - mv ${WRKINST}${SYSCONFDIR}/{dbus-1,geoclue,xdg} \ + mv ${WRKINST}${SYSCONFDIR}/{geoclue,xdg} \ ${PREFIX}/share/examples/geoclue2 .include diff --git a/geo/geoclue2/distinfo b/geo/geoclue2/distinfo index 30eb25125..71eb03789 100644 --- a/geo/geoclue2/distinfo +++ b/geo/geoclue2/distinfo @@ -1,2 +1,2 @@ -SHA256 (geoclue-2.7.0.tar.bz2) = Hc6OVzzTOLyHpb1yX4mm9UP6yDjipdgyUVy16g2Gz0A= -SIZE (geoclue-2.7.0.tar.bz2) = 105353 +SHA256 (geoclue-2.7.1.tar.bz2) = ViTNQRSGQ8RtaB05FTx9Jv24gx5+fIYBwwBzL6im2xw= +SIZE (geoclue-2.7.1.tar.bz2) = 106458 diff --git a/geo/geoclue2/pkg/PLIST b/geo/geoclue2/pkg/PLIST index a41ef2cb6..8c76b70d0 100644 --- a/geo/geoclue2/pkg/PLIST +++ b/geo/geoclue2/pkg/PLIST @@ -30,13 +30,9 @@ share/dbus-1/interfaces/org.freedesktop.GeoClue2.Location.xml share/dbus-1/interfaces/org.freedesktop.GeoClue2.Manager.xml share/dbus-1/interfaces/org.freedesktop.GeoClue2.xml share/dbus-1/system-services/org.freedesktop.GeoClue2.service +share/dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf +share/dbus-1/system.d/org.freedesktop.GeoClue2.conf share/examples/geoclue2/ -share/examples/geoclue2/dbus-1/ -share/examples/geoclue2/dbus-1/system.d/ -share/examples/geoclue2/dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf -@sample ${SYSCONFDIR}/dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf -share/examples/geoclue2/dbus-1/system.d/org.freedesktop.GeoClue2.conf -@sample ${SYSCONFDIR}/dbus-1/system.d/org.freedesktop.GeoClue2.conf share/examples/geoclue2/geoclue/ @sample ${SYSCONFDIR}/geoclue/ share/examples/geoclue2/geoclue/conf.d/ diff --git a/geo/qgis/Makefile b/geo/qgis/Makefile index 69dcf9765..bb1112e88 100644 --- a/geo/qgis/Makefile +++ b/geo/qgis/Makefile @@ -6,14 +6,14 @@ COMMENT = desktop geographical information system DPB_PROPERTIES = parallel -DISTNAME = qgis-3.32.2 +DISTNAME = qgis-3.32.3 EXTRACT_SUFX = .tar.bz2 CATEGORIES = geo x11 DEBUG_PACKAGES =${BUILD_PACKAGES} SHARED_LIBS = qgis_core 71.0 \ - qgis_app 46.0 \ - qgis_gui 53.1 \ + qgis_app 46.1 \ + qgis_gui 53.2 \ qgis_analysis 22.0 \ qgis_server 19.0 \ qgispython 6.0 \ diff --git a/geo/qgis/distinfo b/geo/qgis/distinfo index 74cd6e010..3320f941c 100644 --- a/geo/qgis/distinfo +++ b/geo/qgis/distinfo @@ -1,2 +1,2 @@ -SHA256 (qgis-3.32.2.tar.bz2) = ZvGYJJXux6HaQxytzQ2PrKJZmqXnF9IaabJmTHlGFIs= -SIZE (qgis-3.32.2.tar.bz2) = 161653407 +SHA256 (qgis-3.32.3.tar.bz2) = zVJIdEfr2VK0+7FYuGAt6V+OlA6deTkbuhX5Qc3dB0A= +SIZE (qgis-3.32.3.tar.bz2) = 161368983 diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile index 08626ebf8..19c84fa30 100644 --- a/graphics/py-Pillow/Makefile +++ b/graphics/py-Pillow/Makefile @@ -1,6 +1,6 @@ COMMENT= Python Imaging Library (friendly fork of PIL) -MODPY_EGG_VERSION= 10.0.0 +MODPY_EGG_VERSION= 10.0.1 DISTNAME= Pillow-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} CATEGORIES= graphics diff --git a/graphics/py-Pillow/distinfo b/graphics/py-Pillow/distinfo index c669ffe39..6a2ea57fa 100644 --- a/graphics/py-Pillow/distinfo +++ b/graphics/py-Pillow/distinfo @@ -1,2 +1,2 @@ -SHA256 (Pillow-10.0.0.tar.gz) = nIK1s+BDx68NlXktDSDM9o9hof7Gs1MOcYtohCJyc5Y= -SIZE (Pillow-10.0.0.tar.gz) = 50527522 +SHA256 (Pillow-10.0.1.tar.gz) = 1ylnsGvpMA/tXPvItbr87sSL983H2rZrHSVJA1KHGR0= +SIZE (Pillow-10.0.1.tar.gz) = 50528551 diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile index 0badb4c8d..009517400 100644 --- a/graphics/py-matplotlib/Makefile +++ b/graphics/py-matplotlib/Makefile @@ -1,6 +1,6 @@ COMMENT= Python charting and plotting API -MODPY_EGG_VERSION = 3.7.2 +MODPY_EGG_VERSION = 3.7.3 DISTNAME = matplotlib-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} diff --git a/graphics/py-matplotlib/distinfo b/graphics/py-matplotlib/distinfo index 0ff3cbc3d..8dd0ed024 100644 --- a/graphics/py-matplotlib/distinfo +++ b/graphics/py-matplotlib/distinfo @@ -1,2 +1,2 @@ -SHA256 (matplotlib-3.7.2.tar.gz) = qM25Hd2wRDa9LwmLj99LgTUuaM9NLGdW/MQUeRB2Vps= -SIZE (matplotlib-3.7.2.tar.gz) = 38095843 +SHA256 (matplotlib-3.7.3.tar.gz) = 8Js91r3rWI3pH4U7uy1vD/iraTSFsMSQNeqlEMtPFC4= +SIZE (matplotlib-3.7.3.tar.gz) = 38097222 diff --git a/graphics/py-matplotlib/pkg/PLIST b/graphics/py-matplotlib/pkg/PLIST index e57c99937..eed252388 100644 --- a/graphics/py-matplotlib/pkg/PLIST +++ b/graphics/py-matplotlib/pkg/PLIST @@ -721,6 +721,8 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/${MODPY_PYCACHE}test_a lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/${MODPY_PYCACHE}test_artist.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/${MODPY_PYCACHE}test_axes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/${MODPY_PYCACHE}test_axes.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/${MODPY_PYCACHE}test_axis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/${MODPY_PYCACHE}test_axis.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/${MODPY_PYCACHE}test_backend_bases.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/${MODPY_PYCACHE}test_backend_bases.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/${MODPY_PYCACHE}test_backend_cairo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} @@ -3297,6 +3299,7 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/test_api.py lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/test_arrow_patches.py lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/test_artist.py lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/test_axes.py +lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/test_axis.py lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/test_backend_bases.py lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/test_backend_cairo.py lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/test_backend_gtk3.py diff --git a/infrastructure/lib/DPB/Distfile.pm b/infrastructure/lib/DPB/Distfile.pm index 78b6cef83..f961387b9 100644 --- a/infrastructure/lib/DPB/Distfile.pm +++ b/infrastructure/lib/DPB/Distfile.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Distfile.pm,v 1.28 2023/05/29 19:04:50 espie Exp $ +# $OpenBSD: Distfile.pm,v 1.29 2023/09/14 15:17:38 espie Exp $ # # Copyright (c) 2010-2013 Marc Espie # @@ -70,6 +70,7 @@ sub complete($self, $file, $short, $site, $distinfo, $fname, $v, $repo) $v->break("Missing sha for $file in $fname"); return; } + # XXX todo reset object correctly so that sz is always defined if ($self->{sz} != 0) { if ($self->{sz} != $sz) { $v->break("Inconsistent info for $file in $fname: $self->{sz} vs $sz(".$v->fullpkgpath." vs ".$self->{path}->fullpkgpath.")"); diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk index 5722c89ae..ed019648a 100644 --- a/infrastructure/mk/bsd.port.mk +++ b/infrastructure/mk/bsd.port.mk @@ -1,6 +1,6 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 sw=4 filetype=make: -# $OpenBSD: bsd.port.mk,v 1.1621 2023/09/13 07:47:11 espie Exp $ +# $OpenBSD: bsd.port.mk,v 1.1623 2023/09/16 07:56:08 op Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -280,6 +280,8 @@ NO_TEST ?= No INSTALL_TARGET ?= install USE_GROFF ?= No +CHECK_LIB_DEPENDS_ARGS = + .if !defined(_ARCH_DEFINES_INCLUDED) _ARCH_DEFINES_INCLUDED = Done . include "${PORTSDIR}/infrastructure/mk/arch-defines.mk" @@ -1981,12 +1983,13 @@ _check_lib_depends = ${_CHECK_LIB_DEPENDS} _check_lib_depends =: .endif +CHECK_LIB_DEPENDS_ARGS += -S COMPILER_LIBCXX="${COMPILER_LIBCXX}" +CHECK_LIB_DEPENDS_ARGS += -S LIBECXX="${LIBECXX}" +CHECK_LIB_DEPENDS_ARGS += -S LIBCXX="${LIBCXX}" +CHECK_LIB_DEPENDS_ARGS += -F pthread + _CHECK_LIB_DEPENDS = PORTSDIR=${PORTSDIR} ${_PERLSCRIPT}/check-lib-depends -_CHECK_LIB_DEPENDS += -d ${_PKG_REPO} -B ${WRKINST} -_CHECK_LIB_DEPENDS += -S COMPILER_LIBCXX="${COMPILER_LIBCXX}" -_CHECK_LIB_DEPENDS += -S LIBECXX="${LIBECXX}" -_CHECK_LIB_DEPENDS += -S LIBCXX="${LIBCXX}" -_CHECK_LIB_DEPENDS += -F pthread +_CHECK_LIB_DEPENDS += -d ${_PKG_REPO} -B ${WRKINST} ${CHECK_LIB_DEPENDS_ARGS} .for _s in ${MULTI_PACKAGES} . if ${STATIC_PLIST${_s}:L} == "no" @@ -3227,6 +3230,11 @@ print-plist-contents: print-plist-libs: @${_PKG_CREATE} -DLIBS_ONLY -n -Q ${PKG_ARGS${SUBPACKAGE}} ${_PACKAGE_COOKIE${SUBPACKAGE}}|${_grab_libs_from_plist} +print-plist-all-libs: +.for _S in ${BUILD_PACKAGES} + @${_PKG_CREATE} -DLIBS_ONLY -n -Q ${PKG_ARGS${_S}} ${_PACKAGE_COOKIE${_S}}|${_grab_libs_from_plist} +.endfor + _internal-package-only: ${_PACKAGE_COOKIES} _internal-subpackage: ${_PACKAGE_COOKIES${SUBPACKAGE}} diff --git a/inputmethods/ibus-typing-booster/Makefile b/inputmethods/ibus-typing-booster/Makefile index 666132a3c..9c428c929 100644 --- a/inputmethods/ibus-typing-booster/Makefile +++ b/inputmethods/ibus-typing-booster/Makefile @@ -1,12 +1,14 @@ COMMENT = completion input-method to speed up typing -VERSION = 2.24.0 +VERSION = 2.24.1 DISTNAME = ibus-typing-booster-${VERSION} CATEGORIES = inputmethods HOMEPAGE = https://mike-fabian.github.io/ibus-typing-booster/ +MAINTAINER = Antoine Jacoutot + # GPLv3+, APLv2 (fonts) PERMIT_PACKAGE = Yes diff --git a/inputmethods/ibus-typing-booster/distinfo b/inputmethods/ibus-typing-booster/distinfo index 92e0a7d4a..5eb408079 100644 --- a/inputmethods/ibus-typing-booster/distinfo +++ b/inputmethods/ibus-typing-booster/distinfo @@ -1,2 +1,2 @@ -SHA256 (ibus-typing-booster-2.24.0.tar.gz) = 23vBX9ziNsws+n4kGxxj+6Dd++QJdD+2p4WCoHvBuQM= -SIZE (ibus-typing-booster-2.24.0.tar.gz) = 12225906 +SHA256 (ibus-typing-booster-2.24.1.tar.gz) = LCTTcV0RS2X4Phys0pPjz6wOSX35lOgRQTjPp3/cHHs= +SIZE (ibus-typing-booster-2.24.1.tar.gz) = 12218815 diff --git a/inputmethods/ibus-typing-booster/pkg/PLIST b/inputmethods/ibus-typing-booster/pkg/PLIST index 929c06be4..521d7ef12 100644 --- a/inputmethods/ibus-typing-booster/pkg/PLIST +++ b/inputmethods/ibus-typing-booster/pkg/PLIST @@ -221,7 +221,6 @@ share/ibus-typing-booster/data/annotationsDerived/gd.xml share/ibus-typing-booster/data/annotationsDerived/gl.xml share/ibus-typing-booster/data/annotationsDerived/gu.xml share/ibus-typing-booster/data/annotationsDerived/ha.xml -share/ibus-typing-booster/data/annotationsDerived/ha_NE.xml share/ibus-typing-booster/data/annotationsDerived/he.xml share/ibus-typing-booster/data/annotationsDerived/hi.xml share/ibus-typing-booster/data/annotationsDerived/hi_Latn.xml @@ -261,7 +260,6 @@ share/ibus-typing-booster/data/annotationsDerived/mr.xml share/ibus-typing-booster/data/annotationsDerived/ms.xml share/ibus-typing-booster/data/annotationsDerived/mt.xml share/ibus-typing-booster/data/annotationsDerived/my.xml -share/ibus-typing-booster/data/annotationsDerived/nb.xml share/ibus-typing-booster/data/annotationsDerived/ne.xml share/ibus-typing-booster/data/annotationsDerived/nl.xml share/ibus-typing-booster/data/annotationsDerived/nn.xml @@ -353,6 +351,8 @@ share/ibus-typing-booster/engine/${MODPY_PYCACHE}itb_nltk.${MODPY_PYC_MAGIC_TAG} share/ibus-typing-booster/engine/${MODPY_PYCACHE}itb_nltk.${MODPY_PYC_MAGIC_TAG}pyc share/ibus-typing-booster/engine/${MODPY_PYCACHE}itb_pango.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} share/ibus-typing-booster/engine/${MODPY_PYCACHE}itb_pango.${MODPY_PYC_MAGIC_TAG}pyc +share/ibus-typing-booster/engine/${MODPY_PYCACHE}itb_sound.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +share/ibus-typing-booster/engine/${MODPY_PYCACHE}itb_sound.${MODPY_PYC_MAGIC_TAG}pyc share/ibus-typing-booster/engine/${MODPY_PYCACHE}itb_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} share/ibus-typing-booster/engine/${MODPY_PYCACHE}itb_util.${MODPY_PYC_MAGIC_TAG}pyc share/ibus-typing-booster/engine/${MODPY_PYCACHE}itb_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} @@ -373,6 +373,7 @@ share/ibus-typing-booster/engine/itb_active_window.py share/ibus-typing-booster/engine/itb_emoji.py share/ibus-typing-booster/engine/itb_nltk.py share/ibus-typing-booster/engine/itb_pango.py +share/ibus-typing-booster/engine/itb_sound.py share/ibus-typing-booster/engine/itb_util.py share/ibus-typing-booster/engine/itb_version.py share/ibus-typing-booster/engine/m17n_translit.py diff --git a/java/gradle/Makefile b/java/gradle/Makefile index e08bf281b..0779026d2 100644 --- a/java/gradle/Makefile +++ b/java/gradle/Makefile @@ -1,6 +1,6 @@ COMMENT = build automation tool -DISTNAME = gradle-6.7 +DISTNAME = gradle-8.3 EXTRACT_SUFX = -bin.zip EPOCH = 0 diff --git a/java/gradle/distinfo b/java/gradle/distinfo index d7c3fd383..6f14a4484 100644 --- a/java/gradle/distinfo +++ b/java/gradle/distinfo @@ -1,2 +1,2 @@ -SHA256 (gradle-6.7-bin.zip) = itV3WQGakjPcfcTRpTDO/hCdwSIADVf35iP4z0up38Q= -SIZE (gradle-6.7-bin.zip) = 102804263 +SHA256 (gradle-8.3-bin.zip) = WRhVtRf8Y1ueBN4dBdXnato/ifX8dvh5eNGyRbT2kiU= +SIZE (gradle-8.3-bin.zip) = 130639305 diff --git a/java/gradle/patches/patch-bin_gradle b/java/gradle/patches/patch-bin_gradle index 767e2a11c..68a5fab98 100644 --- a/java/gradle/patches/patch-bin_gradle +++ b/java/gradle/patches/patch-bin_gradle @@ -1,8 +1,8 @@ Index: bin/gradle --- bin/gradle.orig +++ bin/gradle -@@ -83,6 +83,8 @@ esac - CLASSPATH=$APP_HOME/lib/gradle-launcher-6.6.jar +@@ -115,6 +115,8 @@ esac + CLASSPATH=$APP_HOME/lib/gradle-launcher-8.3.jar +JAVA_HOME="$(javaPathHelper -h gradle)" diff --git a/java/gradle/pkg/PLIST b/java/gradle/pkg/PLIST index ab8766477..2fb67bd18 100644 --- a/java/gradle/pkg/PLIST +++ b/java/gradle/pkg/PLIST @@ -10,26 +10,32 @@ share/java/gradle/bin/gradle.bat share/java/gradle/init.d/ share/java/gradle/init.d/readme.txt share/java/gradle/lib/ -share/java/gradle/lib/annotations-13.0.jar -share/java/gradle/lib/ant-1.10.8.jar -share/java/gradle/lib/ant-launcher-1.10.8.jar -share/java/gradle/lib/asm-7.3.1.jar -share/java/gradle/lib/asm-analysis-7.3.1.jar -share/java/gradle/lib/asm-commons-7.3.1.jar -share/java/gradle/lib/asm-tree-7.3.1.jar -share/java/gradle/lib/commons-compress-1.19.jar -share/java/gradle/lib/commons-io-2.6.jar +share/java/gradle/lib/HikariCP-4.0.3.jar +share/java/gradle/lib/agents/ +share/java/gradle/lib/agents/gradle-instrumentation-agent${GRADLE_JAR} +share/java/gradle/lib/annotations-24.0.0.jar +share/java/gradle/lib/ant-1.10.13.jar +share/java/gradle/lib/ant-antlr-1.10.12.jar +share/java/gradle/lib/ant-junit-1.10.12.jar +share/java/gradle/lib/ant-launcher-1.10.13.jar +share/java/gradle/lib/antlr4-runtime-4.7.2.jar +share/java/gradle/lib/asm-9.5.jar +share/java/gradle/lib/asm-commons-9.5.jar +share/java/gradle/lib/asm-tree-9.5.jar +share/java/gradle/lib/commons-compress-1.21.jar +share/java/gradle/lib/commons-io-2.11.0.jar share/java/gradle/lib/commons-lang-2.6.jar share/java/gradle/lib/failureaccess-1.0.1.jar -share/java/gradle/lib/fastutil-8.3.0-min.jar -share/java/gradle/lib/file-events-0.22-milestone-8.jar -share/java/gradle/lib/file-events-linux-aarch64-0.22-milestone-8.jar -share/java/gradle/lib/file-events-linux-amd64-0.22-milestone-8.jar -share/java/gradle/lib/file-events-osx-amd64-0.22-milestone-8.jar -share/java/gradle/lib/file-events-windows-amd64-0.22-milestone-8.jar -share/java/gradle/lib/file-events-windows-amd64-min-0.22-milestone-8.jar -share/java/gradle/lib/file-events-windows-i386-0.22-milestone-8.jar -share/java/gradle/lib/file-events-windows-i386-min-0.22-milestone-8.jar +share/java/gradle/lib/fastutil-8.5.2-min.jar +share/java/gradle/lib/file-events-0.22-milestone-24.jar +share/java/gradle/lib/file-events-linux-aarch64-0.22-milestone-24.jar +share/java/gradle/lib/file-events-linux-amd64-0.22-milestone-24.jar +share/java/gradle/lib/file-events-osx-aarch64-0.22-milestone-24.jar +share/java/gradle/lib/file-events-osx-amd64-0.22-milestone-24.jar +share/java/gradle/lib/file-events-windows-amd64-0.22-milestone-24.jar +share/java/gradle/lib/file-events-windows-amd64-min-0.22-milestone-24.jar +share/java/gradle/lib/file-events-windows-i386-0.22-milestone-24.jar +share/java/gradle/lib/file-events-windows-i386-min-0.22-milestone-24.jar share/java/gradle/lib/gradle-api-metadata${GRADLE_JAR} share/java/gradle/lib/gradle-base-annotations${GRADLE_JAR} share/java/gradle/lib/gradle-base-services${GRADLE_JAR} @@ -44,91 +50,118 @@ share/java/gradle/lib/gradle-build-option${GRADLE_JAR} share/java/gradle/lib/gradle-cli${GRADLE_JAR} share/java/gradle/lib/gradle-core${GRADLE_JAR} share/java/gradle/lib/gradle-core-api${GRADLE_JAR} +share/java/gradle/lib/gradle-enterprise-logging${GRADLE_JAR} +share/java/gradle/lib/gradle-enterprise-operations${GRADLE_JAR} +share/java/gradle/lib/gradle-enterprise-workers${GRADLE_JAR} share/java/gradle/lib/gradle-execution${GRADLE_JAR} share/java/gradle/lib/gradle-file-collections${GRADLE_JAR} +share/java/gradle/lib/gradle-file-temp${GRADLE_JAR} share/java/gradle/lib/gradle-file-watching${GRADLE_JAR} share/java/gradle/lib/gradle-files${GRADLE_JAR} +share/java/gradle/lib/gradle-functional${GRADLE_JAR} share/java/gradle/lib/gradle-hashing${GRADLE_JAR} share/java/gradle/lib/gradle-installation-beacon${GRADLE_JAR} +share/java/gradle/lib/gradle-instrumentation-declarations${GRADLE_JAR} +share/java/gradle/lib/gradle-internal-instrumentation-api${GRADLE_JAR} share/java/gradle/lib/gradle-jvm-services${GRADLE_JAR} share/java/gradle/lib/gradle-kotlin-dsl${GRADLE_JAR} share/java/gradle/lib/gradle-kotlin-dsl-tooling-models${GRADLE_JAR} share/java/gradle/lib/gradle-launcher${GRADLE_JAR} share/java/gradle/lib/gradle-logging${GRADLE_JAR} +share/java/gradle/lib/gradle-logging-api${GRADLE_JAR} share/java/gradle/lib/gradle-messaging${GRADLE_JAR} share/java/gradle/lib/gradle-model-core${GRADLE_JAR} share/java/gradle/lib/gradle-model-groovy${GRADLE_JAR} share/java/gradle/lib/gradle-native${GRADLE_JAR} share/java/gradle/lib/gradle-normalization-java${GRADLE_JAR} share/java/gradle/lib/gradle-persistent-cache${GRADLE_JAR} +share/java/gradle/lib/gradle-problems${GRADLE_JAR} share/java/gradle/lib/gradle-process-services${GRADLE_JAR} share/java/gradle/lib/gradle-resources${GRADLE_JAR} share/java/gradle/lib/gradle-runtime-api-info${GRADLE_JAR} share/java/gradle/lib/gradle-snapshots${GRADLE_JAR} share/java/gradle/lib/gradle-tooling-api${GRADLE_JAR} share/java/gradle/lib/gradle-worker-processes${GRADLE_JAR} -share/java/gradle/lib/gradle-wrapper${GRADLE_JAR} -share/java/gradle/lib/groovy-all-1.3-2.5.12.jar -share/java/gradle/lib/guava-27.1-android.jar +share/java/gradle/lib/gradle-worker-services${GRADLE_JAR} +share/java/gradle/lib/gradle-wrapper-shared${GRADLE_JAR} +share/java/gradle/lib/groovy-3.0.17.jar +share/java/gradle/lib/groovy-ant-3.0.17.jar +share/java/gradle/lib/groovy-astbuilder-3.0.17.jar +share/java/gradle/lib/groovy-console-3.0.17.jar +share/java/gradle/lib/groovy-datetime-3.0.17.jar +share/java/gradle/lib/groovy-dateutil-3.0.17.jar +share/java/gradle/lib/groovy-docgenerator-3.0.17.jar +share/java/gradle/lib/groovy-groovydoc-3.0.17.jar +share/java/gradle/lib/groovy-json-3.0.17.jar +share/java/gradle/lib/groovy-nio-3.0.17.jar +share/java/gradle/lib/groovy-sql-3.0.17.jar +share/java/gradle/lib/groovy-swing-3.0.17.jar +share/java/gradle/lib/groovy-templates-3.0.17.jar +share/java/gradle/lib/groovy-test-3.0.17.jar +share/java/gradle/lib/groovy-xml-3.0.17.jar +share/java/gradle/lib/gson-2.8.9.jar +share/java/gradle/lib/guava-31.1-jre.jar +share/java/gradle/lib/h2-2.1.214.jar +share/java/gradle/lib/hamcrest-core-1.3.jar share/java/gradle/lib/jansi-1.18.jar +share/java/gradle/lib/javaparser-core-3.17.0.jar share/java/gradle/lib/javax.inject-1.jar -share/java/gradle/lib/jcl-over-slf4j-1.7.28.jar +share/java/gradle/lib/jcl-over-slf4j-1.7.30.jar share/java/gradle/lib/jsr305-3.0.2.jar -share/java/gradle/lib/jul-to-slf4j-1.7.28.jar -share/java/gradle/lib/kotlin-compiler-embeddable-1.3.72-patched-for-gradle${GRADLE_JAR} -share/java/gradle/lib/kotlin-daemon-embeddable-1.3.72.jar -share/java/gradle/lib/kotlin-reflect-1.3.72.jar -share/java/gradle/lib/kotlin-sam-with-receiver-compiler-plugin-1.3.72.jar -share/java/gradle/lib/kotlin-script-runtime-1.3.72.jar -share/java/gradle/lib/kotlin-scripting-common-1.3.72.jar -share/java/gradle/lib/kotlin-scripting-compiler-embeddable-1.3.72.jar -share/java/gradle/lib/kotlin-scripting-compiler-impl-embeddable-1.3.72.jar -share/java/gradle/lib/kotlin-scripting-jvm-1.3.72.jar -share/java/gradle/lib/kotlin-scripting-jvm-host-embeddable-1.3.72.jar -share/java/gradle/lib/kotlin-stdlib-1.3.72.jar -share/java/gradle/lib/kotlin-stdlib-common-1.3.72.jar -share/java/gradle/lib/kotlin-stdlib-jdk7-1.3.72.jar -share/java/gradle/lib/kotlin-stdlib-jdk8-1.3.72.jar -share/java/gradle/lib/kotlinx-metadata-jvm-0.1.0.jar +share/java/gradle/lib/jul-to-slf4j-1.7.30.jar +share/java/gradle/lib/junit-4.13.2.jar +share/java/gradle/lib/kotlin-assignment-compiler-plugin-embeddable-1.9.0.jar +share/java/gradle/lib/kotlin-compiler-embeddable-1.9.0.jar +share/java/gradle/lib/kotlin-daemon-embeddable-1.9.0.jar +share/java/gradle/lib/kotlin-reflect-1.9.0.jar +share/java/gradle/lib/kotlin-sam-with-receiver-compiler-plugin-1.9.0.jar +share/java/gradle/lib/kotlin-script-runtime-1.9.0.jar +share/java/gradle/lib/kotlin-scripting-common-1.9.0.jar +share/java/gradle/lib/kotlin-scripting-compiler-embeddable-1.9.0.jar +share/java/gradle/lib/kotlin-scripting-compiler-impl-embeddable-1.9.0.jar +share/java/gradle/lib/kotlin-scripting-jvm-1.9.0.jar +share/java/gradle/lib/kotlin-scripting-jvm-host-1.9.0.jar +share/java/gradle/lib/kotlin-stdlib-1.9.0.jar +share/java/gradle/lib/kotlin-stdlib-common-1.9.0.jar +share/java/gradle/lib/kotlin-stdlib-jdk7-1.9.0.jar +share/java/gradle/lib/kotlin-stdlib-jdk8-1.9.0.jar +share/java/gradle/lib/kotlinx-metadata-jvm-0.5.0.jar share/java/gradle/lib/kryo-2.24.0.jar -share/java/gradle/lib/log4j-over-slf4j-1.7.28.jar +share/java/gradle/lib/log4j-over-slf4j-1.7.30.jar share/java/gradle/lib/minlog-1.2.jar -share/java/gradle/lib/native-platform-0.22-milestone-8.jar -share/java/gradle/lib/native-platform-freebsd-amd64-libcpp-0.22-milestone-8.jar -share/java/gradle/lib/native-platform-linux-aarch64-0.22-milestone-8.jar -share/java/gradle/lib/native-platform-linux-aarch64-ncurses5-0.22-milestone-8.jar -share/java/gradle/lib/native-platform-linux-aarch64-ncurses6-0.22-milestone-8.jar -share/java/gradle/lib/native-platform-linux-amd64-0.22-milestone-8.jar -share/java/gradle/lib/native-platform-linux-amd64-ncurses5-0.22-milestone-8.jar -share/java/gradle/lib/native-platform-linux-amd64-ncurses6-0.22-milestone-8.jar -share/java/gradle/lib/native-platform-osx-amd64-0.22-milestone-8.jar -share/java/gradle/lib/native-platform-windows-amd64-0.22-milestone-8.jar -share/java/gradle/lib/native-platform-windows-amd64-min-0.22-milestone-8.jar -share/java/gradle/lib/native-platform-windows-i386-0.22-milestone-8.jar -share/java/gradle/lib/native-platform-windows-i386-min-0.22-milestone-8.jar +share/java/gradle/lib/native-platform-0.22-milestone-24.jar +share/java/gradle/lib/native-platform-freebsd-amd64-libcpp-0.22-milestone-24.jar +share/java/gradle/lib/native-platform-linux-aarch64-0.22-milestone-24.jar +share/java/gradle/lib/native-platform-linux-aarch64-ncurses5-0.22-milestone-24.jar +share/java/gradle/lib/native-platform-linux-aarch64-ncurses6-0.22-milestone-24.jar +share/java/gradle/lib/native-platform-linux-amd64-0.22-milestone-24.jar +share/java/gradle/lib/native-platform-linux-amd64-ncurses5-0.22-milestone-24.jar +share/java/gradle/lib/native-platform-linux-amd64-ncurses6-0.22-milestone-24.jar +share/java/gradle/lib/native-platform-osx-aarch64-0.22-milestone-24.jar +share/java/gradle/lib/native-platform-osx-amd64-0.22-milestone-24.jar +share/java/gradle/lib/native-platform-windows-amd64-0.22-milestone-24.jar +share/java/gradle/lib/native-platform-windows-amd64-min-0.22-milestone-24.jar +share/java/gradle/lib/native-platform-windows-i386-0.22-milestone-24.jar +share/java/gradle/lib/native-platform-windows-i386-min-0.22-milestone-24.jar share/java/gradle/lib/objenesis-2.6.jar share/java/gradle/lib/plugins/ -share/java/gradle/lib/plugins/aether-api-1.13.1.jar -share/java/gradle/lib/plugins/aether-connector-wagon-1.13.1.jar -share/java/gradle/lib/plugins/aether-impl-1.13.1.jar -share/java/gradle/lib/plugins/aether-spi-1.13.1.jar -share/java/gradle/lib/plugins/aether-util-1.13.1.jar -share/java/gradle/lib/plugins/apiguardian-api-1.1.0.jar -share/java/gradle/lib/plugins/asm-util-7.3.1.jar -share/java/gradle/lib/plugins/aws-java-sdk-core-1.11.633.jar -share/java/gradle/lib/plugins/aws-java-sdk-kms-1.11.633.jar -share/java/gradle/lib/plugins/aws-java-sdk-s3-1.11.633.jar -share/java/gradle/lib/plugins/bcpg-jdk15on-1.64.jar -share/java/gradle/lib/plugins/bcpkix-jdk15on-1.64.jar -share/java/gradle/lib/plugins/bcprov-jdk15on-1.64.jar +share/java/gradle/lib/plugins/aws-java-sdk-core-1.12.365.jar +share/java/gradle/lib/plugins/aws-java-sdk-kms-1.12.365.jar +share/java/gradle/lib/plugins/aws-java-sdk-s3-1.12.365.jar +share/java/gradle/lib/plugins/aws-java-sdk-sts-1.12.365.jar +share/java/gradle/lib/plugins/bcpg-jdk15on-1.68.jar +share/java/gradle/lib/plugins/bcpkix-jdk15on-1.68.jar +share/java/gradle/lib/plugins/bcprov-jdk15on-1.68.jar share/java/gradle/lib/plugins/bsh-2.0b6.jar -share/java/gradle/lib/plugins/commons-codec-1.13.jar +share/java/gradle/lib/plugins/capsule-0.6.3.jar +share/java/gradle/lib/plugins/commons-codec-1.15.jar share/java/gradle/lib/plugins/dd-plist-1.21.jar -share/java/gradle/lib/plugins/google-api-client-1.25.0.jar -share/java/gradle/lib/plugins/google-api-services-storage-v1-rev136-1.25.0.jar -share/java/gradle/lib/plugins/google-http-client-1.25.0.jar -share/java/gradle/lib/plugins/google-http-client-jackson2-1.25.0.jar -share/java/gradle/lib/plugins/google-oauth-client-1.25.0.jar +share/java/gradle/lib/plugins/google-api-client-1.34.0.jar +share/java/gradle/lib/plugins/google-api-services-storage-v1-rev20220705-1.32.1.jar +share/java/gradle/lib/plugins/google-http-client-1.42.2.jar +share/java/gradle/lib/plugins/google-http-client-apache-v2-1.42.2.jar +share/java/gradle/lib/plugins/google-http-client-gson-1.42.2.jar +share/java/gradle/lib/plugins/google-oauth-client-1.34.1.jar share/java/gradle/lib/plugins/gradle-antlr${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-build-cache-http${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-build-init${GRADLE_JAR} @@ -142,23 +175,19 @@ share/java/gradle/lib/plugins/gradle-ear${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-enterprise${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-ide${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-ide-native${GRADLE_JAR} -share/java/gradle/lib/plugins/gradle-ide-play${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-ivy${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-jacoco${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-java-compiler-plugin${GRADLE_JAR} -share/java/gradle/lib/plugins/gradle-javascript${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-kotlin-dsl-provider-plugins${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-kotlin-dsl-tooling-builders${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-language-groovy${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-language-java${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-language-jvm${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-language-native${GRADLE_JAR} -share/java/gradle/lib/plugins/gradle-language-scala${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-maven${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-platform-base${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-platform-jvm${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-platform-native${GRADLE_JAR} -share/java/gradle/lib/plugins/gradle-platform-play${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-plugin-development${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-plugin-use${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-plugins${GRADLE_JAR} @@ -175,64 +204,54 @@ share/java/gradle/lib/plugins/gradle-test-kit${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-testing-base${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-testing-junit-platform${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-testing-jvm${GRADLE_JAR} +share/java/gradle/lib/plugins/gradle-testing-jvm-infrastructure${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-testing-native${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-tooling-api-builders${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-tooling-native${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-version-control${GRADLE_JAR} +share/java/gradle/lib/plugins/gradle-war${GRADLE_JAR} share/java/gradle/lib/plugins/gradle-workers${GRADLE_JAR} -share/java/gradle/lib/plugins/gson-2.8.5.jar -share/java/gradle/lib/plugins/hamcrest-core-1.3.jar -share/java/gradle/lib/plugins/httpclient-4.5.10.jar -share/java/gradle/lib/plugins/httpcore-4.4.12.jar +share/java/gradle/lib/plugins/gradle-wrapper${GRADLE_JAR} +share/java/gradle/lib/plugins/grpc-context-1.27.2.jar +share/java/gradle/lib/plugins/httpclient-4.5.13.jar +share/java/gradle/lib/plugins/httpcore-4.4.14.jar share/java/gradle/lib/plugins/ion-java-1.0.2.jar share/java/gradle/lib/plugins/ivy-2.3.0.jar -share/java/gradle/lib/plugins/jackson-annotations-2.10.2.jar -share/java/gradle/lib/plugins/jackson-core-2.10.2.jar -share/java/gradle/lib/plugins/jackson-databind-2.10.2.jar +share/java/gradle/lib/plugins/jackson-annotations-2.14.1.jar +share/java/gradle/lib/plugins/jackson-core-2.14.1.jar +share/java/gradle/lib/plugins/jackson-databind-2.14.1.jar +share/java/gradle/lib/plugins/jakarta.activation-2.0.0.jar +share/java/gradle/lib/plugins/jakarta.xml.bind-api-3.0.0.jar share/java/gradle/lib/plugins/jatl-0.2.3.jar -share/java/gradle/lib/plugins/jaxb-impl-2.3.2.jar +share/java/gradle/lib/plugins/jaxb-core-3.0.0.jar +share/java/gradle/lib/plugins/jaxb-impl-3.0.0.jar share/java/gradle/lib/plugins/jcifs-1.3.17.jar -share/java/gradle/lib/plugins/jcommander-1.72.jar -share/java/gradle/lib/plugins/jmespath-java-1.11.633.jar +share/java/gradle/lib/plugins/jcommander-1.78.jar +share/java/gradle/lib/plugins/jmespath-java-1.12.365.jar share/java/gradle/lib/plugins/joda-time-2.10.4.jar share/java/gradle/lib/plugins/jsch-0.1.55.jar -share/java/gradle/lib/plugins/junit-4.13.jar -share/java/gradle/lib/plugins/junit-platform-commons-1.6.2.jar -share/java/gradle/lib/plugins/junit-platform-engine-1.6.2.jar -share/java/gradle/lib/plugins/junit-platform-launcher-1.6.2.jar +share/java/gradle/lib/plugins/jsoup-1.15.3.jar +share/java/gradle/lib/plugins/junit-platform-commons-1.8.2.jar +share/java/gradle/lib/plugins/junit-platform-engine-1.8.2.jar +share/java/gradle/lib/plugins/junit-platform-launcher-1.8.2.jar share/java/gradle/lib/plugins/jzlib-1.1.3.jar -share/java/gradle/lib/plugins/maven-aether-provider-3.0.5.jar -share/java/gradle/lib/plugins/maven-artifact-3.0.5.jar -share/java/gradle/lib/plugins/maven-compat-3.0.5.jar -share/java/gradle/lib/plugins/maven-core-3.0.5.jar -share/java/gradle/lib/plugins/maven-model-3.0.5.jar -share/java/gradle/lib/plugins/maven-model-builder-3.0.5.jar -share/java/gradle/lib/plugins/maven-plugin-api-3.0.5.jar -share/java/gradle/lib/plugins/maven-repository-metadata-3.0.5.jar -share/java/gradle/lib/plugins/maven-settings-3.0.5.jar -share/java/gradle/lib/plugins/maven-settings-builder-3.0.5.jar -share/java/gradle/lib/plugins/nekohtml-1.9.22.jar +share/java/gradle/lib/plugins/maven-builder-support-3.6.3.jar +share/java/gradle/lib/plugins/maven-model-3.6.3.jar +share/java/gradle/lib/plugins/maven-repository-metadata-3.6.3.jar +share/java/gradle/lib/plugins/maven-settings-3.6.3.jar +share/java/gradle/lib/plugins/maven-settings-builder-3.6.3.jar +share/java/gradle/lib/plugins/opencensus-api-0.31.1.jar +share/java/gradle/lib/plugins/opencensus-contrib-http-util-0.31.1.jar share/java/gradle/lib/plugins/opentest4j-1.2.0.jar share/java/gradle/lib/plugins/org.eclipse.jgit-5.7.0.202003110725-r.jar share/java/gradle/lib/plugins/plexus-cipher-1.7.jar -share/java/gradle/lib/plugins/plexus-classworlds-2.5.1.jar -share/java/gradle/lib/plugins/plexus-component-annotations-1.5.5.jar -share/java/gradle/lib/plugins/plexus-container-default-1.7.1.jar -share/java/gradle/lib/plugins/plexus-interpolation-1.14.jar -share/java/gradle/lib/plugins/plexus-sec-dispatcher-1.3.jar -share/java/gradle/lib/plugins/plexus-utils-3.1.0.jar -share/java/gradle/lib/plugins/pmaven-common-0.8-20100325.jar -share/java/gradle/lib/plugins/pmaven-groovy-0.8-20100325.jar -share/java/gradle/lib/plugins/rhino-1.7.10.jar -share/java/gradle/lib/plugins/simple-4.1.21.jar -share/java/gradle/lib/plugins/snakeyaml-1.17.jar +share/java/gradle/lib/plugins/plexus-interpolation-1.26.jar +share/java/gradle/lib/plugins/plexus-sec-dispatcher-1.4.jar +share/java/gradle/lib/plugins/plexus-utils-3.3.0.jar +share/java/gradle/lib/plugins/snakeyaml-2.0.jar share/java/gradle/lib/plugins/testng-6.3.1.jar -share/java/gradle/lib/plugins/wagon-file-3.0.0.jar -share/java/gradle/lib/plugins/wagon-http-3.0.0.jar -share/java/gradle/lib/plugins/wagon-http-shared-3.0.0.jar -share/java/gradle/lib/plugins/wagon-provider-api-3.0.0.jar -share/java/gradle/lib/plugins/xbean-reflect-3.7.jar -share/java/gradle/lib/plugins/xercesImpl-2.12.0.jar -share/java/gradle/lib/slf4j-api-1.7.28.jar -share/java/gradle/lib/trove4j-1.0.20181211.jar +share/java/gradle/lib/qdox-1.12.1.jar +share/java/gradle/lib/slf4j-api-1.7.30.jar +share/java/gradle/lib/tomlj-1.0.0.jar +share/java/gradle/lib/trove4j-1.0.20200330.jar share/java/gradle/lib/xml-apis-1.4.01.jar diff --git a/lang/binaryen/Makefile b/lang/binaryen/Makefile index 02f4ad8fc..8fe9e9cb9 100644 --- a/lang/binaryen/Makefile +++ b/lang/binaryen/Makefile @@ -2,7 +2,7 @@ COMMENT = WebAssembly compiler and toolchain infrastructure library GH_ACCOUNT = WebAssembly GH_PROJECT = binaryen -GH_TAGNAME = version_114 +GH_TAGNAME = version_116 PKGNAME = ${DISTNAME:L:S/version_//} diff --git a/lang/binaryen/distinfo b/lang/binaryen/distinfo index 5a42844ba..4eb367ddd 100644 --- a/lang/binaryen/distinfo +++ b/lang/binaryen/distinfo @@ -1,2 +1,2 @@ -SHA256 (binaryen-version_114.tar.gz) = VPeUqEPZbMhBv4BFqd/qrYFhNB8LUKxbGXUYwtOUgs4= -SIZE (binaryen-version_114.tar.gz) = 4728373 +SHA256 (binaryen-version_116.tar.gz) = BJ+jne2sf726ZhvnfXGSI4B7oGcPXaeedaqF2I/tyKk= +SIZE (binaryen-version_116.tar.gz) = 4792263 diff --git a/lang/binaryen/pkg/PLIST b/lang/binaryen/pkg/PLIST index 3aa2ff303..d3387db96 100644 --- a/lang/binaryen/pkg/PLIST +++ b/lang/binaryen/pkg/PLIST @@ -3,7 +3,9 @@ @bin bin/wasm-ctor-eval @bin bin/wasm-dis @bin bin/wasm-emscripten-finalize +@bin bin/wasm-fuzz-lattices @bin bin/wasm-fuzz-types +@bin bin/wasm-merge @bin bin/wasm-metadce @bin bin/wasm-opt @bin bin/wasm-reduce diff --git a/lang/lua/lua.port.mk b/lang/lua/lua.port.mk index 937da1c5a..7978b78a4 100644 --- a/lang/lua/lua.port.mk +++ b/lang/lua/lua.port.mk @@ -58,6 +58,8 @@ MODLUA_DEP = lua${MODLUA_DEP_VERSION} MODLUA_WANTLIB = lua${MODLUA_VERSION} MODLUA_LIB = -l${MODLUA_WANTLIB} +CHECK_LIB_DEPENDS_ARGS += -S MODLUA_WANTLIB="${MODLUA_WANTLIB}" + _MODLUA_RUN_DEPENDS = lang/lua/${MODLUA_VERSION} MODLUA_LIB_DEPENDS = ${_MODLUA_RUN_DEPENDS} diff --git a/lang/pcc/Makefile.inc b/lang/pcc/Makefile.inc index d90547340..a4c620baa 100644 --- a/lang/pcc/Makefile.inc +++ b/lang/pcc/Makefile.inc @@ -1,7 +1,7 @@ # Other architectures not fully supported yet ONLY_FOR_ARCHS = amd64 i386 powerpc mips64 -DISTVER = 20230830 +DISTVER = 20230914 PKGVER = 1.1.0.${DISTVER} PCCVER = 1.2.0.DEVEL diff --git a/lang/pcc/pcc-libs/distinfo b/lang/pcc/pcc-libs/distinfo index 728d0bcbe..75391940e 100644 --- a/lang/pcc/pcc-libs/distinfo +++ b/lang/pcc/pcc-libs/distinfo @@ -1,2 +1,2 @@ -SHA256 (pcc-libs-20230830.tgz) = BHKEMHMi4P6ZD0BFZRG6iqmbZPQR8rduQITSrY7dj9c= -SIZE (pcc-libs-20230830.tgz) = 208109 +SHA256 (pcc-libs-20230914.tgz) = QEl3JMvP4V6SR1HFEaXpovGSBG78Xh3zq7f1m49HcEU= +SIZE (pcc-libs-20230914.tgz) = 208113 diff --git a/lang/pcc/pcc/distinfo b/lang/pcc/pcc/distinfo index 199cf07ce..c4b1444fe 100644 --- a/lang/pcc/pcc/distinfo +++ b/lang/pcc/pcc/distinfo @@ -1,2 +1,2 @@ -SHA256 (pcc-20230830.tgz) = SG0NmO1v+sQLpJQaenqNxmaT8wsNi3EbGnBfZP6xSOc= -SIZE (pcc-20230830.tgz) = 1019479 +SHA256 (pcc-20230914.tgz) = YPeW/DiamAoryWQZQ7tZVMsfaqC5Qpi5eNQGEG4+268= +SIZE (pcc-20230914.tgz) = 1019519 diff --git a/lang/wasi-libc/Makefile b/lang/wasi-libc/Makefile index e940ea3b7..888a49073 100644 --- a/lang/wasi-libc/Makefile +++ b/lang/wasi-libc/Makefile @@ -4,6 +4,11 @@ GH_ACCOUNT = WebAssembly GH_PROJECT = wasi-libc GH_COMMIT = 05cd0af0af4b5a191117d47a182adff1d6546b87 DISTNAME = wasi-libc-0.20220413 +REVISION = 0 + +DISTFILES = ${GH_DISTFILE} \ + wasi-libc-llvm${MODCLANG_VERSION}-std-headers.tar.gz:0 +MASTER_SITES0= https://nerd.hu/distfiles/ CATEGORIES = lang @@ -18,4 +23,13 @@ MAKE_ENV += AR=${LOCALBASE}/bin/llvm-ar-${MODCLANG_VERSION} \ NM=${LOCALBASE}/bin/llvm-nm-${MODCLANG_VERSION} \ INSTALL_DIR=${WRKINST}${PREFIX}/share/wasi-sysroot +SUBST_VARS += WRKDIR + +post-configure: + ${SUBST_CMD} ${WRKSRC}/Makefile + +post-install: + ${INSTALL_DATA} ${WRKDIR}/sysroot/include/* \ + ${PREFIX}/share/wasi-sysroot/include + .include diff --git a/lang/wasi-libc/distinfo b/lang/wasi-libc/distinfo index 8c3516810..2aaa14b09 100644 --- a/lang/wasi-libc/distinfo +++ b/lang/wasi-libc/distinfo @@ -1,2 +1,4 @@ SHA256 (wasi-libc-0.20220413-05cd0af0.tar.gz) = vgKb3dSRO5d5BYZjhUKPJBx+yeCRlteONLe2s2xUOmc= +SHA256 (wasi-libc-llvm13-std-headers.tar.gz) = YTble8uIDTmeki+GTWKcGnO5JHK6p/educ3h/T+tIE4= SIZE (wasi-libc-0.20220413-05cd0af0.tar.gz) = 1251259 +SIZE (wasi-libc-llvm13-std-headers.tar.gz) = 1795 diff --git a/lang/wasi-libc/patches/patch-Makefile b/lang/wasi-libc/patches/patch-Makefile index 94008d3f7..ec9c78eca 100644 --- a/lang/wasi-libc/patches/patch-Makefile +++ b/lang/wasi-libc/patches/patch-Makefile @@ -1,9 +1,21 @@ https://cgit.freebsd.org/ports/tree/devel/wasi-libc/Makefile#n40 avoid rebuilding everything in fake +wasi-libc requires some compiler headers that we remove from our +llvm ports so we include them here instead + Index: Makefile --- Makefile.orig +++ Makefile +@@ -224,7 +224,7 @@ endif + # should come earlier in the search path, so they can "override" + # and/or `#include_next` the public headers. `-isystem` (like + # `-idirafter`) comes later in the search path than `-I`. +-CFLAGS += -isystem "$(SYSROOT_INC)" ++CFLAGS += -isystem "$(SYSROOT_INC)" -isystem "${WRKDIR}/sysroot/include" + + # These variables describe the locations of various files and directories in + # the build tree. @@ -565,7 +565,7 @@ check-symbols: startup_files libc # This ignores whitespace because on Windows the output has CRLF line endings. diff -wur "$(CURDIR)/expected/$(MULTIARCH_TRIPLE)" "$(SYSROOT_SHARE)" diff --git a/lang/wasi-libc/pkg/PLIST b/lang/wasi-libc/pkg/PLIST index ceb356073..71d8b8edd 100644 --- a/lang/wasi-libc/pkg/PLIST +++ b/lang/wasi-libc/pkg/PLIST @@ -146,8 +146,10 @@ share/wasi-sysroot/include/search.h share/wasi-sysroot/include/semaphore.h share/wasi-sysroot/include/signal.h share/wasi-sysroot/include/stdalign.h +share/wasi-sysroot/include/stdarg.h share/wasi-sysroot/include/stdbool.h share/wasi-sysroot/include/stdc-predef.h +share/wasi-sysroot/include/stddef.h share/wasi-sysroot/include/stdint.h share/wasi-sysroot/include/stdio.h share/wasi-sysroot/include/stdio_ext.h diff --git a/lang/wasi-sdk/compiler-rt/Makefile b/lang/wasi-sdk/compiler-rt/Makefile index 1133e5c22..9b397449d 100644 --- a/lang/wasi-sdk/compiler-rt/Makefile +++ b/lang/wasi-sdk/compiler-rt/Makefile @@ -5,7 +5,7 @@ PKGNAME = wasi-compiler-rt-${LLVM_V} REVISION = 0 LIBPATH = wasi/libclang_rt.builtins-wasm32.a BUILDSUBDIR = lib/builtins -BUILD_DEPENDS += lang/wasi-libc +BUILD_DEPENDS += lang/wasi-libc>=0.20220413p0 # In transition from BSD-ish to Apache 2 + LLVM exceptions PERMIT_PACKAGE = Yes diff --git a/lang/wasi-sdk/libcxx/Makefile b/lang/wasi-sdk/libcxx/Makefile index a08b064e4..ffb397b4a 100644 --- a/lang/wasi-sdk/libcxx/Makefile +++ b/lang/wasi-sdk/libcxx/Makefile @@ -8,7 +8,7 @@ BUILDSUBDIR = libcxx # In transition from BSD-ish to Apache 2 + LLVM exceptions PERMIT_PACKAGE = Yes -BUILD_DEPENDS += lang/wasi-libc +BUILD_DEPENDS += lang/wasi-libc>=0.20220413p0 CONFIGURE_ARGS= -DLLVM_PATH=${WRKDIR}/${DISTNAME} \ -DCMAKE_C_COMPILER_WORKS=1 \ diff --git a/lang/wasi-sdk/libcxxabi/Makefile b/lang/wasi-sdk/libcxxabi/Makefile index e6097fac3..f7d0c782d 100644 --- a/lang/wasi-sdk/libcxxabi/Makefile +++ b/lang/wasi-sdk/libcxxabi/Makefile @@ -8,7 +8,7 @@ BUILDSUBDIR = libcxxabi # In transition from BSD-ish to Apache 2 + LLVM exceptions PERMIT_PACKAGE = Yes -BUILD_DEPENDS += lang/wasi-libc +BUILD_DEPENDS += lang/wasi-libc>=0.20220413p0 BUILD_DEPENDS += lang/wasi-sdk/libcxx CONFIGURE_ARGS= -DLLVM_PATH=${WRKDIR}/${DISTNAME} \ diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile index 10d04de82..8b2505b13 100644 --- a/mail/msmtp/Makefile +++ b/mail/msmtp/Makefile @@ -1,6 +1,6 @@ COMMENT = SMTP plugin for MUAs -DISTNAME = msmtp-1.8.23 +DISTNAME = msmtp-1.8.24 CATEGORIES = mail HOMEPAGE = https://marlam.de/msmtp/ diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo index 09c5fe9b7..b6ca12212 100644 --- a/mail/msmtp/distinfo +++ b/mail/msmtp/distinfo @@ -1,2 +1,2 @@ -SHA256 (msmtp-1.8.23.tar.xz) = zwTBawmbPUFNtLW5P8XtnUaq1WTIGjUqoQejOWTDVrg= -SIZE (msmtp-1.8.23.tar.xz) = 401656 +SHA256 (msmtp-1.8.24.tar.xz) = vWZEsaqrF9YbhmR5k+PvrYYLI8VCg7AN3FecH1EQqlk= +SIZE (msmtp-1.8.24.tar.xz) = 409268 diff --git a/mail/msmtp/patches/patch-doc_msmtp_texi b/mail/msmtp/patches/patch-doc_msmtp_texi index baee35124..31f39edf8 100644 --- a/mail/msmtp/patches/patch-doc_msmtp_texi +++ b/mail/msmtp/patches/patch-doc_msmtp_texi @@ -1,7 +1,7 @@ Index: doc/msmtp.texi --- doc/msmtp.texi.orig +++ doc/msmtp.texi -@@ -1504,7 +1504,7 @@ just like @ref{passwordeval} in msmtp) or, if none is +@@ -1507,7 +1507,7 @@ just like @ref{passwordeval} in msmtp) or, if none is from the key ring or, if that fails, from a prompt. @end table @@ -10,7 +10,7 @@ Index: doc/msmtp.texi @section Example: using msmtpd as a system service Only use a local interface to listen on. Run msmtpd with correct user rights -@@ -1521,7 +1521,7 @@ start-stop-daemon --start --pidfile /var/run/msmtpd.pi +@@ -1524,7 +1524,7 @@ start-stop-daemon --start --pidfile /var/run/msmtpd.pi start-stop-daemon --stop --pidfile /var/run/msmtpd.pid --remove-pidfile --quiet --signal TERM @end example diff --git a/mail/msmtp/pkg/PLIST b/mail/msmtp/pkg/PLIST index a6d8af359..1313a72f9 100644 --- a/mail/msmtp/pkg/PLIST +++ b/mail/msmtp/pkg/PLIST @@ -17,6 +17,7 @@ share/locale/de/LC_MESSAGES/msmtp.mo share/locale/eo/LC_MESSAGES/msmtp.mo share/locale/fr/LC_MESSAGES/msmtp.mo share/locale/pt_BR/LC_MESSAGES/msmtp.mo +share/locale/ru/LC_MESSAGES/msmtp.mo share/locale/sr/LC_MESSAGES/msmtp.mo share/locale/sv/LC_MESSAGES/msmtp.mo share/locale/ta/ diff --git a/mail/roundcubemail/Makefile b/mail/roundcubemail/Makefile index 218ab1454..159c6237d 100644 --- a/mail/roundcubemail/Makefile +++ b/mail/roundcubemail/Makefile @@ -2,12 +2,10 @@ COMMENT-main= IMAP4 webmail client COMMENT-classic=classic skin for Roundcube webmail COMMENT-larry= larry skin for Roundcube webmail -V= 1.6.2 -REVISION-main= 0 +V= 1.6.3 DISTNAME= roundcubemail-$V -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${DISTNAME}-skins.tar.xz:0 +DISTFILES.skins= ${DISTNAME}-skins.tar.xz EXTRACT_SUFX= -complete.tar.gz PKGNAME-main= roundcubemail-${VS} @@ -25,8 +23,8 @@ MAINTAINER= Stuart Henderson # GPLv3+ with exceptions for skins & plugins PERMIT_PACKAGE= Yes -MASTER_SITES= https://github.com/roundcube/roundcubemail/releases/download/$V/ -MASTER_SITES0= https://spacehopper.org/mirrors/ +SITES= https://github.com/roundcube/roundcubemail/releases/download/$V/ +SITES.skins= https://spacehopper.org/mirrors/ MULTI_PACKAGES= -main -classic -larry # reduce churn during beta/rc tests VS= ${V:S/-//} diff --git a/mail/roundcubemail/distinfo b/mail/roundcubemail/distinfo index a5e2368ec..014b3d523 100644 --- a/mail/roundcubemail/distinfo +++ b/mail/roundcubemail/distinfo @@ -1,4 +1,4 @@ -SHA256 (roundcubemail-1.6.2-complete.tar.gz) = yJgwfZXMSEGM+VUX71K1sAiMUAFPZ6bvgVdjQoqAQ/A= -SHA256 (roundcubemail-1.6.2-skins.tar.xz) = L97K4MwahtV8kRskZG3c+7Dh2YoWGQDdVlTaUEjYVIE= -SIZE (roundcubemail-1.6.2-complete.tar.gz) = 6004046 -SIZE (roundcubemail-1.6.2-skins.tar.xz) = 400524 +SHA256 (roundcubemail-1.6.3-complete.tar.gz) = XmDM1Q9i+wDEPTNewIqb2vvyvdAlUiVsxACZCLOa2Y8= +SHA256 (roundcubemail-1.6.3-skins.tar.xz) = G0GAtG0C112hMAqBTxIDedMmT+iy2bQZ7rJ3xt8tW+Q= +SIZE (roundcubemail-1.6.3-complete.tar.gz) = 6026670 +SIZE (roundcubemail-1.6.3-skins.tar.xz) = 400572 diff --git a/mail/roundcubemail/patches/patch-bin_update_sh b/mail/roundcubemail/patches/patch-bin_update_sh deleted file mode 100644 index 8035d4eb2..000000000 --- a/mail/roundcubemail/patches/patch-bin_update_sh +++ /dev/null @@ -1,27 +0,0 @@ -From 57b161111f42bbcf3b83d65bf3ad7c017335991a Mon Sep 17 00:00:00 2001 -From: Aleksander Machniak -Date: Sat, 8 Jul 2023 09:08:50 +0200 -Subject: [PATCH] Fix bug where installto.sh/update.sh scripts were removing - some essential options from the config file (#9051) - -Index: bin/update.sh ---- bin/update.sh.orig -+++ bin/update.sh -@@ -88,7 +88,7 @@ if ($RCI->configured) { - if (!empty($opts['accept']) || strtolower($input) == 'y') { - $error = $written = false; - -- echo ". backing up the current config file(s)...\n"; -+ echo "- backing up the current config file(s)...\n"; - - foreach (['config', 'main', 'db'] as $file) { - if (file_exists(RCMAIL_CONFIG_DIR . '/' . $file . '.inc.php')) { -@@ -100,7 +100,7 @@ if ($RCI->configured) { - - if (!$error) { - $RCI->merge_config(); -- echo ". writing " . RCMAIL_CONFIG_DIR . "/config.inc.php...\n"; -+ echo "- writing " . RCMAIL_CONFIG_DIR . "/config.inc.php...\n"; - $written = $RCI->save_configfile($RCI->create_config(false)); - } - diff --git a/mail/roundcubemail/patches/patch-config_defaults_inc_php b/mail/roundcubemail/patches/patch-config_defaults_inc_php index c42e3e8a8..e36943ea3 100644 --- a/mail/roundcubemail/patches/patch-config_defaults_inc_php +++ b/mail/roundcubemail/patches/patch-config_defaults_inc_php @@ -1,22 +1,7 @@ -hunk 1: -From d2e8a889c4094b5890a7d1e162aa9b6044b8baad Mon Sep 17 00:00:00 2001 -From: Aleksander Machniak -Date: Sun, 9 Jul 2023 11:23:44 +0200 -Subject: [PATCH] Fix regression that broke use_secure_urls feature (#9052) - - Index: config/defaults.inc.php --- config/defaults.inc.php.orig +++ config/defaults.inc.php -@@ -799,6 +799,7 @@ $config['no_save_sent_messages'] = false; - // Warning: This requires http server configuration. Sample: - // RewriteRule ^/roundcubemail/[a-zA-Z0-9]{16}/(.*) /roundcubemail/$1 [PT] - // Alias /roundcubemail /var/www/roundcubemail/ -+// Warning: This feature does NOT work with request_path = 'SCRIPT_NAME' - // Note: Use assets_path to not prevent the browser from caching assets - $config['use_secure_urls'] = false; - -@@ -935,10 +936,10 @@ $config['spellcheck_dictionary'] = false; +@@ -936,10 +936,10 @@ $config['spellcheck_dictionary'] = false; // - 'pspell' - requires the PHP Pspell module and aspell installed // - 'enchant' - requires the PHP Enchant module // - 'atd' - install your own After the Deadline server or check with the people at http://www.afterthedeadline.com before using their API diff --git a/mail/roundcubemail/patches/patch-program_include_rcmail_install_php b/mail/roundcubemail/patches/patch-program_include_rcmail_install_php deleted file mode 100644 index bc4e09361..000000000 --- a/mail/roundcubemail/patches/patch-program_include_rcmail_install_php +++ /dev/null @@ -1,46 +0,0 @@ -From 57b161111f42bbcf3b83d65bf3ad7c017335991a Mon Sep 17 00:00:00 2001 -From: Aleksander Machniak -Date: Sat, 8 Jul 2023 09:08:50 +0200 -Subject: [PATCH] Fix bug where installto.sh/update.sh scripts were removing - some essential options from the config file (#9051) - -Index: program/include/rcmail_install.php ---- program/include/rcmail_install.php.orig -+++ program/include/rcmail_install.php -@@ -439,10 +439,10 @@ class rcmail_install - else { - $this->config[$replacement] = $current[$prop]; - } -- } - -- unset($current[$prop]); -- unset($current[$replacement]); -+ unset($current[$prop]); -+ unset($current[$replacement]); -+ } - } - - // Merge old *_port options into the new *_host options, where possible -@@ -464,9 +464,9 @@ class rcmail_install - } - - // add all ldap_public sources having global_search enabled to autocomplete_addressbooks -- if (is_array($current['ldap_public'])) { -+ if (!empty($current['ldap_public']) && is_array($current['ldap_public'])) { - foreach ($current['ldap_public'] as $key => $ldap_public) { -- if ($ldap_public['global_search']) { -+ if (!empty($ldap_public['global_search'])) { - $this->config['autocomplete_addressbooks'][] = $key; - unset($current['ldap_public'][$key]['global_search']); - } -@@ -474,10 +474,6 @@ class rcmail_install - } - - $this->config = array_merge($this->config, $current); -- -- foreach (array_keys((array) $current['ldap_public']) as $key) { -- $this->config['ldap_public'][$key] = $current['ldap_public'][$key]; -- } - } - - /** diff --git a/mail/roundcubemail/patches/patch-program_include_rcmail_oauth_php b/mail/roundcubemail/patches/patch-program_include_rcmail_oauth_php deleted file mode 100644 index 7fad03925..000000000 --- a/mail/roundcubemail/patches/patch-program_include_rcmail_oauth_php +++ /dev/null @@ -1,27 +0,0 @@ -From d2e8a889c4094b5890a7d1e162aa9b6044b8baad Mon Sep 17 00:00:00 2001 -From: Aleksander Machniak -Date: Sun, 9 Jul 2023 11:23:44 +0200 -Subject: [PATCH] Fix regression that broke use_secure_urls feature (#9052) - -From ca1b23ea9d8ddbfeaf973158f508a5f70ae51db8 Mon Sep 17 00:00:00 2001 -From: Aleksander Machniak -Date: Mon, 10 Jul 2023 18:27:56 +0200 -Subject: [PATCH] More fixes regarding rcmail::url() (#9052) - -Index: program/include/rcmail_oauth.php ---- program/include/rcmail_oauth.php.orig -+++ program/include/rcmail_oauth.php -@@ -120,8 +120,12 @@ class rcmail_oauth - */ - public function get_redirect_uri() - { -+ $url = $this->rcmail->url([], true, true); -+ - // rewrite redirect URL to not contain query parameters because some providers do not support this -- return preg_replace('/\/?\?_task=[a-z]+/', '/index.php/login/oauth', $this->rcmail->url([], true, true)); -+ $url = preg_replace('/\?.*/', '', $url); -+ -+ return slashify($url) . 'index.php/login/oauth'; - } - - /** diff --git a/mail/roundcubemail/patches/patch-program_include_rcmail_php b/mail/roundcubemail/patches/patch-program_include_rcmail_php deleted file mode 100644 index 57441b6e5..000000000 --- a/mail/roundcubemail/patches/patch-program_include_rcmail_php +++ /dev/null @@ -1,32 +0,0 @@ -From d2e8a889c4094b5890a7d1e162aa9b6044b8baad Mon Sep 17 00:00:00 2001 -From: Aleksander Machniak -Date: Sun, 9 Jul 2023 11:23:44 +0200 -Subject: [PATCH] Fix regression that broke use_secure_urls feature (#9052) - -From ca1b23ea9d8ddbfeaf973158f508a5f70ae51db8 Mon Sep 17 00:00:00 2001 -From: Aleksander Machniak -Date: Mon, 10 Jul 2023 18:27:56 +0200 -Subject: [PATCH] More fixes regarding rcmail::url() (#9052) - -Index: program/include/rcmail.php ---- program/include/rcmail.php.orig -+++ program/include/rcmail.php -@@ -1169,7 +1169,7 @@ class rcmail extends rcube - $path = $_SERVER[$path]; - } - else if (empty($path)) { -- foreach (['REDIRECT_SCRIPT_URL', 'SCRIPT_NAME', 'REQUEST_URI'] as $name) { -+ foreach (['REQUEST_URI', 'REDIRECT_SCRIPT_URL', 'SCRIPT_NAME'] as $name) { - if (!empty($_SERVER[$name])) { - $path = $_SERVER[$name]; - break; -@@ -1180,7 +1180,8 @@ class rcmail extends rcube - return rtrim($path, '/') . '/'; - } - -- $path = preg_replace('/[?&].*$/', '', (string) $path); -+ $path = preg_replace('/index\.php.*$/', '', (string) $path); -+ $path = preg_replace('/[?&].*$/', '', $path); - $path = preg_replace('![^/]+$!', '', $path); - - return rtrim($path, '/') . '/'; diff --git a/mail/roundcubemail/patches/patch-program_lib_Roundcube_rcube_imap_php b/mail/roundcubemail/patches/patch-program_lib_Roundcube_rcube_imap_php deleted file mode 100644 index 831071242..000000000 --- a/mail/roundcubemail/patches/patch-program_lib_Roundcube_rcube_imap_php +++ /dev/null @@ -1,69 +0,0 @@ -From 813dacec712b98e43f25fbac9b7a78c68ba7f0c6 Mon Sep 17 00:00:00 2001 -From: Aleksander Machniak -Date: Sun, 9 Jul 2023 13:18:11 +0200 -Subject: [PATCH] Fix potential PHP fatal error when opening a message with - message/rfc822 part (#8953) - -From e5c5676fcc52079d43053baa1641e7fa405b0153 Mon Sep 17 00:00:00 2001 -From: Adrien Beau -Date: Sun, 9 Jul 2023 19:51:10 +0200 -Subject: [PATCH] Fix sort_folder_comparator (#9057) - -Index: program/lib/Roundcube/rcube_imap.php ---- program/lib/Roundcube/rcube_imap.php.orig -+++ program/lib/Roundcube/rcube_imap.php -@@ -2060,15 +2060,17 @@ class rcube_imap extends rcube_storage - - // find first non-array entry - for ($i=1; $ictype_secondary = strtolower($part[$i]); - - // read content type parameters - if (isset($part[$i+1]) && is_array($part[$i+1])) { - $struct->ctype_parameters = []; - for ($j=0; $jctype_parameters[$param] = $part[$i+1][$j+1]; -+ if (is_string($part[$i+1][$j])) { -+ $param = strtolower($part[$i+1][$j]); -+ $struct->ctype_parameters[$param] = $part[$i+1][$j+1]; -+ } - } - } - -@@ -2146,7 +2148,9 @@ class rcube_imap extends rcube_storage - if (is_array($part[$params_idx])) { - $struct->ctype_parameters = []; - for ($i=0; $ictype_parameters[strtolower($part[$params_idx][$i])] = $part[$params_idx][$i+1]; -+ if (is_string($part[$params_idx][$i])) { -+ $struct->ctype_parameters[strtolower($part[$params_idx][$i])] = $part[$params_idx][$i+1]; -+ } - } - - if (isset($struct->ctype_parameters['charset'])) { -@@ -2187,7 +2191,9 @@ class rcube_imap extends rcube_storage - } - if (is_array($part[$di][1])) { - for ($n=0; $nd_parameters[strtolower($part[$di][1][$n])] = $part[$di][1][$n+1]; -+ if (is_string($part[$di][1][$n])) { -+ $struct->d_parameters[strtolower($part[$di][1][$n])] = $part[$di][1][$n+1]; -+ } - } - } - } -@@ -4515,7 +4521,10 @@ class rcube_imap extends rcube_storage - $path1 = explode($this->delimiter, $str1); - $path2 = explode($this->delimiter, $str2); - -- foreach ($path1 as $idx => $folder1) { -+ $len = max(count($path1), count($path2)); -+ -+ for ($idx = 0; $idx < $len; $idx++) { -+ $folder1 = $path1[$idx] ?? ''; - $folder2 = $path2[$idx] ?? ''; - - if ($folder1 === $folder2) { diff --git a/mail/roundcubemail/patches/patch-program_lib_Roundcube_rcube_ldap_php b/mail/roundcubemail/patches/patch-program_lib_Roundcube_rcube_ldap_php deleted file mode 100644 index bc42c421e..000000000 --- a/mail/roundcubemail/patches/patch-program_lib_Roundcube_rcube_ldap_php +++ /dev/null @@ -1,124 +0,0 @@ -From f40550f9d2be5050397d199bb36a162247a62b89 Mon Sep 17 00:00:00 2001 -From: Aleksander Machniak -Date: Tue, 11 Jul 2023 10:51:57 +0200 -Subject: [PATCH] Fix regression where LDAP addressbook 'filter' option was - ignored (#9061) - -Index: program/lib/Roundcube/rcube_ldap.php ---- program/lib/Roundcube/rcube_ldap.php.orig -+++ program/lib/Roundcube/rcube_ldap.php -@@ -226,19 +226,15 @@ class rcube_ldap extends rcube_addressbook - } - } - -- // make sure 'required_fields' is an array -- if (!isset($this->prop['required_fields'])) { -- $this->prop['required_fields'] = []; -- } -- else if (!is_array($this->prop['required_fields'])) { -- $this->prop['required_fields'] = (array) $this->prop['required_fields']; -- } -+ // make sure 'required_fields' and 'autovalues' are an array -+ $this->prop['required_fields'] = (array) ($this->prop['required_fields'] ?? []); -+ $this->prop['autovalues'] = (array) ($this->prop['autovalues'] ?? []); - - // make sure LDAP_rdn field is required - if ( - !empty($this->prop['LDAP_rdn']) - && !in_array($this->prop['LDAP_rdn'], $this->prop['required_fields']) -- && !in_array($this->prop['LDAP_rdn'], array_keys((array)$this->prop['autovalues'])) -+ && !array_key_exists($this->prop['LDAP_rdn'], $this->prop['autovalues']) - ) { - $this->prop['required_fields'][] = $this->prop['LDAP_rdn']; - } -@@ -808,7 +804,7 @@ class rcube_ldap extends rcube_addressbook - */ - function _entry_sort_cmp($a, $b) - { -- return strcmp($a[$this->sort_col][0], $b[$this->sort_col][0]); -+ return strcmp($a[$this->sort_col][0] ?? '', $b[$this->sort_col][0] ?? ''); - } - - /** -@@ -1022,7 +1018,6 @@ class rcube_ldap extends rcube_addressbook - $prop = $this->group_id ? $this->group_data : $this->prop; - $base_dn = $this->group_id ? $prop['base_dn'] : $this->base_dn; - $attrs = $count ? ['dn'] : $this->prop['attributes']; -- $filter = $prop['filter'] ?? '(objectclass=*)'; - - // Use global search filter - if ($filter = $this->filter) { -@@ -1031,13 +1026,18 @@ class rcube_ldap extends rcube_addressbook - $is_extended_search = !$this->group_id; - } - -+ $prop['filter'] = $filter; -+ - // add general filter to query - if (!empty($this->prop['filter'])) { -- $filter = '(&(' . preg_replace('/^\(|\)$/', '', $this->prop['filter']) . ')' . $filter . ')'; -+ $prop['filter'] = '(&(' . preg_replace('/^\(|\)$/', '', $this->prop['filter']) . ')' . $filter . ')'; - } - } - -- $result = $this->ldap->search($base_dn, $filter, $prop['scope'] ?? 'sub', $attrs, $prop, $count); -+ $search_scope = $prop['scope'] ?? 'sub'; -+ $search_filter = $prop['filter'] ?? '(objectclass=*)'; -+ -+ $result = $this->ldap->search($base_dn, $search_filter, $search_scope, $attrs, $prop, $count); - $result_count = 0; - - // we have a search result resource, get all entries -@@ -1056,14 +1056,16 @@ class rcube_ldap extends rcube_addressbook - $name_attr = $this->prop['groups']['name_attr']; - $email_attr = $this->prop['groups']['email_attr'] ?: 'mail'; - $attrs = array_unique(['dn', 'objectClass', $name_attr, $email_attr]); -- $filter = '(&(' . preg_replace('/^\(|\)$/', '', $this->prop['groups']['filter']) . ')' . $filter . ')'; - -+ $search_scope = $this->prop['groups']['scope'] ?? 'sub'; -+ $search_filter = '(&(' . preg_replace('/^\(|\)$/', '', $this->prop['groups']['filter']) . ')' . $filter . ')'; -+ - // for groups we may use cn instead of displayname... - if ($this->prop['fieldmap']['name'] != $name_attr) { -- $filter = str_replace(strtolower($this->prop['fieldmap']['name']) . '=', $name_attr . '=', $filter); -+ $search_filter = str_replace(strtolower($this->prop['fieldmap']['name']) . '=', $name_attr . '=', $search_filter); - } - -- $res = $this->ldap->search($this->groups_base_dn, $filter, $this->prop['groups']['scope'] ?? 'sub', $attrs, $prop, $count); -+ $res = $this->ldap->search($this->groups_base_dn, $search_filter, $search_scope, $attrs, $prop, $count); - - if ($count && $res) { - $result += $res; -@@ -1577,7 +1579,7 @@ class rcube_ldap extends rcube_addressbook - $attrvals['{'.$k.'}'] = is_array($v) ? $v[0] : $v; - } - -- foreach ((array) $this->prop['autovalues'] as $lf => $templ) { -+ foreach ($this->prop['autovalues'] as $lf => $templ) { - if (empty($attrs[$lf])) { - if (strpos($templ, '(') !== false) { - // replace {attr} placeholders with (escaped!) attribute values to be safely eval'd -@@ -1910,10 +1912,10 @@ class rcube_ldap extends rcube_addressbook - - $base_dn = $this->groups_base_dn; - $filter = $this->prop['groups']['filter']; -- $scope = $this->prop['groups']['scope']; -- $name_attr = $this->prop['groups']['name_attr']; -- $email_attr = $this->prop['groups']['email_attr'] ?: 'mail'; -- $sort_attrs = (array) ($this->prop['groups']['sort'] ? $this->prop['groups']['sort'] : $name_attr); -+ $scope = $this->prop['groups']['scope'] ?? 'sub'; -+ $name_attr = !empty($this->prop['groups']['name_attr']) ? $this->prop['groups']['name_attr'] : 'cn'; -+ $email_attr = !empty($this->prop['groups']['email_attr']) ? $this->prop['groups']['email_attr'] : 'mail'; -+ $sort_attrs = (array) (!empty($this->prop['groups']['sort']) ? $this->prop['groups']['sort'] : $name_attr); - $sort_attr = $sort_attrs[0]; - $page_size = 200; - -@@ -1930,7 +1932,7 @@ class rcube_ldap extends rcube_addressbook - $ldap->set_vlv_page($vlv_page+1, $page_size); - } - -- $props = ['sort' => $this->prop['groups']['sort']]; -+ $props = ['sort' => $this->prop['groups']['sort'] ?? null]; - $attrs = array_unique(['dn', 'objectClass', $name_attr, $email_attr, $sort_attr]); - - // add search filter diff --git a/mail/roundcubemail/patches/patch-program_lib_Roundcube_rcube_washtml_php b/mail/roundcubemail/patches/patch-program_lib_Roundcube_rcube_washtml_php deleted file mode 100644 index 18df1bf3e..000000000 --- a/mail/roundcubemail/patches/patch-program_lib_Roundcube_rcube_washtml_php +++ /dev/null @@ -1,18 +0,0 @@ -From f211757286e32d69c265233b4b90c7804d4bd0d9 Mon Sep 17 00:00:00 2001 -From: Aleksander Machniak -Date: Sun, 9 Jul 2023 14:46:19 +0200 -Subject: [PATCH] Fix bug where a duplicate `` tag in HTML email could - cause some parts being cut off (#9029) - -Index: program/lib/Roundcube/rcube_washtml.php ---- program/lib/Roundcube/rcube_washtml.php.orig -+++ program/lib/Roundcube/rcube_washtml.php -@@ -744,7 +744,7 @@ class rcube_washtml - // space(s) between <NOBR> - '/(<\/nobr>)(\s+)(<nobr>)/i', - // PHP bug #32547 workaround: remove title tag -- '/<title[^>]*>.*<\/title>/i', -+ '/<title[^>]*>.*<\/title>/iU', - // remove <!doctype> before BOM (#1490291) - '/<\!doctype[^>]+>[^<]*/im', - // byte-order mark (only outlook?) diff --git a/mail/roundcubemail/pkg/PLIST-main b/mail/roundcubemail/pkg/PLIST-main index be735bd39..d9e8f486d 100644 --- a/mail/roundcubemail/pkg/PLIST-main +++ b/mail/roundcubemail/pkg/PLIST-main @@ -2529,6 +2529,10 @@ roundcubemail/program/localization/tr_TR/timezones.inc roundcubemail/program/localization/tzl/ roundcubemail/program/localization/tzl/labels.inc roundcubemail/program/localization/tzl/messages.inc +roundcubemail/program/localization/ug/ +roundcubemail/program/localization/ug/labels.inc +roundcubemail/program/localization/ug/messages.inc +roundcubemail/program/localization/ug/timezones.inc roundcubemail/program/localization/uk_UA/ roundcubemail/program/localization/uk_UA/labels.inc roundcubemail/program/localization/uk_UA/messages.inc @@ -2857,13 +2861,6 @@ roundcubemail/vendor/guzzlehttp/promises/src/RejectionException.php roundcubemail/vendor/guzzlehttp/promises/src/TaskQueue.php roundcubemail/vendor/guzzlehttp/promises/src/TaskQueueInterface.php roundcubemail/vendor/guzzlehttp/promises/src/Utils.php -roundcubemail/vendor/guzzlehttp/promises/vendor-bin/ -roundcubemail/vendor/guzzlehttp/promises/vendor-bin/php-cs-fixer/ -roundcubemail/vendor/guzzlehttp/promises/vendor-bin/php-cs-fixer/composer.json -roundcubemail/vendor/guzzlehttp/promises/vendor-bin/phpstan/ -roundcubemail/vendor/guzzlehttp/promises/vendor-bin/phpstan/composer.json -roundcubemail/vendor/guzzlehttp/promises/vendor-bin/psalm/ -roundcubemail/vendor/guzzlehttp/promises/vendor-bin/psalm/composer.json roundcubemail/vendor/guzzlehttp/psr7/ roundcubemail/vendor/guzzlehttp/psr7/CHANGELOG.md roundcubemail/vendor/guzzlehttp/psr7/LICENSE diff --git a/math/z3/Makefile b/math/z3/Makefile index f95ca3327..76e34e333 100644 --- a/math/z3/Makefile +++ b/math/z3/Makefile @@ -1,6 +1,7 @@ COMMENT = Z3 theorem prover VERSION = 4.12.2 +REVISION = 0 GH_ACCOUNT = Z3Prover GH_PROJECT = z3 @@ -30,6 +31,8 @@ CONFIGURE_ARGS += -DZ3_ENABLE_EXAMPLE_TARGETS=ON \ -DZ3_BUILD_PYTHON_BINDINGS=ON \ -DZ3_USE_LIB_GMP=OFF +DEBUG_PACKAGES = ${BUILD_PACKAGES} + WRKDIST = ${WRKDIR}/z3-${DISTNAME} NO_TEST = Yes diff --git a/meta/tor-browser/Makefile b/meta/tor-browser/Makefile index 6281fc0ca..b329fbaa2 100644 --- a/meta/tor-browser/Makefile +++ b/meta/tor-browser/Makefile @@ -2,10 +2,10 @@ COMMENT= Tor Browser meta package MAINTAINER= Caspar Schutijser <caspar@schutijser.com> -PKGNAME= tor-browser-12.5.3 -ONLY_FOR_ARCHS = amd64 +PKGNAME= tor-browser-12.5.4 +ONLY_FOR_ARCHS = aarch64 amd64 -RUN_DEPENDS= www/tor-browser/browser>=12.5.3 \ +RUN_DEPENDS= www/tor-browser/browser>=12.5.4 \ www/tor-browser/noscript>=11.4.26 \ net/tor>=0.4.7.13 diff --git a/net/Makefile b/net/Makefile index 0cd8a2b6f..6de6e8b05 100644 --- a/net/Makefile +++ b/net/Makefile @@ -592,6 +592,7 @@ SUBDIR += py-pcapy,python3 SUBDIR += py-pf,python3 SUBDIR += py-portend,python3 + SUBDIR += py-python-jsonrpc-server,python3 SUBDIR += py-ripe.atlas.cousteau,python3 SUBDIR += py-ripe.atlas.sagan,python3 SUBDIR += py-ripe.atlas.tools # standalone, uses python3 diff --git a/net/bro/Makefile b/net/bro/Makefile index ceb36c9df..5e689d6c4 100644 --- a/net/bro/Makefile +++ b/net/bro/Makefile @@ -36,6 +36,7 @@ MODULES= lang/python #COMPILER= base-clang ports-gcc # XXX src/modp_numtoa.c:174:30: error: use of undeclared identifier 'DBL_DECIMAL_DIG' COMPILER= ports-clang +CFLAGS += -DDBL_DECIMAL_DIG=__DBL_DECIMAL_DIG__ # XXX sparc64 and ports-clang don't go well together: # /tmp/sqlite3-1f089a.s:544060: Error: operation combines symbols in different segments # clang-13: error: assembler command failed with exit code 1 (use -v to see invocation) diff --git a/net/dnsperf/Makefile b/net/dnsperf/Makefile index ba707a013..bfe760213 100644 --- a/net/dnsperf/Makefile +++ b/net/dnsperf/Makefile @@ -1,31 +1,33 @@ -COMMENT = DNS performance testing tools +COMMENT= DNS performance testing tools -DISTNAME = dnsperf-2.4.2 -REVISION = 1 +# newer versions needs libck ("Concurrency Kit") not yet in ports +DISTNAME= dnsperf-2.4.2 +REVISION= 1 -CATEGORIES = net benchmarks +CATEGORIES= net benchmarks -HOMEPAGE = https://www.dns-oarc.net/tools/dnsperf/ +HOMEPAGE= https://www.dns-oarc.net/tools/dnsperf/ +PORTROACH= site:https://github.com/DNS-OARC/dnsperf/releases/ # Apache 2.0 -PERMIT_PACKAGE = Yes +PERMIT_PACKAGE= Yes WANTLIB += c crypto ldns m ssl pthread -MASTER_SITES = https://www.dns-oarc.net/files/dnsperf/ +SITES= https://www.dns-oarc.net/files/dnsperf/ -MODULES = lang/python -MODPY_ADJ_FILES = contrib/queryparse/queryparse -MODPY_BUILDDEP = No +MODULES= lang/python +MODPY_ADJ_FILES= contrib/queryparse/queryparse +MODPY_BUILDDEP= No -LIB_DEPENDS = net/ldns,-main +LIB_DEPENDS= net/ldns,-main -CONFIGURE_STYLE = gnu -CONFIGURE_ENV = CPPFLAGS=-I${LOCALBASE}/include \ - LDFLAGS=-L${LOCALBASE}/lib +CONFIGURE_STYLE= gnu +CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ + LDFLAGS=-L${LOCALBASE}/lib -RUN_DEPENDS = net/py-dnspython${MODPY_FLAVOR} \ - net/py-pcapy${MODPY_FLAVOR} +RUN_DEPENDS= net/py-dnspython${MODPY_FLAVOR} \ + net/py-pcapy${MODPY_FLAVOR} post-install: cd ${WRKSRC}/contrib/queryparse; \ diff --git a/net/guacamole/Makefile.inc b/net/guacamole/Makefile.inc index 46a06636d..e35f5fd8a 100644 --- a/net/guacamole/Makefile.inc +++ b/net/guacamole/Makefile.inc @@ -1,4 +1,4 @@ -V?= 1.5.2 +V?= 1.5.3 CATEGORIES= net HOMEPAGE= https://guacamole.apache.org/ diff --git a/net/guacamole/client/distinfo b/net/guacamole/client/distinfo index a96510856..43f48e8a3 100644 --- a/net/guacamole/client/distinfo +++ b/net/guacamole/client/distinfo @@ -1,26 +1,26 @@ -SHA256 (guacamole-1.5.2.war) = hu/DABbkA4lI2MGlw3oLBeONrdMQTbbsA3VbxuMRHEA= -SHA256 (guacamole-auth-duo-1.5.2.tar.gz) = rkfghsLDP/AEFcxeONAmBIK1IeU6p+YDbGMk4MTnN2g= -SHA256 (guacamole-auth-header-1.5.2.tar.gz) = yAwR3oeZPhcy1lwFnVPUAJYa/PYefBJQG8IZcAKvdzA= -SHA256 (guacamole-auth-jdbc-1.5.2.tar.gz) = DAUPz54GLq2yQvKWIheHCRnNAqEZvD5x13791Lf4jgY= -SHA256 (guacamole-auth-json-1.5.2.tar.gz) = 8Pfnny02hC4nssFgbznfC11Lv5n5M20CAjr5cDlOPbc= -SHA256 (guacamole-auth-ldap-1.5.2.tar.gz) = SUILvm8S9Wpq2LMROVEvKJ+q2gBAdHCbajqOFHXpvSM= -SHA256 (guacamole-auth-quickconnect-1.5.2.tar.gz) = 69nV3uTYXLCui02jv5LMFigauQJK9VKyo/v7OHMBGD4= -SHA256 (guacamole-auth-sso-1.5.2.tar.gz) = h8rTWi1wduM4jL0+MYBPsESazzAXXGtnJ90KZWAQHRs= -SHA256 (guacamole-auth-totp-1.5.2.tar.gz) = pUi8eyfhm9lOB64Yd3UqLEUYAAvspaZCMPwYoT3uF9U= -SHA256 (guacamole-history-recording-storage-1.5.2.tar.gz) = pBT/ET6BCZFyZ2ee/f78cz/7NE/8dIizwgTpye3AH1I= +SHA256 (guacamole-1.5.3.war) = FaNObtbPbwP+IPkPZ9LWCXE6ic08syT4nt8edpbm7WE= +SHA256 (guacamole-auth-duo-1.5.3.tar.gz) = VhQ0mT3IoHsT/XtqX6Xzulvb5Wxyc9JGYBeMUPoffJ4= +SHA256 (guacamole-auth-header-1.5.3.tar.gz) = a6kSiQip/qxuqfi7Wa4cH2ZEVGxNKIQS9FZC7SgDQUs= +SHA256 (guacamole-auth-jdbc-1.5.3.tar.gz) = 7Tuncc5Io4oOVvApkTuAUSSdvr/dMv/tvOLfDbEyJH8= +SHA256 (guacamole-auth-json-1.5.3.tar.gz) = dF0CkMKemuTZ8gION546Hhc1CTIN3JbKsQv1YJkZMEI= +SHA256 (guacamole-auth-ldap-1.5.3.tar.gz) = BuW7QdqnzyHTJRi2s6FNp1NOok+hpBGknwzZ7xAcupU= +SHA256 (guacamole-auth-quickconnect-1.5.3.tar.gz) = BJHjsMziog+uzoNs81PZOLekvHlkApknXgWLQmAfG4I= +SHA256 (guacamole-auth-sso-1.5.3.tar.gz) = pEVl8vvkQQ2D0UHsgSZ9YH+FsZgEY570wxn/KKBL0pQ= +SHA256 (guacamole-auth-totp-1.5.3.tar.gz) = XKBdXttvBvfD2DbbdJ3OOYRSSsa/ETJx8Hq9fCgU384= +SHA256 (guacamole-history-recording-storage-1.5.3.tar.gz) = mstDq5WTLbTatWWff8+Bug0QeFSe/D8erDvarMQoI/g= SHA256 (mariadb-java-client-2.7.3.jar) = fII7L4/dpSKn925pyyh0grRiR8E1xMRLJ7mPsq4JJ0c= SHA256 (mssql-jdbc-9.4.1.jre8.jar) = lp17yoV3xKpKPuPR7iPloBFPxQNvC/ThLF+MjLYtHE8= SHA256 (postgresql-42.3.3.jar) = 7tBgT1ErpEgXlU3pmgfipUcKpL/LSB1OY6k+D/Dgrt4= -SIZE (guacamole-1.5.2.war) = 13529512 -SIZE (guacamole-auth-duo-1.5.2.tar.gz) = 3585234 -SIZE (guacamole-auth-header-1.5.2.tar.gz) = 3555479 -SIZE (guacamole-auth-jdbc-1.5.2.tar.gz) = 32432224 -SIZE (guacamole-auth-json-1.5.2.tar.gz) = 11945151 -SIZE (guacamole-auth-ldap-1.5.2.tar.gz) = 12264980 -SIZE (guacamole-auth-quickconnect-1.5.2.tar.gz) = 3572039 -SIZE (guacamole-auth-sso-1.5.2.tar.gz) = 33919340 -SIZE (guacamole-auth-totp-1.5.2.tar.gz) = 4824718 -SIZE (guacamole-history-recording-storage-1.5.2.tar.gz) = 15895 +SIZE (guacamole-1.5.3.war) = 13631953 +SIZE (guacamole-auth-duo-1.5.3.tar.gz) = 3676186 +SIZE (guacamole-auth-header-1.5.3.tar.gz) = 3646342 +SIZE (guacamole-auth-jdbc-1.5.3.tar.gz) = 32982901 +SIZE (guacamole-auth-json-1.5.3.tar.gz) = 6570905 +SIZE (guacamole-auth-ldap-1.5.3.tar.gz) = 13100655 +SIZE (guacamole-auth-quickconnect-1.5.3.tar.gz) = 3662930 +SIZE (guacamole-auth-sso-1.5.3.tar.gz) = 34468962 +SIZE (guacamole-auth-totp-1.5.3.tar.gz) = 4915531 +SIZE (guacamole-history-recording-storage-1.5.3.tar.gz) = 15895 SIZE (mariadb-java-client-2.7.3.jar) = 621971 SIZE (mssql-jdbc-9.4.1.jre8.jar) = 1346757 SIZE (postgresql-42.3.3.jar) = 1039047 diff --git a/net/guacamole/server/distinfo b/net/guacamole/server/distinfo index 739858b32..ad7ea4033 100644 --- a/net/guacamole/server/distinfo +++ b/net/guacamole/server/distinfo @@ -1,2 +1,2 @@ -SHA256 (guacamole-server-1.5.2.tar.gz) = qNSBP+rrHm81+/0s9XywQp2yIllgy/7TYlL2Wsk9/8Q= -SIZE (guacamole-server-1.5.2.tar.gz) = 1105353 +SHA256 (guacamole-server-1.5.3.tar.gz) = 3U7r+3n97yPSDcWF2olS4bRqNBHsRoNolcBBSIz228Q= +SIZE (guacamole-server-1.5.3.tar.gz) = 1105466 diff --git a/net/i2p/Makefile b/net/i2p/Makefile index e6d0c09db..2fef23a30 100644 --- a/net/i2p/Makefile +++ b/net/i2p/Makefile @@ -2,14 +2,15 @@ COMMENT= i2p routing protocol GH_ACCOUNT= i2p GH_PROJECT= i2p.i2p -GH_TAGNAME= i2p-1.8.0 +GH_TAGNAME= i2p-2.3.0 DISTNAME= ${GH_TAGNAME} -REVISION= 1 CATEGORIES= net HOMEPAGE= https://geti2p.net/en/ +MAINTAINER= Pascal Stumpf <pascal@stumpf.co> + # Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 # EPLv1.0 GPLv2 GPLv3 LGPLv2.1 LGPLv3 MIT public-domain WTFPLv2 PERMIT_PACKAGE= Yes diff --git a/net/i2p/distinfo b/net/i2p/distinfo index eb30f3d3a..0ec557554 100644 --- a/net/i2p/distinfo +++ b/net/i2p/distinfo @@ -1,2 +1,2 @@ -SHA256 (i2p-1.8.0.tar.gz) = AYQyEGkD8KqdzJ9q0wKFbaPhlfcwumHO3ek/nkW0OtQ= -SIZE (i2p-1.8.0.tar.gz) = 38024343 +SHA256 (i2p-2.3.0.tar.gz) = 6JBfzZy9YOVMI/riZTTZPtEpqa/QwhN9s3zDdpIzQiI= +SIZE (i2p-2.3.0.tar.gz) = 38157548 diff --git a/net/i2p/patches/patch-core_c_jbigi_build_sh b/net/i2p/patches/patch-core_c_jbigi_build_sh index 1a7ae5280..91afb4688 100644 --- a/net/i2p/patches/patch-core_c_jbigi_build_sh +++ b/net/i2p/patches/patch-core_c_jbigi_build_sh @@ -2,8 +2,9 @@ use only local gmp change default lib to dynamic avoid tests ---- core/c/jbigi/build.sh.orig Mon Aug 24 21:45:06 2020 -+++ core/c/jbigi/build.sh Sun Oct 4 08:02:36 2020 +Index: core/c/jbigi/build.sh +--- core/c/jbigi/build.sh.orig ++++ core/c/jbigi/build.sh @@ -21,7 +21,6 @@ rm -rf bin/local mkdir -p lib bin/local @@ -18,23 +19,23 @@ avoid tests echo "Building..." -if [ "$1" != "dynamic" ]; then +if [ "$1" = "static" ]; then - case `uname -sr` in + case $(uname -sr) in Darwin*) # --with-pic is required for static linking -@@ -50,7 +49,6 @@ if [ "$1" != "dynamic" ]; then - make +@@ -51,7 +50,6 @@ if [ "$1" != "dynamic" ]; then + make check sh ../../build_jbigi.sh static else - shift sh ../../build_jbigi.sh dynamic fi -@@ -58,7 +56,7 @@ cp *jbigi???* ../../lib/ +@@ -59,7 +57,7 @@ cp -- *jbigi???* ../../lib/ echo 'Library copied to lib/' cd ../.. -if [ "$1" != "notest" ]; then +if [ "$1" = "test" ]; then if [ -z "$I2P" ]; then - if [ -r $HOME/i2p/lib/i2p.jar ]; then + if [ -r "$HOME/i2p/lib/i2p.jar" ]; then I2P="$HOME/i2p" diff --git a/net/i2p/pkg/PLIST b/net/i2p/pkg/PLIST index 851f3bbb7..ca9ab4b7a 100644 --- a/net/i2p/pkg/PLIST +++ b/net/i2p/pkg/PLIST @@ -37,9 +37,9 @@ share/i2p/certificates/plugin/backup_at_mail.i2p.crt share/i2p/certificates/plugin/cacapo_at_mail.i2p.crt share/i2p/certificates/plugin/hankhill19580_at_gmail.com.crt share/i2p/certificates/plugin/str4d_at_mail.i2p.crt -share/i2p/certificates/plugin/zab_at_mail.i2p.crt share/i2p/certificates/plugin/zzz-plugin_at_mail.i2p.crt share/i2p/certificates/reseed/ +share/i2p/certificates/reseed/arnavbhatt288_at_mail.i2p.crt share/i2p/certificates/reseed/creativecowpat_at_mail.i2p.crt share/i2p/certificates/reseed/echelon3_at_mail.i2p.crt share/i2p/certificates/reseed/hankhill19580_at_gmail.com.crt diff --git a/net/ntfy/Makefile b/net/ntfy/Makefile index d04b75b1d..49b1b6f2c 100644 --- a/net/ntfy/Makefile +++ b/net/ntfy/Makefile @@ -1,8 +1,7 @@ COMMENT = send push notifications to your phone or desktop MODGO_MODNAME = heckel.io/ntfy -MODGO_VERSION = v1.30.1 -REVISION = 0 +MODGO_VERSION = v1.31.0 DISTNAME = ntfy-${MODGO_VERSION} diff --git a/net/ntfy/distinfo b/net/ntfy/distinfo index 1e7ee188e..762030535 100644 --- a/net/ntfy/distinfo +++ b/net/ntfy/distinfo @@ -1,9 +1,9 @@ SHA256 (go_modules/cloud.google.com/go/@v/v0.102.1.mod) = gGGq4iUEaKhiWmJiDk8TpqDNJ8xWWo3dFrt/jiBtPtg= SHA256 (go_modules/cloud.google.com/go/@v/v0.105.0.mod) = X4d8/qVd81QmYDxnHgs2Ne/tSlCq8FKOMU7/wIEFZwI= SHA256 (go_modules/cloud.google.com/go/@v/v0.107.0.mod) = ea4N3XnRnH93hprQCiixtlACz1ycful4FIEOc98CF0M= -SHA256 (go_modules/cloud.google.com/go/@v/v0.107.0.zip) = 9aZNkcZz7JWkLpRwE+L+O537NmryiDcGA4mNjxFU3Os= +SHA256 (go_modules/cloud.google.com/go/@v/v0.109.0.mod) = LqQEf9OUU5lIf+3aF5upMusNkCNYwxVMFCcZ2HAONCk= +SHA256 (go_modules/cloud.google.com/go/@v/v0.109.0.zip) = KGhpX/ApGmOwu7+QZC+V+qyVMCLhftMyrz5ffKmjfWk= SHA256 (go_modules/cloud.google.com/go/@v/v0.26.0.mod) = IhijTyC5cbwZUhbUGV9XUgoqy9hd5/wxrPxEAmZwTBE= -SHA256 (go_modules/cloud.google.com/go/@v/v0.34.0.mod) = IhijTyC5cbwZUhbUGV9XUgoqy9hd5/wxrPxEAmZwTBE= SHA256 (go_modules/cloud.google.com/go/accessapproval/@v/v1.5.0.mod) = dwzvPNTuoNjjlJrg+8gsSFaI78J3R/k3KhRhSehcJqQ= SHA256 (go_modules/cloud.google.com/go/accessapproval/@v/v1.5.0.zip) = f4r9B+gM0BFmDb5gvGUddyp70Iy85Vf+FpJbmUIyJzY= SHA256 (go_modules/cloud.google.com/go/accesscontextmanager/@v/v1.4.0.mod) = zhHjXXfuaT1FaFGFz/bwdvHZ7vv0m/qGUuMHXqwtjKg= @@ -53,11 +53,12 @@ SHA256 (go_modules/cloud.google.com/go/cloudtasks/@v/v1.8.0.zip) = OFqSVy3fN2UdP SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.12.1.mod) = jJ6xeaGjl/1exJaJBx30HxCfxlp/OrwbazSfPltpZvo= SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.13.0.mod) = r7p0AJVEFqvcoR9ix1JIQyMUxzX0IOSvGu4ZxaI4jCQ= SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.14.0.mod) = FZKBsxgLr1dfC/2kB0mJxvyU9EO6BB5HaziS5VCb4a8= -SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.14.0.zip) = lEZYQVkueKQCJzf+gcWjPaklXbgrlAKxkp1GhxyswbA= +SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.15.1.mod) = lGlDK0GpsivQB38ZTECCtYj4JwJVLxDBHvlPlGoudPs= +SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.18.0.mod) = j48coWqiC8JZFDdoKilHp9McujUQLHsb7lEUQ1QGqfU= +SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.18.0.zip) = zm4UoZLkK8BMiRxPWjkbvmCFcx2dUpYy7mYa2BZZR8o= SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.7.0.mod) = N8p9ZT+pBjQk8mI6PRNzRH8N9BHPdWHZ+UxwVLDT3Qg= SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.0.mod) = ZmAMRI0rXFR3BnNIkO0YGJyCgLII2Gua8qsIENW2HSE= SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.1.mod) = MAT3x6QavteW0yL9+p8NxSLfL2MNMjAmPUPHXZHMTek= -SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.2.mod) = MAT3x6QavteW0yL9+p8NxSLfL2MNMjAmPUPHXZHMTek= SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.mod) = ABGpCmT7GqppqtQm/orJyeWjfkthmnvQTUCQlTZatIg= SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.zip) = KShk29Cx3jepaOKF6UmIXlczhIN9gc02lb5c4uI5GIc= SHA256 (go_modules/cloud.google.com/go/contactcenterinsights/@v/v1.4.0.mod) = aXp1J8fU49+2IISVQhjpChCdndxG68/K5R4hIrH2s2s= @@ -123,12 +124,10 @@ SHA256 (go_modules/cloud.google.com/go/gkemulticloud/@v/v0.4.0.mod) = QDRyFsbYKK SHA256 (go_modules/cloud.google.com/go/gkemulticloud/@v/v0.4.0.zip) = St/DgVa0+Zz86xnzqwWFoN4Sd6vdWfYavnF8DXd81QM= SHA256 (go_modules/cloud.google.com/go/gsuiteaddons/@v/v1.4.0.mod) = UXBrrVbGrGbpLxTQK8Kxpcm9BgQjO73AGE/irdMU+dk= SHA256 (go_modules/cloud.google.com/go/gsuiteaddons/@v/v1.4.0.zip) = 5MHw5redgB8lfY2Wk6DGLeYcPjp+SmrE7HgyfglRKBo= +SHA256 (go_modules/cloud.google.com/go/iam/@v/v0.10.0.mod) = ffouiIElyz7b0NsoK2mkIjb+Bw61wSbULLz9SBBc1LQ= +SHA256 (go_modules/cloud.google.com/go/iam/@v/v0.10.0.zip) = rDtvrL3hQQczqBXw/wYTbP7dNZAsiSvA+KOZ/8nc6Hw= SHA256 (go_modules/cloud.google.com/go/iam/@v/v0.3.0.mod) = DY0nE+L94f+AS3dV7tbdmiBTr0MKjDAxcT4O+wEdDxE= -SHA256 (go_modules/cloud.google.com/go/iam/@v/v0.6.0.mod) = vnTEyXuxal3TgYeLZUCFsOCP6jurgGj2oyhTkIGPdZg= -SHA256 (go_modules/cloud.google.com/go/iam/@v/v0.7.0.mod) = fZAbCrhkydppyWb5jbj2s9vO9iw2Zjq+aTAoEiycCVQ= SHA256 (go_modules/cloud.google.com/go/iam/@v/v0.8.0.mod) = w1Qg0gdMzeq4NAM5cpSKitGHQCI9fqdn77S9NwymntY= -SHA256 (go_modules/cloud.google.com/go/iam/@v/v0.9.0.mod) = ffouiIElyz7b0NsoK2mkIjb+Bw61wSbULLz9SBBc1LQ= -SHA256 (go_modules/cloud.google.com/go/iam/@v/v0.9.0.zip) = DzTpWcjTC48++ROm38R/1GvVLPN7q2GIOVNE42WvQD4= SHA256 (go_modules/cloud.google.com/go/iap/@v/v1.5.0.mod) = julQSZjQRl1Zj/f4tZaAtvyAAbOBl5rXrL0pICh3V5g= SHA256 (go_modules/cloud.google.com/go/iap/@v/v1.5.0.zip) = RmRqpzBmRtj+s5S6CmiYqht6kgTeXUdzEaIYI7V4uWA= SHA256 (go_modules/cloud.google.com/go/ids/@v/v1.2.0.mod) = w90NwzxbFKrk/1bHX4J3YyQpjA4b3854dtbyevTE5hA= @@ -144,7 +143,8 @@ SHA256 (go_modules/cloud.google.com/go/lifesciences/@v/v0.6.0.zip) = DmrEyYwnKt6 SHA256 (go_modules/cloud.google.com/go/logging/@v/v1.6.1.mod) = Pe1IkDRYeicqoRy8MkNXJdCI3ZYWoQFYUIz85sRqbMI= SHA256 (go_modules/cloud.google.com/go/logging/@v/v1.6.1.zip) = UpZZPjEC4FVJUcpFisd1uuqZrq2n47n49hTZ+YbFX0A= SHA256 (go_modules/cloud.google.com/go/longrunning/@v/v0.3.0.mod) = u856eWA/8Ak+MDGBukC70TaMAgF89AGIE2yMPa0b3Tg= -SHA256 (go_modules/cloud.google.com/go/longrunning/@v/v0.3.0.zip) = 8wxPOVqE/bb+Eht7JrdNkV0ctsfZOnhxIQhmUjHUZgE= +SHA256 (go_modules/cloud.google.com/go/longrunning/@v/v0.4.1.mod) = OW4zOAFh5e3vkoyTkM0kFr5vH4602nkdA05L6Cdwkyw= +SHA256 (go_modules/cloud.google.com/go/longrunning/@v/v0.4.1.zip) = bLTkprgENcsSqwGSyigYk+dQ8gkDzfXyQyptYdsZA2E= SHA256 (go_modules/cloud.google.com/go/managedidentities/@v/v1.4.0.mod) = zHsCpW2HKuz/SIvdEbgreeoAuMcIanv8yvjrj349U9w= SHA256 (go_modules/cloud.google.com/go/managedidentities/@v/v1.4.0.zip) = dEJKPTCRGIT8U6m9M+J/GJeDZK4w8Zq7CefucLaU8zY= SHA256 (go_modules/cloud.google.com/go/maps/@v/v0.1.0.mod) = i+zNwn8uMVKvNfHbn9qlWYUMDWDvZdKztPwxMnsIoXc= @@ -224,9 +224,9 @@ SHA256 (go_modules/cloud.google.com/go/spanner/@v/v1.41.0.zip) = K69slBGM5+eqvF+ SHA256 (go_modules/cloud.google.com/go/speech/@v/v1.9.0.mod) = Hw7hHplUjSDW8f55sPAGchyv7E9vwP5e1LA2egAzCfw= SHA256 (go_modules/cloud.google.com/go/speech/@v/v1.9.0.zip) = GO5tzoy7tRi6GJ/UtR6ppw+p0z8Up6bhYaJi9c7KW+k= SHA256 (go_modules/cloud.google.com/go/storage/@v/v1.26.0.mod) = gVwWO5BZ5qtUYQVblAkkgK76GO7tiixUDJGDQBA5alw= -SHA256 (go_modules/cloud.google.com/go/storage/@v/v1.27.0.mod) = ufaxq/JyN3X4zCTZLpYSmiCwwoNXC6F/bv3v2mvx9hM= SHA256 (go_modules/cloud.google.com/go/storage/@v/v1.28.1.mod) = JK6PbUNSzcyqLOQtJKw1wl67d/h1TwRpsZRVMfPO/48= -SHA256 (go_modules/cloud.google.com/go/storage/@v/v1.28.1.zip) = LFMjkkgEhCn6IBUPDRGXLAqScGkI5nn1dcjnr/SxeDY= +SHA256 (go_modules/cloud.google.com/go/storage/@v/v1.29.0.mod) = St0d/v8uy6ZUk7s2/LHaXQUWVUcPMWPfZsFY08VwX2c= +SHA256 (go_modules/cloud.google.com/go/storage/@v/v1.29.0.zip) = YrUYz0Ghb94IX9PhVwxkHp3fH63UPzIPQ3+otm9qU2o= SHA256 (go_modules/cloud.google.com/go/storagetransfer/@v/v1.6.0.mod) = o+zXLoqjVEshjKDjZcabMWPHfQyTe3YF30mVFCBnurI= SHA256 (go_modules/cloud.google.com/go/storagetransfer/@v/v1.6.0.zip) = vSI7InshVEVVxR+Iyv0bXqUxvTXTYvB+/VZbkkAOdtU= SHA256 (go_modules/cloud.google.com/go/talent/@v/v1.4.0.mod) = UexaSQLk6LYRAkOE5zv/FmH9OOsIBJN4k/yFlVB0m+s= @@ -269,16 +269,17 @@ SHA256 (go_modules/github.com/!micah!parks/keyfunc/@v/v1.5.1.mod) = sKl67752ousv SHA256 (go_modules/github.com/!micah!parks/keyfunc/@v/v1.9.0.mod) = sKl67752ousvpkyzEkie8lH0gpGxj9RHwMlKCOFLaFo= SHA256 (go_modules/github.com/!micah!parks/keyfunc/@v/v1.9.0.zip) = 8QqGcCL1OucwMPsWNXQxn1i1mTgaWxMFUqsA5RU8kWY= SHA256 (go_modules/github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod) = 2uZGOSlkAiNbVVh9FNJkBhXrNzb6hA5DJ9PBXbY8w0U= -SHA256 (go_modules/github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip) = s8CfPmNdR7QThpWlR9HyxxOPOCy+WotYZbZqjggjNGE= -SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.1.1.mod) = oJD46q9ZzCrfFjKZ6+/nl+Hco/at0sjoimo7kLpTiwI= -SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.1.1.zip) = W6oDHHLnPkJhfw/XTn2BM0SFC9amBzOBtqQWCl6ctZ4= +SHA256 (go_modules/github.com/census-instrumentation/opencensus-proto/@v/v0.4.1.mod) = Yb98TmYveO0zUgjwhdRBydyqFbab3w7Hhu0GoSMCswM= +SHA256 (go_modules/github.com/census-instrumentation/opencensus-proto/@v/v0.4.1.zip) = b85mt9zSy6Ax7Z1z131rIcL+dJxd4ny7QWotLMHGhxk= +SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.2.0.mod) = oJD46q9ZzCrfFjKZ6+/nl+Hco/at0sjoimo7kLpTiwI= +SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.2.0.zip) = /BgM2wwA+/+9Obd0pyzbXwwyrOJTcNUTUZWRiow/vSU= SHA256 (go_modules/github.com/client9/misspell/@v/v0.3.4.mod) = 0bw2Ld3Zb7OkPtS5Kqq3CqbH71pQDX8JVk4+skq88Lg= SHA256 (go_modules/github.com/client9/misspell/@v/v0.3.4.zip) = o68gY3LhMd0QporEcMZqGxjq9Rxq+stVsuKgbjm5Byg= SHA256 (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod) = BfXUp3qEvkXe3IDrrFo47y/Rxv8/rtrZwA6zEjEYEhg= -SHA256 (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20210930031921-04548b0d99d4.mod) = oO1tXDcKFHNnG4sOKIurF13+tkp69c4vyYdLE5rqAgc= -SHA256 (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20210930031921-04548b0d99d4.zip) = pEn6lOWBF6ecF1d+OfcvaVxIdvdMvZFC1RIngZLKkKo= -SHA256 (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20211011173535-cb28da3451f1.mod) = OnJc+6NYLl390r2tlmLg/KPK3YqRu8sbSEJRUm9KyFc= -SHA256 (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20211011173535-cb28da3451f1.zip) = 64YoHh6c9vg9Je2+wOP9aQVw76NBSGbRTGoytEkxN10= +SHA256 (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20220112060539-c52dc94e7fbe.mod) = oO1tXDcKFHNnG4sOKIurF13+tkp69c4vyYdLE5rqAgc= +SHA256 (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20220112060539-c52dc94e7fbe.zip) = j+FYXyXUCl481CQ6khQ9ca5O6S6RXnGS5yOHBHU5Q44= +SHA256 (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20230105202645-06c439db220b.mod) = OnJc+6NYLl390r2tlmLg/KPK3YqRu8sbSEJRUm9KyFc= +SHA256 (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20230105202645-06c439db220b.zip) = fjPb+SnaiWYej3UHcG9+oodi18SMiZ2Og1IUXBFie/Q= SHA256 (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.mod) = FMOvou9iNVXBtINNH4ixTfd1Sa/uheV1DBkQJGW3iro= SHA256 (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.zip) = cKfmCYCc8qksVTUQTbXrgtdcVL/P7S0iTofdL9lyn2I= SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.0.mod) = vLKTkyUSN7eaF7bBm/KRNPQ+j0OMMZiYj81GGhzfBcw= @@ -287,22 +288,24 @@ SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.zip) = a0SoQ5UfNxtwEMdU7 SHA256 (go_modules/github.com/emersion/go-sasl/@v/v0.0.0-20200509203442-7bfe0ed36a21.mod) = pCH9kPoNx7tTJWvfgeIrHa21k0obLWu70lAA/xVvNqg= SHA256 (go_modules/github.com/emersion/go-sasl/@v/v0.0.0-20220912192320-0145f2c60ead.mod) = pCH9kPoNx7tTJWvfgeIrHa21k0obLWu70lAA/xVvNqg= SHA256 (go_modules/github.com/emersion/go-sasl/@v/v0.0.0-20220912192320-0145f2c60ead.zip) = mpkhKMTAOMa/dZLxdtPcwn4vXitytUo4mwjTomwzQBc= -SHA256 (go_modules/github.com/emersion/go-smtp/@v/v0.15.0.mod) = TPRxkLgQ7feET7yyiaDd9QtYpwcxb9Fd7tLCHuMu3oQ= -SHA256 (go_modules/github.com/emersion/go-smtp/@v/v0.15.0.zip) = ww4a89QlpnBbWeG/yMGOh28rzB6wNMRxP0wzjMymYAE= -SHA256 (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.10.2-0.20220325020618-49ff273808a1.mod) = 2Hi72MmVwWYTnxFqNMPcL4olU3i2WXg8exfJwinT9NU= -SHA256 (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.10.2-0.20220325020618-49ff273808a1.zip) = jovyK6zxtLWlSqbFavPygRMdbc0cy/Iia5weYsm1zKc= +SHA256 (go_modules/github.com/emersion/go-smtp/@v/v0.16.0.mod) = TPRxkLgQ7feET7yyiaDd9QtYpwcxb9Fd7tLCHuMu3oQ= +SHA256 (go_modules/github.com/emersion/go-smtp/@v/v0.16.0.zip) = meQ8j6Js6iJZs0Hp7PqDxzlcUL6iL/kqEiWtTlyzhlQ= +SHA256 (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.10.3.mod) = YOe59j0HZ/ngWexy2wzj05MSL1mNtnsIou0ndnFTvho= +SHA256 (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.10.3.zip) = qgUw+7vi1GgwNVR7FNWKcxj0CDmOEAkmN/IGQt6Cyf8= SHA256 (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod) = Lg88WUDGkwvOA/DIzRck3ZPU0wxrHFri7k4wOfAhXAc= SHA256 (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod) = Lg88WUDGkwvOA/DIzRck3ZPU0wxrHFri7k4wOfAhXAc= SHA256 (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod) = Ywn3UvfUW3TJfj+ODlT8R+YE2WW1KOYPpopGMX7LRNw= SHA256 (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod) = yOLhv5Ma0xq0paMmc+/3ZDmPv5y8bDG78AXHyQT8aao= -SHA256 (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip) = 7FJh87vEJtceK+THYGO6EkYMXSeEXWMHY+npEexHaK8= +SHA256 (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v0.9.1.mod) = SuCY/IkE4zc5jk5EELxrkAT/Kzyi7ExOk3kpHBC7O7o= +SHA256 (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v0.9.1.zip) = fKWutGPAWGkHMHbsJczEFE7dQdSJcfG1/YzsG/EqDUg= SHA256 (go_modules/github.com/gabriel-vasile/mimetype/@v/v1.4.1.mod) = G1bXk4nGl94nfTEJ/ZqdKwNdJWQmoffhMgF/7JmSrbs= SHA256 (go_modules/github.com/gabriel-vasile/mimetype/@v/v1.4.1.zip) = GLUP5P8AwGWnqY1NJIPTFezlxhmpRIz/CJsGjRrzdiU= SHA256 (go_modules/github.com/golang-jwt/jwt/v4/@v/v4.4.2.mod) = D45njmSVtlLFyK7Bh5yBcc1v8c9DX7R/5TY2L4iZQpk= SHA256 (go_modules/github.com/golang-jwt/jwt/v4/@v/v4.4.3.mod) = D45njmSVtlLFyK7Bh5yBcc1v8c9DX7R/5TY2L4iZQpk= SHA256 (go_modules/github.com/golang-jwt/jwt/v4/@v/v4.4.3.zip) = ylYwusR5Uk2IBLhjcg1jyUcahDkcPq9CCODOajJ9koE= SHA256 (go_modules/github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod) = nJuvwPUpBa+qcWSFizoBoMw9wH2iMDAXfOSH9ydDiVg= -SHA256 (go_modules/github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip) = NrPFIsgQLf50ypbkdMTDYXUL8ruFvDzv5PB0wH1oJak= +SHA256 (go_modules/github.com/golang/glog/@v/v1.0.0.mod) = xWnWsxv9RJCSBOOZhJV7ib6E+jLyOx0hGHlFiQ5s3fM= +SHA256 (go_modules/github.com/golang/glog/@v/v1.0.0.zip) = ro3+rRmER6VVQJ5OlCvUquIhCxi8kP+PAyqwmplA6Pg= SHA256 (go_modules/github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod) = URfiu4bxzHzHSJ+fJYD6F7LvHjoKNGv2TtgGPKe4dmM= SHA256 (go_modules/github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.mod) = URfiu4bxzHzHSJ+fJYD6F7LvHjoKNGv2TtgGPKe4dmM= SHA256 (go_modules/github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.zip) = snA06PwBNidUPhrQmM/GUynyiW3z2lzzJmzJFm+T86U= @@ -328,7 +331,6 @@ SHA256 (go_modules/github.com/google/go-cmp/@v/v0.4.0.mod) = QDarVjaqQr0xMpbNO/y SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.0.mod) = QDarVjaqQr0xMpbNO/y0yIkSdgxWqeZlWuQi2HZ8gNo= SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.3.mod) = QDarVjaqQr0xMpbNO/y0yIkSdgxWqeZlWuQi2HZ8gNo= SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.5.mod) = QDarVjaqQr0xMpbNO/y0yIkSdgxWqeZlWuQi2HZ8gNo= -SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.6.mod) = QDarVjaqQr0xMpbNO/y0yIkSdgxWqeZlWuQi2HZ8gNo= SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.8.mod) = 58dmnUod1Ym6PgJLon9D8pPbYR/gdc4g17iENw1j/r0= SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.9.mod) = 58dmnUod1Ym6PgJLon9D8pPbYR/gdc4g17iENw1j/r0= SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.9.zip) = MkUIdKx1bvXUf2uBkwUQUwS5gZBFoW4/EFKJt88lLFE= @@ -340,9 +342,9 @@ SHA256 (go_modules/github.com/google/uuid/@v/v1.3.0.zip) = Cl/MBepJKv6sqYSgEkhfa SHA256 (go_modules/github.com/googleapis/enterprise-certificate-proxy/@v/v0.1.0.mod) = VOq47RV747WmdALWdhPKS5AFrRAqM0ZEP9EusaSU9Yk= SHA256 (go_modules/github.com/googleapis/enterprise-certificate-proxy/@v/v0.2.0.mod) = qRxX2OWe6xwpoKCI1FjuatyOWHF76O36nchtUXWpEt8= SHA256 (go_modules/github.com/googleapis/enterprise-certificate-proxy/@v/v0.2.1.mod) = jXz5Yr6MDPeFbZwIG7LJn8xnr9g9EvNVvI5nEmagt3A= -SHA256 (go_modules/github.com/googleapis/enterprise-certificate-proxy/@v/v0.2.1.zip) = qdWQ5Ba14gUnL0oIrGrZp8NUxcErTldV5Jz8kne3sdY= +SHA256 (go_modules/github.com/googleapis/enterprise-certificate-proxy/@v/v0.2.3.mod) = jXz5Yr6MDPeFbZwIG7LJn8xnr9g9EvNVvI5nEmagt3A= +SHA256 (go_modules/github.com/googleapis/enterprise-certificate-proxy/@v/v0.2.3.zip) = 46WzLKf8T4vDYnTYfDVHl1orBgOyoeSxEpUwUE2d3rc= SHA256 (go_modules/github.com/googleapis/gax-go/v2/@v/v2.4.0.mod) = SnLX41twc42neP7XvDRwCSvVhxKVupxfdrI+6rxCltE= -SHA256 (go_modules/github.com/googleapis/gax-go/v2/@v/v2.6.0.mod) = Gh1p1qcjo4FmijQY1tKorslKmDiTCQRjUbChh7LmlGo= SHA256 (go_modules/github.com/googleapis/gax-go/v2/@v/v2.7.0.mod) = iNOMycfcv+nPhA4tIovZ0wu3sBdDXxziiHcl2VL1RFA= SHA256 (go_modules/github.com/googleapis/gax-go/v2/@v/v2.7.0.zip) = O55AZTRlRNKP1/K0vOquDTPNTrMpCPMaCNzW5HXopGw= SHA256 (go_modules/github.com/gorilla/websocket/@v/v1.5.0.mod) = CdyKkielTBBp6gZdYQpfLKGV8fX7pufbstfrD9bgHfY= @@ -369,8 +371,8 @@ SHA256 (go_modules/github.com/stretchr/testify/@v/v1.7.1.mod) = //gWjZjmoHFWxFSh SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.0.mod) = 4HYHTBVgrR3amLiwD+pjCMS2zNBt3QiNIttGJu1o9zg= SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.1.mod) = rxpdyzMazno/n8G11+7pwLyCtKKhgv5M7CrdIX4oU9Y= SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.1.zip) = NvZOTyKfh2cu+N4cdWZIxBZedqvQNDYlF1eDl+gkhWw= -SHA256 (go_modules/github.com/urfave/cli/v2/@v/v2.23.7.mod) = vrUO54Wf55rTJgt1onaRXPZpTqf1UBuI9VD4q7RpqU0= -SHA256 (go_modules/github.com/urfave/cli/v2/@v/v2.23.7.zip) = ggVH4pFbQmV/sBeFs5SaraWtVKqPhFAOWWwJCqawjgQ= +SHA256 (go_modules/github.com/urfave/cli/v2/@v/v2.24.3.mod) = vrUO54Wf55rTJgt1onaRXPZpTqf1UBuI9VD4q7RpqU0= +SHA256 (go_modules/github.com/urfave/cli/v2/@v/v2.24.3.zip) = cinbxVgR8ulrBIG6AOomDiou4YZRg+o6QQ3GuHQRiX4= SHA256 (go_modules/github.com/xrash/smetrics/@v/v0.0.0-20201216005158-039620a65673.mod) = Kz9hJyfgYrwlZDq5c5S7f0F6KXqf9lIqDxjs93h38EI= SHA256 (go_modules/github.com/xrash/smetrics/@v/v0.0.0-20201216005158-039620a65673.zip) = u+u5oA9E/z4nvsFhEe/9zycG1yeCGkgz7I2hmq2W4m0= SHA256 (go_modules/go.opencensus.io/@v/v0.23.0.mod) = T3K2YKaHwoHX9+kVxtcPTmAfW2rlprB0vCyYGX6w0Co= @@ -378,8 +380,8 @@ SHA256 (go_modules/go.opencensus.io/@v/v0.24.0.mod) = DcnMxmCtIc66/9VI8sxu+ieJHG SHA256 (go_modules/go.opencensus.io/@v/v0.24.0.zip) = IDp2fX+OfB6+VYgiCtFo0eFbFK5wpjbefKmkqIp+DQw= SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = M+0HClpm4JYGhaxThkQOG1mJnnTYo4oRgGhecqIZXe0= SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod) = srEtCfgZFfvPQiYAnlD579qL03V9IFXY7AeXfmW8Zhg= -SHA256 (go_modules/golang.org/x/crypto/@v/v0.4.0.mod) = oCSfrnXTVD+PMNcJZjAsz7P2H8Q4oOyGBzOiLff5UME= -SHA256 (go_modules/golang.org/x/crypto/@v/v0.4.0.zip) = hodCa/q7P/WcJT8Ji4Y6K7NQPvrYDcAUNf/Oji6R6qg= +SHA256 (go_modules/golang.org/x/crypto/@v/v0.6.0.mod) = G2poNFWjuIK2rFPyJ1KWDoe9kQQKlNbyxcthJh4jidg= +SHA256 (go_modules/golang.org/x/crypto/@v/v0.6.0.zip) = gcqIrzcc/1qERCuijiPY9CzME4fI/hUuVeh7pK+eGsc= SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod) = n/HQfKjAlFhFDrX0B2qgOQ71x9sMepQhUOiCWKeLU4M= SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.zip) = w6fcwugRfnSca63JHUkt4+4vW0QLMEgaCnX51j22/gs= SHA256 (go_modules/golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod) = FpsFIlyOJylyfgZ5rjkRkY3+HEsYvtXuD64p+e13sgc= @@ -397,18 +399,18 @@ SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod) = SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod) = ZvxEoGRKUG2ngPeiKl1z3QJdRKblh0C2LSf3TXw6SUg= SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20220624214902-1bab6f366d9e.mod) = sxXFJkfS2i925c2502fh1nJ3hCNqm/+2EhkrGbEKEo0= SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20220708220712-1185a9018129.mod) = sxXFJkfS2i925c2502fh1nJ3hCNqm/+2EhkrGbEKEo0= -SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20220722155237-a158d28d115b.mod) = sxXFJkfS2i925c2502fh1nJ3hCNqm/+2EhkrGbEKEo0= SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20220909164309-bea034e7d591.mod) = RchlScbaiI0Gy5B2u6/uyZ9PtWwlnLbilO0+gEM9vKA= SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20221014081412-f15817d10f9b.mod) = RchlScbaiI0Gy5B2u6/uyZ9PtWwlnLbilO0+gEM9vKA= -SHA256 (go_modules/golang.org/x/net/@v/v0.3.0.mod) = PDYKM2jCXws5pktjD+dO2ZjfAOar7pP9SfVv/nWQoTE= -SHA256 (go_modules/golang.org/x/net/@v/v0.4.0.mod) = PDYKM2jCXws5pktjD+dO2ZjfAOar7pP9SfVv/nWQoTE= -SHA256 (go_modules/golang.org/x/net/@v/v0.4.0.zip) = V+7Gs/ErVa6GvQaQ8+aP+GJlhpNdF7rUZjXq+NM2rqo= +SHA256 (go_modules/golang.org/x/net/@v/v0.5.0.mod) = XDe+Zi2TeArML0PMnG6heErvFMEaDyJ971zm23u4pwQ= +SHA256 (go_modules/golang.org/x/net/@v/v0.6.0.mod) = Qex26iFy8+4wMeOPmlNZOaWE1rs170gIVP3LjCAmcBs= +SHA256 (go_modules/golang.org/x/net/@v/v0.7.0.mod) = Qex26iFy8+4wMeOPmlNZOaWE1rs170gIVP3LjCAmcBs= +SHA256 (go_modules/golang.org/x/net/@v/v0.7.0.zip) = BgVSBkUmqQrJsL3OK6CrNFkt7MlCjRRBw8lyL4U80pA= SHA256 (go_modules/golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod) = y7thjah9T5Q7VL/U9NOi//NhApjwT77rPbOIywdfNRo= -SHA256 (go_modules/golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod) = hp9E5OzVzaUxZVEKMIUVZw3X7ckgBegHnKClyGRSmys= SHA256 (go_modules/golang.org/x/oauth2/@v/v0.0.0-20220909003341-f21342109be1.mod) = 6NaF4dTTbfgpneGh7CYXcuKv/YeIpFeuHj0bZ2QimJo= SHA256 (go_modules/golang.org/x/oauth2/@v/v0.0.0-20221014153046-6fdb5e3db783.mod) = 6NaF4dTTbfgpneGh7CYXcuKv/YeIpFeuHj0bZ2QimJo= -SHA256 (go_modules/golang.org/x/oauth2/@v/v0.3.0.mod) = sc0csRce0aP5j8BnhqfiI/ArivRvLwJx/tw0YS2o4uM= -SHA256 (go_modules/golang.org/x/oauth2/@v/v0.3.0.zip) = VE2hx7BPHAZwiNeP02XWsiAI+sT7wRKmru4BMWHx73Q= +SHA256 (go_modules/golang.org/x/oauth2/@v/v0.4.0.mod) = dnHFzQodPhyXT2EYBTWegZNPC3ZS6h5MwJOSKI/xuZM= +SHA256 (go_modules/golang.org/x/oauth2/@v/v0.5.0.mod) = PQc+kZagqQK85eW3Ub194hB6A1ifWUWPI0pLfFIHDV8= +SHA256 (go_modules/golang.org/x/oauth2/@v/v0.5.0.zip) = TZ2c6NL1W30v+zaX7YEaVGBuiBu3+72E09nEL8QErjw= SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw= SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw= SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw= @@ -422,18 +424,21 @@ SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod) = SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220722155257-8c9f86f7a55f.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220728004956-3c1f35247d10.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= -SHA256 (go_modules/golang.org/x/sys/@v/v0.3.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= -SHA256 (go_modules/golang.org/x/sys/@v/v0.3.0.zip) = y98Y476fIRypYmhKwZ1B1L4kBCiY7AzGZL+NHClV04Q= +SHA256 (go_modules/golang.org/x/sys/@v/v0.4.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= +SHA256 (go_modules/golang.org/x/sys/@v/v0.5.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= +SHA256 (go_modules/golang.org/x/sys/@v/v0.5.0.zip) = z0czasG/Z1+m1t1axTmbAUPFE0BMRJ+j8zgKWBI8eQg= SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.mod) = dAeU4pFPXMh+JWVsWEMiKyxlZlghIF9FYyoEd8jT95s= -SHA256 (go_modules/golang.org/x/term/@v/v0.3.0.mod) = HlYfdBO3S00wyi1smHTM0Tu4yU2qDmwjd7rZ6c9tvlg= -SHA256 (go_modules/golang.org/x/term/@v/v0.3.0.zip) = HNnVjqLYYpm4VphyOOY5KlDmiNBGnMs7SkaTSfJDlQc= +SHA256 (go_modules/golang.org/x/term/@v/v0.5.0.mod) = DW9YIoqtwaZSjmdV2gGFFlZuOuXFIB963hdz9W+o2TQ= +SHA256 (go_modules/golang.org/x/term/@v/v0.5.0.zip) = fYnEmrQTBpUBKKD0t8Z/uOLS9jfs6OAk5s840XozGTs= SHA256 (go_modules/golang.org/x/text/@v/v0.3.0.mod) = NoedWG/YAB6E2oeHGQoR5PeHSeKoHf6Lm2kxiZ//Mc8= SHA256 (go_modules/golang.org/x/text/@v/v0.3.2.mod) = bDx63ysK1xQ9kT9GmNGQhCI2ml5vGYYg+X8+UvmhuN0= SHA256 (go_modules/golang.org/x/text/@v/v0.3.3.mod) = +7eojtFAUV55Dsp6EP/TGcl4axHGpsfln4D3+ze7RUI= SHA256 (go_modules/golang.org/x/text/@v/v0.3.7.mod) = xF1mkIlCe8RjXQexhfm5aAMy0cSMdbPEnLcVuBoEpbA= SHA256 (go_modules/golang.org/x/text/@v/v0.4.0.mod) = FZKedvzgSupMkqNUQmu0M3BoRkWk7gPy510MLrFGYwQ= SHA256 (go_modules/golang.org/x/text/@v/v0.5.0.mod) = FZKedvzgSupMkqNUQmu0M3BoRkWk7gPy510MLrFGYwQ= -SHA256 (go_modules/golang.org/x/text/@v/v0.5.0.zip) = 1sAZbL2ZWC3/X3E+0/8UCAN25rDPFFBE+JcosgQjT3w= +SHA256 (go_modules/golang.org/x/text/@v/v0.6.0.mod) = FZKedvzgSupMkqNUQmu0M3BoRkWk7gPy510MLrFGYwQ= +SHA256 (go_modules/golang.org/x/text/@v/v0.7.0.mod) = FZKedvzgSupMkqNUQmu0M3BoRkWk7gPy510MLrFGYwQ= +SHA256 (go_modules/golang.org/x/text/@v/v0.7.0.zip) = TQF0k8WK3a3zx1MFa5IbR644akz9EOqy2Q7RJSxroOQ= SHA256 (go_modules/golang.org/x/time/@v/v0.1.0.mod) = OOK8+aj1Y6FcL7pX5MIqWWOjipV2ZSGtK288nPhxj8w= SHA256 (go_modules/golang.org/x/time/@v/v0.3.0.mod) = OOK8+aj1Y6FcL7pX5MIqWWOjipV2ZSGtK288nPhxj8w= SHA256 (go_modules/golang.org/x/time/@v/v0.3.0.zip) = +pofzQOkrLgX+qXUTpXwpzGCqWy4EBLJuU+DLXD3KWs= @@ -445,14 +450,16 @@ SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod) SHA256 (go_modules/golang.org/x/tools/@v/v0.1.12.mod) = KouTZYmPCCL6zmW6CJoTU+aKZdNC8wDKMXzOzN5kIfM= SHA256 (go_modules/golang.org/x/tools/@v/v0.1.12.zip) = SxIuDkcDvEAUyxz4wBT8+T6n1y8B2nlJk2U0b1TLuFE= SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U= -SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U= SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20220609144429-65e65417b02f.mod) = ycRP1T5v9jnosGWFs/PV/uHCe3X0P4WgrSsYLDxo230= SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20220907171357-04be3eba64a2.mod) = ycRP1T5v9jnosGWFs/PV/uHCe3X0P4WgrSsYLDxo230= SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20220907171357-04be3eba64a2.zip) = ucSB2zPEtoK6i6NIAY3b0hVb0ifMOP+fa0yyt0u8PBQ= SHA256 (go_modules/google.golang.org/api/@v/v0.102.0.mod) = nBVJFesUhkdVaGCubvgbOlKEKOgAiZGmN6CN/5p6nzc= SHA256 (go_modules/google.golang.org/api/@v/v0.103.0.mod) = dv4TP1A4KB+kbhiUUNAEXqroQxz0FFM71vp0A7smcPs= -SHA256 (go_modules/google.golang.org/api/@v/v0.105.0.mod) = 0vOGOa5E7P9hBYci1HhYsDNOsxL7m3D1qjP4cZE1eeo= -SHA256 (go_modules/google.golang.org/api/@v/v0.105.0.zip) = cJFnZNG/d79JWL2IDA6tho41nVKCAIMM+6AO4sJ7PMg= +SHA256 (go_modules/google.golang.org/api/@v/v0.106.0.mod) = g+rlRSBhxZWFevPYmUS79/qO48b/pM0XdqwYTKkP3LA= +SHA256 (go_modules/google.golang.org/api/@v/v0.107.0.mod) = g+rlRSBhxZWFevPYmUS79/qO48b/pM0XdqwYTKkP3LA= +SHA256 (go_modules/google.golang.org/api/@v/v0.108.0.mod) = g+rlRSBhxZWFevPYmUS79/qO48b/pM0XdqwYTKkP3LA= +SHA256 (go_modules/google.golang.org/api/@v/v0.110.0.mod) = 23qD+pvRmRSGw4GwqA9kowpUGOOqqzaJ4wu28K8yMY8= +SHA256 (go_modules/google.golang.org/api/@v/v0.110.0.zip) = 2v8T5Zr28eljKF2EVGaVhrHf+rHY+ASvf/aCqT/UEC0= SHA256 (go_modules/google.golang.org/api/@v/v0.96.0.mod) = FRdPPRT+DpJXup+pLHJMlwDHWCiSjVSZbVeDN+wRLF4= SHA256 (go_modules/google.golang.org/appengine/@v/v1.1.0.mod) = 0Ps/MoqVJZ3e6375NPKrrgMnxqBS/xqwWiuIIXipU7g= SHA256 (go_modules/google.golang.org/appengine/@v/v1.4.0.mod) = +VuAj+0sb+uyOo0R6SdDWDs3hhWE0wI0mtpa4Co4dN0= @@ -465,14 +472,13 @@ SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261 SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod) = TsOU0+ynNofREaPg6IgIsQBocwK0Y7F4abzQJgFnSL0= SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20220810155839-1856144b1d9c.mod) = HzTwhCHw4oClVNg/9eWu9SbjPLMf9W7E4HgAvPxJW1I= SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20221024183307-1bc688fe9f3e.mod) = m1MKSbuOjz6E3VfZEw088zMVUz9l3khihCu552Rz0Sw= -SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20221027153422-115e99e71e1c.mod) = 8glr1ivpm/ksZclmnG8rR6/BGp2ToGvkp/4FhzChCoU= SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20221118155620-16455021b5e6.mod) = IVAJUwrNTJloFSJ2TVH6obNIAM3AnSbCQf51vwfy/M0= -SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20221201164419-0e50fba7f41c.mod) = IVAJUwrNTJloFSJ2TVH6obNIAM3AnSbCQf51vwfy/M0= -SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20221202195650-67e5cbc046fd.mod) = wZsD1YVTR9XDIXf98Guux9jsU7KaBssB7DKRIEgrPwM= SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20221205194025-8222ab48f5fc.mod) = wo/112YHFtKdm2nXdQtgrFXqTF/x5hQ91OUygcw7QA0= -SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20221206210731-b1a01be3a5f6.mod) = wo/112YHFtKdm2nXdQtgrFXqTF/x5hQ91OUygcw7QA0= -SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20221207170731-23e4bf6bdc37.mod) = WfOqvF/poS/pAtHZml/1pAKPcxlOI+K8icm6Gaf5lno= -SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20221207170731-23e4bf6bdc37.zip) = J2PbuywNhV10LSOdjNtSs8x20pdTmxjs9tnflYH9eX8= +SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20230110181048-76db0878b65f.mod) = WfOqvF/poS/pAtHZml/1pAKPcxlOI+K8icm6Gaf5lno= +SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20230113154510-dbe35b8444a5.mod) = WfOqvF/poS/pAtHZml/1pAKPcxlOI+K8icm6Gaf5lno= +SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20230124163310-31e0e69b6fc2.mod) = WfOqvF/poS/pAtHZml/1pAKPcxlOI+K8icm6Gaf5lno= +SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20230209215440-0dfe4f8abfcc.mod) = WfOqvF/poS/pAtHZml/1pAKPcxlOI+K8icm6Gaf5lno= +SHA256 (go_modules/google.golang.org/genproto/@v/v0.0.0-20230209215440-0dfe4f8abfcc.zip) = 1ZPnMhh66ZG+3oMpzHOn7i6d91KK4M/BIB0wGd5EXhU= SHA256 (go_modules/google.golang.org/grpc/@v/v1.19.0.mod) = cd4ll/0ILogu8Illugw+4Z048t8lkgczzUNM+AonrDU= SHA256 (go_modules/google.golang.org/grpc/@v/v1.23.0.mod) = WHybhU1/XwGBSHyFSiT8TAGYLlZB0wLOHQ89BBlRy4s= SHA256 (go_modules/google.golang.org/grpc/@v/v1.25.1.mod) = PEaQF5lFdE7FsBJ535m+hhU/04bW+muO+YiKzkKMsYI= @@ -481,7 +487,8 @@ SHA256 (go_modules/google.golang.org/grpc/@v/v1.33.2.mod) = dMCckwtVh1J+x77bJZhs SHA256 (go_modules/google.golang.org/grpc/@v/v1.48.0.mod) = L6/g986iLo8ZP+tY1e1bpoxkXrkhBUPPzf4wf/0iVLs= SHA256 (go_modules/google.golang.org/grpc/@v/v1.50.1.mod) = 5Bz25kIRU7AxYQXG6DX6ou5E6vUqj1Q6D1brAPo47SY= SHA256 (go_modules/google.golang.org/grpc/@v/v1.51.0.mod) = GG6ECd0RYnPMTY+VGjX9wyAMcb/gA1XJx1pu0Osw3ro= -SHA256 (go_modules/google.golang.org/grpc/@v/v1.51.0.zip) = gHZVZVGikBzAp8lri92N4fjjMXJ0TIKQVtvTuP1Y4JY= +SHA256 (go_modules/google.golang.org/grpc/@v/v1.53.0.mod) = +47qdytH5WnmOBjxv9QA8dglpSRLpdVQMMmj+Qx6a6M= +SHA256 (go_modules/google.golang.org/grpc/@v/v1.53.0.zip) = J+rGMCN2Ah7uUk3c5IdXGgaG6zhoqvk5gepnZ+GSnWs= SHA256 (go_modules/google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod) = ojmQ77Z+4QuxbR0ZNhCc76TkJirj2o0HSO+2kWFNu3g= SHA256 (go_modules/google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod) = ptlQ3Sp+uC5Rz0WdP2H2FLCdcwrbnoCU1b+WsEPzgXQ= SHA256 (go_modules/google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod) = O4CNGZR/sp5Nsk7Vy4iUGvwZJ/U42ArW+ICuRmSl0BY= @@ -493,7 +500,6 @@ SHA256 (go_modules/google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48 SHA256 (go_modules/google.golang.org/protobuf/@v/v1.25.0.mod) = beqAhz0nWKgd5tFrz2p/RaJ/KtTAR7e02h6ISBqXSQM= SHA256 (go_modules/google.golang.org/protobuf/@v/v1.26.0-rc.1.mod) = ssT+Gmb/W+brfAxTiPCA0IghwyesXPl13uUdiw+0np8= SHA256 (go_modules/google.golang.org/protobuf/@v/v1.26.0.mod) = COwuIPOO/LZRRigABp7OSJHiUqJhAH+p1aGxV/UW7l8= -SHA256 (go_modules/google.golang.org/protobuf/@v/v1.27.1.mod) = COwuIPOO/LZRRigABp7OSJHiUqJhAH+p1aGxV/UW7l8= SHA256 (go_modules/google.golang.org/protobuf/@v/v1.28.0.mod) = P3xyYKmH3OL9+0jOKvi082SHNQfSGrzM66sKJ0N2Hic= SHA256 (go_modules/google.golang.org/protobuf/@v/v1.28.1.mod) = P3xyYKmH3OL9+0jOKvi082SHNQfSGrzM66sKJ0N2Hic= SHA256 (go_modules/google.golang.org/protobuf/@v/v1.28.1.zip) = vzhrzTaYf4mOcMgzDG962gPlESkJ8KkrdRCWFAO/Ydo= @@ -507,13 +513,13 @@ SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.zip) = qrj7xOYwDqCOav4crqGKIckMefS SHA256 (go_modules/honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod) = scYIN+phM18U32TzGUw82S4PYo9gZIBnGJUPDXodvp4= SHA256 (go_modules/honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod) = scYIN+phM18U32TzGUw82S4PYo9gZIBnGJUPDXodvp4= SHA256 (go_modules/honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.zip) = 7qqCcA6WrF6APXqcMjYzMlBL7/j7sSAkkrTUPVpec2A= -SHA256 (ntfy-v1.30.1.zip) = 45am0h3si+5dP0eeZq3KRPuCbnuaw+5KnMcxCinw2Qk= +SHA256 (ntfy-v1.31.0.zip) = xM2tBTfctI9yAa/Td7qruWYDIln8J6DHNJEG3XHOpnY= SIZE (go_modules/cloud.google.com/go/@v/v0.102.1.mod) = 568 SIZE (go_modules/cloud.google.com/go/@v/v0.105.0.mod) = 1034 SIZE (go_modules/cloud.google.com/go/@v/v0.107.0.mod) = 1091 -SIZE (go_modules/cloud.google.com/go/@v/v0.107.0.zip) = 542234 +SIZE (go_modules/cloud.google.com/go/@v/v0.109.0.mod) = 1091 +SIZE (go_modules/cloud.google.com/go/@v/v0.109.0.zip) = 549831 SIZE (go_modules/cloud.google.com/go/@v/v0.26.0.mod) = 27 -SIZE (go_modules/cloud.google.com/go/@v/v0.34.0.mod) = 27 SIZE (go_modules/cloud.google.com/go/accessapproval/@v/v1.5.0.mod) = 948 SIZE (go_modules/cloud.google.com/go/accessapproval/@v/v1.5.0.zip) = 43379 SIZE (go_modules/cloud.google.com/go/accesscontextmanager/@v/v1.4.0.mod) = 1036 @@ -563,11 +569,12 @@ SIZE (go_modules/cloud.google.com/go/cloudtasks/@v/v1.8.0.zip) = 186125 SIZE (go_modules/cloud.google.com/go/compute/@v/v1.12.1.mod) = 922 SIZE (go_modules/cloud.google.com/go/compute/@v/v1.13.0.mod) = 922 SIZE (go_modules/cloud.google.com/go/compute/@v/v1.14.0.mod) = 922 -SIZE (go_modules/cloud.google.com/go/compute/@v/v1.14.0.zip) = 1654222 +SIZE (go_modules/cloud.google.com/go/compute/@v/v1.15.1.mod) = 922 +SIZE (go_modules/cloud.google.com/go/compute/@v/v1.18.0.mod) = 922 +SIZE (go_modules/cloud.google.com/go/compute/@v/v1.18.0.zip) = 1674200 SIZE (go_modules/cloud.google.com/go/compute/@v/v1.7.0.mod) = 322 SIZE (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.0.mod) = 53 SIZE (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.1.mod) = 98 -SIZE (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.2.mod) = 98 SIZE (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.mod) = 98 SIZE (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.zip) = 20855 SIZE (go_modules/cloud.google.com/go/contactcenterinsights/@v/v1.4.0.mod) = 1037 @@ -633,12 +640,10 @@ SIZE (go_modules/cloud.google.com/go/gkemulticloud/@v/v0.4.0.mod) = 1029 SIZE (go_modules/cloud.google.com/go/gkemulticloud/@v/v0.4.0.zip) = 105106 SIZE (go_modules/cloud.google.com/go/gsuiteaddons/@v/v1.4.0.mod) = 946 SIZE (go_modules/cloud.google.com/go/gsuiteaddons/@v/v1.4.0.zip) = 34806 +SIZE (go_modules/cloud.google.com/go/iam/@v/v0.10.0.mod) = 995 +SIZE (go_modules/cloud.google.com/go/iam/@v/v0.10.0.zip) = 125153 SIZE (go_modules/cloud.google.com/go/iam/@v/v0.3.0.mod) = 284 -SIZE (go_modules/cloud.google.com/go/iam/@v/v0.6.0.mod) = 897 -SIZE (go_modules/cloud.google.com/go/iam/@v/v0.7.0.mod) = 995 SIZE (go_modules/cloud.google.com/go/iam/@v/v0.8.0.mod) = 995 -SIZE (go_modules/cloud.google.com/go/iam/@v/v0.9.0.mod) = 995 -SIZE (go_modules/cloud.google.com/go/iam/@v/v0.9.0.zip) = 120622 SIZE (go_modules/cloud.google.com/go/iap/@v/v1.5.0.mod) = 937 SIZE (go_modules/cloud.google.com/go/iap/@v/v1.5.0.zip) = 50137 SIZE (go_modules/cloud.google.com/go/ids/@v/v1.2.0.mod) = 1019 @@ -654,7 +659,8 @@ SIZE (go_modules/cloud.google.com/go/lifesciences/@v/v0.6.0.zip) = 66300 SIZE (go_modules/cloud.google.com/go/logging/@v/v1.6.1.mod) = 1170 SIZE (go_modules/cloud.google.com/go/logging/@v/v1.6.1.zip) = 184654 SIZE (go_modules/cloud.google.com/go/longrunning/@v/v0.3.0.mod) = 963 -SIZE (go_modules/cloud.google.com/go/longrunning/@v/v0.3.0.zip) = 40408 +SIZE (go_modules/cloud.google.com/go/longrunning/@v/v0.4.1.mod) = 879 +SIZE (go_modules/cloud.google.com/go/longrunning/@v/v0.4.1.zip) = 40816 SIZE (go_modules/cloud.google.com/go/managedidentities/@v/v1.4.0.mod) = 1033 SIZE (go_modules/cloud.google.com/go/managedidentities/@v/v1.4.0.zip) = 44965 SIZE (go_modules/cloud.google.com/go/maps/@v/v0.1.0.mod) = 938 @@ -734,9 +740,9 @@ SIZE (go_modules/cloud.google.com/go/spanner/@v/v1.41.0.zip) = 594150 SIZE (go_modules/cloud.google.com/go/speech/@v/v1.9.0.mod) = 998 SIZE (go_modules/cloud.google.com/go/speech/@v/v1.9.0.zip) = 196649 SIZE (go_modules/cloud.google.com/go/storage/@v/v1.26.0.mod) = 1033 -SIZE (go_modules/cloud.google.com/go/storage/@v/v1.27.0.mod) = 1033 SIZE (go_modules/cloud.google.com/go/storage/@v/v1.28.1.mod) = 1092 -SIZE (go_modules/cloud.google.com/go/storage/@v/v1.28.1.zip) = 580670 +SIZE (go_modules/cloud.google.com/go/storage/@v/v1.29.0.mod) = 1092 +SIZE (go_modules/cloud.google.com/go/storage/@v/v1.29.0.zip) = 581973 SIZE (go_modules/cloud.google.com/go/storagetransfer/@v/v1.6.0.mod) = 1031 SIZE (go_modules/cloud.google.com/go/storagetransfer/@v/v1.6.0.zip) = 73267 SIZE (go_modules/cloud.google.com/go/talent/@v/v1.4.0.mod) = 1010 @@ -779,16 +785,17 @@ SIZE (go_modules/github.com/!micah!parks/keyfunc/@v/v1.5.1.mod) = 247 SIZE (go_modules/github.com/!micah!parks/keyfunc/@v/v1.9.0.mod) = 247 SIZE (go_modules/github.com/!micah!parks/keyfunc/@v/v1.9.0.zip) = 71843 SIZE (go_modules/github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod) = 58 -SIZE (go_modules/github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip) = 210929 -SIZE (go_modules/github.com/cespare/xxhash/v2/@v/v2.1.1.mod) = 45 -SIZE (go_modules/github.com/cespare/xxhash/v2/@v/v2.1.1.zip) = 12031 +SIZE (go_modules/github.com/census-instrumentation/opencensus-proto/@v/v0.4.1.mod) = 502 +SIZE (go_modules/github.com/census-instrumentation/opencensus-proto/@v/v0.4.1.zip) = 223629 +SIZE (go_modules/github.com/cespare/xxhash/v2/@v/v2.2.0.mod) = 45 +SIZE (go_modules/github.com/cespare/xxhash/v2/@v/v2.2.0.zip) = 17183 SIZE (go_modules/github.com/client9/misspell/@v/v0.3.4.mod) = 35 SIZE (go_modules/github.com/client9/misspell/@v/v0.3.4.zip) = 246908 SIZE (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod) = 170 -SIZE (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20210930031921-04548b0d99d4.mod) = 158 -SIZE (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20210930031921-04548b0d99d4.zip) = 7602 -SIZE (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20211011173535-cb28da3451f1.mod) = 169 -SIZE (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20211011173535-cb28da3451f1.zip) = 109136 +SIZE (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20220112060539-c52dc94e7fbe.mod) = 158 +SIZE (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20220112060539-c52dc94e7fbe.zip) = 7602 +SIZE (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20230105202645-06c439db220b.mod) = 169 +SIZE (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20230105202645-06c439db220b.zip) = 139998 SIZE (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.mod) = 100 SIZE (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.zip) = 12539 SIZE (go_modules/github.com/davecgh/go-spew/@v/v1.1.0.mod) = 34 @@ -797,22 +804,24 @@ SIZE (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.zip) = 60320 SIZE (go_modules/github.com/emersion/go-sasl/@v/v0.0.0-20200509203442-7bfe0ed36a21.mod) = 44 SIZE (go_modules/github.com/emersion/go-sasl/@v/v0.0.0-20220912192320-0145f2c60ead.mod) = 44 SIZE (go_modules/github.com/emersion/go-sasl/@v/v0.0.0-20220912192320-0145f2c60ead.zip) = 12979 -SIZE (go_modules/github.com/emersion/go-smtp/@v/v0.15.0.mod) = 116 -SIZE (go_modules/github.com/emersion/go-smtp/@v/v0.15.0.zip) = 45091 -SIZE (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.10.2-0.20220325020618-49ff273808a1.mod) = 711 -SIZE (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.10.2-0.20220325020618-49ff273808a1.zip) = 3531077 +SIZE (go_modules/github.com/emersion/go-smtp/@v/v0.16.0.mod) = 116 +SIZE (go_modules/github.com/emersion/go-smtp/@v/v0.16.0.zip) = 46090 +SIZE (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.10.3.mod) = 554 +SIZE (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.10.3.zip) = 3597472 SIZE (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod) = 378 SIZE (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod) = 378 SIZE (go_modules/github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod) = 471 SIZE (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod) = 49 -SIZE (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip) = 194391 +SIZE (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v0.9.1.mod) = 628 +SIZE (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v0.9.1.zip) = 232593 SIZE (go_modules/github.com/gabriel-vasile/mimetype/@v/v1.4.1.mod) = 112 SIZE (go_modules/github.com/gabriel-vasile/mimetype/@v/v1.4.1.zip) = 25114511 SIZE (go_modules/github.com/golang-jwt/jwt/v4/@v/v4.4.2.mod) = 138 SIZE (go_modules/github.com/golang-jwt/jwt/v4/@v/v4.4.3.mod) = 138 SIZE (go_modules/github.com/golang-jwt/jwt/v4/@v/v4.4.3.zip) = 76162 SIZE (go_modules/github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod) = 30 -SIZE (go_modules/github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip) = 22449 +SIZE (go_modules/github.com/golang/glog/@v/v1.0.0.mod) = 39 +SIZE (go_modules/github.com/golang/glog/@v/v1.0.0.zip) = 22434 SIZE (go_modules/github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod) = 36 SIZE (go_modules/github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.mod) = 36 SIZE (go_modules/github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.zip) = 39744 @@ -838,7 +847,6 @@ SIZE (go_modules/github.com/google/go-cmp/@v/v0.4.0.mod) = 105 SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.0.mod) = 105 SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.3.mod) = 105 SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.5.mod) = 105 -SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.6.mod) = 105 SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.8.mod) = 41 SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.9.mod) = 41 SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.9.zip) = 130220 @@ -850,9 +858,9 @@ SIZE (go_modules/github.com/google/uuid/@v/v1.3.0.zip) = 25027 SIZE (go_modules/github.com/googleapis/enterprise-certificate-proxy/@v/v0.1.0.mod) = 66 SIZE (go_modules/github.com/googleapis/enterprise-certificate-proxy/@v/v0.2.0.mod) = 67 SIZE (go_modules/github.com/googleapis/enterprise-certificate-proxy/@v/v0.2.1.mod) = 67 -SIZE (go_modules/github.com/googleapis/enterprise-certificate-proxy/@v/v0.2.1.zip) = 28115 +SIZE (go_modules/github.com/googleapis/enterprise-certificate-proxy/@v/v0.2.3.mod) = 67 +SIZE (go_modules/github.com/googleapis/enterprise-certificate-proxy/@v/v0.2.3.zip) = 32042 SIZE (go_modules/github.com/googleapis/gax-go/v2/@v/v2.4.0.mod) = 257 -SIZE (go_modules/github.com/googleapis/gax-go/v2/@v/v2.6.0.mod) = 485 SIZE (go_modules/github.com/googleapis/gax-go/v2/@v/v2.7.0.mod) = 486 SIZE (go_modules/github.com/googleapis/gax-go/v2/@v/v2.7.0.zip) = 47286 SIZE (go_modules/github.com/gorilla/websocket/@v/v1.5.0.mod) = 45 @@ -879,8 +887,8 @@ SIZE (go_modules/github.com/stretchr/testify/@v/v1.7.1.mod) = 216 SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.0.mod) = 188 SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.1.mod) = 188 SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.1.zip) = 113583 -SIZE (go_modules/github.com/urfave/cli/v2/@v/v2.23.7.mod) = 280 -SIZE (go_modules/github.com/urfave/cli/v2/@v/v2.23.7.zip) = 3544683 +SIZE (go_modules/github.com/urfave/cli/v2/@v/v2.24.3.mod) = 280 +SIZE (go_modules/github.com/urfave/cli/v2/@v/v2.24.3.zip) = 3547633 SIZE (go_modules/github.com/xrash/smetrics/@v/v0.0.0-20201216005158-039620a65673.mod) = 33 SIZE (go_modules/github.com/xrash/smetrics/@v/v0.0.0-20201216005158-039620a65673.zip) = 1826113 SIZE (go_modules/go.opencensus.io/@v/v0.23.0.mod) = 300 @@ -888,8 +896,8 @@ SIZE (go_modules/go.opencensus.io/@v/v0.24.0.mod) = 300 SIZE (go_modules/go.opencensus.io/@v/v0.24.0.zip) = 310262 SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = 88 SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod) = 155 -SIZE (go_modules/golang.org/x/crypto/@v/v0.4.0.mod) = 171 -SIZE (go_modules/golang.org/x/crypto/@v/v0.4.0.zip) = 1761018 +SIZE (go_modules/golang.org/x/crypto/@v/v0.6.0.mod) = 171 +SIZE (go_modules/golang.org/x/crypto/@v/v0.6.0.zip) = 1761232 SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod) = 24 SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.zip) = 1453241 SIZE (go_modules/golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod) = 25 @@ -907,18 +915,18 @@ SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod) = 1 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod) = 181 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20220624214902-1bab6f366d9e.mod) = 179 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20220708220712-1185a9018129.mod) = 179 -SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20220722155237-a158d28d115b.mod) = 179 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20220909164309-bea034e7d591.mod) = 179 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20221014081412-f15817d10f9b.mod) = 179 -SIZE (go_modules/golang.org/x/net/@v/v0.3.0.mod) = 123 -SIZE (go_modules/golang.org/x/net/@v/v0.4.0.mod) = 123 -SIZE (go_modules/golang.org/x/net/@v/v0.4.0.zip) = 1553054 +SIZE (go_modules/golang.org/x/net/@v/v0.5.0.mod) = 123 +SIZE (go_modules/golang.org/x/net/@v/v0.6.0.mod) = 123 +SIZE (go_modules/golang.org/x/net/@v/v0.7.0.mod) = 123 +SIZE (go_modules/golang.org/x/net/@v/v0.7.0.zip) = 1559354 SIZE (go_modules/golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod) = 27 -SIZE (go_modules/golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod) = 233 SIZE (go_modules/golang.org/x/oauth2/@v/v0.0.0-20220909003341-f21342109be1.mod) = 315 SIZE (go_modules/golang.org/x/oauth2/@v/v0.0.0-20221014153046-6fdb5e3db783.mod) = 315 -SIZE (go_modules/golang.org/x/oauth2/@v/v0.3.0.mod) = 296 -SIZE (go_modules/golang.org/x/oauth2/@v/v0.3.0.zip) = 136896 +SIZE (go_modules/golang.org/x/oauth2/@v/v0.4.0.mod) = 296 +SIZE (go_modules/golang.org/x/oauth2/@v/v0.5.0.mod) = 308 +SIZE (go_modules/golang.org/x/oauth2/@v/v0.5.0.zip) = 136887 SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod) = 25 SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod) = 25 SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod) = 25 @@ -932,18 +940,21 @@ SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod) = 3 SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 33 SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220722155257-8c9f86f7a55f.mod) = 33 SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220728004956-3c1f35247d10.mod) = 33 -SIZE (go_modules/golang.org/x/sys/@v/v0.3.0.mod) = 33 -SIZE (go_modules/golang.org/x/sys/@v/v0.3.0.zip) = 1862151 +SIZE (go_modules/golang.org/x/sys/@v/v0.4.0.mod) = 33 +SIZE (go_modules/golang.org/x/sys/@v/v0.5.0.mod) = 33 +SIZE (go_modules/golang.org/x/sys/@v/v0.5.0.zip) = 1886681 SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.mod) = 95 -SIZE (go_modules/golang.org/x/term/@v/v0.3.0.mod) = 67 -SIZE (go_modules/golang.org/x/term/@v/v0.3.0.zip) = 19924 +SIZE (go_modules/golang.org/x/term/@v/v0.5.0.mod) = 67 +SIZE (go_modules/golang.org/x/term/@v/v0.5.0.zip) = 19924 SIZE (go_modules/golang.org/x/text/@v/v0.3.0.mod) = 25 SIZE (go_modules/golang.org/x/text/@v/v0.3.2.mod) = 88 SIZE (go_modules/golang.org/x/text/@v/v0.3.3.mod) = 97 SIZE (go_modules/golang.org/x/text/@v/v0.3.7.mod) = 97 SIZE (go_modules/golang.org/x/text/@v/v0.4.0.mod) = 258 SIZE (go_modules/golang.org/x/text/@v/v0.5.0.mod) = 258 -SIZE (go_modules/golang.org/x/text/@v/v0.5.0.zip) = 8614807 +SIZE (go_modules/golang.org/x/text/@v/v0.6.0.mod) = 258 +SIZE (go_modules/golang.org/x/text/@v/v0.7.0.mod) = 258 +SIZE (go_modules/golang.org/x/text/@v/v0.7.0.zip) = 8614578 SIZE (go_modules/golang.org/x/time/@v/v0.1.0.mod) = 25 SIZE (go_modules/golang.org/x/time/@v/v0.3.0.mod) = 25 SIZE (go_modules/golang.org/x/time/@v/v0.3.0.zip) = 14618 @@ -955,14 +966,16 @@ SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod) = SIZE (go_modules/golang.org/x/tools/@v/v0.1.12.mod) = 327 SIZE (go_modules/golang.org/x/tools/@v/v0.1.12.zip) = 3946738 SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod) = 37 -SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod) = 37 SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20220609144429-65e65417b02f.mod) = 37 SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20220907171357-04be3eba64a2.mod) = 37 SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20220907171357-04be3eba64a2.zip) = 22397 SIZE (go_modules/google.golang.org/api/@v/v0.102.0.mod) = 933 SIZE (go_modules/google.golang.org/api/@v/v0.103.0.mod) = 933 -SIZE (go_modules/google.golang.org/api/@v/v0.105.0.mod) = 876 -SIZE (go_modules/google.golang.org/api/@v/v0.105.0.zip) = 31886254 +SIZE (go_modules/google.golang.org/api/@v/v0.106.0.mod) = 876 +SIZE (go_modules/google.golang.org/api/@v/v0.107.0.mod) = 876 +SIZE (go_modules/google.golang.org/api/@v/v0.108.0.mod) = 876 +SIZE (go_modules/google.golang.org/api/@v/v0.110.0.mod) = 792 +SIZE (go_modules/google.golang.org/api/@v/v0.110.0.zip) = 32658520 SIZE (go_modules/google.golang.org/api/@v/v0.96.0.mod) = 680 SIZE (go_modules/google.golang.org/appengine/@v/v1.1.0.mod) = 35 SIZE (go_modules/google.golang.org/appengine/@v/v1.4.0.mod) = 162 @@ -975,14 +988,13 @@ SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c5 SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod) = 353 SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20220810155839-1856144b1d9c.mod) = 340 SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20221024183307-1bc688fe9f3e.mod) = 2448 -SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20221027153422-115e99e71e1c.mod) = 4654 SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20221118155620-16455021b5e6.mod) = 4659 -SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20221201164419-0e50fba7f41c.mod) = 4659 -SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20221202195650-67e5cbc046fd.mod) = 4964 SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20221205194025-8222ab48f5fc.mod) = 4964 -SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20221206210731-b1a01be3a5f6.mod) = 4964 -SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20221207170731-23e4bf6bdc37.mod) = 5038 -SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20221207170731-23e4bf6bdc37.zip) = 7508999 +SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20230110181048-76db0878b65f.mod) = 5038 +SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20230113154510-dbe35b8444a5.mod) = 5038 +SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20230124163310-31e0e69b6fc2.mod) = 5038 +SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20230209215440-0dfe4f8abfcc.mod) = 5038 +SIZE (go_modules/google.golang.org/genproto/@v/v0.0.0-20230209215440-0dfe4f8abfcc.zip) = 7847284 SIZE (go_modules/google.golang.org/grpc/@v/v1.19.0.mod) = 833 SIZE (go_modules/google.golang.org/grpc/@v/v1.23.0.mod) = 762 SIZE (go_modules/google.golang.org/grpc/@v/v1.25.1.mod) = 532 @@ -991,7 +1003,8 @@ SIZE (go_modules/google.golang.org/grpc/@v/v1.33.2.mod) = 578 SIZE (go_modules/google.golang.org/grpc/@v/v1.48.0.mod) = 705 SIZE (go_modules/google.golang.org/grpc/@v/v1.50.1.mod) = 1047 SIZE (go_modules/google.golang.org/grpc/@v/v1.51.0.mod) = 1047 -SIZE (go_modules/google.golang.org/grpc/@v/v1.51.0.zip) = 1949430 +SIZE (go_modules/google.golang.org/grpc/@v/v1.53.0.mod) = 901 +SIZE (go_modules/google.golang.org/grpc/@v/v1.53.0.zip) = 1982072 SIZE (go_modules/google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod) = 83 SIZE (go_modules/google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod) = 128 SIZE (go_modules/google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod) = 158 @@ -1003,7 +1016,6 @@ SIZE (go_modules/google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad SIZE (go_modules/google.golang.org/protobuf/@v/v1.25.0.mod) = 186 SIZE (go_modules/google.golang.org/protobuf/@v/v1.26.0-rc.1.mod) = 83 SIZE (go_modules/google.golang.org/protobuf/@v/v1.26.0.mod) = 123 -SIZE (go_modules/google.golang.org/protobuf/@v/v1.27.1.mod) = 123 SIZE (go_modules/google.golang.org/protobuf/@v/v1.28.0.mod) = 124 SIZE (go_modules/google.golang.org/protobuf/@v/v1.28.1.mod) = 124 SIZE (go_modules/google.golang.org/protobuf/@v/v1.28.1.zip) = 1574540 @@ -1017,4 +1029,4 @@ SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.zip) = 104623 SIZE (go_modules/honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod) = 26 SIZE (go_modules/honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod) = 26 SIZE (go_modules/honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.zip) = 449180 -SIZE (ntfy-v1.30.1.zip) = 13080155 +SIZE (ntfy-v1.31.0.zip) = 12949163 diff --git a/net/ntfy/modules.inc b/net/ntfy/modules.inc index 307a76bd2..9c3881707 100644 --- a/net/ntfy/modules.inc +++ b/net/ntfy/modules.inc @@ -1,5 +1,5 @@ MODGO_MODULES = \ - cloud.google.com/go v0.107.0 \ + cloud.google.com/go v0.109.0 \ cloud.google.com/go/accessapproval v1.5.0 \ cloud.google.com/go/accesscontextmanager v1.4.0 \ cloud.google.com/go/aiplatform v1.27.0 \ @@ -23,7 +23,7 @@ MODGO_MODULES = \ cloud.google.com/go/cloudbuild v1.4.0 \ cloud.google.com/go/clouddms v1.4.0 \ cloud.google.com/go/cloudtasks v1.8.0 \ - cloud.google.com/go/compute v1.14.0 \ + cloud.google.com/go/compute v1.18.0 \ cloud.google.com/go/compute/metadata v0.2.3 \ cloud.google.com/go/contactcenterinsights v1.4.0 \ cloud.google.com/go/container v1.7.0 \ @@ -56,7 +56,7 @@ MODGO_MODULES = \ cloud.google.com/go/gkehub v0.10.0 \ cloud.google.com/go/gkemulticloud v0.4.0 \ cloud.google.com/go/gsuiteaddons v1.4.0 \ - cloud.google.com/go/iam v0.9.0 \ + cloud.google.com/go/iam v0.10.0 \ cloud.google.com/go/iap v1.5.0 \ cloud.google.com/go/ids v1.2.0 \ cloud.google.com/go/iot v1.4.0 \ @@ -64,7 +64,7 @@ MODGO_MODULES = \ cloud.google.com/go/language v1.8.0 \ cloud.google.com/go/lifesciences v0.6.0 \ cloud.google.com/go/logging v1.6.1 \ - cloud.google.com/go/longrunning v0.3.0 \ + cloud.google.com/go/longrunning v0.4.1 \ cloud.google.com/go/managedidentities v1.4.0 \ cloud.google.com/go/maps v0.1.0 \ cloud.google.com/go/mediatranslation v0.6.0 \ @@ -104,7 +104,7 @@ MODGO_MODULES = \ cloud.google.com/go/shell v1.4.0 \ cloud.google.com/go/spanner v1.41.0 \ cloud.google.com/go/speech v1.9.0 \ - cloud.google.com/go/storage v1.28.1 \ + cloud.google.com/go/storage v1.29.0 \ cloud.google.com/go/storagetransfer v1.6.0 \ cloud.google.com/go/talent v1.4.0 \ cloud.google.com/go/texttospeech v1.5.0 \ @@ -124,27 +124,27 @@ MODGO_MODULES = \ github.com/!alek!si/pointer v1.2.0 \ github.com/!burnt!sushi/toml v1.2.1 \ github.com/!micah!parks/keyfunc v1.9.0 \ - github.com/census-instrumentation/opencensus-proto v0.2.1 \ - github.com/cespare/xxhash/v2 v2.1.1 \ + github.com/census-instrumentation/opencensus-proto v0.4.1 \ + github.com/cespare/xxhash/v2 v2.2.0 \ github.com/client9/misspell v0.3.4 \ - github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 \ - github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 \ + github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe \ + github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b \ github.com/cpuguy83/go-md2man/v2 v2.0.2 \ github.com/davecgh/go-spew v1.1.1 \ github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead \ - github.com/emersion/go-smtp v0.15.0 \ - github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 \ - github.com/envoyproxy/protoc-gen-validate v0.1.0 \ + github.com/emersion/go-smtp v0.16.0 \ + github.com/envoyproxy/go-control-plane v0.10.3 \ + github.com/envoyproxy/protoc-gen-validate v0.9.1 \ github.com/gabriel-vasile/mimetype v1.4.1 \ github.com/golang-jwt/jwt/v4 v4.4.3 \ - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b \ + github.com/golang/glog v1.0.0 \ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da \ github.com/golang/mock v1.1.1 \ github.com/golang/protobuf v1.5.2 \ github.com/google/go-cmp v0.5.9 \ github.com/google/martian/v3 v3.2.1 \ github.com/google/uuid v1.3.0 \ - github.com/googleapis/enterprise-certificate-proxy v0.2.1 \ + github.com/googleapis/enterprise-certificate-proxy v0.2.3 \ github.com/googleapis/gax-go/v2 v2.7.0 \ github.com/gorilla/websocket v1.5.0 \ github.com/mattn/go-sqlite3 v1.14.16 \ @@ -155,27 +155,27 @@ MODGO_MODULES = \ github.com/russross/blackfriday/v2 v2.1.0 \ github.com/stretchr/objx v0.5.0 \ github.com/stretchr/testify v1.8.1 \ - github.com/urfave/cli/v2 v2.23.7 \ + github.com/urfave/cli/v2 v2.24.3 \ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 \ go.opencensus.io v0.24.0 \ - golang.org/x/crypto v0.4.0 \ + golang.org/x/crypto v0.6.0 \ golang.org/x/exp v0.0.0-20190121172915-509febef88a4 \ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 \ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 \ - golang.org/x/net v0.4.0 \ - golang.org/x/oauth2 v0.3.0 \ + golang.org/x/net v0.7.0 \ + golang.org/x/oauth2 v0.5.0 \ golang.org/x/sync v0.1.0 \ - golang.org/x/sys v0.3.0 \ - golang.org/x/term v0.3.0 \ - golang.org/x/text v0.5.0 \ + golang.org/x/sys v0.5.0 \ + golang.org/x/term v0.5.0 \ + golang.org/x/text v0.7.0 \ golang.org/x/time v0.3.0 \ golang.org/x/tools v0.1.12 \ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 \ - google.golang.org/api v0.105.0 \ + google.golang.org/api v0.110.0 \ google.golang.org/appengine v1.6.7 \ google.golang.org/appengine/v2 v2.0.2 \ - google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 \ - google.golang.org/grpc v1.51.0 \ + google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc \ + google.golang.org/grpc v1.53.0 \ google.golang.org/protobuf v1.28.1 \ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 \ gopkg.in/yaml.v2 v2.4.0 \ @@ -185,31 +185,34 @@ MODGO_MODULES = \ MODGO_MODFILES = \ cloud.google.com/go v0.102.1 \ cloud.google.com/go v0.105.0 \ + cloud.google.com/go v0.107.0 \ cloud.google.com/go v0.26.0 \ - cloud.google.com/go v0.34.0 \ cloud.google.com/go/compute v1.12.1 \ cloud.google.com/go/compute v1.13.0 \ + cloud.google.com/go/compute v1.14.0 \ + cloud.google.com/go/compute v1.15.1 \ cloud.google.com/go/compute v1.7.0 \ cloud.google.com/go/compute/metadata v0.2.0 \ cloud.google.com/go/compute/metadata v0.2.1 \ - cloud.google.com/go/compute/metadata v0.2.2 \ cloud.google.com/go/firestore v1.6.1 \ cloud.google.com/go/iam v0.3.0 \ - cloud.google.com/go/iam v0.6.0 \ - cloud.google.com/go/iam v0.7.0 \ cloud.google.com/go/iam v0.8.0 \ + cloud.google.com/go/longrunning v0.3.0 \ cloud.google.com/go/storage v1.26.0 \ - cloud.google.com/go/storage v1.27.0 \ + cloud.google.com/go/storage v1.28.1 \ github.com/!alek!si/pointer v1.0.0 \ github.com/!burnt!sushi/toml v0.3.1 \ github.com/!micah!parks/keyfunc v1.5.1 \ + github.com/census-instrumentation/opencensus-proto v0.2.1 \ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f \ github.com/davecgh/go-spew v1.1.0 \ github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 \ github.com/envoyproxy/go-control-plane v0.9.0 \ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473 \ github.com/envoyproxy/go-control-plane v0.9.4 \ + github.com/envoyproxy/protoc-gen-validate v0.1.0 \ github.com/golang-jwt/jwt/v4 v4.4.2 \ + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b \ github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e \ github.com/golang/protobuf v1.2.0 \ github.com/golang/protobuf v1.3.1 \ @@ -229,13 +232,12 @@ MODGO_MODFILES = \ github.com/google/go-cmp v0.5.0 \ github.com/google/go-cmp v0.5.3 \ github.com/google/go-cmp v0.5.5 \ - github.com/google/go-cmp v0.5.6 \ github.com/google/go-cmp v0.5.8 \ github.com/google/uuid v1.1.2 \ github.com/googleapis/enterprise-certificate-proxy v0.1.0 \ github.com/googleapis/enterprise-certificate-proxy v0.2.0 \ + github.com/googleapis/enterprise-certificate-proxy v0.2.1 \ github.com/googleapis/gax-go/v2 v2.4.0 \ - github.com/googleapis/gax-go/v2 v2.6.0 \ github.com/pkg/errors v0.8.1 \ github.com/stretchr/objx v0.1.0 \ github.com/stretchr/objx v0.4.0 \ @@ -256,14 +258,14 @@ MODGO_MODFILES = \ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b \ golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e \ golang.org/x/net v0.0.0-20220708220712-1185a9018129 \ - golang.org/x/net v0.0.0-20220722155237-a158d28d115b \ golang.org/x/net v0.0.0-20220909164309-bea034e7d591 \ golang.org/x/net v0.0.0-20221014081412-f15817d10f9b \ - golang.org/x/net v0.3.0 \ + golang.org/x/net v0.5.0 \ + golang.org/x/net v0.6.0 \ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be \ - golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d \ golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 \ golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 \ + golang.org/x/oauth2 v0.4.0 \ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f \ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f \ golang.org/x/sync v0.0.0-20190423024810-112230192c58 \ @@ -275,12 +277,15 @@ MODGO_MODFILES = \ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a \ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f \ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 \ + golang.org/x/sys v0.4.0 \ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 \ golang.org/x/text v0.3.0 \ golang.org/x/text v0.3.2 \ golang.org/x/text v0.3.3 \ golang.org/x/text v0.3.7 \ golang.org/x/text v0.4.0 \ + golang.org/x/text v0.5.0 \ + golang.org/x/text v0.6.0 \ golang.org/x/time v0.1.0 \ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e \ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b \ @@ -288,10 +293,12 @@ MODGO_MODFILES = \ golang.org/x/tools v0.0.0-20190311212946-11955173bddd \ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 \ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 \ - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 \ golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f \ google.golang.org/api v0.102.0 \ google.golang.org/api v0.103.0 \ + google.golang.org/api v0.106.0 \ + google.golang.org/api v0.107.0 \ + google.golang.org/api v0.108.0 \ google.golang.org/api v0.96.0 \ google.golang.org/appengine v1.1.0 \ google.golang.org/appengine v1.4.0 \ @@ -300,12 +307,11 @@ MODGO_MODFILES = \ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 \ google.golang.org/genproto v0.0.0-20220810155839-1856144b1d9c \ google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e \ - google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c \ google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 \ - google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c \ - google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd \ google.golang.org/genproto v0.0.0-20221205194025-8222ab48f5fc \ - google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6 \ + google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f \ + google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5 \ + google.golang.org/genproto v0.0.0-20230124163310-31e0e69b6fc2 \ google.golang.org/grpc v1.19.0 \ google.golang.org/grpc v1.23.0 \ google.golang.org/grpc v1.25.1 \ @@ -313,6 +319,7 @@ MODGO_MODFILES = \ google.golang.org/grpc v1.33.2 \ google.golang.org/grpc v1.48.0 \ google.golang.org/grpc v1.50.1 \ + google.golang.org/grpc v1.51.0 \ google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd \ google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64 \ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60 \ @@ -324,7 +331,6 @@ MODGO_MODFILES = \ google.golang.org/protobuf v1.25.0 \ google.golang.org/protobuf v1.26.0 \ google.golang.org/protobuf v1.26.0-rc.1 \ - google.golang.org/protobuf v1.27.1 \ google.golang.org/protobuf v1.28.0 \ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c \ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099 diff --git a/net/py-boto3/Makefile b/net/py-boto3/Makefile index be37da219..097b7539b 100644 --- a/net/py-boto3/Makefile +++ b/net/py-boto3/Makefile @@ -1,6 +1,6 @@ COMMENT= AWS SDK for Python -MODPY_EGG_VERSION= 1.28.44 +MODPY_EGG_VERSION= 1.28.49 DISTNAME= boto3-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} diff --git a/net/py-boto3/distinfo b/net/py-boto3/distinfo index f11e11711..760eda689 100644 --- a/net/py-boto3/distinfo +++ b/net/py-boto3/distinfo @@ -1,2 +1,2 @@ -SHA256 (boto3-1.28.44.tar.gz) = 7qOwfg8oyfkrzKuXKvJKOw3ZUcadk9p1InuOzT4Y9sQ= -SIZE (boto3-1.28.44.tar.gz) = 103349 +SHA256 (boto3-1.28.49.tar.gz) = yfrRsBodfnvVEVCzF1tMMredaZzpRwgIJhH1n94uCXo= +SIZE (boto3-1.28.49.tar.gz) = 103327 diff --git a/net/py-botocore/Makefile b/net/py-botocore/Makefile index 74f43cdf6..d2701a014 100644 --- a/net/py-botocore/Makefile +++ b/net/py-botocore/Makefile @@ -4,7 +4,7 @@ COMMENT= low-level interface to Amazon Web Services -MODPY_EGG_VERSION= 1.31.44 +MODPY_EGG_VERSION= 1.31.49 DISTNAME= botocore-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} diff --git a/net/py-botocore/distinfo b/net/py-botocore/distinfo index 097f3ff01..a01fcf386 100644 --- a/net/py-botocore/distinfo +++ b/net/py-botocore/distinfo @@ -1,2 +1,2 @@ -SHA256 (botocore-1.31.44.tar.gz) = hPkJGf7LSk9Bf9EBRciof/LEsU1jgc002bq/AhELMxU= -SIZE (botocore-1.31.44.tar.gz) = 11358265 +SHA256 (botocore-1.31.49.tar.gz) = lelxbyf2fUIH8mCrDqFXYDylRNO4LF8hcosccyvsGBc= +SIZE (botocore-1.31.49.tar.gz) = 11362656 diff --git a/net/py-modbus/Makefile b/net/py-modbus/Makefile index 608648797..c77e5739a 100644 --- a/net/py-modbus/Makefile +++ b/net/py-modbus/Makefile @@ -3,7 +3,9 @@ COMMENT = full modbus protocol written in python MODPY_EGG_VERSION = 3.4.1 +REVISION = 0 DISTNAME = pymodbus-${MODPY_EGG_VERSION} +PKGNAME = py-${DISTNAME} CATEGORIES = net diff --git a/net/py-modbus/pkg/PLIST b/net/py-modbus/pkg/PLIST index 88bc0b6cb..7fa67879e 100644 --- a/net/py-modbus/pkg/PLIST +++ b/net/py-modbus/pkg/PLIST @@ -1,3 +1,4 @@ +@conflict pymodbus-* bin/pymodbus.console bin/pymodbus.server bin/pymodbus.simulator diff --git a/net/py-python-jsonrpc-server/Makefile b/net/py-python-jsonrpc-server/Makefile new file mode 100644 index 000000000..f01f369b8 --- /dev/null +++ b/net/py-python-jsonrpc-server/Makefile @@ -0,0 +1,25 @@ +COMMENT = json rpc server library + +MODPY_EGG_VERSION = 0.4.0 +DISTNAME = python-jsonrpc-server-${MODPY_EGG_VERSION} +PKGNAME = py-${DISTNAME:L} + +CATEGORIES = net + +# MIT +PERMIT_PACKAGE = Yes + +MODULES = lang/python + +FLAVORS = python3 +FLAVOR = python3 + +MODPY_PI = Yes +MODPY_PYBUILD = setuptools + +RUN_DEPENDS = textproc/py-ujson${MODPY_FLAVOR}>=3.0.0 + +TEST_DEPENDS = devel/py-test-cov${MODPY_FLAVOR} \ + devel/py-mock${MODPY_FLAVOR} + +.include <bsd.port.mk> diff --git a/net/py-python-jsonrpc-server/distinfo b/net/py-python-jsonrpc-server/distinfo new file mode 100644 index 000000000..6590eb6d4 --- /dev/null +++ b/net/py-python-jsonrpc-server/distinfo @@ -0,0 +1,2 @@ +SHA256 (python-jsonrpc-server-0.4.0.tar.gz) = YsVD5UHxAexbV9xlTvwhLSwuPqR/9vVLLn3LNuzyBZU= +SIZE (python-jsonrpc-server-0.4.0.tar.gz) = 26491 diff --git a/net/py-python-jsonrpc-server/pkg/DESCR b/net/py-python-jsonrpc-server/pkg/DESCR new file mode 100644 index 000000000..406291455 --- /dev/null +++ b/net/py-python-jsonrpc-server/pkg/DESCR @@ -0,0 +1,2 @@ +A Python server implementation of the JSON RPC 2.0 protocol. This +library has been pulled out of the Python Language Server project. diff --git a/net/py-python-jsonrpc-server/pkg/PLIST b/net/py-python-jsonrpc-server/pkg/PLIST new file mode 100644 index 000000000..ebdfd331f --- /dev/null +++ b/net/py-python-jsonrpc-server/pkg/PLIST @@ -0,0 +1,26 @@ +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/ +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/__init__.py +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/${MODPY_PYCACHE}dispatchers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/${MODPY_PYCACHE}dispatchers.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/${MODPY_PYCACHE}endpoint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/${MODPY_PYCACHE}endpoint.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/${MODPY_PYCACHE}streams.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/${MODPY_PYCACHE}streams.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/_version.py +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/dispatchers.py +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/endpoint.py +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/exceptions.py +lib/python${MODPY_VERSION}/site-packages/pyls_jsonrpc/streams.py +lib/python${MODPY_VERSION}/site-packages/python_jsonrpc_server-${MODPY_EGG_VERSION}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/python_jsonrpc_server-${MODPY_EGG_VERSION}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/python_jsonrpc_server-${MODPY_EGG_VERSION}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/python_jsonrpc_server-${MODPY_EGG_VERSION}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/python_jsonrpc_server-${MODPY_EGG_VERSION}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/python_jsonrpc_server-${MODPY_EGG_VERSION}.dist-info/top_level.txt diff --git a/net/py-solaredge-modbus/Makefile b/net/py-solaredge-modbus/Makefile index 3e16a74f3..546ee6d31 100644 --- a/net/py-solaredge-modbus/Makefile +++ b/net/py-solaredge-modbus/Makefile @@ -1,6 +1,7 @@ COMMENT = collect data from SolarEdge inverters over Modbus MODPY_EGG_VERSION = 0.7.2 +REVISION = 0 DISTNAME = solaredge_modbus-${MODPY_EGG_VERSION} PKGNAME = py-solaredge-modbus-${MODPY_EGG_VERSION} diff --git a/net/sniproxy/Makefile b/net/sniproxy/Makefile index e79611623..3ebf0218f 100644 --- a/net/sniproxy/Makefile +++ b/net/sniproxy/Makefile @@ -2,7 +2,7 @@ COMMENT = name-based proxying of HTTPS without decrypting traffic GH_ACCOUNT = renaudallard GH_PROJECT = sniproxy -GH_TAGNAME = 0.6.7 +GH_TAGNAME = 0.6.8 CATEGORIES = net diff --git a/net/sniproxy/distinfo b/net/sniproxy/distinfo index c22d18878..4b41ed253 100644 --- a/net/sniproxy/distinfo +++ b/net/sniproxy/distinfo @@ -1,2 +1,2 @@ -SHA256 (sniproxy-0.6.7.tar.gz) = KJoGGaI5RSaLMRsP6UQBVoCIiS5XwkcpD2wRY97fOhY= -SIZE (sniproxy-0.6.7.tar.gz) = 80280 +SHA256 (sniproxy-0.6.8.tar.gz) = 8LhjJQUNFaY7H5xqNuGsfHS6bx4dE3ARyBNTatw0Z2k= +SIZE (sniproxy-0.6.8.tar.gz) = 80608 diff --git a/net/swirc/Makefile b/net/swirc/Makefile index d10e59d7f..cadcf5046 100644 --- a/net/swirc/Makefile +++ b/net/swirc/Makefile @@ -1,5 +1,5 @@ COMMENT = curses icb and irc client -DISTNAME = swirc-3.4.4 +DISTNAME = swirc-3.4.5 CATEGORIES = net HOMEPAGE = https://www.nifty-networks.net/swirc/ diff --git a/net/swirc/distinfo b/net/swirc/distinfo index 01f7e3ce5..720543d49 100644 --- a/net/swirc/distinfo +++ b/net/swirc/distinfo @@ -1,2 +1,2 @@ -SHA256 (swirc-3.4.4.tgz) = gxH/N3HvDik0WYEO1qUlEdqm4vvKBbn0e/xtrhLlPUI= -SIZE (swirc-3.4.4.tgz) = 326731 +SHA256 (swirc-3.4.5.tgz) = olNz44AUDVGQd60VYz+577hJO/FXVUTWw6EWTL8AtI4= +SIZE (swirc-3.4.5.tgz) = 336832 diff --git a/security/ghidra/Makefile b/security/ghidra/Makefile index faddc6f6d..a1c75ed61 100644 --- a/security/ghidra/Makefile +++ b/security/ghidra/Makefile @@ -1,3 +1,5 @@ +BROKEN = non-trivial to update to the latest version + # bundled jython has amd64 components for OpenBSD ONLY_FOR_ARCHS = amd64 diff --git a/security/libsodium/Makefile b/security/libsodium/Makefile index 7622f24b4..0ca36df25 100644 --- a/security/libsodium/Makefile +++ b/security/libsodium/Makefile @@ -1,9 +1,8 @@ COMMENT= library for network communications and cryptography -DISTNAME= libsodium-1.0.18 -REVISION= 1 +DISTNAME= libsodium-1.0.19 -SHARED_LIBS += sodium 10.0 # 26.0 +SHARED_LIBS += sodium 10.1 # 27.0 CATEGORIES= security net @@ -19,6 +18,7 @@ MASTER_SITES= https://download.libsodium.org/libsodium/releases/ \ SEPARATE_BUILD= Yes +WRKSRC= ${WRKDIR}/libsodium-stable CONFIGURE_STYLE= gnu MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux diff --git a/security/libsodium/distinfo b/security/libsodium/distinfo index c67d6c1c6..c8e1ff46b 100644 --- a/security/libsodium/distinfo +++ b/security/libsodium/distinfo @@ -1,2 +1,2 @@ -SHA256 (libsodium-1.0.18.tar.gz) = b1BEkLNCpPikxKAvybhmy++GItXfTlRStGvhIeRmNsE= -SIZE (libsodium-1.0.18.tar.gz) = 1919817 +SHA256 (libsodium-1.0.19.tar.gz) = AY15/goEXMoHMx03vQy1ey6DjFG8SP2DehRy5QBou+o= +SIZE (libsodium-1.0.19.tar.gz) = 1945523 diff --git a/security/libsodium/pkg/PLIST b/security/libsodium/pkg/PLIST index 142c3db3d..7e20ab6a8 100644 --- a/security/libsodium/pkg/PLIST +++ b/security/libsodium/pkg/PLIST @@ -1,6 +1,8 @@ include/sodium/ include/sodium.h include/sodium/core.h +include/sodium/crypto_aead_aegis128l.h +include/sodium/crypto_aead_aegis256.h include/sodium/crypto_aead_aes256gcm.h include/sodium/crypto_aead_chacha20poly1305.h include/sodium/crypto_aead_xchacha20poly1305.h @@ -25,6 +27,8 @@ include/sodium/crypto_hash_sha256.h include/sodium/crypto_hash_sha512.h include/sodium/crypto_kdf.h include/sodium/crypto_kdf_blake2b.h +include/sodium/crypto_kdf_hkdf_sha256.h +include/sodium/crypto_kdf_hkdf_sha512.h include/sodium/crypto_kx.h include/sodium/crypto_onetimeauth.h include/sodium/crypto_onetimeauth_poly1305.h diff --git a/security/rust-openssl-tests/Makefile b/security/rust-openssl-tests/Makefile index c40dddbdb..233b5894f 100644 --- a/security/rust-openssl-tests/Makefile +++ b/security/rust-openssl-tests/Makefile @@ -1,12 +1,12 @@ COMMENT = source of the rust-openssl crate for regression testing # Follows HEAD -VERSION = 20230912 +VERSION = 20230914 DISTNAME = rust-openssl-tests-${VERSION} GH_ACCOUNT = sfackler GH_PROJECT = rust-openssl -GH_COMMIT = b1ac079d98288df03130f6433d74a067c4812dd6 +GH_COMMIT = f9907087a788191b87432c6b8bf8fc60c55f153a CATEGORIES = security devel diff --git a/security/rust-openssl-tests/crates.inc b/security/rust-openssl-tests/crates.inc index 869a6cf78..ff258cc42 100644 --- a/security/rust-openssl-tests/crates.inc +++ b/security/rust-openssl-tests/crates.inc @@ -26,7 +26,7 @@ MODCARGO_CRATES += home 0.5.5 # MIT OR Apache-2.0 MODCARGO_CRATES += itoa 1.0.9 # MIT OR Apache-2.0 MODCARGO_CRATES += lazy_static 1.4.0 # MIT/Apache-2.0 MODCARGO_CRATES += lazycell 1.3.0 # MIT/Apache-2.0 -MODCARGO_CRATES += libc 0.2.147 # MIT OR Apache-2.0 +MODCARGO_CRATES += libc 0.2.148 # MIT OR Apache-2.0 MODCARGO_CRATES += libloading 0.7.4 # ISC MODCARGO_CRATES += linux-raw-sys 0.4.7 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT MODCARGO_CRATES += log 0.4.20 # MIT OR Apache-2.0 @@ -37,7 +37,7 @@ MODCARGO_CRATES += once_cell 1.18.0 # MIT OR Apache-2.0 MODCARGO_CRATES += openssl-src 300.1.3+3.1.2 # MIT/Apache-2.0 MODCARGO_CRATES += peeking_take_while 0.1.2 # Apache-2.0/MIT MODCARGO_CRATES += pkg-config 0.3.27 # MIT OR Apache-2.0 -MODCARGO_CRATES += proc-macro2 1.0.66 # MIT OR Apache-2.0 +MODCARGO_CRATES += proc-macro2 1.0.67 # MIT OR Apache-2.0 MODCARGO_CRATES += quote 1.0.33 # MIT OR Apache-2.0 MODCARGO_CRATES += redox_syscall 0.2.16 # MIT MODCARGO_CRATES += redox_users 0.4.3 # MIT @@ -54,11 +54,11 @@ MODCARGO_CRATES += serde_derive 1.0.188 # MIT OR Apache-2.0 MODCARGO_CRATES += serde_json 1.0.106 # MIT OR Apache-2.0 MODCARGO_CRATES += shlex 1.2.0 # MIT OR Apache-2.0 MODCARGO_CRATES += syn 1.0.109 # MIT OR Apache-2.0 -MODCARGO_CRATES += syn 2.0.32 # MIT OR Apache-2.0 +MODCARGO_CRATES += syn 2.0.33 # MIT OR Apache-2.0 MODCARGO_CRATES += term 0.6.1 # MIT/Apache-2.0 MODCARGO_CRATES += thiserror 1.0.48 # MIT OR Apache-2.0 MODCARGO_CRATES += thiserror-impl 1.0.48 # MIT OR Apache-2.0 -MODCARGO_CRATES += unicode-ident 1.0.11 # (MIT OR Apache-2.0) AND Unicode-DFS-2016 +MODCARGO_CRATES += unicode-ident 1.0.12 # (MIT OR Apache-2.0) AND Unicode-DFS-2016 MODCARGO_CRATES += unicode-xid 0.2.4 # MIT OR Apache-2.0 MODCARGO_CRATES += vcpkg 0.2.15 # MIT/Apache-2.0 MODCARGO_CRATES += wasi 0.11.0+wasi-snapshot-preview1 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT diff --git a/security/rust-openssl-tests/distinfo b/security/rust-openssl-tests/distinfo index 535266e53..3dd6dff4f 100644 --- a/security/rust-openssl-tests/distinfo +++ b/security/rust-openssl-tests/distinfo @@ -26,7 +26,7 @@ SHA256 (cargo/home-0.5.5.tar.gz) = VETCfu9pIwcffrzDPjREUIRmp296K5PaAO1uGfMMHds= SHA256 (cargo/itoa-1.0.9.tar.gz) = rxUKtoj/ISL87yKb6Jy1DdZq+eAaT/MgzBN+7Mm6zDg= SHA256 (cargo/lazy_static-1.4.0.tar.gz) = 4qutI/vEKzcA8vJ5hE3IMq2ysusGmy35GPRVxOGMxkY= SHA256 (cargo/lazycell-1.3.0.tar.gz) = gw0Izh0dlB5rMGRfGg61ZDAT2DXON3ml/CCCYdvhD1U= -SHA256 (cargo/libc-0.2.147.tar.gz) = tGaPsOqGHB3wlBJ6xfHaNAmoIRakunT8ouWO+ScVm7M= +SHA256 (cargo/libc-0.2.148.tar.gz) = nNxx4XMy6G0uHTjB+Z7ctiiO4RuBX7GksEnqohFNNps= SHA256 (cargo/libloading-0.7.4.tar.gz) = tnOA/TsvvnUnpgbhhynSHG85UWM9BQBXTE3CLS1ji58= SHA256 (cargo/linux-raw-sys-0.4.7.tar.gz) = Gputn5R0ZELHg8pDGyJAO1Gc1/vu0FM/3WMosvIhISg= SHA256 (cargo/log-0.4.20.tar.gz) = teYWPLjEkIjCw29Xh15YzNjIfHQn9/vVDqZxCy8/Lo8= @@ -37,7 +37,7 @@ SHA256 (cargo/once_cell-1.18.0.tar.gz) = 3Ytd0q5e1xRixUAli+3LUZZRI61+fM9Lmoyvqkp SHA256 (cargo/openssl-src-300.1.3+3.1.2.tar.gz) = zSwQGhZf/5k1403vRmlZWrHHhHlDxCvobiFQPkgr4Qc= SHA256 (cargo/peeking_take_while-0.1.2.tar.gz) = GbF83b5+w/i8gAiHurXnFzSMleosoLG/CDf7lk3GcJk= SHA256 (cargo/pkg-config-0.3.27.tar.gz) = JgcoYLqSTL+pjqOcjBm03WpKJUI9vfIZweypGqDPaWQ= -SHA256 (cargo/proc-macro2-1.0.66.tar.gz) = GPsx2z+b3bLqghzeMKn3ARfj8RmTi17mMLdAOqbi6tk= +SHA256 (cargo/proc-macro2-1.0.67.tar.gz) = PUM9nxo+jBJj2UVlmLFv7Gb0rMmnTaz/01x7sJs6Eyg= SHA256 (cargo/quote-1.0.33.tar.gz) = Umf8pElgKGKKlRYPxCOjPosuavilMCV54yLktSApPK4= SHA256 (cargo/redox_syscall-0.2.16.tar.gz) = +1pYwYVbS2gZ1ZASFVYD8LIq0wytdSYAqt/LaVJlUZo= SHA256 (cargo/redox_users-0.4.3.tar.gz) = sDPYN6fPFi15k63tkwTjCoMhPGSLbjidsjMZH4keXCs= @@ -54,11 +54,11 @@ SHA256 (cargo/serde_derive-1.0.188.tar.gz) = Tsp6xkLYKqNbYASabsy0vmvnXlmb0umttfh SHA256 (cargo/serde_json-1.0.106.tar.gz) = LMZqYZ7YC/eg9rF90GOoS4j23qGBNzfPRprvHQgRQsI= SHA256 (cargo/shlex-1.2.0.tar.gz) = p87gUpptQPWA56XmxJXI+/4ht7Unle1LteYs35K8Y4A= SHA256 (cargo/syn-1.0.109.tar.gz) = crZBkbJ1tm/+JGnorywc/juvpntSnq15Km0BYIiLQjc= -SHA256 (cargo/syn-2.0.32.tar.gz) = I5gUKE/W8aT/5MqJOVLN2TwiS2oVccmp6t1nApXAyeI= +SHA256 (cargo/syn-2.0.33.tar.gz) = nK7OcMY7+6Kewv7YQaCYUbFKI1xgAQ+k3lgIm2wCVmg= SHA256 (cargo/term-0.6.1.tar.gz) = wIY6M0XnD2HWE+qzLuBGzNG8xfkQX+QCxh/NDBPuuLU= SHA256 (cargo/thiserror-1.0.48.tar.gz) = nW16dAuKZmp+go3QDanA3CkN/1MVTqd6wQkoHekFibc= SHA256 (cargo/thiserror-impl-1.0.48.tar.gz) = SZIuyuZsyKJJt35o0dBiPBssUU8AYMJ83Gi9YqEhnTU= -SHA256 (cargo/unicode-ident-1.0.11.tar.gz) = MBq6rkdaqRaH64JRSzKKtHohGlMwJssl/D5Rm4at/Dw= +SHA256 (cargo/unicode-ident-1.0.12.tar.gz) = M1S5rD+uH/Z1XLbbU2g622YWNPZ1V5Qt6k+s6+wP7ks= SHA256 (cargo/unicode-xid-0.2.4.tar.gz) = +WLfdMjAWmZ7Xui88WKZMTTBBOlkQLZjyNqhdtx3LYw= SHA256 (cargo/vcpkg-0.2.15.tar.gz) = rM1Opi97t6gv4jBm+wlX1I72d/buuCFfNy9S5IuzJCY= SHA256 (cargo/wasi-0.11.0+wasi-snapshot-preview1.tar.gz) = nI2H5ytko7TbKNEc4pI3wkYYj09RBX1lp+q2O3mH5CM= @@ -75,7 +75,7 @@ SHA256 (cargo/windows_i686_msvc-0.48.5.tar.gz) = j1XCM/cMSyf2bFI1gPePEATotai2WeB SHA256 (cargo/windows_x86_64_gnu-0.48.5.tar.gz) = U9QKvSWD0j5HGP3fHr7ITb/4OBwHyuZ/93aLvxnGcY4= SHA256 (cargo/windows_x86_64_gnullvm-0.48.5.tar.gz) = C3tSdnhooj1bq3aOOQ3F9cVYJbbTC4bIRP8tx0FARMw= SHA256 (cargo/windows_x86_64_msvc-0.48.5.tar.gz) = 7ZT85hVxpABoUrc4mgY6uYPALrG7N7R/gnLOktBtlTg= -SHA256 (rust-openssl-tests-20230912-b1ac079d.tar.gz) = mCb23A28MYtI/DxesiKz6ggp9zifO79Sf6TG+9rR0mw= +SHA256 (rust-openssl-tests-20230914-f9907087.tar.gz) = XxQF+Oiujt2P8aGujI3kdMIDrsP6zGobMPciw8aXTbw= SIZE (cargo/aho-corasick-1.0.5.tar.gz) = 172064 SIZE (cargo/bindgen-0.64.0.tar.gz) = 204700 SIZE (cargo/bitflags-1.3.2.tar.gz) = 23021 @@ -104,7 +104,7 @@ SIZE (cargo/home-0.5.5.tar.gz) = 8557 SIZE (cargo/itoa-1.0.9.tar.gz) = 10492 SIZE (cargo/lazy_static-1.4.0.tar.gz) = 10443 SIZE (cargo/lazycell-1.3.0.tar.gz) = 12502 -SIZE (cargo/libc-0.2.147.tar.gz) = 686772 +SIZE (cargo/libc-0.2.148.tar.gz) = 690988 SIZE (cargo/libloading-0.7.4.tar.gz) = 27580 SIZE (cargo/linux-raw-sys-0.4.7.tar.gz) = 1350647 SIZE (cargo/log-0.4.20.tar.gz) = 38307 @@ -115,7 +115,7 @@ SIZE (cargo/once_cell-1.18.0.tar.gz) = 32969 SIZE (cargo/openssl-src-300.1.3+3.1.2.tar.gz) = 8823710 SIZE (cargo/peeking_take_while-0.1.2.tar.gz) = 6697 SIZE (cargo/pkg-config-0.3.27.tar.gz) = 18838 -SIZE (cargo/proc-macro2-1.0.66.tar.gz) = 43575 +SIZE (cargo/proc-macro2-1.0.67.tar.gz) = 43683 SIZE (cargo/quote-1.0.33.tar.gz) = 28090 SIZE (cargo/redox_syscall-0.2.16.tar.gz) = 24012 SIZE (cargo/redox_users-0.4.3.tar.gz) = 15353 @@ -132,11 +132,11 @@ SIZE (cargo/serde_derive-1.0.188.tar.gz) = 55563 SIZE (cargo/serde_json-1.0.106.tar.gz) = 146672 SIZE (cargo/shlex-1.2.0.tar.gz) = 6584 SIZE (cargo/syn-1.0.109.tar.gz) = 237611 -SIZE (cargo/syn-2.0.32.tar.gz) = 242504 +SIZE (cargo/syn-2.0.33.tar.gz) = 242543 SIZE (cargo/term-0.6.1.tar.gz) = 37578 SIZE (cargo/thiserror-1.0.48.tar.gz) = 18862 SIZE (cargo/thiserror-impl-1.0.48.tar.gz) = 15096 -SIZE (cargo/unicode-ident-1.0.11.tar.gz) = 42067 +SIZE (cargo/unicode-ident-1.0.12.tar.gz) = 42168 SIZE (cargo/unicode-xid-0.2.4.tar.gz) = 15352 SIZE (cargo/vcpkg-0.2.15.tar.gz) = 228735 SIZE (cargo/wasi-0.11.0+wasi-snapshot-preview1.tar.gz) = 28131 @@ -153,4 +153,4 @@ SIZE (cargo/windows_i686_msvc-0.48.5.tar.gz) = 864300 SIZE (cargo/windows_x86_64_gnu-0.48.5.tar.gz) = 801619 SIZE (cargo/windows_x86_64_gnullvm-0.48.5.tar.gz) = 418486 SIZE (cargo/windows_x86_64_msvc-0.48.5.tar.gz) = 798412 -SIZE (rust-openssl-tests-20230912-b1ac079d.tar.gz) = 350102 +SIZE (rust-openssl-tests-20230914-f9907087.tar.gz) = 350170 diff --git a/security/rust-openssl-tests/pkg/PLIST b/security/rust-openssl-tests/pkg/PLIST index e5fbaa4e0..8153d21cd 100644 --- a/security/rust-openssl-tests/pkg/PLIST +++ b/security/rust-openssl-tests/pkg/PLIST @@ -823,6 +823,9 @@ share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/g share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b32/arm/ share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b32/arm/align.rs share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b32/arm/mod.rs +share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b32/csky/ +share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b32/csky/align.rs +share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b32/csky/mod.rs share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b32/m68k/ share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b32/m68k/align.rs share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b32/m68k/mod.rs @@ -843,6 +846,7 @@ share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/g share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b64/ share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b64/aarch64/ share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs +share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b64/aarch64/fallback.rs share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b64/aarch64/ilp32.rs share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b64/aarch64/int128.rs share/rust-openssl-tests/modcargo-crates/${VER_libc}/src/unix/linux_like/linux/gnu/b64/aarch64/lp64.rs @@ -2824,113 +2828,113 @@ share/rust-openssl-tests/modcargo-crates/syn-1.0.109/tests/test_token_trees.rs share/rust-openssl-tests/modcargo-crates/syn-1.0.109/tests/test_ty.rs share/rust-openssl-tests/modcargo-crates/syn-1.0.109/tests/test_visibility.rs share/rust-openssl-tests/modcargo-crates/syn-1.0.109/tests/zzz_stable.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/.cargo-checksum.json -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/Cargo.toml -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/Cargo.toml.orig -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/LICENSE-APACHE -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/LICENSE-MIT -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/README.md -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/benches/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/benches/file.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/benches/rust.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/attr.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/bigint.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/buffer.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/custom_keyword.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/custom_punctuation.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/data.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/derive.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/discouraged.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/drops.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/error.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/export.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/expr.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/ext.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/file.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/gen/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/gen/clone.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/gen/debug.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/gen/eq.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/gen/fold.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/gen/hash.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/gen/visit.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/gen/visit_mut.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/gen_helper.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/generics.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/group.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/ident.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/item.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/lib.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/lifetime.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/lit.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/lookahead.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/mac.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/macros.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/meta.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/op.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/parse.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/parse_macro_input.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/parse_quote.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/pat.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/path.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/print.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/punctuated.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/restriction.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/sealed.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/span.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/spanned.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/stmt.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/thread.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/token.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/tt.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/ty.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/verbatim.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/src/whitespace.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/common/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/common/eq.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/common/mod.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/common/parse.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/debug/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/debug/gen.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/debug/mod.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/macros/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/macros/mod.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/regression/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/regression.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/regression/issue1108.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/regression/issue1235.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/repo/ -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/repo/mod.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/repo/progress.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_asyncness.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_attribute.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_derive_input.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_expr.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_generics.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_grouping.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_ident.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_item.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_iterators.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_lit.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_meta.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_parse_buffer.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_parse_stream.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_pat.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_path.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_precedence.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_receiver.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_round_trip.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_shebang.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_should_parse.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_size.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_stmt.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_token_trees.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_ty.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/test_visibility.rs -share/rust-openssl-tests/modcargo-crates/syn-2.0.32/tests/zzz_stable.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/.cargo-checksum.json +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/Cargo.toml +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/Cargo.toml.orig +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/LICENSE-APACHE +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/LICENSE-MIT +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/README.md +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/benches/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/benches/file.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/benches/rust.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/attr.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/bigint.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/buffer.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/custom_keyword.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/custom_punctuation.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/data.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/derive.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/discouraged.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/drops.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/error.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/export.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/expr.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/ext.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/file.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/clone.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/debug.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/eq.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/fold.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/hash.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/visit.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen/visit_mut.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/gen_helper.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/generics.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/group.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/ident.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/item.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/lib.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/lifetime.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/lit.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/lookahead.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/mac.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/macros.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/meta.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/op.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/parse.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/parse_macro_input.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/parse_quote.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/pat.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/path.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/print.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/punctuated.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/restriction.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/sealed.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/span.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/spanned.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/stmt.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/thread.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/token.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/tt.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/ty.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/verbatim.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/src/whitespace.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/common/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/common/eq.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/common/mod.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/common/parse.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/debug/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/debug/gen.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/debug/mod.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/macros/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/macros/mod.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/regression/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/regression.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/regression/issue1108.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/regression/issue1235.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/repo/ +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/repo/mod.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/repo/progress.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_asyncness.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_attribute.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_derive_input.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_expr.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_generics.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_grouping.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_ident.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_item.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_iterators.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_lit.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_meta.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_parse_buffer.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_parse_stream.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_pat.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_path.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_precedence.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_receiver.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_round_trip.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_shebang.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_should_parse.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_size.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_stmt.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_token_trees.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_ty.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/test_visibility.rs +share/rust-openssl-tests/modcargo-crates/syn-2.0.33/tests/zzz_stable.rs share/rust-openssl-tests/modcargo-crates/${VER_term}/ share/rust-openssl-tests/modcargo-crates/${VER_term}/.cargo-checksum.json share/rust-openssl-tests/modcargo-crates/${VER_term}/.gitignore diff --git a/security/vault/Makefile b/security/vault/Makefile index 6f0210e5b..aba4964e5 100644 --- a/security/vault/Makefile +++ b/security/vault/Makefile @@ -2,7 +2,7 @@ BROKEN-i386= /usr/local/go/pkg/tool/openbsd_386/link: mapping output file faile COMMENT= secure secret storage -VERSION= 1.14.2 +VERSION= 1.14.3 # vault-vendored distfile generated by fetching archive from # https://github.com/hashicorp/vault/archive/v$VERSION/vault-$VERSION.tar.gz # and running "go mod tidy" + "go mod vendor" diff --git a/security/vault/distinfo b/security/vault/distinfo index 3cc69eb68..be4984328 100644 --- a/security/vault/distinfo +++ b/security/vault/distinfo @@ -1,2 +1,2 @@ -SHA256 (vault-vendored-1.14.2.tar.gz) = ShQKSij9hRtS0XkhKvuNexkBPFFPwgL0lAFaMw9YK+0= -SIZE (vault-vendored-1.14.2.tar.gz) = 73028370 +SHA256 (vault-vendored-1.14.3.tar.gz) = Wg4nTFPi1wEfBUtYAbDsd6yt45gn3YcHsFgb/pzParE= +SIZE (vault-vendored-1.14.3.tar.gz) = 73032463 diff --git a/sysutils/Makefile b/sysutils/Makefile index 8c6feb190..db9288a51 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -327,6 +327,7 @@ SUBDIR += py-userpath,python3 SUBDIR += py-vmomi,python3 SUBDIR += py-vsphere-automation,python3 + SUBDIR += py-watchdog,python3 SUBDIR += py-zabbix-api,python3 SUBDIR += radiusreport SUBDIR += radmind diff --git a/sysutils/awscli/Makefile b/sysutils/awscli/Makefile index e8fc2e652..6dd662222 100644 --- a/sysutils/awscli/Makefile +++ b/sysutils/awscli/Makefile @@ -1,6 +1,6 @@ COMMENT= universal command line environment for AWS -MODPY_EGG_VERSION= 1.29.44 +MODPY_EGG_VERSION= 1.29.49 DISTNAME= awscli-${MODPY_EGG_VERSION} CATEGORIES= sysutils diff --git a/sysutils/awscli/distinfo b/sysutils/awscli/distinfo index eac0a999b..5a7f1b32d 100644 --- a/sysutils/awscli/distinfo +++ b/sysutils/awscli/distinfo @@ -1,2 +1,2 @@ -SHA256 (awscli-1.29.44.tar.gz) = yMXs6SQbA6IDCtDdRPzjSM7/ZMNgEXmUgL2hWECZfIs= -SIZE (awscli-1.29.44.tar.gz) = 1577233 +SHA256 (awscli-1.29.49.tar.gz) = 1T4vva/cr7W6Ef/mWcAM4+G7f5dsdNfamJ7vNP8ygyA= +SIZE (awscli-1.29.49.tar.gz) = 1577457 diff --git a/sysutils/exoscale-cli/Makefile b/sysutils/exoscale-cli/Makefile index 0588bdb3b..3516e1fbc 100644 --- a/sysutils/exoscale-cli/Makefile +++ b/sysutils/exoscale-cli/Makefile @@ -1,6 +1,6 @@ COMMENT= manage Exoscale infrastructure from the command-line -GH_TAGNAME= v1.72.2 +GH_TAGNAME= v1.73.0 GH_ACCOUNT= exoscale GH_PROJECT= cli DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME:C/^v//} diff --git a/sysutils/exoscale-cli/distinfo b/sysutils/exoscale-cli/distinfo index 8c4b760ad..717949d34 100644 --- a/sysutils/exoscale-cli/distinfo +++ b/sysutils/exoscale-cli/distinfo @@ -1,2 +1,2 @@ -SHA256 (exoscale-cli-1.72.2.tar.gz) = 9k5zGZAXNwmUGjLU21GdrPlAxzFxeTgB9ciCKt7obLI= -SIZE (exoscale-cli-1.72.2.tar.gz) = 4981848 +SHA256 (exoscale-cli-1.73.0.tar.gz) = XBfIC1M/nxWSEH/W8/H//XsHnsWw04B2TFOG2/6UtO4= +SIZE (exoscale-cli-1.73.0.tar.gz) = 10884244 diff --git a/sysutils/gitmux/Makefile b/sysutils/gitmux/Makefile index f5175a6a7..501e9cf0b 100644 --- a/sysutils/gitmux/Makefile +++ b/sysutils/gitmux/Makefile @@ -1,8 +1,7 @@ COMMENT = git in your tmux status bar MODGO_MODNAME = github.com/arl/gitmux -MODGO_VERSION = v0.7.9 -REVISION = 0 +MODGO_VERSION = v0.10.3 DISTNAME = gitmux-${MODGO_VERSION} @@ -19,24 +18,6 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gitmux ${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/gitmux -MODGO_MODULES = \ - github.com/arl/gitstatus v0.5.1 \ - github.com/davecgh/go-spew v1.1.0 \ - github.com/kr/pretty v0.1.0 \ - github.com/kr/pty v1.1.1 \ - github.com/kr/text v0.1.0 \ - github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e \ - github.com/pmezard/go-difflib v1.0.0 \ - github.com/rogpeppe/go-internal v1.8.1 \ - github.com/stretchr/objx v0.1.0 \ - github.com/stretchr/testify v1.7.0 \ - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 \ - gopkg.in/errgo.v2 v2.1.0 \ - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b - -MODGO_MODFILES = \ - github.com/stretchr/testify v1.3.0 \ - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 \ - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c +.include "modules.inc" .include <bsd.port.mk> diff --git a/sysutils/gitmux/distinfo b/sysutils/gitmux/distinfo index 7dd9ad461..7103d609e 100644 --- a/sysutils/gitmux/distinfo +++ b/sysutils/gitmux/distinfo @@ -1,6 +1,6 @@ -SHA256 (gitmux-v0.7.9.zip) = dpDCNcNWX2ynZahOv+NCwF/UPkRq5rf7aO5V0HH7Ock= -SHA256 (go_modules/github.com/arl/gitstatus/@v/v0.5.1.mod) = yrC2EL5b7k1zlJF1YKwZrsULXRpg7UsYS7h/Gs1EDhs= -SHA256 (go_modules/github.com/arl/gitstatus/@v/v0.5.1.zip) = 6OqUQZimZgK0RRnh0eU0qOTo2IMWfj7WKkBBP6blnJg= +SHA256 (gitmux-v0.10.3.zip) = gJpTkTCzwLQvqPMzpxYt+nHP3Le0sD/uQoIbH+Garaw= +SHA256 (go_modules/github.com/arl/gitstatus/@v/v0.6.0.mod) = /UGJheRxrmkx0BAxRsa12PwT7Kj6t3oaGeNDrHsgi94= +SHA256 (go_modules/github.com/arl/gitstatus/@v/v0.6.0.zip) = S9TzDnLyDBoZfRNBKkxVYwSirweaqoq4sWW5jj4z5Cs= SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.0.mod) = vLKTkyUSN7eaF7bBm/KRNPQ+j0OMMZiYj81GGhzfBcw= SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.0.zip) = C1ppGuuLavMb0rtkCXPqfovx7ZvFiJ2iIL9E3AbZaSw= SHA256 (go_modules/github.com/kr/pretty/@v/v0.1.0.mod) = 49XUbS9qyUpmalS16GfsFr8ZnZ9LcAgnzXMWB+/dEJo= @@ -13,24 +13,24 @@ SHA256 (go_modules/github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.mod SHA256 (go_modules/github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.zip) = 81sj/dK5Ui3dRsxcAWG08HZcUUR11dTKKoasoxOIyL0= SHA256 (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.mod) = dLLnZushU3eGTVh7rfV+lVIfaS0qeGCzx3WQk/nJvsI= SHA256 (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.zip) = 3gTOzBpLjVPkNXBRAmeUvLxU8uaiYM+sUIzmnV1kV6A= -SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.8.1.mod) = NYwJs9mb11rRqcq3avrFIpJcE3epnXBI/cpKS0GJxQQ= -SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.8.1.zip) = 09hoVBgbn6AI8pSheY1VAze+RMgoXbqfKFTzCNI5MdI= +SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.9.0.mod) = kFmpfaKZDIGaCXZ6XpvYeEtFpXt6JeKQVbvRsKqhRP8= +SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.9.0.zip) = fXd5CLnJGhaF8tcJVQ5rdHjhTpxGmd/9fwoVDjbbx+k= SHA256 (go_modules/github.com/stretchr/objx/@v/v0.1.0.mod) = E1A1TVLSKHpiM27MDVYjLUxHaZr5u6ScZ8K0glTamPE= SHA256 (go_modules/github.com/stretchr/objx/@v/v0.1.0.zip) = H6ENq0BO1/yO0qAz+HhBh9XfNRPO04Qc455G03hQ6x0= SHA256 (go_modules/github.com/stretchr/testify/@v/v1.3.0.mod) = qwY9UVSo6HMLztTFJpjldw61C/rjR768NeykiLjj9uM= SHA256 (go_modules/github.com/stretchr/testify/@v/v1.7.0.mod) = //gWjZjmoHFWxFShtuklUJ8xd+lsFVUW1/lrQHnMo78= SHA256 (go_modules/github.com/stretchr/testify/@v/v1.7.0.zip) = WkbM6+/1EN8+L204Qu550/aNDnsVVM1u6TOQ1otsazQ= +SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20230210204819-062eb4c674ab.mod) = AWlyQUC24fWTQogGuQZg3GxMER20/hXZIWJCRvypaug= +SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20230210204819-062eb4c674ab.zip) = RJJR9sxebqHFRLQjzbKV4A8uaRLoo9XqyYlt9frDJrA= SHA256 (go_modules/gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod) = XDBuDWM81moRtA4uX7vG2kIRDbfXLqPBUkzrRe5Awz8= SHA256 (go_modules/gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod) = XDBuDWM81moRtA4uX7vG2kIRDbfXLqPBUkzrRe5Awz8= SHA256 (go_modules/gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip) = S8U17SqsSKIxr4tgBaC19gadrauaPWWx6fH+kcdNjmE= -SHA256 (go_modules/gopkg.in/errgo.v2/@v/v2.1.0.mod) = 4wUgQkglZieWb/hcfcWRzy0OfeIJTQ9GWEnxtioQJ0g= -SHA256 (go_modules/gopkg.in/errgo.v2/@v/v2.1.0.zip) = a4lUgZog7FKYKiBv0+uUYp/1PFeQqndTTm2Nr33gG+4= SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod) = IVeYYKIDBvz0OxvSNNH7oxlJnHdhG3HAX5vzupDauTk= -SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod) = IVeYYKIDBvz0OxvSNNH7oxlJnHdhG3HAX5vzupDauTk= -SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip) = UWm1Yl08NR8T6KTsSAL3CQcnAbRB7ZIYHGBR7OU2Fak= -SIZE (gitmux-v0.7.9.zip) = 16889 -SIZE (go_modules/github.com/arl/gitstatus/@v/v0.5.1.mod) = 130 -SIZE (go_modules/github.com/arl/gitstatus/@v/v0.5.1.zip) = 28499 +SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.0.mod) = IVeYYKIDBvz0OxvSNNH7oxlJnHdhG3HAX5vzupDauTk= +SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.0.zip) = q5b8PKn3SQQnASDtoYnDnhpZ9gQ6fT6aCz5ACd0IYmc= +SIZE (gitmux-v0.10.3.zip) = 20164 +SIZE (go_modules/github.com/arl/gitstatus/@v/v0.6.0.mod) = 361 +SIZE (go_modules/github.com/arl/gitstatus/@v/v0.6.0.zip) = 28466 SIZE (go_modules/github.com/davecgh/go-spew/@v/v1.1.0.mod) = 34 SIZE (go_modules/github.com/davecgh/go-spew/@v/v1.1.0.zip) = 60546 SIZE (go_modules/github.com/kr/pretty/@v/v0.1.0.mod) = 67 @@ -43,18 +43,18 @@ SIZE (go_modules/github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.mod) SIZE (go_modules/github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.zip) = 219375 SIZE (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.mod) = 37 SIZE (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.zip) = 12433 -SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.8.1.mod) = 143 -SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.8.1.zip) = 207657 +SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.9.0.mod) = 112 +SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.9.0.zip) = 210263 SIZE (go_modules/github.com/stretchr/objx/@v/v0.1.0.mod) = 32 SIZE (go_modules/github.com/stretchr/objx/@v/v0.1.0.zip) = 34637 SIZE (go_modules/github.com/stretchr/testify/@v/v1.3.0.mod) = 154 SIZE (go_modules/github.com/stretchr/testify/@v/v1.7.0.mod) = 216 SIZE (go_modules/github.com/stretchr/testify/@v/v1.7.0.zip) = 105564 +SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20230210204819-062eb4c674ab.mod) = 176 +SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20230210204819-062eb4c674ab.zip) = 441795 SIZE (go_modules/gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod) = 25 SIZE (go_modules/gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod) = 25 SIZE (go_modules/gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip) = 41465 -SIZE (go_modules/gopkg.in/errgo.v2/@v/v2.1.0.mod) = 133 -SIZE (go_modules/gopkg.in/errgo.v2/@v/v2.1.0.zip) = 15087 SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod) = 95 -SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod) = 95 -SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip) = 105245 +SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.0.mod) = 95 +SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.0.zip) = 104597 diff --git a/sysutils/gitmux/modules.inc b/sysutils/gitmux/modules.inc new file mode 100644 index 000000000..a29990377 --- /dev/null +++ b/sysutils/gitmux/modules.inc @@ -0,0 +1,20 @@ +MODGO_MODULES = \ + github.com/arl/gitstatus v0.6.0 \ + github.com/davecgh/go-spew v1.1.0 \ + github.com/kr/pretty v0.1.0 \ + github.com/kr/pty v1.1.1 \ + github.com/kr/text v0.1.0 \ + github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e \ + github.com/pmezard/go-difflib v1.0.0 \ + github.com/rogpeppe/go-internal v1.9.0 \ + github.com/stretchr/objx v0.1.0 \ + github.com/stretchr/testify v1.7.0 \ + golang.org/x/exp v0.0.0-20230210204819-062eb4c674ab \ + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 \ + gopkg.in/yaml.v3 v3.0.0 + +MODGO_MODFILES = \ + github.com/stretchr/testify v1.3.0 \ + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 \ + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c + diff --git a/sysutils/google-cloud-sdk/Makefile b/sysutils/google-cloud-sdk/Makefile index af5c41774..5e2dcc841 100644 --- a/sysutils/google-cloud-sdk/Makefile +++ b/sysutils/google-cloud-sdk/Makefile @@ -1,6 +1,6 @@ COMMENT= manage resources on Google Cloud Platform -V= 445.0.0 +V= 446.0.1 DISTNAME= google-cloud-sdk-${V}-linux-x86 PKGNAME= google-cloud-sdk-${V} WRKDIST= ${WRKDIR}/google-cloud-sdk diff --git a/sysutils/google-cloud-sdk/distinfo b/sysutils/google-cloud-sdk/distinfo index a6a57d7b3..1d70e8c47 100644 --- a/sysutils/google-cloud-sdk/distinfo +++ b/sysutils/google-cloud-sdk/distinfo @@ -1,2 +1,2 @@ -SHA256 (google-cloud-sdk-445.0.0-linux-x86.tar.gz) = UW1nMO4HRvSf4/8DRLrST5vMIui5eji3+Nhgqi81kP8= -SIZE (google-cloud-sdk-445.0.0-linux-x86.tar.gz) = 116710264 +SHA256 (google-cloud-sdk-446.0.1-linux-x86.tar.gz) = b6kesOuSAu8KJuMUCaCBeL8SO/hJNG+CMs2PJJwVla4= +SIZE (google-cloud-sdk-446.0.1-linux-x86.tar.gz) = 116779847 diff --git a/sysutils/google-cloud-sdk/pkg/PLIST b/sysutils/google-cloud-sdk/pkg/PLIST index 3cf9f7bd4..3a1b33f67 100644 --- a/sysutils/google-cloud-sdk/pkg/PLIST +++ b/sysutils/google-cloud-sdk/pkg/PLIST @@ -418,6 +418,7 @@ google-cloud-sdk/lib/googlecloudsdk/api_lib/bigtable/${MODPY_PYCACHE}instances.$ google-cloud-sdk/lib/googlecloudsdk/api_lib/bigtable/${MODPY_PYCACHE}operations.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/api_lib/bigtable/${MODPY_PYCACHE}tables.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/api_lib/bigtable/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/googlecloudsdk/api_lib/bigtable/${MODPY_PYCACHE}views.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/api_lib/bigtable/app_profiles.py google-cloud-sdk/lib/googlecloudsdk/api_lib/bigtable/backups.py google-cloud-sdk/lib/googlecloudsdk/api_lib/bigtable/clusters.py @@ -425,6 +426,7 @@ google-cloud-sdk/lib/googlecloudsdk/api_lib/bigtable/instances.py google-cloud-sdk/lib/googlecloudsdk/api_lib/bigtable/operations.py google-cloud-sdk/lib/googlecloudsdk/api_lib/bigtable/tables.py google-cloud-sdk/lib/googlecloudsdk/api_lib/bigtable/util.py +google-cloud-sdk/lib/googlecloudsdk/api_lib/bigtable/views.py google-cloud-sdk/lib/googlecloudsdk/api_lib/billing/ google-cloud-sdk/lib/googlecloudsdk/api_lib/billing/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/api_lib/billing/${MODPY_PYCACHE}/ @@ -603,6 +605,7 @@ google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/${MODPY_PYCACHE}iap_tunnel_w google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/${MODPY_PYCACHE}iap_tunnel_websocket_utils.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/${MODPY_PYCACHE}image_utils.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/${MODPY_PYCACHE}instance_groups_utils.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/${MODPY_PYCACHE}instance_settings_metadata_utils.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/${MODPY_PYCACHE}instance_template_utils.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/${MODPY_PYCACHE}instance_utils.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/${MODPY_PYCACHE}instant_snapshots_utils.${MODPY_PYC_MAGIC_TAG}pyc @@ -705,6 +708,7 @@ google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/instance_groups/managed/inst google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/instance_groups/managed/stateful_policy_utils.py google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/instance_groups/managed/wait_utils.py google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/instance_groups_utils.py +google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/instance_settings_metadata_utils.py google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/instance_template_utils.py google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/instance_utils.py google-cloud-sdk/lib/googlecloudsdk/api_lib/compute/instances/ @@ -2341,14 +2345,6 @@ google-cloud-sdk/lib/googlecloudsdk/api_lib/tasks/locations.py google-cloud-sdk/lib/googlecloudsdk/api_lib/tasks/queues.py google-cloud-sdk/lib/googlecloudsdk/api_lib/tasks/task_queues_convertors.py google-cloud-sdk/lib/googlecloudsdk/api_lib/tasks/tasks.py -google-cloud-sdk/lib/googlecloudsdk/api_lib/telecom_data_fabric/ -google-cloud-sdk/lib/googlecloudsdk/api_lib/telecom_data_fabric/__init__.py -${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/api_lib/telecom_data_fabric/${MODPY_PYCACHE}/ -google-cloud-sdk/lib/googlecloudsdk/api_lib/telecom_data_fabric/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/api_lib/telecom_data_fabric/${MODPY_PYCACHE}create_deployment_args.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/api_lib/telecom_data_fabric/${MODPY_PYCACHE}lake.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/api_lib/telecom_data_fabric/create_deployment_args.py -google-cloud-sdk/lib/googlecloudsdk/api_lib/telecom_data_fabric/lake.py google-cloud-sdk/lib/googlecloudsdk/api_lib/trace/ google-cloud-sdk/lib/googlecloudsdk/api_lib/trace/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/api_lib/trace/${MODPY_PYCACHE}/ @@ -4070,12 +4066,6 @@ google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/${MODPY_PYCACHE} google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/agent_util.py google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/api_util.py google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/base.py -google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/build/ -google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/build/__init__.py -${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/build/${MODPY_PYCACHE}/ -google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/build/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/build/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/build/utils.py google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/clusterupgrade/ google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/clusterupgrade/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/clusterupgrade/${MODPY_PYCACHE}/ @@ -4129,11 +4119,13 @@ ${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/ google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/policycontroller/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/policycontroller/${MODPY_PYCACHE}command.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/policycontroller/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/policycontroller/${MODPY_PYCACHE}content.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/policycontroller/${MODPY_PYCACHE}deployment_configs.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/policycontroller/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/policycontroller/${MODPY_PYCACHE}flags.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/policycontroller/command.py google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/policycontroller/constants.py +google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/policycontroller/content.py google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/policycontroller/deployment_configs.py google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/policycontroller/exceptions.py google-cloud-sdk/lib/googlecloudsdk/command_lib/container/fleet/policycontroller/flags.py @@ -5611,6 +5603,12 @@ google-cloud-sdk/lib/googlecloudsdk/command_lib/netapp/backup_vaults/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/command_lib/netapp/backup_vaults/${MODPY_PYCACHE}/ google-cloud-sdk/lib/googlecloudsdk/command_lib/netapp/backup_vaults/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/command_lib/netapp/backup_vaults/${MODPY_PYCACHE}flags.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/googlecloudsdk/command_lib/netapp/backup_vaults/backups/ +google-cloud-sdk/lib/googlecloudsdk/command_lib/netapp/backup_vaults/backups/__init__.py +${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/command_lib/netapp/backup_vaults/backups/${MODPY_PYCACHE}/ +google-cloud-sdk/lib/googlecloudsdk/command_lib/netapp/backup_vaults/backups/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/googlecloudsdk/command_lib/netapp/backup_vaults/backups/${MODPY_PYCACHE}flags.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/googlecloudsdk/command_lib/netapp/backup_vaults/backups/flags.py google-cloud-sdk/lib/googlecloudsdk/command_lib/netapp/backup_vaults/flags.py google-cloud-sdk/lib/googlecloudsdk/command_lib/netapp/flags.py google-cloud-sdk/lib/googlecloudsdk/command_lib/netapp/kms_configs/ @@ -6539,11 +6537,6 @@ google-cloud-sdk/lib/googlecloudsdk/command_lib/telco_automation/${MODPY_PYCACHE google-cloud-sdk/lib/googlecloudsdk/command_lib/telco_automation/${MODPY_PYCACHE}hooks.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/command_lib/telco_automation/hooks.py google-cloud-sdk/lib/googlecloudsdk/command_lib/telco_automation/resources.yaml -google-cloud-sdk/lib/googlecloudsdk/command_lib/telecom_data_fabric/ -google-cloud-sdk/lib/googlecloudsdk/command_lib/telecom_data_fabric/__init__.py -${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/command_lib/telecom_data_fabric/${MODPY_PYCACHE}/ -google-cloud-sdk/lib/googlecloudsdk/command_lib/telecom_data_fabric/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/command_lib/telecom_data_fabric/resources.yaml google-cloud-sdk/lib/googlecloudsdk/command_lib/terraform/ google-cloud-sdk/lib/googlecloudsdk/command_lib/terraform/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/command_lib/terraform/${MODPY_PYCACHE}/ @@ -6577,8 +6570,12 @@ google-cloud-sdk/lib/googlecloudsdk/command_lib/transfer/appliances/ google-cloud-sdk/lib/googlecloudsdk/command_lib/transfer/appliances/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/command_lib/transfer/appliances/${MODPY_PYCACHE}/ google-cloud-sdk/lib/googlecloudsdk/command_lib/transfer/appliances/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/googlecloudsdk/command_lib/transfer/appliances/${MODPY_PYCACHE}flags.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/googlecloudsdk/command_lib/transfer/appliances/${MODPY_PYCACHE}mapping_util.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/command_lib/transfer/appliances/${MODPY_PYCACHE}regions.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/googlecloudsdk/command_lib/transfer/appliances/${MODPY_PYCACHE}resource_args.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/googlecloudsdk/command_lib/transfer/appliances/flags.py +google-cloud-sdk/lib/googlecloudsdk/command_lib/transfer/appliances/mapping_util.py google-cloud-sdk/lib/googlecloudsdk/command_lib/transfer/appliances/regions.py google-cloud-sdk/lib/googlecloudsdk/command_lib/transfer/appliances/resource_args.py google-cloud-sdk/lib/googlecloudsdk/command_lib/transfer/creds_util.py @@ -9756,6 +9753,16 @@ google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkconnectivity/v google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkconnectivity/v1alpha1/networkconnectivity_v1alpha1_client.py google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkconnectivity/v1alpha1/networkconnectivity_v1alpha1_messages.py google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkconnectivity/v1alpha1/resources.py +google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkconnectivity/v1beta/ +google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkconnectivity/v1beta/__init__.py +${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkconnectivity/v1beta/${MODPY_PYCACHE}/ +google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkconnectivity/v1beta/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkconnectivity/v1beta/${MODPY_PYCACHE}networkconnectivity_v1beta_client.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkconnectivity/v1beta/${MODPY_PYCACHE}networkconnectivity_v1beta_messages.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkconnectivity/v1beta/${MODPY_PYCACHE}resources.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkconnectivity/v1beta/networkconnectivity_v1beta_client.py +google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkconnectivity/v1beta/networkconnectivity_v1beta_messages.py +google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkconnectivity/v1beta/resources.py google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkmanagement/ google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkmanagement/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/networkmanagement/${MODPY_PYCACHE}/ @@ -10838,20 +10845,6 @@ google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telcoautomation/v1alp google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telcoautomation/v1alpha1/resources.py google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telcoautomation/v1alpha1/telcoautomation_v1alpha1_client.py google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telcoautomation/v1alpha1/telcoautomation_v1alpha1_messages.py -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telecomdatafabric/ -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telecomdatafabric/__init__.py -${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telecomdatafabric/${MODPY_PYCACHE}/ -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telecomdatafabric/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telecomdatafabric/v1alpha/ -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telecomdatafabric/v1alpha/__init__.py -${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telecomdatafabric/v1alpha/${MODPY_PYCACHE}/ -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telecomdatafabric/v1alpha/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telecomdatafabric/v1alpha/${MODPY_PYCACHE}resources.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telecomdatafabric/v1alpha/${MODPY_PYCACHE}telecomdatafabric_v1alpha_client.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telecomdatafabric/v1alpha/${MODPY_PYCACHE}telecomdatafabric_v1alpha_messages.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telecomdatafabric/v1alpha/resources.py -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telecomdatafabric/v1alpha/telecomdatafabric_v1alpha_client.py -google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/telecomdatafabric/v1alpha/telecomdatafabric_v1alpha_messages.py google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/testing/ google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/testing/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/googlecloudsdk/generated_clients/apis/testing/${MODPY_PYCACHE}/ @@ -16070,7 +16063,9 @@ google-cloud-sdk/lib/surface/compute/project_zonal_metadata/ google-cloud-sdk/lib/surface/compute/project_zonal_metadata/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/compute/project_zonal_metadata/${MODPY_PYCACHE}/ google-cloud-sdk/lib/surface/compute/project_zonal_metadata/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/compute/project_zonal_metadata/${MODPY_PYCACHE}add.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/compute/project_zonal_metadata/${MODPY_PYCACHE}describe.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/compute/project_zonal_metadata/add.py google-cloud-sdk/lib/surface/compute/project_zonal_metadata/describe.py google-cloud-sdk/lib/surface/compute/public_advertised_prefixes/ google-cloud-sdk/lib/surface/compute/public_advertised_prefixes/__init__.py @@ -17362,16 +17357,6 @@ google-cloud-sdk/lib/surface/container/fleet/anthosobservability/describe.py google-cloud-sdk/lib/surface/container/fleet/anthosobservability/disable.py google-cloud-sdk/lib/surface/container/fleet/anthosobservability/enable.py google-cloud-sdk/lib/surface/container/fleet/anthosobservability/update.py -google-cloud-sdk/lib/surface/container/fleet/build/ -google-cloud-sdk/lib/surface/container/fleet/build/__init__.py -${MODPY_COMMENT}google-cloud-sdk/lib/surface/container/fleet/build/${MODPY_PYCACHE}/ -google-cloud-sdk/lib/surface/container/fleet/build/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/surface/container/fleet/build/${MODPY_PYCACHE}describe.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/surface/container/fleet/build/${MODPY_PYCACHE}disable.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/surface/container/fleet/build/${MODPY_PYCACHE}enable.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/surface/container/fleet/build/describe.py -google-cloud-sdk/lib/surface/container/fleet/build/disable.py -google-cloud-sdk/lib/surface/container/fleet/build/enable.py google-cloud-sdk/lib/surface/container/fleet/cloudrun/ google-cloud-sdk/lib/surface/container/fleet/cloudrun/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/container/fleet/cloudrun/${MODPY_PYCACHE}/ @@ -17614,6 +17599,18 @@ google-cloud-sdk/lib/surface/container/fleet/policycontroller/constraints/${MODP google-cloud-sdk/lib/surface/container/fleet/policycontroller/constraints/${MODPY_PYCACHE}list.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/container/fleet/policycontroller/constraints/describe.py google-cloud-sdk/lib/surface/container/fleet/policycontroller/constraints/list.py +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/ +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/__init__.py +${MODPY_COMMENT}google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/${MODPY_PYCACHE}/ +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/bundles/ +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/bundles/__init__.py +${MODPY_COMMENT}google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/bundles/${MODPY_PYCACHE}/ +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/bundles/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/bundles/${MODPY_PYCACHE}remove.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/bundles/${MODPY_PYCACHE}set.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/bundles/remove.py +google-cloud-sdk/lib/surface/container/fleet/policycontroller/content/bundles/set.py google-cloud-sdk/lib/surface/container/fleet/policycontroller/deployment/ google-cloud-sdk/lib/surface/container/fleet/policycontroller/deployment/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/container/fleet/policycontroller/deployment/${MODPY_PYCACHE}/ @@ -22029,6 +22026,16 @@ google-cloud-sdk/lib/surface/netapp/backup_vaults/${MODPY_PYCACHE}delete.${MODPY google-cloud-sdk/lib/surface/netapp/backup_vaults/${MODPY_PYCACHE}describe.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/netapp/backup_vaults/${MODPY_PYCACHE}list.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/netapp/backup_vaults/${MODPY_PYCACHE}update.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/ +google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/__init__.py +${MODPY_COMMENT}google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/${MODPY_PYCACHE}/ +google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/${MODPY_PYCACHE}create.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/${MODPY_PYCACHE}delete.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/${MODPY_PYCACHE}list.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/create.py +google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/delete.py +google-cloud-sdk/lib/surface/netapp/backup_vaults/backups/list.py google-cloud-sdk/lib/surface/netapp/backup_vaults/create.py google-cloud-sdk/lib/surface/netapp/backup_vaults/delete.py google-cloud-sdk/lib/surface/netapp/backup_vaults/describe.py @@ -23755,10 +23762,16 @@ google-cloud-sdk/lib/surface/scc/operations/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/scc/operations/${MODPY_PYCACHE}/ google-cloud-sdk/lib/surface/scc/operations/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/scc/operations/describe.yaml +google-cloud-sdk/lib/surface/scc/posture_templates/ +google-cloud-sdk/lib/surface/scc/posture_templates/__init__.py +${MODPY_COMMENT}google-cloud-sdk/lib/surface/scc/posture_templates/${MODPY_PYCACHE}/ +google-cloud-sdk/lib/surface/scc/posture_templates/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/scc/posture_templates/describe.yaml google-cloud-sdk/lib/surface/scc/postures/ google-cloud-sdk/lib/surface/scc/postures/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/scc/postures/${MODPY_PYCACHE}/ google-cloud-sdk/lib/surface/scc/postures/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/scc/postures/create.yaml google-cloud-sdk/lib/surface/scc/postures/describe.yaml google-cloud-sdk/lib/surface/scc/settings/ google-cloud-sdk/lib/surface/scc/settings/__init__.py @@ -24751,33 +24764,6 @@ google-cloud-sdk/lib/surface/telco_automation/orchestration_cluster/create.yaml google-cloud-sdk/lib/surface/telco_automation/orchestration_cluster/delete.yaml google-cloud-sdk/lib/surface/telco_automation/orchestration_cluster/describe.yaml google-cloud-sdk/lib/surface/telco_automation/orchestration_cluster/list.yaml -google-cloud-sdk/lib/surface/telecom_data_fabric/ -google-cloud-sdk/lib/surface/telecom_data_fabric/__init__.py -${MODPY_COMMENT}google-cloud-sdk/lib/surface/telecom_data_fabric/${MODPY_PYCACHE}/ -google-cloud-sdk/lib/surface/telecom_data_fabric/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/surface/telecom_data_fabric/deployments/ -google-cloud-sdk/lib/surface/telecom_data_fabric/deployments/__init__.py -${MODPY_COMMENT}google-cloud-sdk/lib/surface/telecom_data_fabric/deployments/${MODPY_PYCACHE}/ -google-cloud-sdk/lib/surface/telecom_data_fabric/deployments/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/surface/telecom_data_fabric/deployments/create.yaml -google-cloud-sdk/lib/surface/telecom_data_fabric/deployments/delete.yaml -google-cloud-sdk/lib/surface/telecom_data_fabric/deployments/describe.yaml -google-cloud-sdk/lib/surface/telecom_data_fabric/deployments/list.yaml -google-cloud-sdk/lib/surface/telecom_data_fabric/deployments/update.yaml -google-cloud-sdk/lib/surface/telecom_data_fabric/fabrics/ -google-cloud-sdk/lib/surface/telecom_data_fabric/fabrics/__init__.py -${MODPY_COMMENT}google-cloud-sdk/lib/surface/telecom_data_fabric/fabrics/${MODPY_PYCACHE}/ -google-cloud-sdk/lib/surface/telecom_data_fabric/fabrics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/surface/telecom_data_fabric/fabrics/create.yaml -google-cloud-sdk/lib/surface/telecom_data_fabric/fabrics/delete.yaml -google-cloud-sdk/lib/surface/telecom_data_fabric/fabrics/describe.yaml -google-cloud-sdk/lib/surface/telecom_data_fabric/fabrics/list.yaml -google-cloud-sdk/lib/surface/telecom_data_fabric/templates/ -google-cloud-sdk/lib/surface/telecom_data_fabric/templates/__init__.py -${MODPY_COMMENT}google-cloud-sdk/lib/surface/telecom_data_fabric/templates/${MODPY_PYCACHE}/ -google-cloud-sdk/lib/surface/telecom_data_fabric/templates/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -google-cloud-sdk/lib/surface/telecom_data_fabric/templates/describe.yaml -google-cloud-sdk/lib/surface/telecom_data_fabric/templates/list.yaml google-cloud-sdk/lib/surface/terraform/ google-cloud-sdk/lib/surface/terraform/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/terraform/${MODPY_PYCACHE}/ @@ -24917,12 +24903,16 @@ google-cloud-sdk/lib/surface/transfer/appliances/orders/ google-cloud-sdk/lib/surface/transfer/appliances/orders/__init__.py ${MODPY_COMMENT}google-cloud-sdk/lib/surface/transfer/appliances/orders/${MODPY_PYCACHE}/ google-cloud-sdk/lib/surface/transfer/appliances/orders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/transfer/appliances/orders/${MODPY_PYCACHE}create.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/transfer/appliances/orders/${MODPY_PYCACHE}delete.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/transfer/appliances/orders/${MODPY_PYCACHE}describe.${MODPY_PYC_MAGIC_TAG}pyc google-cloud-sdk/lib/surface/transfer/appliances/orders/${MODPY_PYCACHE}list.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/transfer/appliances/orders/${MODPY_PYCACHE}update.${MODPY_PYC_MAGIC_TAG}pyc +google-cloud-sdk/lib/surface/transfer/appliances/orders/create.py google-cloud-sdk/lib/surface/transfer/appliances/orders/delete.py google-cloud-sdk/lib/surface/transfer/appliances/orders/describe.py google-cloud-sdk/lib/surface/transfer/appliances/orders/list.py +google-cloud-sdk/lib/surface/transfer/appliances/orders/update.py google-cloud-sdk/lib/surface/transfer/authorize.py google-cloud-sdk/lib/surface/transfer/jobs/ google-cloud-sdk/lib/surface/transfer/jobs/__init__.py diff --git a/sysutils/py-filelock/Makefile b/sysutils/py-filelock/Makefile index a7edc9510..e9f6df89f 100644 --- a/sysutils/py-filelock/Makefile +++ b/sysutils/py-filelock/Makefile @@ -1,6 +1,6 @@ COMMENT= platform independent file lock -MODPY_EGG_VERSION= 3.12.2 +MODPY_EGG_VERSION= 3.12.4 DISTNAME= filelock-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} diff --git a/sysutils/py-filelock/distinfo b/sysutils/py-filelock/distinfo index 73001a626..f11ade42f 100644 --- a/sysutils/py-filelock/distinfo +++ b/sysutils/py-filelock/distinfo @@ -1,2 +1,2 @@ -SHA256 (filelock-3.12.2.tar.gz) = ACdAUY2KpZomsMduEPuMbhXq6CXTS2/fZwMz/XuTjYE= -SIZE (filelock-3.12.2.tar.gz) = 12441 +SHA256 (filelock-3.12.4.tar.gz) = Lm8knx82VCkWBuBGsJ8f1erDmzYGZMJ/Wq0HIBL4vL0= +SIZE (filelock-3.12.4.tar.gz) = 13758 diff --git a/sysutils/py-watchdog/Makefile b/sysutils/py-watchdog/Makefile new file mode 100644 index 000000000..4f3da1ab0 --- /dev/null +++ b/sysutils/py-watchdog/Makefile @@ -0,0 +1,24 @@ +COMMENT = filesystem event monitoring + +MODPY_EGG_VERSION = 1.0.2 +DISTNAME = watchdog-${MODPY_EGG_VERSION} +PKGNAME = py-${DISTNAME} + +CATEGORIES = sysutils + +# Apache 2.0 +PERMIT_PACKAGE = Yes + +MODULES = lang/python + +FLAVORS = python3 +FLAVOR = python3 + +MODPY_PI = Yes +MODPY_PYBUILD = setuptools + +TEST_DEPENDS = devel/py-test-cov${MODPY_FLAVOR} \ + devel/py-argh${MODPY_FLAVOR} \ + textproc/py-yaml${MODPY_FLAVOR} + +.include <bsd.port.mk> diff --git a/sysutils/py-watchdog/distinfo b/sysutils/py-watchdog/distinfo new file mode 100644 index 000000000..df9f12f92 --- /dev/null +++ b/sysutils/py-watchdog/distinfo @@ -0,0 +1,2 @@ +SHA256 (watchdog-1.0.2.tar.gz) = N2y8KjXAOSsP5/8W+8GzA/2Z1N2ZEatVge6daa3IiYI= +SIZE (watchdog-1.0.2.tar.gz) = 98483 diff --git a/sysutils/py-watchdog/pkg/DESCR b/sysutils/py-watchdog/pkg/DESCR new file mode 100644 index 000000000..c91bfe7cd --- /dev/null +++ b/sysutils/py-watchdog/pkg/DESCR @@ -0,0 +1 @@ +Python API and shell utilities to monitor file system events. diff --git a/sysutils/py-watchdog/pkg/PLIST b/sysutils/py-watchdog/pkg/PLIST new file mode 100644 index 000000000..6cb0a7aac --- /dev/null +++ b/sysutils/py-watchdog/pkg/PLIST @@ -0,0 +1,87 @@ +bin/watchmedo +lib/python${MODPY_VERSION}/site-packages/watchdog/ +lib/python${MODPY_VERSION}/site-packages/watchdog-${MODPY_EGG_VERSION}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/watchdog-${MODPY_EGG_VERSION}.dist-info/AUTHORS +lib/python${MODPY_VERSION}/site-packages/watchdog-${MODPY_EGG_VERSION}.dist-info/COPYING +lib/python${MODPY_VERSION}/site-packages/watchdog-${MODPY_EGG_VERSION}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/watchdog-${MODPY_EGG_VERSION}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/watchdog-${MODPY_EGG_VERSION}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/watchdog-${MODPY_EGG_VERSION}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/watchdog-${MODPY_EGG_VERSION}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/watchdog-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/watchdog/__init__.py +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/watchdog/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/watchdog/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/${MODPY_PYCACHE}watchmedo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/${MODPY_PYCACHE}watchmedo.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/events.py +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/ +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/__init__.py +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}fsevents.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}fsevents.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}fsevents2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}fsevents2.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}inotify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}inotify.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}inotify_buffer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}inotify_buffer.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}inotify_c.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}inotify_c.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}kqueue.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}kqueue.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}polling.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}polling.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}read_directory_changes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}read_directory_changes.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}winapi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/${MODPY_PYCACHE}winapi.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/api.py +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/fsevents.py +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/fsevents2.py +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/inotify.py +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/inotify_buffer.py +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/inotify_c.py +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/kqueue.py +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/polling.py +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/read_directory_changes.py +lib/python${MODPY_VERSION}/site-packages/watchdog/observers/winapi.py +lib/python${MODPY_VERSION}/site-packages/watchdog/tricks/ +lib/python${MODPY_VERSION}/site-packages/watchdog/tricks/__init__.py +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/watchdog/tricks/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/watchdog/tricks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/tricks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/ +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/__init__.py +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}bricks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}bricks.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}delayed_queue.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}delayed_queue.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}dirsnapshot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}dirsnapshot.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}echo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}echo.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}patterns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}patterns.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}platform.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/${MODPY_PYCACHE}platform.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/bricks.py +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/delayed_queue.py +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/dirsnapshot.py +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/echo.py +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/patterns.py +lib/python${MODPY_VERSION}/site-packages/watchdog/utils/platform.py +lib/python${MODPY_VERSION}/site-packages/watchdog/version.py +lib/python${MODPY_VERSION}/site-packages/watchdog/watchmedo.py diff --git a/sysutils/sysclean/Makefile b/sysutils/sysclean/Makefile index 0268131ab..68e29cf2e 100644 --- a/sysutils/sysclean/Makefile +++ b/sysutils/sysclean/Makefile @@ -1,14 +1,14 @@ COMMENT = list obsolete files between OpenBSD upgrades -V = 3.2 +V = 3.3 DISTNAME = sysclean-${V} CATEGORIES = sysutils -HOMEPAGE = https://github.com/semarie/sysclean/ +HOMEPAGE = https://codeberg.org/semarie/sysclean/ -MAINTAINER = Sebastien Marie <semarie@online.fr> +MAINTAINER = Sebastien Marie <semarie@kapouay.eu.org> -MASTER_SITES = https://github.com/semarie/sysclean/releases/download/${V}/ +MASTER_SITES = https://codeberg.org/semarie/sysclean/releases/download/${V}/ # ISC PERMIT_PACKAGE = Yes diff --git a/sysutils/sysclean/distinfo b/sysutils/sysclean/distinfo index aa631dfba..6e67b4f33 100644 --- a/sysutils/sysclean/distinfo +++ b/sysutils/sysclean/distinfo @@ -1,2 +1,2 @@ -SHA256 (sysclean-3.2.tar.gz) = yFDGh9cobBiYxuQcQyvfyW+ozFv9zqAVzDhGce2A5m0= -SIZE (sysclean-3.2.tar.gz) = 6079 +SHA256 (sysclean-3.3.tar.gz) = oJpRpnXK9iGMDULi3K7rgfF76KPcwLCOmHq2p+WmM/8= +SIZE (sysclean-3.3.tar.gz) = 5963 diff --git a/sysutils/terragrunt/Makefile b/sysutils/terragrunt/Makefile index a98c88620..7e93052be 100644 --- a/sysutils/terragrunt/Makefile +++ b/sysutils/terragrunt/Makefile @@ -4,7 +4,7 @@ BROKEN-armv7= old kr/pty doesn't support OpenBSD arm arches; needs creack/pty@v1 COMMENT= thin wrapper for Terraform that provides extra tools MODGO_MODNAME= github.com/gruntwork-io/terragrunt -MODGO_VERSION= v0.50.14 +MODGO_VERSION= v0.50.17 DISTNAME= terragrunt-${MODGO_VERSION} WRKDIST= ${WRKDIR}/github.com/gruntwork-io/terragrunt@${MODGO_VERSION} diff --git a/sysutils/terragrunt/distinfo b/sysutils/terragrunt/distinfo index 4e5d55c6d..05eaab8af 100644 --- a/sysutils/terragrunt/distinfo +++ b/sysutils/terragrunt/distinfo @@ -2274,7 +2274,7 @@ SHA256 (go_modules/sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.zip) = XmRigeM SHA256 (go_modules/sigs.k8s.io/yaml/@v/v1.1.0.mod) = JC1yDRxq7+SjBcM0GoBXXhmlRRelO2IPjOKMKW5R06o= SHA256 (go_modules/sigs.k8s.io/yaml/@v/v1.2.0.mod) = 8ikTVRI4fWZj4fCZmkkiq3CN7UvcgExxzpPj1gK6ld0= SHA256 (go_modules/sigs.k8s.io/yaml/@v/v1.2.0.zip) = Ve0Ixd9EigM79+LCkS1NqoW4VqBchUsMh8zIXH8/v8c= -SHA256 (terragrunt-v0.50.14.zip) = OWmBfllUqFDJnXg4ZDZVqAeRY1mSOJfNxHB8nQ8B5GI= +SHA256 (terragrunt-v0.50.17.zip) = A2Vi7CkHf9p2QdfI0PuaiWEgLlACJ1YwGFnFeINsZR4= SIZE (go_modules/cloud.google.com/go/@v/v0.100.2.mod) = 531 SIZE (go_modules/cloud.google.com/go/@v/v0.102.0.mod) = 568 SIZE (go_modules/cloud.google.com/go/@v/v0.102.1.mod) = 568 @@ -4551,4 +4551,4 @@ SIZE (go_modules/sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.zip) = 230610 SIZE (go_modules/sigs.k8s.io/yaml/@v/v1.1.0.mod) = 24 SIZE (go_modules/sigs.k8s.io/yaml/@v/v1.2.0.mod) = 106 SIZE (go_modules/sigs.k8s.io/yaml/@v/v1.2.0.zip) = 20937 -SIZE (terragrunt-v0.50.14.zip) = 2871850 +SIZE (terragrunt-v0.50.17.zip) = 2877937 diff --git a/textproc/Makefile b/textproc/Makefile index bf64b89b4..907f0a62d 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -126,6 +126,7 @@ SUBDIR += libxml++ SUBDIR += libxml++40 SUBDIR += libxml++50 + SUBDIR += libxmlb SUBDIR += libxmlbird SUBDIR += libxslt SUBDIR += link-grammar @@ -405,6 +406,7 @@ SUBDIR += py-demjson,python3 SUBDIR += py-dict2xml,python3 SUBDIR += py-dicttoxml,python3 + SUBDIR += py-diff-match-patch,python3 SUBDIR += py-docutils,python3 SUBDIR += py-elasticsearch,python3 SUBDIR += py-elementpath,python3 @@ -470,6 +472,7 @@ SUBDIR += py-sphinxcontrib # subdir; uses python3 SUBDIR += py-stache,python3 SUBDIR += py-stemmer,python3 + SUBDIR += py-textdistance,python3 SUBDIR += py-textfsm,python3 SUBDIR += py-tinycss2,python3 SUBDIR += py-toml,python3 @@ -477,6 +480,7 @@ SUBDIR += py-tomli_w,python3 SUBDIR += py-tomlkit,python3 SUBDIR += py-typogrify,python3 + SUBDIR += py-ujson,python3 SUBDIR += py-unicodecsv,python3 SUBDIR += py-unidecode,python3 SUBDIR += py-unpaddedbase64,python3 diff --git a/textproc/libxmlb/Makefile b/textproc/libxmlb/Makefile new file mode 100644 index 000000000..c19f39013 --- /dev/null +++ b/textproc/libxmlb/Makefile @@ -0,0 +1,30 @@ +COMMENT= library to help create and query binary XML blobs + +V= 0.3.14 +DISTNAME= libxmlb-${V} +EXTRACT_SUFX= .tar.xz + +SHARED_LIBS += xmlb 0.0 # 2.0.0 + +CATEGORIES= textproc + +MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org> + +HOMEPAGE= https://github.com/hughsie/libxmlb + +# LGPLv2.1 +PERMIT_PACKAGE= Yes + +WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 lzma zstd + +MASTER_SITES= https://github.com/hughsie/libxmlb/releases/download/${V}/ + +MODULES= devel/meson + +BUILD_DEPENDS= devel/gobject-introspection \ + textproc/gtk-doc + +LIB_DEPENDS= archivers/zstd \ + devel/glib2 + +.include <bsd.port.mk> diff --git a/textproc/libxmlb/distinfo b/textproc/libxmlb/distinfo new file mode 100644 index 000000000..9770ccd65 --- /dev/null +++ b/textproc/libxmlb/distinfo @@ -0,0 +1,2 @@ +SHA256 (libxmlb-0.3.14.tar.xz) = ovAFbu0U/3ka7isIsVFKDxts8hXwV5E4qMroxFoNOw8= +SIZE (libxmlb-0.3.14.tar.xz) = 100288 diff --git a/textproc/libxmlb/pkg/DESCR b/textproc/libxmlb/pkg/DESCR new file mode 100644 index 000000000..b5ccb4570 --- /dev/null +++ b/textproc/libxmlb/pkg/DESCR @@ -0,0 +1,20 @@ +XML is slow to parse and strings inside the document cannot be memory mapped as +they do not have a trailing NUL char. The libxmlb library takes XML source, and +converts it to a structured binary representation with a deduplicated string +table -- where the strings have the NULs included. + +This allows an application to mmap the binary XML file, do an XPath query and +return some strings without actually parsing the entire document. This is all +done using (almost) zero allocations and no actual copying of the binary data. + +As each node in the binary XML file encodes the 'next' node at the same level +it makes skipping whole subtrees trivial. A 10Mb binary XML file can be loaded +from disk **and** queried in less than a few milliseconds. + +The binary XML is not supposed to be small. It's usually about half the size of +the text XML data where a lot of the tag content is duplicated, but can actually +be larger than the original XML file. This isn't important; the fast query speed +and the ability to mmap strings without copies more than makes up for the larger +on-disk size. If you want to compress your XML, this library probably isn't for +you -- just use gzip -- it gives you an almost a perfect compression ratio for +data like this. diff --git a/textproc/libxmlb/pkg/PLIST b/textproc/libxmlb/pkg/PLIST new file mode 100644 index 000000000..4e1a11fb8 --- /dev/null +++ b/textproc/libxmlb/pkg/PLIST @@ -0,0 +1,77 @@ +@bin bin/xb-tool +include/libxmlb-2/ +include/libxmlb-2/libxmlb/ +include/libxmlb-2/libxmlb/xb-builder-fixup.h +include/libxmlb-2/libxmlb/xb-builder-node.h +include/libxmlb-2/libxmlb/xb-builder-source-ctx.h +include/libxmlb-2/libxmlb/xb-builder-source.h +include/libxmlb-2/libxmlb/xb-builder.h +include/libxmlb-2/libxmlb/xb-machine.h +include/libxmlb-2/libxmlb/xb-node-query.h +include/libxmlb-2/libxmlb/xb-node-silo.h +include/libxmlb-2/libxmlb/xb-node.h +include/libxmlb-2/libxmlb/xb-opcode.h +include/libxmlb-2/libxmlb/xb-query-context.h +include/libxmlb-2/libxmlb/xb-query.h +include/libxmlb-2/libxmlb/xb-silo-export.h +include/libxmlb-2/libxmlb/xb-silo-query.h +include/libxmlb-2/libxmlb/xb-silo.h +include/libxmlb-2/libxmlb/xb-stack.h +include/libxmlb-2/libxmlb/xb-string.h +include/libxmlb-2/libxmlb/xb-value-bindings.h +include/libxmlb-2/libxmlb/xb-version.h +include/libxmlb-2/xmlb.h +lib/girepository-1.0/ +lib/girepository-1.0/Xmlb-2.0.typelib +@lib lib/libxmlb.so.${LIBxmlb_VERSION} +lib/pkgconfig/xmlb.pc +libexec/installed-tests/ +libexec/installed-tests/libxmlb/ +libexec/installed-tests/libxmlb/test.desktop +libexec/installed-tests/libxmlb/test.quirk +libexec/installed-tests/libxmlb/test.xml +libexec/installed-tests/libxmlb/test.xml.gz.gz.gz +libexec/installed-tests/libxmlb/test.xml.xz +libexec/installed-tests/libxmlb/test.xml.zstd +@bin libexec/installed-tests/libxmlb/xb-self-test +@man man/man1/xb-tool.1 +share/gir-1.0/ +share/gir-1.0/Xmlb-2.0.gir +share/gtk-doc/ +share/gtk-doc/html/ +share/gtk-doc/html/libxmlb/ +share/gtk-doc/html/libxmlb/annotation-glossary.html +share/gtk-doc/html/libxmlb/api-index-full.html +share/gtk-doc/html/libxmlb/deprecated-api-index.html +share/gtk-doc/html/libxmlb/home.png +share/gtk-doc/html/libxmlb/index.html +share/gtk-doc/html/libxmlb/intro.html +share/gtk-doc/html/libxmlb/left-insensitive.png +share/gtk-doc/html/libxmlb/left.png +share/gtk-doc/html/libxmlb/libxmlb-XbBuilder.html +share/gtk-doc/html/libxmlb/libxmlb-XbBuilderFixup.html +share/gtk-doc/html/libxmlb/libxmlb-XbBuilderNode.html +share/gtk-doc/html/libxmlb/libxmlb-XbBuilderSource.html +share/gtk-doc/html/libxmlb/libxmlb-XbBuilderSourceCtx.html +share/gtk-doc/html/libxmlb/libxmlb-XbMachine.html +share/gtk-doc/html/libxmlb/libxmlb-XbNode.html +share/gtk-doc/html/libxmlb/libxmlb-XbQuery.html +share/gtk-doc/html/libxmlb/libxmlb-XbSilo.html +share/gtk-doc/html/libxmlb/libxmlb-xb-node-query.html +share/gtk-doc/html/libxmlb/libxmlb-xb-opcode.html +share/gtk-doc/html/libxmlb/libxmlb-xb-query-context.html +share/gtk-doc/html/libxmlb/libxmlb-xb-silo-export.html +share/gtk-doc/html/libxmlb/libxmlb-xb-silo-query.html +share/gtk-doc/html/libxmlb/libxmlb-xb-stack.html +share/gtk-doc/html/libxmlb/libxmlb-xb-string.html +share/gtk-doc/html/libxmlb/libxmlb-xb-value-bindings.html +share/gtk-doc/html/libxmlb/libxmlb.devhelp2 +share/gtk-doc/html/libxmlb/libxmlb.html +share/gtk-doc/html/libxmlb/right-insensitive.png +share/gtk-doc/html/libxmlb/right.png +share/gtk-doc/html/libxmlb/style.css +share/gtk-doc/html/libxmlb/up-insensitive.png +share/gtk-doc/html/libxmlb/up.png +share/installed-tests/ +share/installed-tests/libxmlb/ +share/installed-tests/libxmlb/libxmlb.test diff --git a/textproc/py-diff-match-patch/Makefile b/textproc/py-diff-match-patch/Makefile new file mode 100644 index 000000000..0ce2183b4 --- /dev/null +++ b/textproc/py-diff-match-patch/Makefile @@ -0,0 +1,20 @@ +COMMENT = high-performance diff and patch library + +MODPY_EGG_VERSION = 20181111 +DISTNAME = diff-match-patch-${MODPY_EGG_VERSION} +PKGNAME = py-${DISTNAME} + +CATEGORIES = textproc + +# Apache v2 +PERMIT_PACKAGE = Yes + +MODULES = lang/python + +FLAVORS = python3 +FLAVOR = python3 + +MODPY_PI = Yes +MODPY_PYBUILD = setuptools + +.include <bsd.port.mk> diff --git a/textproc/py-diff-match-patch/distinfo b/textproc/py-diff-match-patch/distinfo new file mode 100644 index 000000000..2a0e18df8 --- /dev/null +++ b/textproc/py-diff-match-patch/distinfo @@ -0,0 +1,2 @@ +SHA256 (diff-match-patch-20181111.tar.gz) = qAmpltDwm5u9Wem70Lce7YyAeSJRKRDgXL0/lIBxLds= +SIZE (diff-match-patch-20181111.tar.gz) = 58554 diff --git a/textproc/py-diff-match-patch/pkg/DESCR b/textproc/py-diff-match-patch/pkg/DESCR new file mode 100644 index 000000000..a3e69920f --- /dev/null +++ b/textproc/py-diff-match-patch/pkg/DESCR @@ -0,0 +1,10 @@ +The diff match and patch libraries offer robust algorithms to perform +the operations required for synchronizing plain text. + +This library implements Myer's diff algorithm which is generally +considered to be the best general-purpose diff. A layer of pre-diff +speedups and post-diff cleanups surround the diff algorithm, improving +both performance and output quality. + +This library also implements a Bitap matching algorithm at the heart +of a flexible matching and patching strategy. diff --git a/textproc/py-diff-match-patch/pkg/PLIST b/textproc/py-diff-match-patch/pkg/PLIST new file mode 100644 index 000000000..6fbd7969c --- /dev/null +++ b/textproc/py-diff-match-patch/pkg/PLIST @@ -0,0 +1,31 @@ +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/ +lib/python${MODPY_VERSION}/site-packages/diff_match_patch-${MODPY_EGG_VERSION}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/diff_match_patch-${MODPY_EGG_VERSION}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/diff_match_patch-${MODPY_EGG_VERSION}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/diff_match_patch-${MODPY_EGG_VERSION}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/diff_match_patch-${MODPY_EGG_VERSION}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/diff_match_patch-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/__init__.py +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/diff_match_patch/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/${MODPY_PYCACHE}diff_match_patch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/${MODPY_PYCACHE}diff_match_patch.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/${MODPY_PYCACHE}diff_match_patch_py2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/${MODPY_PYCACHE}diff_match_patch_py2.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/diff_match_patch.py +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/diff_match_patch_py2.py +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/tests/ +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/tests/__init__.py +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/diff_match_patch/tests/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/tests/${MODPY_PYCACHE}diff_match_patch_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/tests/${MODPY_PYCACHE}diff_match_patch_test.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/tests/${MODPY_PYCACHE}diff_match_patch_test_py2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/tests/${MODPY_PYCACHE}diff_match_patch_test_py2.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/tests/${MODPY_PYCACHE}speedtest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/tests/${MODPY_PYCACHE}speedtest.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/tests/diff_match_patch_test.py +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/tests/diff_match_patch_test_py2.py +lib/python${MODPY_VERSION}/site-packages/diff_match_patch/tests/speedtest.py diff --git a/textproc/py-textdistance/Makefile b/textproc/py-textdistance/Makefile new file mode 100644 index 000000000..c3660aac4 --- /dev/null +++ b/textproc/py-textdistance/Makefile @@ -0,0 +1,22 @@ +COMMENT = compute distance between texts + +MODPY_EGG_VERSION = 4.2.0 +DISTNAME = textdistance-${MODPY_EGG_VERSION} +PKGNAME = py-${DISTNAME} +CATEGORIES = textproc + +# MIT +PERMIT_PACKAGE = Yes + +MODULES = lang/python + +FLAVORS = python3 +FLAVOR = python3 + +MODPY_PI = Yes +MODPY_PYBUILD = setuptools + +TEST_DEPENDS = devel/py-hypothesis${MODPY_FLAVOR} \ + math/py-numpy${MODPY_FLAVOR} + +.include <bsd.port.mk> diff --git a/textproc/py-textdistance/distinfo b/textproc/py-textdistance/distinfo new file mode 100644 index 000000000..a03a56e17 --- /dev/null +++ b/textproc/py-textdistance/distinfo @@ -0,0 +1,2 @@ +SHA256 (textdistance-4.2.0.tar.gz) = bSo5iBWu7UU8+zijti2nTjP6al9OQoRf0dLJYRg2vv0= +SIZE (textdistance-4.2.0.tar.gz) = 34519 diff --git a/textproc/py-textdistance/pkg/DESCR b/textproc/py-textdistance/pkg/DESCR new file mode 100644 index 000000000..bad0f7628 --- /dev/null +++ b/textproc/py-textdistance/pkg/DESCR @@ -0,0 +1,2 @@ +Python library for comparing distance between two or more sequences +by many algorithms. diff --git a/textproc/py-textdistance/pkg/PLIST b/textproc/py-textdistance/pkg/PLIST new file mode 100644 index 000000000..0818b0d9e --- /dev/null +++ b/textproc/py-textdistance/pkg/PLIST @@ -0,0 +1,50 @@ +lib/python${MODPY_VERSION}/site-packages/textdistance/ +lib/python${MODPY_VERSION}/site-packages/textdistance-${MODPY_EGG_VERSION}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/textdistance-${MODPY_EGG_VERSION}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/textdistance-${MODPY_EGG_VERSION}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/textdistance-${MODPY_EGG_VERSION}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/textdistance-${MODPY_EGG_VERSION}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/textdistance-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/textdistance/__init__.py +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/textdistance/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/textdistance/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/textdistance/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/textdistance/${MODPY_PYCACHE}benchmark.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/textdistance/${MODPY_PYCACHE}benchmark.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/textdistance/${MODPY_PYCACHE}libraries.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/textdistance/${MODPY_PYCACHE}libraries.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/textdistance/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/textdistance/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/ +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/__init__.py +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}compression_based.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}compression_based.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}edit_based.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}edit_based.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}phonetic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}phonetic.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}sequence_based.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}sequence_based.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}simple.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}simple.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}token_based.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}token_based.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}vector_based.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/${MODPY_PYCACHE}vector_based.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/base.py +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/compression_based.py +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/edit_based.py +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/phonetic.py +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/sequence_based.py +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/simple.py +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/token_based.py +lib/python${MODPY_VERSION}/site-packages/textdistance/algorithms/vector_based.py +lib/python${MODPY_VERSION}/site-packages/textdistance/benchmark.py +lib/python${MODPY_VERSION}/site-packages/textdistance/libraries.json +lib/python${MODPY_VERSION}/site-packages/textdistance/libraries.py +lib/python${MODPY_VERSION}/site-packages/textdistance/utils.py diff --git a/textproc/py-ujson/Makefile b/textproc/py-ujson/Makefile new file mode 100644 index 000000000..0b5032af2 --- /dev/null +++ b/textproc/py-ujson/Makefile @@ -0,0 +1,20 @@ +COMMENT = fast Python json encoder/decoder + +MODPY_EGG_VERSION = 3.0.0 +DISTNAME = ujson-${MODPY_EGG_VERSION} +PKGNAME = py-${DISTNAME} + +CATEGORIES = textproc + +# BSD +PERMIT_PACKAGE = Yes + +MODULES = lang/python + +FLAVORS = python3 +FLAVOR = python3 + +MODPY_PI = Yes +MODPY_PYBUILD = setuptools_scm + +.include <bsd.port.mk> diff --git a/textproc/py-ujson/distinfo b/textproc/py-ujson/distinfo new file mode 100644 index 000000000..067025b6d --- /dev/null +++ b/textproc/py-ujson/distinfo @@ -0,0 +1,2 @@ +SHA256 (ujson-3.0.0.tar.gz) = 4BmYSdYcxkGPlNUqMUxqJ1JNZeghdNKgQ/txj3PRUg0= +SIZE (ujson-3.0.0.tar.gz) = 7128523 diff --git a/textproc/py-ujson/pkg/DESCR b/textproc/py-ujson/pkg/DESCR new file mode 100644 index 000000000..791dd95a2 --- /dev/null +++ b/textproc/py-ujson/pkg/DESCR @@ -0,0 +1,5 @@ +UltraJSON is an ultra fast JSON encoder and decoder written in pure +C with bindings for Python 3.5+. + +May be used as a drop in replacement for most other JSON parsers +for Python. diff --git a/textproc/py-ujson/pkg/PLIST b/textproc/py-ujson/pkg/PLIST new file mode 100644 index 000000000..8be39ab08 --- /dev/null +++ b/textproc/py-ujson/pkg/PLIST @@ -0,0 +1,7 @@ +lib/python${MODPY_VERSION}/site-packages/ujson-${MODPY_EGG_VERSION}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/ujson-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt +lib/python${MODPY_VERSION}/site-packages/ujson-${MODPY_EGG_VERSION}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/ujson-${MODPY_EGG_VERSION}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/ujson-${MODPY_EGG_VERSION}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/ujson-${MODPY_EGG_VERSION}.dist-info/top_level.txt +@so lib/python${MODPY_VERSION}/site-packages/ujson.${MODPY_PYC_MAGIC_TAG}so diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile index add716ce2..337853ccc 100644 --- a/textproc/xml2rfc/Makefile +++ b/textproc/xml2rfc/Makefile @@ -1,8 +1,7 @@ COMMENT= convert memos written in XML to the RFC format -MODPY_EGG_VERSION= 3.15.3 +MODPY_EGG_VERSION= 3.18.0 DISTNAME= xml2rfc-${MODPY_EGG_VERSION} -REVISION= 0 CATEGORIES= textproc @@ -15,8 +14,10 @@ MODPY_PI= Yes MODPY_PYBUILD= setuptools MODPY_PYTEST_ARGS= test.py -RUN_DEPENDS= devel/py-appdirs${MODPY_FLAVOR} \ - devel/py-configargparse${MODPY_FLAVOR} \ +# still uses pkg_resources as of 3.18.0 +RUN_DEPENDS= devel/py-setuptools${MODPY_FLAVOR} + +RUN_DEPENDS+= devel/py-configargparse${MODPY_FLAVOR} \ devel/py-country${MODPY_FLAVOR} \ devel/py-html5lib${MODPY_FLAVOR} \ devel/py-intervaltree${MODPY_FLAVOR} \ @@ -25,6 +26,7 @@ RUN_DEPENDS= devel/py-appdirs${MODPY_FLAVOR} \ devel/py-wcwidth${MODPY_FLAVOR} \ devel/pyflakes${MODPY_FLAVOR} \ geo/py-google-i18n-address${MODPY_FLAVOR} \ + sysutils/py-platformdirs${MODPY_FLAVOR} \ textproc/py-MarkupSafe${MODPY_FLAVOR} \ textproc/py-dict2xml${MODPY_FLAVOR} \ textproc/py-lxml${MODPY_FLAVOR} \ @@ -34,6 +36,6 @@ RUN_DEPENDS= devel/py-appdirs${MODPY_FLAVOR} \ TEST_DEPENDS= devel/py-decorator${MODPY_FLAVOR} \ graphics/py-cairo${MODPY_FLAVOR} \ - textproc/py-PyPDF2${MODPY_FLAVOR} + print/py-pypdf${MODPY_FLAVOR} .include <bsd.port.mk> diff --git a/textproc/xml2rfc/distinfo b/textproc/xml2rfc/distinfo index b8fccf045..02d24b35e 100644 --- a/textproc/xml2rfc/distinfo +++ b/textproc/xml2rfc/distinfo @@ -1,2 +1,2 @@ -SHA256 (xml2rfc-3.15.3.tar.gz) = XRwdbwvKp/UyIbX+cSIT1l2KaayExsZLFub4iu5ZV4g= -SIZE (xml2rfc-3.15.3.tar.gz) = 2645561 +SHA256 (xml2rfc-3.18.0.tar.gz) = CsEJi973MBwSPw2akjyX8g2ya10oIaTMCR+2btVIHKo= +SIZE (xml2rfc-3.18.0.tar.gz) = 2645674 diff --git a/textproc/xml2rfc/pkg/PLIST b/textproc/xml2rfc/pkg/PLIST index e957d5db0..943504972 100644 --- a/textproc/xml2rfc/pkg/PLIST +++ b/textproc/xml2rfc/pkg/PLIST @@ -43,8 +43,6 @@ lib/python${MODPY_VERSION}/site-packages/xml2rfc/data/SVG-1.2-RFC.rng lib/python${MODPY_VERSION}/site-packages/xml2rfc/data/Scripts.txt lib/python${MODPY_VERSION}/site-packages/xml2rfc/data/metadata.js lib/python${MODPY_VERSION}/site-packages/xml2rfc/data/metadata.min.js -lib/python${MODPY_VERSION}/site-packages/xml2rfc/data/mt.css -lib/python${MODPY_VERSION}/site-packages/xml2rfc/data/mt.js lib/python${MODPY_VERSION}/site-packages/xml2rfc/data/reference.rnc lib/python${MODPY_VERSION}/site-packages/xml2rfc/data/reference.rng lib/python${MODPY_VERSION}/site-packages/xml2rfc/data/referencegroup.rnc diff --git a/textproc/zathura/plugins/mupdf/Makefile b/textproc/zathura/plugins/mupdf/Makefile index 030ec2dae..d89ef61bd 100644 --- a/textproc/zathura/plugins/mupdf/Makefile +++ b/textproc/zathura/plugins/mupdf/Makefile @@ -1,7 +1,6 @@ -V = 0.4.0 +V = 0.4.1 COMMENT = mupdf pdf plugin for zathura PROJECT = zathura-pdf-mupdf -REVISION = 4 # please check runtime if updating, mupdf linking is Very Annoying diff --git a/textproc/zathura/plugins/mupdf/distinfo b/textproc/zathura/plugins/mupdf/distinfo index b0451c39f..5ce4f9122 100644 --- a/textproc/zathura/plugins/mupdf/distinfo +++ b/textproc/zathura/plugins/mupdf/distinfo @@ -1,2 +1,2 @@ -SHA256 (zathura-pdf-mupdf-0.4.0.tar.xz) = jBxXVnihzUWwB73xIyhSfwrvYYQQPgllRZpCAunukl0= -SIZE (zathura-pdf-mupdf-0.4.0.tar.xz) = 8784 +SHA256 (zathura-pdf-mupdf-0.4.1.tar.xz) = +YKgHWUj+iVmk4EYTAamJe2/15YcvbBxHcz9ucQCrC8= +SIZE (zathura-pdf-mupdf-0.4.1.tar.xz) = 8796 diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 8d06e7d68..18ae8258d 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -6,7 +6,7 @@ DPB_PROPERTIES= parallel parallel2 COMMENT= Chromium browser -V= 117.0.5938.62 +V= 117.0.5938.88 DISTNAME= chromium-${V} diff --git a/www/chromium/distinfo b/www/chromium/distinfo index a36084c86..217d683d9 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,10 +1,10 @@ -SHA256 (chrome-linux-117.0.5938.62-llvm13.profdata.tar.xz) = pUMKotDzAl3Gso6oyvNMkBSqkpkW9kOSs9M17f40LC4= -SHA256 (chromium-117.0.5938.62-testdata.tar.xz) = fZnuxDKmefFUMSSR1XF7VomvmsaZJ9NbZoEsI5n5EUE= -SHA256 (chromium-117.0.5938.62.tar.xz) = i4xpcgjvn+AU3hEsYuvRkmjNbNlDCDhwCvqYXHFRddc= +SHA256 (chrome-linux-117.0.5938.88-llvm13.profdata.tar.xz) = vKZTdUUFIyGeL5bPhR+2uPUSWpn4aI8vcormPRq80Uk= +SHA256 (chromium-117.0.5938.88-testdata.tar.xz) = xSVpl2R7ywWkuCnZnp78+n4bxGtEqf7OtnqRhW7VQIU= +SHA256 (chromium-117.0.5938.88.tar.xz) = RpHYADnkFV0aPEZ27mih5SbdrWGjz1n2XVlqGi1WyQY= SHA256 (libudev-openbsd-20221108-c3330efd.tar.gz) = BBKUTWeCkarFwKZQ+eg9DfekIMr5xi2G4Lce0C43pnc= SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = osopYtr0gqj5QxY1QeHHO6SyaU+rzSUQmB8ttO2kk8g= -SIZE (chrome-linux-117.0.5938.62-llvm13.profdata.tar.xz) = 28703740 -SIZE (chromium-117.0.5938.62-testdata.tar.xz) = 269863964 -SIZE (chromium-117.0.5938.62.tar.xz) = 3135390052 +SIZE (chrome-linux-117.0.5938.88-llvm13.profdata.tar.xz) = 28704844 +SIZE (chromium-117.0.5938.88-testdata.tar.xz) = 269473360 +SIZE (chromium-117.0.5938.88.tar.xz) = 3131921384 SIZE (libudev-openbsd-20221108-c3330efd.tar.gz) = 32757 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/chromium/patches/patch-third_party_libaom_source_libaom_aom_ports_aarch64_cpudetect_c b/www/chromium/patches/patch-third_party_libaom_source_libaom_aom_ports_aarch64_cpudetect_c new file mode 100644 index 000000000..679f631f9 --- /dev/null +++ b/www/chromium/patches/patch-third_party_libaom_source_libaom_aom_ports_aarch64_cpudetect_c @@ -0,0 +1,40 @@ +Index: third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c +--- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig ++++ third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c +@@ -85,13 +85,35 @@ static int arm_get_cpu_caps(void) { + return flags; + } + +-#elif defined(ANDROID_USE_CPU_FEATURES_LIB) ++#elif defined(ANDROID_USE_CPU_FEATURES_LIB) || defined(__FreeBSD__) + + static int arm_get_cpu_caps(void) { + int flags = 0; + #if HAVE_NEON + flags |= HAS_NEON; // Neon is mandatory in Armv8.0-A. + #endif // HAVE_NEON ++ return flags; ++} ++ ++#elif defined(__OpenBSD__) ++#include <sys/sysctl.h> ++#include <machine/cpu.h> ++#include <machine/armreg.h> ++ ++static int arm_get_cpu_caps(void) { ++ int flags = 0; ++ int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; ++ uint64_t cpu_id = 0; ++ size_t len = sizeof(cpu_id); ++ ++ flags |= HAS_NEON; // Neon is mandatory in Armv8.0-A. ++ ++ if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0) ++ return flags; ++ ++ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) ++ flags |= HAS_ARM_CRC32; ++ + return flags; + } + diff --git a/www/chromium/patches/patch-third_party_zlib_BUILD_gn b/www/chromium/patches/patch-third_party_zlib_BUILD_gn index 9430e7a3c..5f11bb946 100644 --- a/www/chromium/patches/patch-third_party_zlib_BUILD_gn +++ b/www/chromium/patches/patch-third_party_zlib_BUILD_gn @@ -1,7 +1,27 @@ Index: third_party/zlib/BUILD.gn --- third_party/zlib/BUILD.gn.orig +++ third_party/zlib/BUILD.gn -@@ -408,7 +408,7 @@ static_library("minizip") { +@@ -127,7 +127,7 @@ if (use_arm_neon_optimizations) { + defines = [ "CRC32_ARMV8_CRC32" ] + if (is_android) { + defines += [ "ARMV8_OS_ANDROID" ] +- } else if (is_linux || is_chromeos) { ++ } else if ((is_linux || is_chromeos) && !is_bsd) { + defines += [ "ARMV8_OS_LINUX" ] + } else if (is_mac) { + defines += [ "ARMV8_OS_MACOS" ] +@@ -137,6 +137,10 @@ if (use_arm_neon_optimizations) { + defines += [ "ARMV8_OS_FUCHSIA" ] + } else if (is_win) { + defines += [ "ARMV8_OS_WINDOWS" ] ++ } else if (is_openbsd) { ++ defines += [ "ARMV8_OS_OPENBSD" ] ++ } else if (is_freebsd) { ++ defines += [ "ARMV8_OS_FREEBSD" ] + } else { + assert(false, "Unsupported ARM OS") + } +@@ -408,7 +412,7 @@ static_library("minizip") { ] } diff --git a/www/chromium/patches/patch-third_party_zlib_cpu_features_c b/www/chromium/patches/patch-third_party_zlib_cpu_features_c new file mode 100644 index 000000000..e5739ca6f --- /dev/null +++ b/www/chromium/patches/patch-third_party_zlib_cpu_features_c @@ -0,0 +1,52 @@ +Index: third_party/zlib/cpu_features.c +--- third_party/zlib/cpu_features.c.orig ++++ third_party/zlib/cpu_features.c +@@ -35,7 +35,8 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; + + #ifndef CPU_NO_SIMD + +-#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) ++#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) || \ ++ defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD) + #include <pthread.h> + #endif + +@@ -52,6 +53,10 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; + #include <windows.h> + #elif defined(ARMV8_OS_IOS) + #include <sys/sysctl.h> ++#elif defined(ARMV8_OS_OPENBSD) ++#include <sys/sysctl.h> ++#include <machine/cpu.h> ++#include <machine/armreg.h> + #elif !defined(_MSC_VER) + #include <pthread.h> + #else +@@ -62,7 +67,8 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; + static void _cpu_check_features(void); + #endif + +-#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) ++#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) || \ ++ defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD) + #if !defined(ARMV8_OS_MACOS) + // _cpu_check_features() doesn't need to do anything on mac/arm since all + // features are known at build time, so don't call it. +@@ -115,6 +121,17 @@ static void _cpu_check_features(void) + unsigned long features = getauxval(AT_HWCAP2); + arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32); + arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL); ++#elif defined(ARMV8_OS_OPENBSD) ++ int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; ++ uint64_t cpu_id = 0; ++ size_t len = sizeof(cpu_id); ++ if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0) ++ return; ++ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_PMULL) ++ arm_cpu_enable_pmull = 1; ++ ++ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) ++ arm_cpu_enable_crc32 = 1; + #elif defined(ARMV8_OS_FUCHSIA) + uint32_t features; + zx_status_t rc = zx_system_get_features(ZX_FEATURE_KIND_CPU, &features); diff --git a/www/chromium/patches/patch-v8_BUILD_gn b/www/chromium/patches/patch-v8_BUILD_gn index dd0d502ce..bed988da8 100644 --- a/www/chromium/patches/patch-v8_BUILD_gn +++ b/www/chromium/patches/patch-v8_BUILD_gn @@ -28,7 +28,20 @@ Index: v8/BUILD.gn } if (v8_enable_builtins_profiling) { -@@ -6081,7 +6094,7 @@ v8_component("v8_libbase") { +@@ -2353,6 +2366,12 @@ template("run_mksnapshot") { + if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { + args += [ "--reorder-builtins" ] + } ++ ++ if (v8_current_cpu == "x86") { ++ args -= [ ++ "--abort-on-bad-builtin-profile-data", ++ ] ++ } + } + + # This is needed to distinguish between generating code for the simulator +@@ -6081,7 +6100,7 @@ v8_component("v8_libbase") { } } @@ -37,7 +50,7 @@ Index: v8/BUILD.gn sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6092,6 +6105,18 @@ v8_component("v8_libbase") { +@@ -6092,6 +6111,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 9da2d3886..2e6b771bd 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -1,7 +1,7 @@ COMMENT= GNOME web browser based on webkit GNOME_PROJECT= epiphany -GNOME_VERSION= 44.6 +GNOME_VERSION= 44.7 CATEGORIES= www diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index 18cb7cbb9..f1ea2db8c 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1,2 +1,2 @@ -SHA256 (epiphany-44.6.tar.xz) = UzXdVzWB22HhJthU3BauUZZXpbh5B4mkfSXkPhfNOkM= -SIZE (epiphany-44.6.tar.xz) = 3994776 +SHA256 (epiphany-44.7.tar.xz) = RPlaNENuPqq3UijKJUUALdveq5MNTJl3A4xomoVdLes= +SIZE (epiphany-44.7.tar.xz) = 3993892 diff --git a/www/iridium/Makefile b/www/iridium/Makefile index f8d524627..ac4353ae9 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -10,8 +10,7 @@ DPB_PROPERTIES+= lonesome COMMENT= Iridium browser -V= 2023.08.116 -REVISION= 1 +V= 2023.09.116.2 DISTNAME= iridium-browser-${V} PKGNAME= iridium-${V} diff --git a/www/iridium/distinfo b/www/iridium/distinfo index b0dfc8a3e..83e4501a5 100644 --- a/www/iridium/distinfo +++ b/www/iridium/distinfo @@ -1,6 +1,6 @@ SHA256 (disable-privacy-sandbox-891b80bbfcdb15e8292143efd1715fa3f30662c4.patch) = 6kv8rIY2xl2JMyNriUKWmaUcd4N/oEhjy0D4x63YM7Q= -SHA256 (iridium-browser-2023.08.116.tar.xz) = 9Zu0hKfrwMEk5HoTATp1IH1qoqax9Jeuv7/Uyz/FtmM= +SHA256 (iridium-browser-2023.09.116.2.tar.xz) = 498JQ6V5gGhkG5SQf3w0eQ0sbInMU3IJ48DM3oHj0DU= SHA256 (libudev-openbsd-20221108-c3330efd.tar.gz) = BBKUTWeCkarFwKZQ+eg9DfekIMr5xi2G4Lce0C43pnc= SIZE (disable-privacy-sandbox-891b80bbfcdb15e8292143efd1715fa3f30662c4.patch) = 3559 -SIZE (iridium-browser-2023.08.116.tar.xz) = 1424290884 +SIZE (iridium-browser-2023.09.116.2.tar.xz) = 1415374360 SIZE (libudev-openbsd-20221108-c3330efd.tar.gz) = 32757 diff --git a/www/iridium/patches/patch-chrome_app_generated_resources_grd b/www/iridium/patches/patch-chrome_app_generated_resources_grd index c5dd54109..0b1bc5b40 100644 --- a/www/iridium/patches/patch-chrome_app_generated_resources_grd +++ b/www/iridium/patches/patch-chrome_app_generated_resources_grd @@ -46,7 +46,7 @@ Index: chrome/app/generated_resources.grd <message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch."> Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. </message> -@@ -9884,7 +9884,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -9902,7 +9902,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW <message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available."> Update </message> @@ -55,7 +55,7 @@ Index: chrome/app/generated_resources.grd <message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available."> Finish update </message> -@@ -10220,7 +10220,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -10238,7 +10238,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW Google Pay </message> @@ -64,7 +64,7 @@ Index: chrome/app/generated_resources.grd <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> Use system title bar and borders </message> -@@ -11193,7 +11193,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -11211,7 +11211,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW </message> <!-- Device Trust Consent dialog --> @@ -73,7 +73,7 @@ Index: chrome/app/generated_resources.grd <message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals."> Share device signals? </message> -@@ -11592,7 +11592,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -11610,7 +11610,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> @@ -82,7 +82,7 @@ Index: chrome/app/generated_resources.grd <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> Minimize </message> -@@ -13784,7 +13784,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -13802,7 +13802,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway </message> diff --git a/www/iridium/patches/patch-chrome_browser_about_flags_cc b/www/iridium/patches/patch-chrome_browser_about_flags_cc index f552b8cdc..26ff3e324 100644 --- a/www/iridium/patches/patch-chrome_browser_about_flags_cc +++ b/www/iridium/patches/patch-chrome_browser_about_flags_cc @@ -71,7 +71,7 @@ Index: chrome/browser/about_flags.cc {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6678,7 +6678,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6682,7 +6682,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kParallelDownloadingDescription, kOsAll, FEATURE_VALUE_TYPE(download::features::kParallelDownloading)}, @@ -80,7 +80,7 @@ Index: chrome/browser/about_flags.cc {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -8368,7 +8368,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8372,7 +8372,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -89,7 +89,7 @@ Index: chrome/browser/about_flags.cc {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8629,7 +8629,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8633,7 +8633,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -98,7 +98,7 @@ Index: chrome/browser/about_flags.cc {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8690,7 +8690,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8694,7 +8694,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -107,7 +107,7 @@ Index: chrome/browser/about_flags.cc { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9258,7 +9258,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9262,7 +9262,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -116,7 +116,7 @@ Index: chrome/browser/about_flags.cc {"document-picture-in-picture-api", flag_descriptions::kDocumentPictureInPictureApiName, flag_descriptions::kDocumentPictureInPictureApiDescription, -@@ -9978,7 +9978,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9982,7 +9982,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)}, @@ -125,7 +125,7 @@ Index: chrome/browser/about_flags.cc {"webui-system-font", flag_descriptions::kWebUiSystemFontName, flag_descriptions::kWebUiSystemFontDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebUiSystemFont)}, -@@ -10163,7 +10163,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10167,7 +10167,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -134,7 +134,7 @@ Index: chrome/browser/about_flags.cc {"data-retention-policies-disable-sync-types-needed", flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName, flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription, -@@ -10571,7 +10571,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10575,7 +10575,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/patches/patch-chrome_browser_flag_descriptions_cc b/www/iridium/patches/patch-chrome_browser_flag_descriptions_cc index 8a0b7b854..2e513855a 100644 --- a/www/iridium/patches/patch-chrome_browser_flag_descriptions_cc +++ b/www/iridium/patches/patch-chrome_browser_flag_descriptions_cc @@ -1,7 +1,7 @@ Index: chrome/browser/flag_descriptions.cc --- chrome/browser/flag_descriptions.cc.orig +++ chrome/browser/flag_descriptions.cc -@@ -2512,7 +2512,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P +@@ -2515,7 +2515,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P const char kWebUIOmniboxPopupDescription[] = "If enabled, shows the omnibox suggestions popup in WebUI."; @@ -10,7 +10,7 @@ Index: chrome/browser/flag_descriptions.cc const char kWebUiSystemFontName[] = "WebUI System font"; const char kWebUiSystemFontDescription[] = "If enabled, all WebUI surfaces will use the default UI font of the " -@@ -6832,7 +6832,7 @@ const char kLibAssistantV2MigrationDescription[] = +@@ -6835,7 +6835,7 @@ const char kLibAssistantV2MigrationDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -19,7 +19,7 @@ Index: chrome/browser/flag_descriptions.cc const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7072,7 +7072,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -7075,7 +7075,7 @@ const char kSearchWebInSidePanelDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -28,7 +28,7 @@ Index: chrome/browser/flag_descriptions.cc const char kQuickCommandsName[] = "Quick Commands"; const char kQuickCommandsDescription[] = "Enable a text interface to browser features. Invoke with Ctrl-Space."; -@@ -7081,7 +7081,7 @@ const char kQuickCommandsDescription[] = +@@ -7084,7 +7084,7 @@ const char kQuickCommandsDescription[] = // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -37,7 +37,7 @@ Index: chrome/browser/flag_descriptions.cc const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7103,7 +7103,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] +@@ -7106,7 +7106,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] "instead of JSON."; #endif @@ -46,7 +46,7 @@ Index: chrome/browser/flag_descriptions.cc const char kUseOutOfProcessVideoDecodingName[] = "Use out-of-process video decoding (OOP-VD)"; const char kUseOutOfProcessVideoDecodingDescription[] = -@@ -7121,7 +7121,7 @@ const char kWebShareDescription[] = +@@ -7124,7 +7124,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -55,7 +55,7 @@ Index: chrome/browser/flag_descriptions.cc const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7141,7 +7141,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7144,7 +7144,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -64,7 +64,7 @@ Index: chrome/browser/flag_descriptions.cc const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -7155,7 +7155,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -7158,7 +7158,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -73,7 +73,7 @@ Index: chrome/browser/flag_descriptions.cc const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -7256,7 +7256,7 @@ const char kElasticOverscrollDescription[] = +@@ -7259,7 +7259,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -82,7 +82,7 @@ Index: chrome/browser/flag_descriptions.cc const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -7285,7 +7285,7 @@ const char kSigninInterceptBubbleV2Description[] = +@@ -7288,7 +7288,7 @@ const char kSigninInterceptBubbleV2Description[] = #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ diff --git a/www/iridium/patches/patch-chrome_browser_flag_descriptions_h b/www/iridium/patches/patch-chrome_browser_flag_descriptions_h index 18eaf92a7..c448cf870 100644 --- a/www/iridium/patches/patch-chrome_browser_flag_descriptions_h +++ b/www/iridium/patches/patch-chrome_browser_flag_descriptions_h @@ -1,7 +1,7 @@ Index: chrome/browser/flag_descriptions.h --- chrome/browser/flag_descriptions.h.orig +++ chrome/browser/flag_descriptions.h -@@ -1412,7 +1412,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd +@@ -1415,7 +1415,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd extern const char kWebUIOmniboxPopupName[]; extern const char kWebUIOmniboxPopupDescription[]; @@ -10,7 +10,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kWebUiSystemFontName[]; extern const char kWebUiSystemFontDescription[]; #endif -@@ -3928,7 +3928,7 @@ extern const char kLacrosMergeIcuDataFileName[]; +@@ -3931,7 +3931,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -19,7 +19,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4058,14 +4058,14 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -4061,14 +4061,14 @@ extern const char kSearchWebInSidePanelDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kWebShareName[]; extern const char kWebShareDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -4075,7 +4075,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4078,7 +4078,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -45,7 +45,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4085,7 +4085,7 @@ extern const char kOzonePlatformHintName[]; +@@ -4088,7 +4088,7 @@ extern const char kOzonePlatformHintName[]; extern const char kOzonePlatformHintDescription[]; #endif // BUILDFLAG(IS_LINUX) @@ -54,7 +54,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4093,13 +4093,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -4096,13 +4096,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -70,7 +70,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4115,7 +4115,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; +@@ -4118,7 +4118,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; extern const char kEnableProtoApiForClassifyUrlDescription[]; #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -79,7 +79,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kUseOutOfProcessVideoDecodingName[]; extern const char kUseOutOfProcessVideoDecodingDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -4189,7 +4189,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -4192,7 +4192,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -88,7 +88,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; -@@ -4207,7 +4207,7 @@ extern const char kSigninInterceptBubbleV2Description[ +@@ -4210,7 +4210,7 @@ extern const char kSigninInterceptBubbleV2Description[ #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ diff --git a/www/iridium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc b/www/iridium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc index 98e60d6b5..d98424dc4 100644 --- a/www/iridium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc +++ b/www/iridium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc @@ -1,7 +1,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc --- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -77,8 +77,10 @@ +@@ -78,8 +78,10 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -13,7 +13,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -107,7 +109,7 @@ +@@ -108,7 +110,7 @@ #include "chromeos/crosapi/cpp/crosapi_constants.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -22,7 +22,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -116,7 +118,7 @@ +@@ -117,7 +119,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -31,7 +31,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc #include "components/power_metrics/system_power_monitor.h" #endif -@@ -538,7 +540,7 @@ void RecordStartupMetrics() { +@@ -539,7 +541,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -40,7 +40,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -812,11 +814,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -860,11 +862,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_h b/www/iridium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_h index 62ec2e747..243942706 100644 --- a/www/iridium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_h +++ b/www/iridium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_h @@ -1,7 +1,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h --- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h -@@ -32,7 +32,7 @@ class PowerMetricsReporter; +@@ -33,7 +33,7 @@ class PowerMetricsReporter; class ProcessMonitor; #endif @@ -10,7 +10,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h class PressureMetricsReporter; #endif // BUILDFLAG(IS_LINUX) -@@ -133,7 +133,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro +@@ -139,7 +139,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro std::unique_ptr<BatteryDischargeReporter> battery_discharge_reporter_; #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/patches/patch-chrome_test_BUILD_gn b/www/iridium/patches/patch-chrome_test_BUILD_gn index 6c644db77..0dc612ebb 100644 --- a/www/iridium/patches/patch-chrome_test_BUILD_gn +++ b/www/iridium/patches/patch-chrome_test_BUILD_gn @@ -1,7 +1,7 @@ Index: chrome/test/BUILD.gn --- chrome/test/BUILD.gn.orig +++ chrome/test/BUILD.gn -@@ -10600,7 +10600,7 @@ test("chrome_app_unittests") { +@@ -10601,7 +10601,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/www/p5-HTML-Selector-XPath/Makefile b/www/p5-HTML-Selector-XPath/Makefile index 8e49a70d0..bbc1a525e 100644 --- a/www/p5-HTML-Selector-XPath/Makefile +++ b/www/p5-HTML-Selector-XPath/Makefile @@ -1,6 +1,6 @@ COMMENT = CSS Selector to XPath compiler -DISTNAME = HTML-Selector-XPath-0.26 +DISTNAME = HTML-Selector-XPath-0.28 CATEGORIES = www diff --git a/www/p5-HTML-Selector-XPath/distinfo b/www/p5-HTML-Selector-XPath/distinfo index 73293a4b4..0bd4c464b 100644 --- a/www/p5-HTML-Selector-XPath/distinfo +++ b/www/p5-HTML-Selector-XPath/distinfo @@ -1,2 +1,2 @@ -SHA256 (HTML-Selector-XPath-0.26.tar.gz) = PfgKgShNHjddnR9v7BbpbDGywwlFG0uoLl/R2yOsHyQ= -SIZE (HTML-Selector-XPath-0.26.tar.gz) = 32482 +SHA256 (HTML-Selector-XPath-0.28.tar.gz) = QycX8D7Szz1kETDP09ShU/Ca1PhW2gB4E3kv4LLljQ8= +SIZE (HTML-Selector-XPath-0.28.tar.gz) = 33565 diff --git a/www/tomcat/v10/Makefile b/www/tomcat/v10/Makefile index 20782630a..fe910582b 100644 --- a/www/tomcat/v10/Makefile +++ b/www/tomcat/v10/Makefile @@ -3,6 +3,6 @@ PKGSPEC-main= tomcat->=10,<11 MAJ_VER= 10 MIN_VER= 1 -MICRO_VER= 11 +MICRO_VER= 13 .include <bsd.port.mk> diff --git a/www/tomcat/v10/distinfo b/www/tomcat/v10/distinfo index c4298b1b7..0f2feab7f 100644 --- a/www/tomcat/v10/distinfo +++ b/www/tomcat/v10/distinfo @@ -1,4 +1,4 @@ -SHA256 (apache-tomcat-10.1.11-fulldocs.tar.gz) = pHuhjNYulVi/khnewNxrzVCzh2Ez3vb7OyYeLdd6h28= -SHA256 (apache-tomcat-10.1.11.tar.gz) = VDirW7guq4BqDya4zq/bRexmUZsyRWewUrfKip5jFKw= -SIZE (apache-tomcat-10.1.11-fulldocs.tar.gz) = 8864127 -SIZE (apache-tomcat-10.1.11.tar.gz) = 12146928 +SHA256 (apache-tomcat-10.1.13-fulldocs.tar.gz) = RuXuqgXNndB28WqrSsmapgM+JcTxQzC6AsToOBzJeVo= +SHA256 (apache-tomcat-10.1.13.tar.gz) = vaRw+/ka0IDKBDwMCS0uM06cFH3ta/HlFBiT+XEBxSw= +SIZE (apache-tomcat-10.1.13-fulldocs.tar.gz) = 8960302 +SIZE (apache-tomcat-10.1.13.tar.gz) = 12377776 diff --git a/www/tomcat/v10/pkg/PLIST-examples b/www/tomcat/v10/pkg/PLIST-examples index 0bb244893..7c7d20e65 100644 --- a/www/tomcat/v10/pkg/PLIST-examples +++ b/www/tomcat/v10/pkg/PLIST-examples @@ -83,6 +83,14 @@ webapps/docs/annotationapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/annotationapi/jquery/jszip/dist/ webapps/docs/annotationapi/jquery/jszip/dist/jszip.js webapps/docs/annotationapi/jquery/jszip/dist/jszip.min.js +webapps/docs/annotationapi/legal/ +webapps/docs/annotationapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/annotationapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/annotationapi/legal/LICENSE +webapps/docs/annotationapi/legal/jquery.md +webapps/docs/annotationapi/legal/jqueryUI.md +webapps/docs/annotationapi/legal/jszip.md +webapps/docs/annotationapi/legal/pako.md webapps/docs/annotationapi/member-search-index.js webapps/docs/annotationapi/member-search-index.zip webapps/docs/annotationapi/overview-summary.html @@ -125,6 +133,14 @@ webapps/docs/api/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/api/jquery/jszip/dist/ webapps/docs/api/jquery/jszip/dist/jszip.js webapps/docs/api/jquery/jszip/dist/jszip.min.js +webapps/docs/api/legal/ +webapps/docs/api/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/api/legal/ASSEMBLY_EXCEPTION +webapps/docs/api/legal/LICENSE +webapps/docs/api/legal/jquery.md +webapps/docs/api/legal/jqueryUI.md +webapps/docs/api/legal/jszip.md +webapps/docs/api/legal/pako.md webapps/docs/api/member-search-index.js webapps/docs/api/member-search-index.zip webapps/docs/api/org/ @@ -1660,6 +1676,7 @@ webapps/docs/api/org/apache/tomcat/util/collections/package-tree.html webapps/docs/api/org/apache/tomcat/util/compat/ webapps/docs/api/org/apache/tomcat/util/compat/Jre19Compat.html webapps/docs/api/org/apache/tomcat/util/compat/Jre21Compat.html +webapps/docs/api/org/apache/tomcat/util/compat/Jre22Compat.html webapps/docs/api/org/apache/tomcat/util/compat/JreCompat.html webapps/docs/api/org/apache/tomcat/util/compat/JrePlatform.html webapps/docs/api/org/apache/tomcat/util/compat/JreVendor.html @@ -2276,6 +2293,14 @@ webapps/docs/elapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/elapi/jquery/jszip/dist/ webapps/docs/elapi/jquery/jszip/dist/jszip.js webapps/docs/elapi/jquery/jszip/dist/jszip.min.js +webapps/docs/elapi/legal/ +webapps/docs/elapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/elapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/elapi/legal/LICENSE +webapps/docs/elapi/legal/jquery.md +webapps/docs/elapi/legal/jqueryUI.md +webapps/docs/elapi/legal/jszip.md +webapps/docs/elapi/legal/pako.md webapps/docs/elapi/member-search-index.js webapps/docs/elapi/member-search-index.zip webapps/docs/elapi/overview-tree.html @@ -2395,6 +2420,14 @@ webapps/docs/jaspicapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/jaspicapi/jquery/jszip/dist/ webapps/docs/jaspicapi/jquery/jszip/dist/jszip.js webapps/docs/jaspicapi/jquery/jszip/dist/jszip.min.js +webapps/docs/jaspicapi/legal/ +webapps/docs/jaspicapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/jaspicapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/jaspicapi/legal/LICENSE +webapps/docs/jaspicapi/legal/jquery.md +webapps/docs/jaspicapi/legal/jqueryUI.md +webapps/docs/jaspicapi/legal/jszip.md +webapps/docs/jaspicapi/legal/pako.md webapps/docs/jaspicapi/member-search-index.js webapps/docs/jaspicapi/member-search-index.zip webapps/docs/jaspicapi/overview-summary.html @@ -2505,6 +2538,14 @@ webapps/docs/jspapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/jspapi/jquery/jszip/dist/ webapps/docs/jspapi/jquery/jszip/dist/jszip.js webapps/docs/jspapi/jquery/jszip/dist/jszip.min.js +webapps/docs/jspapi/legal/ +webapps/docs/jspapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/jspapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/jspapi/legal/LICENSE +webapps/docs/jspapi/legal/jquery.md +webapps/docs/jspapi/legal/jqueryUI.md +webapps/docs/jspapi/legal/jszip.md +webapps/docs/jspapi/legal/pako.md webapps/docs/jspapi/member-search-index.js webapps/docs/jspapi/member-search-index.zip webapps/docs/jspapi/overview-summary.html @@ -2652,6 +2693,14 @@ webapps/docs/servletapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/servletapi/jquery/jszip/dist/ webapps/docs/servletapi/jquery/jszip/dist/jszip.js webapps/docs/servletapi/jquery/jszip/dist/jszip.min.js +webapps/docs/servletapi/legal/ +webapps/docs/servletapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/servletapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/servletapi/legal/LICENSE +webapps/docs/servletapi/legal/jquery.md +webapps/docs/servletapi/legal/jqueryUI.md +webapps/docs/servletapi/legal/jszip.md +webapps/docs/servletapi/legal/pako.md webapps/docs/servletapi/member-search-index.js webapps/docs/servletapi/member-search-index.zip webapps/docs/servletapi/overview-summary.html @@ -2766,6 +2815,14 @@ webapps/docs/websocketapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/websocketapi/jquery/jszip/dist/ webapps/docs/websocketapi/jquery/jszip/dist/jszip.js webapps/docs/websocketapi/jquery/jszip/dist/jszip.min.js +webapps/docs/websocketapi/legal/ +webapps/docs/websocketapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/websocketapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/websocketapi/legal/LICENSE +webapps/docs/websocketapi/legal/jquery.md +webapps/docs/websocketapi/legal/jqueryUI.md +webapps/docs/websocketapi/legal/jszip.md +webapps/docs/websocketapi/legal/pako.md webapps/docs/websocketapi/member-search-index.js webapps/docs/websocketapi/member-search-index.zip webapps/docs/websocketapi/overview-summary.html diff --git a/www/tomcat/v8/Makefile b/www/tomcat/v8/Makefile index af35775af..7d903eff4 100644 --- a/www/tomcat/v8/Makefile +++ b/www/tomcat/v8/Makefile @@ -3,6 +3,6 @@ PKGSPEC-main= tomcat->=8,<9 MAJ_VER= 8 MIN_VER= 5 -MICRO_VER= 91 +MICRO_VER= 93 .include <bsd.port.mk> diff --git a/www/tomcat/v8/distinfo b/www/tomcat/v8/distinfo index 9d85190fd..60b2fa26d 100644 --- a/www/tomcat/v8/distinfo +++ b/www/tomcat/v8/distinfo @@ -1,4 +1,4 @@ -SHA256 (apache-tomcat-8.5.91-fulldocs.tar.gz) = ssB9+QhIO1ogNbM72wkG7vGGu1EvLQo9WIKSrWPzzYU= -SHA256 (apache-tomcat-8.5.91.tar.gz) = ymZZ4lPB+cx6sjqlOP2wOB2X6QD32sMF4+LiCootvk0= -SIZE (apache-tomcat-8.5.91-fulldocs.tar.gz) = 8467199 -SIZE (apache-tomcat-8.5.91.tar.gz) = 10730552 +SHA256 (apache-tomcat-8.5.93-fulldocs.tar.gz) = eRt7NAJEG7Nx8SzuDjU0QGptzzGXmF2mjYwcuzVu8tY= +SHA256 (apache-tomcat-8.5.93.tar.gz) = thSso2WW9hJz399MzmI9B4Yk/zNfc0NjwpXuJ1Q/feY= +SIZE (apache-tomcat-8.5.93-fulldocs.tar.gz) = 8567775 +SIZE (apache-tomcat-8.5.93.tar.gz) = 10736621 diff --git a/www/tomcat/v8/pkg/PLIST-examples b/www/tomcat/v8/pkg/PLIST-examples index e5b576fbb..0e32ac22a 100644 --- a/www/tomcat/v8/pkg/PLIST-examples +++ b/www/tomcat/v8/pkg/PLIST-examples @@ -81,6 +81,14 @@ webapps/docs/annotationapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/annotationapi/jquery/jszip/dist/ webapps/docs/annotationapi/jquery/jszip/dist/jszip.js webapps/docs/annotationapi/jquery/jszip/dist/jszip.min.js +webapps/docs/annotationapi/legal/ +webapps/docs/annotationapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/annotationapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/annotationapi/legal/LICENSE +webapps/docs/annotationapi/legal/jquery.md +webapps/docs/annotationapi/legal/jqueryUI.md +webapps/docs/annotationapi/legal/jszip.md +webapps/docs/annotationapi/legal/pako.md webapps/docs/annotationapi/member-search-index.js webapps/docs/annotationapi/member-search-index.zip webapps/docs/annotationapi/overview-summary.html @@ -123,6 +131,14 @@ webapps/docs/api/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/api/jquery/jszip/dist/ webapps/docs/api/jquery/jszip/dist/jszip.js webapps/docs/api/jquery/jszip/dist/jszip.min.js +webapps/docs/api/legal/ +webapps/docs/api/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/api/legal/ASSEMBLY_EXCEPTION +webapps/docs/api/legal/LICENSE +webapps/docs/api/legal/jquery.md +webapps/docs/api/legal/jqueryUI.md +webapps/docs/api/legal/jszip.md +webapps/docs/api/legal/pako.md webapps/docs/api/member-search-index.js webapps/docs/api/member-search-index.zip webapps/docs/api/org/ @@ -857,6 +873,7 @@ webapps/docs/api/org/apache/catalina/util/Strftime.html webapps/docs/api/org/apache/catalina/util/SystemPropertyReplacerListener.html webapps/docs/api/org/apache/catalina/util/TLSUtil.html webapps/docs/api/org/apache/catalina/util/TimeBucketCounter.html +webapps/docs/api/org/apache/catalina/util/ToStringUtil.html webapps/docs/api/org/apache/catalina/util/TomcatCSS.html webapps/docs/api/org/apache/catalina/util/URLEncoder.html webapps/docs/api/org/apache/catalina/util/XMLWriter.html @@ -2301,6 +2318,14 @@ webapps/docs/elapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/elapi/jquery/jszip/dist/ webapps/docs/elapi/jquery/jszip/dist/jszip.js webapps/docs/elapi/jquery/jszip/dist/jszip.min.js +webapps/docs/elapi/legal/ +webapps/docs/elapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/elapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/elapi/legal/LICENSE +webapps/docs/elapi/legal/jquery.md +webapps/docs/elapi/legal/jqueryUI.md +webapps/docs/elapi/legal/jszip.md +webapps/docs/elapi/legal/pako.md webapps/docs/elapi/member-search-index.js webapps/docs/elapi/member-search-index.zip webapps/docs/elapi/overview-tree.html @@ -2420,6 +2445,14 @@ webapps/docs/jaspicapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/jaspicapi/jquery/jszip/dist/ webapps/docs/jaspicapi/jquery/jszip/dist/jszip.js webapps/docs/jaspicapi/jquery/jszip/dist/jszip.min.js +webapps/docs/jaspicapi/legal/ +webapps/docs/jaspicapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/jaspicapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/jaspicapi/legal/LICENSE +webapps/docs/jaspicapi/legal/jquery.md +webapps/docs/jaspicapi/legal/jqueryUI.md +webapps/docs/jaspicapi/legal/jszip.md +webapps/docs/jaspicapi/legal/pako.md webapps/docs/jaspicapi/member-search-index.js webapps/docs/jaspicapi/member-search-index.zip webapps/docs/jaspicapi/overview-summary.html @@ -2528,6 +2561,14 @@ webapps/docs/jspapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/jspapi/jquery/jszip/dist/ webapps/docs/jspapi/jquery/jszip/dist/jszip.js webapps/docs/jspapi/jquery/jszip/dist/jszip.min.js +webapps/docs/jspapi/legal/ +webapps/docs/jspapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/jspapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/jspapi/legal/LICENSE +webapps/docs/jspapi/legal/jquery.md +webapps/docs/jspapi/legal/jqueryUI.md +webapps/docs/jspapi/legal/jszip.md +webapps/docs/jspapi/legal/pako.md webapps/docs/jspapi/member-search-index.js webapps/docs/jspapi/member-search-index.zip webapps/docs/jspapi/overview-summary.html @@ -2672,6 +2713,14 @@ webapps/docs/servletapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/servletapi/jquery/jszip/dist/ webapps/docs/servletapi/jquery/jszip/dist/jszip.js webapps/docs/servletapi/jquery/jszip/dist/jszip.min.js +webapps/docs/servletapi/legal/ +webapps/docs/servletapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/servletapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/servletapi/legal/LICENSE +webapps/docs/servletapi/legal/jquery.md +webapps/docs/servletapi/legal/jqueryUI.md +webapps/docs/servletapi/legal/jszip.md +webapps/docs/servletapi/legal/pako.md webapps/docs/servletapi/member-search-index.js webapps/docs/servletapi/member-search-index.zip webapps/docs/servletapi/overview-summary.html @@ -2786,6 +2835,14 @@ webapps/docs/websocketapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/websocketapi/jquery/jszip/dist/ webapps/docs/websocketapi/jquery/jszip/dist/jszip.js webapps/docs/websocketapi/jquery/jszip/dist/jszip.min.js +webapps/docs/websocketapi/legal/ +webapps/docs/websocketapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/websocketapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/websocketapi/legal/LICENSE +webapps/docs/websocketapi/legal/jquery.md +webapps/docs/websocketapi/legal/jqueryUI.md +webapps/docs/websocketapi/legal/jszip.md +webapps/docs/websocketapi/legal/pako.md webapps/docs/websocketapi/member-search-index.js webapps/docs/websocketapi/member-search-index.zip webapps/docs/websocketapi/overview-summary.html diff --git a/www/tomcat/v9/Makefile b/www/tomcat/v9/Makefile index f1f8f6a80..e83aeb4f9 100644 --- a/www/tomcat/v9/Makefile +++ b/www/tomcat/v9/Makefile @@ -3,6 +3,6 @@ PKGSPEC-main= tomcat->=9,<10 MAJ_VER= 9 MIN_VER= 0 -MICRO_VER= 78 +MICRO_VER= 80 .include <bsd.port.mk> diff --git a/www/tomcat/v9/distinfo b/www/tomcat/v9/distinfo index cf08b5b3a..891399b4d 100644 --- a/www/tomcat/v9/distinfo +++ b/www/tomcat/v9/distinfo @@ -1,4 +1,4 @@ -SHA256 (apache-tomcat-9.0.78-fulldocs.tar.gz) = f6f9yOk3MUotTxpJqDAw5uDTGMvQN+GX+6G4gavqTWU= -SHA256 (apache-tomcat-9.0.78.tar.gz) = sTCUTdLKkFgvJ/mCjiqc0y6AWb3zm+1TZz9e2srH6Ko= -SIZE (apache-tomcat-9.0.78-fulldocs.tar.gz) = 8653266 -SIZE (apache-tomcat-9.0.78.tar.gz) = 11684406 +SHA256 (apache-tomcat-9.0.80-fulldocs.tar.gz) = KqxlJfn9i/f2zINUxYSR0SbwJYwGzTGtTfqafkHfA/M= +SHA256 (apache-tomcat-9.0.80.tar.gz) = dv9omIUXh9kIl8y4ITAu//KX7L0LN0TV4HzIH6ce5cs= +SIZE (apache-tomcat-9.0.80-fulldocs.tar.gz) = 8750485 +SIZE (apache-tomcat-9.0.80.tar.gz) = 11692853 diff --git a/www/tomcat/v9/pkg/PLIST-examples b/www/tomcat/v9/pkg/PLIST-examples index fe9673a32..de6a3318f 100644 --- a/www/tomcat/v9/pkg/PLIST-examples +++ b/www/tomcat/v9/pkg/PLIST-examples @@ -81,6 +81,14 @@ webapps/docs/annotationapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/annotationapi/jquery/jszip/dist/ webapps/docs/annotationapi/jquery/jszip/dist/jszip.js webapps/docs/annotationapi/jquery/jszip/dist/jszip.min.js +webapps/docs/annotationapi/legal/ +webapps/docs/annotationapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/annotationapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/annotationapi/legal/LICENSE +webapps/docs/annotationapi/legal/jquery.md +webapps/docs/annotationapi/legal/jqueryUI.md +webapps/docs/annotationapi/legal/jszip.md +webapps/docs/annotationapi/legal/pako.md webapps/docs/annotationapi/member-search-index.js webapps/docs/annotationapi/member-search-index.zip webapps/docs/annotationapi/overview-summary.html @@ -123,6 +131,14 @@ webapps/docs/api/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/api/jquery/jszip/dist/ webapps/docs/api/jquery/jszip/dist/jszip.js webapps/docs/api/jquery/jszip/dist/jszip.min.js +webapps/docs/api/legal/ +webapps/docs/api/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/api/legal/ASSEMBLY_EXCEPTION +webapps/docs/api/legal/LICENSE +webapps/docs/api/legal/jquery.md +webapps/docs/api/legal/jqueryUI.md +webapps/docs/api/legal/jszip.md +webapps/docs/api/legal/pako.md webapps/docs/api/member-search-index.js webapps/docs/api/member-search-index.zip webapps/docs/api/org/ @@ -1708,6 +1724,7 @@ webapps/docs/api/org/apache/tomcat/util/collections/package-tree.html webapps/docs/api/org/apache/tomcat/util/compat/ webapps/docs/api/org/apache/tomcat/util/compat/Jre19Compat.html webapps/docs/api/org/apache/tomcat/util/compat/Jre21Compat.html +webapps/docs/api/org/apache/tomcat/util/compat/Jre22Compat.html webapps/docs/api/org/apache/tomcat/util/compat/JreCompat.html webapps/docs/api/org/apache/tomcat/util/compat/JrePlatform.html webapps/docs/api/org/apache/tomcat/util/compat/JreVendor.html @@ -2339,6 +2356,14 @@ webapps/docs/elapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/elapi/jquery/jszip/dist/ webapps/docs/elapi/jquery/jszip/dist/jszip.js webapps/docs/elapi/jquery/jszip/dist/jszip.min.js +webapps/docs/elapi/legal/ +webapps/docs/elapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/elapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/elapi/legal/LICENSE +webapps/docs/elapi/legal/jquery.md +webapps/docs/elapi/legal/jqueryUI.md +webapps/docs/elapi/legal/jszip.md +webapps/docs/elapi/legal/pako.md webapps/docs/elapi/member-search-index.js webapps/docs/elapi/member-search-index.zip webapps/docs/elapi/overview-tree.html @@ -2458,6 +2483,14 @@ webapps/docs/jaspicapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/jaspicapi/jquery/jszip/dist/ webapps/docs/jaspicapi/jquery/jszip/dist/jszip.js webapps/docs/jaspicapi/jquery/jszip/dist/jszip.min.js +webapps/docs/jaspicapi/legal/ +webapps/docs/jaspicapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/jaspicapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/jaspicapi/legal/LICENSE +webapps/docs/jaspicapi/legal/jquery.md +webapps/docs/jaspicapi/legal/jqueryUI.md +webapps/docs/jaspicapi/legal/jszip.md +webapps/docs/jaspicapi/legal/pako.md webapps/docs/jaspicapi/member-search-index.js webapps/docs/jaspicapi/member-search-index.zip webapps/docs/jaspicapi/overview-summary.html @@ -2566,6 +2599,14 @@ webapps/docs/jspapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/jspapi/jquery/jszip/dist/ webapps/docs/jspapi/jquery/jszip/dist/jszip.js webapps/docs/jspapi/jquery/jszip/dist/jszip.min.js +webapps/docs/jspapi/legal/ +webapps/docs/jspapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/jspapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/jspapi/legal/LICENSE +webapps/docs/jspapi/legal/jquery.md +webapps/docs/jspapi/legal/jqueryUI.md +webapps/docs/jspapi/legal/jszip.md +webapps/docs/jspapi/legal/pako.md webapps/docs/jspapi/member-search-index.js webapps/docs/jspapi/member-search-index.zip webapps/docs/jspapi/overview-summary.html @@ -2715,6 +2756,14 @@ webapps/docs/servletapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/servletapi/jquery/jszip/dist/ webapps/docs/servletapi/jquery/jszip/dist/jszip.js webapps/docs/servletapi/jquery/jszip/dist/jszip.min.js +webapps/docs/servletapi/legal/ +webapps/docs/servletapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/servletapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/servletapi/legal/LICENSE +webapps/docs/servletapi/legal/jquery.md +webapps/docs/servletapi/legal/jqueryUI.md +webapps/docs/servletapi/legal/jszip.md +webapps/docs/servletapi/legal/pako.md webapps/docs/servletapi/member-search-index.js webapps/docs/servletapi/member-search-index.zip webapps/docs/servletapi/overview-summary.html @@ -2829,6 +2878,14 @@ webapps/docs/websocketapi/jquery/jszip-utils/dist/jszip-utils.min.js webapps/docs/websocketapi/jquery/jszip/dist/ webapps/docs/websocketapi/jquery/jszip/dist/jszip.js webapps/docs/websocketapi/jquery/jszip/dist/jszip.min.js +webapps/docs/websocketapi/legal/ +webapps/docs/websocketapi/legal/ADDITIONAL_LICENSE_INFO +webapps/docs/websocketapi/legal/ASSEMBLY_EXCEPTION +webapps/docs/websocketapi/legal/LICENSE +webapps/docs/websocketapi/legal/jquery.md +webapps/docs/websocketapi/legal/jqueryUI.md +webapps/docs/websocketapi/legal/jszip.md +webapps/docs/websocketapi/legal/pako.md webapps/docs/websocketapi/member-search-index.js webapps/docs/websocketapi/member-search-index.zip webapps/docs/websocketapi/overview-summary.html diff --git a/www/twill/Makefile b/www/twill/Makefile index 8736822e3..ca31a42bb 100644 --- a/www/twill/Makefile +++ b/www/twill/Makefile @@ -1,9 +1,8 @@ COMMENT= simple scripting language for web browsing -MODPY_EGG_VERSION= 3.0.2 +MODPY_EGG_VERSION= 3.1 DISTNAME= twill-${MODPY_EGG_VERSION} CATEGORIES= www -REVISION= 1 HOMEPAGE= https://twill-tools.github.io/twill/ @@ -11,20 +10,23 @@ HOMEPAGE= https://twill-tools.github.io/twill/ PERMIT_PACKAGE= Yes MODULES= lang/python + MODPY_PYBUILD = setuptools MODPY_PI= Yes -# needs unported wsgi_intercept -MODPY_PYTEST_ARGS= --ignore tests/test_wsgi_intercept.py - -BUILD_DEPENDS= textproc/py-sphinx${MODPY_FLAVOR} USE_GMAKE= Yes -RUN_DEPENDS= textproc/py-lxml${MODPY_FLAVOR}>=4.6,<5 \ - www/py-requests${MODPY_FLAVOR}>=2.25,<3 \ - devel/py-parsing${MODPY_FLAVOR}>=2.4,<4 +# needs unported wsgi_intercept and pytidylib +MODPY_PYTEST_ARGS= --ignore tests/test_wsgi_intercept.py \ + --ignore tests/test_tidy.py -TEST_DEPENDS= www/py-quixote${MODPY_FLAVOR} +BUILD_DEPENDS= textproc/py-sphinx${MODPY_FLAVOR} + +RUN_DEPENDS= textproc/py-lxml${MODPY_FLAVOR}>=4.9,<5 \ + www/py-requests${MODPY_FLAVOR}>=2.27,<3 \ + devel/py-parsing${MODPY_FLAVOR}>=3.0,<4 + +TEST_DEPENDS= www/py-quixote${MODPY_FLAVOR}>=3.6,<4 post-build: cd ${WRKSRC}/docs && ${MAKE_PROGRAM} man diff --git a/www/twill/distinfo b/www/twill/distinfo index d51a2d3fc..387cf9b5d 100644 --- a/www/twill/distinfo +++ b/www/twill/distinfo @@ -1,2 +1,2 @@ -SHA256 (twill-3.0.2.tar.gz) = dWtrdkiR1+IBfeF9jwbOjKE2UMXDJji0iOb+USbY7zk= -SIZE (twill-3.0.2.tar.gz) = 75779 +SHA256 (twill-3.1.tar.gz) = tWcZRvBvkRyQ7gD5zjocBzFVlzQ0Mhf1unF3gUkhB94= +SIZE (twill-3.1.tar.gz) = 82442 diff --git a/www/twill/pkg/PLIST b/www/twill/pkg/PLIST index c9be76661..bbdfef7a5 100644 --- a/www/twill/pkg/PLIST +++ b/www/twill/pkg/PLIST @@ -15,6 +15,8 @@ lib/python${MODPY_VERSION}/site-packages/twill/${MODPY_PYCACHE}__init__.${MODPY_ lib/python${MODPY_VERSION}/site-packages/twill/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/twill/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/twill/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/twill/${MODPY_PYCACHE}agents.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/twill/${MODPY_PYCACHE}agents.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/twill/${MODPY_PYCACHE}browser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/twill/${MODPY_PYCACHE}browser.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/twill/${MODPY_PYCACHE}commands.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} @@ -33,6 +35,7 @@ lib/python${MODPY_VERSION}/site-packages/twill/${MODPY_PYCACHE}unit.${MODPY_PYC_ lib/python${MODPY_VERSION}/site-packages/twill/${MODPY_PYCACHE}unit.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/twill/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/twill/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/twill/agents.py lib/python${MODPY_VERSION}/site-packages/twill/browser.py lib/python${MODPY_VERSION}/site-packages/twill/commands.py lib/python${MODPY_VERSION}/site-packages/twill/errors.py diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index c97215f1d..8f9a513ee 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -7,7 +7,7 @@ DPB_PROPERTIES= parallel parallel2 COMMENT= Chromium browser sans integration with Google -V= 116.0.5845.187 +V= 117.0.5938.62 UGV= ${V}-1 DISTNAME= ungoogled-chromium-${V} @@ -194,7 +194,7 @@ PKG_ARGS+= -Dswiftshader=0 .endif FFMPEG_BRAND= Chrome -FFMPEG_BDIR= ${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.openbsd/${FFMPEG_BRAND} +FFMPEG_BDIR= ${WRKSRC}/build.${FFMPEG_TARGET}.openbsd/${FFMPEG_BRAND} FFMPEG_CDIR= ${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/openbsd/${FFMPEG_TARGET} GN_ARGS+= ffmpeg_branding=\"${FFMPEG_BRAND}\" \ @@ -278,7 +278,7 @@ pre-configure: # 3. run gn with the appropriate configuration arguments do-configure: # Regenerate build and perlasm files (force json to not overwrite our local gn patches) - @cd ${WRKSRC}/third_party/boringssl && ${MODPY_BIN} src/util/generate_build_files.py json + # @cd ${WRKSRC}/third_party/boringssl && ${MODPY_BIN} src/util/generate_build_files.py json @cd ${WRKSRC} && env -i ${MAKE_ENV} build/linux/unbundle/replace_gn_files.py \ --system-libraries ${GN_SYSTEM_LIBS} @cd ${WRKSRC}/tools/gn && env -i ${MAKE_ENV} LDFLAGS=-L${LOCALBASE}/lib ${MODPY_BIN} bootstrap/bootstrap.py \ diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index 1b0c5099a..6d63050b7 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,10 +1,10 @@ -SHA256 (chromium-116.0.5845.187-testdata.tar.xz) = P+bvkKDtZBiPWcU7L5Opzmekh6xszZk+FRRrVOg6fyI= -SHA256 (chromium-116.0.5845.187.tar.xz) = USq4Kp3F8regzh6RVvwQBUAsFfHWVUdcXc+MiXj2VJQ= +SHA256 (chromium-117.0.5938.62-testdata.tar.xz) = fZnuxDKmefFUMSSR1XF7VomvmsaZJ9NbZoEsI5n5EUE= +SHA256 (chromium-117.0.5938.62.tar.xz) = i4xpcgjvn+AU3hEsYuvRkmjNbNlDCDhwCvqYXHFRddc= SHA256 (libudev-openbsd-20221108-c3330efd.tar.gz) = BBKUTWeCkarFwKZQ+eg9DfekIMr5xi2G4Lce0C43pnc= SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = osopYtr0gqj5QxY1QeHHO6SyaU+rzSUQmB8ttO2kk8g= -SHA256 (ungoogled-chromium-116.0.5845.187-1.tar.gz) = QKt1jgbTK7ZbPwRhZbJozyBCOPy5G+Nal58sgfbOLYg= -SIZE (chromium-116.0.5845.187-testdata.tar.xz) = 268453988 -SIZE (chromium-116.0.5845.187.tar.xz) = 1599648000 +SHA256 (ungoogled-chromium-117.0.5938.62-1.tar.gz) = i3UJhwDmrbveCpWfR5XBoHEcrdjmiNXiQE82IRLgcy0= +SIZE (chromium-117.0.5938.62-testdata.tar.xz) = 269863964 +SIZE (chromium-117.0.5938.62.tar.xz) = 3135390052 SIZE (libudev-openbsd-20221108-c3330efd.tar.gz) = 32757 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 -SIZE (ungoogled-chromium-116.0.5845.187-1.tar.gz) = 673674 +SIZE (ungoogled-chromium-117.0.5938.62-1.tar.gz) = 651902 diff --git a/www/ungoogled-chromium/patches/patch-BUILD_gn b/www/ungoogled-chromium/patches/patch-BUILD_gn index 3a4188ed6..e71f2bcb0 100644 --- a/www/ungoogled-chromium/patches/patch-BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-BUILD_gn @@ -43,7 +43,7 @@ Index: BUILD.gn if (is_mac) { deps += [ "//third_party/breakpad:dump_syms", -@@ -660,7 +668,7 @@ group("gn_all") { +@@ -663,7 +671,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -52,16 +52,16 @@ Index: BUILD.gn deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1084,7 +1092,7 @@ if (!is_ios && !is_cronet_build) { +@@ -1087,7 +1095,7 @@ if (!is_ios && !is_cronet_build) { ] } - if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) { + if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) { - # WPT Webdriver tests runner - # chrome/test/chromedriver/test/run_webdriver_tests.py script_test("webdriver_wpt_tests") { -@@ -1188,7 +1196,7 @@ if (!is_ios && !is_cronet_build) { + script = "//third_party/blink/tools/run_wpt_tests.py" + args = [ +@@ -1177,7 +1185,7 @@ if (!is_ios && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -70,7 +70,7 @@ Index: BUILD.gn data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1197,7 +1205,7 @@ if (!is_ios && !is_cronet_build) { +@@ -1186,7 +1194,7 @@ if (!is_ios && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -79,7 +79,7 @@ Index: BUILD.gn data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1671,7 +1679,7 @@ group("chromium_builder_perf") { +@@ -1646,7 +1654,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/ungoogled-chromium/patches/patch-ash_display_mirror_window_controller_cc b/www/ungoogled-chromium/patches/patch-ash_display_mirror_window_controller_cc index c8fa1c02d..e7ac31ab6 100644 --- a/www/ungoogled-chromium/patches/patch-ash_display_mirror_window_controller_cc +++ b/www/ungoogled-chromium/patches/patch-ash_display_mirror_window_controller_cc @@ -1,7 +1,7 @@ Index: ash/display/mirror_window_controller.cc --- ash/display/mirror_window_controller.cc.orig +++ ash/display/mirror_window_controller.cc -@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow( +@@ -294,7 +294,11 @@ void MirrorWindowController::UpdateWindow( if (!base::Contains(display_info_list, iter->first, &display::ManagedDisplayInfo::id)) { CloseAndDeleteHost(iter->second, true); diff --git a/www/ungoogled-chromium/patches/patch-base_BUILD_gn b/www/ungoogled-chromium/patches/patch-base_BUILD_gn index 8e30c18b1..99779412b 100644 --- a/www/ungoogled-chromium/patches/patch-base_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-base_BUILD_gn @@ -10,7 +10,7 @@ Index: base/BUILD.gn buildflag_header("message_pump_buildflags") { header = "message_pump_buildflags.h" header_dir = "base/message_loop" -@@ -1150,11 +1150,23 @@ component("base") { +@@ -1112,11 +1112,23 @@ component("base") { # Needed for <atomic> 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. @@ -33,18 +33,9 @@ Index: base/BUILD.gn + } + if (use_allocator_shim) { - sources += [ - "allocator/partition_allocator/shim/allocator_shim.cc", -@@ -1185,7 +1197,7 @@ component("base") { - ] - configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] - } -- if (is_chromeos || is_linux) { -+ if (is_chromeos || (is_linux && !is_bsd)) { - sources += [ - "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h", - "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h", -@@ -1226,7 +1238,7 @@ component("base") { + if (is_apple) { + sources += [ "allocator/early_zone_registration_mac.h" ] +@@ -1133,7 +1145,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -53,31 +44,10 @@ Index: base/BUILD.gn defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2185,6 +2197,43 @@ component("base") { - } +@@ -2075,6 +2087,22 @@ component("base") { + ] } -+ if (is_bsd) { -+ sources -= [ -+ "files/file_path_watcher_inotify.cc", -+ "files/scoped_file_linux.cc", -+ "process/process_linux.cc", -+ "system/sys_info_linux.cc", -+ "process/process_iterator_linux.cc", -+ "process/process_metrics_linux.cc", -+ "process/process_handle_linux.cc", -+ "profiler/stack_copier_signal.cc", -+ "profiler/stack_copier_signal.h", -+ "profiler/thread_delegate_posix.cc", -+ "profiler/thread_delegate_posix.h", -+ ] -+ sources += [ -+ "files/file_path_watcher_kqueue.cc", -+ "files/file_path_watcher_kqueue.h", -+ "files/file_path_watcher_bsd.cc", -+ ] -+ } -+ + if (is_openbsd) { + sources += [ + "process/process_handle_openbsd.cc", @@ -97,7 +67,37 @@ Index: base/BUILD.gn # iOS if (is_ios) { sources += [ -@@ -2285,7 +2334,7 @@ component("base") { +@@ -2207,6 +2235,29 @@ component("base") { + } + } + ++ if (is_bsd) { ++ sources -= [ ++ "files/file_path_watcher_inotify.cc", ++ "files/scoped_file_linux.cc", ++ "system/sys_info_linux.cc", ++ "process/process_iterator_linux.cc", ++ "process/process_linux.cc", ++ "process/process_metrics_linux.cc", ++ "process/process_handle_linux.cc", ++ "profiler/stack_copier_signal.cc", ++ "profiler/stack_copier_signal.h", ++ "profiler/thread_delegate_posix.cc", ++ "profiler/thread_delegate_posix.h", ++ "threading/platform_thread_linux.cc", ++ ] ++ sources += [ ++ "files/file_path_watcher_kqueue.cc", ++ "files/file_path_watcher_kqueue.h", ++ "files/file_path_watcher_bsd.cc", ++ "threading/platform_thread_bsd.cc", ++ ] ++ } ++ + if (use_blink) { + sources += [ + "files/file_path_watcher.cc", +@@ -2217,7 +2268,7 @@ component("base") { } if (dep_libevent) { @@ -106,7 +106,7 @@ Index: base/BUILD.gn } if (use_libevent) { -@@ -3619,7 +3668,7 @@ test("base_unittests") { +@@ -3587,7 +3638,7 @@ test("base_unittests") { ] } @@ -115,7 +115,7 @@ Index: base/BUILD.gn sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3640,7 +3689,7 @@ test("base_unittests") { +@@ -3608,7 +3659,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -124,7 +124,7 @@ Index: base/BUILD.gn sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3651,7 +3700,7 @@ test("base_unittests") { +@@ -3619,7 +3670,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -133,7 +133,7 @@ Index: base/BUILD.gn defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3907,7 +3956,7 @@ test("base_unittests") { +@@ -3871,7 +3922,7 @@ test("base_unittests") { } } diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_BUILD_gn b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_BUILD_gn new file mode 100644 index 000000000..24bcde0ac --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_BUILD_gn @@ -0,0 +1,12 @@ +Index: base/allocator/partition_allocator/BUILD.gn +--- base/allocator/partition_allocator/BUILD.gn.orig ++++ base/allocator/partition_allocator/BUILD.gn +@@ -541,7 +541,7 @@ source_set("allocator_shim") { + ] + configs += [ ":mac_no_default_new_delete_symbols" ] + } +- if (is_chromeos || is_linux) { ++ if ((is_chromeos || is_linux) && !is_bsd) { + sources += [ + "shim/allocator_shim_override_cpp_symbols.h", + "shim/allocator_shim_override_glibc_weak_symbols.h", diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_address_space_randomization_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_address_space_randomization_h index 3d4951c1c..aace20ea8 100644 --- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_address_space_randomization_h +++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_address_space_randomization_h @@ -6,7 +6,7 @@ Index: base/allocator/partition_allocator/address_space_randomization.h #if defined(ARCH_CPU_64_BITS) - #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) -+ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !defined(OS_BSD) ++ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !BUILDFLAG(IS_BSD) // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_constants_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_constants_h index 7e85cd40a..adc62b546 100644 --- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_constants_h +++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_constants_h @@ -10,7 +10,7 @@ Index: base/allocator/partition_allocator/page_allocator_constants.h // This should work for all POSIX (if needed), but currently all other // supported OS/architecture combinations use either hard-coded values // (such as x86) or have means to determine these values without needing -@@ -81,7 +81,7 @@ PageAllocationGranularityShift() { +@@ -92,7 +92,7 @@ PageAllocationGranularityShift() { return 14; // 16kB #elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS) return static_cast<size_t>(vm_page_shift); @@ -19,7 +19,7 @@ Index: base/allocator/partition_allocator/page_allocator_constants.h // arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16) // page sizes. Retrieve from or initialize cache. size_t shift = page_characteristics.shift.load(std::memory_order_relaxed); -@@ -102,7 +102,7 @@ PageAllocationGranularity() { +@@ -113,7 +113,7 @@ PageAllocationGranularity() { // This is literally equivalent to |1 << PageAllocationGranularityShift()| // below, but was separated out for IS_APPLE to avoid << on a non-constexpr. return vm_page_size; @@ -28,7 +28,7 @@ Index: base/allocator/partition_allocator/page_allocator_constants.h // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or // initialize cache. size_t size = page_characteristics.size.load(std::memory_order_relaxed); -@@ -141,7 +141,7 @@ SystemPageShift() { +@@ -152,7 +152,7 @@ SystemPageShift() { PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t SystemPageSize() { #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_h index 5f72f6cb1..15777984e 100644 --- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_h +++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_h @@ -1,7 +1,7 @@ Index: base/allocator/partition_allocator/page_allocator.h --- base/allocator/partition_allocator/page_allocator.h.orig +++ base/allocator/partition_allocator/page_allocator.h -@@ -245,7 +245,7 @@ void DecommitAndZeroSystemPages(void* address, size_t +@@ -258,7 +258,7 @@ void DecommitAndZeroSystemPages(void* address, // recommitted. Do not assume that this will not change over time. constexpr PA_COMPONENT_EXPORT( PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_internals_posix_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_internals_posix_h index 5932908c3..27e451bbb 100644 --- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_internals_posix_h +++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_page_allocator_internals_posix_h @@ -1,7 +1,7 @@ Index: base/allocator/partition_allocator/page_allocator_internals_posix.h --- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -396,8 +396,12 @@ bool TryRecommitSystemPagesInternal( +@@ -403,8 +403,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast<void*>(address); diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_rand_util_posix_cc b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_rand_util_posix_cc index 8e90973de..d1e2bbcfe 100644 --- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_rand_util_posix_cc +++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_base_rand_util_posix_cc @@ -1,7 +1,7 @@ Index: base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc --- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig +++ base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc -@@ -86,6 +86,10 @@ void RandBytes(void* output, size_t output_length) { +@@ -90,6 +90,10 @@ void RandBytes(void* output, size_t output_length) { if (getentropy(output, output_length) == 0) { return; } @@ -10,5 +10,5 @@ Index: base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.c + return; + } #endif - - // If the OS-specific mechanisms didn't work, fall through to reading from + // If getrandom(2) above returned with an error and the /dev/urandom fallback + // took place on Linux/ChromeOS bots, they would fail with a CHECK in diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_config_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_config_h index d48ab9707..bec0b5e4f 100644 --- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_config_h +++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_config_h @@ -10,7 +10,7 @@ Index: base/allocator/partition_allocator/partition_alloc_config.h // On some platforms, we implement locking by spinning in userspace, then going // into the kernel only if there is contention. This requires platform support, -@@ -234,7 +234,7 @@ constexpr bool kUseLazyCommit = false; +@@ -236,7 +236,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() \ @@ -19,7 +19,7 @@ Index: base/allocator/partition_allocator/partition_alloc_config.h // PartitionAlloc uses PartitionRootEnumerator to acquire all // PartitionRoots at BeforeFork and to release at AfterFork. -@@ -279,7 +279,7 @@ constexpr bool kUseLazyCommit = false; +@@ -283,7 +283,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/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_constants_h b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_constants_h index a2e738496..1560b2b12 100644 --- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_constants_h +++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_constants_h @@ -1,7 +1,7 @@ Index: base/allocator/partition_allocator/partition_alloc_constants.h --- base/allocator/partition_allocator/partition_alloc_constants.h.orig +++ base/allocator/partition_allocator/partition_alloc_constants.h -@@ -92,7 +92,7 @@ PartitionPageShift() { +@@ -95,7 +95,7 @@ PartitionPageShift() { return 18; // 256 KiB } #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ @@ -10,7 +10,7 @@ Index: base/allocator/partition_allocator/partition_alloc_constants.h PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t PartitionPageShift() { return PageAllocationGranularityShift() + 2; -@@ -294,7 +294,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; +@@ -297,7 +297,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) || \ diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_gni b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_gni index dee6ea203..fa3f1dfb3 100644 --- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_gni +++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_gni @@ -1,7 +1,7 @@ Index: base/allocator/partition_allocator/partition_alloc.gni --- base/allocator/partition_allocator/partition_alloc.gni.orig +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -317,7 +317,7 @@ declare_args() { +@@ -332,7 +332,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. diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_root_cc b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_root_cc index 569c8c6f9..4fc16a244 100644 --- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_root_cc +++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_root_cc @@ -10,7 +10,7 @@ Index: base/allocator/partition_allocator/partition_root.cc #include <pthread.h> #endif -@@ -284,7 +284,7 @@ void PartitionAllocMallocInitOnce() { +@@ -280,7 +280,7 @@ void PartitionAllocMallocInitOnce() { return; } @@ -19,7 +19,7 @@ Index: base/allocator/partition_allocator/partition_root.cc // 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. -@@ -376,7 +376,7 @@ static size_t PartitionPurgeSlotSpan(internal::SlotSpa +@@ -372,7 +372,7 @@ static size_t PartitionPurgeSlotSpan(internal::SlotSpa constexpr size_t kMaxSlotCount = (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / MinPurgeableSlotSize(); @@ -28,7 +28,7 @@ Index: base/allocator/partition_allocator/partition_root.cc // 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 opts) { +@@ -849,7 +849,7 @@ void PartitionRoot::Init(PartitionOptions opts) { // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_starscan_stack_stack_cc b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_starscan_stack_stack_cc index 80b1f6725..973811ebf 100644 --- a/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_starscan_stack_stack_cc +++ b/www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_starscan_stack_stack_cc @@ -5,7 +5,7 @@ Index: base/allocator/partition_allocator/starscan/stack/stack.cc #include <pthread.h> #endif -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include <pthread_np.h> +#endif + diff --git a/www/ungoogled-chromium/patches/patch-base_base_switches_cc b/www/ungoogled-chromium/patches/patch-base_base_switches_cc index 275f33522..5a18b6de6 100644 --- a/www/ungoogled-chromium/patches/patch-base_base_switches_cc +++ b/www/ungoogled-chromium/patches/patch-base_base_switches_cc @@ -1,7 +1,7 @@ Index: base/base_switches.cc --- base/base_switches.cc.orig +++ base/base_switches.cc -@@ -167,7 +167,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria +@@ -162,7 +162,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria #endif diff --git a/www/ungoogled-chromium/patches/patch-base_base_switches_h b/www/ungoogled-chromium/patches/patch-base_base_switches_h index 0e3fe0568..fb69b363b 100644 --- a/www/ungoogled-chromium/patches/patch-base_base_switches_h +++ b/www/ungoogled-chromium/patches/patch-base_base_switches_h @@ -1,7 +1,7 @@ Index: base/base_switches.h --- base/base_switches.h.orig +++ base/base_switches.h -@@ -57,7 +57,7 @@ extern const char kEnableIdleTracing[]; +@@ -56,7 +56,7 @@ extern const char kEnableIdleTracing[]; extern const char kForceFieldTrialParams[]; #endif diff --git a/www/ungoogled-chromium/patches/patch-base_debug_elf_reader_cc b/www/ungoogled-chromium/patches/patch-base_debug_elf_reader_cc index 5711dc722..647620cd4 100644 --- a/www/ungoogled-chromium/patches/patch-base_debug_elf_reader_cc +++ b/www/ungoogled-chromium/patches/patch-base_debug_elf_reader_cc @@ -5,7 +5,7 @@ Index: base/debug/elf_reader.cc bool found = false; while (current_section < section_end) { current_note = reinterpret_cast<const Nhdr*>(current_section); -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) if (current_note->n_type == NT_GNU_BUILD_ID) { StringPiece note_name(current_section + sizeof(Nhdr), current_note->n_namesz); diff --git a/www/ungoogled-chromium/patches/patch-base_debug_stack_trace_posix_cc b/www/ungoogled-chromium/patches/patch-base_debug_stack_trace_posix_cc index 9405b3178..32befb562 100644 --- a/www/ungoogled-chromium/patches/patch-base_debug_stack_trace_posix_cc +++ b/www/ungoogled-chromium/patches/patch-base_debug_stack_trace_posix_cc @@ -19,7 +19,53 @@ Index: base/debug/stack_trace_posix.cc #include "base/debug/proc_maps_linux.h" #endif -@@ -798,6 +798,9 @@ class SandboxSymbolizeHelper { +@@ -300,7 +300,7 @@ void PrintToStderr(const char* output) { + std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output))); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) { + // We have seen rare cases on AMD linux where the default signal handler + // either does not run or a thread (Probably an AMD driver thread) prevents +@@ -317,7 +317,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v + "Warning: Default signal handler failed to terminate process.\n"); + PrintToStderr("Calling exit_group() directly to prevent timeout.\n"); + // See: https://man7.org/linux/man-pages/man2/exit_group.2.html ++#if BUILDFLAG(IS_BSD) ++ _exit(EXIT_FAILURE); ++#else + syscall(SYS_exit_group, EXIT_FAILURE); ++#endif + } + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || + // BUILDFLAG(IS_CHROMEOS) +@@ -534,7 +538,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf + _exit(EXIT_FAILURE); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Set an alarm to trigger in case the default handler does not terminate + // the process. See 'AlarmSignalHandler' for more details. + struct sigaction action; +@@ -559,6 +563,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf + // signals that do not re-raise autonomously), such as signals delivered via + // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would + // otherwise be lost when re-raising the signal via raise(). ++#if !BUILDFLAG(IS_BSD) + long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid), + info->si_signo, info); + if (retval == 0) { +@@ -573,6 +578,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf + if (errno != EPERM) { + _exit(EXIT_FAILURE); + } ++#endif + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || + // BUILDFLAG(IS_CHROMEOS) + +@@ -821,6 +827,9 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -29,7 +75,7 @@ Index: base/debug/stack_trace_posix.cc // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -815,6 +818,7 @@ class SandboxSymbolizeHelper { +@@ -838,6 +847,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; diff --git a/www/ungoogled-chromium/patches/patch-base_files_file_path_watcher_unittest_cc b/www/ungoogled-chromium/patches/patch-base_files_file_path_watcher_unittest_cc index 0dce92373..10d78b417 100644 --- a/www/ungoogled-chromium/patches/patch-base_files_file_path_watcher_unittest_cc +++ b/www/ungoogled-chromium/patches/patch-base_files_file_path_watcher_unittest_cc @@ -1,30 +1,30 @@ Index: base/files/file_path_watcher_unittest.cc --- base/files/file_path_watcher_unittest.cc.orig +++ base/files/file_path_watcher_unittest.cc -@@ -479,7 +479,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { - VLOG(1) << "Waiting for file1 creation"; - ASSERT_TRUE(WaitForEvent()); +@@ -586,7 +586,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { + } + delegate.RunUntilEventsMatch(event_expecter); -#if !BUILDFLAG(IS_APPLE) -+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) - // Mac implementation does not detect files modified in a directory. ++#if !BUILDFLAG(IS_APPLE) && BUILDFLAG(IS_BSD) ASSERT_TRUE(WriteFile(file1, "content v2")); - VLOG(1) << "Waiting for file1 modification"; -@@ -1281,7 +1281,7 @@ enum Permission { - Execute - }; + // Mac implementation does not detect files modified in a directory. + // TODO(https://crbug.com/1432064): Expect that no events are fired on Mac. +@@ -1525,7 +1525,7 @@ namespace { + + enum Permission { Read, Write, Execute }; -#if BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -1312,7 +1312,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi - } - #endif // BUILDFLAG(IS_APPLE) +@@ -1559,7 +1559,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi + + } // namespace -#if BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_APPLE) && BUILDFLAG(IS_BSD) // Linux implementation of FilePathWatcher doesn't catch attribute changes. // http://crbug.com/78043 // Windows implementation of FilePathWatcher catches attribute changes that diff --git a/www/ungoogled-chromium/patches/patch-base_i18n_icu_util_cc b/www/ungoogled-chromium/patches/patch-base_i18n_icu_util_cc index ae9872b2d..34d84ba5d 100644 --- a/www/ungoogled-chromium/patches/patch-base_i18n_icu_util_cc +++ b/www/ungoogled-chromium/patches/patch-base_i18n_icu_util_cc @@ -10,7 +10,7 @@ Index: base/i18n/icu_util.cc BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -340,7 +340,7 @@ void InitializeIcuTimeZone() { +@@ -345,7 +345,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); diff --git a/www/ungoogled-chromium/patches/patch-base_linux_util_cc b/www/ungoogled-chromium/patches/patch-base_linux_util_cc index 6284ccf5f..cf21f61b2 100644 --- a/www/ungoogled-chromium/patches/patch-base_linux_util_cc +++ b/www/ungoogled-chromium/patches/patch-base_linux_util_cc @@ -13,7 +13,7 @@ Index: base/linux_util.cc } bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + return false; +#else // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 diff --git a/www/ungoogled-chromium/patches/patch-base_process_process_metrics_h b/www/ungoogled-chromium/patches/patch-base_process_process_metrics_h index 47f5f9630..bb6675552 100644 --- a/www/ungoogled-chromium/patches/patch-base_process_process_metrics_h +++ b/www/ungoogled-chromium/patches/patch-base_process_process_metrics_h @@ -1,7 +1,7 @@ Index: base/process/process_metrics.h --- base/process/process_metrics.h.orig +++ base/process/process_metrics.h -@@ -38,7 +38,7 @@ +@@ -37,7 +37,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -10,16 +10,16 @@ Index: base/process/process_metrics.h #include <string> #include <utility> #include <vector> -@@ -53,7 +53,7 @@ struct IoCounters; - - class ProcessMetricsAppleInternal; +@@ -50,7 +50,7 @@ namespace base { + // Full declaration is in process_metrics_iocounters.h. + struct IoCounters; -#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. // -@@ -108,7 +108,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); @@ -28,7 +28,7 @@ Index: base/process/process_metrics.h // 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; -@@ -166,7 +166,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -163,7 +163,7 @@ class BASE_EXPORT ProcessMetrics { #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -37,7 +37,7 @@ Index: base/process/process_metrics.h // 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 -@@ -226,7 +226,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -223,7 +223,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // BUILDFLAG(IS_POSIX) @@ -46,7 +46,7 @@ Index: base/process/process_metrics.h // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; -@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -244,7 +244,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -74,7 +74,7 @@ Index: base/process/process_metrics.h // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -313,7 +311,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -316,7 +314,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) || \ @@ -83,7 +83,7 @@ Index: base/process/process_metrics.h // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -348,7 +346,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -351,7 +349,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -92,7 +92,7 @@ Index: base/process/process_metrics.h // 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 -@@ -363,7 +361,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -366,7 +364,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -101,7 +101,7 @@ Index: base/process/process_metrics.h int buffers = 0; int cached = 0; int active_anon = 0; -@@ -400,7 +398,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -403,7 +401,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -110,7 +110,7 @@ Index: base/process/process_metrics.h // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -588,7 +586,7 @@ class BASE_EXPORT SystemMetrics { +@@ -591,7 +589,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/ungoogled-chromium/patches/patch-base_process_process_metrics_openbsd_cc b/www/ungoogled-chromium/patches/patch-base_process_process_metrics_openbsd_cc index edb589f2a..7221b52ef 100644 --- a/www/ungoogled-chromium/patches/patch-base_process_process_metrics_openbsd_cc +++ b/www/ungoogled-chromium/patches/patch-base_process_process_metrics_openbsd_cc @@ -84,13 +84,14 @@ Index: base/process/process_metrics_openbsd.cc size_t GetSystemCommitCharge() { int mib[] = { CTL_VM, VM_METER }; int pagesize; -@@ -84,6 +67,129 @@ size_t GetSystemCommitCharge() { +@@ -84,6 +67,133 @@ size_t GetSystemCommitCharge() { pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); +} + +int ProcessMetrics::GetOpenFdCount() const { ++#if 0 + struct kinfo_file *files; + kvm_t *kd = NULL; + int total_count = 0; @@ -109,10 +110,13 @@ Index: base/process/process_metrics_openbsd.cc + +out: + return total_count; ++#endif ++ return getdtablecount(); +} + +int ProcessMetrics::GetOpenFdSoftLimit() const { -+ return GetMaxFds(); ++ return getdtablesize(); ++// return GetMaxFds(); +} + +uint64_t ProcessMetrics::GetVmSwapBytes() const { diff --git a/www/ungoogled-chromium/patches/patch-base_process_process_posix_cc b/www/ungoogled-chromium/patches/patch-base_process_process_posix_cc index 58cd0e50e..3d560d4df 100644 --- a/www/ungoogled-chromium/patches/patch-base_process_process_posix_cc +++ b/www/ungoogled-chromium/patches/patch-base_process_process_posix_cc @@ -10,7 +10,7 @@ Index: base/process/process_posix.cc #include <sys/event.h> #endif -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include <sys/types.h> +#include <sys/sysctl.h> +#endif @@ -36,21 +36,21 @@ Index: base/process/process_posix.cc // On Mac we can wait on non child processes. return WaitForSingleNonChildProcess(handle, timeout); #else -@@ -387,7 +392,55 @@ void Process::Exited(int exit_code) const { +@@ -387,7 +392,56 @@ void Process::Exited(int exit_code) const { - int Process::GetPriority() const { + int Process::GetOSPriority() const { DCHECK(IsValid()); +// avoid pledge(2) violation -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + return 0; +#else return getpriority(PRIO_PROCESS, static_cast<id_t>(process_)); +#endif -+} + } + +Time Process::CreationTime() const { +// avoid ps pledge in the network process -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), + sizeof(struct kinfo_proc), 0 }; + struct kinfo_proc *info = nullptr; @@ -58,7 +58,7 @@ Index: base/process/process_posix.cc +#endif + Time ct = Time(); + -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) + if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0) + goto out; + @@ -78,17 +78,18 @@ Index: base/process/process_posix.cc + return ct; +} + -+bool Process::IsProcessBackgrounded() const { ++#if BUILDFLAG(IS_BSD) ++Process::Priority Process::GetPriority() const { ++ return Priority::kUserBlocking; ++} ++ ++bool Process::SetPriority(Priority priority) { + return false; +} -+ -+bool Process::SetProcessBackgrounded(bool value) { ++ ++bool Process::CanSetPriority() { + return false; +} -+ -+// static -+bool Process::CanBackgroundProcesses() { -+ return false; - } ++#endif } // namespace base diff --git a/www/ungoogled-chromium/patches/patch-base_profiler_module_cache_cc b/www/ungoogled-chromium/patches/patch-base_profiler_module_cache_cc index dc369c5e4..50ab0d511 100644 --- a/www/ungoogled-chromium/patches/patch-base_profiler_module_cache_cc +++ b/www/ungoogled-chromium/patches/patch-base_profiler_module_cache_cc @@ -1,7 +1,7 @@ Index: base/profiler/module_cache.cc --- base/profiler/module_cache.cc.orig +++ base/profiler/module_cache.cc -@@ -37,7 +37,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri +@@ -52,7 +52,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri // Android and Linux Chrome builds use the "breakpad" format to index their // build id, so we transform the build id for these platforms. All other // platforms keep their symbols indexed by the original build ID. diff --git a/www/ungoogled-chromium/patches/patch-base_system_sys_info_cc b/www/ungoogled-chromium/patches/patch-base_system_sys_info_cc index eaed515a8..42cf5bda4 100644 --- a/www/ungoogled-chromium/patches/patch-base_system_sys_info_cc +++ b/www/ungoogled-chromium/patches/patch-base_system_sys_info_cc @@ -1,7 +1,7 @@ Index: base/system/sys_info.cc --- base/system/sys_info.cc.orig +++ base/system/sys_info.cc -@@ -155,7 +155,7 @@ std::string SysInfo::HardwareModelName() { +@@ -166,7 +166,7 @@ std::string SysInfo::HardwareModelName() { #endif void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) { diff --git a/www/ungoogled-chromium/patches/patch-base_system_sys_info_h b/www/ungoogled-chromium/patches/patch-base_system_sys_info_h index 448cb9eee..71685d16b 100644 --- a/www/ungoogled-chromium/patches/patch-base_system_sys_info_h +++ b/www/ungoogled-chromium/patches/patch-base_system_sys_info_h @@ -1,7 +1,7 @@ Index: base/system/sys_info.h --- base/system/sys_info.h.orig +++ base/system/sys_info.h -@@ -261,6 +261,8 @@ class BASE_EXPORT SysInfo { +@@ -264,6 +264,8 @@ class BASE_EXPORT SysInfo { static void ResetCpuSecurityMitigationsEnabledForTesting(); #endif @@ -10,7 +10,7 @@ Index: base/system/sys_info.h private: friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); -@@ -273,7 +275,7 @@ class BASE_EXPORT SysInfo { +@@ -276,7 +278,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/ungoogled-chromium/patches/patch-base_test_test_file_util_linux_cc b/www/ungoogled-chromium/patches/patch-base_test_test_file_util_linux_cc index 2c729089b..1cc827c77 100644 --- a/www/ungoogled-chromium/patches/patch-base_test_test_file_util_linux_cc +++ b/www/ungoogled-chromium/patches/patch-base_test_test_file_util_linux_cc @@ -5,7 +5,7 @@ Index: base/test/test_file_util_linux.cc return false; if (fdatasync(fd.get()) != 0) return false; -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0) return false; +#endif diff --git a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_bsd_cc b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_bsd_cc new file mode 100644 index 000000000..07d576387 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_bsd_cc @@ -0,0 +1,35 @@ +Index: base/threading/platform_thread_bsd.cc +--- base/threading/platform_thread_bsd.cc.orig ++++ base/threading/platform_thread_bsd.cc +@@ -0,0 +1,31 @@ ++// Copyright 2023 The Chromium Authors ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++// Description: These are stubs for *BSD. ++ ++#include "base/threading/platform_thread.h" ++ ++namespace base { ++namespace internal { ++ ++bool CanSetThreadTypeToRealtimeAudio() { ++ return false; ++} ++ ++bool SetCurrentThreadTypeForPlatform(ThreadType thread_type, ++ MessagePumpType pump_type_hint) { ++ return false; ++} ++ ++absl::optional<ThreadPriorityForTest> ++GetCurrentThreadPriorityForPlatformForTest() { ++ return absl::nullopt; ++} ++} // namespace internal ++ ++// static ++void PlatformThreadBase::SetName(const std::string& name) { ++ SetNameCommon(name); ++} ++ ++} // namespace base diff --git a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_internal_posix_cc b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_internal_posix_cc new file mode 100644 index 000000000..fbd7bf218 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_internal_posix_cc @@ -0,0 +1,12 @@ +Index: base/threading/platform_thread_internal_posix.cc +--- base/threading/platform_thread_internal_posix.cc.orig ++++ base/threading/platform_thread_internal_posix.cc +@@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest + } + + int GetCurrentThreadNiceValue() { +-#if BUILDFLAG(IS_NACL) ++#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) + NOTIMPLEMENTED(); + return 0; + #else diff --git a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_linux_cc b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_linux_cc deleted file mode 100644 index 5b35622da..000000000 --- a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_linux_cc +++ /dev/null @@ -1,85 +0,0 @@ -Index: base/threading/platform_thread_linux.cc ---- base/threading/platform_thread_linux.cc.orig -+++ base/threading/platform_thread_linux.cc -@@ -30,7 +30,9 @@ - - #if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) - #include <pthread.h> -+#if !BUILDFLAG(IS_BSD) - #include <sys/prctl.h> -+#endif - #include <sys/resource.h> - #include <sys/time.h> - #include <sys/types.h> -@@ -139,7 +141,7 @@ long sched_setattr(pid_t pid, - #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) - #endif // BUILDFLAG(IS_CHROMEOS) - --#if !BUILDFLAG(IS_NACL) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - const FilePath::CharType kCgroupDirectory[] = - FILE_PATH_LITERAL("/sys/fs/cgroup"); - -@@ -313,7 +315,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th - namespace internal { - - namespace { --#if !BUILDFLAG(IS_NACL) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - const struct sched_param kRealTimePrio = {8}; - #endif - } // namespace -@@ -340,7 +342,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue - }; - - bool CanSetThreadTypeToRealtimeAudio() { --#if !BUILDFLAG(IS_NACL) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke - // pthread_setschedparam in SetCurrentThreadTypeForPlatform(). - struct rlimit rlim; -@@ -352,7 +354,7 @@ bool CanSetThreadTypeToRealtimeAudio() { - - bool SetCurrentThreadTypeForPlatform(ThreadType thread_type, - MessagePumpType pump_type_hint) { --#if !BUILDFLAG(IS_NACL) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - const PlatformThreadId tid = PlatformThread::CurrentId(); - - if (g_thread_type_delegate && -@@ -378,7 +380,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread - - absl::optional<ThreadPriorityForTest> - GetCurrentThreadPriorityForPlatformForTest() { --#if !BUILDFLAG(IS_NACL) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - int maybe_sched_rr = 0; - struct sched_param maybe_realtime_prio = {0}; - if (pthread_getschedparam(pthread_self(), &maybe_sched_rr, -@@ -397,7 +399,7 @@ GetCurrentThreadPriorityForPlatformForTest() { - void PlatformThread::SetName(const std::string& name) { - ThreadIdNameManager::GetInstance()->SetName(name); - --#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) && !BUILDFLAG(IS_BSD) - // On linux we can get the thread names to show up in the debugger by setting - // the process name for the LWP. We don't want to do this for the main - // thread because that would rename the process, causing tools like killall -@@ -417,7 +419,7 @@ void PlatformThread::SetName(const std::string& name) - #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) - } - --#if !BUILDFLAG(IS_NACL) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - // static - void PlatformThread::SetThreadTypeDelegate(ThreadTypeDelegate* delegate) { - // A component cannot override a delegate set by another component, thus -@@ -428,7 +430,7 @@ void PlatformThread::SetThreadTypeDelegate(ThreadTypeD - } - #endif - --#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) && !BUILDFLAG(IS_BSD) - // static - void PlatformThread::SetThreadType(ProcessId process_id, - PlatformThreadId thread_id, diff --git a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_posix_cc b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_posix_cc index b17f4584b..4c3dcaa54 100644 --- a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_posix_cc +++ b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_posix_cc @@ -1,7 +1,7 @@ Index: base/threading/platform_thread_posix.cc --- base/threading/platform_thread_posix.cc.orig +++ base/threading/platform_thread_posix.cc -@@ -76,7 +76,7 @@ void* ThreadFunc(void* params) { +@@ -76,12 +76,12 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::DisallowSingleton(); @@ -10,6 +10,21 @@ Index: base/threading/platform_thread_posix.cc partition_alloc::internal::PCScan::NotifyThreadCreated( partition_alloc::internal::GetStackPointer()); #endif + +-#if !BUILDFLAG(IS_NACL) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_APPLE) + PlatformThread::SetCurrentThreadRealtimePeriodValue( + delegate->GetRealtimePeriod()); +@@ -353,7 +353,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t + + // static + bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) { +-#if BUILDFLAG(IS_NACL) ++#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) + return false; + #else + if (from >= to) { @@ -374,6 +374,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, MessagePumpType pump_type_hint) { #if BUILDFLAG(IS_NACL) @@ -20,3 +35,12 @@ Index: base/threading/platform_thread_posix.cc #else if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) return; +@@ -396,7 +399,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, + + // static + ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() { +-#if BUILDFLAG(IS_NACL) ++#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) + NOTIMPLEMENTED(); + return ThreadPriorityForTest::kNormal; + #else diff --git a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_unittest_cc b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_unittest_cc index d1c979310..2752cd985 100644 --- a/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_unittest_cc +++ b/www/ungoogled-chromium/patches/patch-base_threading_platform_thread_unittest_cc @@ -19,7 +19,7 @@ Index: base/threading/platform_thread_unittest.cc // 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; -@@ -698,12 +698,16 @@ INSTANTIATE_TEST_SUITE_P( +@@ -695,12 +695,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) diff --git a/www/ungoogled-chromium/patches/patch-base_trace_event_malloc_dump_provider_cc b/www/ungoogled-chromium/patches/patch-base_trace_event_malloc_dump_provider_cc index f77131519..d58acef3f 100644 --- a/www/ungoogled-chromium/patches/patch-base_trace_event_malloc_dump_provider_cc +++ b/www/ungoogled-chromium/patches/patch-base_trace_event_malloc_dump_provider_cc @@ -5,7 +5,7 @@ Index: base/trace_event/malloc_dump_provider.cc #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> -+#elif defined(OS_BSD) ++#elif BUILDFLAG(IS_BSD) +#include <stdlib.h> #else #include <malloc.h> @@ -23,7 +23,7 @@ Index: base/trace_event/malloc_dump_provider.cc &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. -+#elif defined(OS_BSD) ++#elif BUILDFLAG(IS_BSD) + total_virtual_size = 0; + allocated_objects_size = 0; #else diff --git a/www/ungoogled-chromium/patches/patch-base_trace_event_trace_log_cc b/www/ungoogled-chromium/patches/patch-base_trace_event_trace_log_cc new file mode 100644 index 000000000..57a237add --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-base_trace_event_trace_log_cc @@ -0,0 +1,17 @@ +Index: base/trace_event/trace_log.cc +--- base/trace_event/trace_log.cc.orig ++++ base/trace_event/trace_log.cc +@@ -2187,8 +2187,13 @@ void TraceLog::SetTraceBufferForTesting( + #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY) + void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) { + AutoLock lock(track_event_lock_); ++#if defined(__clang__) && (__clang_major__ >= 16) + track_event_sessions_.emplace_back(args.internal_instance_index, *args.config, + args.backend_type); ++#else ++ track_event_sessions_.emplace_back(TrackEventSession{args.internal_instance_index, *args.config, ++ args.backend_type}); ++#endif + } + + void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) { diff --git a/www/ungoogled-chromium/patches/patch-build_config_compiler_BUILD_gn b/www/ungoogled-chromium/patches/patch-build_config_compiler_BUILD_gn index d52f9b9e8..95110bf8d 100644 --- a/www/ungoogled-chromium/patches/patch-build_config_compiler_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-build_config_compiler_BUILD_gn @@ -1,7 +1,7 @@ Index: build/config/compiler/BUILD.gn --- build/config/compiler/BUILD.gn.orig +++ build/config/compiler/BUILD.gn -@@ -249,13 +249,16 @@ config("default_include_dirs") { +@@ -248,13 +248,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") { @@ -19,7 +19,7 @@ Index: build/config/compiler/BUILD.gn } # compiler --------------------------------------------------------------------- -@@ -500,6 +503,10 @@ config("compiler") { +@@ -499,6 +502,10 @@ config("compiler") { } } @@ -30,7 +30,7 @@ Index: build/config/compiler/BUILD.gn # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -575,7 +582,7 @@ config("compiler") { +@@ -574,7 +581,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -39,7 +39,7 @@ Index: build/config/compiler/BUILD.gn cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -760,7 +767,7 @@ config("compiler") { +@@ -759,7 +766,7 @@ config("compiler") { ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ] @@ -48,7 +48,7 @@ Index: build/config/compiler/BUILD.gn # 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 -@@ -867,7 +874,7 @@ config("compiler") { +@@ -866,7 +873,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. @@ -57,7 +57,7 @@ Index: build/config/compiler/BUILD.gn cflags_cc += [ "-gsimple-template-names" ] } -@@ -1109,7 +1116,7 @@ config("compiler_cpu_abi") { +@@ -1108,7 +1115,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -66,7 +66,7 @@ Index: build/config/compiler/BUILD.gn !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1124,7 +1131,7 @@ config("compiler_cpu_abi") { +@@ -1123,7 +1130,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -75,7 +75,7 @@ Index: build/config/compiler/BUILD.gn !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1459,7 +1466,7 @@ config("compiler_deterministic") { +@@ -1458,7 +1465,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. @@ -84,7 +84,7 @@ Index: build/config/compiler/BUILD.gn # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1511,7 +1518,7 @@ config("compiler_deterministic") { +@@ -1510,7 +1517,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -93,7 +93,7 @@ Index: build/config/compiler/BUILD.gn update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1759,7 +1766,7 @@ config("default_warnings") { +@@ -1764,7 +1771,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -102,7 +102,7 @@ Index: build/config/compiler/BUILD.gn cflags += [ # TODO(crbug.com/1343975) Evaluate and possibly enable. "-Wno-deprecated-builtins", -@@ -1962,7 +1969,7 @@ config("no_chromium_code") { +@@ -1973,7 +1980,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -111,7 +111,7 @@ Index: build/config/compiler/BUILD.gn cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2472,7 +2479,7 @@ config("afdo_optimize_size") { +@@ -2483,7 +2490,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") { @@ -120,8 +120,8 @@ Index: build/config/compiler/BUILD.gn cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2491,7 +2498,7 @@ config("afdo") { - } +@@ -2510,7 +2517,7 @@ config("afdo") { + cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } - } else if (auto_profile_path != "" && is_a_target_toolchain) { @@ -129,7 +129,7 @@ Index: build/config/compiler/BUILD.gn cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2649,7 +2656,8 @@ config("symbols") { +@@ -2674,7 +2681,8 @@ config("symbols") { configs += [ "//build/config:compress_debug_sections" ] } diff --git a/www/ungoogled-chromium/patches/patch-build_config_compiler_pgo_BUILD_gn b/www/ungoogled-chromium/patches/patch-build_config_compiler_pgo_BUILD_gn index 56f134609..59a7b0f45 100644 --- a/www/ungoogled-chromium/patches/patch-build_config_compiler_pgo_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-build_config_compiler_pgo_BUILD_gn @@ -1,7 +1,7 @@ Index: build/config/compiler/pgo/BUILD.gn --- build/config/compiler/pgo/BUILD.gn.orig +++ build/config/compiler/pgo/BUILD.gn -@@ -128,13 +128,14 @@ config("pgo_optimization_flags") { +@@ -138,13 +138,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. diff --git a/www/ungoogled-chromium/patches/patch-build_toolchain_gcc_toolchain_gni b/www/ungoogled-chromium/patches/patch-build_toolchain_gcc_toolchain_gni index 0a9d71149..c768aae9e 100644 --- a/www/ungoogled-chromium/patches/patch-build_toolchain_gcc_toolchain_gni +++ b/www/ungoogled-chromium/patches/patch-build_toolchain_gcc_toolchain_gni @@ -15,7 +15,7 @@ Index: build/toolchain/gcc_toolchain.gni # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -876,22 +883,12 @@ template("gcc_toolchain") { +@@ -874,22 +881,12 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/ungoogled-chromium/patches/patch-build_toolchain_toolchain_gni b/www/ungoogled-chromium/patches/patch-build_toolchain_toolchain_gni index 1f1e6ac27..33e3ae438 100644 --- a/www/ungoogled-chromium/patches/patch-build_toolchain_toolchain_gni +++ b/www/ungoogled-chromium/patches/patch-build_toolchain_toolchain_gni @@ -5,7 +5,7 @@ Index: build/toolchain/toolchain.gni host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" --} else if (host_os == "linux") { +-} else if (host_os == "linux" || host_os == "aix") { +} else if (is_posix) { host_shlib_extension = ".so" } else { diff --git a/www/ungoogled-chromium/patches/patch-cc_BUILD_gn b/www/ungoogled-chromium/patches/patch-cc_BUILD_gn index 03df065f0..9593bfe61 100644 --- a/www/ungoogled-chromium/patches/patch-cc_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-cc_BUILD_gn @@ -1,7 +1,7 @@ Index: cc/BUILD.gn --- cc/BUILD.gn.orig +++ cc/BUILD.gn -@@ -670,7 +670,7 @@ cc_test_static_library("test_support") { +@@ -671,7 +671,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -10,7 +10,7 @@ Index: cc/BUILD.gn data_deps = [ "//third_party/mesa_headers" ] } } -@@ -918,7 +918,6 @@ cc_test("cc_unittests") { +@@ -919,7 +919,6 @@ cc_test("cc_unittests") { data = [ "//components/test/data/viz/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/ungoogled-chromium/patches/patch-cc_base_features_cc b/www/ungoogled-chromium/patches/patch-cc_base_features_cc new file mode 100644 index 000000000..7cb8566f8 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-cc_base_features_cc @@ -0,0 +1,12 @@ +Index: cc/base/features.cc +--- cc/base/features.cc.orig ++++ cc/base/features.cc +@@ -71,7 +71,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding, + + BASE_FEATURE(kUseDMSAAForTiles, + "UseDMSAAForTiles", +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_app_management_strings_grdp b/www/ungoogled-chromium/patches/patch-chrome_app_app_management_strings_grdp index 9a87fb133..d9a138f9b 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_app_app_management_strings_grdp +++ b/www/ungoogled-chromium/patches/patch-chrome_app_app_management_strings_grdp @@ -1,7 +1,7 @@ Index: chrome/app/app_management_strings.grdp --- chrome/app/app_management_strings.grdp.orig +++ chrome/app/app_management_strings.grdp -@@ -191,7 +191,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, <ph name="BEGIN_LINK"><a href="#"></ph>learn how to set default apps on your device<ph name="END_LINK"></a></ph>. </message> </if> diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_chrome_command_ids_h b/www/ungoogled-chromium/patches/patch-chrome_app_chrome_command_ids_h index 65cb4d643..02eb6a96f 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_app_chrome_command_ids_h +++ b/www/ungoogled-chromium/patches/patch-chrome_app_chrome_command_ids_h @@ -1,7 +1,7 @@ Index: chrome/app/chrome_command_ids.h --- chrome/app/chrome_command_ids.h.orig +++ chrome/app/chrome_command_ids.h -@@ -69,12 +69,12 @@ +@@ -68,12 +68,12 @@ #define IDC_TOGGLE_MULTITASK_MENU 34050 #endif diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_chrome_main_delegate_cc b/www/ungoogled-chromium/patches/patch-chrome_app_chrome_main_delegate_cc index a4914a69d..411660561 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_app_chrome_main_delegate_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_app_chrome_main_delegate_cc @@ -10,7 +10,7 @@ Index: chrome/app/chrome_main_delegate.cc #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -183,16 +183,16 @@ +@@ -182,16 +182,16 @@ #include "v8/include/v8.h" #endif @@ -48,7 +48,7 @@ Index: chrome/app/chrome_main_delegate.cc // 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) || -@@ -529,7 +529,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -542,7 +542,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -57,7 +57,7 @@ Index: chrome/app/chrome_main_delegate.cc // 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. -@@ -618,7 +618,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -632,7 +632,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -65,8 +65,8 @@ Index: chrome/app/chrome_main_delegate.cc + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. - startup_metric_utils::RecordStartupProcessCreationTime( -@@ -967,7 +967,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { + startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( +@@ -959,7 +959,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); base::sequence_manager::internal::ThreadController::InitializeFeatures(); @@ -93,7 +93,7 @@ Index: chrome/app/chrome_main_delegate.cc nacl::RegisterPathProvider(); #endif -@@ -1510,7 +1510,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1526,7 +1526,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -102,7 +102,7 @@ Index: chrome/app/chrome_main_delegate.cc // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1612,7 +1612,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1628,7 +1628,7 @@ absl::variant<int, content::MainFunctionParams> Chrome // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_chromium_strings_grd b/www/ungoogled-chromium/patches/patch-chrome_app_chromium_strings_grd index f7f5895a9..36f004a6a 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_app_chromium_strings_grd +++ b/www/ungoogled-chromium/patches/patch-chrome_app_chromium_strings_grd @@ -10,7 +10,7 @@ Index: chrome/app/chromium_strings.grd <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar"> Welcome to Chromium </message> -@@ -456,7 +456,7 @@ If you update this file, be sure also to update google +@@ -465,7 +465,7 @@ If you update this file, be sure also to update google To get future Chromium updates, you'll need Windows 10 or later. This computer is using Windows 8.1. </message> </if> @@ -19,7 +19,7 @@ Index: chrome/app/chromium_strings.grd <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported."> Chromium may not function correctly because it is no longer supported on this Linux distribution </message> -@@ -860,7 +860,7 @@ Permissions you've already given to websites and apps +@@ -870,7 +870,7 @@ Permissions you've already given to websites and apps </message> </if> @@ -28,7 +28,7 @@ Index: chrome/app/chromium_strings.grd <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item" translateable="false"> Not used in Chromium. Placeholder to keep resource maps in sync. </message> -@@ -1234,7 +1234,7 @@ Permissions you've already given to websites and apps +@@ -1255,7 +1255,7 @@ Permissions you've already given to websites and apps </message> </if> diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_generated_resources_grd b/www/ungoogled-chromium/patches/patch-chrome_app_generated_resources_grd index 0b1bc5b40..0d7685d70 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_app_generated_resources_grd +++ b/www/ungoogled-chromium/patches/patch-chrome_app_generated_resources_grd @@ -10,7 +10,7 @@ Index: chrome/app/generated_resources.grd for making strings OS specific. Other platform defines such as use_titlecase are declared in tools/grit/grit_rule.gni. --> -@@ -3426,7 +3426,7 @@ You can send it to Google to check if it's unsafe. Sca +@@ -3575,7 +3575,7 @@ are declared in tools/grit/grit_rule.gni. </if> <!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog --> @@ -19,7 +19,7 @@ Index: chrome/app/generated_resources.grd <message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog."> Device Credentials </message> -@@ -5172,7 +5172,7 @@ You can send it to Google to check if it's unsafe. Sca +@@ -5406,7 +5406,7 @@ are declared in tools/grit/grit_rule.gni. Read information about your browser, OS, device, installed software, registry values and files </message> </if> @@ -28,7 +28,7 @@ Index: chrome/app/generated_resources.grd <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS."> Read information about your browser, OS, device, installed software and files </message> -@@ -5845,7 +5845,7 @@ Keep your key file in a safe place. You will need it t +@@ -6095,7 +6095,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. </message> </if> @@ -37,7 +37,7 @@ Index: chrome/app/generated_resources.grd <message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog"> 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. </message> -@@ -5891,7 +5891,7 @@ Keep your key file in a safe place. You will need it t +@@ -6141,7 +6141,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. </message> </if> @@ -46,7 +46,7 @@ Index: chrome/app/generated_resources.grd <message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch."> Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. </message> -@@ -9902,7 +9902,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -10361,7 +10361,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW <message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available."> Update </message> @@ -55,7 +55,7 @@ Index: chrome/app/generated_resources.grd <message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available."> Finish update </message> -@@ -10238,7 +10238,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -10700,7 +10700,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW Google Pay </message> @@ -64,16 +64,16 @@ Index: chrome/app/generated_resources.grd <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> Use system title bar and borders </message> -@@ -11211,7 +11211,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -11685,7 +11685,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW </message> <!-- Device Trust Consent dialog --> - <if expr="is_win or is_macosx or is_linux or is_chromeos"> + <if expr="is_win or is_macosx or is_posix or is_chromeos"> <message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals."> - Share device signals? + Share information about your device? </message> -@@ -11610,7 +11610,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -12084,7 +12084,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> @@ -82,7 +82,7 @@ Index: chrome/app/generated_resources.grd <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> Minimize </message> -@@ -13802,7 +13802,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -14306,7 +14306,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway </message> diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_google_chrome_strings_grd b/www/ungoogled-chromium/patches/patch-chrome_app_google_chrome_strings_grd index b8dafebac..806ccaaf7 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_app_google_chrome_strings_grd +++ b/www/ungoogled-chromium/patches/patch-chrome_app_google_chrome_strings_grd @@ -28,7 +28,7 @@ Index: chrome/app/google_chrome_strings.grd <if expr="use_titlecase"> <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item"> Relaunch to Update - Your tabs will reopen -@@ -1276,7 +1276,7 @@ Permissions you've already given to websites and apps +@@ -1278,7 +1278,7 @@ Permissions you've already given to websites and apps </message> </if> diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_profiles_strings_grdp b/www/ungoogled-chromium/patches/patch-chrome_app_profiles_strings_grdp index 439ccf8d3..54dd7720b 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_app_profiles_strings_grdp +++ b/www/ungoogled-chromium/patches/patch-chrome_app_profiles_strings_grdp @@ -1,7 +1,7 @@ Index: chrome/app/profiles_strings.grdp --- chrome/app/profiles_strings.grdp.orig +++ chrome/app/profiles_strings.grdp -@@ -60,7 +60,7 @@ +@@ -54,7 +54,7 @@ Add Profile... </message> </if> diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_settings_strings_grdp b/www/ungoogled-chromium/patches/patch-chrome_app_settings_strings_grdp index f8759a490..5a65e2517 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_app_settings_strings_grdp +++ b/www/ungoogled-chromium/patches/patch-chrome_app_settings_strings_grdp @@ -1,7 +1,7 @@ Index: chrome/app/settings_strings.grdp --- chrome/app/settings_strings.grdp.orig +++ chrome/app/settings_strings.grdp -@@ -202,7 +202,7 @@ +@@ -207,7 +207,7 @@ Theme </message> </if> @@ -10,7 +10,7 @@ Index: chrome/app/settings_strings.grdp <message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux"> GTK </message> -@@ -222,7 +222,7 @@ +@@ -227,7 +227,7 @@ Use Classic </message> </if> diff --git a/www/ungoogled-chromium/patches/patch-chrome_app_theme_theme_resources_grd b/www/ungoogled-chromium/patches/patch-chrome_app_theme_theme_resources_grd index f1864da3a..211ca94d6 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_app_theme_theme_resources_grd +++ b/www/ungoogled-chromium/patches/patch-chrome_app_theme_theme_resources_grd @@ -1,7 +1,7 @@ Index: chrome/app/theme/theme_resources.grd --- chrome/app/theme/theme_resources.grd.orig +++ chrome/app/theme/theme_resources.grd -@@ -135,14 +135,14 @@ +@@ -143,14 +143,14 @@ </if> <if expr="_google_chrome"> <then> @@ -18,7 +18,7 @@ Index: chrome/app/theme/theme_resources.grd <if expr="not is_android"> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" /> -@@ -150,7 +150,7 @@ +@@ -158,7 +158,7 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" /> </else> @@ -27,7 +27,7 @@ Index: chrome/app/theme/theme_resources.grd <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="google_chrome/product_logo_32_canary.png" /> <if expr="not is_android"> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" /> -@@ -162,7 +162,7 @@ +@@ -170,7 +170,7 @@ <else> <!-- not _google_chrome --> <if expr="_is_chrome_for_testing_branded"> <then> @@ -36,7 +36,7 @@ Index: chrome/app/theme/theme_resources.grd <then> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/linux/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/linux/product_logo_32.png" /> -@@ -171,10 +171,10 @@ +@@ -179,10 +179,10 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/product_logo_32.png" /> </else> @@ -49,7 +49,7 @@ Index: chrome/app/theme/theme_resources.grd <then> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" /> -@@ -183,7 +183,7 @@ +@@ -191,7 +191,7 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" /> </else> diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_BUILD_gn b/www/ungoogled-chromium/patches/patch-chrome_browser_BUILD_gn index 1f74b26dc..b2f55d6b6 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_BUILD_gn @@ -1,7 +1,7 @@ Index: chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn.orig +++ chrome/browser/BUILD.gn -@@ -6278,6 +6278,13 @@ static_library("browser") { +@@ -6347,6 +6347,13 @@ static_library("browser") { } } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_about_flags_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_about_flags_cc index a0dac1973..fa6cfa424 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_about_flags_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_about_flags_cc @@ -1,7 +1,7 @@ Index: chrome/browser/about_flags.cc --- chrome/browser/about_flags.cc.orig +++ chrome/browser/about_flags.cc -@@ -224,7 +224,7 @@ +@@ -222,7 +222,7 @@ #include "ui/ui_features.h" #include "url/url_features.h" @@ -10,7 +10,7 @@ Index: chrome/browser/about_flags.cc #include "base/allocator/buildflags.h" #endif -@@ -320,7 +320,7 @@ +@@ -321,7 +321,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -19,7 +19,16 @@ Index: chrome/browser/about_flags.cc #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -430,7 +430,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -335,7 +335,7 @@ + #include "chrome/browser/win/titlebar_config.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/profile_management/profile_management_features.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) + +@@ -435,7 +435,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -28,7 +37,7 @@ Index: chrome/browser/about_flags.cc const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1482,7 +1482,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 +@@ -1475,7 +1475,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 std::size(kChromeRefresh2023Level1), nullptr}}; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -37,7 +46,7 @@ Index: chrome/browser/about_flags.cc const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = { {"ShortcutBoostSearchScore", "1414"}, {"ShortcutBoostUrlScore", "1414"}}; -@@ -4971,13 +4971,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5031,13 +5031,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -53,7 +62,7 @@ Index: chrome/browser/about_flags.cc {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5262,7 +5262,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5326,7 +5326,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(feed::kFeedDynamicColors)}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -62,7 +71,7 @@ Index: chrome/browser/about_flags.cc {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -5928,7 +5928,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6016,7 +6016,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -71,7 +80,7 @@ Index: chrome/browser/about_flags.cc {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6691,7 +6691,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6814,7 +6814,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kParallelDownloadingDescription, kOsAll, FEATURE_VALUE_TYPE(download::features::kParallelDownloading)}, @@ -80,7 +89,16 @@ Index: chrome/browser/about_flags.cc {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -8381,7 +8381,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7797,7 +7797,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(supervised_user::kEnableProtoApiForClassifyUrl)}, + #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"enable-network-service-sandbox", + flag_descriptions::kEnableNetworkServiceSandboxName, + flag_descriptions::kEnableNetworkServiceSandboxDescription, +@@ -8528,7 +8528,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -89,7 +107,7 @@ Index: chrome/browser/about_flags.cc {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8642,7 +8642,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8808,7 +8808,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -98,7 +116,7 @@ Index: chrome/browser/about_flags.cc {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8703,7 +8703,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8868,7 +8868,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -107,7 +125,7 @@ Index: chrome/browser/about_flags.cc { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9271,7 +9271,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9386,7 +9386,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -116,7 +134,7 @@ Index: chrome/browser/about_flags.cc {"document-picture-in-picture-api", flag_descriptions::kDocumentPictureInPictureApiName, flag_descriptions::kDocumentPictureInPictureApiDescription, -@@ -9991,7 +9991,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10046,7 +10046,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)}, @@ -125,7 +143,7 @@ Index: chrome/browser/about_flags.cc {"webui-system-font", flag_descriptions::kWebUiSystemFontName, flag_descriptions::kWebUiSystemFontDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebUiSystemFont)}, -@@ -10176,7 +10176,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10232,7 +10232,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -134,7 +152,7 @@ Index: chrome/browser/about_flags.cc {"data-retention-policies-disable-sync-types-needed", flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName, flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription, -@@ -10584,7 +10584,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10625,7 +10625,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -143,3 +161,12 @@ Index: chrome/browser/about_flags.cc {"camera-mic-preview", flag_descriptions::kCameraMicPreviewName, flag_descriptions::kCameraMicPreviewDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux | kOsFuchsia), +@@ -10802,7 +10802,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kDigestAuthEnableSecureAlgorithmsDescription, kOsAll, + FEATURE_VALUE_TYPE(net::features::kDigestAuthEnableSecureAlgorithms)}, + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + {"third-party-profile-management", + flag_descriptions::kThirdPartyProfileManagementName, + flag_descriptions::kThirdPartyProfileManagementDescription, diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_browser_features_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_browser_features_cc index 1454aa2b6..073fcd851 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_browser_features_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_browser_features_cc @@ -1,7 +1,7 @@ Index: chrome/browser/browser_features.cc --- chrome/browser/browser_features.cc.orig +++ chrome/browser/browser_features.cc -@@ -27,7 +27,7 @@ BASE_FEATURE(kClosedTabCache, +@@ -28,7 +28,7 @@ BASE_FEATURE(kClosedTabCache, BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_cc index 95108e9d2..dbb205080 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_cc @@ -1,7 +1,7 @@ Index: chrome/browser/browser_process_impl.cc --- chrome/browser/browser_process_impl.cc.orig +++ chrome/browser/browser_process_impl.cc -@@ -216,7 +216,7 @@ +@@ -219,7 +219,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -10,7 +10,7 @@ Index: chrome/browser/browser_process_impl.cc #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1190,7 +1190,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1212,7 +1212,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -19,7 +19,7 @@ Index: chrome/browser/browser_process_impl.cc ChromeJsErrorReportProcessor::Create(); #endif -@@ -1427,7 +1427,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1448,7 +1448,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/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_h b/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_h index 28277da8f..51fd81bf7 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_h +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_h @@ -1,7 +1,7 @@ Index: chrome/browser/browser_process_impl.h --- chrome/browser/browser_process_impl.h.orig +++ chrome/browser/browser_process_impl.h -@@ -370,7 +370,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/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_interface_binders_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_interface_binders_cc index ecf67107a..c8b77764c 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_interface_binders_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_interface_binders_cc @@ -1,7 +1,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc --- chrome/browser/chrome_browser_interface_binders.cc.orig +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -124,13 +124,13 @@ +@@ -129,13 +129,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -17,7 +17,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc #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 -@@ -208,7 +208,7 @@ +@@ -217,7 +217,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -26,7 +26,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc #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" -@@ -915,7 +915,7 @@ void PopulateChromeFrameBinders( +@@ -949,7 +949,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -35,7 +35,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc if (!render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -923,7 +923,7 @@ void PopulateChromeFrameBinders( +@@ -957,7 +957,7 @@ void PopulateChromeFrameBinders( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -44,7 +44,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -997,7 +997,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1031,7 +1031,7 @@ void PopulateChromeWebUIFrameBinders( commerce::CommerceInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -53,7 +53,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -1011,7 +1011,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1046,7 +1046,7 @@ void PopulateChromeWebUIFrameBinders( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -62,7 +62,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1477,7 +1477,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1535,7 +1535,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_cc index 4efa842cb..2bcb37000 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_cc @@ -32,7 +32,7 @@ Index: chrome/browser/chrome_browser_main.cc #include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck #include "chrome/browser/headless/headless_mode_util.h" // nogncheck #include "components/headless/select_file_dialog/headless_select_file_dialog.h" -@@ -1029,7 +1029,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1030,7 +1030,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -41,7 +41,7 @@ Index: chrome/browser/chrome_browser_main.cc // 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 . -@@ -1085,7 +1085,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1086,7 +1086,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) || \ @@ -50,7 +50,7 @@ Index: chrome/browser/chrome_browser_main.cc metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1321,7 +1321,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1322,7 +1322,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -59,7 +59,7 @@ Index: chrome/browser/chrome_browser_main.cc if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1430,7 +1430,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1428,7 +1428,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc index 005cfd9c4..e161d36e3 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc @@ -1,7 +1,7 @@ Index: chrome/browser/chrome_content_browser_client.cc --- chrome/browser/chrome_content_browser_client.cc.orig +++ chrome/browser/chrome_content_browser_client.cc -@@ -424,7 +424,7 @@ +@@ -432,7 +432,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" @@ -10,7 +10,7 @@ Index: chrome/browser/chrome_content_browser_client.cc #include "chrome/browser/chrome_browser_main_linux.h" #elif BUILDFLAG(IS_ANDROID) #include "base/android/application_status_listener.h" -@@ -513,12 +513,12 @@ +@@ -523,12 +523,12 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -25,7 +25,7 @@ Index: chrome/browser/chrome_content_browser_client.cc #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -527,14 +527,14 @@ +@@ -537,14 +537,14 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif @@ -42,7 +42,7 @@ Index: chrome/browser/chrome_content_browser_client.cc #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -563,11 +563,11 @@ +@@ -571,11 +571,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -56,16 +56,16 @@ Index: chrome/browser/chrome_content_browser_client.cc #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1555,7 +1555,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre - prefs::kThrottleNonVisibleCrossOriginIframesAllowed, true); +@@ -1564,7 +1564,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre registry->RegisterBooleanPref(prefs::kNewBaseUrlInheritanceBehaviorAllowed, true); + registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false); -#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) -@@ -1676,7 +1676,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1688,7 +1688,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -74,7 +74,7 @@ Index: chrome/browser/chrome_content_browser_client.cc main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1715,7 +1715,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1727,7 +1727,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -83,7 +83,7 @@ Index: chrome/browser/chrome_content_browser_client.cc main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1736,7 +1736,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1748,7 +1748,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -92,7 +92,7 @@ Index: chrome/browser/chrome_content_browser_client.cc main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1755,7 +1755,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1767,7 +1767,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -101,7 +101,7 @@ Index: chrome/browser/chrome_content_browser_client.cc main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2579,6 +2579,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2591,6 +2591,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #if(0) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -110,7 +110,7 @@ Index: chrome/browser/chrome_content_browser_client.cc #elif BUILDFLAG(IS_CHROMEOS) bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2984,7 +2986,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2998,7 +3000,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -119,7 +119,7 @@ Index: chrome/browser/chrome_content_browser_client.cc // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4487,7 +4489,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4564,7 +4566,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -128,7 +128,7 @@ Index: chrome/browser/chrome_content_browser_client.cc void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5003,7 +5005,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5086,7 +5088,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -137,7 +137,7 @@ Index: chrome/browser/chrome_content_browser_client.cc MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5013,7 +5015,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5096,7 +5098,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -146,7 +146,7 @@ Index: chrome/browser/chrome_content_browser_client.cc MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5044,7 +5046,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5127,7 +5129,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #endif @@ -155,7 +155,7 @@ Index: chrome/browser/chrome_content_browser_client.cc MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -6843,7 +6845,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -6920,7 +6922,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS } bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_h b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_h index c6211d112..934e37c74 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_h +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_h @@ -1,7 +1,7 @@ Index: chrome/browser/chrome_content_browser_client.h --- chrome/browser/chrome_content_browser_client.h.orig +++ chrome/browser/chrome_content_browser_client.h -@@ -465,7 +465,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -471,7 +471,7 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_process_singleton_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_process_singleton_cc deleted file mode 100644 index 4928ca1b0..000000000 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_chrome_process_singleton_cc +++ /dev/null @@ -1,47 +0,0 @@ -Index: chrome/browser/chrome_process_singleton.cc ---- chrome/browser/chrome_process_singleton.cc.orig -+++ chrome/browser/chrome_process_singleton.cc -@@ -11,7 +11,7 @@ - #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" - #include "chrome/common/chrome_switches.h" - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "base/hash/hash.h" - #include "chrome/common/channel_info.h" - #include "components/version_info/channel.h" -@@ -22,7 +22,7 @@ - #include "base/win/registry.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "base/files/file_util.h" - #endif - -@@ -33,14 +33,14 @@ constexpr char kEarlySingletonEnabledGroup[] = "Enable - constexpr char kEarlySingletonDisabledMergeGroup[] = "Disabled_Merge3"; - constexpr char kEarlySingletonDefaultGroup[] = "Default3"; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - constexpr char kEarlySingletonDisabledGroup[] = "Disabled3"; - #endif // BUILDFLAG(IS_WIN) - - const char* g_early_singleton_feature_group_ = nullptr; - ChromeProcessSingleton* g_chrome_process_singleton_ = nullptr; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - - std::string GetMachineGUID() { - std::string machine_guid; -@@ -171,7 +171,7 @@ void ChromeProcessSingleton::SetupEarlySingletonFeatur - return; - } - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - g_early_singleton_feature_group_ = EnrollMachineInEarlySingletonFeature(); - #else - g_early_singleton_feature_group_ = kEarlySingletonDefaultGroup; diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_content_settings_one_time_permission_provider_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_content_settings_one_time_permission_provider_cc index e00e67de7..9ff1d6dd2 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_content_settings_one_time_permission_provider_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_content_settings_one_time_permission_provider_cc @@ -1,7 +1,7 @@ Index: chrome/browser/content_settings/one_time_permission_provider.cc --- chrome/browser/content_settings/one_time_permission_provider.cc.orig +++ chrome/browser/content_settings/one_time_permission_provider.cc -@@ -207,8 +207,13 @@ void OneTimePermissionProvider::OnSuspend() { +@@ -225,8 +225,13 @@ void OneTimePermissionProvider::OnSuspend() { while (rule_iterator && rule_iterator->HasNext()) { auto rule = rule_iterator->Next(); @@ -15,7 +15,7 @@ Index: chrome/browser/content_settings/one_time_permission_provider.cc permissions::PermissionUmaUtil::RecordOneTimePermissionEvent( setting_type, permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND); -@@ -302,8 +307,13 @@ void OneTimePermissionProvider::DeleteEntriesMatchingG +@@ -320,8 +325,13 @@ void OneTimePermissionProvider::DeleteEntriesMatchingG auto rule = rule_iterator->Next(); if (rule->primary_pattern.Matches(origin_gurl) && rule->secondary_pattern.Matches(origin_gurl)) { diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc index ad4ca244c..026714846 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc @@ -1,7 +1,7 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc --- chrome/browser/download/chrome_download_manager_delegate.cc.orig +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1552,7 +1552,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1565,7 +1565,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -10,7 +10,7 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1618,7 +1618,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1631,7 +1631,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) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_commands_h b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_commands_h index 3387d930e..37043d96d 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_commands_h +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_commands_h @@ -1,7 +1,7 @@ Index: chrome/browser/download/download_commands.h --- chrome/browser/download/download_commands.h.orig +++ chrome/browser/download/download_commands.h -@@ -58,7 +58,7 @@ class DownloadCommands { +@@ -60,7 +60,7 @@ class DownloadCommands { void ExecuteCommand(Command command); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_item_model_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_item_model_cc index 5b4f79ffa..84671503b 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_item_model_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_item_model_cc @@ -1,7 +1,7 @@ Index: chrome/browser/download/download_item_model.cc --- chrome/browser/download/download_item_model.cc.orig +++ chrome/browser/download/download_item_model.cc -@@ -761,7 +761,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -765,7 +765,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -10,7 +10,7 @@ Index: chrome/browser/download/download_item_model.cc if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -805,7 +805,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -811,7 +811,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand base::UmaHistogramBoolean("Download.SetAlwaysOpenTo", !is_checked); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -19,7 +19,7 @@ Index: chrome/browser/download/download_item_model.cc if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1155,7 +1155,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1163,7 +1163,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_prefs_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_prefs_cc index 7469dfabb..2ec0157eb 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_prefs_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_download_download_prefs_cc @@ -38,7 +38,7 @@ Index: chrome/browser/download/download_prefs.cc should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -304,7 +309,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -307,7 +312,7 @@ void DownloadPrefs::RegisterProfilePrefs( registry->RegisterTimePref(prefs::kDownloadLastCompleteTime, /*default_value=*/base::Time()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -47,7 +47,7 @@ Index: chrome/browser/download/download_prefs.cc registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if BUILDFLAG(IS_ANDROID) -@@ -473,7 +478,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -476,7 +481,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -56,7 +56,7 @@ Index: chrome/browser/download/download_prefs.cc void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -505,7 +510,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -508,7 +513,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons void DownloadPrefs::ResetAutoOpenByUser() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -65,7 +65,7 @@ Index: chrome/browser/download/download_prefs.cc SetShouldOpenPdfInSystemReader(false); #endif auto_open_by_user_.clear(); -@@ -536,7 +541,7 @@ void DownloadPrefs::SaveAutoOpenState() { +@@ -539,7 +544,7 @@ void DownloadPrefs::SaveAutoOpenState() { bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const { #if BUILDFLAG(IS_CHROMEOS) return false; // There is no UI for auto-open on ChromeOS. @@ -74,7 +74,7 @@ Index: chrome/browser/download/download_prefs.cc return ShouldOpenPdfInSystemReader(); #else return false; -@@ -660,7 +665,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -663,7 +668,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa #else // If the stored download directory is an absolute path, we presume it's // correct; there's not really much more validation we can do here. diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_content_analysis_delegate_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_content_analysis_delegate_cc index 15e108150..2f444056f 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_content_analysis_delegate_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_content_analysis_delegate_cc @@ -10,7 +10,7 @@ Index: chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.c #include "chrome/browser/enterprise/connectors/analysis/content_analysis_sdk_manager.h" // nogncheck #endif -@@ -555,7 +555,7 @@ void ContentAnalysisDelegate::PageRequestCallback( +@@ -557,7 +557,7 @@ void ContentAnalysisDelegate::PageRequestCallback( bool ContentAnalysisDelegate::UploadData() { upload_start_time_ = base::TimeTicks::Now(); diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_service_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_service_cc index c0693834d..0ee2ef7c3 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_service_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_connectors_service_cc @@ -1,7 +1,7 @@ Index: chrome/browser/enterprise/connectors/connectors_service.cc --- chrome/browser/enterprise/connectors/connectors_service.cc.orig +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -498,7 +498,7 @@ bool ConnectorsService::ConnectorsEnabled() const { +@@ -514,7 +514,7 @@ bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_device_trust_service_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_device_trust_service_factory_cc index 448400660..89c977c48 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_device_trust_service_factory_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_device_trust_service_factory_cc @@ -10,7 +10,7 @@ Index: chrome/browser/enterprise/connectors/device_trust/device_trust_service_fa #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/browser_attestation_service.h" #include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/device_attester.h" -@@ -55,7 +55,7 @@ bool IsProfileManaged(Profile* profile) { +@@ -56,7 +56,7 @@ bool IsProfileManaged(Profile* profile) { return management_service && management_service->IsManaged(); } @@ -19,7 +19,7 @@ Index: chrome/browser/enterprise/connectors/device_trust/device_trust_service_fa policy::CloudPolicyStore* GetUserCloudPolicyStore(Profile* profile) { policy::CloudPolicyManager* user_policy_manager = profile->GetUserCloudPolicyManager(); -@@ -105,7 +105,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() +@@ -106,7 +106,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() DependsOn(DeviceTrustConnectorServiceFactory::GetInstance()); DependsOn(policy::ManagementServiceFactory::GetInstance()); diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime_reporting_client_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime_reporting_client_cc new file mode 100644 index 000000000..27c8e0c65 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime_reporting_client_cc @@ -0,0 +1,39 @@ +Index: chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig ++++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc +@@ -54,7 +54,7 @@ + #include "base/strings/utf_string_conversions.h" + #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 "chrome/browser/enterprise/signals/signals_aggregator_factory.h" + #include "components/device_signals/core/browser/signals_aggregator.h" + #include "components/device_signals/core/common/signals_constants.h" +@@ -139,7 +139,7 @@ void UploadSecurityEventReport(base::Value::Dict event + std::move(upload_callback)); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void PopulateSignals(base::Value::Dict event, + policy::CloudPolicyClient* client, + std::string name, +@@ -427,7 +427,7 @@ void RealtimeReportingClient::ReportPastEvent(const st + /*include_profile_user_name=*/false); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + void AddCrowdstrikeSignalsToEvent( + base::Value::Dict& event, +@@ -486,7 +486,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp + if (include_profile_user_name) { + event.Set(kKeyProfileUserName, GetProfileUserName()); + } +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + Profile* profile = Profile::FromBrowserContext(context_); + device_signals::SignalsAggregator* signals_aggregator = + enterprise_signals::SignalsAggregatorFactory::GetForProfile(profile); diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime_reporting_client_h b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime_reporting_client_h new file mode 100644 index 000000000..bffa6df17 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime_reporting_client_h @@ -0,0 +1,21 @@ +Index: chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig ++++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h +@@ -17,7 +17,7 @@ + #include "components/keyed_service/core/keyed_service.h" + #include "components/policy/core/common/cloud/cloud_policy_client.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 "components/device_signals/core/browser/signals_types.h" + #endif + +@@ -194,7 +194,7 @@ class RealtimeReportingClient : public KeyedService, + base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this}; + }; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Populate event dict with CrowdStrike signal values. If those signals are + // available in `response`, this function returns a Dict with the following + // fields added: diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_profile_management_profile_management_navigation_throttle_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_profile_management_profile_management_navigation_throttle_cc new file mode 100644 index 000000000..4b114a74a --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_profile_management_profile_management_navigation_throttle_cc @@ -0,0 +1,14 @@ +Index: chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc +--- chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.orig ++++ chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc +@@ -66,8 +66,8 @@ base::flat_map<std::string, SAMLProfileAttributes>& Ge + // TODO(crbug.com/1445072): Add actual domains with attribute names. + profile_attributes->insert(std::make_pair( + "supported.test", +- SAMLProfileAttributes("placeholderName", "placeholderDomain", +- "placeholderToken"))); ++ SAMLProfileAttributes(SAMLProfileAttributes{"placeholderName", "placeholderDomain", ++ "placeholderToken"}))); + + // Extract domains and attributes from the command line switch. + const base::CommandLine& command_line = diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_signals_device_info_fetcher_linux_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_signals_device_info_fetcher_linux_cc index e4179b1c4..653718405 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_signals_device_info_fetcher_linux_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_signals_device_info_fetcher_linux_cc @@ -11,11 +11,11 @@ Index: chrome/browser/enterprise/signals/device_info_fetcher_linux.cc #include <gio/gio.h> #endif // defined(USE_GIO) #include <sys/stat.h> -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) #include <sys/sysmacros.h> +#endif -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include <sys/types.h> +#include <sys/socket.h> +#include <ifaddrs.h> @@ -29,7 +29,7 @@ Index: chrome/browser/enterprise/signals/device_info_fetcher_linux.cc // Implements the logic from the native host installation script. First find the // root device identifier, then locate its parent and get its type. SettingValue GetDiskEncrypted() { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) struct stat info; // First figure out the device identifier. Fail fast if this fails. if (stat("/", &info) != 0) @@ -43,7 +43,7 @@ Index: chrome/browser/enterprise/signals/device_info_fetcher_linux.cc std::vector<std::string> GetMacAddresses() { std::vector<std::string> result; -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + struct ifaddrs* ifa = nullptr; + + if (getifaddrs(&ifa) != 0) diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_BUILD_gn b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_BUILD_gn index 96aa0d44b..78294986d 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_BUILD_gn @@ -1,7 +1,7 @@ Index: chrome/browser/extensions/BUILD.gn --- chrome/browser/extensions/BUILD.gn.orig +++ chrome/browser/extensions/BUILD.gn -@@ -1346,6 +1346,10 @@ static_library("extensions") { +@@ -1351,6 +1351,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider_cc index 653ef57d1..deca47554 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider_cc @@ -5,7 +5,7 @@ Index: chrome/browser/extensions/api/image_writer_private/removable_storage_prov void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) if (g_test_device_list.Get().get() != nullptr) { base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_passwords_private_passwords_private_delegate_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_passwords_private_passwords_private_delegate_impl_cc index f3201f134..057118a80 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_passwords_private_passwords_private_delegate_impl_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_passwords_private_passwords_private_delegate_impl_cc @@ -1,7 +1,7 @@ Index: chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc --- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -582,7 +582,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( +@@ -593,7 +593,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_settings_private_prefs_util_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_settings_private_prefs_util_cc index 95edb3979..f026017d6 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_settings_private_prefs_util_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_settings_private_prefs_util_cc @@ -1,7 +1,7 @@ Index: chrome/browser/extensions/api/settings_private/prefs_util.cc --- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -193,7 +193,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] = settings_api::PrefType::PREF_TYPE_BOOLEAN; @@ -10,7 +10,7 @@ Index: chrome/browser/extensions/api/settings_private/prefs_util.cc (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -205,7 +205,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -208,7 +208,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/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_webstore_private_webstore_private_api_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_webstore_private_webstore_private_api_cc index 263adf8b1..09e9cabd4 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_webstore_private_webstore_private_api_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_webstore_private_webstore_private_api_cc @@ -1,7 +1,7 @@ Index: chrome/browser/extensions/api/webstore_private/webstore_private_api.cc --- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -905,7 +905,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -901,7 +901,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: RequestExtensionApproval(contents); return; } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_file_system_access_chrome_file_system_access_permission_context_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_file_system_access_chrome_file_system_access_permission_context_cc index 40a203db8..37f94d03c 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_file_system_access_chrome_file_system_access_permission_context_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_file_system_access_chrome_file_system_access_permission_context_cc @@ -1,7 +1,7 @@ Index: chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc --- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -316,7 +316,7 @@ const struct { +@@ -313,7 +313,7 @@ const struct { FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), kDontBlockChildren}, #endif diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_cc index d088f6dcc..5ea42198a 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_cc @@ -1,7 +1,7 @@ Index: chrome/browser/flag_descriptions.cc --- chrome/browser/flag_descriptions.cc.orig +++ chrome/browser/flag_descriptions.cc -@@ -2519,7 +2519,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P +@@ -2560,7 +2560,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P const char kWebUIOmniboxPopupDescription[] = "If enabled, shows the omnibox suggestions popup in WebUI."; @@ -10,16 +10,16 @@ Index: chrome/browser/flag_descriptions.cc const char kWebUiSystemFontName[] = "WebUI System font"; const char kWebUiSystemFontDescription[] = "If enabled, all WebUI surfaces will use the default UI font of the " -@@ -6839,7 +6839,7 @@ const char kLibAssistantV2MigrationDescription[] = - - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -7044,7 +7044,7 @@ const char kLacrosMergeIcuDataFileDescription[] = + "Enables sharing common areas of icudtl.dat between Ash and Lacros."; + #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7079,7 +7079,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -7258,7 +7258,7 @@ const char kSearchWebInSidePanelDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -28,7 +28,7 @@ Index: chrome/browser/flag_descriptions.cc const char kQuickCommandsName[] = "Quick Commands"; const char kQuickCommandsDescription[] = "Enable a text interface to browser features. Invoke with Ctrl-Space."; -@@ -7088,7 +7088,7 @@ const char kQuickCommandsDescription[] = +@@ -7267,7 +7267,7 @@ const char kQuickCommandsDescription[] = // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -37,16 +37,16 @@ Index: chrome/browser/flag_descriptions.cc const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7110,7 +7110,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] +@@ -7282,7 +7282,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] "instead of JSON."; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const char kUseOutOfProcessVideoDecodingName[] = - "Use out-of-process video decoding (OOP-VD)"; - const char kUseOutOfProcessVideoDecodingDescription[] = -@@ -7128,7 +7128,7 @@ const char kWebShareDescription[] = + const char kEnableNetworkServiceSandboxName[] = + "Enable the network service sandbox."; + const char kEnableNetworkServiceSandboxDescription[] = +@@ -7306,7 +7306,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -55,7 +55,7 @@ Index: chrome/browser/flag_descriptions.cc const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7148,7 +7148,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7326,7 +7326,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -64,7 +64,7 @@ Index: chrome/browser/flag_descriptions.cc const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -7162,7 +7162,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -7340,7 +7340,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -73,7 +73,7 @@ Index: chrome/browser/flag_descriptions.cc const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -7263,7 +7263,7 @@ const char kElasticOverscrollDescription[] = +@@ -7447,7 +7447,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -82,7 +82,7 @@ Index: chrome/browser/flag_descriptions.cc const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -7292,7 +7292,7 @@ const char kSigninInterceptBubbleV2Description[] = +@@ -7459,7 +7459,7 @@ const char kSyncPollImmediatelyOnEveryStartupDescripti #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -91,3 +91,12 @@ Index: chrome/browser/flag_descriptions.cc const char kDataRetentionPoliciesDisableSyncTypesNeededName[] = "Data Retention Policies Disable Sync Types"; const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[] = +@@ -7504,7 +7504,7 @@ const char kEnableAudioFocusEnforcementDescription[] = + "any one time. Requires #enable-media-session-service to be enabled too."; + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + const char kThirdPartyProfileManagementName[] = + "Third party profile management"; + const char kThirdPartyProfileManagementDescription[] = diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_h b/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_h index 19767fa98..355b16dab 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_h +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_h @@ -1,7 +1,7 @@ Index: chrome/browser/flag_descriptions.h --- chrome/browser/flag_descriptions.h.orig +++ chrome/browser/flag_descriptions.h -@@ -1418,7 +1418,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd +@@ -1455,7 +1455,7 @@ extern const char kOmnibox2023RefreshConnectionSecurit extern const char kWebUIOmniboxPopupName[]; extern const char kWebUIOmniboxPopupDescription[]; @@ -10,7 +10,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kWebUiSystemFontName[]; extern const char kWebUiSystemFontDescription[]; #endif -@@ -3934,7 +3934,7 @@ extern const char kLacrosMergeIcuDataFileName[]; +@@ -4039,7 +4039,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -19,7 +19,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4064,14 +4064,14 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -4169,14 +4169,14 @@ extern const char kSearchWebInSidePanelDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kWebShareName[]; extern const char kWebShareDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -4081,7 +4081,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4186,7 +4186,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -45,7 +45,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4091,7 +4091,7 @@ extern const char kOzonePlatformHintName[]; +@@ -4196,7 +4196,7 @@ extern const char kOzonePlatformHintName[]; extern const char kOzonePlatformHintDescription[]; #endif // BUILDFLAG(IS_LINUX) @@ -54,7 +54,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4099,13 +4099,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -4204,13 +4204,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -70,16 +70,16 @@ Index: chrome/browser/flag_descriptions.h extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4121,7 +4121,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; +@@ -4221,7 +4221,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; extern const char kEnableProtoApiForClassifyUrlDescription[]; #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kUseOutOfProcessVideoDecodingName[]; - extern const char kUseOutOfProcessVideoDecodingDescription[]; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -4195,7 +4195,7 @@ extern const char kElasticOverscrollDescription[]; + extern const char kEnableNetworkServiceSandboxName[]; + extern const char kEnableNetworkServiceSandboxDescription[]; + +@@ -4303,7 +4303,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -88,7 +88,7 @@ Index: chrome/browser/flag_descriptions.h extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; -@@ -4213,7 +4213,7 @@ extern const char kSigninInterceptBubbleV2Description[ +@@ -4312,7 +4312,7 @@ extern const char kSyncPollImmediatelyOnEveryStartupDe #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -97,3 +97,12 @@ Index: chrome/browser/flag_descriptions.h extern const char kDataRetentionPoliciesDisableSyncTypesNeededName[]; extern const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[]; #endif +@@ -4339,7 +4339,7 @@ extern const char kEnableAudioFocusEnforcementName[]; + extern const char kEnableAudioFocusEnforcementDescription[]; + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + extern const char kThirdPartyProfileManagementName[]; + extern const char kThirdPartyProfileManagementDescription[]; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_gcm_gcm_profile_service_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_gcm_gcm_profile_service_factory_cc new file mode 100644 index 000000000..c15d35a60 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_gcm_gcm_profile_service_factory_cc @@ -0,0 +1,21 @@ +Index: chrome/browser/gcm/gcm_profile_service_factory.cc +--- chrome/browser/gcm/gcm_profile_service_factory.cc.orig ++++ chrome/browser/gcm/gcm_profile_service_factory.cc +@@ -89,7 +89,7 @@ GCMProfileServiceFactory::ScopedTestingFactoryInstalle + // static + GCMProfileService* GCMProfileServiceFactory::GetForProfile( + content::BrowserContext* profile) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On desktop, incognito profiles are checked with IsIncognitoProfile(). + // It's possible for non-incognito profiles to also be off-the-record. + bool is_profile_supported = +@@ -129,7 +129,7 @@ GCMProfileServiceFactory::~GCMProfileServiceFactory() + KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { + Profile* profile = Profile::FromBrowserContext(context); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + DCHECK(!profile->IsIncognitoProfile()); + #else + DCHECK(!profile->IsOffTheRecord()); diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_gcm_instance_id_instance_id_profile_service_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_gcm_instance_id_instance_id_profile_service_factory_cc new file mode 100644 index 000000000..4042409a2 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_gcm_instance_id_instance_id_profile_service_factory_cc @@ -0,0 +1,21 @@ +Index: chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc +--- chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig ++++ chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc +@@ -16,7 +16,7 @@ namespace instance_id { + // static + InstanceIDProfileService* InstanceIDProfileServiceFactory::GetForProfile( + content::BrowserContext* profile) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On desktop, the guest profile is actually the primary OTR profile of + // the "regular" guest profile. The regular guest profile is never used + // directly by users. Also, user are not able to create child OTR profiles +@@ -61,7 +61,7 @@ InstanceIDProfileServiceFactory::~InstanceIDProfileSer + KeyedService* InstanceIDProfileServiceFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { + Profile* profile = Profile::FromBrowserContext(context); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On desktop, incognito profiles are checked with IsIncognitoProfile(). + // It's possible for non-incognito profiles to also be off-the-record. + bool is_incognito = profile->IsIncognitoProfile(); diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_headless_headless_mode_util_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_headless_headless_mode_util_cc index ef6f9ee4a..06c976207 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_headless_headless_mode_util_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_headless_headless_mode_util_cc @@ -16,9 +16,9 @@ Index: chrome/browser/headless/headless_mode_util.cc #include "ui/gl/gl_switches.h" // nogncheck #include "ui/ozone/public/ozone_switches.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) -@@ -78,7 +78,7 @@ void SetUpCommandLine(const base::CommandLine* command - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kDisableLazyLoading); +@@ -73,7 +73,7 @@ void SetUpCommandLine(const base::CommandLine* command + ::switches::kNoErrorDialogs); + } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc index 6741edea8..73dc74fc9 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc @@ -5,7 +5,7 @@ Index: chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc // Note that this initializes the delegate asynchronously, but since // the delegate will only be used from the IO thread, it is guaranteed // to be created before use of it expects it to be there. -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) CreateMTPDeviceAsyncDelegate( device_location, read_only, base::BindOnce(&MTPDeviceMapService::AddAsyncDelegate, diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_linux_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_linux_cc index 104df84d5..47e5c1d7a 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_linux_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_linux_cc @@ -7,7 +7,7 @@ Index: chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.c +#include "build/build_config.h" + -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) #include <linux/wireless.h> +#endif @@ -17,7 +17,7 @@ Index: chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.c bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) { DCHECK(ssid_out); -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0)); if (!ioctl_socket.is_valid()) { // AF_INET is for IPv4, so it may fail for IPv6-only hosts even when there diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_memory_details_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_memory_details_cc index 955f08d74..e4a52adae 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_memory_details_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_memory_details_cc @@ -10,7 +10,7 @@ Index: chrome/browser/memory_details.cc #include "content/public/browser/zygote_host/zygote_host_linux.h" #endif -@@ -329,7 +329,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { std::ref(process))); } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_memory_details_linux_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_memory_details_linux_cc deleted file mode 100644 index bb4daac77..000000000 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_memory_details_linux_cc +++ /dev/null @@ -1,38 +0,0 @@ -Index: chrome/browser/memory_details_linux.cc ---- chrome/browser/memory_details_linux.cc.orig -+++ chrome/browser/memory_details_linux.cc -@@ -12,6 +12,7 @@ - #include <memory> - #include <set> - -+#include "base/command_line.h" - #include "base/files/file_util.h" - #include "base/functional/bind.h" - #include "base/process/process_iterator.h" -@@ -27,6 +28,7 @@ - #include "content/public/browser/browser_task_traits.h" - #include "content/public/browser/browser_thread.h" - #include "content/public/common/process_type.h" -+#include "sandbox/policy/switches.h" - #include "ui/base/l10n/l10n_util.h" - - using base::ProcessEntry; -@@ -70,9 +72,18 @@ ProcessData GetProcessDataMemoryInformation( - - std::unique_ptr<base::ProcessMetrics> metrics( - base::ProcessMetrics::CreateProcessMetrics(pid)); -+ -+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); -+ if (!command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) { -+ pmi.num_open_fds = 0; -+ pmi.open_fds_soft_limit = 0; -+ goto out; -+ } -+ - pmi.num_open_fds = metrics->GetOpenFdCount(); - pmi.open_fds_soft_limit = metrics->GetOpenFdSoftLimit(); - -+out: - process_data.processes.push_back(pmi); - } - return process_data; diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc index d98424dc4..6a54ec6b1 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc @@ -1,7 +1,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc --- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -78,8 +78,10 @@ +@@ -79,8 +79,10 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -13,7 +13,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -108,7 +110,7 @@ +@@ -109,7 +111,7 @@ #include "chromeos/crosapi/cpp/crosapi_constants.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -22,7 +22,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -117,7 +119,7 @@ +@@ -118,7 +120,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -31,7 +31,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc #include "components/power_metrics/system_power_monitor.h" #endif -@@ -539,7 +541,7 @@ void RecordStartupMetrics() { +@@ -931,7 +933,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -40,7 +40,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -860,11 +862,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -1260,11 +1262,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc index 823f19536..d26a08e3f 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc @@ -19,7 +19,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc #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)) -@@ -788,7 +788,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -809,7 +809,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -28,7 +28,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -870,7 +870,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -891,7 +891,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -37,7 +37,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); -@@ -983,7 +983,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -1007,7 +1007,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -46,7 +46,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1182,7 +1182,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1206,7 +1206,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/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_monitor_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_monitor_cc index 691de7274..130758aab 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_monitor_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_monitor_cc @@ -1,7 +1,7 @@ Index: chrome/browser/metrics/power/process_monitor.cc --- chrome/browser/metrics/power/process_monitor.cc.orig +++ chrome/browser/metrics/power/process_monitor.cc -@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet +@@ -65,7 +65,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -10,7 +10,7 @@ Index: chrome/browser/metrics/power/process_monitor.cc metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond(); #endif #if BUILDFLAG(IS_MAC) -@@ -81,7 +81,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do +@@ -82,7 +82,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do metrics->cpu_usage *= factor; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -19,7 +19,7 @@ Index: chrome/browser/metrics/power/process_monitor.cc metrics->idle_wakeups *= factor; #endif -@@ -168,7 +168,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me +@@ -174,7 +174,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me lhs.cpu_usage += rhs.cpu_usage; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_net_system_network_context_manager_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_net_system_network_context_manager_cc index e3b09dab3..9f92440b7 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_net_system_network_context_manager_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_net_system_network_context_manager_cc @@ -10,7 +10,7 @@ Index: chrome/browser/net/system_network_context_manager.cc #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -178,7 +178,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -184,7 +184,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -19,7 +19,25 @@ Index: chrome/browser/net/system_network_context_manager.cc auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -445,7 +445,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -242,7 +242,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() + if (g_previously_failed_to_launch_sandboxed_service) { + return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; + } +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto* local_state = g_browser_process->local_state(); + #endif + +@@ -263,7 +263,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() + } + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (local_state && + local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { + return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) +@@ -494,7 +494,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -28,7 +46,7 @@ Index: chrome/browser/net/system_network_context_manager.cc pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -492,7 +492,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -541,7 +541,7 @@ SystemNetworkContextManager::SystemNetworkContextManag #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -37,7 +55,7 @@ Index: chrome/browser/net/system_network_context_manager.cc pref_change_registrar_.Add( prefs::kEnforceLocalAnchorConstraintsEnabled, base::BindRepeating(&SystemNetworkContextManager:: -@@ -541,7 +541,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -590,7 +590,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -46,7 +64,7 @@ Index: chrome/browser/net/system_network_context_manager.cc registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -570,7 +570,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -619,7 +619,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) || \ @@ -55,7 +73,16 @@ Index: chrome/browser/net/system_network_context_manager.cc // Note that the default value is not relevant because the pref is only // evaluated when it is managed. registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled, -@@ -977,7 +977,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor +@@ -628,7 +628,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe + + registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + registry->RegisterBooleanPref(prefs::kNetworkServiceSandboxEnabled, true); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) + } +@@ -980,7 +980,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/ungoogled-chromium/patches/patch-chrome_browser_new_tab_page_modules_drive_drive_service_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_new_tab_page_modules_drive_drive_service_cc index 34e37b53f..45c29b40f 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_new_tab_page_modules_drive_drive_service_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_new_tab_page_modules_drive_drive_service_cc @@ -1,7 +1,7 @@ Index: chrome/browser/new_tab_page/modules/drive/drive_service.cc --- chrome/browser/new_tab_page/modules/drive/drive_service.cc.orig +++ chrome/browser/new_tab_page/modules/drive/drive_service.cc -@@ -28,7 +28,7 @@ +@@ -32,7 +32,7 @@ #include "services/network/public/cpp/resource_request.h" namespace { diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_password_manager_password_reuse_manager_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_password_manager_password_reuse_manager_factory_cc index 0ce66097c..da38e7cfc 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_password_manager_password_reuse_manager_factory_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_password_manager_password_reuse_manager_factory_cc @@ -1,7 +1,7 @@ Index: chrome/browser/password_manager/password_reuse_manager_factory.cc --- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -106,7 +106,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic +@@ -115,7 +115,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr // 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/ungoogled-chromium/patches/patch-chrome_browser_platform_util_linux_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_platform_util_linux_cc index 8e674e0ec..c2c8abd2a 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_platform_util_linux_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_platform_util_linux_cc @@ -1,11 +1,11 @@ Index: chrome/browser/platform_util_linux.cc --- chrome/browser/platform_util_linux.cc.orig +++ chrome/browser/platform_util_linux.cc -@@ -298,7 +298,9 @@ void RunCommand(const std::string& command, +@@ -299,7 +299,9 @@ void RunCommand(const std::string& command, base::LaunchOptions options; options.current_directory = working_directory; -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) options.allow_new_privs = true; +#endif // xdg-open can fall back on mailcap which eventually might plumb through diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc index 3e721ecf5..177ca9c66 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc @@ -1,7 +1,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc --- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -209,12 +209,12 @@ +@@ -212,12 +212,12 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -16,7 +16,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc 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) || -@@ -755,14 +755,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -771,14 +771,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -33,8 +33,8 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1431,7 +1431,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::INTEGER }, +@@ -1466,7 +1466,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) @@ -42,7 +42,16 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1501,18 +1501,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1514,7 +1514,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { key::kNetworkServiceSandboxEnabled, + prefs::kNetworkServiceSandboxEnabled, + base::Value::Type::BOOLEAN }, +@@ -1540,18 +1540,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -64,7 +73,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1525,7 +1525,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1564,7 +1564,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) \ @@ -73,7 +82,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1626,7 +1626,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1665,7 +1665,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -82,7 +91,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1713,7 +1713,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1752,7 +1752,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) @@ -91,7 +100,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc // TODO(crbug.com/1454054): replace the // kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that // matches the name of the new `getAllScreensMedia` API. -@@ -1722,7 +1722,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1761,7 +1761,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) @@ -100,7 +109,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1753,7 +1753,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1792,7 +1792,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -109,7 +118,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc { key::kEnforceLocalAnchorConstraintsEnabled, prefs::kEnforceLocalAnchorConstraintsEnabled, base::Value::Type::BOOLEAN }, -@@ -1832,7 +1832,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1871,7 +1871,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -118,7 +127,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc { key::kBatterySaverModeAvailability, performance_manager::user_tuning::prefs::kBatterySaverModeState, base::Value::Type::INTEGER }, -@@ -1863,7 +1863,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1902,7 +1902,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kCloudApAuthEnabled, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) @@ -127,7 +136,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -1968,7 +1968,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2016,7 +2016,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -136,7 +145,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc handlers->AddHandler( std::make_unique<performance_manager::HighEfficiencyPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -2159,7 +2159,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2207,7 +2207,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -145,7 +154,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2216,7 +2216,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2265,7 +2265,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -154,7 +163,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); handlers->AddHandler( -@@ -2597,7 +2597,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2649,7 +2649,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -163,7 +172,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2605,7 +2605,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2657,7 +2657,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -172,7 +181,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -2618,7 +2618,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2670,7 +2670,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH handlers->AddHandler( std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>( chrome_schema)); diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc index 99023879b..c2637138c 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc @@ -1,7 +1,7 @@ Index: chrome/browser/prefs/browser_prefs.cc --- chrome/browser/prefs/browser_prefs.cc.orig +++ chrome/browser/prefs/browser_prefs.cc -@@ -462,13 +462,13 @@ +@@ -469,13 +469,13 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -17,7 +17,7 @@ Index: chrome/browser/prefs/browser_prefs.cc (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -501,7 +501,7 @@ +@@ -508,7 +508,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -26,7 +26,7 @@ Index: chrome/browser/prefs/browser_prefs.cc #include "ui/color/system_theme.h" #endif -@@ -706,7 +706,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li +@@ -713,7 +713,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li const char kPluginsShowDetails[] = "plugins.show_details"; // Deprecated 02/2023. @@ -35,7 +35,7 @@ Index: chrome/browser/prefs/browser_prefs.cc const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -949,7 +949,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS +@@ -1004,7 +1004,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Deprecated 02/2023. @@ -44,7 +44,7 @@ Index: chrome/browser/prefs/browser_prefs.cc registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1100,7 +1100,7 @@ void RegisterProfilePrefsForMigration( +@@ -1160,7 +1160,7 @@ void RegisterProfilePrefsForMigration( registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0); #endif @@ -53,7 +53,7 @@ Index: chrome/browser/prefs/browser_prefs.cc // Deprecated 08/2022. registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false); #endif -@@ -1855,12 +1855,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1957,12 +1957,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -68,7 +68,7 @@ Index: chrome/browser/prefs/browser_prefs.cc browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif -@@ -2013,7 +2013,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local +@@ -2120,7 +2120,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Added 02/2023 @@ -77,7 +77,7 @@ Index: chrome/browser/prefs/browser_prefs.cc local_state->ClearPref(kWebAppsUrlHandlerInfo); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -2178,7 +2178,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { +@@ -2290,7 +2290,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { profile_prefs->ClearPref(kProfileAvatarTutorialShown); #endif diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_printing_print_backend_service_manager_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_printing_print_backend_service_manager_cc index 6a09f90e9..18662a41f 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_printing_print_backend_service_manager_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_printing_print_backend_service_manager_cc @@ -1,25 +1,25 @@ Index: chrome/browser/printing/print_backend_service_manager.cc --- chrome/browser/printing/print_backend_service_manager.cc.orig +++ chrome/browser/printing/print_backend_service_manager.cc -@@ -687,7 +687,7 @@ PrintBackendServiceManager::RegisterClient( - query_clients_.insert(client_id); - break; - case ClientType::kQueryWithUi: --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - if (!query_with_ui_clients_.empty()) - return absl::nullopt; - #endif -@@ -960,7 +960,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate - break; +@@ -33,7 +33,7 @@ + #include "printing/buildflags/buildflags.h" + #include "printing/printing_features.h" - case ClientType::kQueryWithUi: -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // No need to update if there were other query with UI clients. - if (query_with_ui_clients_.size() > 1) - return absl::nullopt; -@@ -1017,7 +1017,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate + #include "content/public/common/content_switches.h" + #endif + +@@ -851,7 +851,7 @@ PrintBackendServiceManager::GetServiceFromBundle( + host.BindNewPipeAndPassReceiver(), + content::ServiceProcessHost::Options() + .WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + .WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi}) + #endif + .Pass()); +@@ -1024,7 +1024,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate return kNoClientsRegisteredResetOnIdleTimeout; case ClientType::kQueryWithUi: diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc index 0a8daf362..7c9ea0af5 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc @@ -1,7 +1,7 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -375,18 +375,18 @@ +@@ -379,18 +379,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -23,31 +23,44 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #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" -@@ -567,7 +567,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -589,7 +589,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + if (breadcrumbs::IsEnabled()) { BreadcrumbManagerKeyedServiceFactory::GetInstance(); } - browser_sync::UserEventServiceFactory::GetInstance(); -#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::BrowserSwitcherServiceFactory::GetInstance(); #endif - BrowsingDataHistoryObserverService::Factory::GetInstance(); -@@ -644,12 +644,12 @@ void ChromeBrowserMainExtraPartsProfiles:: - #if !BUILDFLAG(IS_ANDROID) - DriveServiceFactory::GetInstance(); - #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - enterprise_signals::SignalsAggregatorFactory::GetInstance(); + browser_sync::UserEventServiceFactory::GetInstance(); +@@ -675,23 +675,23 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif enterprise::ProfileIdServiceFactory::GetInstance(); #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(); -@@ -762,12 +762,12 @@ void ChromeBrowserMainExtraPartsProfiles:: + enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); + #endif + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + enterprise_idle::IdleServiceFactory::GetInstance(); + #endif + #if !BUILDFLAG(IS_CHROMEOS_ASH) + enterprise_reporting::CloudProfileReportingServiceFactory::GetInstance(); + #endif + enterprise_reporting::LegacyTechServiceFactory::GetInstance(); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + enterprise_signals::SignalsAggregatorFactory::GetInstance(); + #endif + #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(); + #endif + #if BUILDFLAG(ENABLE_SESSION_SERVICE) +@@ -794,7 +794,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -56,18 +69,21 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - enterprise_idle::IdleServiceFactory::GetInstance(); +@@ -888,7 +888,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + #if BUILDFLAG(IS_CHROMEOS) + policy::PolicyCertServiceFactory::GetInstance(); + #endif +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); + #endif + policy::UserCloudPolicyInvalidatorFactory::GetInstance(); +@@ -929,7 +929,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + #if !BUILDFLAG(IS_ANDROID) + ProfileThemeUpdateServiceFactory::GetInstance(); #endif - ModelTypeStoreServiceFactory::GetInstance(); -@@ -841,7 +841,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - PredictionServiceFactory::GetInstance(); - - PrimaryAccountPolicyManagerFactory::GetInstance(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ProfileTokenWebSigninInterceptorFactory::GetInstance(); - policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); #endif + #if !BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_profile_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_profile_impl_cc index c39efd942..cfc05e10d 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_profile_impl_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_profiles_profile_impl_cc @@ -1,7 +1,7 @@ Index: chrome/browser/profiles/profile_impl.cc --- chrome/browser/profiles/profile_impl.cc.orig +++ chrome/browser/profiles/profile_impl.cc -@@ -260,6 +260,10 @@ +@@ -256,6 +256,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -12,7 +12,7 @@ Index: chrome/browser/profiles/profile_impl.cc using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -604,7 +608,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async +@@ -598,7 +602,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async #else { #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -21,7 +21,7 @@ Index: chrome/browser/profiles/profile_impl.cc ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage() -@@ -868,7 +872,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -860,7 +864,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_html b/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_html index 3b41584f3..1ca92c7e1 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_html +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_html @@ -19,7 +19,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.html <div class="settings-row continuation" hidden="[[!showThemesSecondary_( prefs.extensions.theme.id.value, systemTheme_)]]" -@@ -154,7 +154,7 @@ +@@ -172,7 +172,7 @@ </div> </template> diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_ts b/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_ts index 6eef390b3..917731675 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_ts +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_ts @@ -1,7 +1,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts --- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig +++ chrome/browser/resources/settings/appearance_page/appearance_page.ts -@@ -64,7 +64,7 @@ export interface SettingsAppearancePageElement { +@@ -72,7 +72,7 @@ export interface SettingsAppearancePageElement { export enum SystemTheme { // Either classic or web theme. DEFAULT = 0, @@ -10,7 +10,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts GTK = 1, QT = 2, // </if> -@@ -156,7 +156,7 @@ export class SettingsAppearancePageElement extends +@@ -193,7 +193,7 @@ export class SettingsAppearancePageElement extends 'prefs.autogenerated.theme.policy.color.controlledBy)', }, @@ -19,7 +19,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts /** * Whether to show the "Custom Chrome Frame" setting. */ -@@ -192,7 +192,7 @@ export class SettingsAppearancePageElement extends +@@ -229,7 +229,7 @@ export class SettingsAppearancePageElement extends 'themeChanged_(' + 'prefs.extensions.theme.id.value, systemTheme_, isForcedTheme_)', @@ -28,7 +28,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts 'systemThemePrefChanged_(prefs.extensions.theme.system_theme.value)', // </if> ]; -@@ -212,7 +212,7 @@ export class SettingsAppearancePageElement extends +@@ -253,7 +253,7 @@ export class SettingsAppearancePageElement extends private isForcedTheme_: boolean; private showHoverCardImagesOption_: boolean; @@ -37,7 +37,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts private showCustomChromeFrame_: boolean; // </if> -@@ -290,7 +290,7 @@ export class SettingsAppearancePageElement extends +@@ -354,7 +354,7 @@ export class SettingsAppearancePageElement extends this.appearanceBrowserProxy_.useDefaultTheme(); } @@ -46,7 +46,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts private systemThemePrefChanged_(systemTheme: SystemTheme) { this.systemTheme_ = systemTheme; } -@@ -362,7 +362,7 @@ export class SettingsAppearancePageElement extends +@@ -426,7 +426,7 @@ export class SettingsAppearancePageElement extends return; } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_route_ts b/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_route_ts index fbe2dcf7e..15eb839d2 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_route_ts +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_route_ts @@ -1,7 +1,7 @@ Index: chrome/browser/resources/settings/route.ts --- chrome/browser/resources/settings/route.ts.orig +++ chrome/browser/resources/settings/route.ts -@@ -241,7 +241,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes +@@ -231,7 +231,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes r.ACCESSIBILITY = r.ADVANCED.createSection( '/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle')); diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_cloud_content_scanning_binary_upload_service_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_cloud_content_scanning_binary_upload_service_cc index 43ddf1f82..cba879833 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_cloud_content_scanning_binary_upload_service_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_cloud_content_scanning_binary_upload_service_cc @@ -10,7 +10,7 @@ Index: chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #endif -@@ -397,7 +397,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil +@@ -398,7 +398,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil Profile* profile, const enterprise_connectors::AnalysisSettings& settings) { // Local content analysis is supported only on desktop platforms. diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_download_protection_file_analyzer_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_download_protection_file_analyzer_cc index b6f15d653..2d3aa3716 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_download_protection_file_analyzer_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_download_protection_file_analyzer_cc @@ -19,7 +19,7 @@ Index: chrome/browser/safe_browsing/download_protection/file_analyzer.cc } else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) { StartExtractDocumentFeatures(); #endif -@@ -308,7 +308,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( +@@ -310,7 +310,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( } #endif // BUILDFLAG(IS_MAC) diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_sync_chrome_sync_client_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_sync_chrome_sync_client_cc index de92c99da..b2b508fb8 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_sync_chrome_sync_client_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_sync_chrome_sync_client_cc @@ -1,8 +1,8 @@ Index: chrome/browser/sync/chrome_sync_client.cc --- chrome/browser/sync/chrome_sync_client.cc.orig +++ chrome/browser/sync/chrome_sync_client.cc -@@ -129,7 +129,7 @@ - #endif // BUILDFLAG(IS_ANDROID) +@@ -110,7 +110,7 @@ + #endif // BUILDFLAG(ENABLE_SPELLCHECK) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) @@ -10,7 +10,7 @@ Index: chrome/browser/sync/chrome_sync_client.cc #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || -@@ -477,7 +477,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -440,7 +440,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -19,7 +19,7 @@ Index: chrome/browser/sync/chrome_sync_client.cc if (base::FeatureList::IsEnabled(features::kTabGroupsSave)) { controllers.push_back(std::make_unique<syncer::ModelTypeController>( syncer::SAVED_TAB_GROUP, -@@ -490,7 +490,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -453,7 +453,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. @@ -28,7 +28,7 @@ Index: chrome/browser/sync/chrome_sync_client.cc // Dictionary sync is enabled by default. if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { controllers.push_back( -@@ -661,7 +661,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate> +@@ -609,7 +609,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate> ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) { switch (type) { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_sync_sync_service_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_sync_sync_service_factory_cc index 93dff7544..cab1f76c3 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_sync_sync_service_factory_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_sync_sync_service_factory_cc @@ -1,7 +1,7 @@ Index: chrome/browser/sync/sync_service_factory.cc --- chrome/browser/sync/sync_service_factory.cc.orig +++ chrome/browser/sync/sync_service_factory.cc -@@ -75,7 +75,7 @@ +@@ -80,7 +80,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -10,7 +10,7 @@ Index: chrome/browser/sync/sync_service_factory.cc #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_WIN) -@@ -124,7 +124,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -129,7 +129,7 @@ std::unique_ptr<KeyedService> BuildSyncService( // TODO(crbug.com/1052397): Reassess whether the following block needs to be // included in lacros-chrome once build flag switch of lacros-chrome is // complete. @@ -19,9 +19,9 @@ Index: chrome/browser/sync/sync_service_factory.cc (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); -@@ -252,7 +252,7 @@ SyncServiceFactory::SyncServiceFactory() - DependsOn(ThemeServiceFactory::GetInstance()); - #endif // !BUILDFLAG(IS_ANDROID) +@@ -251,7 +251,7 @@ SyncServiceFactory::SyncServiceFactory() + DependsOn(PasswordStoreFactory::GetInstance()); + DependsOn(PowerBookmarkServiceFactory::GetInstance()); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_group_sampler_h b/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_group_sampler_h index b20a461fb..30d376708 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_group_sampler_h +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_group_sampler_h @@ -9,8 +9,8 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.h +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) using OnOpenFdCountCallback = base::RepeatingCallback<void(int)>; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) - using OnProcessPriorityCallback = base::RepeatingCallback<void(bool)>; -@@ -42,7 +42,7 @@ class TaskGroupSampler : public base::RefCountedThread + using OnProcessPriorityCallback = +@@ -43,7 +43,7 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_memory_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, @@ -19,7 +19,7 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.h const OnOpenFdCountCallback& on_open_fd_count, #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) const OnProcessPriorityCallback& on_process_priority); -@@ -62,7 +62,7 @@ class TaskGroupSampler : public base::RefCountedThread +@@ -63,7 +63,7 @@ class TaskGroupSampler : public base::RefCountedThread double RefreshCpuUsage(); int64_t RefreshSwappedMem(); int RefreshIdleWakeupsPerSecond(); @@ -27,8 +27,8 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.h +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) int RefreshOpenFdCount(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) - bool RefreshProcessPriority(); -@@ -86,7 +86,7 @@ class TaskGroupSampler : public base::RefCountedThread + base::Process::Priority RefreshProcessPriority(); +@@ -87,7 +87,7 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback on_cpu_refresh_callback_; const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_; const OnIdleWakeupsCallback on_idle_wakeups_callback_; diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_cc index 371cdc4f4..53a9f6788 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_cc @@ -10,7 +10,7 @@ Index: chrome/browser/themes/theme_service.cc #include "ui/linux/linux_ui.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -317,7 +317,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -333,7 +333,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() } bool ThemeService::ShouldUseCustomFrame() const { diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_factory_cc index de305d297..67ed57422 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_factory_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_factory_cc @@ -1,7 +1,7 @@ Index: chrome/browser/themes/theme_service_factory.cc --- chrome/browser/themes/theme_service_factory.cc.orig +++ chrome/browser/themes/theme_service_factory.cc -@@ -26,11 +26,11 @@ +@@ -27,11 +27,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -15,7 +15,7 @@ Index: chrome/browser/themes/theme_service_factory.cc #include "ui/linux/linux_ui_factory.h" #endif -@@ -102,7 +102,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; +@@ -103,7 +103,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; KeyedService* ThemeServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { @@ -24,7 +24,7 @@ Index: chrome/browser/themes/theme_service_factory.cc using ThemeService = ThemeServiceAuraLinux; #endif -@@ -116,9 +116,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( +@@ -117,9 +117,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/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_chrome_autofill_client_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_chrome_autofill_client_cc new file mode 100644 index 000000000..25fdc05b7 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_autofill_chrome_autofill_client_cc @@ -0,0 +1,18 @@ +Index: chrome/browser/ui/autofill/chrome_autofill_client.cc +--- chrome/browser/ui/autofill/chrome_autofill_client.cc.orig ++++ chrome/browser/ui/autofill/chrome_autofill_client.cc +@@ -1100,7 +1100,14 @@ void ChromeAutofillClient::PropagateAutofillPrediction + &renderer_form); + } + ++#if defined(__clang__) && (__clang_major__ >= 16) + for (const auto& [frame_token, frame_forms] : renderer_forms_by_frame) { ++#else ++ for (const auto& r_f : renderer_forms_by_frame) { ++ const auto& [f_t, f_f] = r_f; ++ const auto& frame_token = f_t; ++ const auto& frame_forms = f_f; ++#endif + // Attempt to find the RFH with this `frame_token`. + content::RenderFrameHost* rfh = nullptr; + GetWebContents().ForEachRenderFrameHost( diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc index 59c543fbb..e6df9e8e7 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/browser_command_controller.cc --- chrome/browser/ui/browser_command_controller.cc.orig +++ chrome/browser/ui/browser_command_controller.cc -@@ -122,7 +122,7 @@ +@@ -123,7 +123,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -10,7 +10,7 @@ Index: chrome/browser/ui/browser_command_controller.cc #include "ui/linux/linux_ui.h" #endif -@@ -303,7 +303,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -304,7 +304,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -19,7 +19,7 @@ Index: chrome/browser/ui/browser_command_controller.cc // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -554,7 +554,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -555,7 +555,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -28,7 +28,7 @@ Index: chrome/browser/ui/browser_command_controller.cc case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -566,7 +566,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -567,7 +567,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -37,7 +37,7 @@ Index: chrome/browser/ui/browser_command_controller.cc case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -1208,12 +1208,12 @@ void BrowserCommandController::InitCommandState() { +@@ -1210,12 +1210,12 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_h index 441099b8f..68eb8518a 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_h +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_h @@ -1,7 +1,7 @@ Index: chrome/browser/ui/browser.h --- chrome/browser/ui/browser.h.orig +++ chrome/browser/ui/browser.h -@@ -290,7 +290,7 @@ class Browser : public TabStripModelObserver, +@@ -289,7 +289,7 @@ class Browser : public TabStripModelObserver, int32_t restore_id = kDefaultRestoreId; #endif diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_cc index 63b9d68f1..2249ab1d3 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_cc @@ -10,7 +10,7 @@ Index: chrome/browser/ui/chrome_pages.cc #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -622,7 +622,7 @@ void ShowShortcutCustomizationApp(Profile* profile) { +@@ -616,7 +616,7 @@ void ShowShortcutCustomizationApp(Profile* profile) { } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_h index c3346e867..02a215210 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_h +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_h @@ -10,7 +10,7 @@ Index: chrome/browser/ui/chrome_pages.h namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -233,7 +233,7 @@ void ShowShortcutCustomizationApp(Profile* profile); +@@ -237,7 +237,7 @@ void ShowShortcutCustomizationApp(Profile* profile); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_color_native_chrome_color_mixer_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_color_native_chrome_color_mixer_cc index 01006b029..0c51c04d9 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_color_native_chrome_color_mixer_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_color_native_chrome_color_mixer_cc @@ -8,5 +8,5 @@ Index: chrome/browser/ui/color/native_chrome_color_mixer.cc - !BUILDFLAG(IS_WIN) + !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) void AddNativeChromeColorMixer(ui::ColorProvider* provider, - const ui::ColorProviderManager::Key& key) {} + const ui::ColorProviderKey& key) {} #endif diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_managed_ui_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_managed_ui_cc deleted file mode 100644 index f6aa1b9d3..000000000 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_managed_ui_cc +++ /dev/null @@ -1,12 +0,0 @@ -Index: chrome/browser/ui/managed_ui.cc ---- chrome/browser/ui/managed_ui.cc.orig -+++ chrome/browser/ui/managed_ui.cc -@@ -95,7 +95,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. - DCHECK( diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_chrome_omnibox_client_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_chrome_omnibox_client_cc index aef96c6bd..0e8ee04ae 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_chrome_omnibox_client_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_chrome_omnibox_client_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/omnibox/chrome_omnibox_client.cc --- chrome/browser/ui/omnibox/chrome_omnibox_client.cc.orig +++ chrome/browser/ui/omnibox/chrome_omnibox_client.cc -@@ -470,10 +470,18 @@ void ChromeOmniboxClient::OnAutocompleteAccept( +@@ -474,10 +474,18 @@ void ChromeOmniboxClient::OnAutocompleteAccept( alternative_nav_match); // Store the details necessary to open the omnibox match via browser commands. diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_omnibox_pedal_implementations_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_omnibox_pedal_implementations_cc index 43179fbe4..33e59262f 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_omnibox_pedal_implementations_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_omnibox_omnibox_pedal_implementations_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc --- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig +++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc -@@ -1960,7 +1960,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { +@@ -1961,7 +1961,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled() ? omnibox::kShareWinChromeRefreshIcon : omnibox::kShareWinIcon; diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_view_controller_delegate_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_view_controller_delegate_h index 9e87cca5b..e36d286eb 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_view_controller_delegate_h +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_view_controller_delegate_h @@ -1,7 +1,7 @@ Index: chrome/browser/ui/signin_view_controller_delegate.h --- chrome/browser/ui/signin_view_controller_delegate.h.orig +++ chrome/browser/ui/signin_view_controller_delegate.h -@@ -83,7 +83,7 @@ class SigninViewControllerDelegate { +@@ -81,7 +81,7 @@ class SigninViewControllerDelegate { #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_bad_flags_prompt_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_bad_flags_prompt_cc index 349e6c11f..81027588a 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_bad_flags_prompt_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_bad_flags_prompt_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/startup/bad_flags_prompt.cc --- chrome/browser/ui/startup/bad_flags_prompt.cc.orig +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -94,7 +94,7 @@ static const char* kBadFlags[] = { +@@ -95,7 +95,7 @@ static const char* kBadFlags[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_tab_helpers_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_tab_helpers_cc index fdfc7649b..88ed507a4 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_tab_helpers_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_tab_helpers_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/tab_helpers.cc --- chrome/browser/ui/tab_helpers.cc.orig +++ chrome/browser/ui/tab_helpers.cc -@@ -217,7 +217,7 @@ +@@ -223,7 +223,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -10,7 +10,7 @@ Index: chrome/browser/ui/tab_helpers.cc #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" -@@ -567,12 +567,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -597,12 +597,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/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_cc index 241d8a62a..3c7c241b3 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/ui_features.cc --- chrome/browser/ui/ui_features.cc.orig +++ chrome/browser/ui/ui_features.cc -@@ -271,7 +271,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -288,7 +288,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, "TopChromeWebUIUsesSpareRenderer", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_h index 7717dedf2..5ff4db1c2 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_h +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_ui_features_h @@ -1,7 +1,7 @@ Index: chrome/browser/ui/ui_features.h --- chrome/browser/ui/ui_features.h.orig +++ chrome/browser/ui/ui_features.h -@@ -183,7 +183,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); +@@ -191,7 +191,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_accelerator_table_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_accelerator_table_cc index debecbcd6..77e59be8b 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_accelerator_table_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_accelerator_table_cc @@ -40,5 +40,5 @@ Index: chrome/browser/ui/views/accelerator_table.cc - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) {ui::VKEY_S, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, - IDC_RUN_SCREEN_AI_VISUAL_ANNOTATIONS}, + IDC_CONTENT_CONTEXT_RUN_LAYOUT_EXTRACTION}, #endif diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_eye_dropper_eye_dropper_view_aura_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_eye_dropper_eye_dropper_view_aura_cc index dbe48c761..bb120185d 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_eye_dropper_eye_dropper_view_aura_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_eye_dropper_eye_dropper_view_aura_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc --- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig +++ chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc -@@ -87,7 +87,7 @@ void EyeDropperView::MoveViewToFront() { +@@ -119,7 +119,7 @@ void EyeDropperView::MoveViewToFront() { } void EyeDropperView::CaptureInputIfNeeded() { diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_cc index 5ee404a5e..c98af8928 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_frame_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc --- chrome/browser/ui/views/frame/browser_frame.cc.orig +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -51,7 +51,7 @@ +@@ -54,7 +54,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc #include "ui/display/screen.h" #include "ui/linux/linux_ui.h" #endif -@@ -63,7 +63,7 @@ +@@ -66,7 +66,7 @@ namespace { bool IsUsingLinuxSystemTheme(Profile* profile) { @@ -19,7 +19,7 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -303,7 +303,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -319,7 +319,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(), IsVisibleOnAllWorkspaces()); @@ -28,7 +28,7 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc // 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() -@@ -508,7 +508,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -547,7 +547,7 @@ void BrowserFrame::SelectNativeTheme() { return; } @@ -37,7 +37,7 @@ Index: chrome/browser/ui/views/frame/browser_frame.cc const auto* linux_ui_theme = ui::LinuxUiTheme::GetForWindow(GetNativeWindow()); // Ignore the system theme for web apps with window-controls-overlay as the -@@ -525,7 +525,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -564,7 +564,7 @@ void BrowserFrame::SelectNativeTheme() { bool BrowserFrame::RegenerateFrameOnThemeChange( BrowserThemeChangeType theme_change_type) { bool need_regenerate = false; diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc index 138955049..543775b46 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/views/frame/browser_view.cc --- chrome/browser/ui/views/frame/browser_view.cc.orig +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2019,7 +2019,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2080,7 +2080,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/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_cc index 1a6ae7dcc..4141a6570 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc --- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -46,7 +46,7 @@ +@@ -56,7 +56,7 @@ #include "ui/aura/window.h" #endif @@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc #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 -@@ -68,7 +68,7 @@ constexpr int kBackToTabImageSize = 16; +@@ -78,7 +78,7 @@ constexpr int kBackToTabImageSize = 16; // The height of the controls bar at the top of the window. constexpr int kTopControlsHeight = 30; @@ -19,7 +19,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc // Frame border when window shadow is not drawn. constexpr int kFrameBorderThickness = 4; #endif -@@ -160,7 +160,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -173,7 +173,7 @@ class WindowEventObserver : public ui::EventObserver { gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); @@ -28,16 +28,16 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc // 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()) { -@@ -359,7 +359,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow - hide_close_button_animation_.set_continuous(false); - hide_close_button_animation_.set_delegate(this); +@@ -399,7 +399,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow + } + #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) frame_background_ = std::make_unique<views::FrameBackground>(); #endif -@@ -492,7 +492,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -578,7 +578,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( for (ContentSettingImageView* view : content_setting_views_) view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); @@ -46,7 +46,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc // On Linux the top bar background will be drawn in OnPaint(). top_bar_container_view_->SetBackground(views::CreateSolidBackground( color_provider->GetColor(kColorPipWindowTopBarBackground))); -@@ -537,7 +537,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -634,7 +634,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -55,7 +55,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -745,7 +745,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -875,7 +875,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre // views::View implementations: void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { @@ -64,7 +64,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc // Draw the PiP window frame borders and shadows, including the top bar // background. if (window_frame_provider_) { -@@ -868,7 +868,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -998,7 +998,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -73,7 +73,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const auto tiled_edges = frame()->tiled_edges(); -@@ -889,7 +889,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1019,7 +1019,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { @@ -82,7 +82,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc return FrameBorderInsets(); #elif BUILDFLAG(IS_CHROMEOS_ASH) return gfx::Insets(chromeos::kResizeInsideBoundsSize); -@@ -910,7 +910,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1040,7 +1040,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_h index 93d43779c..30288834b 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_h +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_picture_in_picture_browser_frame_view_h @@ -1,7 +1,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h --- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ #include "ui/views/controls/image_view.h" #include "ui/views/widget/widget_observer.h" @@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h #include "ui/linux/window_frame_provider.h" #endif -@@ -80,7 +80,7 @@ class PictureInPictureBrowserFrameView +@@ -86,7 +86,7 @@ class PictureInPictureBrowserFrameView void Layout() override; void AddedToWidget() override; void RemovedFromWidget() override; @@ -19,7 +19,7 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h gfx::Insets MirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -166,7 +166,7 @@ class PictureInPictureBrowserFrameView +@@ -175,7 +175,7 @@ class PictureInPictureBrowserFrameView // Called when mouse entered or exited the pip window. void OnMouseEnteredOrExitedWindow(bool entered); @@ -28,9 +28,9 @@ Index: chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h // Sets the window frame provider so that it will be used for drawing. void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider); -@@ -241,7 +241,7 @@ class PictureInPictureBrowserFrameView - gfx::MultiAnimation show_close_button_animation_; - gfx::MultiAnimation hide_close_button_animation_; +@@ -258,7 +258,7 @@ class PictureInPictureBrowserFrameView + // `top_bar_color_animation_`. + absl::optional<SkColor> current_foreground_color_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc index 44ae7571b..82fb12e03 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/views/frame/system_menu_model_builder.cc --- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -76,7 +76,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -75,7 +75,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser ui::SimpleMenuModel* model) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/frame/system_menu_model_builder.cc model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); -@@ -92,7 +92,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -91,7 +91,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -19,7 +19,7 @@ Index: chrome/browser/ui/views/frame/system_menu_model_builder.cc model->AddSeparator(ui::NORMAL_SEPARATOR); bool supports_server_side_decorations = true; #if BUILDFLAG(IS_OZONE) && !BUILDFLAG(IS_CHROMEOS) -@@ -148,7 +148,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -147,7 +147,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_profile_menu_view_base_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_profile_menu_view_base_cc index f44d8d228..53b3d2bd5 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_profile_menu_view_base_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_profile_menu_view_base_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/views/profiles/profile_menu_view_base.cc --- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -639,7 +639,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -651,7 +651,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_cc index 01f9fb18a..c1635e7d0 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_cc @@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc const int kEnterpriseConfirmationDialogWidth = 512; const int kEnterpriseConfirmationDialogHeight = 576; #endif -@@ -169,7 +169,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom +@@ -167,7 +167,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ Index: chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView( -@@ -446,7 +446,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -442,7 +442,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_h index ce494da6b..22b1835c3 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_h +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_profiles_signin_view_controller_delegate_views_h @@ -1,7 +1,7 @@ Index: chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h --- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h -@@ -76,7 +76,7 @@ class SigninViewControllerDelegateViews +@@ -74,7 +74,7 @@ class SigninViewControllerDelegateViews #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tab_search_bubble_host_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tab_search_bubble_host_cc index be43e08b6..da1cf541d 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tab_search_bubble_host_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tab_search_bubble_host_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/views/tab_search_bubble_host.cc --- chrome/browser/ui/views/tab_search_bubble_host.cc.orig +++ chrome/browser/ui/views/tab_search_bubble_host.cc -@@ -171,7 +171,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT +@@ -184,7 +184,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT // Mac should have tabsearch on the right side. Windows >= Win10 has the // Tab Search button as a FrameCaptionButton, but it still needs to be on the // left if it exists. diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_cc index 6384dee10..dd6203fe6 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/views/tabs/tab.cc --- chrome/browser/ui/views/tabs/tab.cc.orig +++ chrome/browser/ui/views/tabs/tab.cc -@@ -585,7 +585,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -594,7 +594,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc index 5f9810e0b..f9f38d196 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc --- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -86,7 +86,7 @@ +@@ -89,7 +89,7 @@ #include "components/remote_cocoa/browser/window.h" #endif @@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc #include "ui/aura/client/drag_drop_client.h" #endif -@@ -203,7 +203,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -206,7 +206,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { void UpdateSystemDnDDragImage(TabDragContext* attached_context, const gfx::ImageSkia& image) { @@ -19,7 +19,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc aura::Window* root_window = attached_context->GetWidget()->GetNativeWindow()->GetRootWindow(); if (aura::client::GetDragDropClient(root_window)) { -@@ -383,7 +383,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -386,7 +386,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - ChromeOS Ash // Releasing capture on Ash cancels gestures so avoid it. @@ -28,7 +28,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -994,7 +994,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1011,7 +1011,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -37,7 +37,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2033,7 +2033,7 @@ void TabDragController::CompleteDrag() { +@@ -2051,7 +2051,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -46,7 +46,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc // Keeping maximized state breaks snap to Grid on Windows when dragging // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in -@@ -2440,7 +2440,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2465,7 +2465,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_hover_card_bubble_view_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_hover_card_bubble_view_cc index 8ea497915..976272dc6 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_hover_card_bubble_view_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_hover_card_bubble_view_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc --- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc -@@ -364,7 +364,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -372,7 +372,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/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_style_views_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_style_views_cc new file mode 100644 index 000000000..2c2b010c2 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_tabs_tab_style_views_cc @@ -0,0 +1,12 @@ +Index: chrome/browser/ui/views/tabs/tab_style_views.cc +--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig ++++ chrome/browser/ui/views/tabs/tab_style_views.cc +@@ -487,7 +487,7 @@ float GM2TabStyleViews::GetCurrentActiveOpacity() cons + if (!IsHoverAnimationActive()) { + return base_opacity; + } +- return std::lerp(base_opacity, GetHoverOpacity(), GetHoverAnimationValue()); ++ return std::lerp(base_opacity, GetHoverOpacity(), static_cast<float>(GetHoverAnimationValue())); + } + + TabActive GM2TabStyleViews::GetApparentActiveState() const { diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_web_apps_web_app_integration_test_driver_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_web_apps_web_app_integration_test_driver_cc index 3ac6b99fc..49363ecd0 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_web_apps_web_app_integration_test_driver_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_web_apps_web_app_integration_test_driver_cc @@ -1,25 +1,16 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc --- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc -@@ -409,7 +409,7 @@ std::string GetFileExtension(FileExtension file_extens +@@ -416,7 +416,7 @@ std::string GetFileExtension(FileExtension file_extens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_BSD) SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -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. --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - ASSERT_TRUE(override_registration_->test_override->ForceDeleteAllShortcuts()); - #endif - LOG(INFO) -@@ -1829,7 +1829,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -1862,7 +1862,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc if (app_name.empty()) { app_name = GetSiteConfiguration(site).app_name; } @@ -28,7 +19,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated( profile(), app_id, app_name)); ASSERT_TRUE( -@@ -3069,7 +3069,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3106,7 +3106,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())); @@ -37,7 +28,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3084,7 +3084,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3121,7 +3121,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site); ASSERT_TRUE(app_state); base::ScopedAllowBlockingForTesting allow_blocking; @@ -46,7 +37,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3094,7 +3094,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3131,7 +3131,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -55,7 +46,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3110,7 +3110,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3147,7 +3147,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -64,7 +55,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3859,7 +3859,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -3939,7 +3939,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, const AppId& app_id) { @@ -73,7 +64,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc return override_registration_->test_override->GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -4042,7 +4042,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4126,7 +4126,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre const AppId& id) { base::ScopedAllowBlockingForTesting allow_blocking; bool is_shortcut_and_icon_correct = false; @@ -82,7 +73,7 @@ Index: chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc bool is_shortcut_correct = override_registration_->test_override->IsShortcutCreated(profile, id, name); -@@ -4086,7 +4086,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4170,7 +4170,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr do_icon_colors_match = (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webauthn_sheet_models_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webauthn_sheet_models_cc new file mode 100644 index 000000000..4caac0160 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webauthn_sheet_models_cc @@ -0,0 +1,15 @@ +Index: chrome/browser/ui/webauthn/sheet_models.cc +--- chrome/browser/ui/webauthn/sheet_models.cc.orig ++++ chrome/browser/ui/webauthn/sheet_models.cc +@@ -1496,7 +1496,11 @@ AuthenticatorMultiSourcePickerSheetModel:: + + using CredentialMech = AuthenticatorRequestDialogModel::Mechanism::Credential; + bool has_local_passkeys = ++#if (_LIBCPP_VERSION >= 160000) + std::ranges::any_of(dialog_model->mechanisms(), [](const auto& mech) { ++#else ++ base::ranges::any_of(dialog_model->mechanisms(), [](const auto& mech) { ++#endif + return absl::holds_alternative<CredentialMech>(mech.type) && + absl::get<CredentialMech>(mech.type).value() != + device::AuthenticatorType::kPhone; diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_app_home_app_home_page_handler_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_app_home_app_home_page_handler_cc index aaecb52dd..800e535a7 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_app_home_app_home_page_handler_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_app_home_app_home_page_handler_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/webui/app_home/app_home_page_handler.cc --- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc -@@ -416,7 +416,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create +@@ -415,7 +415,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create bool deprecated_app = false; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -10,7 +10,7 @@ Index: chrome/browser/ui/webui/app_home/app_home_page_handler.cc auto* context = extension_system_->extension_service()->GetBrowserContext(); deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); -@@ -479,7 +479,7 @@ void AppHomePageHandler::FillExtensionInfoList( +@@ -478,7 +478,7 @@ void AppHomePageHandler::FillExtensionInfoList( } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc index 20ed2fd49..cfd8bb023 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc --- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -213,7 +213,7 @@ +@@ -214,7 +214,7 @@ #include "chrome/browser/ui/webui/app_launcher_page_ui.h" #endif @@ -10,7 +10,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -239,17 +239,17 @@ +@@ -240,17 +240,17 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +31,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -399,7 +399,7 @@ bool IsAboutUI(const GURL& url) { +@@ -403,7 +403,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -40,7 +40,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -665,7 +665,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -668,7 +668,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI<ash::cellular_setup::MobileSetupUI>; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -49,7 +49,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -727,7 +727,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -730,7 +730,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -58,7 +58,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -794,27 +794,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -797,27 +797,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_cc index 3cf733178..8e0a09905 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/webui/management/management_ui_handler.cc --- chrome/browser/ui/webui/management/management_ui_handler.cc.orig +++ chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -85,7 +85,7 @@ +@@ -90,7 +90,7 @@ #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -10,7 +10,7 @@ Index: chrome/browser/ui/webui/management/management_ui_handler.cc #include "chrome/browser/enterprise/signals/user_permission_service_factory.h" #include "components/device_signals/core/browser/user_permission_service.h" // nogncheck #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -177,12 +177,12 @@ enum class ReportingType { +@@ -182,12 +182,12 @@ enum class ReportingType { kUserActivity }; @@ -25,7 +25,7 @@ Index: chrome/browser/ui/webui/management/management_ui_handler.cc const char kManagementDeviceSignalsDisclosure[] = "managementDeviceSignalsDisclosure"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -737,7 +737,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value +@@ -746,7 +746,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value GetReportingTypeValue(report_definition.reporting_type)); report_sources->Append(std::move(data)); } @@ -34,7 +34,7 @@ Index: chrome/browser/ui/webui/management/management_ui_handler.cc // Insert the device signals consent disclosure at the end of browser // reporting section. auto* user_permission_service = GetUserPermissionService(); -@@ -1008,7 +1008,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec +@@ -1024,7 +1024,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec &info); } @@ -43,7 +43,7 @@ Index: chrome/browser/ui/webui/management/management_ui_handler.cc if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) { AddThreatProtectionPermission(kManagementScreenCaptureEvent, kManagementScreenCaptureData, &info); -@@ -1053,7 +1053,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS +@@ -1108,7 +1108,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS ->policy_service(); } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_h b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_h index 6e0b5f08b..78f20fc22 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_h +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_management_management_ui_handler_h @@ -27,9 +27,9 @@ Index: chrome/browser/ui/webui/management/management_ui_handler.h namespace device_signals { class UserPermissionService; } // namespace device_signals -@@ -173,7 +173,7 @@ class ManagementUIHandler : public content::WebUIMessa - base::Value::Dict GetThreatProtectionInfo(Profile* profile); +@@ -174,7 +174,7 @@ class ManagementUIHandler : public content::WebUIMessa base::Value::List GetManagedWebsitesInfo(Profile* profile) const; + base::Value::List GetApplicationsInfo(Profile* profile) const; virtual policy::PolicyService* GetPolicyService(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_ntp_app_launcher_handler_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_ntp_app_launcher_handler_cc index e64f79eed..a6d5e2005 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_ntp_app_launcher_handler_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_ntp_app_launcher_handler_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc --- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig +++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -321,7 +321,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI +@@ -320,7 +320,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/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_realbox_realbox_handler_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_realbox_realbox_handler_cc index e61e3eb8f..efc5f16a0 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_realbox_realbox_handler_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_realbox_realbox_handler_cc @@ -10,7 +10,7 @@ Index: chrome/browser/ui/webui/realbox/realbox_handler.cc constexpr char kLinuxShareIconResourceName[] = "//resources/cr_components/omnibox/icons/share.svg"; #else -@@ -735,7 +735,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN +@@ -740,7 +740,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN icon.name == omnibox::kShareWinChromeRefreshIcon.name) { return kWinShareIconResourceName; } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_settings_localized_strings_provider_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_settings_localized_strings_provider_cc index af3a6799d..df4e42df2 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_settings_localized_strings_provider_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_webui_settings_settings_localized_strings_provider_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc --- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -133,7 +133,7 @@ +@@ -134,7 +134,7 @@ #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #endif @@ -10,7 +10,7 @@ Index: chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc #include "ui/display/screen.h" #endif -@@ -153,7 +153,7 @@ +@@ -154,7 +154,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -19,7 +19,7 @@ Index: chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -253,7 +253,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s +@@ -254,7 +254,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s base::FeatureList::IsEnabled( supervised_user::kClearingCookiesKeepsSupervisedUsersSignedIn)); @@ -28,7 +28,7 @@ Index: chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt); #else bool allow_qt_theme = false; -@@ -408,7 +408,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -415,7 +415,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}, @@ -37,7 +37,7 @@ Index: chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -418,7 +418,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -425,7 +425,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -46,7 +46,7 @@ Index: chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -443,7 +443,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -450,7 +450,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/ungoogled-chromium/patches/patch-chrome_browser_ui_window_sizer_window_sizer_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_window_sizer_window_sizer_cc index accfe401f..f25f41198 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_ui_window_sizer_window_sizer_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_ui_window_sizer_window_sizer_cc @@ -1,7 +1,7 @@ Index: chrome/browser/ui/window_sizer/window_sizer.cc --- chrome/browser/ui/window_sizer/window_sizer.cc.orig +++ chrome/browser/ui/window_sizer/window_sizer.cc -@@ -215,7 +215,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( +@@ -216,7 +216,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( browser, window_bounds, show_state); } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_run_on_os_login_sub_manager_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_run_on_os_login_sub_manager_cc index e30e8ce94..46d96ef40 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_run_on_os_login_sub_manager_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_run_on_os_login_sub_manager_cc @@ -1,7 +1,7 @@ Index: chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc --- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig +++ chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc -@@ -53,7 +53,7 @@ proto::RunOnOsLoginMode ConvertWebAppRunOnOsLoginModeT +@@ -54,7 +54,7 @@ proto::RunOnOsLoginMode ConvertWebAppRunOnOsLoginModeT // different from other platforms, see web_app_run_on_os_login_manager.h for // more info. bool DoesRunOnOsLoginRequireExecution() { diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_shortcut_sub_manager_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_shortcut_sub_manager_cc index 3661d3eab..a21b28929 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_shortcut_sub_manager_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_shortcut_sub_manager_cc @@ -1,7 +1,7 @@ Index: chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc --- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig +++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc -@@ -166,7 +166,7 @@ void ShortcutSubManager::Execute( +@@ -171,7 +171,7 @@ void ShortcutSubManager::Execute( return; } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_cc index a54b9caf8..a552e5fc8 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_cc @@ -10,7 +10,7 @@ Index: chrome/browser/web_applications/os_integration/web_app_shortcut.cc // Linux supports icons of any size. FreeDesktop Icon Theme Specification states // that "Minimally you should install a 48x48 icon in the hicolor theme." const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512}; -@@ -221,7 +221,7 @@ std::unique_ptr<ShortcutInfo> BuildShortcutInfoWithout +@@ -227,7 +227,7 @@ std::unique_ptr<ShortcutInfo> BuildShortcutInfoWithout // TODO(crbug.com/1416965): Implement tests on Linux for using shortcuts_menu // actions. diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_h b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_h index 5c05fa55f..a73e0b5f9 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_h +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_h @@ -10,7 +10,7 @@ Index: chrome/browser/web_applications/os_integration/web_app_shortcut.h #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h" #endif // BUILDFLAG(IS_LINUX) -@@ -69,7 +69,7 @@ struct ShortcutInfo { +@@ -70,7 +70,7 @@ struct ShortcutInfo { std::set<std::string> file_handler_extensions; std::set<std::string> file_handler_mime_types; std::set<std::string> protocol_handlers; diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_manager_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_manager_cc index c3f201a1c..3aaa5d89e 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_manager_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_os_integration_web_app_shortcut_manager_cc @@ -1,7 +1,7 @@ Index: chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc --- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig +++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc -@@ -436,7 +436,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B +@@ -434,7 +434,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B } } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_test_os_integration_test_override_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_test_os_integration_test_override_impl_cc index b3bbc518f..c40ec62d9 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_test_os_integration_test_override_impl_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_test_os_integration_test_override_impl_cc @@ -19,16 +19,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.cc base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); LOG(INFO) << desktop_shortcut_path; -@@ -241,7 +241,7 @@ bool OsIntegrationTestOverrideImpl::ForceDeleteAllShor - return DeleteDesktopDirOnWin() && DeleteApplicationMenuDirOnWin(); - #elif BUILDFLAG(IS_MAC) - return DeleteChromeAppsDir(); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return DeleteDesktopDirOnLinux(); - #else - NOTREACHED() << "Not implemented on ChromeOS/Fuchsia "; -@@ -277,7 +277,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM +@@ -264,7 +264,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM } #endif // BUILDFLAG(IS_WIN) @@ -37,7 +28,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.cc bool OsIntegrationTestOverrideImpl::DeleteDesktopDirOnLinux() { if (desktop_.IsValid()) { return desktop_.Delete(); -@@ -291,7 +291,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab +@@ -278,7 +278,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab Profile* profile, const AppId& app_id, const std::string& app_name) { @@ -46,7 +37,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.cc std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; return base::PathExists(startup().Append(shortcut_filename)); -@@ -347,7 +347,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan +@@ -334,7 +334,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan is_file_handled = shell_integration::CanApplicationHandleURL(app_path, test_file_url); base::DeleteFile(test_file_path); @@ -55,7 +46,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.cc base::FilePath user_applications_dir = applications_dir().Append("applications"); bool database_update_called = false; -@@ -391,7 +391,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC +@@ -378,7 +378,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC return absl::nullopt; } return GetIconTopLeftColorFromShortcutFile(shortcut_path); @@ -64,7 +55,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.cc WebAppProvider* provider = WebAppProvider::GetForLocalAppsUnchecked(profile); if (!provider) { return absl::nullopt; -@@ -441,7 +441,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort +@@ -428,7 +428,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort app_installed_profiles.end()) { return shortcut_path; } @@ -73,7 +64,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.cc std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename); -@@ -467,7 +467,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( +@@ -454,7 +454,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( base::FilePath app_shortcut_path = GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name); return base::PathExists(app_shortcut_path); @@ -82,7 +73,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.cc base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); return base::PathExists(desktop_shortcut_path); -@@ -656,7 +656,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat +@@ -643,7 +643,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat } #endif // BUILDFLAG(IS_MAC) @@ -91,7 +82,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.cc const base::FilePath& OsIntegrationTestOverrideImpl::desktop() { return desktop_.GetPath(); } -@@ -691,7 +691,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -678,7 +678,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri #elif BUILDFLAG(IS_MAC) bool success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(base_path); CHECK(success); @@ -100,7 +91,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.cc bool success = desktop_.CreateUniqueTempDirUnderPath(base_path); CHECK(success); success = startup_.CreateUniqueTempDirUnderPath(base_path); -@@ -712,7 +712,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -699,7 +699,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri #elif BUILDFLAG(IS_MAC) bool success = chrome_apps_folder_.CreateUniqueTempDir(); CHECK(success); @@ -109,7 +100,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.cc bool success = desktop_.CreateUniqueTempDir(); CHECK(success); success = startup_.CreateUniqueTempDir(); -@@ -722,7 +722,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -709,7 +709,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri #endif } @@ -118,7 +109,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.cc auto callback = base::BindRepeating([](base::FilePath filename_in, std::string xdg_command, std::string file_contents) { -@@ -769,7 +769,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr +@@ -756,7 +756,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr } } } diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_test_os_integration_test_override_impl_h b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_test_os_integration_test_override_impl_h index 5dc490c1d..93a7cb787 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_test_os_integration_test_override_impl_h +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_web_applications_test_os_integration_test_override_impl_h @@ -10,7 +10,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.h struct LinuxFileRegistration { base::FilePath file_name; std::string xdg_command; -@@ -116,7 +116,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra +@@ -112,7 +112,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra bool DeleteApplicationMenuDirOnWin(); #endif // BUILDFLAG(IS_WIN) @@ -19,7 +19,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.h bool DeleteDesktopDirOnLinux(); #endif // BUILDFLAG(IS_LINUX) -@@ -235,7 +235,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra +@@ -231,7 +231,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra const base::FilePath& chrome_apps_folder() override; void EnableOrDisablePathOnLogin(const base::FilePath& file_path, bool enable_on_login) override; @@ -28,7 +28,7 @@ Index: chrome/browser/web_applications/test/os_integration_test_override_impl.h const base::FilePath& desktop() override; const base::FilePath& startup() override; const base::FilePath& applications_dir() override; -@@ -282,7 +282,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra +@@ -278,7 +278,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra base::ScopedTempDir chrome_apps_folder_; std::map<base::FilePath, bool> startup_enabled_; diff --git a/www/ungoogled-chromium/patches/patch-chrome_browser_webauthn_chrome_authenticator_request_delegate_cc b/www/ungoogled-chromium/patches/patch-chrome_browser_webauthn_chrome_authenticator_request_delegate_cc index f14593dc2..8234df6c7 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_browser_webauthn_chrome_authenticator_request_delegate_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_browser_webauthn_chrome_authenticator_request_delegate_cc @@ -1,7 +1,7 @@ Index: chrome/browser/webauthn/chrome_authenticator_request_delegate.cc --- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -572,7 +572,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl +@@ -602,7 +602,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_cc b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_cc index 2a9a1cdd3..33306faab 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_cc @@ -1,7 +1,7 @@ Index: chrome/common/chrome_features.cc --- chrome/common/chrome_features.cc.orig +++ chrome/common/chrome_features.cc -@@ -76,7 +76,7 @@ BASE_FEATURE(kAsyncDns, +@@ -77,7 +77,7 @@ BASE_FEATURE(kAsyncDns, ); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -10,7 +10,7 @@ Index: chrome/common/chrome_features.cc // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. BASE_FEATURE(kAutofillAddressSurvey, -@@ -94,7 +94,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -95,7 +95,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, base::FEATURE_DISABLED_BY_DEFAULT); #endif @@ -19,7 +19,7 @@ Index: chrome/common/chrome_features.cc // 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. -@@ -287,7 +287,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, +@@ -278,7 +278,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, // Enables or disables Desktop PWAs to be auto-started on OS login. BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", @@ -28,7 +28,7 @@ Index: chrome/common/chrome_features.cc base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -322,7 +322,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, +@@ -307,7 +307,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -37,7 +37,7 @@ Index: chrome/common/chrome_features.cc // 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. -@@ -360,7 +360,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -351,7 +351,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa const base::FeatureParam<bool> kDnsOverHttpsShowUiParam { &kDnsOverHttps, "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -46,7 +46,7 @@ Index: chrome/common/chrome_features.cc true #else false -@@ -784,7 +784,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -820,7 +820,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -55,7 +55,7 @@ Index: chrome/common/chrome_features.cc BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -797,7 +797,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -833,7 +833,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_h b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_h index c0fa193d8..c89810521 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_h +++ b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_features_h @@ -17,7 +17,7 @@ Index: chrome/common/chrome_features.h COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -196,7 +196,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); +@@ -190,7 +190,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -26,7 +26,7 @@ Index: chrome/common/chrome_features.h COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps); -@@ -459,7 +459,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -487,7 +487,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); @@ -35,7 +35,7 @@ Index: chrome/common/chrome_features.h COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -467,7 +467,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -495,7 +495,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_cc b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_cc index a3a47cab2..9ef5b1aa0 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_cc @@ -1,7 +1,7 @@ Index: chrome/common/chrome_paths.cc --- chrome/common/chrome_paths.cc.orig +++ chrome/common/chrome_paths.cc -@@ -48,14 +48,14 @@ +@@ -45,14 +45,14 @@ namespace { @@ -19,18 +19,18 @@ Index: chrome/common/chrome_paths.cc #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -176,7 +176,7 @@ bool PathProvider(int key, base::FilePath* result) { - return false; +@@ -207,7 +207,7 @@ bool PathProvider(int key, base::FilePath* result) { + } break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (!GetUserDownloadsDirectorySafe(&cur)) + if (!GetUserDownloadsDirectorySafe(&cur)) { return false; - break; -@@ -419,12 +419,14 @@ bool PathProvider(int key, base::FilePath* result) { - if (!base::PathExists(cur)) // We don't want to create this + } +@@ -500,12 +500,14 @@ bool PathProvider(int key, base::FilePath* result) { return false; + } break; -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) @@ -45,16 +45,16 @@ Index: chrome/common/chrome_paths.cc #endif break; } -@@ -434,7 +436,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -515,7 +517,7 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { - if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) + if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) { return false; -@@ -442,7 +444,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -524,7 +526,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -63,7 +63,7 @@ Index: chrome/common/chrome_paths.cc case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -486,7 +488,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -571,7 +573,7 @@ bool PathProvider(int key, base::FilePath* result) { break; #endif @@ -72,17 +72,17 @@ Index: chrome/common/chrome_paths.cc case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -500,9 +502,12 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -585,9 +587,12 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) - cur = base::FilePath(FILE_PATH_LITERAL( - "/etc/opt/chrome/native-messaging-hosts")); + cur = base::FilePath( + FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts")); +#elif BUILDFLAG(IS_FREEBSD) + cur = base::FilePath(FILE_PATH_LITERAL( + "/usr/local/etc/ungoogled-chromium/native-messaging-hosts")); #else - cur = base::FilePath(FILE_PATH_LITERAL( -- "/etc/chromium/native-messaging-hosts")); -+ "/etc/ungoogled-chromium/native-messaging-hosts")); + cur = base::FilePath( +- FILE_PATH_LITERAL("/etc/chromium/native-messaging-hosts")); ++ FILE_PATH_LITERAL("/etc/ungoogled-chromium/native-messaging-hosts")); #endif #endif // !BUILDFLAG(IS_MAC) break; diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_h b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_h index dbb42046f..fa72e8cd8 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_h +++ b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_h @@ -1,7 +1,7 @@ Index: chrome/common/chrome_paths.h --- chrome/common/chrome_paths.h.orig +++ chrome/common/chrome_paths.h -@@ -56,7 +56,7 @@ enum { +@@ -57,7 +57,7 @@ enum { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -10,7 +10,7 @@ Index: chrome/common/chrome_paths.h DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. // On Chrome OS, this path is used for OEM -@@ -64,7 +64,7 @@ enum { +@@ -65,7 +65,7 @@ enum { // create it. #endif @@ -19,9 +19,9 @@ Index: chrome/common/chrome_paths.h DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -117,7 +117,7 @@ enum { - DIR_CHROMEOS_CUSTOM_WALLPAPERS, // Directory where custom wallpapers - // reside. +@@ -123,7 +123,7 @@ enum { + // must be cleared on device reboot. + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_cc b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_cc index 7c08aeb4e..759929b66 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_cc @@ -1,7 +1,7 @@ Index: chrome/common/chrome_switches.cc --- chrome/common/chrome_switches.cc.orig +++ chrome/common/chrome_switches.cc -@@ -850,14 +850,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -853,14 +853,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_h b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_h index 873533192..c1615e23d 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_h +++ b/www/ungoogled-chromium/patches/patch-chrome_common_chrome_switches_h @@ -1,7 +1,7 @@ Index: chrome/common/chrome_switches.h --- chrome/common/chrome_switches.h.orig +++ chrome/common/chrome_switches.h -@@ -269,12 +269,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -270,12 +270,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -15,4 +15,4 @@ Index: chrome/common/chrome_switches.h +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extern const char kListApps[]; extern const char kProfileBaseName[]; - #endif + extern const char kProfileManagementAttributes[]; diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_pref_names_cc b/www/ungoogled-chromium/patches/patch-chrome_common_pref_names_cc deleted file mode 100644 index c900a1681..000000000 --- a/www/ungoogled-chromium/patches/patch-chrome_common_pref_names_cc +++ /dev/null @@ -1,66 +0,0 @@ -Index: chrome/common/pref_names.cc ---- chrome/common/pref_names.cc.orig -+++ chrome/common/pref_names.cc -@@ -1207,7 +1207,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. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - // 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"; -@@ -1319,7 +1319,7 @@ const char kShowUpdatePromotionInfoBar[] = - "browser.show_update_promotion_info_bar"; - #endif - --#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"; -@@ -1837,7 +1837,7 @@ const char kDownloadDirUpgraded[] = "download.director - const char kDownloadLastCompleteTime[] = "download.last_complete_time"; - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - const char kOpenPdfDownloadInSystemReader[] = - "download.open_pdf_in_system_reader"; - #endif -@@ -2285,7 +2285,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled - // requests. - const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected - // along with kAuthNegotiateDelegateAllowlist. - const char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3296,7 +3296,7 @@ const char kFileOrDirectoryPickerWithoutGestureAllowed - const char kSandboxExternalProtocolBlocked[] = - "profile.sandbox_external_protocol_blocked"; - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Boolean that indicates if system notifications are allowed to be used in - // place of Chrome notifications. - const char kAllowSystemNotifications[] = "system_notifications.allowed"; -@@ -3349,7 +3349,7 @@ const char kCACertificateManagementAllowed[] = - const char kChromeRootStoreEnabled[] = "chrome_root_store_enabled"; - #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - const char kEnforceLocalAnchorConstraintsEnabled[] = - "enforce_local_anchor_constraints_enabled"; - #endif -@@ -3663,7 +3663,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe - const char kNewBaseUrlInheritanceBehaviorAllowed[] = - "new_base_url_inheritance_behavior_allowed"; - --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // If this exists and is true, Chrome may run system DNS resolution out of the - // network process. If false, Chrome will run system DNS resolution in the - // network process. If non-existent, Chrome will decide where to run system DNS diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_pref_names_h b/www/ungoogled-chromium/patches/patch-chrome_common_pref_names_h index a0761579d..14c06baab 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_common_pref_names_h +++ b/www/ungoogled-chromium/patches/patch-chrome_common_pref_names_h @@ -1,75 +1,75 @@ Index: chrome/common/pref_names.h --- chrome/common/pref_names.h.orig +++ chrome/common/pref_names.h -@@ -378,7 +378,7 @@ extern const char kUseAshProxy[]; - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -1329,7 +1329,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u + // 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) - // TODO(https://crbug.com/1317782): Remove in M110. - extern const char kUsesSystemThemeDeprecated[]; - extern const char kSystemTheme[]; -@@ -400,7 +400,7 @@ extern const char kDefaultBrowserSettingEnabled[]; - #if BUILDFLAG(IS_MAC) - extern const char kShowUpdatePromotionInfoBar[]; + // Linux specific preference on whether we should match the system theme. + inline constexpr char kUsesSystemThemeDeprecated[] = + "extensions.theme.use_system"; +@@ -1451,7 +1451,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = + "browser.show_update_promotion_info_bar"; #endif + -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - extern const char kUseCustomChromeFrame[]; - #endif - extern const char kPartitionDefaultZoomLevel[]; -@@ -589,7 +589,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ - extern const char kDownloadDirUpgraded[]; - extern const char kDownloadLastCompleteTime[]; + // 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). + inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; +@@ -2004,7 +2004,7 @@ inline constexpr char kDownloadLastCompleteTime[] = + "download.last_complete_time"; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - extern const char kOpenPdfDownloadInSystemReader[]; + inline constexpr char kOpenPdfDownloadInSystemReader[] = + "download.open_pdf_in_system_reader"; #endif - #if BUILDFLAG(IS_ANDROID) -@@ -712,7 +712,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps - extern const char kWebAppsPreferences[]; - extern const char kWebAppsIsolationState[]; +@@ -2396,7 +2396,7 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s + inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; + #endif // BUILDFLAG(IS_WIN) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - extern const char kWebAppsUrlHandlerInfo[]; - #endif -@@ -837,7 +837,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] - extern const char kAmbientAuthenticationInPrivateModesEnabled[]; - extern const char kBasicAuthOverHttpEnabled[]; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // A boolean pref to determine whether or not the network service is running + // sandboxed. + inline constexpr char kNetworkServiceSandboxEnabled[] = +@@ -2475,7 +2475,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM + inline constexpr char kBasicAuthOverHttpEnabled[] = + "auth.basic_over_http_enabled"; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kAuthNegotiateDelegateByKdcPolicy[]; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) - -@@ -1112,7 +1112,7 @@ extern const char kFileOrDirectoryPickerWithoutGesture - #endif - extern const char kSandboxExternalProtocolBlocked[]; + // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected + // along with kAuthNegotiateDelegateAllowlist. + inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = +@@ -3545,7 +3545,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes + inline constexpr char kSandboxExternalProtocolBlocked[] = + "profile.sandbox_external_protocol_blocked"; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - extern const char kAllowSystemNotifications[]; - #endif - -@@ -1138,7 +1138,7 @@ extern const char kCACertificateManagementAllowed[]; - extern const char kChromeRootStoreEnabled[]; + // Boolean that indicates if system notifications are allowed to be used in + // place of Chrome notifications. + inline constexpr char kAllowSystemNotifications[] = +@@ -3601,7 +3601,7 @@ inline constexpr char kCACertificateManagementAllowed[ + inline constexpr char kChromeRootStoreEnabled[] = "chrome_root_store_enabled"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // TODO(https://crbug.com/1406103): delete this after a few milestones. - extern const char kEnforceLocalAnchorConstraintsEnabled[]; + inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] = + "enforce_local_anchor_constraints_enabled"; #endif -@@ -1289,7 +1289,7 @@ extern const char kDIPSTimerLastUpdate[]; - extern const char kThrottleNonVisibleCrossOriginIframesAllowed[]; - extern const char kNewBaseUrlInheritanceBehaviorAllowed[]; +@@ -3928,7 +3928,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf + inline constexpr char kNewBaseUrlInheritanceBehaviorAllowed[] = + "new_base_url_inheritance_behavior_allowed"; -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - extern const char kOutOfProcessSystemDnsResolutionEnabled[]; - #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) - + // If this exists and is true, Chrome may run system DNS resolution out of the + // network process. If false, Chrome will run system DNS resolution in the + // network process. If non-existent, Chrome will decide where to run system DNS diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_cc b/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_cc index 3451d500c..cc404b668 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_cc @@ -1,7 +1,7 @@ Index: chrome/common/url_constants.cc --- chrome/common/url_constants.cc.orig +++ chrome/common/url_constants.cc -@@ -537,7 +537,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = +@@ -554,7 +554,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = "https://support.9oo91e.qjz9zk/chromebook/?p=multidevice"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_h b/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_h index 97179f704..a6c911728 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_h +++ b/www/ungoogled-chromium/patches/patch-chrome_common_url_constants_h @@ -1,7 +1,7 @@ Index: chrome/common/url_constants.h --- chrome/common/url_constants.h.orig +++ chrome/common/url_constants.h -@@ -516,7 +516,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; +@@ -531,7 +531,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; extern const char kPhoneHubPermissionLearnMoreURL[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_cc b/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_cc index 4a063c3de..ac59e6513 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_cc @@ -1,7 +1,7 @@ Index: chrome/common/webui_url_constants.cc --- chrome/common/webui_url_constants.cc.orig +++ chrome/common/webui_url_constants.cc -@@ -485,18 +485,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// +@@ -490,18 +490,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// const char kOsUIVersionURL[] = "os://version"; #endif @@ -23,7 +23,7 @@ Index: chrome/common/webui_url_constants.cc const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -511,14 +511,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -516,14 +516,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -40,7 +40,7 @@ Index: chrome/common/webui_url_constants.cc const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -535,7 +535,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -542,7 +542,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -49,7 +49,7 @@ Index: chrome/common/webui_url_constants.cc defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -614,7 +614,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -622,7 +622,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -58,7 +58,7 @@ Index: chrome/common/webui_url_constants.cc const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -846,7 +846,7 @@ const char* const kChromeDebugURLs[] = { +@@ -857,7 +857,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif diff --git a/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_h b/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_h index 295b43e3a..2e81de326 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_h +++ b/www/ungoogled-chromium/patches/patch-chrome_common_webui_url_constants_h @@ -1,7 +1,7 @@ Index: chrome/common/webui_url_constants.h --- chrome/common/webui_url_constants.h.orig +++ chrome/common/webui_url_constants.h -@@ -407,24 +407,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; +@@ -411,24 +411,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; extern const char kOsUIVersionURL[]; #endif @@ -30,7 +30,7 @@ Index: chrome/common/webui_url_constants.h extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -439,7 +439,7 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -443,7 +443,7 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -39,7 +39,7 @@ Index: chrome/common/webui_url_constants.h extern const char kChromeUISandboxHost[]; #endif -@@ -451,7 +451,7 @@ extern const char kChromeUIWaffleHost[]; +@@ -455,7 +455,7 @@ extern const char kChromeUISearchEngineChoiceHost[]; // 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_FUCHSIA) || \ @@ -48,7 +48,7 @@ Index: chrome/common/webui_url_constants.h extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -465,7 +465,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -471,7 +471,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/ungoogled-chromium/patches/patch-chrome_renderer_chrome_render_frame_observer_cc b/www/ungoogled-chromium/patches/patch-chrome_renderer_chrome_render_frame_observer_cc index 55783da05..f3607037e 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_renderer_chrome_render_frame_observer_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_renderer_chrome_render_frame_observer_cc @@ -1,7 +1,7 @@ Index: chrome/renderer/chrome_render_frame_observer.cc --- chrome/renderer/chrome_render_frame_observer.cc.orig +++ chrome/renderer/chrome_render_frame_observer.cc -@@ -353,7 +353,7 @@ void ChromeRenderFrameObserver::OnDestruct() { +@@ -351,7 +351,7 @@ void ChromeRenderFrameObserver::OnDestruct() { void ChromeRenderFrameObserver::DraggableRegionsChanged() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-chrome_services_printing_print_backend_service_impl_cc b/www/ungoogled-chromium/patches/patch-chrome_services_printing_print_backend_service_impl_cc index 6940e725c..305969e73 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_services_printing_print_backend_service_impl_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_services_printing_print_backend_service_impl_cc @@ -1,7 +1,7 @@ Index: chrome/services/printing/print_backend_service_impl.cc --- chrome/services/printing/print_backend_service_impl.cc.orig +++ chrome/services/printing/print_backend_service_impl.cc -@@ -45,7 +45,7 @@ +@@ -46,7 +46,7 @@ #include "printing/backend/cups_connection_pool.h" #endif @@ -10,7 +10,7 @@ Index: chrome/services/printing/print_backend_service_impl.cc #include "base/no_destructor.h" #include "ui/linux/linux_ui.h" #include "ui/linux/linux_ui_delegate_stub.h" -@@ -72,7 +72,7 @@ namespace printing { +@@ -73,7 +73,7 @@ namespace printing { namespace { @@ -19,7 +19,16 @@ Index: chrome/services/printing/print_backend_service_impl.cc void InstantiateLinuxUiDelegate() { // TODO(crbug.com/809738) Until a real UI can be used in a utility process, // need to use the stub version. -@@ -456,7 +456,7 @@ void PrintBackendServiceImpl::Init( +@@ -82,7 +82,7 @@ void InstantiateLinuxUiDelegate() { + #endif + + scoped_refptr<base::SequencedTaskRunner> GetPrintingTaskRunner() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Use task runner associated with equivalent of UI thread. Needed for calls + // made through `PrintDialogLinuxInterface` to properly execute. + CHECK(base::SequencedTaskRunner::HasCurrentDefault()); +@@ -466,7 +466,7 @@ void PrintBackendServiceImpl::Init( // `InitCommon()`. InitializeProcessForPrinting(); print_backend_ = PrintBackend::CreateInstance(locale); @@ -28,7 +37,7 @@ Index: chrome/services/printing/print_backend_service_impl.cc // Test framework already initializes the UI, so this should not go in // `InitCommon()`. Additionally, low-level Linux UI is not needed when tests // are using `TestPrintingContext`. -@@ -677,7 +677,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -686,7 +686,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend_->GetPrinterDriverInfo(*printer_name)); diff --git a/www/ungoogled-chromium/patches/patch-chrome_test_BUILD_gn b/www/ungoogled-chromium/patches/patch-chrome_test_BUILD_gn index f6dd72eae..a72c0522a 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_test_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-chrome_test_BUILD_gn @@ -1,7 +1,7 @@ Index: chrome/test/BUILD.gn --- chrome/test/BUILD.gn.orig +++ chrome/test/BUILD.gn -@@ -10599,7 +10599,7 @@ test("chrome_app_unittests") { +@@ -10855,7 +10855,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_capabilities_cc b/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_capabilities_cc index 8518b6af9..22014ac52 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_capabilities_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_capabilities_cc @@ -1,7 +1,7 @@ Index: chrome/test/chromedriver/capabilities.cc --- chrome/test/chromedriver/capabilities.cc.orig +++ chrome/test/chromedriver/capabilities.cc -@@ -355,7 +355,11 @@ Status ParseMobileEmulation(const base::Value& option, +@@ -346,7 +346,11 @@ Status ParseMobileEmulation(const base::Value& option, "'version' field of type string"); } @@ -13,7 +13,7 @@ Index: chrome/test/chromedriver/capabilities.cc } client_hints.brands = std::move(brands); -@@ -392,7 +396,11 @@ Status ParseMobileEmulation(const base::Value& option, +@@ -384,7 +388,11 @@ Status ParseMobileEmulation(const base::Value& option, "a 'version' field of type string"); } diff --git a/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_launcher_cc b/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_launcher_cc index 10939bfbf..bcb78bd51 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_launcher_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_test_chromedriver_chrome_launcher_cc @@ -1,11 +1,11 @@ Index: chrome/test/chromedriver/chrome_launcher.cc --- chrome/test/chromedriver/chrome_launcher.cc.orig +++ chrome/test/chromedriver/chrome_launcher.cc -@@ -67,6 +67,7 @@ +@@ -69,6 +69,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> +#include <sys/wait.h> #include <unistd.h> #elif BUILDFLAG(IS_WIN) - #include "chrome/test/chromedriver/keycode_text_conversion.h" + #include <windows.h> diff --git a/www/ungoogled-chromium/patches/patch-chrome_utility_services_cc b/www/ungoogled-chromium/patches/patch-chrome_utility_services_cc index 61e408ce7..a13bb09a9 100644 --- a/www/ungoogled-chromium/patches/patch-chrome_utility_services_cc +++ b/www/ungoogled-chromium/patches/patch-chrome_utility_services_cc @@ -10,7 +10,7 @@ Index: chrome/utility/services.cc #include "chrome/services/system_signals/linux/linux_system_signals_service.h" #endif // BUILDFLAG(IS_LINUX) -@@ -84,7 +84,7 @@ +@@ -82,7 +82,7 @@ #include "chrome/services/file_util/file_util_service.h" // nogncheck #endif @@ -19,7 +19,7 @@ Index: chrome/utility/services.cc #include "chrome/services/file_util/document_analysis_service.h" // nogncheck #endif -@@ -218,7 +218,7 @@ auto RunMacNotificationService( +@@ -216,7 +216,7 @@ auto RunMacNotificationService( } #endif // BUILDFLAG(IS_MAC) @@ -28,7 +28,7 @@ Index: chrome/utility/services.cc auto RunSystemSignalsService( mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> receiver) { -@@ -285,7 +285,7 @@ auto RunCupsIppParser( +@@ -276,7 +276,7 @@ auto RunCupsIppParser( } #endif @@ -37,7 +37,7 @@ Index: chrome/utility/services.cc auto RunDocumentAnalysis( mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) { return std::make_unique<DocumentAnalysisService>(std::move(receiver)); -@@ -462,7 +462,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -452,7 +452,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunWindowsIconReader); #endif // BUILDFLAG(IS_WIN) @@ -46,7 +46,7 @@ Index: chrome/utility/services.cc services.Add(RunSystemSignalsService); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -478,7 +478,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -468,7 +468,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunFileUtil); #endif diff --git a/www/ungoogled-chromium/patches/patch-chromecast_browser_cast_content_browser_client_cc b/www/ungoogled-chromium/patches/patch-chromecast_browser_cast_content_browser_client_cc index b6a5074f2..6167120ea 100644 --- a/www/ungoogled-chromium/patches/patch-chromecast_browser_cast_content_browser_client_cc +++ b/www/ungoogled-chromium/patches/patch-chromecast_browser_cast_content_browser_client_cc @@ -1,7 +1,7 @@ Index: chromecast/browser/cast_content_browser_client.cc --- chromecast/browser/cast_content_browser_client.cc.orig +++ chromecast/browser/cast_content_browser_client.cc -@@ -446,7 +446,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -448,7 +448,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/ungoogled-chromium/patches/patch-components_autofill_core_browser_personal_data_manager_cc b/www/ungoogled-chromium/patches/patch-components_autofill_core_browser_personal_data_manager_cc index 174c91f65..bc2aa9ee4 100644 --- a/www/ungoogled-chromium/patches/patch-components_autofill_core_browser_personal_data_manager_cc +++ b/www/ungoogled-chromium/patches/patch-components_autofill_core_browser_personal_data_manager_cc @@ -1,7 +1,7 @@ Index: components/autofill/core/browser/personal_data_manager.cc --- components/autofill/core/browser/personal_data_manager.cc.orig +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2418,7 +2418,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2484,7 +2484,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/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_payments_features_cc b/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_payments_features_cc index 9c5f95293..805c9da8e 100644 --- a/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_payments_features_cc +++ b/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_payments_features_cc @@ -1,7 +1,7 @@ Index: components/autofill/core/common/autofill_payments_features.cc --- components/autofill/core/common/autofill_payments_features.cc.orig +++ components/autofill/core/common/autofill_payments_features.cc -@@ -301,7 +301,7 @@ BASE_FEATURE(kAutofillUseTwoDotsForLastFourDigits, +@@ -305,7 +305,7 @@ BASE_FEATURE(kAutofillEnablePaymentsMandatoryReauthOnB bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_util_cc b/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_util_cc index 23095baff..fa307ba66 100644 --- a/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_util_cc +++ b/www/ungoogled-chromium/patches/patch-components_autofill_core_common_autofill_util_cc @@ -1,7 +1,7 @@ Index: components/autofill/core/common/autofill_util.cc --- components/autofill/core/common/autofill_util.cc.orig +++ components/autofill/core/common/autofill_util.cc -@@ -156,7 +156,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value +@@ -153,7 +153,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value bool ShouldAutoselectFirstSuggestionOnArrowDown() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-components_autofill_payments_strings_grdp b/www/ungoogled-chromium/patches/patch-components_autofill_payments_strings_grdp index 84635a4ae..bf617eacd 100644 --- a/www/ungoogled-chromium/patches/patch-components_autofill_payments_strings_grdp +++ b/www/ungoogled-chromium/patches/patch-components_autofill_payments_strings_grdp @@ -1,7 +1,7 @@ Index: components/autofill_payments_strings.grdp --- components/autofill_payments_strings.grdp.orig +++ components/autofill_payments_strings.grdp -@@ -118,7 +118,7 @@ +@@ -124,7 +124,7 @@ <message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java"> Save card </message> diff --git a/www/ungoogled-chromium/patches/patch-components_crash_core_app_BUILD_gn b/www/ungoogled-chromium/patches/patch-components_crash_core_app_BUILD_gn index f190515f4..7308301bc 100644 --- a/www/ungoogled-chromium/patches/patch-components_crash_core_app_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-components_crash_core_app_BUILD_gn @@ -1,7 +1,7 @@ Index: components/crash/core/app/BUILD.gn --- components/crash/core/app/BUILD.gn.orig +++ components/crash/core/app/BUILD.gn -@@ -60,7 +60,7 @@ static_library("app") { +@@ -72,7 +72,7 @@ static_library("app") { "crashpad.h", ] @@ -10,7 +10,7 @@ Index: components/crash/core/app/BUILD.gn sources += [ "crashpad_linux.cc" ] } -@@ -73,6 +73,10 @@ static_library("app") { +@@ -85,6 +85,10 @@ static_library("app") { ] } @@ -21,7 +21,7 @@ Index: components/crash/core/app/BUILD.gn defines = [ "CRASH_IMPLEMENTATION" ] public_deps = [ ":lib" ] -@@ -101,7 +105,7 @@ static_library("app") { +@@ -113,7 +117,7 @@ static_library("app") { libs = [ "log" ] } @@ -30,7 +30,7 @@ Index: components/crash/core/app/BUILD.gn deps += [ "//base:base_static", "//components/crash/core/common", -@@ -233,11 +237,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -241,11 +245,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/ungoogled-chromium/patches/patch-components_crash_core_browser_crash_upload_list_crashpad_cc b/www/ungoogled-chromium/patches/patch-components_crash_core_browser_crash_upload_list_crashpad_cc index f177083df..06c89d274 100644 --- a/www/ungoogled-chromium/patches/patch-components_crash_core_browser_crash_upload_list_crashpad_cc +++ b/www/ungoogled-chromium/patches/patch-components_crash_core_browser_crash_upload_list_crashpad_cc @@ -5,7 +5,7 @@ Index: components/crash/core/browser/crash_upload_list_crashpad.cc std::vector<std::unique_ptr<UploadList::UploadInfo>> CrashUploadListCrashpad::LoadUploadList() { std::vector<crash_reporter::Report> reports; -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) crash_reporter::GetReports(&reports); +#endif @@ -15,13 +15,13 @@ Index: components/crash/core/browser/crash_upload_list_crashpad.cc void CrashUploadListCrashpad::ClearUploadList(const base::Time& begin, const base::Time& end) { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) crash_reporter::ClearReportsBetween(begin, end); +#endif } void CrashUploadListCrashpad::RequestSingleUpload(const std::string& local_id) { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) crash_reporter::RequestSingleCrashUpload(local_id); +#endif } diff --git a/www/ungoogled-chromium/patches/patch-components_device_signals_test_signals_contract_cc b/www/ungoogled-chromium/patches/patch-components_device_signals_test_signals_contract_cc index 3b5a1f16a..9596074e3 100644 --- a/www/ungoogled-chromium/patches/patch-components_device_signals_test_signals_contract_cc +++ b/www/ungoogled-chromium/patches/patch-components_device_signals_test_signals_contract_cc @@ -1,7 +1,7 @@ Index: components/device_signals/test/signals_contract.cc --- components/device_signals/test/signals_contract.cc.orig +++ components/device_signals/test/signals_contract.cc -@@ -187,7 +187,7 @@ GetSignalsContract() { +@@ -212,7 +212,7 @@ GetSignalsContract() { base::BindRepeating(VerifyUnset, names::kCrowdStrike); #endif diff --git a/www/ungoogled-chromium/patches/patch-components_embedder_support_user_agent_utils_cc b/www/ungoogled-chromium/patches/patch-components_embedder_support_user_agent_utils_cc new file mode 100644 index 000000000..3baf0233b --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-components_embedder_support_user_agent_utils_cc @@ -0,0 +1,13 @@ +Index: components/embedder_support/user_agent_utils.cc +--- components/embedder_support/user_agent_utils.cc.orig ++++ components/embedder_support/user_agent_utils.cc +@@ -540,6 +540,9 @@ std::string GetPlatformForUAMetadata() { + # else + return "Chromium OS"; + # endif ++#elif BUILDFLAG(IS_BSD) ++ // The internet is weird... ++ return "Linux"; + #else + return std::string(version_info::GetOSType()); + #endif diff --git a/www/ungoogled-chromium/patches/patch-components_embedder_support_user_agent_utils_unittest_cc b/www/ungoogled-chromium/patches/patch-components_embedder_support_user_agent_utils_unittest_cc index e3c5964ae..8b261f1dc 100644 --- a/www/ungoogled-chromium/patches/patch-components_embedder_support_user_agent_utils_unittest_cc +++ b/www/ungoogled-chromium/patches/patch-components_embedder_support_user_agent_utils_unittest_cc @@ -1,7 +1,7 @@ Index: components/embedder_support/user_agent_utils_unittest.cc --- components/embedder_support/user_agent_utils_unittest.cc.orig +++ components/embedder_support/user_agent_utils_unittest.cc -@@ -83,7 +83,7 @@ const char kDesktop[] = +@@ -84,7 +84,7 @@ const char kDesktop[] = "Safari/537.36"; #endif // BUILDFLAG(IS_ANDROID) @@ -10,7 +10,7 @@ Index: components/embedder_support/user_agent_utils_unittest.cc std::string GetMachine() { struct utsname unixinfo; uname(&unixinfo); -@@ -191,7 +191,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) +@@ -192,7 +192,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) int value; ASSERT_TRUE(base::StringToInt(pieces[i], &value)); } diff --git a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_event_constants_h b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_event_constants_h index e837399a8..b3ca1956f 100644 --- a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_event_constants_h +++ b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_event_constants_h @@ -1,7 +1,7 @@ Index: components/feature_engagement/public/event_constants.h --- components/feature_engagement/public/event_constants.h.orig +++ components/feature_engagement/public/event_constants.h -@@ -13,7 +13,7 @@ namespace events { +@@ -14,7 +14,7 @@ namespace events { // Desktop #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_configurations_cc b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_configurations_cc index 94f170deb..8828a1ebd 100644 --- a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_configurations_cc +++ b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_configurations_cc @@ -10,7 +10,7 @@ Index: components/feature_engagement/public/feature_configurations.cc if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1267,7 +1267,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -1320,7 +1320,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_cc b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_cc index 13afc1bd0..c18f53c56 100644 --- a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_cc +++ b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_cc @@ -10,7 +10,7 @@ Index: components/feature_engagement/public/feature_constants.cc BASE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature, "IPH_AutofillFeedbackNewBadge", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -508,7 +508,8 @@ BASE_FEATURE(kIPHiOSPromoPostRestoreDefaultBrowserFeat +@@ -516,7 +516,8 @@ BASE_FEATURE(kIPHiOSPromoPostRestoreDefaultBrowserFeat #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_h b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_h index 7adb6d4eb..f2669d0c5 100644 --- a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_h +++ b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_constants_h @@ -10,7 +10,7 @@ Index: components/feature_engagement/public/feature_constants.h BASE_DECLARE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature); BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); -@@ -206,7 +206,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoPostRestoreDefaultBro +@@ -210,7 +210,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoPostRestoreDefaultBro #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -18,5 +18,5 @@ Index: components/feature_engagement/public/feature_constants.h + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature); + BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardCVCSuggestionFeature); BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardSuggestionFeature); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || diff --git a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_cc b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_cc index 82f2c565f..dc95b8444 100644 --- a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_cc +++ b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_cc @@ -10,7 +10,7 @@ Index: components/feature_engagement/public/feature_list.cc &kIPHAutofillFeedbackNewBadgeFeature, &kIPHBatterySaverModeFeature, &kIPHCompanionSidePanelFeature, -@@ -182,7 +182,8 @@ const base::Feature* const kAllFeatures[] = { +@@ -185,7 +185,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -18,5 +18,5 @@ Index: components/feature_engagement/public/feature_list.cc + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) &kIPHAutofillExternalAccountProfileSuggestionFeature, + &kIPHAutofillVirtualCardCVCSuggestionFeature, &kIPHAutofillVirtualCardSuggestionFeature, - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || diff --git a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_h b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_h index 7a2fcb8a1..6302751a1 100644 --- a/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_h +++ b/www/ungoogled-chromium/patches/patch-components_feature_engagement_public_feature_list_h @@ -1,7 +1,7 @@ Index: components/feature_engagement/public/feature_list.h --- components/feature_engagement/public/feature_list.h.orig +++ components/feature_engagement/public/feature_list.h -@@ -257,7 +257,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoPostRestoreDefaultB +@@ -258,7 +258,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoPostRestoreDefaultB #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -10,7 +10,7 @@ Index: components/feature_engagement/public/feature_list.h DEFINE_VARIATION_PARAM(kIPHAutofillFeedbackNewBadgeFeature, "IPH_AutofillFeedbackNewBadge"); DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); -@@ -325,7 +325,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, +@@ -332,7 +332,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,8 +19,8 @@ Index: components/feature_engagement/public/feature_list.h + BUILDFLAG(IS_BSD) DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature, "IPH_AutofillExternalAccountProfileSuggestion"); - DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature, -@@ -465,7 +466,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardCVCSuggestionFeature, +@@ -538,7 +539,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHiOSShareToolbarItemFeature), VARIATION_ENTRY(kIPHiOSPromoPostRestoreDefaultBrowserFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -29,7 +29,7 @@ Index: components/feature_engagement/public/feature_list.h VARIATION_ENTRY(kIPHAutofillFeedbackNewBadgeFeature), VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), -@@ -509,7 +510,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -585,7 +586,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -37,5 +37,5 @@ Index: components/feature_engagement/public/feature_list.h + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature), + VARIATION_ENTRY(kIPHAutofillVirtualCardCVCSuggestionFeature), VARIATION_ENTRY(kIPHAutofillVirtualCardSuggestionFeature), - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || diff --git a/www/ungoogled-chromium/patches/patch-components_feed_core_v2_proto_util_unittest_cc b/www/ungoogled-chromium/patches/patch-components_feed_core_v2_proto_util_unittest_cc index d154428ef..5bbf5eac0 100644 --- a/www/ungoogled-chromium/patches/patch-components_feed_core_v2_proto_util_unittest_cc +++ b/www/ungoogled-chromium/patches/patch-components_feed_core_v2_proto_util_unittest_cc @@ -1,7 +1,7 @@ Index: components/feed/core/v2/proto_util_unittest.cc --- components/feed/core/v2/proto_util_unittest.cc.orig +++ components/feed/core/v2/proto_util_unittest.cc -@@ -43,8 +43,8 @@ TEST(ProtoUtilTest, CreateClientInfo) { +@@ -44,8 +44,8 @@ TEST(ProtoUtilTest, CreateClientInfo) { feedwire::ClientInfo result = CreateClientInfo(request_metadata); EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, result.app_type()); EXPECT_EQ(feedwire::Version::RELEASE, result.app_version().build_type()); diff --git a/www/ungoogled-chromium/patches/patch-components_flags_ui_flags_state_cc b/www/ungoogled-chromium/patches/patch-components_flags_ui_flags_state_cc index fcf7ab849..67772b480 100644 --- a/www/ungoogled-chromium/patches/patch-components_flags_ui_flags_state_cc +++ b/www/ungoogled-chromium/patches/patch-components_flags_ui_flags_state_cc @@ -1,7 +1,7 @@ Index: components/flags_ui/flags_state.cc --- components/flags_ui/flags_state.cc.orig +++ components/flags_ui/flags_state.cc -@@ -682,7 +682,7 @@ unsigned short FlagsState::GetCurrentPlatform() { +@@ -750,7 +750,7 @@ unsigned short FlagsState::GetCurrentPlatform() { return kOsCrOS; #elif BUILDFLAG(IS_CHROMEOS_LACROS) return kOsLacros; diff --git a/www/ungoogled-chromium/patches/patch-components_gwp_asan_client_guarded_page_allocator_posix_cc b/www/ungoogled-chromium/patches/patch-components_gwp_asan_client_guarded_page_allocator_posix_cc new file mode 100644 index 000000000..41d68d9e2 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-components_gwp_asan_client_guarded_page_allocator_posix_cc @@ -0,0 +1,14 @@ +Index: components/gwp_asan/client/guarded_page_allocator_posix.cc +--- components/gwp_asan/client/guarded_page_allocator_posix.cc.orig ++++ components/gwp_asan/client/guarded_page_allocator_posix.cc +@@ -35,8 +35,9 @@ void GuardedPageAllocator::MarkPageInaccessible(void* + // mmap() a PROT_NONE page over the address to release it to the system, if + // we used mprotect() here the system would count pages in the quarantine + // against the RSS. ++ // MAP_ANONYMOUS requires the fd to be -1 on !linux + void* err = mmap(ptr, state_.page_size, PROT_NONE, +- MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); ++ MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); + PCHECK(err == ptr) << "mmap"; + } + diff --git a/www/ungoogled-chromium/patches/patch-components_gwp_asan_client_gwp_asan_cc b/www/ungoogled-chromium/patches/patch-components_gwp_asan_client_gwp_asan_cc new file mode 100644 index 000000000..72ed756d0 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-components_gwp_asan_client_gwp_asan_cc @@ -0,0 +1,21 @@ +Index: components/gwp_asan/client/gwp_asan.cc +--- components/gwp_asan/client/gwp_asan.cc.orig ++++ components/gwp_asan/client/gwp_asan.cc +@@ -64,7 +64,7 @@ constexpr bool kCpuIs64Bit = + // ProcessSamplingBoost is the multiplier to increase the + // ProcessSamplingProbability in scenarios where we want to perform additional + // testing (e.g., on canary/dev builds). +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + constexpr int kDefaultMaxAllocations = 50; + constexpr int kDefaultMaxMetadata = 210; + constexpr int kDefaultTotalPages = kCpuIs64Bit ? 2048 : kDefaultMaxMetadata * 2; +@@ -84,7 +84,7 @@ constexpr int kDefaultProcessSamplingBoost2 = 10; + // BUILDFLAG(IS_FUCHSIA) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + constexpr base::FeatureState kDefaultEnabled = base::FEATURE_ENABLED_BY_DEFAULT; + #else + constexpr base::FeatureState kDefaultEnabled = diff --git a/www/ungoogled-chromium/patches/patch-components_invalidation_impl_invalidation_switches_cc b/www/ungoogled-chromium/patches/patch-components_invalidation_impl_invalidation_switches_cc deleted file mode 100644 index 6bacbaea6..000000000 --- a/www/ungoogled-chromium/patches/patch-components_invalidation_impl_invalidation_switches_cc +++ /dev/null @@ -1,12 +0,0 @@ -Index: components/invalidation/impl/invalidation_switches.cc ---- components/invalidation/impl/invalidation_switches.cc.orig -+++ components/invalidation/impl/invalidation_switches.cc -@@ -21,7 +21,7 @@ const int kDefaultInstanceIDTokenTTLSeconds = 14 * 24 - BASE_FEATURE(kSyncInstanceIDTokenTTL, - "SyncInstanceIDTokenTTL", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/patches/patch-components_management_strings_grdp b/www/ungoogled-chromium/patches/patch-components_management_strings_grdp index 144a4a88a..8babda7e9 100644 --- a/www/ungoogled-chromium/patches/patch-components_management_strings_grdp +++ b/www/ungoogled-chromium/patches/patch-components_management_strings_grdp @@ -1,7 +1,7 @@ Index: components/management_strings.grdp --- components/management_strings.grdp.orig +++ components/management_strings.grdp -@@ -321,7 +321,7 @@ +@@ -343,7 +343,7 @@ </if> <!-- Strings related to Chrome Enterprise Device Signals Sharing --> diff --git a/www/ungoogled-chromium/patches/patch-components_metrics_drive_metrics_provider_linux_cc b/www/ungoogled-chromium/patches/patch-components_metrics_drive_metrics_provider_linux_cc index 65949254b..87016a612 100644 --- a/www/ungoogled-chromium/patches/patch-components_metrics_drive_metrics_provider_linux_cc +++ b/www/ungoogled-chromium/patches/patch-components_metrics_drive_metrics_provider_linux_cc @@ -5,7 +5,7 @@ Index: components/metrics/drive_metrics_provider_linux.cc #include "components/metrics/drive_metrics_provider.h" -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include <sys/types.h> +#define MAJOR(dev) major(dev) +#define MINOR(dev) minor(dev) diff --git a/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_cc b/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_cc index 388fbe2bf..2802485e1 100644 --- a/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_cc +++ b/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_cc @@ -1,12 +1,12 @@ Index: components/network_session_configurator/browser/network_session_configurator.cc --- components/network_session_configurator/browser/network_session_configurator.cc.orig +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -808,7 +808,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C - } - #endif // #if !BUILDFLAG(IS_ANDROID) - --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +@@ -793,7 +793,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C + // backport, having it behave differently than in stable would be a bigger + // problem. TODO: Does this work in later macOS releases? + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) return net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE; #else return net::URLRequestContextBuilder::HttpCacheParams::DISK_BLOCKFILE; diff --git a/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_unittest_cc b/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_unittest_cc index 045f88c41..5d7682ae5 100644 --- a/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_unittest_cc +++ b/www/ungoogled-chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_unittest_cc @@ -1,12 +1,12 @@ Index: components/network_session_configurator/browser/network_session_configurator_unittest.cc --- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig +++ components/network_session_configurator/browser/network_session_configurator_unittest.cc -@@ -794,7 +794,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { - } +@@ -775,7 +775,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) { --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) EXPECT_EQ(net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE, ChooseCacheType()); - #elif BUILDFLAG(IS_MAC) + #else diff --git a/www/ungoogled-chromium/patches/patch-components_optimization_guide_core_tflite_model_executor_h b/www/ungoogled-chromium/patches/patch-components_optimization_guide_core_tflite_model_executor_h index d3442eff2..fcf6fe032 100644 --- a/www/ungoogled-chromium/patches/patch-components_optimization_guide_core_tflite_model_executor_h +++ b/www/ungoogled-chromium/patches/patch-components_optimization_guide_core_tflite_model_executor_h @@ -1,7 +1,7 @@ Index: components/optimization_guide/core/tflite_model_executor.h --- components/optimization_guide/core/tflite_model_executor.h.orig +++ components/optimization_guide/core/tflite_model_executor.h -@@ -189,7 +189,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu +@@ -212,7 +212,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu void SendForBatchExecution( BatchExecutionCallback callback_on_complete, base::TimeTicks start_time, @@ -13,3 +13,51 @@ Index: components/optimization_guide/core/tflite_model_executor.h override { DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); +@@ -234,7 +238,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu + // Starts the synchronous execution of the model. Returns model outputs. + // Model needs to be loaded. Synchronous calls do not load or unload model. + std::vector<absl::optional<OutputType>> SendForBatchExecutionSync( ++#if defined(__clang__) && (__clang_major__ >= 15) + ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) ++#else ++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) ++#endif + override { + DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); +@@ -389,7 +397,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu + // executes it on the model execution thread. + void LoadModelFileAndBatchExecute( + BatchExecutionCallback callback_on_complete, ++#if defined(__clang__) && (__clang_major__ >= 15) + ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) { ++#else ++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) { ++#endif + DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + +@@ -406,7 +418,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu + + // Batch executes the loaded model for inputs. + void BatchExecuteLoadedModel( ++#if defined(__clang__) && (__clang_major__ >= 15) + ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs, ++#else ++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs, ++#endif + std::vector<absl::optional<OutputType>>* outputs) { + DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); +@@ -466,7 +482,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu + // Unloads the model if needed. + void BatchExecuteLoadedModelAndRunCallback( + BatchExecutionCallback callback_on_complete, ++#if defined(__clang__) && (__clang_major__ >= 15) + ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs, ++#else ++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs, ++#endif + ExecutionStatus execution_status) { + DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_cc index 5fda36f5d..1cefb5738 100644 --- a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_cc +++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_cc @@ -1,7 +1,7 @@ Index: components/password_manager/core/browser/login_database.cc --- components/password_manager/core/browser/login_database.cc.orig +++ components/password_manager/core/browser/login_database.cc -@@ -843,7 +843,7 @@ std::string GeneratePlaceholders(size_t count) { +@@ -960,7 +960,7 @@ std::string GeneratePlaceholders(size_t count) { return result; } @@ -10,7 +10,7 @@ Index: components/password_manager/core/browser/login_database.cc // Fills |form| with necessary data required to be removed from the database // and returns it. PasswordForm GetFormForRemoval(sql::Statement& statement) { -@@ -860,7 +860,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme +@@ -977,7 +977,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() { @@ -19,7 +19,7 @@ Index: components/password_manager/core/browser/login_database.cc return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords); #else return false; -@@ -1713,7 +1713,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { +@@ -1832,7 +1832,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { } DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() { diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_unittest_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_unittest_cc index bb566d33b..961e81392 100644 --- a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_unittest_cc +++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_login_database_unittest_cc @@ -1,7 +1,7 @@ Index: components/password_manager/core/browser/login_database_unittest.cc --- components/password_manager/core/browser/login_database_unittest.cc.orig +++ components/password_manager/core/browser/login_database_unittest.cc -@@ -2170,7 +2170,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2159,7 +2159,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd base::HistogramTester histogram_tester; ASSERT_TRUE(db.Init()); @@ -10,7 +10,7 @@ Index: components/password_manager/core/browser/login_database_unittest.cc // Make sure that we can't get any logins when database is corrupted. // Disabling the checks in chromecast because encryption is unavailable. std::vector<std::unique_ptr<PasswordForm>> result; -@@ -2197,7 +2197,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2186,7 +2186,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd #endif // Check histograms. @@ -19,7 +19,7 @@ Index: components/password_manager/core/browser/login_database_unittest.cc histogram_tester.ExpectUniqueSample( "PasswordManager.DeleteUndecryptableLoginsReturnValue", metrics_util::DeleteCorruptedPasswordsResult::kSuccessPasswordsDeleted, -@@ -2240,7 +2240,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL +@@ -2229,7 +2229,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL } #endif // BUILDFLAG(IS_MAC) diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_sync_password_sync_bridge_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_sync_password_sync_bridge_cc index 73af6099a..68ca16282 100644 --- a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_sync_password_sync_bridge_cc +++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_sync_password_sync_bridge_cc @@ -1,7 +1,7 @@ Index: components/password_manager/core/browser/sync/password_sync_bridge.cc --- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig +++ components/password_manager/core/browser/sync/password_sync_bridge.cc -@@ -188,7 +188,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif +@@ -191,7 +191,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif // merge. bool ShouldRecoverPasswordsDuringMerge() { // Delete the local undecryptable copy when this is MacOS or Linux only. @@ -10,7 +10,7 @@ Index: components/password_manager/core/browser/sync/password_sync_bridge.cc return true; #else return false; -@@ -196,7 +196,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -199,7 +199,7 @@ bool ShouldRecoverPasswordsDuringMerge() { } bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_ui_passwords_grouper_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_ui_passwords_grouper_cc index ddd81846c..bcd695a2e 100644 --- a/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_ui_passwords_grouper_cc +++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_browser_ui_passwords_grouper_cc @@ -1,7 +1,7 @@ Index: components/password_manager/core/browser/ui/passwords_grouper.cc --- components/password_manager/core/browser/ui/passwords_grouper.cc.orig +++ components/password_manager/core/browser/ui/passwords_grouper.cc -@@ -403,7 +403,11 @@ absl::optional<PasskeyCredential> PasswordsGrouper::Ge +@@ -277,7 +277,11 @@ absl::optional<PasskeyCredential> PasswordsGrouper::Ge const std::vector<PasskeyCredential>& passkeys = map_group_id_to_credentials_[group_id_iterator->second].passkeys; const auto passkey_it = diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_cc b/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_cc index 6a6468542..9a01f1708 100644 --- a/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_cc +++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_cc @@ -1,8 +1,8 @@ Index: components/password_manager/core/common/password_manager_features.cc --- components/password_manager/core/common/password_manager_features.cc.orig +++ components/password_manager/core/common/password_manager_features.cc -@@ -96,7 +96,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal, - "PasswordManagerLogToTerminal", +@@ -18,7 +18,7 @@ BASE_FEATURE(kEnableOverwritingPlaceholderUsernames, + "EnableOverwritingPlaceholderUsernames", base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -10,8 +10,8 @@ Index: components/password_manager/core/common/password_manager_features.cc // When enabled, initial sync will be forced during startup if the password // store has encryption service failures. BASE_FEATURE(kForceInitialSyncWhenDecryptionFails, -@@ -211,7 +211,7 @@ BASE_FEATURE(kRevampedPasswordManagementBubble, - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -101,7 +101,7 @@ BASE_FEATURE(kRevampedPasswordManagementBubble, + base::FEATURE_ENABLED_BY_DEFAULT); #endif -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_h b/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_h index 22e1405a8..ffeabbf14 100644 --- a/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_h +++ b/www/ungoogled-chromium/patches/patch-components_password_manager_core_common_password_manager_features_h @@ -1,16 +1,16 @@ Index: components/password_manager/core/common/password_manager_features.h --- components/password_manager/core/common/password_manager_features.h.orig +++ components/password_manager/core/common/password_manager_features.h -@@ -44,7 +44,7 @@ BASE_DECLARE_FEATURE(kFillingAcrossAffiliatedWebsites) - BASE_DECLARE_FEATURE(kFillingAcrossGroupedSites); - BASE_DECLARE_FEATURE(kFillOnAccountSelect); - BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); +@@ -24,7 +24,7 @@ namespace password_manager::features { + // alongside the definition of their values in the .cc file. + BASE_DECLARE_FEATURE(kEnableOverwritingPlaceholderUsernames); + -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails); #endif - BASE_DECLARE_FEATURE(kInferConfirmationPasswordField); -@@ -73,7 +73,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); + BASE_DECLARE_FEATURE(kForgotPasswordFormSupport); +@@ -45,7 +45,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) // Desktop BASE_DECLARE_FEATURE(kRevampedPasswordManagementBubble); #endif diff --git a/www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_loader_common_cc b/www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_loader_common_cc new file mode 100644 index 000000000..14ba3b479 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-components_policy_core_common_policy_loader_common_cc @@ -0,0 +1,21 @@ +Index: components/policy/core/common/policy_loader_common.cc +--- components/policy/core/common/policy_loader_common.cc.orig ++++ components/policy/core/common/policy_loader_common.cc +@@ -46,7 +46,7 @@ const char* kSensitivePolicies[] = { + key::kDefaultSearchProviderEnabled, + key::kSafeBrowsingEnabled, + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + key::kAutoOpenFileTypes, + key::kSafeBrowsingAllowlistDomains, + key::kHomepageIsNewTabPage, +@@ -55,7 +55,7 @@ const char* kSensitivePolicies[] = { + key::kRestoreOnStartup, + key::kRestoreOnStartupURLs, + #endif +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + key::kCommandLineFlagSecurityWarningsEnabled, + #endif + #if !BUILDFLAG(IS_IOS) diff --git a/www/ungoogled-chromium/patches/patch-components_policy_tools_generate_policy_source_py b/www/ungoogled-chromium/patches/patch-components_policy_tools_generate_policy_source_py index 9ff5c6e1c..2335fbd2c 100644 --- a/www/ungoogled-chromium/patches/patch-components_policy_tools_generate_policy_source_py +++ b/www/ungoogled-chromium/patches/patch-components_policy_tools_generate_policy_source_py @@ -1,7 +1,7 @@ Index: components/policy/tools/generate_policy_source.py --- components/policy/tools/generate_policy_source.py.orig +++ components/policy/tools/generate_policy_source.py -@@ -49,9 +49,9 @@ PLATFORM_STRINGS = { +@@ -37,9 +37,9 @@ PLATFORM_STRINGS = { 'ios': ['ios'], 'fuchsia': ['fuchsia'], 'chrome.win': ['win'], diff --git a/www/ungoogled-chromium/patches/patch-components_power_metrics_BUILD_gn b/www/ungoogled-chromium/patches/patch-components_power_metrics_BUILD_gn index 80a46ace2..4ed4ec0ee 100644 --- a/www/ungoogled-chromium/patches/patch-components_power_metrics_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-components_power_metrics_BUILD_gn @@ -1,7 +1,7 @@ Index: components/power_metrics/BUILD.gn --- components/power_metrics/BUILD.gn.orig +++ components/power_metrics/BUILD.gn -@@ -42,7 +42,7 @@ static_library("power_metrics") { +@@ -41,7 +41,7 @@ static_library("power_metrics") { ldflags = [ "/DELAYLOAD:setupapi.dll" ] } diff --git a/www/ungoogled-chromium/patches/patch-components_segmentation_platform_embedder_default_model_cross_device_user_segment_cc b/www/ungoogled-chromium/patches/patch-components_segmentation_platform_embedder_default_model_cross_device_user_segment_cc index 8164272e1..fbd5333c8 100644 --- a/www/ungoogled-chromium/patches/patch-components_segmentation_platform_embedder_default_model_cross_device_user_segment_cc +++ b/www/ungoogled-chromium/patches/patch-components_segmentation_platform_embedder_default_model_cross_device_user_segment_cc @@ -1,7 +1,7 @@ Index: components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc --- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig +++ components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc -@@ -175,7 +175,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( +@@ -179,7 +179,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( // Check for current device type and subtract it from the device count // calculation. #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/patches/patch-components_services_paint_preview_compositor_paint_preview_compositor_collection_impl_cc b/www/ungoogled-chromium/patches/patch-components_services_paint_preview_compositor_paint_preview_compositor_collection_impl_cc index 1c43290d6..2ac56d5f4 100644 --- a/www/ungoogled-chromium/patches/patch-components_services_paint_preview_compositor_paint_preview_compositor_collection_impl_cc +++ b/www/ungoogled-chromium/patches/patch-components_services_paint_preview_compositor_paint_preview_compositor_collection_impl_cc @@ -1,7 +1,7 @@ Index: components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc --- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc -@@ -20,7 +20,7 @@ +@@ -21,7 +21,7 @@ #if BUILDFLAG(IS_WIN) #include "content/public/child/dwrite_font_proxy_init_win.h" @@ -10,7 +10,7 @@ Index: components/services/paint_preview_compositor/paint_preview_compositor_col #include "components/services/font/public/cpp/font_loader.h" #endif -@@ -66,7 +66,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp +@@ -78,7 +78,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp // Initialize font access for Skia. #if BUILDFLAG(IS_WIN) content::InitializeDWriteFontProxy(); @@ -19,7 +19,7 @@ Index: components/services/paint_preview_compositor/paint_preview_compositor_col mojo::PendingRemote<font_service::mojom::FontService> font_service; content::UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -89,7 +89,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp +@@ -101,7 +101,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp base::BindOnce([] { SkFontMgr::RefDefault(); })); // Sanity check that fonts are working. diff --git a/www/ungoogled-chromium/patches/patch-components_services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_cc b/www/ungoogled-chromium/patches/patch-components_services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_cc index 5f48a0340..1596af09c 100644 --- a/www/ungoogled-chromium/patches/patch-components_services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_cc +++ b/www/ungoogled-chromium/patches/patch-components_services_screen_ai_sandbox_screen_ai_sandbox_hook_linux_cc @@ -9,7 +9,7 @@ Index: components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc auto* instance = sandbox::policy::SandboxLinux::GetInstance(); std::vector<BrokerFilePermission> permissions{ -@@ -80,6 +81,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi +@@ -82,6 +83,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi sandbox::syscall_broker::COMMAND_OPEN}), permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/ungoogled-chromium/patches/patch-components_services_screen_ai_screen_ai_library_wrapper_cc b/www/ungoogled-chromium/patches/patch-components_services_screen_ai_screen_ai_library_wrapper_cc index 94717a54b..bae053afe 100644 --- a/www/ungoogled-chromium/patches/patch-components_services_screen_ai_screen_ai_library_wrapper_cc +++ b/www/ungoogled-chromium/patches/patch-components_services_screen_ai_screen_ai_library_wrapper_cc @@ -3,7 +3,7 @@ Index: components/services/screen_ai/screen_ai_library_wrapper.cc +++ 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 + // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux // official. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) @@ -12,7 +12,7 @@ Index: components/services/screen_ai/screen_ai_library_wrapper.cc @@ -219,7 +219,7 @@ ScreenAILibraryWrapper::ExtractLayout(const SkBitmap& - // TODO(crbug.com/1278245): Remove this after fixing the crash issue on Linux + // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux // official. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) @@ -21,7 +21,7 @@ Index: components/services/screen_ai/screen_ai_library_wrapper.cc @@ -253,7 +253,7 @@ absl::optional<std::vector<int32_t>> ScreenAILibraryWr - // TODO(crbug.com/1278245): Remove this after fixing the crash issue on Linux + // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux // official. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/patches/patch-components_startup_metric_utils_browser_startup_metric_utils_cc b/www/ungoogled-chromium/patches/patch-components_startup_metric_utils_browser_startup_metric_utils_cc deleted file mode 100644 index 14d166f5f..000000000 --- a/www/ungoogled-chromium/patches/patch-components_startup_metric_utils_browser_startup_metric_utils_cc +++ /dev/null @@ -1,12 +0,0 @@ -Index: components/startup_metric_utils/browser/startup_metric_utils.cc ---- components/startup_metric_utils/browser/startup_metric_utils.cc.orig -+++ components/startup_metric_utils/browser/startup_metric_utils.cc -@@ -311,7 +311,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time - // Enabling this logic on OS X causes a significant performance regression. - // TODO(crbug.com/601270): Remove IS_APPLE ifdef once priority changes are - // ignored on Mac main thread. --#if !BUILDFLAG(IS_APPLE) -+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) - static bool statics_initialized = false; - if (!statics_initialized) { - statics_initialized = true; diff --git a/www/ungoogled-chromium/patches/patch-components_startup_metric_utils_common_startup_metric_utils_cc b/www/ungoogled-chromium/patches/patch-components_startup_metric_utils_common_startup_metric_utils_cc new file mode 100644 index 000000000..2fe14e06e --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-components_startup_metric_utils_common_startup_metric_utils_cc @@ -0,0 +1,12 @@ +Index: components/startup_metric_utils/common/startup_metric_utils.cc +--- components/startup_metric_utils/common/startup_metric_utils.cc.orig ++++ components/startup_metric_utils/common/startup_metric_utils.cc +@@ -78,7 +78,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi + // Enabling this logic on OS X causes a significant performance regression. + // TODO(crbug.com/601270): Remove IS_APPLE ifdef once priority changes are + // ignored on Mac main thread. +-#if !BUILDFLAG(IS_APPLE) ++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) + static bool statics_initialized = false; + if (!statics_initialized) { + statics_initialized = true; diff --git a/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_proto_fetcher_cc b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_proto_fetcher_cc new file mode 100644 index 000000000..be657d93d --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_proto_fetcher_cc @@ -0,0 +1,40 @@ +Index: components/supervised_user/core/browser/proto_fetcher.cc +--- components/supervised_user/core/browser/proto_fetcher.cc.orig ++++ components/supervised_user/core/browser/proto_fetcher.cc +@@ -398,8 +398,11 @@ class RetryingFetcherImpl final : public DeferredFetch + // Not copyable. + RetryingFetcherImpl(const RetryingFetcherImpl&) = delete; + RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete; +- ++#if defined(__clang__) && (__clang_major__ >= 15) + void Start(ProtoFetcher<Response>::Callback callback) override { ++#else ++ void Start(typename ProtoFetcher<Response>::Callback callback) override { ++#endif + callback_ = std::move(callback); + Retry(); + } +@@ -435,7 +438,11 @@ class RetryingFetcherImpl final : public DeferredFetch + } + + // Client callback. ++#if defined(__clang__) && (__clang_major__ >= 15) + ProtoFetcher<Response>::Callback callback_; ++#else ++ typename ProtoFetcher<Response>::Callback callback_; ++#endif + + // Retry controls. + base::OneShotTimer timer_; +@@ -578,7 +585,11 @@ ParallelFetchManager<Request, Response>::ParallelFetch + template <typename Request, typename Response> + void ParallelFetchManager<Request, Response>::Fetch( + const Request& request, ++#if defined(__clang__) && (__clang_major__ >= 15) + Fetcher::Callback callback) { ++#else ++ typename Fetcher::Callback callback) { ++#endif + CHECK(callback) << "Use base::DoNothing() instead of empty callback."; + KeyType key = requests_in_flight_.Add(MakeFetcher(request)); + requests_in_flight_.Lookup(key)->Start( diff --git a/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_proto_fetcher_h b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_proto_fetcher_h new file mode 100644 index 000000000..dd8c582ec --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_proto_fetcher_h @@ -0,0 +1,22 @@ +Index: components/supervised_user/core/browser/proto_fetcher.h +--- components/supervised_user/core/browser/proto_fetcher.h.orig ++++ components/supervised_user/core/browser/proto_fetcher.h +@@ -165,10 +165,18 @@ class ParallelFetchManager { + + // Starts the fetch. Underlying fetcher is stored internally, and will be + // cleaned up after finish or when this manager is destroyed. ++#if defined(__clang__) && (__clang_major__ >= 15) + void Fetch(const Request& request, Fetcher::Callback callback); ++#else ++ void Fetch(const Request& request, typename Fetcher::Callback callback); ++#endif + + private: ++#if defined(__clang__) && (__clang_major__ >= 15) + using KeyType = base::IDMap<std::unique_ptr<Fetcher>>::KeyType; ++#else ++ using KeyType = typename base::IDMap<std::unique_ptr<Fetcher>>::KeyType; ++#endif + + // Remove fetcher under key from requests_in_flight_. + void Remove(KeyType key); diff --git a/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_supervised_user_service_cc b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_supervised_user_service_cc index 2ef5a96fc..be5706a81 100644 --- a/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_supervised_user_service_cc +++ b/www/ungoogled-chromium/patches/patch-components_supervised_user_core_browser_supervised_user_service_cc @@ -1,12 +1,12 @@ Index: components/supervised_user/core/browser/supervised_user_service.cc --- components/supervised_user/core/browser/supervised_user_service.cc.orig +++ components/supervised_user/core/browser/supervised_user_service.cc -@@ -70,7 +70,7 @@ void SupervisedUserService::Init() { - supervised_user::FirstTimeInterstitialBannerState banner_state = +@@ -73,7 +73,7 @@ void SupervisedUserService::Init() { static_cast<supervised_user::FirstTimeInterstitialBannerState>( 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 BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) if (supervised_user::CanDisplayFirstTimeInterstitialBanner()) { if (banner_state == supervised_user::FirstTimeInterstitialBannerState::kUnknown && diff --git a/www/ungoogled-chromium/patches/patch-components_sync_device_info_local_device_info_util_cc b/www/ungoogled-chromium/patches/patch-components_sync_device_info_local_device_info_util_cc index 7ed69cc37..3719747df 100644 --- a/www/ungoogled-chromium/patches/patch-components_sync_device_info_local_device_info_util_cc +++ b/www/ungoogled-chromium/patches/patch-components_sync_device_info_local_device_info_util_cc @@ -9,8 +9,8 @@ Index: components/sync_device_info/local_device_info_util.cc +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) - return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET -@@ -102,7 +102,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { + switch (ui::GetDeviceFormFactor()) { +@@ -107,7 +107,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { return DeviceInfo::OsType::kChromeOsAsh; #elif BUILDFLAG(IS_CHROMEOS_LACROS) return DeviceInfo::OsType::kChromeOsLacros; @@ -19,7 +19,7 @@ Index: components/sync_device_info/local_device_info_util.cc return DeviceInfo::OsType::kLinux; #elif BUILDFLAG(IS_ANDROID) return DeviceInfo::OsType::kAndroid; -@@ -121,7 +121,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { +@@ -126,7 +126,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { DeviceInfo::FormFactor GetLocalDeviceFormFactor() { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/patches/patch-components_translate_core_common_translate_util_cc b/www/ungoogled-chromium/patches/patch-components_translate_core_common_translate_util_cc index 19119e140..3f24e92c3 100644 --- a/www/ungoogled-chromium/patches/patch-components_translate_core_common_translate_util_cc +++ b/www/ungoogled-chromium/patches/patch-components_translate_core_common_translate_util_cc @@ -1,7 +1,7 @@ Index: components/translate/core/common/translate_util.cc --- components/translate/core/common/translate_util.cc.orig +++ components/translate/core/common/translate_util.cc -@@ -33,7 +33,7 @@ BASE_FEATURE(kTranslateSubFrames, +@@ -21,7 +21,7 @@ const char kSecurityOrigin[] = "trk:220:https://transl BASE_FEATURE(kTFLiteLanguageDetectionEnabled, "TFLiteLanguageDetectionEnabled", #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/ungoogled-chromium/patches/patch-components_url_formatter_spoof_checks_idn_spoof_checker_cc b/www/ungoogled-chromium/patches/patch-components_url_formatter_spoof_checks_idn_spoof_checker_cc index 24dab6e8d..d0653776f 100644 --- a/www/ungoogled-chromium/patches/patch-components_url_formatter_spoof_checks_idn_spoof_checker_cc +++ b/www/ungoogled-chromium/patches/patch-components_url_formatter_spoof_checks_idn_spoof_checker_cc @@ -1,7 +1,7 @@ Index: components/url_formatter/spoof_checks/idn_spoof_checker.cc --- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -292,7 +292,7 @@ IDNSpoofChecker::IDNSpoofChecker() { +@@ -293,7 +293,7 @@ IDNSpoofChecker::IDNSpoofChecker() { // The ideal fix would be to change the omnibox font used for Thai. In // that case, the Linux-only list should be revisited and potentially // removed. diff --git a/www/ungoogled-chromium/patches/patch-components_user_education_views_help_bubble_view_cc b/www/ungoogled-chromium/patches/patch-components_user_education_views_help_bubble_view_cc index a20b93cd9..d059b2673 100644 --- a/www/ungoogled-chromium/patches/patch-components_user_education_views_help_bubble_view_cc +++ b/www/ungoogled-chromium/patches/patch-components_user_education_views_help_bubble_view_cc @@ -1,7 +1,7 @@ Index: components/user_education/views/help_bubble_view.cc --- components/user_education/views/help_bubble_view.cc.orig +++ components/user_education/views/help_bubble_view.cc -@@ -947,7 +947,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -991,7 +991,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, views::Widget* widget) const { BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); diff --git a/www/ungoogled-chromium/patches/patch-components_variations_service_google_groups_updater_service_cc b/www/ungoogled-chromium/patches/patch-components_variations_service_google_groups_updater_service_cc index 583a9e77d..beaec6cbf 100644 --- a/www/ungoogled-chromium/patches/patch-components_variations_service_google_groups_updater_service_cc +++ b/www/ungoogled-chromium/patches/patch-components_variations_service_google_groups_updater_service_cc @@ -1,7 +1,7 @@ Index: components/variations/service/google_groups_updater_service.cc --- components/variations/service/google_groups_updater_service.cc.orig +++ components/variations/service/google_groups_updater_service.cc -@@ -29,7 +29,7 @@ const char kDogfoodGroupsSyncPrefGaiaIdKey[] = "gaia_i +@@ -15,7 +15,7 @@ // information from per-profile data to local-state. BASE_FEATURE(kVariationsGoogleGroupFiltering, "VariationsGoogleGroupFiltering", diff --git a/www/ungoogled-chromium/patches/patch-components_viz_host_renderer_settings_creation_cc b/www/ungoogled-chromium/patches/patch-components_viz_host_renderer_settings_creation_cc deleted file mode 100644 index bd9403a30..000000000 --- a/www/ungoogled-chromium/patches/patch-components_viz_host_renderer_settings_creation_cc +++ /dev/null @@ -1,12 +0,0 @@ -Index: components/viz/host/renderer_settings_creation.cc ---- components/viz/host/renderer_settings_creation.cc.orig -+++ components/viz/host/renderer_settings_creation.cc -@@ -52,7 +52,7 @@ RendererSettings CreateRendererSettings() { - renderer_settings.partial_swap_enabled = - !command_line->HasSwitch(switches::kUIDisablePartialSwap); - --#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Simple frame rate throttling only works on macOS and Linux - renderer_settings.apply_simple_frame_rate_throttling = - features::IsSimpleFrameRateThrottlingEnabled(); diff --git a/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_cc b/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_cc index 2a0d2159c..04979019c 100644 --- a/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_cc +++ b/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_cc @@ -1,7 +1,7 @@ Index: components/viz/service/display_embedder/skia_output_surface_impl.cc --- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1444,7 +1444,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1450,7 +1450,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, ycbcr_info); diff --git a/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_on_gpu_cc b/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_on_gpu_cc index d69b41cf7..02b4505ee 100644 --- a/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_on_gpu_cc +++ b/www/ungoogled-chromium/patches/patch-components_viz_service_display_embedder_skia_output_surface_impl_on_gpu_cc @@ -1,7 +1,7 @@ Index: components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc --- components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.orig +++ components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc -@@ -1496,7 +1496,12 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12( +@@ -1508,7 +1508,12 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12( // Issue readbacks from the surfaces: for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) { diff --git a/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_cc b/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_cc index a1f5128f6..915ae9852 100644 --- a/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_cc +++ b/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_cc @@ -1,7 +1,7 @@ Index: components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc --- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -107,7 +107,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -109,7 +109,7 @@ RootCompositorFrameSinkImpl::Create( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -10,7 +10,7 @@ Index: components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc // 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); -@@ -628,7 +628,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -644,7 +644,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/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_h b/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_h index 6c25020e8..b3ed9bf7d 100644 --- a/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_h +++ b/www/ungoogled-chromium/patches/patch-components_viz_service_frame_sinks_root_compositor_frame_sink_impl_h @@ -1,7 +1,7 @@ Index: components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h --- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -204,7 +204,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl +@@ -205,7 +205,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/patches/patch-components_webauthn_core_browser_passkey_sync_bridge_cc b/www/ungoogled-chromium/patches/patch-components_webauthn_core_browser_passkey_sync_bridge_cc index fc3a06d33..9d1c38498 100644 --- a/www/ungoogled-chromium/patches/patch-components_webauthn_core_browser_passkey_sync_bridge_cc +++ b/www/ungoogled-chromium/patches/patch-components_webauthn_core_browser_passkey_sync_bridge_cc @@ -1,7 +1,7 @@ Index: components/webauthn/core/browser/passkey_sync_bridge.cc --- components/webauthn/core/browser/passkey_sync_bridge.cc.orig +++ components/webauthn/core/browser/passkey_sync_bridge.cc -@@ -268,7 +268,11 @@ PasskeySyncBridge::GetAllPasskeys() const { +@@ -257,7 +257,11 @@ PasskeySyncBridge::GetPasskeysForRelyingPartyId( bool PasskeySyncBridge::DeletePasskey(const std::string& credential_id) { // Find the credential with the given |credential_id|. const auto passkey_it = @@ -13,7 +13,7 @@ Index: components/webauthn/core/browser/passkey_sync_bridge.cc return passkey.second.credential_id() == credential_id; }); if (passkey_it == data_.end()) { -@@ -319,7 +323,11 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin +@@ -308,7 +312,11 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin PasskeyChange change) { // Find the credential with the given |credential_id|. const auto passkey_it = diff --git a/www/ungoogled-chromium/patches/patch-content_app_content_main_runner_impl_cc b/www/ungoogled-chromium/patches/patch-content_app_content_main_runner_impl_cc index 6749d1c68..cdc2903a2 100644 --- a/www/ungoogled-chromium/patches/patch-content_app_content_main_runner_impl_cc +++ b/www/ungoogled-chromium/patches/patch-content_app_content_main_runner_impl_cc @@ -1,7 +1,7 @@ Index: content/app/content_main_runner_impl.cc --- content/app/content_main_runner_impl.cc.orig +++ content/app/content_main_runner_impl.cc -@@ -143,13 +143,13 @@ +@@ -142,13 +142,13 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -17,7 +17,7 @@ Index: content/app/content_main_runner_impl.cc #include "base/files/file_path_watcher_inotify.h" #include "base/native_library.h" #include "base/rand_util.h" -@@ -187,6 +187,10 @@ +@@ -186,6 +186,10 @@ #include "media/base/media_switches.h" #endif diff --git a/www/ungoogled-chromium/patches/patch-content_browser_BUILD_gn b/www/ungoogled-chromium/patches/patch-content_browser_BUILD_gn index 6ec462fca..d7597bf8e 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-content_browser_BUILD_gn @@ -1,7 +1,7 @@ Index: content/browser/BUILD.gn --- content/browser/BUILD.gn.orig +++ content/browser/BUILD.gn -@@ -2421,6 +2421,13 @@ source_set("browser") { +@@ -2434,6 +2434,13 @@ source_set("browser") { deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] } diff --git a/www/ungoogled-chromium/patches/patch-content_browser_browser_main_loop_cc b/www/ungoogled-chromium/patches/patch-content_browser_browser_main_loop_cc index ae558bbd5..f0446ab25 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_browser_main_loop_cc +++ b/www/ungoogled-chromium/patches/patch-content_browser_browser_main_loop_cc @@ -1,7 +1,7 @@ Index: content/browser/browser_main_loop.cc --- content/browser/browser_main_loop.cc.orig +++ content/browser/browser_main_loop.cc -@@ -245,6 +245,12 @@ +@@ -246,6 +246,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -14,7 +14,7 @@ Index: content/browser/browser_main_loop.cc // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -538,6 +544,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -539,6 +545,12 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -27,7 +27,7 @@ Index: content/browser/browser_main_loop.cc #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -575,7 +587,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -576,7 +588,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/patches/patch-content_browser_child_process_launcher_helper_linux_cc b/www/ungoogled-chromium/patches/patch-content_browser_child_process_launcher_helper_linux_cc index bb2a8c1de..06bfae5b3 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_child_process_launcher_helper_linux_cc +++ b/www/ungoogled-chromium/patches/patch-content_browser_child_process_launcher_helper_linux_cc @@ -109,9 +109,9 @@ Index: content/browser/child_process_launcher_helper_linux.cc +#endif } - void ChildProcessLauncherHelper::SetProcessBackgroundedOnLauncherThread( -@@ -174,11 +194,13 @@ void ChildProcessLauncherHelper::SetProcessBackgrounde - process.SetProcessBackgrounded(is_background); + void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( +@@ -175,11 +195,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL + } } +#if !BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/patches/patch-content_browser_devtools_protocol_system_info_handler_cc b/www/ungoogled-chromium/patches/patch-content_browser_devtools_protocol_system_info_handler_cc index 8799231ee..1ce49e728 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_devtools_protocol_system_info_handler_cc +++ b/www/ungoogled-chromium/patches/patch-content_browser_devtools_protocol_system_info_handler_cc @@ -1,7 +1,7 @@ Index: content/browser/devtools/protocol/system_info_handler.cc --- content/browser/devtools/protocol/system_info_handler.cc.orig +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -50,7 +50,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS +@@ -49,7 +49,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS // 1046598, and 1153667. // Windows builds need more time -- see Issue 873112 and 1004472. // Mac builds need more time - see Issue angleproject:6182. diff --git a/www/ungoogled-chromium/patches/patch-content_browser_download_save_package_cc b/www/ungoogled-chromium/patches/patch-content_browser_download_save_package_cc new file mode 100644 index 000000000..7cdcfa76c --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-content_browser_download_save_package_cc @@ -0,0 +1,17 @@ +Index: content/browser/download/save_package.cc +--- content/browser/download/save_package.cc.orig ++++ content/browser/download/save_package.cc +@@ -764,8 +764,13 @@ void SavePackage::Finish() { + if (download_) { + std::vector<download::DownloadSaveItemData::ItemInfo> files; + for (auto& item : saved_success_items_) { ++#if defined(__clang__) && (__clang_major__ >= 16) + files.emplace_back(item.second->full_path(), item.second->url(), + item.second->referrer().url); ++#else ++ files.emplace_back(download::DownloadSaveItemData::ItemInfo{item.second->full_path(), item.second->url(), ++ item.second->referrer().url}); ++#endif + } + download::DownloadSaveItemData::AttachItemData(download_, std::move(files)); + } diff --git a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_cc b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_cc index 347f7d7fd..a8b30c60c 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_cc +++ b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_cc @@ -1,7 +1,7 @@ Index: content/browser/gpu/gpu_data_manager_impl_private.cc --- content/browser/gpu/gpu_data_manager_impl_private.cc.orig +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1713,7 +1713,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1753,7 +1753,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_h b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_h index 26bd760a2..f7540708a 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_h +++ b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_data_manager_impl_private_h @@ -10,7 +10,7 @@ Index: content/browser/gpu/gpu_data_manager_impl_private.h bool IsGpuMemoryBufferNV12Supported(); void SetGpuMemoryBufferNV12Supported(bool supported); #endif // BUILDFLAG(IS_LINUX) -@@ -307,7 +307,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -306,7 +306,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { bool application_is_visible_ = true; bool disable_gpu_compositing_ = false; diff --git a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_process_host_cc b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_process_host_cc index 2b1801400..3d2a05343 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_process_host_cc +++ b/www/ungoogled-chromium/patches/patch-content_browser_gpu_gpu_process_host_cc @@ -1,7 +1,7 @@ Index: content/browser/gpu/gpu_process_host.cc --- content/browser/gpu/gpu_process_host.cc.orig +++ content/browser/gpu/gpu_process_host.cc -@@ -253,6 +253,7 @@ static const char* const kSwitchNames[] = { +@@ -254,6 +254,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, switches::kEnableGpuRasterization, switches::kEnableLogging, @@ -9,7 +9,7 @@ Index: content/browser/gpu/gpu_process_host.cc switches::kDoubleBufferCompositing, switches::kHeadless, switches::kLoggingLevel, -@@ -286,7 +287,7 @@ static const char* const kSwitchNames[] = { +@@ -287,7 +288,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kDisableBufferBWCompression, #endif diff --git a/www/ungoogled-chromium/patches/patch-content_browser_interest_group_header_direct_from_seller_signals_cc b/www/ungoogled-chromium/patches/patch-content_browser_interest_group_header_direct_from_seller_signals_cc new file mode 100644 index 000000000..8b79b973d --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-content_browser_interest_group_header_direct_from_seller_signals_cc @@ -0,0 +1,15 @@ +Index: content/browser/interest_group/header_direct_from_seller_signals.cc +--- content/browser/interest_group/header_direct_from_seller_signals.cc.orig ++++ content/browser/interest_group/header_direct_from_seller_signals.cc +@@ -187,7 +187,11 @@ void OnJsonDecoded(std::unique_ptr<const std::set<std: + + } // namespace + ++#if defined(__clang__) && (__clang_major__ >= 16) + HeaderDirectFromSellerSignals::HeaderDirectFromSellerSignals() = default; ++#else ++HeaderDirectFromSellerSignals::HeaderDirectFromSellerSignals() {} ++#endif + + HeaderDirectFromSellerSignals::~HeaderDirectFromSellerSignals() = default; + diff --git a/www/ungoogled-chromium/patches/patch-content_browser_network_service_instance_impl_cc b/www/ungoogled-chromium/patches/patch-content_browser_network_service_instance_impl_cc index bae776249..9235f3ebd 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_network_service_instance_impl_cc +++ b/www/ungoogled-chromium/patches/patch-content_browser_network_service_instance_impl_cc @@ -1,7 +1,7 @@ Index: content/browser/network_service_instance_impl.cc --- content/browser/network_service_instance_impl.cc.orig +++ content/browser/network_service_instance_impl.cc -@@ -80,7 +80,7 @@ +@@ -82,7 +82,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" #endif @@ -10,7 +10,7 @@ Index: content/browser/network_service_instance_impl.cc #include "content/browser/system_dns_resolution/system_dns_resolver.h" #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" #endif -@@ -419,7 +419,7 @@ void CreateInProcessNetworkService( +@@ -421,7 +421,7 @@ void CreateInProcessNetworkService( #endif } @@ -19,7 +19,7 @@ Index: content/browser/network_service_instance_impl.cc // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a // high-priority thread pool. void RunSystemDnsResolverOnThreadPool( -@@ -486,7 +486,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -488,7 +488,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_back_forward_cache_impl_cc b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_back_forward_cache_impl_cc deleted file mode 100644 index 789fd43ad..000000000 --- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_back_forward_cache_impl_cc +++ /dev/null @@ -1,12 +0,0 @@ -Index: content/browser/renderer_host/back_forward_cache_impl.cc ---- content/browser/renderer_host/back_forward_cache_impl.cc.orig -+++ content/browser/renderer_host/back_forward_cache_impl.cc -@@ -65,7 +65,7 @@ BASE_FEATURE(kBackForwardCacheSize, - // Sets the BackForwardCache size for desktop. - // See crbug.com/1291435. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_delegated_frame_host_cc b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_delegated_frame_host_cc index 35864ad14..2b5a1a812 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_delegated_frame_host_cc +++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_delegated_frame_host_cc @@ -1,7 +1,7 @@ Index: content/browser/renderer_host/delegated_frame_host.cc --- content/browser/renderer_host/delegated_frame_host.cc.orig +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -296,7 +296,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -312,7 +312,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_media_service_video_capture_device_launcher_cc b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_media_service_video_capture_device_launcher_cc new file mode 100644 index 000000000..8f0728d75 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_media_service_video_capture_device_launcher_cc @@ -0,0 +1,21 @@ +Index: content/browser/renderer_host/media/service_video_capture_device_launcher.cc +--- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig ++++ content/browser/renderer_host/media/service_video_capture_device_launcher.cc +@@ -24,7 +24,7 @@ + #include "media/base/media_switches.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "content/browser/gpu/gpu_data_manager_impl.h" + #endif + +@@ -166,7 +166,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs + } + #else + if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Linux, additionally check whether the NV12 GPU memory buffer is + // supported. + if (GpuDataManagerImpl::GetInstance()->IsGpuMemoryBufferNV12Supported()) diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_frame_host_impl_cc b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_frame_host_impl_cc new file mode 100644 index 000000000..442fe3ebd --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_frame_host_impl_cc @@ -0,0 +1,41 @@ +Index: content/browser/renderer_host/render_frame_host_impl.cc +--- content/browser/renderer_host/render_frame_host_impl.cc.orig ++++ content/browser/renderer_host/render_frame_host_impl.cc +@@ -8509,7 +8509,11 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeac + for (const blink::FencedFrame::ReportingDestination& destination : + destinations) { + SendFencedFrameReportingBeaconInternal( ++#if defined(__clang__) && (__clang_major__ >= 16) + DestinationEnumEvent(event_type, event_data), destination, ++#else ++ DestinationEnumEvent(DestinationEnumEvent{event_type, event_data}), destination, ++#endif + /*from_renderer=*/true, attribution_reporting_runtime_features, + GetFrameTreeNodeId()); + } +@@ -8545,7 +8549,11 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeac + } + + SendFencedFrameReportingBeaconInternal( ++#if defined(__clang__) && (__clang_major__ >= 16) + DestinationURLEvent(destination_url), ++#else ++ DestinationURLEvent(DestinationURLEvent{destination_url}), ++#endif + blink::FencedFrame::ReportingDestination::kBuyer, + /*from_renderer=*/true, attribution_reporting_runtime_features, + GetFrameTreeNodeId()); +@@ -8617,8 +8625,13 @@ void RenderFrameHostImpl::MaybeSendFencedFrameReportin + for (blink::FencedFrame::ReportingDestination destination : + info->destinations) { + initiator_rfh->SendFencedFrameReportingBeaconInternal( ++#if defined(__clang__) && (__clang_major__ >= 16) + DestinationEnumEvent(blink::kFencedFrameTopNavigationBeaconType, + info->data), ++#else ++ DestinationEnumEvent(DestinationEnumEvent{blink::kFencedFrameTopNavigationBeaconType, ++ info->data}), ++#endif + destination, + /*from_renderer=*/false, info->attribution_reporting_runtime_features, + GetFrameTreeNodeId(), navigation_request.GetNavigationId()); diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_cc b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_cc index 5b6fed66c..73fc9f4c6 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_cc +++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_cc @@ -19,7 +19,7 @@ Index: content/browser/renderer_host/render_process_host_impl.cc struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1352,7 +1352,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1362,7 +1362,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -28,7 +28,7 @@ Index: content/browser/renderer_host/render_process_host_impl.cc if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1441,7 +1441,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1451,7 +1451,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public std::unique_ptr<service_manager::BinderRegistry> binders_; mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; @@ -37,7 +37,16 @@ Index: content/browser/renderer_host/render_process_host_impl.cc mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> video_encode_accelerator_factory_remote_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -3556,6 +3556,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3515,7 +3515,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( + base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support + // for NV12 GPU memory buffer. + if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && +@@ -3576,6 +3576,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_h b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_h index 777150e06..c4c013d4b 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_h +++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_process_host_impl_h @@ -1,7 +1,7 @@ Index: content/browser/renderer_host/render_process_host_impl.h --- content/browser/renderer_host/render_process_host_impl.h.orig +++ content/browser/renderer_host/render_process_host_impl.h -@@ -537,7 +537,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -539,7 +539,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc index 698ed49a7..46c73b93c 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc +++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc @@ -1,7 +1,7 @@ Index: content/browser/renderer_host/render_widget_host_view_aura.cc --- content/browser/renderer_host/render_widget_host_view_aura.cc.orig +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -120,7 +120,7 @@ +@@ -121,7 +121,7 @@ #include "ui/gfx/gdi_util.h" #endif @@ -10,7 +10,7 @@ Index: content/browser/renderer_host/render_widget_host_view_aura.cc #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/linux/linux_ui.h" -@@ -453,7 +453,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -464,7 +464,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -19,7 +19,7 @@ Index: content/browser/renderer_host/render_widget_host_view_aura.cc BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1633,7 +1633,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1692,7 +1692,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } @@ -28,7 +28,7 @@ Index: content/browser/renderer_host/render_widget_host_view_aura.cc bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2468,7 +2468,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2537,7 +2537,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -37,7 +37,7 @@ Index: content/browser/renderer_host/render_widget_host_view_aura.cc return NeedsInputGrab(); #else return false; -@@ -2644,7 +2644,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2713,7 +2713,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_h b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_h index dfef71984..2e20d769d 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_h +++ b/www/ungoogled-chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_h @@ -1,7 +1,7 @@ Index: content/browser/renderer_host/render_widget_host_view_aura.h --- content/browser/renderer_host/render_widget_host_view_aura.h.orig +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -251,7 +251,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -256,7 +256,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/ungoogled-chromium/patches/patch-content_browser_sandbox_host_linux_cc b/www/ungoogled-chromium/patches/patch-content_browser_sandbox_host_linux_cc index 768a2a402..f2c455f6c 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_sandbox_host_linux_cc +++ b/www/ungoogled-chromium/patches/patch-content_browser_sandbox_host_linux_cc @@ -5,7 +5,7 @@ Index: content/browser/sandbox_host_linux.cc // Instead, it replies on a temporary socket provided by the caller. PCHECK(0 == shutdown(browser_socket, SHUT_WR)) << "shutdown"; -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) int pipefds[2]; CHECK(0 == pipe(pipefds)); const int child_lifeline_fd = pipefds[0]; diff --git a/www/ungoogled-chromium/patches/patch-content_browser_service_worker_service_worker_context_wrapper_cc b/www/ungoogled-chromium/patches/patch-content_browser_service_worker_service_worker_context_wrapper_cc index fc2ae67fa..617ac1181 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_service_worker_service_worker_context_wrapper_cc +++ b/www/ungoogled-chromium/patches/patch-content_browser_service_worker_service_worker_context_wrapper_cc @@ -1,7 +1,7 @@ Index: content/browser/service_worker/service_worker_context_wrapper.cc --- content/browser/service_worker/service_worker_context_wrapper.cc.orig +++ content/browser/service_worker/service_worker_context_wrapper.cc -@@ -1393,7 +1393,12 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW +@@ -1406,7 +1406,12 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW return; } diff --git a/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_cc b/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_cc index 23b744969..9bfeae9b9 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_cc +++ b/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_cc @@ -14,8 +14,8 @@ Index: content/browser/utility_process_host.cc #include "media/capture/capture_switches.h" #endif --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "base/task/sequenced_task_runner.h" #include "components/viz/host/gpu_client.h" #include "media/capture/capture_switches.h" @@ -32,8 +32,8 @@ Index: content/browser/utility_process_host.cc started_(false), name_(u"utility process"), file_data_(std::make_unique<ChildProcessLauncherFileData>()), --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)), #endif client_(std::move(client)) { @@ -52,6 +52,6 @@ Index: content/browser/utility_process_host.cc -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) { - if (!base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableVideoCaptureUseGpuMemoryBuffer) && + // Pass `kVideoCaptureUseGpuMemoryBuffer` flag to video capture service only + // when the video capture use GPU memory buffer enabled and NV12 GPU memory + // buffer supported. diff --git a/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_h b/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_h index 6ef78d6af..ad3e785e9 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_h +++ b/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_h @@ -5,8 +5,8 @@ Index: content/browser/utility_process_host.h class Thread; } // namespace base --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) namespace viz { class GpuClient; } // namespace viz @@ -14,8 +14,8 @@ Index: content/browser/utility_process_host.h std::vector<RunServiceDeprecatedCallback> pending_run_service_callbacks_; #endif --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) std::unique_ptr<viz::GpuClient, base::OnTaskRunnerDeleter> gpu_client_; #endif diff --git a/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_receiver_bindings_cc b/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_receiver_bindings_cc index 19fdcb268..ebad53ed5 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_receiver_bindings_cc +++ b/www/ungoogled-chromium/patches/patch-content_browser_utility_process_host_receiver_bindings_cc @@ -11,8 +11,8 @@ Index: content/browser/utility_process_host_receiver_bindings.cc #include "content/browser/font_service.h" // nogncheck #endif --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "components/viz/host/gpu_client.h" #include "content/public/browser/gpu_client.h" #endif @@ -27,8 +27,8 @@ Index: content/browser/utility_process_host_receiver_bindings.cc return; } #endif --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (auto gpu_receiver = receiver.As<viz::mojom::Gpu>()) { gpu_client_ = content::CreateGpuClient(std::move(gpu_receiver), base::DoNothing()); diff --git a/www/ungoogled-chromium/patches/patch-content_browser_web_contents_web_contents_view_aura_cc b/www/ungoogled-chromium/patches/patch-content_browser_web_contents_web_contents_view_aura_cc index 4aa77223f..13ab5278a 100644 --- a/www/ungoogled-chromium/patches/patch-content_browser_web_contents_web_contents_view_aura_cc +++ b/www/ungoogled-chromium/patches/patch-content_browser_web_contents_web_contents_view_aura_cc @@ -19,7 +19,7 @@ Index: content/browser/web_contents/web_contents_view_aura.cc // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1372,7 +1372,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1337,7 +1337,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. diff --git a/www/ungoogled-chromium/patches/patch-content_child_child_process_cc b/www/ungoogled-chromium/patches/patch-content_child_child_process_cc index fafdda2f6..26cff2d52 100644 --- a/www/ungoogled-chromium/patches/patch-content_child_child_process_cc +++ b/www/ungoogled-chromium/patches/patch-content_child_child_process_cc @@ -1,7 +1,7 @@ Index: content/child/child_process.cc --- content/child/child_process.cc.orig +++ content/child/child_process.cc -@@ -67,7 +67,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ +@@ -70,7 +70,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ io_thread_(std::make_unique<ChildIOThread>()) { const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); diff --git a/www/ungoogled-chromium/patches/patch-content_common_BUILD_gn b/www/ungoogled-chromium/patches/patch-content_common_BUILD_gn index f6ad3fe73..891a4b1f6 100644 --- a/www/ungoogled-chromium/patches/patch-content_common_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-content_common_BUILD_gn @@ -1,7 +1,7 @@ Index: content/common/BUILD.gn --- content/common/BUILD.gn.orig +++ content/common/BUILD.gn -@@ -434,6 +434,9 @@ if (is_linux || is_chromeos) { +@@ -433,6 +433,9 @@ if (is_linux || is_chromeos) { public = [ "set_process_title_linux.h" ] sources = [ "set_process_title_linux.cc" ] deps = [ "//base" ] @@ -11,7 +11,7 @@ Index: content/common/BUILD.gn } } -@@ -479,7 +482,7 @@ mojom("mojo_bindings") { +@@ -478,7 +481,7 @@ mojom("mojo_bindings") { if (enable_ipc_logging) { enabled_features += [ "ipc_logging" ] } diff --git a/www/ungoogled-chromium/patches/patch-content_public_common_content_features_cc b/www/ungoogled-chromium/patches/patch-content_public_common_content_features_cc index 63b7d689d..4d545f5aa 100644 --- a/www/ungoogled-chromium/patches/patch-content_public_common_content_features_cc +++ b/www/ungoogled-chromium/patches/patch-content_public_common_content_features_cc @@ -19,7 +19,7 @@ Index: content/public/common/content_features.cc base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -534,7 +534,7 @@ BASE_FEATURE(kNetworkQualityEstimatorWebHoldback, +@@ -507,7 +507,7 @@ BASE_FEATURE(kNetworkQualityEstimatorWebHoldback, // (activated by kUserAgentClientHint) BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT); @@ -28,7 +28,7 @@ Index: content/public/common/content_features.cc // 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 -@@ -1406,7 +1406,7 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1408,7 +1408,7 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -37,7 +37,7 @@ Index: content/public/common/content_features.cc defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1465,7 +1465,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1466,7 +1466,11 @@ BASE_FEATURE(kWebUICodeCache, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/ungoogled-chromium/patches/patch-content_public_common_content_features_h b/www/ungoogled-chromium/patches/patch-content_public_common_content_features_h index 1ae58afb6..b27cc8265 100644 --- a/www/ungoogled-chromium/patches/patch-content_public_common_content_features_h +++ b/www/ungoogled-chromium/patches/patch-content_public_common_content_features_h @@ -1,7 +1,7 @@ Index: content/public/common/content_features.h --- content/public/common/content_features.h.orig +++ content/public/common/content_features.h -@@ -114,7 +114,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> +@@ -108,7 +108,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> kFledgeLimitNumAuctionsParam; CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollOffsets); CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH); diff --git a/www/ungoogled-chromium/patches/patch-content_public_common_content_switches_cc b/www/ungoogled-chromium/patches/patch-content_public_common_content_switches_cc index d882bbd8c..f19b210d1 100644 --- a/www/ungoogled-chromium/patches/patch-content_public_common_content_switches_cc +++ b/www/ungoogled-chromium/patches/patch-content_public_common_content_switches_cc @@ -10,7 +10,7 @@ Index: content/public/common/content_switches.cc // 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. -@@ -1001,7 +1003,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -1005,7 +1007,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/ungoogled-chromium/patches/patch-content_renderer_BUILD_gn b/www/ungoogled-chromium/patches/patch-content_renderer_BUILD_gn index cf8805637..94e7bc139 100644 --- a/www/ungoogled-chromium/patches/patch-content_renderer_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-content_renderer_BUILD_gn @@ -1,8 +1,8 @@ Index: content/renderer/BUILD.gn --- content/renderer/BUILD.gn.orig +++ content/renderer/BUILD.gn -@@ -204,6 +204,13 @@ target(link_target_type, "renderer") { - configs += [ "//build/config/compiler:enable_arc" ] +@@ -200,6 +200,13 @@ target(link_target_type, "renderer") { + ] } + if (is_bsd) { diff --git a/www/ungoogled-chromium/patches/patch-content_renderer_render_thread_impl_cc b/www/ungoogled-chromium/patches/patch-content_renderer_render_thread_impl_cc index fd95fc4ab..9fc425663 100644 --- a/www/ungoogled-chromium/patches/patch-content_renderer_render_thread_impl_cc +++ b/www/ungoogled-chromium/patches/patch-content_renderer_render_thread_impl_cc @@ -1,7 +1,7 @@ Index: content/renderer/render_thread_impl.cc --- content/renderer/render_thread_impl.cc.orig +++ content/renderer/render_thread_impl.cc -@@ -203,6 +203,8 @@ +@@ -204,6 +204,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -10,7 +10,7 @@ Index: content/renderer/render_thread_impl.cc #else #include <malloc.h> #endif -@@ -1058,7 +1060,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1055,7 +1057,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = @@ -19,7 +19,7 @@ Index: content/renderer/render_thread_impl.cc base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1067,7 +1069,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1064,7 +1066,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = @@ -28,7 +28,7 @@ Index: content/renderer/render_thread_impl.cc base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1844,7 +1846,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1839,7 +1841,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create bool enable_video_encode_accelerator) { mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> vea_provider; diff --git a/www/ungoogled-chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc b/www/ungoogled-chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc index c33e85c04..2d7f523c6 100644 --- a/www/ungoogled-chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc +++ b/www/ungoogled-chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc @@ -1,7 +1,7 @@ Index: content/renderer/renderer_blink_platform_impl.cc --- content/renderer/renderer_blink_platform_impl.cc.orig +++ content/renderer/renderer_blink_platform_impl.cc -@@ -114,7 +114,7 @@ +@@ -113,7 +113,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -10,7 +10,7 @@ Index: content/renderer/renderer_blink_platform_impl.cc #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -178,13 +178,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -181,13 +181,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( sudden_termination_disables_(0), is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler) { @@ -26,7 +26,7 @@ Index: content/renderer/renderer_blink_platform_impl.cc mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -193,7 +193,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -196,7 +196,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -35,7 +35,7 @@ Index: content/renderer/renderer_blink_platform_impl.cc if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -251,7 +251,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -254,7 +254,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/ungoogled-chromium/patches/patch-content_renderer_renderer_main_platform_delegate_linux_cc b/www/ungoogled-chromium/patches/patch-content_renderer_renderer_main_platform_delegate_linux_cc index 1cb092846..414124a21 100644 --- a/www/ungoogled-chromium/patches/patch-content_renderer_renderer_main_platform_delegate_linux_cc +++ b/www/ungoogled-chromium/patches/patch-content_renderer_renderer_main_platform_delegate_linux_cc @@ -5,7 +5,7 @@ Index: content/renderer/renderer_main_platform_delegate_linux.cc // any renderer has been started. // Here, we test that the status of SeccompBpf in the renderer is consistent // with what SandboxLinux::GetStatus() said we would do. -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) auto* linux_sandbox = sandbox::policy::SandboxLinux::GetInstance(); if (linux_sandbox->GetStatus() & sandbox::policy::SandboxLinux::kSeccompBPF) { CHECK(linux_sandbox->seccomp_bpf_started()); diff --git a/www/ungoogled-chromium/patches/patch-content_shell_BUILD_gn b/www/ungoogled-chromium/patches/patch-content_shell_BUILD_gn index 8da00aa41..e063b517c 100644 --- a/www/ungoogled-chromium/patches/patch-content_shell_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-content_shell_BUILD_gn @@ -1,7 +1,7 @@ Index: content/shell/BUILD.gn --- content/shell/BUILD.gn.orig +++ content/shell/BUILD.gn -@@ -1016,7 +1016,7 @@ group("content_shell_crash_test") { +@@ -1021,7 +1021,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/ungoogled-chromium/patches/patch-content_test_BUILD_gn b/www/ungoogled-chromium/patches/patch-content_test_BUILD_gn index 3aeb9da9e..f757314cc 100644 --- a/www/ungoogled-chromium/patches/patch-content_test_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-content_test_BUILD_gn @@ -1,7 +1,7 @@ Index: content/test/BUILD.gn --- content/test/BUILD.gn.orig +++ content/test/BUILD.gn -@@ -2207,7 +2207,7 @@ static_library("run_all_unittests") { +@@ -2217,7 +2217,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -10,7 +10,7 @@ Index: content/test/BUILD.gn deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3273,7 +3273,7 @@ test("content_unittests") { +@@ -3288,7 +3288,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/ungoogled-chromium/patches/patch-content_utility_services_cc b/www/ungoogled-chromium/patches/patch-content_utility_services_cc index 47fbc6b1e..2ec6baaed 100644 --- a/www/ungoogled-chromium/patches/patch-content_utility_services_cc +++ b/www/ungoogled-chromium/patches/patch-content_utility_services_cc @@ -1,7 +1,7 @@ Index: content/utility/services.cc --- content/utility/services.cc.orig +++ content/utility/services.cc -@@ -65,7 +65,7 @@ +@@ -64,7 +64,7 @@ extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) @@ -10,7 +10,7 @@ Index: content/utility/services.cc #include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h" #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/policy/mojom/sandbox.mojom.h" -@@ -88,7 +88,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -87,7 +87,7 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -19,16 +19,16 @@ Index: content/utility/services.cc (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)) && -@@ -110,7 +110,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -109,7 +109,7 @@ extern sandbox::TargetServices* g_utility_target_servi #include "ui/accessibility/accessibility_features.h" #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE) --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "media/capture/capture_switches.h" #include "services/viz/public/cpp/gpu/gpu.h" - #endif // BUILDFLAG(IS_LINUX) -@@ -227,7 +227,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +@@ -226,7 +226,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -37,16 +37,16 @@ Index: content/utility/services.cc auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -311,7 +311,7 @@ auto RunVideoCapture( +@@ -308,7 +308,7 @@ auto RunVideoCapture( mojo::PendingReceiver<video_capture::mojom::VideoCaptureService> receiver) { auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>( std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault()); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { mojo::PendingRemote<viz::mojom::Gpu> remote_gpu; content::UtilityThread::Get()->BindHostReceiver( -@@ -343,7 +343,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -340,7 +340,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -55,7 +55,7 @@ Index: content/utility/services.cc (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryProcessService( mojo::PendingReceiver< -@@ -354,7 +354,7 @@ auto RunStableVideoDecoderFactoryProcessService( +@@ -351,7 +351,7 @@ auto RunStableVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) @@ -64,7 +64,7 @@ Index: content/utility/services.cc auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> receiver) { -@@ -418,13 +418,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -415,13 +415,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) diff --git a/www/ungoogled-chromium/patches/patch-content_utility_speech_speech_recognition_sandbox_hook_linux_h b/www/ungoogled-chromium/patches/patch-content_utility_speech_speech_recognition_sandbox_hook_linux_h index 37699d91a..d36ea891b 100644 --- a/www/ungoogled-chromium/patches/patch-content_utility_speech_speech_recognition_sandbox_hook_linux_h +++ b/www/ungoogled-chromium/patches/patch-content_utility_speech_speech_recognition_sandbox_hook_linux_h @@ -1,11 +1,13 @@ Index: content/utility/speech/speech_recognition_sandbox_hook_linux.h --- content/utility/speech/speech_recognition_sandbox_hook_linux.h.orig +++ content/utility/speech/speech_recognition_sandbox_hook_linux.h -@@ -5,7 +5,11 @@ +@@ -5,7 +5,13 @@ #ifndef CONTENT_UTILITY_SPEECH_SPEECH_RECOGNITION_SANDBOX_HOOK_LINUX_H_ #define CONTENT_UTILITY_SPEECH_SPEECH_RECOGNITION_SANDBOX_HOOK_LINUX_H_ -+#if defined(OS_BSD) ++#include "build/build_config.h" ++ ++#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" +#else #include "sandbox/policy/linux/sandbox_linux.h" diff --git a/www/ungoogled-chromium/patches/patch-content_zygote_zygote_linux_cc b/www/ungoogled-chromium/patches/patch-content_zygote_zygote_linux_cc index f556b9277..f43f6bbe0 100644 --- a/www/ungoogled-chromium/patches/patch-content_zygote_zygote_linux_cc +++ b/www/ungoogled-chromium/patches/patch-content_zygote_zygote_linux_cc @@ -9,7 +9,7 @@ Index: content/zygote/zygote_linux.cc #include "content/zygote/zygote_linux.h" -@@ -706,3 +707,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi +@@ -707,3 +708,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi } } // namespace content diff --git a/www/ungoogled-chromium/patches/patch-content_zygote_zygote_main_linux_cc b/www/ungoogled-chromium/patches/patch-content_zygote_zygote_main_linux_cc index 05a05c64a..2d2e58cd0 100644 --- a/www/ungoogled-chromium/patches/patch-content_zygote_zygote_main_linux_cc +++ b/www/ungoogled-chromium/patches/patch-content_zygote_zygote_main_linux_cc @@ -5,7 +5,7 @@ Index: content/zygote/zygote_main_linux.cc #include <stddef.h> #include <stdint.h> #include <string.h> -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) #include <sys/prctl.h> +#endif #include <sys/socket.h> @@ -15,7 +15,7 @@ Index: content/zygote/zygote_main_linux.cc #include "sandbox/linux/services/thread_helpers.h" #include "sandbox/linux/suid/client/setuid_sandbox_client.h" #include "sandbox/policy/linux/sandbox_debug_handling_linux.h" -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) #include "sandbox/policy/linux/sandbox_linux.h" +#endif #include "sandbox/policy/sandbox.h" @@ -25,7 +25,7 @@ Index: content/zygote/zygote_main_linux.cc namespace { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) void CloseFds(const std::vector<int>& fds) { for (const auto& it : fds) { PCHECK(0 == IGNORE_EINTR(close(it))); @@ -43,7 +43,7 @@ Index: content/zygote/zygote_main_linux.cc bool ZygoteMain( std::vector<std::unique_ptr<ZygoteForkDelegate>> fork_delegates) { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD()); auto* linux_sandbox = sandbox::policy::SandboxLinux::GetInstance(); diff --git a/www/ungoogled-chromium/patches/patch-extensions_browser_api_messaging_message_service_cc b/www/ungoogled-chromium/patches/patch-extensions_browser_api_messaging_message_service_cc index b357dba8f..7e1260491 100644 --- a/www/ungoogled-chromium/patches/patch-extensions_browser_api_messaging_message_service_cc +++ b/www/ungoogled-chromium/patches/patch-extensions_browser_api_messaging_message_service_cc @@ -10,7 +10,7 @@ Index: extensions/browser/api/messaging/message_service.cc const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -484,7 +484,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -486,7 +486,7 @@ void MessageService::OpenChannelToNativeApp( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/patches/patch-extensions_common_api_runtime_json b/www/ungoogled-chromium/patches/patch-extensions_common_api_runtime_json index a5a76afc0..2bfcd56e5 100644 --- a/www/ungoogled-chromium/patches/patch-extensions_common_api_runtime_json +++ b/www/ungoogled-chromium/patches/patch-extensions_common_api_runtime_json @@ -1,13 +1,11 @@ Index: extensions/common/api/runtime.json --- extensions/common/api/runtime.json.orig +++ extensions/common/api/runtime.json -@@ -89,7 +89,8 @@ - "cros", - "linux", - "openbsd", -- "fuchsia" -+ "fuchsia", -+ "freebsd" +@@ -89,6 +89,7 @@ + {"name": "cros", "description": "Specifies the Chrome operating system."}, + {"name": "linux", "description": "Specifies the Linux operating system."}, + {"name": "openbsd", "description": "Specifies the OpenBSD operating system."}, ++ {"name": "freebsd", "description": "Specifies the FreeBSD operating system."}, + {"name": "fuchsia", "description": "Specifies the Fuchsia operating system."} ] }, - { diff --git a/www/ungoogled-chromium/patches/patch-extensions_common_features_feature_cc b/www/ungoogled-chromium/patches/patch-extensions_common_features_feature_cc index 0c3b3fd87..ce5de1065 100644 --- a/www/ungoogled-chromium/patches/patch-extensions_common_features_feature_cc +++ b/www/ungoogled-chromium/patches/patch-extensions_common_features_feature_cc @@ -5,7 +5,7 @@ Index: extensions/common/features/feature.cc return WIN_PLATFORM; #elif BUILDFLAG(IS_FUCHSIA) return FUCHSIA_PLATFORM; -+#elif defined(OS_BSD) ++#elif BUILDFLAG(IS_BSD) + return LINUX_PLATFORM; #else return UNSPECIFIED_PLATFORM; diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_common_gpu_memory_buffer_support_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_common_gpu_memory_buffer_support_cc index d82abc8c8..5027cabf6 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_common_gpu_memory_buffer_support_cc +++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_common_gpu_memory_buffer_support_cc @@ -1,7 +1,7 @@ Index: gpu/command_buffer/common/gpu_memory_buffer_support.cc --- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc -@@ -174,7 +174,7 @@ uint32_t GetPlatformSpecificTextureTarget() { +@@ -182,7 +182,7 @@ uint32_t GetPlatformSpecificTextureTarget() { #if BUILDFLAG(IS_MAC) return macos_specific_texture_target; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || \ @@ -10,7 +10,7 @@ Index: gpu/command_buffer/common/gpu_memory_buffer_support.cc return GL_TEXTURE_EXTERNAL_OES; #elif BUILDFLAG(IS_IOS) return GL_TEXTURE_2D; -@@ -209,7 +209,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu +@@ -217,7 +217,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu gfx::BufferFormat format, gfx::BufferPlane plane) { #if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_dawn_context_provider_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_dawn_context_provider_cc index 11aca8d49..833167e79 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_dawn_context_provider_cc +++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_dawn_context_provider_cc @@ -1,12 +1,12 @@ Index: gpu/command_buffer/service/dawn_context_provider.cc --- gpu/command_buffer/service/dawn_context_provider.cc.orig +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -45,7 +45,7 @@ wgpu::BackendType GetDefaultBackendType() { +@@ -53,7 +53,7 @@ wgpu::BackendType GetDefaultBackendType() { return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return wgpu::BackendType::Vulkan; - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) return wgpu::BackendType::Metal; diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_gles2_cmd_decoder_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_gles2_cmd_decoder_cc index 0b9571ad7..03e58806e 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_gles2_cmd_decoder_cc +++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_gles2_cmd_decoder_cc @@ -1,7 +1,7 @@ Index: gpu/command_buffer/service/gles2_cmd_decoder.cc --- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2988,7 +2988,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2980,7 +2980,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_cc index 177057085..292e6611f 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_cc +++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_cc @@ -5,17 +5,17 @@ Index: gpu/command_buffer/service/shared_image/external_vk_image_backing.cc #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #endif -@@ -595,7 +595,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma - WGPUDevice wgpuDevice, - WGPUBackendType backend_type, - std::vector<WGPUTextureFormat> view_formats) { --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) - auto wgpu_format = ToWGPUFormat(format()); +@@ -656,7 +656,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma + const wgpu::Device& wgpuDevice, + wgpu::BackendType backend_type, + std::vector<wgpu::TextureFormat> view_formats) { +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) + auto wgpu_format = ToDawnFormat(format()); - if (wgpu_format == WGPUTextureFormat_Undefined) { + if (wgpu_format == wgpu::TextureFormat::Undefined) { diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_factory_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_factory_cc index c98be344c..aabb48af1 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_factory_cc +++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_external_vk_image_backing_factory_cc @@ -1,7 +1,16 @@ Index: gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc --- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc -@@ -226,7 +226,7 @@ bool ExternalVkImageBackingFactory::IsSupported( +@@ -89,7 +89,7 @@ base::flat_map<VkFormat, VkImageUsageFlags> CreateImag + } // namespace + + constexpr uint32_t kSupportedUsage = +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) + SHARED_IMAGE_USAGE_WEBGPU | SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE | + SHARED_IMAGE_USAGE_WEBGPU_STORAGE_TEXTURE | + #endif +@@ -257,7 +257,7 @@ bool ExternalVkImageBackingFactory::IsSupported( return false; } diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_factory_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_factory_cc new file mode 100644 index 000000000..3d9f5a181 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_factory_cc @@ -0,0 +1,12 @@ +Index: gpu/command_buffer/service/shared_image/shared_image_factory.cc +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig ++++ gpu/command_buffer/service/shared_image/shared_image_factory.cc +@@ -142,7 +142,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { + return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; + #elif BUILDFLAG(IS_ANDROID) + return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + return gfx::GpuMemoryBufferType::NATIVE_PIXMAP; + #elif BUILDFLAG(IS_WIN) + return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE; diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_manager_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_manager_cc index 9a12a7705..23964452f 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_manager_cc +++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_shared_image_manager_cc @@ -1,7 +1,7 @@ Index: gpu/command_buffer/service/shared_image/shared_image_manager.cc --- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc -@@ -499,7 +499,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -507,7 +507,7 @@ bool SharedImageManager::SupportsScanoutImages() { return true; #elif BUILDFLAG(IS_ANDROID) return base::AndroidHardwareBufferCompat::IsSupportAvailable(); diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_wrapped_sk_image_backing_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_wrapped_sk_image_backing_cc index 4e03056a0..917a699cc 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_wrapped_sk_image_backing_cc +++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_shared_image_wrapped_sk_image_backing_cc @@ -1,7 +1,7 @@ Index: gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc --- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig +++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc -@@ -210,7 +210,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri +@@ -211,7 +211,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri constexpr GrRenderable is_renderable = GrRenderable::kYes; constexpr GrProtected is_protected = GrProtected::kNo; diff --git a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_webgpu_decoder_impl_cc b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_webgpu_decoder_impl_cc index 2354b054e..6c8c85956 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_webgpu_decoder_impl_cc +++ b/www/ungoogled-chromium/patches/patch-gpu_command_buffer_service_webgpu_decoder_impl_cc @@ -1,7 +1,7 @@ Index: gpu/command_buffer/service/webgpu_decoder_impl.cc --- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1235,7 +1235,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1193,7 +1193,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( if (gr_context_type_ != GrContextType::kVulkan && use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { diff --git a/www/ungoogled-chromium/patches/patch-gpu_config_gpu_finch_features_cc b/www/ungoogled-chromium/patches/patch-gpu_config_gpu_finch_features_cc index 0dcc50c79..7e41614a2 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_config_gpu_finch_features_cc +++ b/www/ungoogled-chromium/patches/patch-gpu_config_gpu_finch_features_cc @@ -10,7 +10,7 @@ Index: gpu/config/gpu_finch_features.cc base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT -@@ -136,7 +136,8 @@ const base::FeatureParam<std::string> +@@ -142,7 +142,8 @@ BASE_FEATURE(kAggressiveSkiaGpuResourcePurge, BASE_FEATURE(kDefaultEnableGpuRasterization, "DefaultEnableGpuRasterization", #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/patches/patch-gpu_ipc_service_gpu_init_cc b/www/ungoogled-chromium/patches/patch-gpu_ipc_service_gpu_init_cc index 177a9543a..184c1474d 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_ipc_service_gpu_init_cc +++ b/www/ungoogled-chromium/patches/patch-gpu_ipc_service_gpu_init_cc @@ -1,7 +1,7 @@ Index: gpu/ipc/service/gpu_init.cc --- gpu/ipc/service/gpu_init.cc.orig +++ gpu/ipc/service/gpu_init.cc -@@ -336,7 +336,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -357,7 +357,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -10,7 +10,7 @@ Index: gpu/ipc/service/gpu_init.cc bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -373,7 +373,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -394,7 +394,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -19,7 +19,7 @@ Index: gpu/ipc/service/gpu_init.cc // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -444,7 +444,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -451,7 +451,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -28,7 +28,7 @@ Index: gpu/ipc/service/gpu_init.cc // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -530,7 +530,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -533,7 +533,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -37,7 +37,7 @@ Index: gpu/ipc/service/gpu_init.cc VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -674,7 +674,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -686,7 +686,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -46,7 +46,7 @@ Index: gpu/ipc/service/gpu_init.cc // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -728,7 +728,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -740,7 +740,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -55,7 +55,7 @@ Index: gpu/ipc/service/gpu_init.cc (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -882,7 +882,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -894,7 +894,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -64,7 +64,7 @@ Index: gpu/ipc/service/gpu_init.cc (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -952,7 +952,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -964,7 +964,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/ungoogled-chromium/patches/patch-gpu_vulkan_generate_bindings_py b/www/ungoogled-chromium/patches/patch-gpu_vulkan_generate_bindings_py index 53fae79f8..c8591f187 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_vulkan_generate_bindings_py +++ b/www/ungoogled-chromium/patches/patch-gpu_vulkan_generate_bindings_py @@ -1,7 +1,7 @@ Index: gpu/vulkan/generate_bindings.py --- gpu/vulkan/generate_bindings.py.orig +++ gpu/vulkan/generate_bindings.py -@@ -259,7 +259,7 @@ VULKAN_DEVICE_FUNCTIONS = [ +@@ -260,7 +260,7 @@ VULKAN_DEVICE_FUNCTIONS = [ ] }, { diff --git a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_cc b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_cc index 2240ce803..7bf905115 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_cc +++ b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_cc @@ -1,7 +1,7 @@ Index: gpu/vulkan/vulkan_device_queue.cc --- gpu/vulkan/vulkan_device_queue.cc.orig +++ gpu/vulkan/vulkan_device_queue.cc -@@ -93,7 +93,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -121,7 +121,7 @@ bool VulkanDeviceQueue::Initialize( // In dual-CPU cases, we cannot detect the active GPU correctly on Linux, // so don't select GPU device based on the |gpu_info|. @@ -10,12 +10,12 @@ Index: gpu/vulkan/vulkan_device_queue.cc // If gpu_info is provided, the device should match it. if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id || device_properties.deviceID != gpu_info->gpu.device_id)) { -@@ -233,7 +233,7 @@ bool VulkanDeviceQueue::Initialize( - enabled_device_features_2_ = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2}; - - // Android, Fuchsia, and Linux(VaapiVideoDecoder) need YCbCr sampler support. --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +@@ -263,7 +263,7 @@ bool VulkanDeviceQueue::Initialize( + // Android, Fuchsia, Linux, and CrOS (VaapiVideoDecoder) need YCbCr sampler + // support. + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!physical_device_info.feature_sampler_ycbcr_conversion) { LOG(ERROR) << "samplerYcbcrConversion is not supported."; return false; diff --git a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_h b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_h index 436859906..7f81431f7 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_h +++ b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_device_queue_h @@ -1,12 +1,12 @@ Index: gpu/vulkan/vulkan_device_queue.h --- gpu/vulkan/vulkan_device_queue.h.orig +++ gpu/vulkan/vulkan_device_queue.h -@@ -165,7 +165,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue - +@@ -166,7 +166,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue bool allow_protected_memory_ = false; --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) VkPhysicalDeviceSamplerYcbcrConversionFeatures sampler_ycbcr_conversion_features_{ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES}; diff --git a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_cc b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_cc index 7ac8d30b0..62dfbc7cc 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_cc +++ b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_cc @@ -1,7 +1,7 @@ Index: gpu/vulkan/vulkan_function_pointers.cc --- gpu/vulkan/vulkan_function_pointers.cc.orig +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -1151,7 +1151,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -1161,7 +1161,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } } @@ -10,7 +10,7 @@ Index: gpu/vulkan/vulkan_function_pointers.cc if (gfx::HasExtension(enabled_extensions, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) { vkGetImageDrmFormatModifierPropertiesEXT = -@@ -1339,7 +1339,7 @@ void VulkanFunctionPointers::ResetForTesting() { +@@ -1350,7 +1350,7 @@ void VulkanFunctionPointers::ResetForTesting() { vkGetSwapchainImagesKHR = nullptr; vkQueuePresentKHR = nullptr; diff --git a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_h b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_h index 172768b98..0803d522c 100644 --- a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_h +++ b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_function_pointers_h @@ -1,7 +1,7 @@ Index: gpu/vulkan/vulkan_function_pointers.h --- gpu/vulkan/vulkan_function_pointers.h.orig +++ gpu/vulkan/vulkan_function_pointers.h -@@ -309,7 +309,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -311,7 +311,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR; VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR; @@ -10,7 +10,7 @@ Index: gpu/vulkan/vulkan_function_pointers.h VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT> vkGetImageDrmFormatModifierPropertiesEXT; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -1225,7 +1225,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1235,7 +1235,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } @@ -19,7 +19,7 @@ Index: gpu/vulkan/vulkan_function_pointers.h ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1235,4 +1235,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1245,4 +1245,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_image_cc b/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_image_cc deleted file mode 100644 index a54425302..000000000 --- a/www/ungoogled-chromium/patches/patch-gpu_vulkan_vulkan_image_cc +++ /dev/null @@ -1,12 +0,0 @@ -Index: gpu/vulkan/vulkan_image.cc ---- gpu/vulkan/vulkan_image.cc.orig -+++ gpu/vulkan/vulkan_image.cc -@@ -392,7 +392,7 @@ bool VulkanImage::InitializeWithExternalMemory( - - // TODO(crbug.com/1052397): Revisit 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) - VkPhysicalDeviceImageDrmFormatModifierInfoEXT modifier_info = { - .sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT, diff --git a/www/ungoogled-chromium/patches/patch-headless_lib_headless_content_main_delegate_cc b/www/ungoogled-chromium/patches/patch-headless_lib_headless_content_main_delegate_cc index b811bf14e..212dacefd 100644 --- a/www/ungoogled-chromium/patches/patch-headless_lib_headless_content_main_delegate_cc +++ b/www/ungoogled-chromium/patches/patch-headless_lib_headless_content_main_delegate_cc @@ -1,7 +1,7 @@ Index: headless/lib/headless_content_main_delegate.cc --- headless/lib/headless_content_main_delegate.cc.orig +++ headless/lib/headless_content_main_delegate.cc -@@ -337,7 +337,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -344,7 +344,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( if (process_type != ::switches::kZygoteProcess) { g_headless_crash_client.Pointer()->set_crash_dumps_dir( command_line.GetSwitchValuePath(switches::kCrashDumpsDir)); diff --git a/www/ungoogled-chromium/patches/patch-ipc_ipc_message_utils_cc b/www/ungoogled-chromium/patches/patch-ipc_ipc_message_utils_cc index d00786c4f..6ef39dde3 100644 --- a/www/ungoogled-chromium/patches/patch-ipc_ipc_message_utils_cc +++ b/www/ungoogled-chromium/patches/patch-ipc_ipc_message_utils_cc @@ -1,7 +1,7 @@ Index: ipc/ipc_message_utils.cc --- ipc/ipc_message_utils.cc.orig +++ ipc/ipc_message_utils.cc -@@ -360,7 +360,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -393,7 +393,7 @@ void ParamTraits<unsigned int>::Log(const param_type& } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/patches/patch-media_BUILD_gn b/www/ungoogled-chromium/patches/patch-media_BUILD_gn index fbd8adeee..afcf9fffe 100644 --- a/www/ungoogled-chromium/patches/patch-media_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-media_BUILD_gn @@ -1,7 +1,7 @@ Index: media/BUILD.gn --- media/BUILD.gn.orig +++ media/BUILD.gn -@@ -93,6 +93,9 @@ config("media_config") { +@@ -94,6 +94,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/ungoogled-chromium/patches/patch-media_audio_BUILD_gn b/www/ungoogled-chromium/patches/patch-media_audio_BUILD_gn index 69770b5df..f92ad8581 100644 --- a/www/ungoogled-chromium/patches/patch-media_audio_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-media_audio_BUILD_gn @@ -1,7 +1,7 @@ Index: media/audio/BUILD.gn --- media/audio/BUILD.gn.orig +++ media/audio/BUILD.gn -@@ -283,9 +283,20 @@ source_set("audio") { +@@ -279,9 +279,20 @@ source_set("audio") { ] } diff --git a/www/ungoogled-chromium/patches/patch-media_base_media_switches_cc b/www/ungoogled-chromium/patches/patch-media_base_media_switches_cc index c83567641..02b57967b 100644 --- a/www/ungoogled-chromium/patches/patch-media_base_media_switches_cc +++ b/www/ungoogled-chromium/patches/patch-media_base_media_switches_cc @@ -10,7 +10,7 @@ Index: media/base/media_switches.cc #include "base/cpu.h" #endif -@@ -648,7 +648,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -652,7 +652,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -19,7 +19,7 @@ Index: media/base/media_switches.cc base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -671,7 +671,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, +@@ -675,7 +675,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -28,7 +28,7 @@ Index: media/base/media_switches.cc base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -683,7 +683,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -687,7 +687,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -37,7 +37,7 @@ Index: media/base/media_switches.cc base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -727,7 +727,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -731,7 +731,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -46,7 +46,16 @@ Index: media/base/media_switches.cc // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -1294,7 +1294,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo +@@ -811,7 +811,7 @@ BASE_FEATURE(kVaapiVp9kSVCHWEncoding, + "VaapiVp9kSVCHWEncoding", + base::FEATURE_ENABLED_BY_DEFAULT); + #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. + BASE_FEATURE(kV4L2FlatStatelessVideoDecoder, + "V4L2FlatStatelessVideoDecoder", +@@ -1317,7 +1317,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo }; #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/ungoogled-chromium/patches/patch-media_base_media_switches_h b/www/ungoogled-chromium/patches/patch-media_base_media_switches_h index 1affd9da4..ec0a99498 100644 --- a/www/ungoogled-chromium/patches/patch-media_base_media_switches_h +++ b/www/ungoogled-chromium/patches/patch-media_base_media_switches_h @@ -1,7 +1,7 @@ Index: media/base/media_switches.h --- media/base/media_switches.h.orig +++ media/base/media_switches.h -@@ -300,7 +300,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor +@@ -301,7 +301,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture); @@ -10,7 +10,16 @@ Index: media/base/media_switches.h MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -436,7 +436,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV +@@ -319,7 +319,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding); + #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatelessVideoDecoder); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder); + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +@@ -439,7 +439,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/ungoogled-chromium/patches/patch-media_base_video_frame_cc b/www/ungoogled-chromium/patches/patch-media_base_video_frame_cc index 018149fa2..99c78aed5 100644 --- a/www/ungoogled-chromium/patches/patch-media_base_video_frame_cc +++ b/www/ungoogled-chromium/patches/patch-media_base_video_frame_cc @@ -55,7 +55,7 @@ Index: media/base/video_frame.cc DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1303,7 +1303,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1309,7 +1309,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -64,7 +64,7 @@ Index: media/base/video_frame.cc const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1416,7 +1416,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1422,7 +1422,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/ungoogled-chromium/patches/patch-media_base_video_frame_h b/www/ungoogled-chromium/patches/patch-media_base_video_frame_h index 0e90b4f6c..3f44c6591 100644 --- a/www/ungoogled-chromium/patches/patch-media_base_video_frame_h +++ b/www/ungoogled-chromium/patches/patch-media_base_video_frame_h @@ -10,7 +10,7 @@ Index: media/base/video_frame.h #include "base/files/scoped_file.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -113,7 +113,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -110,7 +110,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Backed by read-only shared memory. @@ -19,7 +19,7 @@ Index: media/base/video_frame.h // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -316,7 +316,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -313,7 +313,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -28,7 +28,7 @@ Index: media/base/video_frame.h // 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 -@@ -596,7 +596,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -593,7 +593,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; @@ -37,7 +37,7 @@ Index: media/base/video_frame.h // 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 -@@ -814,7 +814,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -811,7 +811,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_; diff --git a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_fake_v4l2_impl_cc b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_fake_v4l2_impl_cc index d2e2bc5cd..bdabe31d9 100644 --- a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_fake_v4l2_impl_cc +++ b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_fake_v4l2_impl_cc @@ -1,7 +1,7 @@ Index: media/capture/video/linux/fake_v4l2_impl.cc --- media/capture/video/linux/fake_v4l2_impl.cc.orig +++ media/capture/video/linux/fake_v4l2_impl.cc -@@ -487,7 +487,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -560,7 +560,7 @@ int FakeV4L2Impl::close(int fd) { return kSuccessReturnValue; } diff --git a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_fake_v4l2_impl_h b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_fake_v4l2_impl_h index 703788974..4718d892f 100644 --- a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_fake_v4l2_impl_h +++ b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_fake_v4l2_impl_h @@ -15,7 +15,7 @@ Index: media/capture/video/linux/fake_v4l2_impl.h #include "base/synchronization/lock.h" #include "media/capture/capture_export.h" -@@ -36,7 +42,7 @@ class CAPTURE_EXPORT FakeV4L2Impl : public V4L2Capture +@@ -38,7 +44,7 @@ class CAPTURE_EXPORT FakeV4L2Impl : public V4L2Capture // Implementation of V4L2CaptureDevice interface: int open(const char* device_name, int flags) override; int close(int fd) override; diff --git a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_cc b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_cc index 75d4d6db9..ef71210fb 100644 --- a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_cc +++ b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_cc @@ -12,7 +12,15 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc #include <poll.h> #include <sys/fcntl.h> #include <sys/ioctl.h> -@@ -28,10 +30,12 @@ +@@ -26,17 +28,19 @@ + #include "media/capture/video/blob_utils.h" + #include "media/capture/video/linux/video_capture_device_linux.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "media/capture/capture_switches.h" + #include "media/capture/video/linux/v4l2_capture_delegate_gpu_helper.h" + #endif // BUILDFLAG(IS_LINUX) using media::mojom::MeteringMode; @@ -25,7 +33,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -255,7 +259,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control +@@ -260,7 +264,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control // static bool V4L2CaptureDelegate::IsControllableControl( int control_id, @@ -34,7 +42,25 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc 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 +@@ -316,7 +320,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( + is_capturing_(false), + timeout_count_(0), + rotation_(rotation) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); + #endif // BUILDFLAG(IS_LINUX) + } +@@ -443,7 +447,7 @@ void V4L2CaptureDelegate::AllocateAndStart( + + client_->OnStarted(); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (use_gpu_buffer_) { + v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>( + std::move(gmb_support_test_)); +@@ -793,7 +797,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting( V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -43,7 +69,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -782,7 +786,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -803,7 +807,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } @@ -52,7 +78,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp)); } -@@ -793,6 +797,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co +@@ -814,6 +818,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co } void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() { @@ -60,7 +86,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS, V4L2_CID_AUTO_WHITE_BALANCE, V4L2_CID_BRIGHTNESS, -@@ -820,6 +825,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript +@@ -841,6 +846,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}"; } } @@ -68,7 +94,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc } mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) { -@@ -1000,7 +1006,11 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1021,7 +1027,11 @@ void V4L2CaptureDelegate::DoCapture() { pollfd device_pfd = {}; device_pfd.fd = device_fd_.get(); @@ -80,7 +106,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc const int result = HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs)); -@@ -1038,6 +1048,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1059,6 +1069,7 @@ void V4L2CaptureDelegate::DoCapture() { timeout_count_ = 0; } @@ -88,7 +114,7 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc // Dequeue events if the driver has filled in some. if (device_pfd.revents & POLLPRI) { bool controls_changed = false; -@@ -1072,6 +1083,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1093,6 +1104,7 @@ void V4L2CaptureDelegate::DoCapture() { client_->OnCaptureConfigurationChanged(); } } @@ -96,3 +122,12 @@ Index: media/capture/video/linux/v4l2_capture_delegate.cc // Deenqueue, send and reenqueue a buffer if the driver has filled one in. if (device_pfd.revents & POLLIN) { +@@ -1147,7 +1159,7 @@ void V4L2CaptureDelegate::DoCapture() { + // matrix = v4l2_format->fmt.pix.ycbcr_enc; + // transfer = v4l2_format->fmt.pix.xfer_func; + // See http://crbug.com/959919. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (use_gpu_buffer_) { + v4l2_gpu_helper_->OnIncomingCapturedData( + client_.get(), buffer_tracker->start(), diff --git a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_h b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_h index d567008e2..f51c8fcb6 100644 --- a/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_h +++ b/www/ungoogled-chromium/patches/patch-media_capture_video_linux_v4l2_capture_delegate_h @@ -1,16 +1,25 @@ Index: media/capture/video/linux/v4l2_capture_delegate.h --- media/capture/video/linux/v4l2_capture_delegate.h.orig +++ media/capture/video/linux/v4l2_capture_delegate.h -@@ -81,7 +81,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { +@@ -35,7 +35,7 @@ class Location; + + namespace media { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + class V4L2CaptureDelegateGpuHelper; + #endif // BUILDFLAG(IS_LINUX) + +@@ -86,7 +86,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { static bool IsBlockedControl(int control_id); static bool IsControllableControl( int control_id, - const base::RepeatingCallback<int(int, void*)>& do_ioctl); + const base::RepeatingCallback<int(unsigned int, void*)>& do_ioctl); - private: - friend class V4L2CaptureDelegateTest; -@@ -92,10 +92,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { + void SetGPUEnvironmentForTesting( + std::unique_ptr<gpu::GpuMemoryBufferSupport> gmb_support); +@@ -100,10 +100,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. @@ -23,3 +32,12 @@ Index: media/capture/video/linux/v4l2_capture_delegate.h // Check whether the control is controllable (and not changed automatically). bool IsControllableControl(int control_id); +@@ -157,7 +157,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { + // Clockwise rotation in degrees. This value should be 0, 90, 180, or 270. + int rotation_; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Support GPU memory buffer. + bool use_gpu_buffer_; + std::unique_ptr<V4L2CaptureDelegateGpuHelper> v4l2_gpu_helper_; diff --git a/www/ungoogled-chromium/patches/patch-media_capture_video_video_capture_buffer_tracker_factory_impl_cc b/www/ungoogled-chromium/patches/patch-media_capture_video_video_capture_buffer_tracker_factory_impl_cc index 0c437ccdb..de7d8512b 100644 --- a/www/ungoogled-chromium/patches/patch-media_capture_video_video_capture_buffer_tracker_factory_impl_cc +++ b/www/ungoogled-chromium/patches/patch-media_capture_video_video_capture_buffer_tracker_factory_impl_cc @@ -1,21 +1,21 @@ Index: media/capture/video/video_capture_buffer_tracker_factory_impl.cc --- media/capture/video/video_capture_buffer_tracker_factory_impl.cc.orig +++ media/capture/video/video_capture_buffer_tracker_factory_impl.cc -@@ -18,7 +18,7 @@ - #include "media/capture/video/mac/gpu_memory_buffer_tracker_mac.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +@@ -14,7 +14,7 @@ + #include "media/capture/video/chromeos/gpu_memory_buffer_tracker_cros.h" + #elif BUILDFLAG(IS_APPLE) + #include "media/capture/video/apple/gpu_memory_buffer_tracker_apple.h" +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "media/capture/video/linux/v4l2_gpu_memory_buffer_tracker.h" - #endif - -@@ -33,7 +33,7 @@ VideoCaptureBufferTrackerFactoryImpl::CreateTracker( - return std::make_unique<GpuMemoryBufferTracker>(); - #elif BUILDFLAG(IS_MAC) - return std::make_unique<GpuMemoryBufferTrackerMac>(); + #elif BUILDFLAG(IS_WIN) + #include "media/capture/video/shared_memory_buffer_tracker.h" +@@ -43,7 +43,7 @@ VideoCaptureBufferTrackerFactoryImpl::CreateTracker( + return std::make_unique<GpuMemoryBufferTrackerCros>(); + #elif BUILDFLAG(IS_APPLE) + return std::make_unique<GpuMemoryBufferTrackerApple>(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique<V4L2GpuMemoryBufferTracker>(); - #else - return nullptr; + #elif BUILDFLAG(IS_WIN) + if (!dxgi_device_manager_) { diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_video_decoder_pipeline_cc b/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_video_decoder_pipeline_cc index 9cdbc74a2..2efba0859 100644 --- a/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_video_decoder_pipeline_cc +++ b/www/ungoogled-chromium/patches/patch-media_gpu_chromeos_video_decoder_pipeline_cc @@ -1,7 +1,7 @@ Index: media/gpu/chromeos/video_decoder_pipeline.cc --- media/gpu/chromeos/video_decoder_pipeline.cc.orig +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -986,14 +986,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1002,14 +1002,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } } @@ -18,7 +18,7 @@ Index: media/gpu/chromeos/video_decoder_pipeline.cc // Linux w/ V4L2 should not use a custom allocator // Only tested with video_decode_accelerator_tests // TODO(wenst@) Test with full Chromium Browser -@@ -1124,7 +1124,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1140,7 +1140,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_gpu_video_encode_accelerator_factory_cc b/www/ungoogled-chromium/patches/patch-media_gpu_gpu_video_encode_accelerator_factory_cc index 5d4aa38ae..b67812c12 100644 --- a/www/ungoogled-chromium/patches/patch-media_gpu_gpu_video_encode_accelerator_factory_cc +++ b/www/ungoogled-chromium/patches/patch-media_gpu_gpu_video_encode_accelerator_factory_cc @@ -1,7 +1,7 @@ Index: media/gpu/gpu_video_encode_accelerator_factory.cc --- media/gpu/gpu_video_encode_accelerator_factory.cc.orig +++ media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -122,7 +122,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions +@@ -119,7 +119,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions return vea_factory_functions; #if BUILDFLAG(USE_VAAPI) diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_sandbox_hardware_video_encoding_sandbox_hook_linux_cc b/www/ungoogled-chromium/patches/patch-media_gpu_sandbox_hardware_video_encoding_sandbox_hook_linux_cc index be759729c..89ad2f07f 100644 --- a/www/ungoogled-chromium/patches/patch-media_gpu_sandbox_hardware_video_encoding_sandbox_hook_linux_cc +++ b/www/ungoogled-chromium/patches/patch-media_gpu_sandbox_hardware_video_encoding_sandbox_hook_linux_cc @@ -17,12 +17,11 @@ Index: media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc sandbox::syscall_broker::BrokerCommandSet command_set; std::vector<BrokerFilePermission> permissions; -@@ -134,7 +137,7 @@ bool HardwareVideoEncodingPreSandboxHook( - #endif // defined(__aarch64__) +@@ -121,6 +124,7 @@ bool HardwareVideoEncodingPreSandboxHook( + return false; + } } - #endif -- +#endif + #endif return true; } - diff --git a/www/ungoogled-chromium/patches/patch-media_gpu_vaapi_vaapi_wrapper_cc b/www/ungoogled-chromium/patches/patch-media_gpu_vaapi_vaapi_wrapper_cc index 3345cab7e..84d459467 100644 --- a/www/ungoogled-chromium/patches/patch-media_gpu_vaapi_vaapi_wrapper_cc +++ b/www/ungoogled-chromium/patches/patch-media_gpu_vaapi_vaapi_wrapper_cc @@ -1,7 +1,7 @@ Index: media/gpu/vaapi/vaapi_wrapper.cc --- media/gpu/vaapi/vaapi_wrapper.cc.orig +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -1609,7 +1609,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl +@@ -1610,7 +1610,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl return {}; } @@ -10,3 +10,12 @@ Index: media/gpu/vaapi/vaapi_wrapper.cc // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on // Linux. See comment in OzonePlatform::PlatformProperties::supports_vaapi // for more details. This will also require revisiting everything that's +@@ -2454,7 +2454,7 @@ scoped_refptr<VASurface> VaapiWrapper::CreateVASurface + return nullptr; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/1326754): enable use DRIME_PRIME_2 API on Linux with the + // iHD driver. + const bool use_drm_prime_2 = false; diff --git a/www/ungoogled-chromium/patches/patch-media_mojo_mojom_stable_stable_video_decoder_types_mojom_traits_cc b/www/ungoogled-chromium/patches/patch-media_mojo_mojom_stable_stable_video_decoder_types_mojom_traits_cc index e1cb7c42b..f2c4b4607 100644 --- a/www/ungoogled-chromium/patches/patch-media_mojo_mojom_stable_stable_video_decoder_types_mojom_traits_cc +++ b/www/ungoogled-chromium/patches/patch-media_mojo_mojom_stable_stable_video_decoder_types_mojom_traits_cc @@ -1,7 +1,7 @@ Index: media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc --- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc -@@ -730,7 +730,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -746,7 +746,7 @@ const gfx::GpuMemoryBufferId& StructTraits< return input.id; } @@ -10,7 +10,7 @@ Index: media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc // static gfx::NativePixmapHandle StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -751,7 +751,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor +@@ -767,7 +767,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor output->type = gfx::NATIVE_PIXMAP; diff --git a/www/ungoogled-chromium/patches/patch-media_video_gpu_memory_buffer_video_frame_pool_cc b/www/ungoogled-chromium/patches/patch-media_video_gpu_memory_buffer_video_frame_pool_cc index b50a0f079..257f38575 100644 --- a/www/ungoogled-chromium/patches/patch-media_video_gpu_memory_buffer_video_frame_pool_cc +++ b/www/ungoogled-chromium/patches/patch-media_video_gpu_memory_buffer_video_frame_pool_cc @@ -1,7 +1,7 @@ Index: media/video/gpu_memory_buffer_video_frame_pool.cc --- media/video/gpu_memory_buffer_video_frame_pool.cc.orig +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -728,7 +728,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -727,7 +727,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -10,7 +10,7 @@ Index: media/video/gpu_memory_buffer_video_frame_pool.cc is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1196,7 +1196,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1195,7 +1195,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo is_webgpu_compatible = (gpu_memory_buffer != nullptr); #endif @@ -19,7 +19,7 @@ Index: media/video/gpu_memory_buffer_video_frame_pool.cc is_webgpu_compatible = (gpu_memory_buffer != nullptr); if (is_webgpu_compatible) { is_webgpu_compatible &= -@@ -1215,7 +1215,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1214,7 +1214,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; diff --git a/www/ungoogled-chromium/patches/patch-media_video_video_encode_accelerator_adapter_cc b/www/ungoogled-chromium/patches/patch-media_video_video_encode_accelerator_adapter_cc index 74d526bfe..1b36ba142 100644 --- a/www/ungoogled-chromium/patches/patch-media_video_video_encode_accelerator_adapter_cc +++ b/www/ungoogled-chromium/patches/patch-media_video_video_encode_accelerator_adapter_cc @@ -10,7 +10,7 @@ Index: media/video/video_encode_accelerator_adapter.cc if (format != PIXEL_FORMAT_I420 || !VideoFrame::IsStorageTypeMappable(storage_type)) { // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -473,7 +473,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -465,7 +465,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), supported_rc_modes_, required_encoder_type_); diff --git a/www/ungoogled-chromium/patches/patch-mojo_public_tools_bindings_mojom_gni b/www/ungoogled-chromium/patches/patch-mojo_public_tools_bindings_mojom_gni index e2695d0dc..e1796719f 100644 --- a/www/ungoogled-chromium/patches/patch-mojo_public_tools_bindings_mojom_gni +++ b/www/ungoogled-chromium/patches/patch-mojo_public_tools_bindings_mojom_gni @@ -1,7 +1,7 @@ Index: mojo/public/tools/bindings/mojom.gni --- mojo/public/tools/bindings/mojom.gni.orig +++ mojo/public/tools/bindings/mojom.gni -@@ -744,6 +744,16 @@ template("mojom") { +@@ -743,6 +743,16 @@ template("mojom") { enabled_features += [ "is_apple" ] } diff --git a/www/ungoogled-chromium/patches/patch-net_BUILD_gn b/www/ungoogled-chromium/patches/patch-net_BUILD_gn index c6df1f963..6bcaac4c6 100644 --- a/www/ungoogled-chromium/patches/patch-net_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-net_BUILD_gn @@ -1,7 +1,7 @@ Index: net/BUILD.gn --- net/BUILD.gn.orig +++ net/BUILD.gn -@@ -107,7 +107,7 @@ net_configs = [ +@@ -122,7 +122,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -10,7 +10,7 @@ Index: net/BUILD.gn net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1235,6 +1235,19 @@ component("net") { +@@ -1244,6 +1244,19 @@ component("net") { deps += [ "//third_party/xdg_shared_mime_info" ] } @@ -30,7 +30,7 @@ Index: net/BUILD.gn if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1395,7 +1408,7 @@ component("net") { +@@ -1399,7 +1412,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -39,7 +39,7 @@ Index: net/BUILD.gn sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2875,7 +2888,7 @@ test("net_unittests") { +@@ -2893,7 +2906,7 @@ test("net_unittests") { ] } @@ -48,7 +48,7 @@ Index: net/BUILD.gn sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2943,6 +2956,10 @@ test("net_unittests") { +@@ -2961,6 +2974,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -59,7 +59,7 @@ Index: net/BUILD.gn if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -3029,7 +3046,7 @@ test("net_unittests") { +@@ -3043,7 +3060,7 @@ test("net_unittests") { ] } @@ -68,7 +68,7 @@ Index: net/BUILD.gn sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3165,7 +3182,7 @@ test("net_unittests") { +@@ -3178,7 +3195,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/ungoogled-chromium/patches/patch-net_base_features_cc b/www/ungoogled-chromium/patches/patch-net_base_features_cc new file mode 100644 index 000000000..622d4cdce --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-net_base_features_cc @@ -0,0 +1,12 @@ +Index: net/base/features.cc +--- net/base/features.cc.orig ++++ net/base/features.cc +@@ -179,7 +179,7 @@ BASE_FEATURE(kCertDualVerificationTrialFeature, + #if BUILDFLAG(CHROME_ROOT_STORE_OPTIONAL) + BASE_FEATURE(kChromeRootStoreUsed, + "ChromeRootStoreUsed", +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/patches/patch-net_disk_cache_blockfile_disk_format_h b/www/ungoogled-chromium/patches/patch-net_disk_cache_blockfile_disk_format_h deleted file mode 100644 index 1bf37c4e6..000000000 --- a/www/ungoogled-chromium/patches/patch-net_disk_cache_blockfile_disk_format_h +++ /dev/null @@ -1,13 +0,0 @@ -Index: net/disk_cache/blockfile/disk_format.h ---- net/disk_cache/blockfile/disk_format.h.orig -+++ net/disk_cache/blockfile/disk_format.h -@@ -153,7 +153,9 @@ struct RankingsNode { - }; - #pragma pack(pop) - -+#if !defined(OS_BSD) - static_assert(sizeof(RankingsNode) == 36, "bad RankingsNode"); -+#endif - - } // namespace disk_cache - diff --git a/www/ungoogled-chromium/patches/patch-net_dns_address_info_cc b/www/ungoogled-chromium/patches/patch-net_dns_address_info_cc new file mode 100644 index 000000000..eb3d0e964 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-net_dns_address_info_cc @@ -0,0 +1,12 @@ +Index: net/dns/address_info.cc +--- net/dns/address_info.cc.orig ++++ net/dns/address_info.cc +@@ -77,7 +77,7 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get( + // error. + // http://crbug.com/134142 + err = ERR_NAME_NOT_RESOLVED; +-#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FREEBSD) ++#elif BUILDFLAG(IS_POSIX) + if (os_error != EAI_NONAME && os_error != EAI_NODATA) + err = ERR_NAME_RESOLUTION_FAILED; + #endif diff --git a/www/ungoogled-chromium/patches/patch-net_dns_host_resolver_cache_cc b/www/ungoogled-chromium/patches/patch-net_dns_host_resolver_cache_cc index 8f06f9c69..bb23a9bed 100644 --- a/www/ungoogled-chromium/patches/patch-net_dns_host_resolver_cache_cc +++ b/www/ungoogled-chromium/patches/patch-net_dns_host_resolver_cache_cc @@ -1,7 +1,7 @@ Index: net/dns/host_resolver_cache.cc --- net/dns/host_resolver_cache.cc.orig +++ net/dns/host_resolver_cache.cc -@@ -159,7 +159,11 @@ void HostResolverCache::Set( +@@ -161,7 +161,11 @@ void HostResolverCache::Set( std::string domain_name = result->domain_name(); entries_.emplace( diff --git a/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_builder_cc b/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_builder_cc index 8ef5f1b67..aa560bb18 100644 --- a/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_builder_cc +++ b/www/ungoogled-chromium/patches/patch-net_url_request_url_request_context_builder_cc @@ -1,7 +1,7 @@ Index: net/url_request/url_request_context_builder.cc --- net/url_request/url_request_context_builder.cc.orig +++ net/url_request/url_request_context_builder.cc -@@ -445,7 +445,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -446,7 +446,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/ungoogled-chromium/patches/patch-printing_backend_cups_ipp_helper_cc b/www/ungoogled-chromium/patches/patch-printing_backend_cups_ipp_helper_cc index f35d54457..b5bf2d798 100644 --- a/www/ungoogled-chromium/patches/patch-printing_backend_cups_ipp_helper_cc +++ b/www/ungoogled-chromium/patches/patch-printing_backend_cups_ipp_helper_cc @@ -1,7 +1,7 @@ Index: printing/backend/cups_ipp_helper.cc --- printing/backend/cups_ipp_helper.cc.orig +++ printing/backend/cups_ipp_helper.cc -@@ -213,7 +213,7 @@ void ExtractResolutions(const CupsOptionProvider& prin +@@ -215,7 +215,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/ungoogled-chromium/patches/patch-printing_print_settings_cc b/www/ungoogled-chromium/patches/patch-printing_print_settings_cc index b7bf37fc8..40d403bce 100644 --- a/www/ungoogled-chromium/patches/patch-printing_print_settings_cc +++ b/www/ungoogled-chromium/patches/patch-printing_print_settings_cc @@ -1,7 +1,7 @@ Index: printing/print_settings.cc --- printing/print_settings.cc.orig +++ printing/print_settings.cc -@@ -314,7 +314,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet +@@ -309,7 +309,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet #endif is_modifiable_ = settings.is_modifiable_; pages_per_sheet_ = settings.pages_per_sheet_; @@ -10,7 +10,7 @@ Index: printing/print_settings.cc for (const auto& item : settings.advanced_settings_) advanced_settings_.emplace(item.first, item.second.Clone()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -341,7 +341,7 @@ bool PrintSettings::operator==(const PrintSettings& ot +@@ -336,7 +336,7 @@ bool PrintSettings::operator==(const PrintSettings& ot #endif is_modifiable_, requested_custom_margins_in_points_, pages_per_sheet_ @@ -19,7 +19,7 @@ Index: printing/print_settings.cc , advanced_settings_ #endif -@@ -366,7 +366,7 @@ bool PrintSettings::operator==(const PrintSettings& ot +@@ -361,7 +361,7 @@ bool PrintSettings::operator==(const PrintSettings& ot other.is_modifiable_, other.requested_custom_margins_in_points_, other.pages_per_sheet_ @@ -28,7 +28,7 @@ Index: printing/print_settings.cc , other.advanced_settings_ #endif -@@ -405,7 +405,7 @@ void PrintSettings::Clear() { +@@ -400,7 +400,7 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; diff --git a/www/ungoogled-chromium/patches/patch-printing_print_settings_h b/www/ungoogled-chromium/patches/patch-printing_print_settings_h index f3c3e304e..729f28ec6 100644 --- a/www/ungoogled-chromium/patches/patch-printing_print_settings_h +++ b/www/ungoogled-chromium/patches/patch-printing_print_settings_h @@ -28,7 +28,7 @@ Index: printing/print_settings.h AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; -@@ -377,7 +377,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -381,7 +381,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { // Number of pages per sheet. int pages_per_sheet_; diff --git a/www/ungoogled-chromium/patches/patch-printing_sandbox_print_backend_sandbox_hook_linux_h b/www/ungoogled-chromium/patches/patch-printing_sandbox_print_backend_sandbox_hook_linux_h index 54e99cad0..6d254806a 100644 --- a/www/ungoogled-chromium/patches/patch-printing_sandbox_print_backend_sandbox_hook_linux_h +++ b/www/ungoogled-chromium/patches/patch-printing_sandbox_print_backend_sandbox_hook_linux_h @@ -7,7 +7,7 @@ Index: printing/sandbox/print_backend_sandbox_hook_linux.h +#include "build/build_config.h" #include "base/component_export.h" -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" +#else #include "sandbox/policy/linux/sandbox_linux.h" diff --git a/www/ungoogled-chromium/patches/patch-remoting_base_mojo_util_cc b/www/ungoogled-chromium/patches/patch-remoting_base_mojo_util_cc deleted file mode 100644 index 0c6e6068c..000000000 --- a/www/ungoogled-chromium/patches/patch-remoting_base_mojo_util_cc +++ /dev/null @@ -1,12 +0,0 @@ -Index: remoting/base/mojo_util.cc ---- remoting/base/mojo_util.cc.orig -+++ remoting/base/mojo_util.cc -@@ -12,7 +12,7 @@ namespace remoting { - - void InitializeMojo(const mojo::core::Configuration& config) { - mojo::core::Configuration new_config = config; --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - // MojoIpcz has only been tested and verified on Linux. The Windows - // multi-process architecture doesn't support MojoIpcz yet. - new_config.disable_ipcz = true; diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_cc b/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_cc index 4820a463e..eb06b4d3a 100644 --- a/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_cc +++ b/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_cc @@ -1,12 +1,12 @@ Index: remoting/host/chromoting_host.cc --- remoting/host/chromoting_host.cc.orig +++ remoting/host/chromoting_host.cc -@@ -132,7 +132,7 @@ void ChromotingHost::StartChromotingHostServices() { +@@ -128,7 +128,7 @@ void ChromotingHost::Start(const std::string& host_own + &ChromotingHost::OnIncomingSession, base::Unretained(this))); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void ChromotingHost::StartChromotingHostServices() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(!ipc_server_); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - named_mojo_ipc_server::EndpointOptions options; - options.server_name = GetChromotingHostServicesServerName(); - #if BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_h b/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_h new file mode 100644 index 000000000..eca541ec3 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_h @@ -0,0 +1,30 @@ +Index: remoting/host/chromoting_host.h +--- remoting/host/chromoting_host.h.orig ++++ remoting/host/chromoting_host.h +@@ -32,7 +32,7 @@ + #include "remoting/protocol/session_manager.h" + #include "remoting/protocol/transport_context.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "remoting/host/chromoting_host_services_server.h" + #endif + +@@ -97,7 +97,7 @@ class ChromotingHost : public ClientSession::EventHand + // This method can only be called once during the lifetime of this object. + void Start(const std::string& host_owner); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Starts running the ChromotingHostServices server and listening for incoming + // IPC binding requests. + // Currently only Linux runs the ChromotingHostServices server on the host +@@ -206,7 +206,7 @@ class ChromotingHost : public ClientSession::EventHand + // List of host extensions. + std::vector<std::unique_ptr<HostExtension>> extensions_; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // IPC server that runs the CRD host service API. Non-null if the server name + // is set and the host is started. + // Currently only Linux runs the ChromotingHostServices server on the host diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_services_client_cc b/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_services_client_cc index 4c973ed87..bd9cd0be6 100644 --- a/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_services_client_cc +++ b/www/ungoogled-chromium/patches/patch-remoting_host_chromoting_host_services_client_cc @@ -1,7 +1,7 @@ Index: remoting/host/chromoting_host_services_client.cc --- remoting/host/chromoting_host_services_client.cc.orig +++ remoting/host/chromoting_host_services_client.cc -@@ -65,7 +65,7 @@ mojo::PendingRemote<mojom::ChromotingHostServices> Con +@@ -59,7 +59,7 @@ mojo::PendingRemote<mojom::ChromotingHostServices> Con } // namespace @@ -10,7 +10,7 @@ Index: remoting/host/chromoting_host_services_client.cc // static constexpr char -@@ -144,7 +144,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic +@@ -136,7 +136,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic if (session_services_remote_.is_bound()) { return true; } diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_it2me_it2me_host_cc b/www/ungoogled-chromium/patches/patch-remoting_host_it2me_it2me_host_cc index 09a7df278..b931b9549 100644 --- a/www/ungoogled-chromium/patches/patch-remoting_host_it2me_it2me_host_cc +++ b/www/ungoogled-chromium/patches/patch-remoting_host_it2me_it2me_host_cc @@ -1,16 +1,16 @@ Index: remoting/host/it2me/it2me_host.cc --- remoting/host/it2me/it2me_host.cc.orig +++ remoting/host/it2me/it2me_host.cc -@@ -44,7 +44,7 @@ - #include "remoting/signaling/signaling_id_util.h" - #include "services/network/public/cpp/shared_url_loader_factory.h" +@@ -49,7 +49,7 @@ + #include "remoting/host/chromeos/features.h" + #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "remoting/host/linux/wayland_manager.h" #include "remoting/host/linux/wayland_utils.h" #endif // BUILDFLAG(IS_LINUX) -@@ -111,7 +111,7 @@ void It2MeHost::Connect( +@@ -121,7 +121,7 @@ void It2MeHost::Connect( OnPolicyUpdate(std::move(policies)); @@ -19,7 +19,7 @@ Index: remoting/host/it2me/it2me_host.cc if (IsRunningWayland()) { WaylandManager::Get()->Init(host_context_->ui_task_runner()); } -@@ -251,7 +251,7 @@ void It2MeHost::ConnectOnNetworkThread( +@@ -261,7 +261,7 @@ void It2MeHost::ConnectOnNetworkThread( // Set up the desktop environment options. DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault()); diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_it2me_it2me_native_messaging_host_main_cc b/www/ungoogled-chromium/patches/patch-remoting_host_it2me_it2me_native_messaging_host_main_cc index 5463d94fe..f5a087640 100644 --- a/www/ungoogled-chromium/patches/patch-remoting_host_it2me_it2me_native_messaging_host_main_cc +++ b/www/ungoogled-chromium/patches/patch-remoting_host_it2me_it2me_native_messaging_host_main_cc @@ -10,7 +10,7 @@ Index: remoting/host/it2me/it2me_native_messaging_host_main.cc #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> #include "base/linux_util.h" -@@ -78,7 +78,7 @@ bool CurrentProcessHasUiAccess() { +@@ -77,7 +77,7 @@ bool CurrentProcessHasUiAccess() { // Creates a It2MeNativeMessagingHost instance, attaches it to stdin/stdout and // runs the task executor until It2MeNativeMessagingHost signals shutdown. int It2MeNativeMessagingHostMain(int argc, char** argv) { @@ -19,7 +19,7 @@ Index: remoting/host/it2me/it2me_native_messaging_host_main.cc if (!IsRunningWayland()) { // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -126,7 +126,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -125,7 +125,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv remoting::LoadResources(""); @@ -28,7 +28,7 @@ Index: remoting/host/it2me/it2me_native_messaging_host_main.cc // Required for any calls into GTK functions, such as the Disconnect and // Continue windows. Calling with nullptr arguments because we don't have // any command line arguments for gtk to consume. -@@ -260,7 +260,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -257,7 +257,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv PolicyWatcher::CreateWithTaskRunner(context->file_task_runner(), context->management_service()); @@ -37,7 +37,7 @@ Index: remoting/host/it2me/it2me_native_messaging_host_main.cc scoped_refptr<AutoThreadTaskRunner> input_task_runner; if (!IsRunningWayland()) { // Create an X11EventSource on all UI threads, so the global X11 connection -@@ -287,7 +287,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -284,7 +284,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Run the loop until channel is alive. run_loop.Run(); diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_policy_watcher_cc b/www/ungoogled-chromium/patches/patch-remoting_host_policy_watcher_cc index be647044a..03b8caf54 100644 --- a/www/ungoogled-chromium/patches/patch-remoting_host_policy_watcher_cc +++ b/www/ungoogled-chromium/patches/patch-remoting_host_policy_watcher_cc @@ -1,9 +1,9 @@ Index: remoting/host/policy_watcher.cc --- remoting/host/policy_watcher.cc.orig +++ remoting/host/policy_watcher.cc -@@ -183,7 +183,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() - result.Set(key::kRemoteAccessHostAllowEnterpriseRemoteSupportConnections, +@@ -184,7 +184,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() true); + result.Set(key::kRemoteAccessHostAllowEnterpriseFileTransfer, false); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/patches/patch-remoting_host_remoting_me2me_host_cc b/www/ungoogled-chromium/patches/patch-remoting_host_remoting_me2me_host_cc index 56f131fb8..f2331cc25 100644 --- a/www/ungoogled-chromium/patches/patch-remoting_host_remoting_me2me_host_cc +++ b/www/ungoogled-chromium/patches/patch-remoting_host_remoting_me2me_host_cc @@ -44,7 +44,7 @@ Index: remoting/host/remoting_me2me_host.cc // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -394,7 +394,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -397,7 +397,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -53,7 +53,7 @@ Index: remoting/host/remoting_me2me_host.cc // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -463,7 +463,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -466,7 +466,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<HostStatusLogger> host_status_logger_; std::unique_ptr<HostEventLogger> host_event_logger_; @@ -62,7 +62,7 @@ Index: remoting/host/remoting_me2me_host.cc std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -774,7 +774,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -775,7 +775,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -71,7 +71,7 @@ Index: remoting/host/remoting_me2me_host.cc cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -835,7 +835,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -836,7 +836,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -80,7 +80,7 @@ Index: remoting/host/remoting_me2me_host.cc if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -954,13 +954,13 @@ void HostProcess::StartOnUiThread() { +@@ -955,13 +955,13 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -96,7 +96,7 @@ Index: remoting/host/remoting_me2me_host.cc // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = -@@ -1032,7 +1032,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1033,7 +1033,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -105,7 +105,7 @@ Index: remoting/host/remoting_me2me_host.cc // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1040,7 +1040,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1041,7 +1041,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -114,7 +114,7 @@ Index: remoting/host/remoting_me2me_host.cc context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1371,7 +1371,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V +@@ -1392,7 +1392,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V // Returns false: never restart the host after this policy update. DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); @@ -123,7 +123,7 @@ Index: remoting/host/remoting_me2me_host.cc absl::optional<bool> host_username_match_required = policies.FindBool(policy::key::kRemoteAccessHostMatchUsername); if (!host_username_match_required.has_value()) { -@@ -1780,7 +1780,7 @@ void HostProcess::StartHost() { +@@ -1801,7 +1801,7 @@ void HostProcess::StartHost() { // won't be advertised if it's missing a registry key or something. desktop_environment_options_.set_enable_remote_open_url(true); @@ -132,7 +132,7 @@ Index: remoting/host/remoting_me2me_host.cc desktop_environment_options_.set_enable_remote_webauthn(is_googler_); #endif -@@ -1813,7 +1813,7 @@ void HostProcess::StartHost() { +@@ -1834,7 +1834,7 @@ void HostProcess::StartHost() { host_status_logger_ = std::make_unique<HostStatusLogger>( host_->status_monitor(), log_to_server_.get()); @@ -141,7 +141,16 @@ Index: remoting/host/remoting_me2me_host.cc const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableUtempter)) { host_utmp_logger_ = -@@ -1984,7 +1984,7 @@ int HostProcessMain() { +@@ -1866,7 +1866,7 @@ void HostProcess::StartHost() { + + host_->Start(host_owner_); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // For Windows, ChromotingHostServices connections are handled by the daemon + // process, then the message pipe is forwarded to the network process. + host_->StartChromotingHostServices(); +@@ -1999,7 +1999,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -150,7 +159,7 @@ Index: remoting/host/remoting_me2me_host.cc #if defined(REMOTING_USE_X11) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -2033,7 +2033,7 @@ int HostProcessMain() { +@@ -2048,7 +2048,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/ungoogled-chromium/patches/patch-sandbox_linux_services_libc_interceptor_cc b/www/ungoogled-chromium/patches/patch-sandbox_linux_services_libc_interceptor_cc index 68288aa2c..cd2e79e9b 100644 --- a/www/ungoogled-chromium/patches/patch-sandbox_linux_services_libc_interceptor_cc +++ b/www/ungoogled-chromium/patches/patch-sandbox_linux_services_libc_interceptor_cc @@ -5,7 +5,7 @@ Index: sandbox/linux/services/libc_interceptor.cc #include <stddef.h> #include <stdint.h> #include <string.h> -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) #include <sys/prctl.h> +#endif #include <sys/socket.h> diff --git a/www/ungoogled-chromium/patches/patch-services_audio_audio_sandbox_hook_linux_cc b/www/ungoogled-chromium/patches/patch-services_audio_audio_sandbox_hook_linux_cc index 23e1681ac..669072a3b 100644 --- a/www/ungoogled-chromium/patches/patch-services_audio_audio_sandbox_hook_linux_cc +++ b/www/ungoogled-chromium/patches/patch-services_audio_audio_sandbox_hook_linux_cc @@ -5,7 +5,7 @@ Index: services/audio/audio_sandbox_hook_linux.cc } #endif -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) std::vector<BrokerFilePermission> GetAudioFilePermissions() { std::vector<BrokerFilePermission> permissions{ BrokerFilePermission::ReadOnly("/dev/urandom"), @@ -18,7 +18,7 @@ Index: services/audio/audio_sandbox_hook_linux.cc } // namespace bool AudioPreSandboxHook(sandbox::policy::SandboxLinux::Options options) { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) LoadAudioLibraries(); auto* instance = sandbox::policy::SandboxLinux::GetInstance(); instance->StartBrokerProcess(MakeBrokerCommandSet({ diff --git a/www/ungoogled-chromium/patches/patch-services_audio_audio_sandbox_hook_linux_h b/www/ungoogled-chromium/patches/patch-services_audio_audio_sandbox_hook_linux_h index 5c851d223..2aa5f7122 100644 --- a/www/ungoogled-chromium/patches/patch-services_audio_audio_sandbox_hook_linux_h +++ b/www/ungoogled-chromium/patches/patch-services_audio_audio_sandbox_hook_linux_h @@ -1,11 +1,13 @@ Index: services/audio/audio_sandbox_hook_linux.h --- services/audio/audio_sandbox_hook_linux.h.orig +++ services/audio/audio_sandbox_hook_linux.h -@@ -5,7 +5,11 @@ +@@ -5,7 +5,13 @@ #ifndef SERVICES_AUDIO_AUDIO_SANDBOX_HOOK_LINUX_H_ #define SERVICES_AUDIO_AUDIO_SANDBOX_HOOK_LINUX_H_ -+#if defined(OS_BSD) ++#include "build/build_config.h" ++ ++#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" +#else #include "sandbox/policy/linux/sandbox_linux.h" diff --git a/www/ungoogled-chromium/patches/patch-services_device_geolocation_location_arbitrator_cc b/www/ungoogled-chromium/patches/patch-services_device_geolocation_location_arbitrator_cc index d2f5e0779..0493dd6cc 100644 --- a/www/ungoogled-chromium/patches/patch-services_device_geolocation_location_arbitrator_cc +++ b/www/ungoogled-chromium/patches/patch-services_device_geolocation_location_arbitrator_cc @@ -1,7 +1,7 @@ Index: services/device/geolocation/location_arbitrator.cc --- services/device/geolocation/location_arbitrator.cc.orig +++ services/device/geolocation/location_arbitrator.cc -@@ -174,7 +174,7 @@ LocationArbitrator::NewNetworkLocationProvider( +@@ -186,7 +186,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { diff --git a/www/ungoogled-chromium/patches/patch-services_device_public_mojom_BUILD_gn b/www/ungoogled-chromium/patches/patch-services_device_public_mojom_BUILD_gn index b9aee5988..d6aa33515 100644 --- a/www/ungoogled-chromium/patches/patch-services_device_public_mojom_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-services_device_public_mojom_BUILD_gn @@ -1,7 +1,7 @@ Index: services/device/public/mojom/BUILD.gn --- services/device/public/mojom/BUILD.gn.orig +++ services/device/public/mojom/BUILD.gn -@@ -95,7 +95,7 @@ mojom("device_service") { +@@ -96,7 +96,7 @@ mojom("device_service") { enable_js_fuzzing = false enabled_features = [] diff --git a/www/ungoogled-chromium/patches/patch-services_device_time_zone_monitor_time_zone_monitor_linux_cc b/www/ungoogled-chromium/patches/patch-services_device_time_zone_monitor_time_zone_monitor_linux_cc index ef27f2930..523f13dba 100644 --- a/www/ungoogled-chromium/patches/patch-services_device_time_zone_monitor_time_zone_monitor_linux_cc +++ b/www/ungoogled-chromium/patches/patch-services_device_time_zone_monitor_time_zone_monitor_linux_cc @@ -5,7 +5,7 @@ Index: services/device/time_zone_monitor/time_zone_monitor_linux.cc // false positives are harmless, assuming the false positive rate is // reasonable. const char* const kFilesToWatch[] = { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + "/etc/localtime", +#else "/etc/localtime", "/etc/timezone", "/etc/TZ", diff --git a/www/ungoogled-chromium/patches/patch-services_device_usb_BUILD_gn b/www/ungoogled-chromium/patches/patch-services_device_usb_BUILD_gn index 5dba0c4a3..c2903fea8 100644 --- a/www/ungoogled-chromium/patches/patch-services_device_usb_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-services_device_usb_BUILD_gn @@ -1,7 +1,7 @@ Index: services/device/usb/BUILD.gn --- services/device/usb/BUILD.gn.orig +++ services/device/usb/BUILD.gn -@@ -103,15 +103,17 @@ static_library("usb") { +@@ -89,15 +89,17 @@ static_library("usb") { deps += [ "//third_party/re2" ] } @@ -28,7 +28,7 @@ Index: services/device/usb/BUILD.gn # These sources and deps are required for libusb. # TODO(https://crbug.com/1096743) Remove these sources. -@@ -135,6 +137,13 @@ static_library("usb") { +@@ -121,6 +123,13 @@ static_library("usb") { deps += [ "//third_party/libusb" ] } @@ -42,7 +42,7 @@ Index: services/device/usb/BUILD.gn if (is_linux || is_chromeos) { sources += [ "usb_device_linux.cc", -@@ -152,7 +161,7 @@ static_library("usb") { +@@ -138,7 +147,7 @@ static_library("usb") { deps += [ "//device/udev_linux" ] } diff --git a/www/ungoogled-chromium/patches/patch-services_network_BUILD_gn b/www/ungoogled-chromium/patches/patch-services_network_BUILD_gn index 99d1f4a27..adf580cdb 100644 --- a/www/ungoogled-chromium/patches/patch-services_network_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-services_network_BUILD_gn @@ -1,7 +1,7 @@ Index: services/network/BUILD.gn --- services/network/BUILD.gn.orig +++ services/network/BUILD.gn -@@ -375,7 +375,6 @@ if (is_linux || is_chromeos) { +@@ -385,7 +385,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/ungoogled-chromium/patches/patch-services_network_network_service_cc b/www/ungoogled-chromium/patches/patch-services_network_network_service_cc index 54b3bc574..45ba69a37 100644 --- a/www/ungoogled-chromium/patches/patch-services_network_network_service_cc +++ b/www/ungoogled-chromium/patches/patch-services_network_network_service_cc @@ -1,7 +1,7 @@ Index: services/network/network_service.cc --- services/network/network_service.cc.orig +++ services/network/network_service.cc -@@ -92,7 +92,7 @@ +@@ -96,7 +96,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif diff --git a/www/ungoogled-chromium/patches/patch-services_network_public_cpp_BUILD_gn b/www/ungoogled-chromium/patches/patch-services_network_public_cpp_BUILD_gn index c2855f3b5..f5c911f46 100644 --- a/www/ungoogled-chromium/patches/patch-services_network_public_cpp_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-services_network_public_cpp_BUILD_gn @@ -1,7 +1,7 @@ Index: services/network/public/cpp/BUILD.gn --- services/network/public/cpp/BUILD.gn.orig +++ services/network/public/cpp/BUILD.gn -@@ -474,7 +474,7 @@ component("cpp_base") { +@@ -475,7 +475,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/ungoogled-chromium/patches/patch-services_network_public_mojom_BUILD_gn b/www/ungoogled-chromium/patches/patch-services_network_public_mojom_BUILD_gn index bbacf0b55..0e2bebdaf 100644 --- a/www/ungoogled-chromium/patches/patch-services_network_public_mojom_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-services_network_public_mojom_BUILD_gn @@ -1,7 +1,7 @@ Index: services/network/public/mojom/BUILD.gn --- services/network/public/mojom/BUILD.gn.orig +++ services/network/public/mojom/BUILD.gn -@@ -465,11 +465,11 @@ mojom("url_loader_base") { +@@ -515,11 +515,11 @@ mojom("url_loader_base") { } enabled_features = [] @@ -15,7 +15,7 @@ Index: services/network/public/mojom/BUILD.gn # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1386,7 +1386,7 @@ mojom("mojom") { +@@ -1435,7 +1435,7 @@ mojom("mojom") { } } diff --git a/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_cc b/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_cc index 634e6677f..11c88f393 100644 --- a/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_cc +++ b/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_cc @@ -5,35 +5,35 @@ Index: services/video_capture/video_capture_service_impl.cc #include "services/video_capture/lacros/device_factory_adapter_lacros.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "media/capture/capture_switches.h" - #include "media/capture/video/linux/video_capture_gpu_memory_buffer_manager.h" + #include "media/capture/video/video_capture_gpu_channel_host.h" #include "services/viz/public/cpp/gpu/context_provider_command_buffer.h" @@ -107,7 +107,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext this}; }; --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Intended usage of this class is to create viz::Gpu in utility process and // connect to viz::GpuClient of browser process, which will call to Gpu service. // Also, this class holds the viz::ContextProvider to listen and monitor Gpu -@@ -285,7 +285,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende +@@ -289,7 +289,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende if (!gpu_dependencies_context_) gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>(); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { if (!viz_gpu_context_provider_) { viz_gpu_context_provider_ = -@@ -381,7 +381,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH +@@ -385,7 +385,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH } #endif --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) void VideoCaptureServiceImpl::SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu) { viz_gpu_ = std::move(viz_gpu); } diff --git a/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_h b/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_h index 3078263de..9b24f4047 100644 --- a/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_h +++ b/www/ungoogled-chromium/patches/patch-services_video_capture_video_capture_service_impl_h @@ -5,26 +5,26 @@ Index: services/video_capture/video_capture_service_impl.h #include "services/video_capture/ash/video_capture_device_factory_ash.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "services/viz/public/cpp/gpu/gpu.h" - #endif // BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) @@ -62,7 +62,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap #if BUILDFLAG(IS_WIN) void OnGpuInfoUpdate(const CHROME_LUID& luid) override; #endif --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) void SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu); - #endif // BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) private: @@ -87,7 +87,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap factory_receivers_ash_; #endif --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) class VizGpuContextProvider; std::unique_ptr<VizGpuContextProvider> viz_gpu_context_provider_; std::unique_ptr<viz::Gpu> viz_gpu_; diff --git a/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_internal_sysinfo_cc b/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_internal_sysinfo_cc index 7032c7d10..6a7c04237 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_internal_sysinfo_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_base_internal_sysinfo_cc @@ -25,7 +25,7 @@ Index: third_party/abseil-cpp/absl/base/internal/sysinfo.cc // Helper function for reading a long from a file. Returns true if successful // and the memory location pointed to by value is set to the value read. static bool ReadLongFromFile(const char *file, long *value) { -@@ -212,6 +217,7 @@ static bool ReadLongFromFile(const char *file, long *v +@@ -218,6 +223,7 @@ static bool ReadLongFromFile(const char *file, long *v } return ret; } @@ -33,7 +33,7 @@ Index: third_party/abseil-cpp/absl/base/internal/sysinfo.cc #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) -@@ -311,9 +317,11 @@ static double GetNominalCPUFrequency() { +@@ -317,9 +323,11 @@ static double GetNominalCPUFrequency() { // a new mode (turbo mode). Essentially, those frequencies cannot // always be relied upon. The same reasons apply to /proc/cpuinfo as // well. @@ -45,7 +45,7 @@ Index: third_party/abseil-cpp/absl/base/internal/sysinfo.cc #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) // On these platforms, the TSC frequency is the nominal CPU -@@ -332,10 +340,12 @@ static double GetNominalCPUFrequency() { +@@ -338,10 +346,12 @@ static double GetNominalCPUFrequency() { // If CPU scaling is in effect, we want to use the *maximum* // frequency, not whatever CPU speed some random processor happens // to be using now. @@ -58,7 +58,7 @@ Index: third_party/abseil-cpp/absl/base/internal/sysinfo.cc return 1.0; #endif // !ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY -@@ -433,6 +443,18 @@ pid_t GetTID() { +@@ -439,6 +449,18 @@ pid_t GetTID() { static_assert(sizeof(pid_t) == sizeof(thread), "In NaCL int expected to be the same size as a pointer"); return reinterpret_cast<pid_t>(thread); diff --git a/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_debugging_internal_elf_mem_image_h b/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_debugging_internal_elf_mem_image_h index 320e6cbc8..2561e2deb 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_debugging_internal_elf_mem_image_h +++ b/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_debugging_internal_elf_mem_image_h @@ -5,8 +5,8 @@ Index: third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \ !defined(__native_client__) && !defined(__asmjs__) && \ !defined(__wasm__) && !defined(__HAIKU__) && !defined(__sun) && \ -- !defined(__VXWORKS__) -+ !defined(__VXWORKS__) && !defined(__FreeBSD__) +- !defined(__VXWORKS__) && !defined(__hexagon__) ++ !defined(__VXWORKS__) && !defined(__hexagon__) && !defined(__FreeBSD__) #define ABSL_HAVE_ELF_MEM_IMAGE 1 #endif diff --git a/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_time_internal_cctz_src_time_zone_format_cc b/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_time_internal_cctz_src_time_zone_format_cc index f139c64c1..30fa1e7b5 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_time_internal_cctz_src_time_zone_format_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_abseil-cpp_absl_time_internal_cctz_src_time_zone_format_cc @@ -1,12 +1,12 @@ Index: third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc --- third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig +++ third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc -@@ -21,7 +21,7 @@ +@@ -19,7 +19,7 @@ #endif #if defined(HAS_STRPTIME) && HAS_STRPTIME -#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) +#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__FreeBSD__) - #define _XOPEN_SOURCE // Definedness suffices for strptime. + #define _XOPEN_SOURCE 500 // Exposes definitions for SUSv2 (UNIX 98). #endif #endif diff --git a/www/ungoogled-chromium/patches/patch-third_party_angle_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_angle_BUILD_gn index 79151740d..9c15a82f3 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_angle_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-third_party_angle_BUILD_gn @@ -1,7 +1,7 @@ Index: third_party/angle/BUILD.gn --- third_party/angle/BUILD.gn.orig +++ third_party/angle/BUILD.gn -@@ -307,7 +307,6 @@ config("extra_warnings") { +@@ -321,7 +321,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -9,7 +9,7 @@ Index: third_party/angle/BUILD.gn "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -478,7 +477,7 @@ template("angle_common_lib") { +@@ -492,7 +491,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -18,7 +18,7 @@ Index: third_party/angle/BUILD.gn libs = [ "dl" ] } -@@ -633,6 +632,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -647,6 +646,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] diff --git a/www/ungoogled-chromium/patches/patch-third_party_angle_src_common_platform_helpers_h b/www/ungoogled-chromium/patches/patch-third_party_angle_src_common_platform_helpers_h new file mode 100644 index 000000000..73f091a54 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-third_party_angle_src_common_platform_helpers_h @@ -0,0 +1,12 @@ +Index: third_party/angle/src/common/platform_helpers.h +--- third_party/angle/src/common/platform_helpers.h.orig ++++ third_party/angle/src/common/platform_helpers.h +@@ -62,7 +62,7 @@ inline constexpr bool IsIOS() + + inline constexpr bool IsLinux() + { +-#if defined(ANGLE_PLATFORM_LINUX) ++#if defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) + return true; + #else + return false; diff --git a/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_Display_cpp b/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_Display_cpp index 78ccfb69e..fd36680bd 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_Display_cpp +++ b/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_Display_cpp @@ -1,7 +1,7 @@ Index: third_party/angle/src/libANGLE/Display.cpp --- third_party/angle/src/libANGLE/Display.cpp.orig +++ third_party/angle/src/libANGLE/Display.cpp -@@ -62,7 +62,7 @@ +@@ -60,7 +60,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" # elif ANGLE_ENABLE_EAGL # include "libANGLE/renderer/gl/eagl/DisplayEAGL.h" @@ -10,7 +10,7 @@ Index: third_party/angle/src/libANGLE/Display.cpp # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_X11) # include "libANGLE/renderer/gl/glx/DisplayGLX.h" -@@ -394,7 +394,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -411,7 +411,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = new rx::DisplayEAGL(state); break; @@ -19,7 +19,7 @@ Index: third_party/angle/src/libANGLE/Display.cpp # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -435,7 +435,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -452,7 +452,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); @@ -28,7 +28,7 @@ Index: third_party/angle/src/libANGLE/Display.cpp # if defined(ANGLE_USE_GBM) if (platformType == 0 || platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE) -@@ -484,7 +484,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -501,7 +501,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; @@ -37,7 +37,7 @@ Index: third_party/angle/src/libANGLE/Display.cpp # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2158,7 +2158,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2125,7 +2125,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_renderer_driver_utils_h b/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_renderer_driver_utils_h deleted file mode 100644 index 7900ebf1f..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_angle_src_libANGLE_renderer_driver_utils_h +++ /dev/null @@ -1,12 +0,0 @@ -Index: third_party/angle/src/libANGLE/renderer/driver_utils.h ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig -+++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -218,7 +218,7 @@ inline bool IsWindows() - - inline bool IsLinux() - { --#if defined(ANGLE_PLATFORM_LINUX) -+#if defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) - return true; - #else - return false; diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_public_platform_platform_h b/www/ungoogled-chromium/patches/patch-third_party_blink_public_platform_platform_h index df8d851ca..4e7d8bfd8 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_public_platform_platform_h +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_public_platform_platform_h @@ -1,7 +1,7 @@ Index: third_party/blink/public/platform/platform.h --- third_party/blink/public/platform/platform.h.orig +++ third_party/blink/public/platform/platform.h -@@ -339,7 +339,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -338,7 +338,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_controller_memory_usage_monitor_posix_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_controller_memory_usage_monitor_posix_cc index 0a40ffab4..5b30f858d 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_controller_memory_usage_monitor_posix_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_controller_memory_usage_monitor_posix_cc @@ -1,7 +1,7 @@ Index: third_party/blink/renderer/controller/memory_usage_monitor_posix.cc --- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc -@@ -129,15 +129,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { +@@ -128,15 +128,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file, base::File status_file) { diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_exported_web_view_impl_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_exported_web_view_impl_cc index 92deb7e6b..2b8de6b04 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_exported_web_view_impl_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_exported_web_view_impl_cc @@ -1,7 +1,7 @@ Index: third_party/blink/renderer/core/exported/web_view_impl.cc --- third_party/blink/renderer/core/exported/web_view_impl.cc.orig +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -409,7 +409,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -421,7 +421,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -10,7 +10,7 @@ Index: third_party/blink/renderer/core/exported/web_view_impl.cc 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' -@@ -3298,7 +3298,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3318,7 +3318,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/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_frame_web_frame_test_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_frame_web_frame_test_cc index 975664e68..25b8cfd0f 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_frame_web_frame_test_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_frame_web_frame_test_cc @@ -1,7 +1,7 @@ Index: third_party/blink/renderer/core/frame/web_frame_test.cc --- third_party/blink/renderer/core/frame/web_frame_test.cc.orig +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6455,7 +6455,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6456,7 +6456,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { } #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -10,7 +10,7 @@ Index: third_party/blink/renderer/core/frame/web_frame_test.cc // TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable. // TODO(crbug.com/1317375): Build these tests on all platforms. #define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \ -@@ -6864,7 +6864,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6865,7 +6865,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_grid_ng_grid_layout_algorithm_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_grid_ng_grid_layout_algorithm_cc new file mode 100644 index 000000000..0edf1a925 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_grid_ng_grid_layout_algorithm_cc @@ -0,0 +1,31 @@ +Index: third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc +--- third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.orig ++++ third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc +@@ -3431,7 +3431,13 @@ void NGGridLayoutAlgorithm::PlaceGridItems( + DCHECK(out_row_break_between); + + const auto& container_space = ConstraintSpace(); ++#if defined(__clang__) && (__clang_major__ >= 16) + const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData(); ++#else ++ const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData(); ++ const auto& grid_items = g_i; ++ const auto& layout_data = l_d; ++#endif + + const auto* cached_layout_subtree = container_space.GridLayoutSubtree(); + const auto container_writing_direction = +@@ -3595,7 +3601,13 @@ void NGGridLayoutAlgorithm::PlaceGridItemsForFragmenta + + // TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true. + const auto& constraint_space = ConstraintSpace(); ++#if defined(__clang__) && (__clang_major__ >= 16) + const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData(); ++#else ++ const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData(); ++ const auto& grid_items = g_i; ++ const auto& layout_data = l_d; ++#endif + + const auto* cached_layout_subtree = constraint_space.GridLayoutSubtree(); + const auto container_writing_direction = diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_layout_ng_view_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_layout_ng_view_cc index 376701253..4d00adeed 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_layout_ng_view_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_layout_ng_view_cc @@ -10,7 +10,7 @@ Index: third_party/blink/renderer/core/layout/ng/layout_ng_view.cc #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -57,7 +57,7 @@ void LayoutNGView::UpdateLayout() { +@@ -53,7 +53,7 @@ void LayoutNGView::UpdateLayout() { fragmentation_context_.Clear(); } diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_physical_fragment_rare_data_h b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_physical_fragment_rare_data_h new file mode 100644 index 000000000..fb605b5f7 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_layout_ng_physical_fragment_rare_data_h @@ -0,0 +1,11 @@ +Index: third_party/blink/renderer/core/layout/ng/physical_fragment_rare_data.h +--- third_party/blink/renderer/core/layout/ng/physical_fragment_rare_data.h.orig ++++ third_party/blink/renderer/core/layout/ng/physical_fragment_rare_data.h +@@ -5,6 +5,7 @@ + #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_PHYSICAL_FRAGMENT_RARE_DATA_H_ + #define THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_PHYSICAL_FRAGMENT_RARE_DATA_H_ + ++#include <bit> + #include <climits> + + #include "third_party/blink/renderer/core/layout/geometry/logical_rect.h" diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_paint_paint_layer_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_paint_paint_layer_cc index 9b2a13070..09c77588b 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_paint_paint_layer_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_core_paint_paint_layer_cc @@ -1,7 +1,7 @@ Index: third_party/blink/renderer/core/paint/paint_layer.cc --- third_party/blink/renderer/core/paint/paint_layer.cc.orig +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -116,7 +116,7 @@ namespace blink { +@@ -119,7 +119,7 @@ namespace blink { namespace { diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_ml_webnn_ml_graph_xnnpack_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_ml_webnn_ml_graph_xnnpack_cc index a2e6f4d88..496027736 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_ml_webnn_ml_graph_xnnpack_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_ml_webnn_ml_graph_xnnpack_cc @@ -1,7 +1,7 @@ Index: third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc --- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig +++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc -@@ -186,7 +186,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount +@@ -191,7 +191,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount ~SharedXnnpackContext() { base::AutoLock auto_lock(SharedXnnpackContextLock()); diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgl_webgl_rendering_context_base_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgl_webgl_rendering_context_base_cc index df77c1e63..6c0a16f3e 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgl_webgl_rendering_context_base_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgl_webgl_rendering_context_base_cc @@ -1,7 +1,7 @@ Index: third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc --- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6251,7 +6251,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6285,7 +6285,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgl_webgl_webcodecs_video_frame_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgl_webgl_webcodecs_video_frame_cc deleted file mode 100644 index 9f60c4e73..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgl_webgl_webcodecs_video_frame_cc +++ /dev/null @@ -1,12 +0,0 @@ -Index: third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc ---- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig -+++ third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc -@@ -102,7 +102,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // TODO(jie.a.chen@intel.com): Add Linux support. - return false; - #elif BUILDFLAG(IS_APPLE) diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgpu_gpu_queue_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgpu_gpu_queue_cc index be2ee0a35..b437fe8fc 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgpu_gpu_queue_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_modules_webgpu_gpu_queue_cc @@ -1,7 +1,7 @@ Index: third_party/blink/renderer/modules/webgpu/gpu_queue.cc --- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc -@@ -694,7 +694,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( +@@ -698,7 +698,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( // on linux platform. // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES // backend is failing for unknown reasons. diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_BUILD_gn index ae633f446..5af88273d 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_BUILD_gn @@ -1,7 +1,7 @@ Index: third_party/blink/renderer/platform/BUILD.gn --- third_party/blink/renderer/platform/BUILD.gn.orig +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1936,7 +1936,7 @@ static_library("test_support") { +@@ -1926,7 +1926,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_cache_h b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_cache_h index b59fb738e..0b8797ab0 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_cache_h +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_cache_h @@ -1,7 +1,7 @@ Index: third_party/blink/renderer/platform/fonts/font_cache.h --- third_party/blink/renderer/platform/fonts/font_cache.h.orig +++ third_party/blink/renderer/platform/fonts/font_cache.h -@@ -57,7 +57,7 @@ +@@ -56,7 +56,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" #include "third_party/skia/include/core/SkRefCnt.h" @@ -10,7 +10,7 @@ Index: third_party/blink/renderer/platform/fonts/font_cache.h #include "ui/gfx/font_fallback_linux.h" #endif -@@ -187,7 +187,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -174,7 +174,7 @@ class PLATFORM_EXPORT FontCache final { static void PrewarmFamily(const AtomicString& family_name) {} #endif @@ -19,7 +19,7 @@ Index: third_party/blink/renderer/platform/fonts/font_cache.h // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -263,7 +263,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -250,7 +250,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); #endif // BUILDFLAG(IS_ANDROID) @@ -28,7 +28,7 @@ Index: third_party/blink/renderer/platform/fonts/font_cache.h static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -344,7 +344,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -330,7 +330,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); @@ -37,7 +37,7 @@ Index: third_party/blink/renderer/platform/fonts/font_cache.h static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, -@@ -382,7 +382,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -368,7 +368,7 @@ class PLATFORM_EXPORT FontCache final { bool is_test_font_mgr_ = false; #endif // BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_description_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_description_cc index 855a6b3ea..2b79893ad 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_description_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_description_cc @@ -10,7 +10,7 @@ Index: third_party/blink/renderer/platform/fonts/font_description.cc #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -275,7 +275,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -274,7 +274,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_palette_h b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_palette_h new file mode 100644 index 000000000..1c93ceb11 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_fonts_font_palette_h @@ -0,0 +1,27 @@ +Index: third_party/blink/renderer/platform/fonts/font_palette.h +--- third_party/blink/renderer/platform/fonts/font_palette.h.orig ++++ third_party/blink/renderer/platform/fonts/font_palette.h +@@ -96,7 +96,11 @@ class PLATFORM_EXPORT FontPalette : public RefCounted< + Color::ColorSpace color_interpolation_space, + absl::optional<Color::HueInterpolationMethod> hue_interpolation_method) { + return base::AdoptRef(new FontPalette( ++#if defined(__clang__) && (__clang_major__ >= 16) + start, end, NonNormalizedPercentages(start_percentage, end_percentage), ++#else ++ start, end, NonNormalizedPercentages(NonNormalizedPercentages{start_percentage, end_percentage}), ++#endif + normalized_percentage, alpha_multiplier, color_interpolation_space, + hue_interpolation_method)); + } +@@ -170,7 +174,11 @@ class PLATFORM_EXPORT FontPalette : public RefCounted< + double normalized_percentage) { + double end_percentage = normalized_percentage * 100.0; + double start_percentage = 100.0 - end_percentage; ++#if defined(__clang__) && (__clang_major__ >= 16) + return NonNormalizedPercentages(start_percentage, end_percentage); ++#else ++ return NonNormalizedPercentages(NonNormalizedPercentages{start_percentage, end_percentage}); ++#endif + } + + double GetAlphaMultiplier() const { diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_runtime_enabled_features_json5 b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_runtime_enabled_features_json5 index f74f86102..54b2ee1b6 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_runtime_enabled_features_json5 +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_runtime_enabled_features_json5 @@ -1,7 +1,7 @@ Index: third_party/blink/renderer/platform/runtime_enabled_features.json5 --- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2684,7 +2684,7 @@ +@@ -2667,7 +2667,7 @@ name: "PaymentHandlerMinimalHeaderUX", origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX", origin_trial_allows_third_party: true, @@ -10,7 +10,7 @@ Index: third_party/blink/renderer/platform/runtime_enabled_features.json5 }, { name: "PaymentInstruments", -@@ -3645,7 +3645,7 @@ +@@ -3663,7 +3663,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -19,7 +19,7 @@ Index: third_party/blink/renderer/platform/runtime_enabled_features.json5 }, { name: "URLPatternCompareComponent", -@@ -3823,12 +3823,12 @@ +@@ -3857,12 +3857,12 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_video_capture_video_capture_impl_cc b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_video_capture_video_capture_impl_cc index 4cf6efd4e..ee28c6e67 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_video_capture_video_capture_impl_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_video_capture_video_capture_impl_cc @@ -1,7 +1,7 @@ Index: third_party/blink/renderer/platform/video_capture/video_capture_impl.cc --- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig +++ third_party/blink/renderer/platform/video_capture/video_capture_impl.cc -@@ -572,7 +572,7 @@ bool VideoCaptureImpl::VideoFrameBufferPreparer::BindV +@@ -612,7 +612,7 @@ bool VideoCaptureImpl::VideoFrameBufferPreparer::BindV } const unsigned texture_target = diff --git a/www/ungoogled-chromium/patches/patch-third_party_boringssl_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_boringssl_BUILD_gn deleted file mode 100644 index 2f9d544d3..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_BUILD_gn +++ /dev/null @@ -1,12 +0,0 @@ -Index: third_party/boringssl/BUILD.gn ---- third_party/boringssl/BUILD.gn.orig -+++ third_party/boringssl/BUILD.gn -@@ -139,7 +139,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { - public_configs = [ ":no_asm_config" ] - } - } else if (current_cpu == "arm64") { -- if (is_linux || is_chromeos || is_android) { -+ if ((is_linux || is_chromeos || is_android) && !is_freebsd) { - sources += crypto_sources_linux_aarch64 - } else if (is_apple) { - sources += crypto_sources_apple_aarch64 diff --git a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_chacha_asm_chacha-x86_64_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_chacha_asm_chacha-x86_64_pl deleted file mode 100644 index 0e4c00e71..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_chacha_asm_chacha-x86_64_pl +++ /dev/null @@ -1,11 +0,0 @@ -Index: third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl ---- third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl.orig -+++ 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/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_cipher_extra_asm_aes128gcmsiv-x86_64_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_cipher_extra_asm_aes128gcmsiv-x86_64_pl deleted file mode 100644 index 46af2a49d..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_cipher_extra_asm_aes128gcmsiv-x86_64_pl +++ /dev/null @@ -1,139 +0,0 @@ -Index: third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl ---- third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl.orig -+++ 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/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_cipher_extra_asm_chacha20_poly1305_x86_64_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_cipher_extra_asm_chacha20_poly1305_x86_64_pl deleted file mode 100644 index eb11a537b..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_cipher_extra_asm_chacha20_poly1305_x86_64_pl +++ /dev/null @@ -1,19 +0,0 @@ -Index: third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl ---- third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl.orig -+++ 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/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86_64_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86_64_pl deleted file mode 100644 index fff54a187..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86_64_pl +++ /dev/null @@ -1,75 +0,0 @@ -Index: third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl ---- third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl.orig -+++ 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 -@@ -1781,6 +1785,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_xts_encrypt: - .cfi_startproc -+ _CET_ENDBR - lea (%rsp),%r11 # frame pointer - .cfi_def_cfa_register %r11 - push %rbp -@@ -2264,6 +2269,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_xts_decrypt: - .cfi_startproc -+ _CET_ENDBR - lea (%rsp),%r11 # frame pointer - .cfi_def_cfa_register %r11 - push %rbp -@@ -2782,6 +2788,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_cbc_encrypt: - .cfi_startproc -+ _CET_ENDBR - test $len,$len # check length - jz .Lcbc_ret - -@@ -3331,6 +3338,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 -@@ -3403,6 +3411,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/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86_64_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86_64_pl deleted file mode 100644 index ff19ab47f..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86_64_pl +++ /dev/null @@ -1,51 +0,0 @@ -Index: third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl ---- third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl.orig -+++ 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/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2_pl deleted file mode 100644 index 3fd847260..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2_pl +++ /dev/null @@ -1,51 +0,0 @@ -Index: third_party/boringssl/src/crypto/fipsmodule/bn/asm/rsaz-avx2.pl ---- third_party/boringssl/src/crypto/fipsmodule/bn/asm/rsaz-avx2.pl.orig -+++ 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/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_bn_asm_x86_64-mont5_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_bn_asm_x86_64-mont5_pl deleted file mode 100644 index 4c6e79110..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_bn_asm_x86_64-mont5_pl +++ /dev/null @@ -1,51 +0,0 @@ -Index: third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl ---- third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl.orig -+++ 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/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_bn_asm_x86_64-mont_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_bn_asm_x86_64-mont_pl deleted file mode 100644 index 5313da7ed..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_bn_asm_x86_64-mont_pl +++ /dev/null @@ -1,11 +0,0 @@ -Index: third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont.pl ---- third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont.pl.orig -+++ 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/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86_64-asm_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86_64-asm_pl deleted file mode 100644 index 6a90f2a1a..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86_64-asm_pl +++ /dev/null @@ -1,99 +0,0 @@ -Index: third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl ---- third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl.orig -+++ 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/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_ec_asm_p256_beeu-x86_64-asm_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_ec_asm_p256_beeu-x86_64-asm_pl deleted file mode 100644 index 8d7a91cc5..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_ec_asm_p256_beeu-x86_64-asm_pl +++ /dev/null @@ -1,11 +0,0 @@ -Index: third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256_beeu-x86_64-asm.pl ---- third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256_beeu-x86_64-asm.pl.orig -+++ 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/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86_64_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86_64_pl deleted file mode 100644 index 0292f31bb..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86_64_pl +++ /dev/null @@ -1,11 +0,0 @@ -Index: third_party/boringssl/src/crypto/fipsmodule/md5/asm/md5-x86_64.pl ---- third_party/boringssl/src/crypto/fipsmodule/md5/asm/md5-x86_64.pl.orig -+++ third_party/boringssl/src/crypto/fipsmodule/md5/asm/md5-x86_64.pl -@@ -131,6 +131,7 @@ $code .= <<EOF; - .type md5_block_asm_data_order,\@function,3 - md5_block_asm_data_order: - .cfi_startproc -+ _CET_ENDBR - push %rbp - .cfi_push rbp - push %rbx diff --git a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86_64_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86_64_pl deleted file mode 100644 index f205f25f0..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86_64_pl +++ /dev/null @@ -1,35 +0,0 @@ -Index: third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl ---- third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl.orig -+++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl -@@ -442,6 +442,7 @@ $code.=<<___; - aesni_gcm_decrypt: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - xor %rax,%rax - - # We call |_aesni_ctr32_ghash_6x|, which requires at least 96 (0x60) -@@ -715,6 +716,7 @@ _aesni_ctr32_6x: - aesni_gcm_encrypt: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - #ifdef BORINGSSL_DISPATCH_TEST - .extern BORINGSSL_function_hit - movb \$1,BORINGSSL_function_hit+2(%rip) -@@ -1089,6 +1091,7 @@ $code=<<___; # assembler is too old - .globl aesni_gcm_encrypt - .type aesni_gcm_encrypt,\@abi-omnipotent - aesni_gcm_encrypt: -+ _CET_ENDBR - xor %eax,%eax - ret - .size aesni_gcm_encrypt,.-aesni_gcm_encrypt -@@ -1096,6 +1099,7 @@ aesni_gcm_encrypt: - .globl aesni_gcm_decrypt - .type aesni_gcm_decrypt,\@abi-omnipotent - aesni_gcm_decrypt: -+ _CET_ENDBR - xor %eax,%eax - ret - .size aesni_gcm_decrypt,.-aesni_gcm_decrypt diff --git a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86_64_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86_64_pl deleted file mode 100644 index 8a00c8c50..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86_64_pl +++ /dev/null @@ -1,19 +0,0 @@ -Index: third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl ---- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl.orig -+++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl -@@ -104,6 +104,7 @@ my $code = <<____; - gcm_gmult_ssse3: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - ____ - $code .= <<____ if ($win64); - subq \$40, %rsp -@@ -246,6 +247,7 @@ $code .= <<____; - gcm_ghash_ssse3: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - ____ - $code .= <<____ if ($win64); - subq \$56, %rsp diff --git a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86_64_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86_64_pl deleted file mode 100644 index b73921461..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86_64_pl +++ /dev/null @@ -1,51 +0,0 @@ -Index: third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl ---- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl.orig -+++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl -@@ -206,6 +206,7 @@ $code.=<<___; - gcm_init_clmul: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - .L_init_clmul: - ___ - $code.=<<___ if ($win64); -@@ -288,6 +289,7 @@ $code.=<<___; - .align 16 - gcm_gmult_clmul: - .cfi_startproc -+ _CET_ENDBR - .L_gmult_clmul: - movdqu ($Xip),$Xi - movdqa .Lbswap_mask(%rip),$T3 -@@ -340,6 +342,7 @@ $code.=<<___; - gcm_ghash_clmul: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - .L_ghash_clmul: - ___ - $code.=<<___ if ($win64); -@@ -708,6 +711,7 @@ $code.=<<___; - .align 32 - gcm_init_avx: - .cfi_startproc -+ _CET_ENDBR - ___ - if ($avx) { - my ($Htbl,$Xip)=@_4args; -@@ -853,6 +857,7 @@ $code.=<<___; - .align 32 - gcm_gmult_avx: - .cfi_startproc -+ _CET_ENDBR - jmp .L_gmult_clmul - .cfi_endproc - .size gcm_gmult_avx,.-gcm_gmult_avx -@@ -864,6 +869,7 @@ $code.=<<___; - .align 32 - gcm_ghash_avx: - .cfi_startproc -+ _CET_ENDBR - ___ - if ($avx) { - my ($Xip,$Htbl,$inp,$len)=@_4args; diff --git a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_rand_asm_rdrand-x86_64_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_rand_asm_rdrand-x86_64_pl deleted file mode 100644 index 0aa095ae1..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_rand_asm_rdrand-x86_64_pl +++ /dev/null @@ -1,19 +0,0 @@ -Index: third_party/boringssl/src/crypto/fipsmodule/rand/asm/rdrand-x86_64.pl ---- third_party/boringssl/src/crypto/fipsmodule/rand/asm/rdrand-x86_64.pl.orig -+++ third_party/boringssl/src/crypto/fipsmodule/rand/asm/rdrand-x86_64.pl -@@ -46,6 +46,7 @@ print<<___; - .align 16 - CRYPTO_rdrand: - .cfi_startproc -+ _CET_ENDBR - xorq %rax, %rax - rdrand $tmp1 - # An add-with-carry of zero effectively sets %rax to the carry flag. -@@ -64,6 +65,7 @@ CRYPTO_rdrand: - .align 16 - CRYPTO_rdrand_multiple8_buf: - .cfi_startproc -+ _CET_ENDBR - test $len, $len - jz .Lout - movq \$8, $tmp1 diff --git a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86_64_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86_64_pl deleted file mode 100644 index dd6b1036b..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86_64_pl +++ /dev/null @@ -1,11 +0,0 @@ -Index: third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl ---- third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl.orig -+++ third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl -@@ -244,6 +244,7 @@ $code.=<<___; - .align 16 - sha1_block_data_order: - .cfi_startproc -+ _CET_ENDBR - leaq OPENSSL_ia32cap_P(%rip),%r10 - mov 0(%r10),%r9d - mov 4(%r10),%r8d diff --git a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86_64_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86_64_pl deleted file mode 100644 index 911827b84..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86_64_pl +++ /dev/null @@ -1,11 +0,0 @@ -Index: third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl ---- third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl.orig -+++ third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl -@@ -263,6 +263,7 @@ $code=<<___; - .align 16 - $func: - .cfi_startproc -+ _CET_ENDBR - ___ - $code.=<<___ if ($SZ==4 || $avx); - leaq OPENSSL_ia32cap_P(%rip),%r11 diff --git a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_perlasm_x86_64-xlate_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_perlasm_x86_64-xlate_pl deleted file mode 100644 index 5304059a8..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_perlasm_x86_64-xlate_pl +++ /dev/null @@ -1,25 +0,0 @@ -Index: third_party/boringssl/src/crypto/perlasm/x86_64-xlate.pl ---- third_party/boringssl/src/crypto/perlasm/x86_64-xlate.pl.orig -+++ third_party/boringssl/src/crypto/perlasm/x86_64-xlate.pl -@@ -1510,6 +1510,21 @@ OPTION DOTNAME - ___ - } - -+if ($nasm) { -+ print <<___; -+\%define _CET_ENDBR -+___ -+} else { -+ print <<___; -+#if defined(__CET__) -+#include <cet.h> -+#else -+#define _CET_ENDBR -+#endif -+ -+___ -+} -+ - if ($gas) { - my $target; - if ($elf) { diff --git a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_test_asm_trampoline-x86_64_pl b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_test_asm_trampoline-x86_64_pl deleted file mode 100644 index f55a2b1bc..000000000 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_crypto_test_asm_trampoline-x86_64_pl +++ /dev/null @@ -1,59 +0,0 @@ -Index: third_party/boringssl/src/crypto/test/asm/trampoline-x86_64.pl ---- third_party/boringssl/src/crypto/test/asm/trampoline-x86_64.pl.orig -+++ 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/ungoogled-chromium/patches/patch-third_party_boringssl_src_util_generate_build_files_py b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_util_generate_build_files_py index 3f6c26d60..ff1525572 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_util_generate_build_files_py +++ b/www/ungoogled-chromium/patches/patch-third_party_boringssl_src_util_generate_build_files_py @@ -1,7 +1,7 @@ Index: third_party/boringssl/src/util/generate_build_files.py --- third_party/boringssl/src/util/generate_build_files.py.orig +++ third_party/boringssl/src/util/generate_build_files.py -@@ -776,10 +776,10 @@ def main(platforms): +@@ -792,10 +792,10 @@ def main(platforms): ] # Generate err_data.c @@ -16,7 +16,7 @@ Index: third_party/boringssl/src/util/generate_build_files.py crypto_c_files.append('err_data.c') crypto_c_files.sort() -@@ -792,11 +792,11 @@ def main(platforms): +@@ -806,11 +806,11 @@ def main(platforms): crypto_test_files = [] if EMBED_TEST_DATA: # Generate crypto_test_data.cc @@ -30,6 +30,6 @@ Index: third_party/boringssl/src/util/generate_build_files.py +# ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'], +# cwd='src', +# stdout=out) - crypto_test_files += ['crypto_test_data.cc'] + crypto_test_files.append('crypto_test_data.cc') - crypto_test_files += FindCFiles(os.path.join('src', 'crypto'), OnlyTests) + crypto_test_files += PrefixWithSrc(cmake['CRYPTO_TEST_SOURCES']) diff --git a/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig_gni b/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig_gni index 1a83b4466..225a1ac82 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig_gni +++ b/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig_gni @@ -1,9 +1,9 @@ Index: third_party/crashpad/crashpad/build/crashpad_buildconfig.gni --- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig +++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni -@@ -60,7 +60,7 @@ if (crashpad_is_in_chromium) { - crashpad_is_mac = is_mac +@@ -61,7 +61,7 @@ if (crashpad_is_in_chromium) { crashpad_is_ios = is_ios + crashpad_is_apple = is_apple crashpad_is_win = is_win - crashpad_is_linux = is_linux || is_chromeos + crashpad_is_linux = (is_linux || is_chromeos) && !is_bsd diff --git a/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_client_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_client_BUILD_gn index 074319c64..4620dc4a2 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_client_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_client_BUILD_gn @@ -1,7 +1,7 @@ Index: third_party/crashpad/crashpad/client/BUILD.gn --- third_party/crashpad/crashpad/client/BUILD.gn.orig +++ third_party/crashpad/crashpad/client/BUILD.gn -@@ -133,6 +133,13 @@ static_library("common") { +@@ -137,6 +137,13 @@ static_library("common") { if (crashpad_is_win) { sources += [ "crash_report_database_win.cc" ] } diff --git a/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_util_misc_capture_context_h b/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_util_misc_capture_context_h index 98b19ca7d..dc5c0ffb2 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_util_misc_capture_context_h +++ b/www/ungoogled-chromium/patches/patch-third_party_crashpad_crashpad_util_misc_capture_context_h @@ -9,15 +9,15 @@ Index: third_party/crashpad/crashpad/util/misc/capture_context.h +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ + BUILDFLAG(IS_FREEBSD) #include <ucontext.h> - #elif BUILDFLAG(IS_FUCHSIA) - #include <signal.h> -@@ -38,7 +39,8 @@ using NativeCPUContext = arm_unified_thread_state; + #endif // BUILDFLAG(IS_APPLE) + +@@ -35,7 +36,8 @@ using NativeCPUContext = arm_unified_thread_state; + #endif #elif BUILDFLAG(IS_WIN) using NativeCPUContext = CONTEXT; - #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ ++ BUILDFLAG(IS_BSD) using NativeCPUContext = ucontext_t; #endif // BUILDFLAG(IS_APPLE) diff --git a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_build_ffmpeg_py b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_build_ffmpeg_py index b710d0122..385967910 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_build_ffmpeg_py +++ b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_build_ffmpeg_py @@ -1,7 +1,7 @@ Index: third_party/ffmpeg/chromium/scripts/build_ffmpeg.py --- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig +++ third_party/ffmpeg/chromium/scripts/build_ffmpeg.py -@@ -29,7 +29,7 @@ NDK_ROOT_DIR = os.path.abspath( +@@ -32,7 +32,7 @@ NDK_ROOT_DIR = os.path.abspath( SUCCESS_TOKEN = 'THIS_BUILD_WORKED' sys.path.append(os.path.join(CHROMIUM_ROOT_DIR, 'build')) @@ -10,7 +10,7 @@ Index: third_party/ffmpeg/chromium/scripts/build_ffmpeg.py BRANDINGS = [ 'Chrome', -@@ -42,6 +42,8 @@ ARCH_MAP = { +@@ -45,6 +45,8 @@ ARCH_MAP = { 'linux': [ 'ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64' ], @@ -19,7 +19,7 @@ Index: third_party/ffmpeg/chromium/scripts/build_ffmpeg.py 'mac': ['x64', 'arm64'], 'win': ['ia32', 'x64', 'arm64'], } -@@ -51,6 +53,8 @@ USAGE_END = """ +@@ -54,6 +56,8 @@ USAGE_END = """ Valid combinations are android [%(android)s] linux [%(linux)s] mac [%(mac)s] @@ -28,7 +28,7 @@ Index: third_party/ffmpeg/chromium/scripts/build_ffmpeg.py win [%(win)s] If no target architecture is specified all will be built. -@@ -123,6 +127,10 @@ def PrintAndCheckCall(argv, *args, **kwargs): +@@ -126,6 +130,10 @@ def PrintAndCheckCall(argv, *args, **kwargs): def DetermineHostOsAndArch(): if platform.system() == 'Linux': host_os = 'linux' @@ -39,7 +39,7 @@ Index: third_party/ffmpeg/chromium/scripts/build_ffmpeg.py elif platform.system() == 'Darwin': host_os = 'mac' elif platform.system() == 'Windows' or 'CYGWIN_NT' in platform.system(): -@@ -132,7 +140,7 @@ def DetermineHostOsAndArch(): +@@ -135,7 +143,7 @@ def DetermineHostOsAndArch(): if re.match(r'i.86', platform.machine()): host_arch = 'ia32' @@ -48,7 +48,7 @@ Index: third_party/ffmpeg/chromium/scripts/build_ffmpeg.py host_arch = 'x64' elif platform.machine() == 'aarch64': host_arch = 'arm64' -@@ -149,7 +157,7 @@ def DetermineHostOsAndArch(): +@@ -152,7 +160,7 @@ def DetermineHostOsAndArch(): def GetDsoName(target_os, dso_name, dso_version): @@ -57,7 +57,7 @@ Index: third_party/ffmpeg/chromium/scripts/build_ffmpeg.py return 'lib%s.so.%s' % (dso_name, dso_version) elif target_os == 'mac': return 'lib%s.%s.dylib' % (dso_name, dso_version) -@@ -492,7 +500,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ +@@ -495,7 +503,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation # #warning which will be converted to an error via -Werror. # There is also no prctl.h @@ -66,7 +66,7 @@ Index: third_party/ffmpeg/chromium/scripts/build_ffmpeg.py pre_make_rewrites += [ (r'(#define HAVE_SYSCTL [01])', r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'), -@@ -613,7 +621,7 @@ def main(argv): +@@ -622,7 +630,7 @@ def main(argv): configure_args = args[2:] @@ -75,7 +75,7 @@ Index: third_party/ffmpeg/chromium/scripts/build_ffmpeg.py parser.print_help() return 1 -@@ -735,7 +743,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -744,7 +752,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, '--enable-parser=vp3,vp8', ]) @@ -84,7 +84,7 @@ Index: third_party/ffmpeg/chromium/scripts/build_ffmpeg.py if target_arch == 'x64': if target_os == 'android': configure_flags['Common'].extend([ -@@ -745,7 +753,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -754,7 +762,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, configure_flags['Common'].extend([ '--enable-lto', '--arch=x86_64', @@ -93,7 +93,7 @@ Index: third_party/ffmpeg/chromium/scripts/build_ffmpeg.py ]) if host_arch != 'x64': -@@ -836,7 +844,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -845,7 +853,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, '--extra-cflags=-mfpu=vfpv3-d16', ]) elif target_arch == 'arm64': @@ -102,7 +102,7 @@ Index: third_party/ffmpeg/chromium/scripts/build_ffmpeg.py if host_arch != 'arm64': configure_flags['Common'].extend([ '--enable-cross-compile', -@@ -898,7 +906,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -910,7 +918,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, '--disable-mips64r2', '--enable-msa', ]) @@ -111,7 +111,7 @@ Index: third_party/ffmpeg/chromium/scripts/build_ffmpeg.py configure_flags['Common'].extend([ '--enable-cross-compile', '--target-os=linux', -@@ -1049,7 +1057,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -1061,7 +1069,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, 'Chrome', configure_flags['Common'] + configure_flags['ChromeAndroid'] + configure_args) diff --git a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_robo_lib_config_py b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_robo_lib_config_py new file mode 100644 index 000000000..15cf06510 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_chromium_scripts_robo_lib_config_py @@ -0,0 +1,54 @@ +Index: third_party/ffmpeg/chromium/scripts/robo_lib/config.py +--- third_party/ffmpeg/chromium/scripts/robo_lib/config.py.orig ++++ third_party/ffmpeg/chromium/scripts/robo_lib/config.py +@@ -35,7 +35,7 @@ class RoboConfiguration: + self._patches_commit_title = "Chromium patches file" + # Title of the commit with README.chromium + self._readme_chromium_commit_title = "README.chromium file" +- self.EnsureHostInfo() ++ #self.EnsureHostInfo() + self.EnsureChromeSrc() + self.EnsureScriptDirectory() + +@@ -47,18 +47,15 @@ class RoboConfiguration: + self._llvm_path = os.path.join(self.chrome_src(), "third_party", + "llvm-build", "Release+Asserts", "bin") + +- self.EnsurePathContainsLLVM() +- self.EnsureNoMakeInfo() ++ #self.EnsurePathContainsLLVM() ++ #self.EnsureNoMakeInfo() + self.EnsureFFmpegHome() + self.EnsureASANConfig() +- self.ComputeBranchName() ++ #self.ComputeBranchName() + if not quiet: + shell.log(f"Using chrome src: {self.chrome_src()}") + shell.log(f"Using script dir: {self._script_directory}") + shell.log(f"Using ffmpeg home:{self.ffmpeg_home()}") +- shell.log(f"On branch: {self.branch_name()}") +- if self.sushi_branch_name(): +- shell.log(f"On sushi branch: {self.sushi_branch_name()}") + + # Filename that we'll ask generate_gn.py to write git commands to. + # TODO: Should this use script_directory, or stay with ffmpeg? As long as +@@ -149,7 +146,7 @@ class RoboConfiguration: + """Ensure that the host architecture and platform are set.""" + kernel, host, os, *rest = shell.output_or_error(["uname", "-a"]).split() + assert kernel in ("Linux", "linux") +- assert "x86_64" in rest ++ assert ("x86_64", "amd64") in rest + self._host_operating_system = "linux" + self._host_architecture = "x64" + +@@ -165,8 +162,8 @@ class RoboConfiguration: + wd = os.getcwd() + # Walk up the tree until we find src/AUTHORS + while wd != "/": +- if os.path.isfile(os.path.join(wd, "src", "AUTHORS")): +- self._chrome_src = os.path.join(wd, "src") ++ if os.path.isfile(os.path.join(wd, "third_party", "DEPS")): ++ self._chrome_src = wd + return + wd = os.path.dirname(wd) + raise Exception("could not find src/AUTHORS in any parent of the wd") diff --git a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_configure b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_configure index 5bfdda866..c40eec1bc 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_configure +++ b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_configure @@ -1,7 +1,7 @@ Index: third_party/ffmpeg/configure --- third_party/ffmpeg/configure.orig +++ third_party/ffmpeg/configure -@@ -5542,6 +5542,7 @@ case $target_os in +@@ -5613,6 +5613,7 @@ case $target_os in disable symver ;; freebsd) diff --git a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_libavutil_random_seed_c b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_libavutil_random_seed_c index 716961ec8..58f2cb5b5 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_libavutil_random_seed_c +++ b/www/ungoogled-chromium/patches/patch-third_party_ffmpeg_libavutil_random_seed_c @@ -1,11 +1,11 @@ Index: third_party/ffmpeg/libavutil/random_seed.c --- third_party/ffmpeg/libavutil/random_seed.c.orig +++ third_party/ffmpeg/libavutil/random_seed.c -@@ -30,6 +30,11 @@ - #include <windows.h> - #include <bcrypt.h> +@@ -35,6 +35,11 @@ + #elif CONFIG_OPENSSL + #include <openssl/rand.h> #endif -+#if HAVE_ARC4RANDOM ++#if HAVE_ARC4RANDOM_BUF +#undef __BSD_VISIBLE +#define __BSD_VISIBLE 1 +#include <stdlib.h> diff --git a/www/ungoogled-chromium/patches/patch-third_party_ipcz_src_reference_drivers_random_cc b/www/ungoogled-chromium/patches/patch-third_party_ipcz_src_reference_drivers_random_cc index 879b331a9..24b39bb2d 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_ipcz_src_reference_drivers_random_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_ipcz_src_reference_drivers_random_cc @@ -1,8 +1,8 @@ Index: third_party/ipcz/src/reference_drivers/random.cc --- third_party/ipcz/src/reference_drivers/random.cc.orig +++ third_party/ipcz/src/reference_drivers/random.cc -@@ -15,7 +15,7 @@ - #include <limits> +@@ -14,7 +14,7 @@ + #include <windows.h> #elif BUILDFLAG(IS_FUCHSIA) #include <zircon/syscalls.h> -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) @@ -10,8 +10,8 @@ Index: third_party/ipcz/src/reference_drivers/random.cc #include <asm/unistd.h> #include <sys/syscall.h> #include <unistd.h> -@@ -78,7 +78,7 @@ void RandomBytes(absl::Span<uint8_t> destination) { - ABSL_ASSERT(ok); +@@ -86,7 +86,7 @@ void RandomBytes(absl::Span<uint8_t> destination) { + process_prng_fn(destination.data(), destination.size()); #elif BUILDFLAG(IS_FUCHSIA) zx_cprng_draw(destination.data(), destination.size()); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/patches/patch-third_party_leveldatabase_env_chromium_cc b/www/ungoogled-chromium/patches/patch-third_party_leveldatabase_env_chromium_cc index 8d0394252..ded989b61 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_leveldatabase_env_chromium_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_leveldatabase_env_chromium_cc @@ -1,7 +1,7 @@ Index: third_party/leveldatabase/env_chromium.cc --- third_party/leveldatabase/env_chromium.cc.orig +++ third_party/leveldatabase/env_chromium.cc -@@ -318,7 +318,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: +@@ -320,7 +320,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: Status ChromiumWritableFile::SyncParent() { TRACE_EVENT0("leveldb", "SyncParent"); diff --git a/www/ungoogled-chromium/patches/patch-third_party_libaom_source_libaom_aom_ports_aarch64_cpudetect_c b/www/ungoogled-chromium/patches/patch-third_party_libaom_source_libaom_aom_ports_aarch64_cpudetect_c new file mode 100644 index 000000000..679f631f9 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-third_party_libaom_source_libaom_aom_ports_aarch64_cpudetect_c @@ -0,0 +1,40 @@ +Index: third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c +--- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig ++++ third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c +@@ -85,13 +85,35 @@ static int arm_get_cpu_caps(void) { + return flags; + } + +-#elif defined(ANDROID_USE_CPU_FEATURES_LIB) ++#elif defined(ANDROID_USE_CPU_FEATURES_LIB) || defined(__FreeBSD__) + + static int arm_get_cpu_caps(void) { + int flags = 0; + #if HAVE_NEON + flags |= HAS_NEON; // Neon is mandatory in Armv8.0-A. + #endif // HAVE_NEON ++ return flags; ++} ++ ++#elif defined(__OpenBSD__) ++#include <sys/sysctl.h> ++#include <machine/cpu.h> ++#include <machine/armreg.h> ++ ++static int arm_get_cpu_caps(void) { ++ int flags = 0; ++ int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; ++ uint64_t cpu_id = 0; ++ size_t len = sizeof(cpu_id); ++ ++ flags |= HAS_NEON; // Neon is mandatory in Armv8.0-A. ++ ++ if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0) ++ return flags; ++ ++ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) ++ flags |= HAS_ARM_CRC32; ++ + return flags; + } + diff --git a/www/ungoogled-chromium/patches/patch-third_party_libusb_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_libusb_BUILD_gn index d2c1ce46d..e772a3b6e 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_libusb_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-third_party_libusb_BUILD_gn @@ -10,7 +10,7 @@ Index: third_party/libusb/BUILD.gn import("//build/config/chromeos/ui_mode.gni") import("//build/config/features.gni") -@@ -116,7 +116,7 @@ static_library("libusb") { +@@ -103,7 +103,7 @@ static_library("libusb") { ] } @@ -19,7 +19,7 @@ Index: third_party/libusb/BUILD.gn sources += [ "src/libusb/os/linux_usbfs.c", "src/libusb/os/linux_usbfs.h", -@@ -127,11 +127,21 @@ static_library("libusb") { +@@ -114,11 +114,21 @@ static_library("libusb") { ] } @@ -42,7 +42,7 @@ Index: third_party/libusb/BUILD.gn sources += [ "src/libusb/os/linux_udev.cc" ] defines += [ "HAVE_LIBUDEV=1", -@@ -140,7 +150,7 @@ static_library("libusb") { +@@ -127,7 +137,7 @@ static_library("libusb") { deps += [ "//build/linux/libudev" ] } diff --git a/www/ungoogled-chromium/patches/patch-third_party_libxml_linux_config_h b/www/ungoogled-chromium/patches/patch-third_party_libxml_linux_config_h index 6303b965d..b2757f6b5 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_libxml_linux_config_h +++ b/www/ungoogled-chromium/patches/patch-third_party_libxml_linux_config_h @@ -1,9 +1,9 @@ Index: third_party/libxml/linux/config.h --- third_party/libxml/linux/config.h.orig +++ third_party/libxml/linux/config.h -@@ -72,6 +72,9 @@ - /* Define to 1 if you have the `putenv' function. */ - #define HAVE_PUTENV 1 +@@ -69,6 +69,9 @@ + /* Define to 1 if you have the <pthread.h> header file. */ + #define HAVE_PTHREAD_H /**/ +/* Define to 1 if you have the `arc4random' function. */ +#define HAVE_ARC4RANDOM 1 diff --git a/www/ungoogled-chromium/patches/patch-third_party_maldoca_src_maldoca_service_common_process_doc_wrapper_cc b/www/ungoogled-chromium/patches/patch-third_party_maldoca_src_maldoca_service_common_process_doc_wrapper_cc index c330de048..cbc426c04 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_maldoca_src_maldoca_service_common_process_doc_wrapper_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_maldoca_src_maldoca_service_common_process_doc_wrapper_cc @@ -6,7 +6,7 @@ Index: third_party/maldoca/src/maldoca/service/common/process_doc_wrapper.cc #include "base/files/file_util.h" -#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) ++#if defined(OS_LINUX) || BUILDFLAG(IS_BSD) #include "base/strings/string_util.h" #else #include "base/strings/string_util_win.h" @@ -15,7 +15,7 @@ Index: third_party/maldoca/src/maldoca/service/common/process_doc_wrapper.cc bool ExtensionEqualInCaseSensitive(base::FilePath file_path, std::string extension){ - #if defined(OS_LINUX) -+ #if defined(OS_LINUX) || defined(OS_BSD) ++ #if defined(OS_LINUX) || BUILDFLAG(IS_BSD) std::string file_extension = file_path.FinalExtension(); return base::CompareCaseInsensitiveASCII(file_extension, extension) == 0; #else @@ -24,7 +24,7 @@ Index: third_party/maldoca/src/maldoca/service/common/process_doc_wrapper.cc maldoca::ProcessDocumentRequest process_doc_request; - #if defined(OS_LINUX) -+ #if defined(OS_LINUX) || defined(OS_BSD) ++ #if defined(OS_LINUX) || BUILDFLAG(IS_BSD) const std::string file_name = file_path.BaseName().value().c_str(); process_doc_request.set_file_name(file_name); #endif diff --git a/www/ungoogled-chromium/patches/patch-third_party_material_color_utilities_src_cpp_palettes_tones_cc b/www/ungoogled-chromium/patches/patch-third_party_material_color_utilities_src_cpp_palettes_tones_cc new file mode 100644 index 000000000..da4a78067 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-third_party_material_color_utilities_src_cpp_palettes_tones_cc @@ -0,0 +1,12 @@ +Index: third_party/material_color_utilities/src/cpp/palettes/tones.cc +--- third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig ++++ third_party/material_color_utilities/src/cpp/palettes/tones.cc +@@ -14,6 +14,8 @@ + * limitations under the License. + */ + ++#include <cmath> ++ + #include "cpp/palettes/tones.h" + + #include "cpp/cam/cam.h" diff --git a/www/ungoogled-chromium/patches/patch-third_party_pdfium_core_fxge_cfx_fontmapper_cpp b/www/ungoogled-chromium/patches/patch-third_party_pdfium_core_fxge_cfx_fontmapper_cpp index d7a996dd2..9e43dbdc4 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_pdfium_core_fxge_cfx_fontmapper_cpp +++ b/www/ungoogled-chromium/patches/patch-third_party_pdfium_core_fxge_cfx_fontmapper_cpp @@ -1,7 +1,7 @@ Index: third_party/pdfium/core/fxge/cfx_fontmapper.cpp --- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig +++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp -@@ -158,7 +158,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { +@@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { {"ForteMT", "Forte"}, }; diff --git a/www/ungoogled-chromium/patches/patch-third_party_pdfium_pdfium_gni b/www/ungoogled-chromium/patches/patch-third_party_pdfium_pdfium_gni index 83bcbf342..aaadaa427 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_pdfium_pdfium_gni +++ b/www/ungoogled-chromium/patches/patch-third_party_pdfium_pdfium_gni @@ -1,10 +1,10 @@ Index: third_party/pdfium/pdfium.gni --- third_party/pdfium/pdfium.gni.orig +++ third_party/pdfium/pdfium.gni -@@ -42,7 +42,7 @@ declare_args() { - pdf_use_cxx20 = (is_win && is_component_build) || is_fuchsia - - # Build PDFium with PartitionAlloc as the memory allocator. +@@ -46,7 +46,7 @@ declare_args() { + # PDFium will use PartitionAlloc partitions to separate strings, scalars, + # etc. from other allocations. However, the use of PartitionAlloc for new or + # malloc is controlled by args in build_overrides/partition_alloc.gni. - pdf_use_partition_alloc = pdf_use_partition_alloc_override + pdf_use_partition_alloc = pdf_use_partition_alloc_override && use_partition_alloc_as_malloc diff --git a/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_base_unix_socket_cc b/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_base_unix_socket_cc index f1d2c6577..f0fdad939 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_base_unix_socket_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_base_unix_socket_cc @@ -1,7 +1,7 @@ Index: third_party/perfetto/src/base/unix_socket.cc --- third_party/perfetto/src/base/unix_socket.cc.orig +++ third_party/perfetto/src/base/unix_socket.cc -@@ -43,7 +43,7 @@ +@@ -44,7 +44,7 @@ #include <unistd.h> #endif @@ -10,7 +10,7 @@ Index: third_party/perfetto/src/base/unix_socket.cc #include <sys/ucred.h> #endif -@@ -871,9 +871,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { +@@ -917,9 +917,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { return; PERFETTO_CHECK(peer_cred_mode_ != SockPeerCredMode::kIgnore); diff --git a/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_trace_processor_db_storage_numeric_storage_cc b/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_trace_processor_db_storage_numeric_storage_cc index 058a35172..e9da27fca 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_trace_processor_db_storage_numeric_storage_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_trace_processor_db_storage_numeric_storage_cc @@ -1,7 +1,7 @@ Index: third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc --- third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc.orig +++ third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc -@@ -280,8 +280,13 @@ BitVector NumericStorage::LinearSearch(FilterOp op, +@@ -245,8 +245,13 @@ BitVector NumericStorage::LinearSearch(FilterOp op, } else if (const auto* i32 = std::get_if<int32_t>(&*val)) { auto* start = static_cast<const int32_t*>(data_) + range.start; TypedLinearSearch(*i32, start, op, builder); diff --git a/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_tracing_core_tracing_service_impl_cc b/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_tracing_core_tracing_service_impl_cc index e3052b04a..db59e0d03 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_tracing_core_tracing_service_impl_cc +++ b/www/ungoogled-chromium/patches/patch-third_party_perfetto_src_tracing_core_tracing_service_impl_cc @@ -1,7 +1,7 @@ Index: third_party/perfetto/src/tracing/core/tracing_service_impl.cc --- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -3149,7 +3149,8 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -3203,7 +3203,8 @@ bool TracingServiceImpl::SnapshotClocks( #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ diff --git a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-loader_src_loader_vk_loader_platform_h b/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-loader_src_loader_vk_loader_platform_h index 5ead02594..44ee21c5b 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-loader_src_loader_vk_loader_platform_h +++ b/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-loader_src_loader_vk_loader_platform_h @@ -1,7 +1,7 @@ Index: third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h --- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig +++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h -@@ -298,7 +298,15 @@ static inline char *loader_platform_executable_path(ch +@@ -303,7 +303,15 @@ static inline char *loader_platform_executable_path(ch return buffer; } diff --git a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl_instance_device_cpp b/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl_instance_device_cpp index c517a21e9..99be84a72 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl_instance_device_cpp +++ b/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl_instance_device_cpp @@ -1,7 +1,7 @@ Index: third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp --- third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp.orig +++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp -@@ -46,12 +46,12 @@ bool StatelessValidation::ValidateApiVersion(uint32_t +@@ -26,12 +26,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 ".", diff --git a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk_extension_helper_h b/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk_extension_helper_h index a11943709..7f502aab3 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk_extension_helper_h +++ b/www/ungoogled-chromium/patches/patch-third_party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk_extension_helper_h @@ -1,7 +1,7 @@ Index: third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h --- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h.orig +++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h -@@ -88,9 +88,9 @@ class APIVersion { +@@ -87,9 +87,9 @@ class APIVersion { bool valid() const { return api_version_ != VVL_UNRECOGNIZED_API_VERSION; } uint32_t value() const { return api_version_; } diff --git a/www/ungoogled-chromium/patches/patch-third_party_webrtc_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_webrtc_BUILD_gn index cb94608a2..f527b1ef4 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_webrtc_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-third_party_webrtc_BUILD_gn @@ -1,7 +1,7 @@ Index: third_party/webrtc/BUILD.gn --- third_party/webrtc/BUILD.gn.orig +++ third_party/webrtc/BUILD.gn -@@ -208,6 +208,9 @@ config("common_inherited_config") { +@@ -216,6 +216,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/ungoogled-chromium/patches/patch-third_party_webrtc_modules_audio_device_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_webrtc_modules_audio_device_BUILD_gn index 8484f4017..37046e1ae 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_webrtc_modules_audio_device_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-third_party_webrtc_modules_audio_device_BUILD_gn @@ -1,7 +1,7 @@ Index: third_party/webrtc/modules/audio_device/BUILD.gn --- third_party/webrtc/modules/audio_device/BUILD.gn.orig +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -330,7 +330,7 @@ rtc_library("audio_device_impl") { +@@ -349,7 +349,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/ungoogled-chromium/patches/patch-third_party_webrtc_rtc_base_net_test_helpers_cc b/www/ungoogled-chromium/patches/patch-third_party_webrtc_rtc_base_net_test_helpers_cc new file mode 100644 index 000000000..1d3075b2a --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-third_party_webrtc_rtc_base_net_test_helpers_cc @@ -0,0 +1,11 @@ +Index: third_party/webrtc/rtc_base/net_test_helpers.cc +--- third_party/webrtc/rtc_base/net_test_helpers.cc.orig ++++ third_party/webrtc/rtc_base/net_test_helpers.cc +@@ -21,6 +21,7 @@ + #endif + #if defined(WEBRTC_POSIX) && !defined(__native_client__) + #include <arpa/inet.h> ++#include <sys/socket.h> + #if defined(WEBRTC_ANDROID) + #include "rtc_base/ifaddrs_android.h" + #else diff --git a/www/ungoogled-chromium/patches/patch-third_party_zlib_BUILD_gn b/www/ungoogled-chromium/patches/patch-third_party_zlib_BUILD_gn index 2cedf8e4c..5f11bb946 100644 --- a/www/ungoogled-chromium/patches/patch-third_party_zlib_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-third_party_zlib_BUILD_gn @@ -2,24 +2,26 @@ Index: third_party/zlib/BUILD.gn --- third_party/zlib/BUILD.gn.orig +++ third_party/zlib/BUILD.gn @@ -127,7 +127,7 @@ if (use_arm_neon_optimizations) { - # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: - # "All implementations of the ARMv8.1 architecture are required to - # implement the CRC32* instructions. These are optional in ARMv8.0." -- if (!is_ios) { -+ if (!is_ios && !is_bsd) { - defines = [ "CRC32_ARMV8_CRC32" ] - if (is_android) { - defines += [ "ARMV8_OS_ANDROID" ] -@@ -148,7 +148,7 @@ if (use_arm_neon_optimizations) { - source_set("zlib_arm_crc32") { - visibility = [ ":*" ] - -- if (!is_ios) { -+ if (!is_ios && !is_bsd) { - include_dirs = [ "." ] - - if (!is_win && !is_clang) { -@@ -416,7 +416,7 @@ static_library("minizip") { + defines = [ "CRC32_ARMV8_CRC32" ] + if (is_android) { + defines += [ "ARMV8_OS_ANDROID" ] +- } else if (is_linux || is_chromeos) { ++ } else if ((is_linux || is_chromeos) && !is_bsd) { + defines += [ "ARMV8_OS_LINUX" ] + } else if (is_mac) { + defines += [ "ARMV8_OS_MACOS" ] +@@ -137,6 +137,10 @@ if (use_arm_neon_optimizations) { + defines += [ "ARMV8_OS_FUCHSIA" ] + } else if (is_win) { + defines += [ "ARMV8_OS_WINDOWS" ] ++ } else if (is_openbsd) { ++ defines += [ "ARMV8_OS_OPENBSD" ] ++ } else if (is_freebsd) { ++ defines += [ "ARMV8_OS_FREEBSD" ] + } else { + assert(false, "Unsupported ARM OS") + } +@@ -408,7 +412,7 @@ static_library("minizip") { ] } diff --git a/www/ungoogled-chromium/patches/patch-third_party_zlib_cpu_features_c b/www/ungoogled-chromium/patches/patch-third_party_zlib_cpu_features_c new file mode 100644 index 000000000..e5739ca6f --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-third_party_zlib_cpu_features_c @@ -0,0 +1,52 @@ +Index: third_party/zlib/cpu_features.c +--- third_party/zlib/cpu_features.c.orig ++++ third_party/zlib/cpu_features.c +@@ -35,7 +35,8 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; + + #ifndef CPU_NO_SIMD + +-#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) ++#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) || \ ++ defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD) + #include <pthread.h> + #endif + +@@ -52,6 +53,10 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; + #include <windows.h> + #elif defined(ARMV8_OS_IOS) + #include <sys/sysctl.h> ++#elif defined(ARMV8_OS_OPENBSD) ++#include <sys/sysctl.h> ++#include <machine/cpu.h> ++#include <machine/armreg.h> + #elif !defined(_MSC_VER) + #include <pthread.h> + #else +@@ -62,7 +67,8 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; + static void _cpu_check_features(void); + #endif + +-#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) ++#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) || \ ++ defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD) + #if !defined(ARMV8_OS_MACOS) + // _cpu_check_features() doesn't need to do anything on mac/arm since all + // features are known at build time, so don't call it. +@@ -115,6 +121,17 @@ static void _cpu_check_features(void) + unsigned long features = getauxval(AT_HWCAP2); + arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32); + arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL); ++#elif defined(ARMV8_OS_OPENBSD) ++ int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; ++ uint64_t cpu_id = 0; ++ size_t len = sizeof(cpu_id); ++ if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0) ++ return; ++ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_PMULL) ++ arm_cpu_enable_pmull = 1; ++ ++ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) ++ arm_cpu_enable_crc32 = 1; + #elif defined(ARMV8_OS_FUCHSIA) + uint32_t features; + zx_status_t rc = zx_system_get_features(ZX_FEATURE_KIND_CPU, &features); diff --git a/www/ungoogled-chromium/patches/patch-tools_gn_build_gen_py b/www/ungoogled-chromium/patches/patch-tools_gn_build_gen_py index 639b06a3e..ffd1a0cf3 100644 --- a/www/ungoogled-chromium/patches/patch-tools_gn_build_gen_py +++ b/www/ungoogled-chromium/patches/patch-tools_gn_build_gen_py @@ -1,7 +1,7 @@ Index: tools/gn/build/gen.py --- tools/gn/build/gen.py.orig +++ tools/gn/build/gen.py -@@ -92,6 +92,12 @@ class Platform(object): +@@ -94,6 +94,12 @@ class Platform(object): def is_solaris(self): return self._platform == 'solaris' @@ -12,9 +12,9 @@ Index: tools/gn/build/gen.py + return self._platform == 'freebsd' + def is_posix(self): - return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd'] + return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd', 'serenity'] -@@ -283,7 +289,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -288,7 +294,7 @@ def WriteGenericNinja(path, static_libraries, executab 'linux': 'build_linux.ninja.template', 'freebsd': 'build_linux.ninja.template', 'aix': 'build_aix.ninja.template', @@ -23,7 +23,7 @@ Index: tools/gn/build/gen.py 'haiku': 'build_haiku.ninja.template', 'solaris': 'build_linux.ninja.template', 'netbsd': 'build_linux.ninja.template', -@@ -506,6 +512,9 @@ def WriteGNNinja(path, platform, host, options, args_l +@@ -512,6 +518,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/ungoogled-chromium/patches/patch-ui_base_cursor_cursor_factory_cc b/www/ungoogled-chromium/patches/patch-ui_base_cursor_cursor_factory_cc index 132cea1f7..7f6509540 100644 --- a/www/ungoogled-chromium/patches/patch-ui_base_cursor_cursor_factory_cc +++ b/www/ungoogled-chromium/patches/patch-ui_base_cursor_cursor_factory_cc @@ -1,7 +1,7 @@ Index: ui/base/cursor/cursor_factory.cc --- ui/base/cursor/cursor_factory.cc.orig +++ ui/base/cursor/cursor_factory.cc -@@ -89,7 +89,7 @@ void CursorFactory::ObserveThemeChanges() { +@@ -98,7 +98,7 @@ void CursorFactory::ObserveThemeChanges() { NOTIMPLEMENTED(); } diff --git a/www/ungoogled-chromium/patches/patch-ui_base_cursor_cursor_factory_h b/www/ungoogled-chromium/patches/patch-ui_base_cursor_cursor_factory_h index 917d39e3c..faa64f2f7 100644 --- a/www/ungoogled-chromium/patches/patch-ui_base_cursor_cursor_factory_h +++ b/www/ungoogled-chromium/patches/patch-ui_base_cursor_cursor_factory_h @@ -1,7 +1,7 @@ Index: ui/base/cursor/cursor_factory.h --- ui/base/cursor/cursor_factory.h.orig +++ ui/base/cursor/cursor_factory.h -@@ -86,7 +86,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) CursorFactory { +@@ -93,7 +93,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) CursorFactory { base::ObserverList<CursorFactoryObserver>::Unchecked observers_; }; diff --git a/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_cc b/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_cc index ac5a81ef0..34e3c7be5 100644 --- a/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_cc +++ b/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_cc @@ -1,7 +1,7 @@ Index: ui/base/ime/fake_text_input_client.cc --- ui/base/ime/fake_text_input_client.cc.orig +++ ui/base/ime/fake_text_input_client.cc -@@ -167,7 +167,7 @@ bool FakeTextInputClient::ShouldDoLearning() { +@@ -171,7 +171,7 @@ bool FakeTextInputClient::ShouldDoLearning() { return false; } diff --git a/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_h b/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_h index 62c522bbc..1a7ecc5be 100644 --- a/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_h +++ b/www/ungoogled-chromium/patches/patch-ui_base_ime_fake_text_input_client_h @@ -1,7 +1,7 @@ Index: ui/base/ime/fake_text_input_client.h --- ui/base/ime/fake_text_input_client.h.orig +++ ui/base/ime/fake_text_input_client.h -@@ -73,7 +73,7 @@ class FakeTextInputClient : public TextInputClient { +@@ -74,7 +74,7 @@ class FakeTextInputClient : public TextInputClient { void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override; ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/ungoogled-chromium/patches/patch-ui_base_resource_resource_bundle_cc b/www/ungoogled-chromium/patches/patch-ui_base_resource_resource_bundle_cc index 11c41191a..084d06c88 100644 --- a/www/ungoogled-chromium/patches/patch-ui_base_resource_resource_bundle_cc +++ b/www/ungoogled-chromium/patches/patch-ui_base_resource_resource_bundle_cc @@ -1,7 +1,7 @@ Index: ui/base/resource/resource_bundle.cc --- ui/base/resource/resource_bundle.cc.orig +++ ui/base/resource/resource_bundle.cc -@@ -916,7 +916,7 @@ void ResourceBundle::ReloadFonts() { +@@ -926,7 +926,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { diff --git a/www/ungoogled-chromium/patches/patch-ui_base_test_skia_gold_pixel_diff_cc b/www/ungoogled-chromium/patches/patch-ui_base_test_skia_gold_pixel_diff_cc index 984841bf9..88e6b7b3b 100644 --- a/www/ungoogled-chromium/patches/patch-ui_base_test_skia_gold_pixel_diff_cc +++ b/www/ungoogled-chromium/patches/patch-ui_base_test_skia_gold_pixel_diff_cc @@ -1,7 +1,7 @@ Index: ui/base/test/skia_gold_pixel_diff.cc --- ui/base/test/skia_gold_pixel_diff.cc.orig +++ ui/base/test/skia_gold_pixel_diff.cc -@@ -104,7 +104,7 @@ const char* GetPlatformName() { +@@ -115,7 +115,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/ungoogled-chromium/patches/patch-ui_base_ui_base_features_cc b/www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_cc index d5c609140..925788ffd 100644 --- a/www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_cc +++ b/www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_cc @@ -1,7 +1,16 @@ Index: ui/base/ui_base_features.cc --- ui/base/ui_base_features.cc.orig +++ ui/base/ui_base_features.cc -@@ -206,7 +206,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -113,7 +113,7 @@ BASE_FEATURE(kAlwaysConfirmComposition, + base::FEATURE_ENABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kRedundantImeCompositionClearing, + "RedundantImeCompositionClearing", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -212,7 +212,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -10,7 +19,7 @@ Index: ui/base/ui_base_features.cc (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -313,7 +313,7 @@ bool IsForcedColorsEnabled() { +@@ -319,7 +319,7 @@ bool IsForcedColorsEnabled() { // milestones. BASE_FEATURE(kEyeDropper, "EyeDropper", @@ -19,7 +28,7 @@ Index: ui/base/ui_base_features.cc base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -478,7 +478,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() { +@@ -531,7 +531,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() { return level; } diff --git a/www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_h b/www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_h index a73017f64..ec1f8f3d2 100644 --- a/www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_h +++ b/www/ungoogled-chromium/patches/patch-ui_base_ui_base_features_h @@ -1,7 +1,16 @@ Index: ui/base/ui_base_features.h --- ui/base/ui_base_features.h.orig +++ ui/base/ui_base_features.h -@@ -234,7 +234,7 @@ enum class ChromeRefresh2023Level { +@@ -133,7 +133,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) + BASE_DECLARE_FEATURE(kAlwaysConfirmComposition); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(UI_BASE_FEATURES) + BASE_DECLARE_FEATURE(kRedundantImeCompositionClearing); + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) +@@ -266,7 +266,7 @@ enum class ChromeRefresh2023Level { COMPONENT_EXPORT(UI_BASE_FEATURES) ChromeRefresh2023Level GetChromeRefresh2023Level(); diff --git a/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_loader_cc b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_loader_cc index ed691d99c..c9147f176 100644 --- a/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_loader_cc +++ b/www/ungoogled-chromium/patches/patch-ui_base_x_x11_cursor_loader_cc @@ -14,7 +14,7 @@ Index: ui/base/x/x11_cursor_loader.cc void operator()(void* ptr) const { dlclose(ptr); } }; -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + std::unique_ptr<void, DlCloser> lib(dlopen("libXcursor.so", RTLD_LAZY)); +#else std::unique_ptr<void, DlCloser> lib(dlopen("libXcursor.so.1", RTLD_LAZY)); diff --git a/www/ungoogled-chromium/patches/patch-ui_color_color_id_h b/www/ungoogled-chromium/patches/patch-ui_color_color_id_h index c44a73420..0dee66dea 100644 --- a/www/ungoogled-chromium/patches/patch-ui_color_color_id_h +++ b/www/ungoogled-chromium/patches/patch-ui_color_color_id_h @@ -1,7 +1,7 @@ Index: ui/color/color_id.h --- ui/color/color_id.h.orig +++ ui/color/color_id.h -@@ -509,7 +509,7 @@ +@@ -543,7 +543,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) diff --git a/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_cc b/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_cc index 745d94228..cd76ac4d7 100644 --- a/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_cc +++ b/www/ungoogled-chromium/patches/patch-ui_compositor_compositor_cc @@ -1,7 +1,7 @@ Index: ui/compositor/compositor.cc --- ui/compositor/compositor.cc.orig +++ ui/compositor/compositor.cc -@@ -897,7 +897,7 @@ void Compositor::OnResume() { +@@ -896,7 +896,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/ungoogled-chromium/patches/patch-ui_events_event_cc b/www/ungoogled-chromium/patches/patch-ui_events_event_cc index 17ab4816c..45d7468d1 100644 --- a/www/ungoogled-chromium/patches/patch-ui_events_event_cc +++ b/www/ungoogled-chromium/patches/patch-ui_events_event_cc @@ -19,7 +19,7 @@ Index: ui/events/event.cc // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on // Linux. // static -@@ -931,7 +931,7 @@ void KeyEvent::InitializeNative() { +@@ -936,7 +936,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) set_flags(flags() | EF_IS_REPEAT); diff --git a/www/ungoogled-chromium/patches/patch-ui_events_gesture_detection_motion_event_generic_h b/www/ungoogled-chromium/patches/patch-ui_events_gesture_detection_motion_event_generic_h new file mode 100644 index 000000000..a44add7d2 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-ui_events_gesture_detection_motion_event_generic_h @@ -0,0 +1,11 @@ +Index: ui/events/gesture_detection/motion_event_generic.h +--- ui/events/gesture_detection/motion_event_generic.h.orig ++++ ui/events/gesture_detection/motion_event_generic.h +@@ -7,6 +7,7 @@ + + #include <stddef.h> + #include <stdint.h> ++#include <vector> + + #include "base/time/time.h" + #include "third_party/abseil-cpp/absl/container/inlined_vector.h" diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_BUILD_gn b/www/ungoogled-chromium/patches/patch-ui_gfx_BUILD_gn index 495687f97..ed2b80700 100644 --- a/www/ungoogled-chromium/patches/patch-ui_gfx_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-ui_gfx_BUILD_gn @@ -1,7 +1,7 @@ Index: ui/gfx/BUILD.gn --- ui/gfx/BUILD.gn.orig +++ ui/gfx/BUILD.gn -@@ -648,7 +648,7 @@ source_set("memory_buffer_sources") { +@@ -644,7 +644,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_canvas_skia_cc b/www/ungoogled-chromium/patches/patch-ui_gfx_canvas_skia_cc index 40942a8ce..9e07579a0 100644 --- a/www/ungoogled-chromium/patches/patch-ui_gfx_canvas_skia_cc +++ b/www/ungoogled-chromium/patches/patch-ui_gfx_canvas_skia_cc @@ -1,7 +1,7 @@ Index: ui/gfx/canvas_skia.cc --- ui/gfx/canvas_skia.cc.orig +++ ui/gfx/canvas_skia.cc -@@ -200,7 +200,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str +@@ -212,7 +212,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_native_widget_types_h b/www/ungoogled-chromium/patches/patch-ui_gfx_native_widget_types_h index a43e0fd4b..dc3c39892 100644 --- a/www/ungoogled-chromium/patches/patch-ui_gfx_native_widget_types_h +++ b/www/ungoogled-chromium/patches/patch-ui_gfx_native_widget_types_h @@ -1,7 +1,7 @@ Index: ui/gfx/native_widget_types.h --- ui/gfx/native_widget_types.h.orig +++ ui/gfx/native_widget_types.h -@@ -105,7 +105,7 @@ class SkBitmap; +@@ -103,7 +103,7 @@ class SkBitmap; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -10,7 +10,7 @@ Index: ui/gfx/native_widget_types.h extern "C" { struct _AtkObject; using AtkObject = struct _AtkObject; -@@ -223,7 +223,7 @@ using NativeViewAccessible = struct objc_object*; +@@ -221,7 +221,7 @@ using NativeViewAccessible = struct objc_object*; #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/patches/patch-ui_gfx_x_xlib_support_cc b/www/ungoogled-chromium/patches/patch-ui_gfx_x_xlib_support_cc index e1a0f63c4..cca036765 100644 --- a/www/ungoogled-chromium/patches/patch-ui_gfx_x_xlib_support_cc +++ b/www/ungoogled-chromium/patches/patch-ui_gfx_x_xlib_support_cc @@ -5,14 +5,14 @@ Index: ui/gfx/x/xlib_support.cc if (xlib_loader->loaded()) return; -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + CHECK(xlib_loader->Load("libX11.so")); +#else CHECK(xlib_loader->Load("libX11.so.6")); +#endif auto* xlib_xcb_loader = GetXlibXcbLoader(); -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + CHECK(xlib_xcb_loader->Load("libX11-xcb.so")); +#else CHECK(xlib_xcb_loader->Load("libX11-xcb.so.1")); diff --git a/www/ungoogled-chromium/patches/patch-ui_gl_BUILD_gn b/www/ungoogled-chromium/patches/patch-ui_gl_BUILD_gn index be441b766..48e0ee0c5 100644 --- a/www/ungoogled-chromium/patches/patch-ui_gl_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-ui_gl_BUILD_gn @@ -1,7 +1,7 @@ Index: ui/gl/BUILD.gn --- ui/gl/BUILD.gn.orig +++ ui/gl/BUILD.gn -@@ -153,8 +153,6 @@ component("gl") { +@@ -151,8 +151,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] } @@ -10,7 +10,7 @@ Index: ui/gl/BUILD.gn all_dependent_configs = [ ":gl_config" ] public_configs = [ "//third_party/khronos:khronos_headers" ] -@@ -171,7 +169,6 @@ component("gl") { +@@ -169,7 +167,6 @@ component("gl") { ] public_deps = [ "//base", @@ -18,7 +18,7 @@ Index: ui/gl/BUILD.gn "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -369,7 +366,6 @@ component("gl") { +@@ -373,7 +370,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -26,7 +26,7 @@ Index: ui/gl/BUILD.gn ] if (enable_swiftshader) { data_deps += [ -@@ -589,7 +585,6 @@ test("gl_unittests") { +@@ -574,7 +570,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/ungoogled-chromium/patches/patch-ui_gl_gl_fence_cc b/www/ungoogled-chromium/patches/patch-ui_gl_gl_fence_cc new file mode 100644 index 000000000..e334250ed --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-ui_gl_gl_fence_cc @@ -0,0 +1,12 @@ +Index: ui/gl/gl_fence.cc +--- ui/gl/gl_fence.cc.orig ++++ ui/gl/gl_fence.cc +@@ -20,7 +20,7 @@ + #endif + + #if defined(USE_EGL) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #define USE_GL_FENCE_ANDROID_NATIVE_FENCE_SYNC + #include "ui/gl/gl_fence_android_native_fence_sync.h" + #endif diff --git a/www/ungoogled-chromium/patches/patch-ui_gl_gl_switches_cc b/www/ungoogled-chromium/patches/patch-ui_gl_gl_switches_cc index dca4a904a..d9aa3169a 100644 --- a/www/ungoogled-chromium/patches/patch-ui_gl_gl_switches_cc +++ b/www/ungoogled-chromium/patches/patch-ui_gl_gl_switches_cc @@ -10,7 +10,7 @@ Index: ui/gl/gl_switches.cc #include <vulkan/vulkan_core.h> #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif -@@ -271,7 +271,7 @@ bool IsDefaultANGLEVulkan() { +@@ -289,7 +289,7 @@ bool IsDefaultANGLEVulkan() { base::android::SDK_VERSION_Q) return false; #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/patches/patch-ui_gtk_gtk_compat_cc b/www/ungoogled-chromium/patches/patch-ui_gtk_gtk_compat_cc index 15338e867..8cf07d946 100644 --- a/www/ungoogled-chromium/patches/patch-ui_gtk_gtk_compat_cc +++ b/www/ungoogled-chromium/patches/patch-ui_gtk_gtk_compat_cc @@ -5,7 +5,7 @@ Index: ui/gtk/gtk_compat.cc } void* GetLibGio() { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + static void* libgio = DlOpen("libgio-2.0.so"); +#else static void* libgio = DlOpen("libgio-2.0.so.0"); @@ -14,7 +14,7 @@ Index: ui/gtk/gtk_compat.cc } void* GetLibGdkPixbuf() { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so"); +#else static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0"); @@ -23,7 +23,7 @@ Index: ui/gtk/gtk_compat.cc } void* GetLibGdk3() { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + static void* libgdk3 = DlOpen("libgdk-3.so"); +#else static void* libgdk3 = DlOpen("libgdk-3.so.0"); @@ -32,7 +32,7 @@ Index: ui/gtk/gtk_compat.cc } void* GetLibGtk3(bool check = true) { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + static void* libgtk3 = DlOpen("libgtk-3.so", check); +#else static void* libgtk3 = DlOpen("libgtk-3.so.0", check); @@ -41,7 +41,7 @@ Index: ui/gtk/gtk_compat.cc } void* GetLibGtk4(bool check = true) { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + static void* libgtk4 = DlOpen("libgtk-4.so", check); +#else static void* libgtk4 = DlOpen("libgtk-4.so.1", check); diff --git a/www/ungoogled-chromium/patches/patch-ui_gtk_gtk_ui_cc b/www/ungoogled-chromium/patches/patch-ui_gtk_gtk_ui_cc new file mode 100644 index 000000000..dceadeb32 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-ui_gtk_gtk_ui_cc @@ -0,0 +1,23 @@ +Index: ui/gtk/gtk_ui.cc +--- ui/gtk/gtk_ui.cc.orig ++++ ui/gtk/gtk_ui.cc +@@ -955,11 +955,19 @@ ui::DisplayConfig GtkUi::GetDisplayConfig() const { + GdkRectangle geometry; + gdk_monitor_get_geometry(monitor, &geometry); + int monitor_scale = std::max(1, gdk_monitor_get_scale_factor(monitor)); ++#if defined(__clang__) && (__clang_major__ >= 16) + config.display_geometries.emplace_back( + gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y, + monitor_scale * geometry.width, + monitor_scale * geometry.height), + monitor_scale * font_scale); ++#else ++ config.display_geometries.emplace_back() = { ++ gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y, ++ monitor_scale * geometry.width, ++ monitor_scale * geometry.height), ++ static_cast<float>(monitor_scale * font_scale)}; ++#endif + } + return config; + } diff --git a/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_base_cc b/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_base_cc index 2743128d1..05c883c29 100644 --- a/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_base_cc +++ b/www/ungoogled-chromium/patches/patch-ui_native_theme_native_theme_base_cc @@ -1,7 +1,7 @@ Index: ui/native_theme/native_theme_base.cc --- ui/native_theme/native_theme_base.cc.orig +++ ui/native_theme/native_theme_base.cc -@@ -273,7 +273,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -274,7 +274,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_headless_vulkan_implementation_headless_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_headless_vulkan_implementation_headless_cc index ee0d65b07..f99f0e63b 100644 --- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_headless_vulkan_implementation_headless_cc +++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_headless_vulkan_implementation_headless_cc @@ -1,7 +1,7 @@ Index: ui/ozone/platform/headless/vulkan_implementation_headless.cc --- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig +++ ui/ozone/platform/headless/vulkan_implementation_headless.cc -@@ -155,7 +155,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory +@@ -141,7 +141,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; auto tiling = VK_IMAGE_TILING_OPTIMAL; diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_cc index 896eebfdd..5aac0801c 100644 --- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_cc +++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_cc @@ -1,7 +1,7 @@ Index: ui/ozone/platform/wayland/host/wayland_toplevel_window.cc --- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -543,7 +543,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -548,7 +548,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/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_h b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_h index 7a5afe8e3..7fa6eeb4d 100644 --- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_h +++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_toplevel_window_h @@ -1,7 +1,7 @@ Index: ui/ozone/platform/wayland/host/wayland_toplevel_window.h --- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -250,7 +250,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -256,7 +256,7 @@ class WaylandToplevelWindow : public WaylandWindow, // Contains the previous state of the window. PlatformWindowState previous_state_ = PlatformWindowState::kUnknown; diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_cc new file mode 100644 index 000000000..5d8452c6a --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_cc @@ -0,0 +1,36 @@ +Index: ui/ozone/platform/wayland/host/wayland_window.cc +--- ui/ozone/platform/wayland/host/wayland_window.cc.orig ++++ ui/ozone/platform/wayland/host/wayland_window.cc +@@ -233,7 +233,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused + // Whenever the window gets the pointer focus back, the cursor shape must be + // updated. Otherwise, it is invalidated upon wl_pointer::leave and is not + // restored by the Wayland compositor. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (focused && async_cursor_) { + async_cursor_->AddCursorLoadedCallback( + base::BindOnce(&WaylandWindow::OnCursorLoaded, +@@ -490,7 +490,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { + void WaylandWindow::SetCursor(scoped_refptr<PlatformCursor> platform_cursor) { + DCHECK(platform_cursor); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor); + + if (async_cursor_ == async_cursor) { +@@ -1070,12 +1070,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi + cursor->bitmaps(), hotspot_in_dips, + std::ceil(cursor->cursor_image_scale_factor())); + } +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + cursor_ = cursor; + #endif + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void WaylandWindow::OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor, + scoped_refptr<BitmapCursor> bitmap_cursor) { + if (HasPointerFocus() && async_cursor_ == cursor && bitmap_cursor) { diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_h b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_h index 599b47b0c..a0c0cbe19 100644 --- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_h +++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_wayland_window_h @@ -1,7 +1,16 @@ Index: ui/ozone/platform/wayland/host/wayland_window.h --- ui/ozone/platform/wayland/host/wayland_window.h.orig +++ ui/ozone/platform/wayland/host/wayland_window.h -@@ -236,7 +236,7 @@ class WaylandWindow : public PlatformWindow, +@@ -38,7 +38,7 @@ + #include "ui/platform_window/platform_window_init_properties.h" + #include "ui/platform_window/wm/wm_drag_handler.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h" + #endif + +@@ -240,7 +240,7 @@ class WaylandWindow : public PlatformWindow, bool is_snapped_primary = false; bool is_snapped_secondary = false; bool is_floated = false; @@ -10,3 +19,21 @@ Index: ui/ozone/platform/wayland/host/wayland_window.h WindowTiledEdges tiled_edges; #endif }; +@@ -487,7 +487,7 @@ class WaylandWindow : public PlatformWindow, + + void UpdateCursorShape(scoped_refptr<BitmapCursor> cursor); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor, + scoped_refptr<BitmapCursor> bitmap_cursor); + #endif +@@ -546,7 +546,7 @@ class WaylandWindow : public PlatformWindow, + + wl::Object<zaura_surface> aura_surface_; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // The current asynchronously loaded cursor (Linux specific). + scoped_refptr<WaylandAsyncCursor> async_cursor_; + #else diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_xdg_toplevel_wrapper_impl_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_xdg_toplevel_wrapper_impl_cc index 7eb1c3d3e..a13c96273 100644 --- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_xdg_toplevel_wrapper_impl_cc +++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_xdg_toplevel_wrapper_impl_cc @@ -1,7 +1,7 @@ Index: ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc --- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig +++ ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc -@@ -277,7 +277,7 @@ void XDGToplevelWrapperImpl::ConfigureTopLevel( +@@ -284,7 +284,7 @@ void XDGToplevelWrapperImpl::ConfigureTopLevel( CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED), }; diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_zwp_text_input_wrapper_v1_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_zwp_text_input_wrapper_v1_cc index 062e7dadd..4f2bb2bd7 100644 --- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_zwp_text_input_wrapper_v1_cc +++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_host_zwp_text_input_wrapper_v1_cc @@ -1,7 +1,7 @@ Index: ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc --- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig +++ ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc -@@ -224,6 +224,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( +@@ -225,6 +225,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( // so if it exceeds 16 bits, it may be broken. static constexpr size_t kSizeLimit = 60000; if (HasAdvancedSurroundingTextSupport() && text.length() > kSizeLimit) { @@ -12,7 +12,7 @@ Index: ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc base::ScopedFD memfd(memfd_create("surrounding_text", MFD_CLOEXEC)); if (!memfd.get()) { PLOG(ERROR) << "Failed to create memfd"; -@@ -236,6 +240,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText( +@@ -237,6 +241,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText( zcr_extended_text_input_v1_set_large_surrounding_text( extended_obj_.get(), memfd.get(), text.length(), selection_range.start(), selection_range.end()); diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_ozone_platform_wayland_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_ozone_platform_wayland_cc index 6fb8a56da..0459bc6f3 100644 --- a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_ozone_platform_wayland_cc +++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_wayland_ozone_platform_wayland_cc @@ -1,8 +1,15 @@ Index: ui/ozone/platform/wayland/ozone_platform_wayland.cc --- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig +++ ui/ozone/platform/wayland/ozone_platform_wayland.cc -@@ -71,7 +71,7 @@ +@@ -66,13 +66,13 @@ + #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/ozone/platform/wayland/host/wayland_cursor_factory.h" + #else + #include "ui/ozone/common/bitmap_cursor_factory.h" #endif -#if BUILDFLAG(IS_LINUX) @@ -10,7 +17,16 @@ Index: ui/ozone/platform/wayland/ozone_platform_wayland.cc #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h" #endif -@@ -255,7 +255,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -246,7 +246,7 @@ class OzonePlatformWayland : public OzonePlatform, + + buffer_manager_connector_ = std::make_unique<WaylandBufferManagerConnector>( + connection_->buffer_manager_host()); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + cursor_factory_ = std::make_unique<WaylandCursorFactory>(connection_.get()); + #else + cursor_factory_ = std::make_unique<BitmapCursorFactory>(); +@@ -256,7 +256,7 @@ class OzonePlatformWayland : public OzonePlatform, supported_buffer_formats_ = connection_->buffer_manager_host()->GetSupportedBufferFormats(); @@ -19,7 +35,7 @@ Index: ui/ozone/platform/wayland/ozone_platform_wayland.cc linux_ui_delegate_ = std::make_unique<LinuxUiDelegateWayland>(connection_.get()); #endif -@@ -480,7 +480,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -489,7 +489,7 @@ class OzonePlatformWayland : public OzonePlatform, DrmRenderNodePathFinder path_finder_; #endif diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_screen_ozone_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_screen_ozone_cc new file mode 100644 index 000000000..24398c405 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_screen_ozone_cc @@ -0,0 +1,12 @@ +Index: ui/ozone/platform/x11/x11_screen_ozone.cc +--- ui/ozone/platform/x11/x11_screen_ozone.cc.orig ++++ ui/ozone/platform/x11/x11_screen_ozone.cc +@@ -235,7 +235,7 @@ base::Value::List X11ScreenOzone::GetGpuExtraInfo( + return result; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void X11ScreenOzone::SetDisplayConfig(const DisplayConfig& display_config) { + display_config_ = &display_config; + // See DesktopScreenLinux, which sets the |device_scale_factor| before |this| diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_screen_ozone_h b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_screen_ozone_h new file mode 100644 index 000000000..6ffc43667 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-ui_ozone_platform_x11_x11_screen_ozone_h @@ -0,0 +1,12 @@ +Index: ui/ozone/platform/x11/x11_screen_ozone.h +--- ui/ozone/platform/x11/x11_screen_ozone.h.orig ++++ ui/ozone/platform/x11/x11_screen_ozone.h +@@ -61,7 +61,7 @@ class X11ScreenOzone : public PlatformScreen, + std::string GetCurrentWorkspace() override; + base::Value::List GetGpuExtraInfo( + const gfx::GpuExtraInfo& gpu_extra_info) override; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void SetDisplayConfig(const DisplayConfig& display_config) override; + #endif + diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_public_ozone_platform_h b/www/ungoogled-chromium/patches/patch-ui_ozone_public_ozone_platform_h index ced10f5c6..1c7243cf2 100644 --- a/www/ungoogled-chromium/patches/patch-ui_ozone_public_ozone_platform_h +++ b/www/ungoogled-chromium/patches/patch-ui_ozone_public_ozone_platform_h @@ -1,7 +1,7 @@ Index: ui/ozone/public/ozone_platform.h --- ui/ozone/public/ozone_platform.h.orig +++ ui/ozone/public/ozone_platform.h -@@ -140,7 +140,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { +@@ -143,7 +143,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { // back via gpu extra info. bool fetch_buffer_formats_for_gmb_on_gpu = false; diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_public_platform_screen_cc b/www/ungoogled-chromium/patches/patch-ui_ozone_public_platform_screen_cc new file mode 100644 index 000000000..916cf5da1 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-ui_ozone_public_platform_screen_cc @@ -0,0 +1,12 @@ +Index: ui/ozone/public/platform_screen.cc +--- ui/ozone/public/platform_screen.cc.orig ++++ ui/ozone/public/platform_screen.cc +@@ -61,7 +61,7 @@ display::TabletState PlatformScreen::GetTabletState() + } + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void PlatformScreen::SetDisplayConfig(const DisplayConfig& display_config) {} + #endif + diff --git a/www/ungoogled-chromium/patches/patch-ui_ozone_public_platform_screen_h b/www/ungoogled-chromium/patches/patch-ui_ozone_public_platform_screen_h new file mode 100644 index 000000000..120e1a8d1 --- /dev/null +++ b/www/ungoogled-chromium/patches/patch-ui_ozone_public_platform_screen_h @@ -0,0 +1,21 @@ +Index: ui/ozone/public/platform_screen.h +--- ui/ozone/public/platform_screen.h.orig ++++ ui/ozone/public/platform_screen.h +@@ -15,7 +15,7 @@ + #include "ui/gfx/gpu_extra_info.h" + #include "ui/gfx/native_widget_types.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -136,7 +136,7 @@ class COMPONENT_EXPORT(OZONE_BASE) PlatformScreen { + virtual base::Value::List GetGpuExtraInfo( + const gfx::GpuExtraInfo& gpu_extra_info); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Sets device scale factor received from external sources such as toolkits. + virtual void SetDisplayConfig(const DisplayConfig& display_config); + #endif diff --git a/www/ungoogled-chromium/patches/patch-ui_views_controls_textfield_textfield_cc b/www/ungoogled-chromium/patches/patch-ui_views_controls_textfield_textfield_cc index e22797c52..34c267203 100644 --- a/www/ungoogled-chromium/patches/patch-ui_views_controls_textfield_textfield_cc +++ b/www/ungoogled-chromium/patches/patch-ui_views_controls_textfield_textfield_cc @@ -19,7 +19,7 @@ Index: ui/views/controls/textfield/textfield.cc return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -737,7 +737,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -741,7 +741,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -28,7 +28,7 @@ Index: ui/views/controls/textfield/textfield.cc auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; if (!handled && linux_ui && -@@ -917,7 +917,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -923,7 +923,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -37,7 +37,7 @@ Index: ui/views/controls/textfield/textfield.cc // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -1914,7 +1914,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1928,7 +1928,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -46,7 +46,7 @@ Index: ui/views/controls/textfield/textfield.cc // 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( -@@ -2427,14 +2427,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2441,14 +2441,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/ungoogled-chromium/patches/patch-ui_views_widget_widget_cc b/www/ungoogled-chromium/patches/patch-ui_views_widget_widget_cc index 238d10a11..8da695bb6 100644 --- a/www/ungoogled-chromium/patches/patch-ui_views_widget_widget_cc +++ b/www/ungoogled-chromium/patches/patch-ui_views_widget_widget_cc @@ -10,7 +10,7 @@ Index: ui/views/widget/widget.cc #include "ui/linux/linux_ui.h" #endif -@@ -2036,7 +2036,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2026,7 +2026,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/ungoogled-chromium/patches/patch-ui_views_window_dialog_delegate_cc b/www/ungoogled-chromium/patches/patch-ui_views_window_dialog_delegate_cc index 213c53c7c..d94227b6a 100644 --- a/www/ungoogled-chromium/patches/patch-ui_views_window_dialog_delegate_cc +++ b/www/ungoogled-chromium/patches/patch-ui_views_window_dialog_delegate_cc @@ -1,7 +1,7 @@ Index: ui/views/window/dialog_delegate.cc --- ui/views/window/dialog_delegate.cc.orig +++ ui/views/window/dialog_delegate.cc -@@ -72,7 +72,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -83,7 +83,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/ungoogled-chromium/patches/patch-v8_BUILD_gn b/www/ungoogled-chromium/patches/patch-v8_BUILD_gn index 7fb9bb2bb..bed988da8 100644 --- a/www/ungoogled-chromium/patches/patch-v8_BUILD_gn +++ b/www/ungoogled-chromium/patches/patch-v8_BUILD_gn @@ -1,7 +1,7 @@ Index: v8/BUILD.gn --- v8/BUILD.gn.orig +++ v8/BUILD.gn -@@ -1369,6 +1369,14 @@ config("toolchain") { +@@ -1404,6 +1404,14 @@ config("toolchain") { } else if (target_os == "chromeos") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -16,9 +16,9 @@ Index: v8/BUILD.gn } # TODO(infra): Support v8_enable_prof on Windows. -@@ -2295,6 +2303,11 @@ template("run_mksnapshot") { - # list of builtins with incompatible profiles. - "--abort-on-bad-builtin-profile-data", +@@ -2331,6 +2339,11 @@ template("run_mksnapshot") { + "--turbo-log-builtins-count-input", + v8_log_builtins_block_count_input, ] + if (v8_current_cpu == "x86") { + args -= [ @@ -27,8 +27,21 @@ Index: v8/BUILD.gn + } } + if (v8_enable_builtins_profiling) { +@@ -2353,6 +2366,12 @@ template("run_mksnapshot") { + if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { + args += [ "--reorder-builtins" ] + } ++ ++ if (v8_current_cpu == "x86") { ++ args -= [ ++ "--abort-on-bad-builtin-profile-data", ++ ] ++ } + } + # This is needed to distinguish between generating code for the simulator -@@ -5920,7 +5933,7 @@ v8_component("v8_libbase") { +@@ -6081,7 +6100,7 @@ v8_component("v8_libbase") { } } @@ -37,7 +50,7 @@ Index: v8/BUILD.gn sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5931,6 +5944,18 @@ v8_component("v8_libbase") { +@@ -6092,6 +6111,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/ungoogled-chromium/patches/patch-v8_src_api_api_cc b/www/ungoogled-chromium/patches/patch-v8_src_api_api_cc index f152debac..aea7ca428 100644 --- a/www/ungoogled-chromium/patches/patch-v8_src_api_api_cc +++ b/www/ungoogled-chromium/patches/patch-v8_src_api_api_cc @@ -1,7 +1,7 @@ Index: v8/src/api/api.cc --- v8/src/api/api.cc.orig +++ v8/src/api/api.cc -@@ -143,7 +143,7 @@ +@@ -141,7 +141,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY @@ -10,7 +10,7 @@ Index: v8/src/api/api.cc #include <signal.h> #include <unistd.h> -@@ -6471,7 +6471,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6336,7 +6336,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/ungoogled-chromium/patches/patch-v8_src_base_atomicops_h b/www/ungoogled-chromium/patches/patch-v8_src_base_atomicops_h index edce59818..4339bb1d3 100644 --- a/www/ungoogled-chromium/patches/patch-v8_src_base_atomicops_h +++ b/www/ungoogled-chromium/patches/patch-v8_src_base_atomicops_h @@ -14,7 +14,7 @@ Index: v8/src/base/atomicops.h using Atomic64 = int64_t; #else using Atomic64 = intptr_t; -@@ -258,7 +258,7 @@ inline Atomic32 SeqCst_Load(volatile const Atomic32* p +@@ -266,7 +266,7 @@ inline Atomic32 SeqCst_Load(volatile const Atomic32* p std::memory_order_seq_cst); } diff --git a/www/ungoogled-chromium/patches/patch-v8_src_base_platform_platform-posix_cc b/www/ungoogled-chromium/patches/patch-v8_src_base_platform_platform-posix_cc index 29cc6fb77..6e1fb4d1f 100644 --- a/www/ungoogled-chromium/patches/patch-v8_src_base_platform_platform-posix_cc +++ b/www/ungoogled-chromium/patches/patch-v8_src_base_platform_platform-posix_cc @@ -19,7 +19,7 @@ Index: v8/src/base/platform/platform-posix.cc #define MAP_ANONYMOUS MAP_ANON #endif -@@ -299,8 +299,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -305,8 +305,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } @@ -35,7 +35,7 @@ Index: v8/src/base/platform/platform-posix.cc uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -395,6 +402,7 @@ void* OS::GetRandomMmapAddr() { +@@ -401,6 +408,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast<void*>(raw_addr); } @@ -43,7 +43,7 @@ Index: v8/src/base/platform/platform-posix.cc // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -668,7 +676,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor +@@ -674,7 +682,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor // static bool OS::HasLazyCommits() { @@ -52,7 +52,7 @@ Index: v8/src/base/platform/platform-posix.cc return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1247,7 +1255,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1281,7 +1289,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/ungoogled-chromium/patches/patch-v8_src_builtins_x64_builtins-x64_cc b/www/ungoogled-chromium/patches/patch-v8_src_builtins_x64_builtins-x64_cc index ad8c2d251..da812bd46 100644 --- a/www/ungoogled-chromium/patches/patch-v8_src_builtins_x64_builtins-x64_cc +++ b/www/ungoogled-chromium/patches/patch-v8_src_builtins_x64_builtins-x64_cc @@ -10,7 +10,7 @@ Index: v8/src/builtins/x64/builtins-x64.cc __ LoadAddress(kJavaScriptCallExtraArg1Register, ExternalReference::Create(address)); __ Jump(BUILTIN_CODE(masm->isolate(), AdaptorWithBuiltinExitFrame), -@@ -458,7 +460,7 @@ void Generate_JSEntryVariant(MacroAssembler* masm, Sta +@@ -430,7 +432,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); @@ -19,7 +19,7 @@ Index: v8/src/builtins/x64/builtins-x64.cc // Store the current pc as the handler offset. It's used later to create the // handler table. -@@ -3828,6 +3830,8 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm +@@ -4015,6 +4017,8 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm RestoreParentSuspender(masm, rbx, rcx); } __ bind(&suspend); @@ -28,7 +28,7 @@ Index: v8/src/builtins/x64/builtins-x64.cc // 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. -@@ -4094,6 +4098,9 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm +@@ -4281,6 +4285,9 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm // thrown exception. if (stack_switch) { int catch_handler = __ pc_offset(); @@ -38,7 +38,7 @@ Index: v8/src/builtins/x64/builtins-x64.cc // Restore rsp to free the reserved stack slots for the sections. __ leaq(rsp, MemOperand(rbp, kLastSpillOffset)); -@@ -4361,6 +4368,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma +@@ -4567,6 +4574,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma LoadJumpBuffer(masm, jmpbuf, true); __ Trap(); __ bind(&resume); @@ -46,7 +46,7 @@ Index: v8/src/builtins/x64/builtins-x64.cc __ LeaveFrame(StackFrame::STACK_SWITCH); __ ret(0); } -@@ -4508,6 +4516,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w +@@ -4711,6 +4719,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w } __ Trap(); __ bind(&suspend); diff --git a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_cc b/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_cc index bf32a0d52..f668c08df 100644 --- a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_cc +++ b/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_cc @@ -1,7 +1,7 @@ Index: v8/src/codegen/x64/assembler-x64.cc --- v8/src/codegen/x64/assembler-x64.cc.orig +++ v8/src/codegen/x64/assembler-x64.cc -@@ -1313,6 +1313,14 @@ void Assembler::hlt() { +@@ -1316,6 +1316,14 @@ void Assembler::hlt() { emit(0xF4); } @@ -16,7 +16,7 @@ Index: v8/src/codegen/x64/assembler-x64.cc void Assembler::emit_idiv(Register src, int size) { EnsureSpace ensure_space(this); emit_rex(src, size); -@@ -1580,16 +1588,22 @@ void Assembler::jmp(Handle<Code> target, RelocInfo::Mo +@@ -1583,16 +1591,22 @@ void Assembler::jmp(Handle<Code> target, RelocInfo::Mo emitl(code_target_index); } diff --git a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_h b/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_h index 2f9c5a0b4..ffbf4ead5 100644 --- a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_h +++ b/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_assembler-x64_h @@ -1,7 +1,7 @@ Index: v8/src/codegen/x64/assembler-x64.h --- v8/src/codegen/x64/assembler-x64.h.orig +++ v8/src/codegen/x64/assembler-x64.h -@@ -856,6 +856,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa +@@ -860,6 +860,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa void ret(int imm16); void ud2(); void setcc(Condition cc, Register reg); @@ -9,7 +9,7 @@ Index: v8/src/codegen/x64/assembler-x64.h 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 +@@ -917,8 +918,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa void jmp(Handle<Code> target, RelocInfo::Mode rmode); // Jump near absolute indirect (r64) diff --git a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_cc b/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_cc index b58dc0f83..e357d434f 100644 --- a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_cc +++ b/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_cc @@ -1,7 +1,7 @@ Index: v8/src/codegen/x64/macro-assembler-x64.cc --- v8/src/codegen/x64/macro-assembler-x64.cc.orig +++ v8/src/codegen/x64/macro-assembler-x64.cc -@@ -50,6 +50,8 @@ Operand StackArgumentsAccessor::GetArgumentOperand(int +@@ -51,6 +51,8 @@ Operand StackArgumentsAccessor::GetArgumentOperand(int return Operand(rsp, kPCOnStackSize + index * kSystemPointerSize); } @@ -10,7 +10,7 @@ Index: v8/src/codegen/x64/macro-assembler-x64.cc void MacroAssembler::Load(Register destination, ExternalReference source) { if (root_array_available_ && options().enable_root_relative_access) { intptr_t delta = RootRegisterOffsetForExternalReference(isolate(), source); -@@ -1947,7 +1949,7 @@ void MacroAssembler::Switch(Register scratch, Register +@@ -2046,7 +2048,7 @@ void MacroAssembler::Switch(Register scratch, Register cmpq(reg, Immediate(num_labels)); j(above_equal, &fallthrough); leaq(table, MemOperand(&jump_table)); diff --git a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_h b/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_h index 3542cde1d..e77c96cdb 100644 --- a/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_h +++ b/www/ungoogled-chromium/patches/patch-v8_src_codegen_x64_macro-assembler-x64_h @@ -1,7 +1,7 @@ Index: v8/src/codegen/x64/macro-assembler-x64.h --- v8/src/codegen/x64/macro-assembler-x64.h.orig +++ v8/src/codegen/x64/macro-assembler-x64.h -@@ -625,11 +625,14 @@ class V8_EXPORT_PRIVATE MacroAssembler +@@ -642,11 +642,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. diff --git a/www/ungoogled-chromium/patches/patch-v8_src_compiler_backend_x64_code-generator-x64_cc b/www/ungoogled-chromium/patches/patch-v8_src_compiler_backend_x64_code-generator-x64_cc index 70122f7f7..fd6b5e8f2 100644 --- a/www/ungoogled-chromium/patches/patch-v8_src_compiler_backend_x64_code-generator-x64_cc +++ b/www/ungoogled-chromium/patches/patch-v8_src_compiler_backend_x64_code-generator-x64_cc @@ -1,12 +1,17 @@ Index: v8/src/compiler/backend/x64/code-generator-x64.cc --- v8/src/compiler/backend/x64/code-generator-x64.cc.orig +++ v8/src/compiler/backend/x64/code-generator-x64.cc -@@ -6594,7 +6594,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); +@@ -6795,11 +6795,11 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio + // target = table + (target - table) + __ addq(input, kScratchRegister); + // Jump to the target. +- __ jmp(input); ++ __ jmp(input, /*notrack=*/true); + } else { + // For non builtins, the value in the table is 'target_address' (8 bytes) + // jmp [table + index*8] +- __ 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/ungoogled-chromium/patches/patch-v8_src_execution_isolate_cc b/www/ungoogled-chromium/patches/patch-v8_src_execution_isolate_cc index 48ef49e1c..e2ee51929 100644 --- a/www/ungoogled-chromium/patches/patch-v8_src_execution_isolate_cc +++ b/www/ungoogled-chromium/patches/patch-v8_src_execution_isolate_cc @@ -12,7 +12,7 @@ Index: v8/src/execution/isolate.cc 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_[]; -@@ -3932,6 +3936,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -4021,6 +4025,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); diff --git a/www/ungoogled-chromium/patches/patch-v8_src_flags_flags_cc b/www/ungoogled-chromium/patches/patch-v8_src_flags_flags_cc index 6cdb6badc..69093f49f 100644 --- a/www/ungoogled-chromium/patches/patch-v8_src_flags_flags_cc +++ b/www/ungoogled-chromium/patches/patch-v8_src_flags_flags_cc @@ -24,7 +24,7 @@ Index: v8/src/flags/flags.cc // {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() { +@@ -824,6 +832,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)); diff --git a/www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64-inl_h b/www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64-inl_h index e8da0825a..9d0d8f27d 100644 --- a/www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64-inl_h +++ b/www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64-inl_h @@ -1,7 +1,7 @@ Index: v8/src/maglev/x64/maglev-assembler-x64-inl.h --- v8/src/maglev/x64/maglev-assembler-x64-inl.h.orig +++ v8/src/maglev/x64/maglev-assembler-x64-inl.h -@@ -226,7 +226,10 @@ void MaglevAssembler::PushReverse(T... vals) { +@@ -229,7 +229,10 @@ void MaglevAssembler::PushReverse(T... vals) { detail::PushAllHelper<T...>::PushReverse(this, vals...); } diff --git a/www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64_cc b/www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64_cc index c0c88b758..b06d6720b 100644 --- a/www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64_cc +++ b/www/ungoogled-chromium/patches/patch-v8_src_maglev_x64_maglev-assembler-x64_cc @@ -1,17 +1,14 @@ Index: v8/src/maglev/x64/maglev-assembler-x64.cc --- v8/src/maglev/x64/maglev-assembler-x64.cc.orig +++ v8/src/maglev/x64/maglev-assembler-x64.cc -@@ -553,13 +553,15 @@ void MaglevAssembler::TryChangeFloat64ToIndex(Register - } - +@@ -433,10 +433,12 @@ void MaglevAssembler::OSRPrologue(Graph* graph) { void MaglevAssembler::Prologue(Graph* graph) { + DCHECK(!graph->is_osr()); + + CodeEntry(); + - if (!graph->is_osr()) { - BailoutIfDeoptimized(rbx); - } + BailoutIfDeoptimized(rbx); - CHECK_IMPLIES(graph->is_osr(), !graph->has_recursive_calls()); if (graph->has_recursive_calls()) { - bind(code_gen_state()->entry_label()); + BindJumpTarget(code_gen_state()->entry_label()); diff --git a/www/ungoogled-chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32_h b/www/ungoogled-chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32_h index f5a7a30be..3a918cef0 100644 --- a/www/ungoogled-chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32_h +++ b/www/ungoogled-chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32_h @@ -1,7 +1,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h --- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h -@@ -419,7 +419,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -491,7 +491,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst } void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr, @@ -10,7 +10,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h LoadType type, uint32_t* protected_load_pc, bool /* is_load_mem */, bool /* i64_offset */, bool needs_shift) { -@@ -499,7 +499,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -571,7 +571,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis } void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, @@ -19,7 +19,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h StoreType type, LiftoffRegList pinned, uint32_t* protected_store_pc, bool /* is_store_mem */, bool /* i64_offset */) { -@@ -579,7 +579,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -651,7 +651,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist } void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, @@ -28,7 +28,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h LoadType type, LiftoffRegList /* pinned */, bool /* i64_offset */) { if (type.value() != LoadType::kI64Load) { -@@ -599,7 +599,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -671,7 +671,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -37,7 +37,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h StoreType type, LiftoffRegList pinned, bool /* i64_offset */) { DCHECK_NE(offset_reg, no_reg); -@@ -669,7 +669,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; +@@ -741,7 +741,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop, Register dst_addr, Register offset_reg, @@ -46,7 +46,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -736,7 +736,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble +@@ -808,7 +808,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble } inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -55,7 +55,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -848,7 +848,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino +@@ -920,7 +920,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino } inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -64,7 +64,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h LiftoffRegister value, LiftoffRegister result) { // We need {ebx} here, which is the root register. As the root register it // needs special treatment. As we use {ebx} directly in the code below, we -@@ -940,7 +940,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -1012,7 +1012,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, @@ -73,7 +73,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -954,7 +954,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -1026,7 +1026,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re } void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, @@ -82,7 +82,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -967,7 +967,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -1039,7 +1039,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re } void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, @@ -91,7 +91,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -981,7 +981,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -1053,7 +1053,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re } void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, @@ -100,7 +100,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -995,7 +995,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -1067,7 +1067,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg } void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, @@ -109,7 +109,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1009,7 +1009,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1081,7 +1081,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re } void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, @@ -118,7 +118,7 @@ Index: v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h LiftoffRegister value, LiftoffRegister result, StoreType type, bool /* i64_offset */) { -@@ -1024,7 +1024,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1096,7 +1096,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( diff --git a/www/ungoogled-chromium/patches/patch-weblayer_browser_browser_main_parts_impl_cc b/www/ungoogled-chromium/patches/patch-weblayer_browser_browser_main_parts_impl_cc index cc795152e..68ebf9c9e 100644 --- a/www/ungoogled-chromium/patches/patch-weblayer_browser_browser_main_parts_impl_cc +++ b/www/ungoogled-chromium/patches/patch-weblayer_browser_browser_main_parts_impl_cc @@ -1,7 +1,7 @@ Index: weblayer/browser/browser_main_parts_impl.cc --- weblayer/browser/browser_main_parts_impl.cc.orig +++ weblayer/browser/browser_main_parts_impl.cc -@@ -81,7 +81,7 @@ +@@ -82,7 +82,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -10,7 +10,7 @@ Index: weblayer/browser/browser_main_parts_impl.cc #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -200,7 +200,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { +@@ -201,7 +201,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_cc b/www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_cc index 87c6dc573..984ea4fe4 100644 --- a/www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_cc +++ b/www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_cc @@ -10,7 +10,7 @@ Index: weblayer/browser/content_browser_client_impl.cc #include "content/public/common/content_descriptors.h" #endif -@@ -1022,7 +1022,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -1025,7 +1025,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_h b/www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_h index 9f243a7c2..5230f31e3 100644 --- a/www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_h +++ b/www/ungoogled-chromium/patches/patch-weblayer_browser_content_browser_client_impl_h @@ -1,7 +1,7 @@ Index: weblayer/browser/content_browser_client_impl.h --- weblayer/browser/content_browser_client_impl.h.orig +++ weblayer/browser/content_browser_client_impl.h -@@ -183,7 +183,7 @@ class ContentBrowserClientImpl : public content::Conte +@@ -184,7 +184,7 @@ class ContentBrowserClientImpl : public content::Conte // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/zola/Makefile b/www/zola/Makefile index d92d94a7d..44e51099e 100644 --- a/www/zola/Makefile +++ b/www/zola/Makefile @@ -5,8 +5,7 @@ COMMENT = static site generator GH_ACCOUNT = getzola GH_PROJECT = zola -GH_TAGNAME = v0.16.1 -REVISION = 6 +GH_TAGNAME = v0.17.2 HOMEPAGE = https://www.getzola.org @@ -17,12 +16,11 @@ MAINTAINER = Peter H. Ezetta <protocall7@gmail.com> # MIT PERMIT_PACKAGE = Yes -WANTLIB += c c++abi m pthread sass onig +WANTLIB += c c++abi m pthread onig BUILD_DEPENDS += security/rust-ring -LIB_DEPENDS += www/libsass \ - textproc/oniguruma +LIB_DEPENDS += textproc/oniguruma MODULES = devel/cargo diff --git a/www/zola/distinfo b/www/zola/distinfo index 0d8a2b8f0..27086359a 100644 --- a/www/zola/distinfo +++ b/www/zola/distinfo @@ -1,70 +1,82 @@ SHA256 (cargo/adler-1.0.2.tar.gz) = 8mIBYEyHseAb09mPjV2aj8u4FejO20H/zL60v1k6Nf4= -SHA256 (cargo/adler32-1.2.0.tar.gz) = quEnfTmu7BXLOIJm7MJLEcgEad6uYGfhehp6qeXB8jQ= -SHA256 (cargo/ahash-0.8.0.tar.gz) = V+bpUc+7LbjeGCjUkHOhE6Kf1xF7FZbKp4GiWMfjjXI= -SHA256 (cargo/aho-corasick-0.7.18.tar.gz) = HjfP1edletpF90LW6ZyleIWAtcUp3Hj68R7ObccCZW8= -SHA256 (cargo/ammonia-3.2.0.tar.gz) = 1e0lCe6IzAI8zO43pvqzWCaDD+i3SLOGl5DncgwsSnQ= -SHA256 (cargo/android_system_properties-0.1.4.tar.gz) = 1+1y4WNeEhyj55QgVAKCryLaWL5Q3hU9Nvgd3GuDqp4= +SHA256 (cargo/ahash-0.7.6.tar.gz) = /LUaBpXY+Dix7gCbP79mvaB4zWRZAgKoZKjz6MQxXEc= +SHA256 (cargo/ahash-0.8.3.tar.gz) = LJn2TR4GSI9iD5Mmd+JLxuKJdYKYBEGukKZxQVvX7C8= +SHA256 (cargo/aho-corasick-0.7.20.tar.gz) = zJNkGflvohHBuRZoh7OOXkCxmVjluJW+fB+Trexwcaw= +SHA256 (cargo/ammonia-3.3.0.tar.gz) = ZObRx4ONtwXJt1ZVfuJ8OEzmlaHFGm/lKHhMscaEAXA= +SHA256 (cargo/android_system_properties-0.1.5.tar.gz) = gZ5yGdvUEEOsJ5sZgw8u/IlxVkkNf9bqkWcgEX7mYxE= SHA256 (cargo/any_ascii-0.1.7.tar.gz) = cAM3d+uLUSSoGhiJQWVD3d7y3iQAGbZ0yBKFomNafh4= -SHA256 (cargo/anyhow-1.0.61.tar.gz) = UIs1K7XAZqrCUfba9rNuzNA+iojoCBzUSVnqJ3o6+ag= -SHA256 (cargo/arrayvec-0.4.12.tar.gz) = zZ/UTvr6hpA1i3QI0lOt8RADa4j1VnKpM/AdYWrZsbk= +SHA256 (cargo/anyhow-1.0.69.tar.gz) = Ikr71yfD1uS5AQPs5kuNG2f7sZc7EEbCKB7tPzgD+AA= SHA256 (cargo/arrayvec-0.5.2.tar.gz) = I7Yvxl3o5Of1JTT7UrDz7QR0auJnUZ7vKoOUHoCFBos= +SHA256 (cargo/arrayvec-0.7.2.tar.gz) = jaUtZscHHi4/oqHlxtCI/sR7WTAyslT16YDejqVEVNY= SHA256 (cargo/assert-json-diff-2.0.2.tar.gz) = R+TyuBgy5yg011GNhIegOWoozECBhqLohUwPmAEfrxI= SHA256 (cargo/atty-0.2.14.tar.gz) = 2bOb4Ydw0RQhzbG5lHpF3T836TCSy/N3YUgooxnV/ug= SHA256 (cargo/autocfg-1.1.0.tar.gz) = 1GiAK6sXy8DMV16bBT9B5yqja/prf1XjUp/6QxYbl/o= -SHA256 (cargo/base64-0.13.0.tar.gz) = kE3+rFDzzauij8b1f9zdt19J7WE0ZnanjE/+VYd4Av0= +SHA256 (cargo/base64-0.21.0.tar.gz) = pKTdqlGlvFKmlI90wG0gqq3bcZJOq3m4yXqMVW6ULWo= SHA256 (cargo/bincode-1.3.3.tar.gz) = sfRelBfYcifHpW0i5HHGIGRiy6UUx1kMCa/0z20d3K0= -SHA256 (cargo/bit_field-0.10.1.tar.gz) = 3LbdHCN20uCWeW4jSnDhfpTMLV1U/4zkKyjO8dDTWaQ= +SHA256 (cargo/bit_field-0.10.2.tar.gz) = 3IJxhpY+WSNghD+1ukuXPhRYQSZsE1f3GAxDUm8uW2E= SHA256 (cargo/bitflags-1.3.2.tar.gz) = vvONRRY8Lx3eCUp9/TPM9ZXJKQXI+PT9wY0G+xA3cYo= -SHA256 (cargo/bitvec-0.19.6.tar.gz) = Vfk9DvM2PDZNWXZkajjwTPZ8/h1MjRYM3qAsqywRazM= -SHA256 (cargo/block-buffer-0.10.2.tar.gz) = C/f+UYSepWn9RS83gi9galyrtoTckYcHoBk/1GZP8yQ= +SHA256 (cargo/block-buffer-0.10.4.tar.gz) = MHjHYpti0/BDlRf6OUmWrKzFy8kcWiDYxljner1QOnE= SHA256 (cargo/block-buffer-0.7.3.tar.gz) = wJQNxEHzFokmnhCscOsQAqOh060TkOAwBDZi63/kaIs= SHA256 (cargo/block-padding-0.1.5.tar.gz) = +nne27CR9Enx855T7fiNXb6V+JXa5hNajXuIH7Wvc/U= -SHA256 (cargo/bstr-0.2.17.tar.gz) = ujVp84Po8VmESfGkI+cumVaRN7R3QLHaEe8Zrz1cMiM= +SHA256 (cargo/bstr-1.3.0.tar.gz) = X/2znLcDIS88EZc0UsKGG5cvdXsCEVjzUWuhDy+ossE= SHA256 (cargo/build_const-0.2.2.tar.gz) = tK5CNebawGlGN8djAp7OoaLsnk4G7CcpvSG6TZyGPrc= -SHA256 (cargo/bumpalo-3.10.0.tar.gz) = N8y9IUYUxngzhsGvMMrwMZLxeJEFnOzDlLT7EZ42PeM= +SHA256 (cargo/bumpalo-3.12.0.tar.gz) = DSYeJWhUkTkH9n7QbvvDM43+YXl5be78H/dj/BruVTU= SHA256 (cargo/byte-tools-0.3.1.tar.gz) = 47XKegSJitS81ByQxShURf9beRiZuxsKvdKiqnkSEdc= SHA256 (cargo/bytecount-0.3.2.tar.gz) = +GHZzjWfVtvLbgwqHLhOUq1zLK21e4Bq3rPHZoysy9g= SHA256 (cargo/bytecount-0.6.3.tar.gz) = LGdqR49j6fot1TaKQvKLug1sVgt3XzhYPIu6p/zWfJw= -SHA256 (cargo/bytemuck-1.11.0.tar.gz) = pTd8iGXnShYNIfKcLUBmn1MobbbqtZuIVAy7Ev/IuDU= +SHA256 (cargo/bytemuck-1.13.1.tar.gz) = F/685oT9FdiQJxBWYf7JSvtHXLmV+8WdKGUZhEa6Luo= SHA256 (cargo/byteorder-1.4.3.tar.gz) = FMGJxT0JiUVJnN+n7MY1Z884hrMzKzEqW0WF2NOmphA= SHA256 (cargo/bytes-0.4.12.tar.gz) = IG/f/Pot98vhVgHvRsgT/OCWXrMobba1bFg7gUtRyBw= -SHA256 (cargo/bytes-1.2.1.tar.gz) = 7Ip7anD96ANyFUxlcC8AoPVvPhw2q7xsRASEviSIVts= -SHA256 (cargo/cc-1.0.73.tar.gz) = L/8qaSezu4f5WV1nGWpwST9idoenHYeg1pIkLDP1jBE= -SHA256 (cargo/cedarwood-0.4.5.tar.gz) = +jEkmPn0FFKZjZhNPeuEyE+GrriiSZ11BbuBBteNFH0= +SHA256 (cargo/bytes-1.4.0.tar.gz) = ibL9Kg3PONeXHiGUtrbuurRa4BBnRWp/2T1VR6YbcL4= +SHA256 (cargo/camino-1.1.4.tar.gz) = xTDt8Y83BorC2XdAntXNUNU9c7xlPHZHtI63iXasmuI= +SHA256 (cargo/cargo-platform-0.1.2.tar.gz) = y9uCXail3weaQ2dtvgQnAvFwexEJ9xOgFCD7tMxx+ic= +SHA256 (cargo/cargo_metadata-0.14.2.tar.gz) = SsuwnZ7o4jaZuWNDdccnldCVvyaEOdqIViz5tQHxgfo= +SHA256 (cargo/cc-1.0.79.tar.gz) = UNMJBihhIdlb49R5UztFj4dJOzCktfeaYH249dEaqR8= +SHA256 (cargo/cedarwood-0.4.6.tar.gz) = bZEL7dYsJHMyY9C+0kdGCFPJ0i6JVr1M2WQwIJXgTpA= SHA256 (cargo/cfg-if-0.1.10.tar.gz) = R4W90clrKoRrK9fMAuhraz2/FOflNEbE9UySo2EECCI= SHA256 (cargo/cfg-if-1.0.0.tar.gz) = uvHeQzl2FYi8Bhnjy8ASDuWC67dLU7Tvv3kRe9LaQP0= -SHA256 (cargo/chrono-0.4.22.tar.gz) = v9TRsx+qo6ideTTb3tMRHaDS7yjj68zbTwF59ZKdHvE= -SHA256 (cargo/chrono-tz-0.6.3.tar.gz) = KcOSAxgZkafdQ0O4AFvYBOepo3r7isBw5Ddx6Mggu94= -SHA256 (cargo/chrono-tz-build-0.0.3.tar.gz) = b1CcOoezNDewXiRYdQoHAOW91pVhdnc+bH1t0VooOgw= -SHA256 (cargo/clap-3.2.17.tar.gz) = Keckpo2TGTQ7szKMnMLf3iY/SzFC7hBZqZgFgBcclUs= -SHA256 (cargo/clap_complete-3.2.4.tar.gz) = 5Bedpxq9VsJrVN0MJIzAgcH0OwoafoRI4o5XopuqmT0= -SHA256 (cargo/clap_derive-3.2.17.tar.gz) = E1R/cBLAGrSg6PiWdzCtqPn99BnotseSeI85z05G7vo= +SHA256 (cargo/chrono-0.4.24.tar.gz) = TjxZGQZq3yLfc3YuUM/83jp1jyqEixE7WG0fhnKLZzs= +SHA256 (cargo/chrono-tz-0.6.1.tar.gz) = WFSfGELaMIDOYwAhAtW8lUx7yEPU9HgY5kKr3DYlNVI= +SHA256 (cargo/chrono-tz-build-0.0.2.tar.gz) = 2wWNST+y9l9Bhhv+1+P+YzUmSp8PknEMq1vfAf7wkGk= +SHA256 (cargo/clap-3.2.23.tar.gz) = cWVcRcuYRdMnDJ1t+E6+crTa08K6P3AjrUfBROTkc6U= +SHA256 (cargo/clap-4.1.8.tar.gz) = w9euFLILlMsCFJ7SGobEI4WcvhjcftaYRcrOUOUrQKU= +SHA256 (cargo/clap_complete-4.1.4.tar.gz) = UB/wpAFHPqHUw7El/5VQa2LFvFdo2BhjQZX7t8StX/Q= +SHA256 (cargo/clap_derive-3.2.18.tar.gz) = 6gyLzlKMS+TaE+pv6tiWXpW2BzWFovBSBL2PQRn4KmU= +SHA256 (cargo/clap_derive-4.1.8.tar.gz) = RL7I5cnQnkOcQzWxrwq6q1bc87lJmak24btHuRNCiPA= SHA256 (cargo/clap_lex-0.2.4.tar.gz) = KFDy9agsv0N91a9NSYSPvfwnwVfD0BA0V3b5UnZSYcU= +SHA256 (cargo/clap_lex-0.3.2.tar.gz) = NQuc8xcx+ZVzmSKemyrcUe6r376dcdmgVSJ1/RJxDQk= +SHA256 (cargo/codemap-0.1.3.tar.gz) = uedptcjIKDmCqYfG6UjlQCVPEFjVp0uHlJFNTvX8KiQ= +SHA256 (cargo/codespan-reporting-0.11.1.tar.gz) = NTgnDTPMZpZQxLCThIRQ04De8QwzHTjHaONMrIBXbm4= SHA256 (cargo/color_quant-1.1.0.tar.gz) = PXuJT1QRc3t4Z/SCeVWSTXwlT8n02RpqrWsJeASxAYs= SHA256 (cargo/colored-2.0.0.tar.gz) = s2FvdQuE2PDeili9qT4I4qga0/UjCJsF8d/+yrSMbL0= -SHA256 (cargo/console-0.15.1.tar.gz) = ieq00gziDOoYIwi8oTCI/s6pwF9nds8ocgXUGg7TyEc= +SHA256 (cargo/console-0.15.5.tar.gz) = w9efvolwp34+NBUcwT07PiSKoPquy59gkfoH6+/lrWA= SHA256 (cargo/convert_case-0.4.0.tar.gz) = YkXVmj6Cp/whfFgopmktvG37Y6DIyQSVYh97nXlwSg4= SHA256 (cargo/core-foundation-0.9.3.tar.gz) = GUp6nm3lP6VRFpNAZ8hE2ddJMS91xvbQmA6MJS+MIUY= SHA256 (cargo/core-foundation-sys-0.8.3.tar.gz) = WCfOv0ZwRouHct0ZGFZ2iu3LGwJ4oE+Yn3dmNRkXudw= -SHA256 (cargo/cpufeatures-0.2.2.tar.gz) = WaYAFmerEkrrripJURjhHTCYTDplPpnYbViXFwjPXks= +SHA256 (cargo/cpufeatures-0.2.5.tar.gz) = KNmXvV4kpZKN1D5G3FKYZ+IHkH/gsjnDR32ST38soyA= SHA256 (cargo/crc-1.8.1.tar.gz) = 1mNUjef1zKND8eCkjRTc+w6etOB57FiIO3JRU5+hCus= SHA256 (cargo/crc32fast-1.3.2.tar.gz) = tUC9i8gQ04hcbqkeIBgwL2i6uiEpqz6I8yOJ7pNwiA0= -SHA256 (cargo/crossbeam-channel-0.5.6.tar.gz) = wt0E3a+II33DuNj5o8EAS1BrVLMxNAOUQFTSPAhwxSE= -SHA256 (cargo/crossbeam-deque-0.8.2.tar.gz) = cV6BUraSu6LTdLU9SHVEU2j98hqUdRQQr2B6WsZ30fw= -SHA256 (cargo/crossbeam-epoch-0.9.10.tar.gz) = BF6+J2ZkcbtUk3C0sLPlGwf1YyW++kKE22X8icAlEbE= -SHA256 (cargo/crossbeam-utils-0.8.11.tar.gz) = UYh9Stx7VkU3sVrc+zB5NvgHXfzV8A3emp8dKTg2grw= +SHA256 (cargo/crossbeam-channel-0.5.7.tar.gz) = zys+hHh5dEZRTJHvBLr8tZ+roYPmIa1IjfiJg8wUEow= +SHA256 (cargo/crossbeam-deque-0.8.3.tar.gz) = zm/W+FUkMCLc7PhwL+8MKX1DOOImhF/gZ/Y0Gtn6DO8= +SHA256 (cargo/crossbeam-epoch-0.9.14.tar.gz) = Rr1fP4UnMpWp0Urt+4b2qtv/bY9SlcSp7bCOgZ3PVpU= +SHA256 (cargo/crossbeam-utils-0.8.15.tar.gz) = PAY82MyV9cN37Q1LSaSyH2Mjlv9pDoRwwpszWbNGmEs= +SHA256 (cargo/crunchy-0.2.2.tar.gz) = eoHa4HjOqVoBSjOSkc7EOdLyMuvoVKnWcreWxq+vqbc= SHA256 (cargo/crypto-common-0.1.6.tar.gz) = G/sSUC8/xGzKG7Uawo351hjYE83D0vJbn+d1o0rya7M= -SHA256 (cargo/css-minify-0.2.2.tar.gz) = aSsYXjt8mvlrMZXzAh9TqTHYlpaO0q0/sc22VYswyas= -SHA256 (cargo/csv-1.1.6.tar.gz) = IoE6bcRbM1+breEL9ycdxHfoERPonrJRoLwqioHFNuE= +SHA256 (cargo/css-minify-0.3.1.tar.gz) = h0xuLRn41KKFCDsRoyQb++Aaw+2F8m4eazSIjZYFUr0= +SHA256 (cargo/csv-1.2.1.tar.gz) = CwFUlwebmp1pwCrSXebApu3vBR6mNgoyfQvQWALvZK0= SHA256 (cargo/csv-core-0.1.10.tar.gz) = KyRmVZ8mD0itJf5jF7PI2sd7W9tXY6x9nWEDUwZjvJA= -SHA256 (cargo/ctrlc-3.2.2.tar.gz) = s3/qqE5oYeAKH15aqNo+5W1gXJmS0z4IJ4Z1SCjiCGU= -SHA256 (cargo/deflate-1.0.0.tar.gz) = yG9+JfUY9LgYCKLPHFCZamH1wus5SyOTvYfypHgKQy8= +SHA256 (cargo/ctrlc-3.2.5.tar.gz) = u88zwqYYy+Qe5Drm6fLkg2jNn52yiW8QFn2NdiZ59jk= +SHA256 (cargo/cxx-1.0.92.tar.gz) = mhQPJg5vP3kBO4v8ZefOYwyatDiMaonHHgcib0lIe3I= +SHA256 (cargo/cxx-build-1.0.92.tar.gz) = 2mOD9Fk0HqaJN0vwpCl5c53EIYdPES/yb4KbgEC45hM= +SHA256 (cargo/cxxbridge-flags-1.0.92.tar.gz) = kCAcGmUOlcz/HIwLtaNDITvdMXxuYAqTB1vKLv9U7Jc= +SHA256 (cargo/cxxbridge-macro-1.0.92.tar.gz) = C3Wu1Buy5jZ8rjnmMm74F6hR2xPBPk8yY3FMo8+43lY= SHA256 (cargo/derive_more-0.99.17.tar.gz) = T7gQ0wp8GVP5EzTeckRzH8PzwQ1/4WMzijW59kCWAyE= SHA256 (cargo/deunicode-0.4.3.tar.gz) = hQh4aUt5M8pMlWnTCjS1UDG5sTnuH8e5SlJ8Tvlg1pA= -SHA256 (cargo/digest-0.10.3.tar.gz) = 8vuGDKb6+lVS+20OgWppyOSfCQi/Uk4wqQ2XyFiS1QY= +SHA256 (cargo/digest-0.10.6.tar.gz) = gWg3j05QI+chjInIkcD9js215eTxjLePOM8kXdAh528= SHA256 (cargo/digest-0.8.1.tar.gz) = 89DIyHUjEvlxPv05f/Y6y5+FWFr78XkoLnIOdwSVTdU= +SHA256 (cargo/displaydoc-0.2.3.tar.gz) = O/ldw/BGudpPLVGDPA01R9hWTvaRD1we0TAwanW5KIY= SHA256 (cargo/doc-comment-0.3.3.tar.gz) = /qQbujLZabUTmXdSc1YFBUvA36krTFa/EYny4XS+ehA= -SHA256 (cargo/either-1.7.0.tar.gz) = PxB7h7avwqZP0TysVf4G1siFnxLUsUy83Sxn0Jdngb4= +SHA256 (cargo/either-1.8.1.tar.gz) = f8qrsv74yRDn9MfOn2ehKDoXFYeafCMMqdbRrjHxbZE= SHA256 (cargo/elasticlunr-rs-3.0.1.tar.gz) = uU2cjfD+aHnKEudjP9/kZ8UDcizJgfxGNwNHLSuHZEg= SHA256 (cargo/encode_unicode-0.3.6.tar.gz) = o1fSjtQaUPnHZdv+VsvASmTlPl/Fi6efvDTBDvPfgx8= SHA256 (cargo/encoding-0.2.33.tar.gz) = aw2UOFa5kNEtO1WzWRRP80FTPlFtlAmLHT/BrGZtNuw= @@ -74,82 +86,91 @@ SHA256 (cargo/encoding-index-simpchinese-1.20141219.5.tar.gz) = 2HpxlJCbkRj8cHGU SHA256 (cargo/encoding-index-singlebyte-1.20141219.5.tar.gz) = M1HVrP+yJK+comX0NbhZx8AVN8CEl1TT2z/fK/4q6Eo= SHA256 (cargo/encoding-index-tradchinese-1.20141219.5.tar.gz) = /Q4g1WiM48q1nrPvOiCDpcd79JbLeY3G/Nt18yOJDBg= SHA256 (cargo/encoding_index_tests-0.1.4.tar.gz) = okbYK+HJ15HF396aK9BF/Dy7o/orEa1VjyfQFxLwBWk= -SHA256 (cargo/encoding_rs-0.8.31.tar.gz) = mFJjVYncn56htv6fBbUO8gjIXINKVi8MarscR1c27Cs= -SHA256 (cargo/env_logger-0.9.0.tar.gz) = CyzwNElx7mxkwxvg1TB5P7pFfTIt/sKBDEU9DvIo+cM= -SHA256 (cargo/exr-1.4.2.tar.gz) = FMwOBvtfZ+XWvq3zo4L+ybrKGqdRxtU2j97uflkywhU= +SHA256 (cargo/encoding_rs-0.8.32.tar.gz) = Bxox9O6FQDNwtYrKdG8BBB7ebw2icwlgrQAe3Ctxs5Q= +SHA256 (cargo/env_logger-0.9.3.tar.gz) = oS5mV8TJfrqxFaQtzudyJff0gs3YQc9wiMZXpC6eAOc= +SHA256 (cargo/errno-0.2.8.tar.gz) = 9jkEY1XuTzeUTkT2BkLG86fvo89reMeKDZiajObDlqE= +SHA256 (cargo/errno-dragonfly-0.1.2.tar.gz) = qmjxsSdk+riU0nVdJRh1TnG0/YDs+4InFKEgbCqrOb8= +SHA256 (cargo/error-chain-0.12.4.tar.gz) = LS8GucrBUG7OmP4yMePMnEQQ7D1bHySuHIlG8HQs3vw= +SHA256 (cargo/exr-1.6.3.tar.gz) = vdIWK3IBQakaBUZAZi0+3OPVCpRKUP/KUxPNlRq7NbQ= SHA256 (cargo/fake-simd-0.1.2.tar.gz) = 6IqKzykdr7WcLZbo9Zgo84OLsacDmII63lGoTeam3u0= -SHA256 (cargo/fastrand-1.8.0.tar.gz) = p6QHz6ozhcSuayPoRiPUjCeY0G4+ahh49/WfF7P4ZJk= -SHA256 (cargo/filetime-0.2.17.tar.gz) = 6Up7uqWTVLwg3XW2fyPieXtEkOnWkoID+xBceeRIyGw= -SHA256 (cargo/flate2-1.0.24.tar.gz) = +CsPTCetn4v9HzII2ILaKwnDAbwcgo/ToA0CFtL7v/Y= +SHA256 (cargo/fastrand-1.9.0.tar.gz) = 5RCT4nsHl8NZeDKUyk8KkRwnAYTLEPhXg7EYYUoVAb4= +SHA256 (cargo/filetime-0.2.20.tar.gz) = ij3m6NEbIv+e3G2Rb4kIAFl9YPiy2hyvKVXCdGONZBI= +SHA256 (cargo/flate2-1.0.25.tar.gz) = qKLbOXyxyHcvMUlMuJF+SM0eZPD6fvrFn710GgqM6EE= SHA256 (cargo/flume-0.10.14.tar.gz) = Fle0RBw0A9n3s0CeR1dSN9rCextXJt9lSm7L+S8PdXc= SHA256 (cargo/fnv-1.0.7.tar.gz) = P57skY0/JAad7LmvFVTK18iA4tokqa/YisoABTGrgsE= SHA256 (cargo/foreign-types-0.3.2.tar.gz) = 9vM564rcBSzSyniRD9qGmu+jjSLVy2SOZIXk0/wG87E= SHA256 (cargo/foreign-types-shared-0.1.1.tar.gz) = ALAihBGQjKhoXbp/ws3XDsmZCm51Pom2rJGoTED7r0s= -SHA256 (cargo/form_urlencoded-1.0.1.tar.gz) = X8Jah/pP0glL/7BpJYUgNNkKF/DR4FGX1JVtNVV1IZE= +SHA256 (cargo/form_urlencoded-1.1.0.tar.gz) = qcOE8WEVb1JgwkoJfFYRn5vox5hYauzBOvvL57fia/g= SHA256 (cargo/fsevent-0.4.0.tar.gz) = WrfRvRvTPMmLCImDG3LaI8CqTfnOx+BwL0bs6gSzXbY= SHA256 (cargo/fsevent-sys-2.0.1.tar.gz) = 9BsEipRVXaD0Lx1jLi4ZUQCE+44wOw2qKBbnM/s2RKA= SHA256 (cargo/fuchsia-zircon-0.3.3.tar.gz) = Lpdjxp66rmMLo190iI20ZeSeJZuhvA7afQb0oGdhXYI= SHA256 (cargo/fuchsia-zircon-sys-0.3.3.tar.gz) = Pcqprncl0SzbhbOtmaQ023C0aMCd7RfgEthrXBAQ96c= -SHA256 (cargo/funty-1.1.0.tar.gz) = /tNM0QWRfpHapNprNyjEewaHSdamLFmBHwbtKscdnac= SHA256 (cargo/futf-0.1.5.tar.gz) = 30IOLoSBlmN5fR7GVEsTxb6EYp57sA3JYNaRfbKYeEM= -SHA256 (cargo/futures-channel-0.3.23.tar.gz) = K/xSy93P10W/F0AzhJK7C9g9dsZ7RF+Rxfsp+uKeyqE= -SHA256 (cargo/futures-core-0.3.23.tar.gz) = 0qztrojTgjWTbDkiR2sQ/O17K2gTb148A8LVvjSKERU= -SHA256 (cargo/futures-io-0.3.23.tar.gz) = k6ZvxtA1omo64lWm0ryjXtpjrkxVEr71REkRP3oSKOU= -SHA256 (cargo/futures-sink-0.3.23.tar.gz) = yguuH+l1LPf9mwBkxnSuY/l7N7xxTXRcveCvt+xOZ2U= -SHA256 (cargo/futures-task-0.3.23.tar.gz) = hC/GO5MfQFaiTVneE/sSchNM4mGBbgY+Y0rQwVzcUwY= -SHA256 (cargo/futures-util-0.3.23.tar.gz) = 8IKKVHHjQCKcEcd8qAAXk3zjxYy3iKF+XxwtXEhalXc= +SHA256 (cargo/futures-channel-0.3.27.tar.gz) = FkcTpaDcw+e0se19O0M8q8GAJThvkzk0bo2vFZY896w= +SHA256 (cargo/futures-core-0.3.27.tar.gz) = htegwap2Nj2sSR3g7pn69pQRKDdvHPlvB9t2A7fead0= +SHA256 (cargo/futures-io-0.3.27.tar.gz) = idQi+jy+O0DcpXSrCHq7W8mCWOpX7qP9bx+nFix3i5E= +SHA256 (cargo/futures-sink-0.3.27.tar.gz) = 7JMIOkrsr7KoCohcneHwzK6dvTLCu1Sww6ZWkOC40vI= +SHA256 (cargo/futures-task-0.3.27.tar.gz) = /WVUDTOzexZUKgQ4wS5q7q0Q1KxdBb0/gFuPNatZKHk= +SHA256 (cargo/futures-util-0.3.27.tar.gz) = PvaxfkgVA+yFIR/tjznRlw8SiTXKH4FM0yrEpoQuhKs= SHA256 (cargo/fxhash-0.2.1.tar.gz) = wxttdRrix/ETIEAtNOQTSd0QFvjV1F5IxDEryGJa9Qw= SHA256 (cargo/generic-array-0.12.4.tar.gz) = /9+fNPFEdEPTc5PMbCuDE6693NlpBsrzTlTGjY5X170= SHA256 (cargo/generic-array-0.14.6.tar.gz) = v/SelHKX8zEkR6vcp59F9HOAl8yCsG5yBU0iI/YB8bk= SHA256 (cargo/getrandom-0.1.16.tar.gz) = j8PLTZH1O1AVW9z9I/akw5rhlpwq6FmCsTV1DMyvX84= -SHA256 (cargo/getrandom-0.2.7.tar.gz) = TrGoZKUBYpaR7fbBWlk7elHuuqHoRo6d3GI958m1jsY= +SHA256 (cargo/getrandom-0.2.8.tar.gz) = wFrraiK49iVAwZSqyYDyEVrwZ7/hWgc01yd6do05azE= SHA256 (cargo/gh-emoji-1.0.7.tar.gz) = MK1ktD1IwXRcAFnluiI4FutZnuyJVsZo/Aox9rnNeZ4= SHA256 (cargo/gif-0.11.4.tar.gz) = Pt2TxnVrTfrycJ6vzDRbomNlZSlcGYqc+/dfpePgCwY= -SHA256 (cargo/glob-0.3.0.tar.gz) = m5GZM6OXt5w34zt3uyqj3I624WWtgJ5Y/3W8fbLjRXQ= -SHA256 (cargo/globset-0.4.9.tar.gz) = Ch4XNCYZ7bwhqWTCr762yCDGolYAMocvOXu5fqEnvQo= +SHA256 (cargo/glob-0.3.1.tar.gz) = 0vq8+9yH9HWDN8pTX7QabXAbZWk844KH2FbRZ0VR7Js= +SHA256 (cargo/globset-0.4.10.tar.gz) = Ap10WJre/eWd4aDE9HMmlcMoBWJK7Hto2RUD1Nunmvw= SHA256 (cargo/globwalk-0.8.1.tar.gz) = k+OvlCQIho9pNKe4UTSjIwgyuZd89mEl3y+e3Pzk3cw= -SHA256 (cargo/h2-0.3.13.tar.gz) = N6gsbWN/yVFaRpS78cskV7edgc5SsxCL3upYsH3TSlc= -SHA256 (cargo/half-1.8.2.tar.gz) = 6rtKREUNoCyQREz3RVjakE7d6PtOkDWppqThVEWvC9c= +SHA256 (cargo/grass-0.12.3.tar.gz) = 9L+gEOb5/i9AcntK7fZ6pU4EOcV/hVRY77H0PXMKAo8= +SHA256 (cargo/grass_compiler-0.12.3.tar.gz) = q+BbSMnJb17GStmvIMkBao1X7IuXng9tvdl0fzKxbfM= +SHA256 (cargo/h2-0.3.16.tar.gz) = W+e1RYm1gfYk9Wa/XY6yurHbc2xRUocgtr02uWtVkk0= +SHA256 (cargo/half-2.2.1.tar.gz) = ArSvNpPxtwXflG6f5WMZMkQ3gdCqu0I7YvzU1z9tL9A= SHA256 (cargo/hashbrown-0.11.2.tar.gz) = q17w1JCe83JMyMzmzMhXLFyBdZLpKF9UZPjob4vTcm4= SHA256 (cargo/hashbrown-0.12.3.tar.gz) = ip7nDEOq9BfJFDlmRaD6hSYkgBsk67eueP6CcoiayIg= -SHA256 (cargo/heck-0.4.0.tar.gz) = JUB3HmX8jLg81uiiN/cMMZvVwp947RCEul1Q7qyG9/k= +SHA256 (cargo/heck-0.4.1.tar.gz) = lVBcOLRXKy2RDOywKBVg9UtEChkzbLvLJ79s5q3G9ag= SHA256 (cargo/hermit-abi-0.1.19.tar.gz) = YrRnNDuUukdtyyUA0kLa27OVV9+IkxCsd8XZkQCqrDM= +SHA256 (cargo/hermit-abi-0.2.6.tar.gz) = 7lEmQP41rL+0u3edtvDYBwTCys+i45tgHvPj9H0a5Mc= +SHA256 (cargo/hermit-abi-0.3.1.tar.gz) = /tRIgMRmc275pcW1+s77XtB4VnbQwC1hLbFOVPDYQoY= SHA256 (cargo/html5ever-0.26.0.tar.gz) = vqaMq0i4RZ8XzxyUTGfdxXLSctnysnQUDyI+yx2ko7c= -SHA256 (cargo/http-0.2.8.tar.gz) = dfQ9QeJplcF+ce4SZFHdOUEBCwUUqBqdEfOzQd68I5k= +SHA256 (cargo/http-0.2.9.tar.gz) = vW7/yZr7Y0Ja/5sFg28CmSnjRaYUihS37NWrZ6+URII= SHA256 (cargo/http-body-0.4.5.tar.gz) = 1fOPFtGE428kCKVSgc1ljsvTygXM5tZRChduyjk+JtE= -SHA256 (cargo/httparse-1.7.1.tar.gz) = SWzim7WlJ4W0Tg98ooR64LuDnJvSj2msrJuZ1GHAwEw= +SHA256 (cargo/httparse-1.8.0.tar.gz) = 2JfzlLrWpwXV9BBHYuEWp1Y55HDYCQHu0FqGCpXLGQQ= SHA256 (cargo/httpdate-1.0.2.tar.gz) = xKHjbIIdvgRXT2AoSKGfdC9Ps8mNQESfEbytGNaxdCE= -SHA256 (cargo/humansize-1.1.1.tar.gz) = AilplsuHltfG47wtkhG3gCgS02mZpRu3VBI+rX030CY= +SHA256 (cargo/humansize-2.1.3.tar.gz) = bLUcmgKd3JGwenh/HYa1PM+kmw6GaIyUbr6NNVVoXdc= SHA256 (cargo/humantime-2.1.0.tar.gz) = mjpb+xlZMe6zNrKntNdh2uyEG5f5R9NDlGAXN6e7peQ= -SHA256 (cargo/hyper-0.14.20.tar.gz) = Askp3Fw54zWgPEBSknKBGIYHIbEBkNmMKg8O/Vuq+6w= -SHA256 (cargo/hyper-rustls-0.23.0.tar.gz) = 2HxIwC4NxeO4SaIEHbMCn9BmZQ+PcXwHv47XjMuJXKw= +SHA256 (cargo/hyper-0.14.25.tar.gz) = zF5VT/YZgiMJ/9V9hzTXfNXOYji8lW8DfqBsWCOMmJk= +SHA256 (cargo/hyper-rustls-0.23.2.tar.gz) = F4iWXmGzZ80DpilQg21c1BVgw1d9kOQOCBk3MZTRZhw= SHA256 (cargo/hyper-tls-0.5.0.tar.gz) = 1hg936mbhdphoUC+oO/JP99WzqoEGzfVU1GAMIJ/mQU= -SHA256 (cargo/iana-time-zone-0.1.44.tar.gz) = gIz31nz0oircW+Zudevfdps/LqAyBBQ3pwYfl6Y9rUs= -SHA256 (cargo/idna-0.2.3.tar.gz) = QYoKb6uCFHX2NO/jzMRcAT90Lv4D2FPo0zVdXLhQ7Pg= -SHA256 (cargo/ignore-0.4.18.tar.gz) = cT8bE5Nz+WouDOOskxzQHulzw8XdfEDAwu/patK2dR0= -SHA256 (cargo/image-0.24.3.tar.gz) = fjDKLs92ZhB/+Ceo5IHeahMqm2h+07sguxwUSjbACWQ= -SHA256 (cargo/indexmap-1.9.1.tar.gz) = EKNal3MDIP/o4tQQtdO2knm5jSwUvbi3Dqiez3iI1B4= -SHA256 (cargo/inflate-0.4.5.tar.gz) = HNspl4zFeXvY3Mjlv33mBIkd8qjcV2lz1xooHpFtsv8= +SHA256 (cargo/iana-time-zone-0.1.53.tar.gz) = ZMEiZnsocESALWzhfuLd8TIH7ZJMcS3ppmpYFNW2R2U= +SHA256 (cargo/iana-time-zone-haiku-0.1.1.tar.gz) = BwOuKE/BZ0JhYcLj8do+px2UshvtvMlJTpKyjjNOPco= +SHA256 (cargo/idna-0.3.0.tar.gz) = 4U3fxwiEIC2yJEwiMgDCBMK9obxuCZjRG14CTWVyCeY= +SHA256 (cargo/ignore-0.4.20.tar.gz) = 2+eHPatTippErXnt4fr18w1J+aXIg926tIvOgbZLdJI= +SHA256 (cargo/image-0.24.5.tar.gz) = abfqlJtTew/QrxQf/4x3aQ8s6W9PQfBCzLbGnGyWWUU= +SHA256 (cargo/indexmap-1.9.2.tar.gz) = GIXnnB/EsQ8OFyxHX0WLf3uTBhBk2Ywyk+mMW6DIs5k= SHA256 (cargo/inotify-0.7.1.tar.gz) = SBbGbSyK5nPfgzZsGDQVOPI0om1lqezqXDSLRTrB0C8= SHA256 (cargo/inotify-sys-0.1.5.tar.gz) = 4FwCteib/zuUbO3sonirxij+gR5gTwJ8RaiqPPeT0Os= -SHA256 (cargo/insta-1.18.2.tar.gz) = V6muwQyaBi7wRU/UnrrvpZI5+DbRswiR2cwiiZeN2XA= +SHA256 (cargo/insta-1.28.0.tar.gz) = /qWziUr+RmtLzwOIYw/BXhGTimB0rwzWN8glui7IoJk= SHA256 (cargo/instant-0.1.12.tar.gz) = elu+gkxQfF2llWNV6Gp0bYLg4UZPZdhizF5x2nDpSyw= +SHA256 (cargo/io-lifetimes-1.0.6.tar.gz) = z6kZqC6ldDMuLebnS0w2501BmCszUID6WdTvMb4g/fM= SHA256 (cargo/iovec-0.1.4.tar.gz) = srPqb/leF1Rz+P/mp+t8ANBUJAMhuExXBRF1/jweB14= -SHA256 (cargo/ipnet-2.5.0.tar.gz) = h51Ug0yMdkV+9Ck6aJsqjFmwdgZ613sV76+7BfkqWSs= -SHA256 (cargo/itoa-0.4.8.tar.gz) = txmR/1YpSqkitFATnuCLO/xwmCxrLHVidxN1z3NULdQ= -SHA256 (cargo/itoa-1.0.3.tar.gz) = bIr4RnT+HyI6mCyTOg7hCGrE1AUqoPuAYMEsatg451Q= -SHA256 (cargo/jieba-rs-0.6.6.tar.gz) = jH4S9QMlQB3eUMKcoyz/RLriCHMTWzn04Z7PMFIm3YA= -SHA256 (cargo/jobserver-0.1.24.tar.gz) = ryWncpmn9xGgGXXDWmpCTraGIJLMLWxyxO1svFbfwfo= -SHA256 (cargo/jpeg-decoder-0.2.6.tar.gz) = lHiqEPc+dSgZjXUQnIvlzX0V+1MCOAQBSNX5oi1MWzs= -SHA256 (cargo/js-sys-0.3.59.tar.gz) = JYRRqxCzT4r1NBbR/atywi6AXwySoRNtWUcOwLEROLI= -SHA256 (cargo/kamadak-exif-0.5.4.tar.gz) = cElJZEkr+OSR6zlRxdcMlifrcQDt5sxW10i5o/MCz7Y= +SHA256 (cargo/ipnet-2.7.1.tar.gz) = MOIr2GKTWYlUULWep6d2yFBWG5ajsdMTIcGUnZ5skUY= +SHA256 (cargo/is-terminal-0.4.4.tar.gz) = IbazJXZBOo5puQ6VLkoCZHYEDYEBe4BEXe2l8tOSGFc= +SHA256 (cargo/itoa-1.0.6.tar.gz) = RTrZ9YKkQZWeXw0IiwLOBM/o1RqOrwd/EqxtPpQWTKY= +SHA256 (cargo/jieba-rs-0.6.7.tar.gz) = NyKOBsdYQtEJdDLZTQLzf+Pr/Kl5HC6P726dsX7RKME= +SHA256 (cargo/jobserver-0.1.26.tar.gz) = k2z9ISoBVZA7y8Bg4xb7bMfL8uGQcyk5HrrcH+DOd8I= +SHA256 (cargo/jpeg-decoder-0.3.0.tar.gz) = vAAA5CUSyS4xwiUjFb2jJmIKTgNBBekAyY7EkvoHez4= +SHA256 (cargo/js-sys-0.3.61.tar.gz) = RF3eIVDFXkg/PYQWcGuX7I6CN8MH5be0uN0V5q8qBzA= +SHA256 (cargo/kamadak-exif-0.5.5.tar.gz) = 70/HDQq35ba6+jAhamtIcF6pZM38KcBQ8kEileulgHc= SHA256 (cargo/kernel32-sys-0.2.2.tar.gz) = dQdiSylINDHAui2Crs6Mps26k4K/9N3Q90kFYMBWCY0= +SHA256 (cargo/lasso-0.6.0.tar.gz) = rreyGlJjdcXKVfGm39Th+tn6Tt11D1MCUqcYpEsmCPA= SHA256 (cargo/lazy_static-1.4.0.tar.gz) = 4qutI/vEKzcA8vJ5hE3IMq2ysusGmy35GPRVxOGMxkY= SHA256 (cargo/lazycell-1.3.0.tar.gz) = gw0Izh0dlB5rMGRfGg61ZDAT2DXON3ml/CCCYdvhD1U= -SHA256 (cargo/lebe-0.5.1.tar.gz) = fv0daY2wdZ5u8Rp81EQHQHOZqRDHdN2ATGTAMtp4Jv8= +SHA256 (cargo/lebe-0.5.2.tar.gz) = Awh8K61eEDToys5ZJt7AU/s3kCSDcIZfURen0CEzVMg= SHA256 (cargo/lexical-core-0.7.6.tar.gz) = ZgfGKqFh0j0XqQcsxdoL5nzfyJ06+x6NnIQr68JSX/4= SHA256 (cargo/lexical-sort-0.3.1.tar.gz) = wJ5FkWEeIx2vTUxoWmbLBBDMHlAgJ6IK5V8ruemXIHo= -SHA256 (cargo/libc-0.2.131.tar.gz) = BMO0gizOv6OcAvwD0VNEQbIurTI/oPSLt93Y5roHakA= +SHA256 (cargo/libc-0.2.140.tar.gz) = mSJzNJIfrhqXnPC/38xrPlzjdu9X4W+2+z6i7WCV+Aw= +SHA256 (cargo/libm-0.2.6.tar.gz) = NIEIqz+6QuyC/26VZPxMoCR73M3Gjdivl2S7x5w8j/s= SHA256 (cargo/libwebp-sys-0.4.2.tar.gz) = Q5/RiFqiiTfn7c1o0ueTy0oi+HM0YNJRn7r9KyFWcr8= SHA256 (cargo/lindera-0.14.0.tar.gz) = Td3QEZIcrA7FkCWmtuJsLNmvOtzjhLVsdTwx33GgeWU= SHA256 (cargo/lindera-cc-cedict-builder-0.13.5.tar.gz) = WESRqRt1j5LvMgKq+WnYN1IvLBE5DE3gBJo1bWO8Cw8= @@ -161,199 +182,208 @@ SHA256 (cargo/lindera-ipadic-builder-0.13.5.tar.gz) = m9Ps+wfogQ9boxP6g2gEtmEg8O SHA256 (cargo/lindera-ko-dic-builder-0.13.5.tar.gz) = /IbyZWDqaekUE+7MB42OE/ObPB/cWiQteddiL2+rOoM= SHA256 (cargo/lindera-unidic-builder-0.13.5.tar.gz) = BcG7i304/+x9lJ7ixgO275bfp89JN+kbrSlaLSsme4I= SHA256 (cargo/line-wrap-0.1.1.tar.gz) = 8wNENQoqUdpUwdU76T+t6KI35UXbzEvb5jVBPyEXyrk= +SHA256 (cargo/link-cplusplus-1.0.8.tar.gz) = 7NIHyccTw0+VoJelsCmsLOYBBTDHtJ1/6iTZd97eBPU= SHA256 (cargo/linked-hash-map-0.5.6.tar.gz) = BxfO8byLY2xuHBu978CeYyLaipMhlm6JKO+A0g9/dw8= -SHA256 (cargo/lock_api-0.4.7.tar.gz) = Mn+ltqaUDkaZ7Empvq4epIRca6uTFOT4SsaHQhOdjFM= +SHA256 (cargo/linux-raw-sys-0.1.4.tar.gz) = 8FH3enyOaVfAaW6siPJrARflT1LT/GgqsZOXqIEoRqQ= +SHA256 (cargo/lock_api-0.4.9.tar.gz) = Q1ARNm/lZYOxbPlW+d8AlbQFuC12QlvImBwOIuYOxN8= SHA256 (cargo/log-0.4.17.tar.gz) = q7EuaHz7RKpA9B/Dl473ZEj5tgOMrWrvQlnTwJWiOC4= SHA256 (cargo/lzma-rs-0.2.0.tar.gz) = q6jssEUN+rzkrXIIXu0Kdd/+jyH3raBWOFZOqdstf7E= SHA256 (cargo/mac-0.1.1.tar.gz) = xB4MT++GlhrG1vioJgn1XzGwXk/OFJrFcQ5Dnfdhm6Q= SHA256 (cargo/maplit-1.0.2.tar.gz) = Pi5loaLkPPy0eolcTIsQ0fSmEJf58lTxg67mDK2cZR0= SHA256 (cargo/markup5ever-0.11.0.tar.gz) = eiYpuxQE89NMLpIfIf00ugCyBhJMgfZcULQ7aq7+sBY= -SHA256 (cargo/matches-0.1.9.tar.gz) = o+N4tmoGDUiUe1kHN7MKG+dnBsjde4ug8v45icaKhT8= SHA256 (cargo/memchr-2.5.0.tar.gz) = Lf/lLs8ndy5gGQW3Uiy073kNLMIDSIu9Di/oX8t0Vm0= -SHA256 (cargo/memoffset-0.6.5.tar.gz) = WqNh1Prqk2AwZKAnQV8HvY4dXIjJ+/aL9WooVCj9ec4= +SHA256 (cargo/memoffset-0.8.0.tar.gz) = 1hxxm8+89dYrOgnvpgiN6MVLwL/NPqeuOfzBhhCLjeE= SHA256 (cargo/mime-0.3.16.tar.gz) = KmDHzlAcceA6nJwNNbhhQTrpJb2XnMek4w0GAGmqrI0= SHA256 (cargo/mime_guess-2.0.4.tar.gz) = QZImPCOKXw0Ma/0h8zajE6TOHEUFQkScoZG7ZXtGQu8= SHA256 (cargo/minidom-0.12.0.tar.gz) = /lSRFaZ09exkx1TYXjfW9CZkvQ70/7YrYZSJrZnGyxo= -SHA256 (cargo/minify-html-0.9.2.tar.gz) = ZA51RuvSnH0P5SNoSloGYSgcqTt88B/jAjp/qXnq8X4= -SHA256 (cargo/minify-js-0.1.5.tar.gz) = QoUhwMj6+JhHR5rudRYNIlTxWz18XmKfSvC3+y4ZslE= -SHA256 (cargo/miniz_oxide-0.5.3.tar.gz) = b1x1aI2lgrj/wfF5np2yc/MhM8SeBI9hTSLsMlZ3PMw= +SHA256 (cargo/minify-html-0.10.8.tar.gz) = d1TUZphzN56mqKW1bkBuuD3nE6+KeRUX7zWgyDKx59U= +SHA256 (cargo/minify-js-0.4.3.tar.gz) = wwD5C6ETi1xdr12UQdyb3Ge4CKrCLPY4NiomR7whO+Q= +SHA256 (cargo/minimal-lexical-0.2.1.tar.gz) = aDVMXGvTbXP/P+zrBe+lm2rLdiZhf0livjIqgl5h95o= +SHA256 (cargo/miniz_oxide-0.6.2.tar.gz) = snWVDCizfnlOjFXYiuteE50M4j/bvtpo+NcXSr356Po= SHA256 (cargo/mio-0.6.23.tar.gz) = Sv1m9bkb8qO8E/rQ4hyu2sFoykxwdQTnVYVkiugOTMQ= -SHA256 (cargo/mio-0.8.4.tar.gz) = V+4cI8fGOwySUMM5/9xpJV8RCymLkBufbIJUe3uHyq8= +SHA256 (cargo/mio-0.8.6.tar.gz) = W52aRu/1tP9ktFqeMWptHgvHGe9CnL7E3GMGhCEr/fk= SHA256 (cargo/mio-extras-2.0.6.tar.gz) = UkA/4pABLOd3xGJnkMiVEySiueMxazFDd5xysCl0Lxk= SHA256 (cargo/miow-0.2.2.tar.gz) = 69gIQkFmMi1KONqHCDv93TrEwTEzTtVYVhEusG1GlE0= -SHA256 (cargo/mockito-0.31.0.tar.gz) = QB7cCIBpY0r6pfSilhezbbpoPAwW/kQ1qG3rrSP6Lxo= +SHA256 (cargo/mockito-0.31.1.tar.gz) = gPn+zpvZerdDOf4Z9LyvUrdtzBjlNkx5d8GDj3azjek= SHA256 (cargo/mutate_once-0.1.1.tar.gz) = Fs9oGiO00KQ/w1AkwXZDf53NgY2zTg9Cq0VqDuWtSXs= SHA256 (cargo/nanorand-0.7.0.tar.gz) = alExPFggsLAr1CL0tEd2+/R5YXVcdM5kr8c7+tECJsM= -SHA256 (cargo/native-tls-0.2.10.tar.gz) = /X4vNhhVf5gOCxfohWJS7uPJf6EsVN/wyikPtiZspKk= -SHA256 (cargo/net2-0.2.37.tar.gz) = ORYw0StoACrh4l6Pl0MGR0lmVQrYLaxohvuJEMGVaK4= +SHA256 (cargo/native-tls-0.2.11.tar.gz) = ByJhc8MvKSYCe2PM5LzYB2w1UoRsvnkl86r/6sCjuS4= +SHA256 (cargo/net2-0.2.38.tar.gz) = dNDfmc/NJTCy5pT24X5/N7jia7I5g6xTDAyXQIg3xjE= SHA256 (cargo/new_debug_unreachable-1.0.4.tar.gz) = 5KJHNiFuwxYEeh/EJS4n2rsEIYqko/N8bn3b8fl4K1Q= -SHA256 (cargo/nix-0.24.2.tar.gz) = GVzbwXQbgTQ0bVFbOlahyUsJEnWACc/VP5nqD1ewZfw= -SHA256 (cargo/nodrop-0.1.14.tar.gz) = cu9KVohMpVjl3bBaHR5+G/2aaNntAkwhcEzJiHLa4bs= +SHA256 (cargo/nix-0.26.2.tar.gz) = v92j0ZaCHWrxMSbkA3XN99pkapYRSvE01fQXqaHcjho= SHA256 (cargo/nom-5.1.2.tar.gz) = /7QmLSbtg6HAozo4/iuxV5cynIV3DaBea4KN23gmJ68= -SHA256 (cargo/nom-6.1.2.tar.gz) = 50E/mZZxvUdFp7YkvTcKVp+2vFdLI8g6PF7S5FPz1eI= +SHA256 (cargo/nom-7.1.3.tar.gz) = 0nOYPFplenCj6PKgEymCLzuMgXK3OCZBGlV1HkBKCko= SHA256 (cargo/nom-bibtex-0.3.0.tar.gz) = ydslf2x7nIs6tn7mpLI6KQwVfRg/7yrAZb+fzl8cEpk= SHA256 (cargo/nom-tracable-0.5.2.tar.gz) = 4BLHQuEmn4Afa/4NHr+Z16P3vB1lyXC6sOe+5DnjFhA= SHA256 (cargo/nom-tracable-macros-0.5.2.tar.gz) = Za1jD/RtTGHaiQQvMn5v3xBKbrtmdWVyfvC7KUp8MZc= SHA256 (cargo/nom_locate-1.0.0.tar.gz) = +TKDT9jjkfx3EOK6F+j5+GRdhGtVqmMgfhfhEKHhzjU= SHA256 (cargo/nom_locate-2.1.0.tar.gz) = pnSErfVxH5Ty8otlO/Ixv/jkOL4zv1sPNZNaDbT2GKI= SHA256 (cargo/notify-4.0.17.tar.gz) = rgPIyFPbp7/SPlcf8M/3vJ3OtApM1oTNFoGCQYP0Ulc= -SHA256 (cargo/num-format-0.4.0.tar.gz) = uv5BeXIsKJQojud6nwRPAoEchq9pk0TEmLCEDGmKJGU= +SHA256 (cargo/num-format-0.4.4.tar.gz) = plLZdxpjcR/Tw962cKz75cMKQHLmZNejv1qeEFascsM= SHA256 (cargo/num-integer-0.1.45.tar.gz) = Il0zifs1CaJMk/XCnra94lhrmNnwFmNt/1jXxvdWnNk= SHA256 (cargo/num-rational-0.4.1.tar.gz) = BjihydCjwJFBWBRbx2z/Nzp1pifm7L+3HL5vRTpaGbA= SHA256 (cargo/num-traits-0.2.15.tar.gz) = V47eNM8C+JJKuUR/UMKAdbTT5bJplyNF5+A3KzjGzc0= -SHA256 (cargo/num_cpus-1.13.1.tar.gz) = GeZFJuve4YI0FXLlDprQOWWqUQzZRCekVJRI8oXpV6E= +SHA256 (cargo/num_cpus-1.15.0.tar.gz) = D6yeLaE7XrRHps49OS8jop2GlL/3gb8DoWzZrIaXWTs= SHA256 (cargo/num_threads-0.1.6.tar.gz) = KBnOBB0u4TEDb0/J1q564SWjpA6XumTQT+eZrZ2ru0Q= -SHA256 (cargo/once_cell-1.13.0.tar.gz) = GKbb4wdYyfg+sAy+pKyVlmMF9ad3Lz9C6/x/x+3b2OE= +SHA256 (cargo/once_cell-1.17.1.tar.gz) = t+VQApnhbrsUeuFaAKlCryZM82iPR5I7j8LNWFjyOtM= SHA256 (cargo/onig-6.4.0.tar.gz) = jEsxyHIq2RccbXfTVX2weMqyvVCvzJ0JyLMVxZ34yk8= SHA256 (cargo/onig_sys-69.8.1.tar.gz) = e4KePX6cx0x+MV7o7bGFv0GQ2lrN50r9f8WcNbHwhuc= SHA256 (cargo/opaque-debug-0.2.3.tar.gz) = KDnnlmXxMb21eC5R8sbJWZwTPGCYmCpUx5Q1i/QyUpw= -SHA256 (cargo/open-3.0.2.tar.gz) = 8jpAcAShAz9T6T+bRVgNFN4jko+q0Yc4T4kVB8mwwEU= -SHA256 (cargo/openssl-0.10.41.tar.gz) = YY/r9lM2SQ388gtz+IX1ZRoMicZMLUqMNmJYWnC/W9A= +SHA256 (cargo/open-3.4.0.tar.gz) = IezySH55lgRzV1TSxYlhBnhZh7RBta7ljyQuTUljF5o= +SHA256 (cargo/openssl-0.10.46.tar.gz) = /SUjOB5GJW5AkwUSx/0lViuerkgSy1IHjxVehyF8nR4= SHA256 (cargo/openssl-macros-0.1.0.tar.gz) = tQHkTxFmWWDH5/zwYsfZahSt5KqYEWwASy43tb59c2w= SHA256 (cargo/openssl-probe-0.1.5.tar.gz) = /wEaMCw5alGXaSQx/BlIAZFUr8F4uvfY43NnRCpGAc8= -SHA256 (cargo/openssl-sys-0.9.75.tar.gz) = 5fm9DCcQVBo82nPW+axPGyQN5K4mEGXTCdvnPZ3OtC8= -SHA256 (cargo/os_str_bytes-6.3.0.tar.gz) = n/dBXprj//EiWFHfng2eTlR5+Udhl3RnemNXLlXoDv8= +SHA256 (cargo/openssl-sys-0.9.81.tar.gz) = F2viYplXwVckD2j2Hy0AU606Ts/dnr8eZSHRjZY1z2c= +SHA256 (cargo/os_str_bytes-6.4.1.tar.gz) = m3ggudrqVFfJ8hxpRIkF1yP70hE2zPUhdI8j/UnnI+4= SHA256 (cargo/parking_lot-0.12.1.tar.gz) = N0KywQO58GvJ//Cjf/SRKTWFG+5tNvPAK8x1W8/sIo8= -SHA256 (cargo/parking_lot_core-0.9.3.tar.gz) = CaJ5y/JcsHV4EDlPvB41mUm1njSBRcZDqTmlJWkuaSk= +SHA256 (cargo/parking_lot_core-0.9.7.tar.gz) = kGnLufmeOlCDR2zLKc6x3hi5EYyvpT6QyVUSNd4rlSE= +SHA256 (cargo/parse-js-0.10.3.tar.gz) = MFNHWeath6oUTDllRHR+HCWxAgvRMzVv11jI+s7HZOU= SHA256 (cargo/parse-zoneinfo-0.3.0.tar.gz) = xwXyVkScYNpl4R/2Ym4MFqCguWqqNI3mE3aySbw0D0E= SHA256 (cargo/path-slash-0.2.1.tar.gz) = HpEJnUJosOEZc/A26IXWUvsLIf7c9pc4xif5TbakT0I= SHA256 (cargo/pathdiff-0.2.1.tar.gz) = iDURalwXkISoMO+zrcEXqwB1ErU1vBohyZHTsyprRN0= -SHA256 (cargo/percent-encoding-2.1.0.tar.gz) = 1P1WQdAcjxiiPae2/ikpj/S1WvzM33iXOyTPMXX+4y4= -SHA256 (cargo/pest-2.2.1.tar.gz) = aUhuK4wtKuuXYtt7TgCwMxFWOTVVz/Rn9BY/8Ggh7vg= -SHA256 (cargo/pest_derive-2.2.1.tar.gz) = sTVwYzr/M8bSLOR91WaxCjuRIsL+nY51AYlZBb5TK5E= -SHA256 (cargo/pest_generator-2.2.1.tar.gz) = s8Vn5XAu/cefsYhZ6nTD6zbhTEPae4wfCYpO1lFOx6A= -SHA256 (cargo/pest_meta-2.2.1.tar.gz) = XrMr5e47va+ox6GLCoqNlitmz6LO7kA39JJnpQ7oIf4= +SHA256 (cargo/percent-encoding-2.2.0.tar.gz) = R4xXLD1zGB/zwlOQRfbrmeVJEhjq6Rk3CZO4kM292Y4= +SHA256 (cargo/pest-2.5.6.tar.gz) = jL2TmyNOldcrw5PVF4iuxorutdUedIygj/Oq1Yy3Ivc= +SHA256 (cargo/pest_derive-2.5.6.tar.gz) = qBGGhj89Cic0CBW+jyB43YBQsUzXGRPbn72nleX3B9c= +SHA256 (cargo/pest_generator-2.5.6.tar.gz) = daHvIL8xk8Faw0Wssy4ms9wyI6/013rk/FNZVnaDeWs= +SHA256 (cargo/pest_meta-2.5.6.tar.gz) = XjsoSx8Tog3F68kK/1mlG41xN8IhExtSpyYMCMvBzIA= SHA256 (cargo/phf-0.10.1.tar.gz) = +rvx6tilvLwg9fi5Oe4/Ww9vKBtq00aLhGVrZYtFUlk= SHA256 (cargo/phf-0.11.1.tar.gz) = koxlNd6TVIGI72O7fEA2vUFc2PNq0lr0S5eJsu5ypIw= SHA256 (cargo/phf_codegen-0.10.0.tar.gz) = T7HDqLxN1OXPzim0T/wUvt0u4pRVmilOKk1MnppqE80= SHA256 (cargo/phf_codegen-0.11.1.tar.gz) = pWrIkMXjylmLveqpmWTttbAlilg6nrbvTon8hdkiR3A= SHA256 (cargo/phf_generator-0.10.0.tar.gz) = XVKFiTu164LmqvXVnukJoGoWc3qJcJhN13RrqSg0mNY= SHA256 (cargo/phf_generator-0.11.1.tar.gz) = sRgclFgPo0X1DxnXOKqjnA7TCmANlcstPiP5QmbxT78= +SHA256 (cargo/phf_macros-0.10.0.tar.gz) = WP3zGE3VYPFg3XOSK+otXNbo8GS/SxMRCr2BsDaXtOA= SHA256 (cargo/phf_shared-0.10.0.tar.gz) = tnlq13Gs3AEj0qiNxCi1447yRFZ0PdsXRO1ij5gVwJY= SHA256 (cargo/phf_shared-0.11.1.tar.gz) = 4ftfb4JrdyqNTAOUIJRB59N8u7lnrpx+DoE0Nlye5nY= -SHA256 (cargo/pin-project-1.0.11.tar.gz) = eCA+g8SM/74B5KLTXVZspN5EXXmoU3L8ZON4v8gSomA= -SHA256 (cargo/pin-project-internal-1.0.11.tar.gz) = cQ+vdeGzM0U2EgHTbQTpisHtiQkVGgF+04RwCDYQTHQ= +SHA256 (cargo/pin-project-1.0.12.tar.gz) = rSmmCba81n/ukFgS5USZLSFq+ddVdXwF7S0OFadMbsw= +SHA256 (cargo/pin-project-internal-1.0.12.tar.gz) = BpvbHgWtx6iZDc6cx1NwiV++Tj1Yubc78a7lY1k0SlU= SHA256 (cargo/pin-project-lite-0.2.9.tar.gz) = 4KeuOsLxFzCF05hTHHBXVslKTFaEN4XfhaYMGgr6wRY= SHA256 (cargo/pin-utils-0.1.0.tar.gz) = i4cNjBUbby+5PoShMUYTjwXQLtEcfnxU+IJqqvfJ8YQ= -SHA256 (cargo/pkg-config-0.3.25.tar.gz) = HfjE7EsGJ+U73yFGFa0oc2fkglWM+EsQklCzdGTcA64= -SHA256 (cargo/plist-1.3.1.tar.gz) = vTm8bNyTVa0dxe7t7+5pa7NcNMryF2h0HoGCbAu9ciU= -SHA256 (cargo/png-0.17.5.tar.gz) = 3DjArVfvt4bdV7mGTlsYuuR4wAyCTcVaOLvJ2pXd47o= -SHA256 (cargo/ppv-lite86-0.2.16.tar.gz) = 65+ebiM+XEo1VZphe/QKTsRH2y6EwgtVpvgxZ7fleHI= +SHA256 (cargo/pkg-config-0.3.26.tar.gz) = asmln3NHPxuNhSQh5Z5kgJ8CWZSDfvdDYVxtDFswUWA= +SHA256 (cargo/plist-1.4.2.tar.gz) = /6xqUREOl2EN06xz40plsn5WoeMF30G60fYW2OHLIvQ= +SHA256 (cargo/png-0.17.7.tar.gz) = XXCOr4YKGbGc5Th0DStL3uuDN/pT93OEVecGYjrVxjg= +SHA256 (cargo/ppv-lite86-0.2.17.tar.gz) = W0CvgFsxIf6rijwp8E2K0mL6jgVhiD52U+AkrkR55t4= SHA256 (cargo/precomputed-hash-0.1.1.tar.gz) = klOD76NGcwR4+0g42+kTfSpHZ1rXicVG0VCm4d1Ksxw= SHA256 (cargo/proc-macro-error-1.0.4.tar.gz) = 2iVJD/mJKqs/z3w28Iz7kC3T5xyg+flRe+oCpzpc44w= SHA256 (cargo/proc-macro-error-attr-1.0.4.tar.gz) = ob5AGA5S7MmK2AsYSTS689DSn5eVdOQ5r1pVJ0s1+Gk= -SHA256 (cargo/proc-macro2-1.0.43.tar.gz) = CiyixhvJ89dNKIYpSre5hTq9nBrZA6OseBXFiYm7e6s= +SHA256 (cargo/proc-macro-hack-0.5.20+deprecated.tar.gz) = 3DdeFSckf+GpfYtxVmeN/nwa8vwHXJpNs2kOzSoUgGg= +SHA256 (cargo/proc-macro2-1.0.52.tar.gz) = HQ4a6eg2zDvt3WPbDfaCWT1+LT2JGujJCD0hE+F0QiQ= SHA256 (cargo/pulldown-cmark-0.9.2.tar.gz) = LZzGNLx4doFXtcv+mI/80dy6lc0rLwOogxbAjG0A7WM= +SHA256 (cargo/pure-rust-locales-0.5.6.tar.gz) = tFxJ/E+R81uuZU+F67OkTWCsZPEbMWb/pgne85DHMtg= SHA256 (cargo/quick-error-1.2.3.tar.gz) = odAZQdgvoqtQvh555nFCid183njrpMB0vFpDdPZQ3+A= SHA256 (cargo/quick-xml-0.17.2.tar.gz) = /h5DC9zzDJ/cJQU7nEWbsaRnKvRhe2x4PX2R3BfGu7A= +SHA256 (cargo/quick-xml-0.27.1.tar.gz) = /8BT8FfddopW9izX5DTELIMdKWlomX6awfdup8LRTEE= SHA256 (cargo/quickxml_to_serde-0.5.0.tar.gz) = JvNRErNUgP1y9jREKJCD7u29YdE5B8gsQwnwzNo14kQ= -SHA256 (cargo/quote-1.0.21.tar.gz) = u+RI83en1pYeMPWVX5uNEGw/XkSdST7hsSXB1DwrUXk= -SHA256 (cargo/radium-0.5.3.tar.gz) = lBup142OL3zkdMAV7qTZxtJbajMn+YMu4ppN4n+Ru7g= +SHA256 (cargo/quote-1.0.26.tar.gz) = RCSvS/d4quIFGne2AoMzLzhlVCVdciIz0J+/x+MNovw= SHA256 (cargo/rand-0.7.3.tar.gz) = amsWedSbJLv+DIA0KaoYdEcvUNmzYxMfDon8NWtUTQM= SHA256 (cargo/rand-0.8.5.tar.gz) = NK+NGg4lkkvFt8Q8B5yUIznY8Ki1fDkEm+9YG0YydAQ= SHA256 (cargo/rand_chacha-0.2.2.tar.gz) = 9MjthWJ5yXNyBr9yW/NpNdhmbq16pptSvlWvNp0ZNAI= SHA256 (cargo/rand_chacha-0.3.1.tar.gz) = 5sEKY6D6MiUr5J0h53CdTUuvjSMcLbzh6qgUG5sSfYg= SHA256 (cargo/rand_core-0.5.1.tar.gz) = kL3lKW/IkbDO8SptA93MwWLOeyr/VBYK+TOPjUDfbRk= -SHA256 (cargo/rand_core-0.6.3.tar.gz) = 008UCPVSlEU3kMSLLx67scW0t1Y+sfQYvPz9uwbrtOc= +SHA256 (cargo/rand_core-0.6.4.tar.gz) = 7AvkeV4vaigGm+wLX/PirJuvyZ5qmn3DVHmWxcgWkiw= SHA256 (cargo/rand_hc-0.2.0.tar.gz) = yjEpr3uSoXES1ZrUmMb4Hq9GMlN2a5A5bTnqejnWYTw= -SHA256 (cargo/rayon-1.5.3.tar.gz) = vZnldy6ti6pSFSeMmxW/kgh3CenBstH5fNtaGDyTOn0= -SHA256 (cargo/rayon-core-1.9.3.tar.gz) = JYvNtaxtrUhJG7KZLba3z3SHiwOEkIrxJII9EYyZaD8= +SHA256 (cargo/rayon-1.7.0.tar.gz) = HS31GW43vMh6vrwAU+IHh9c4R7szE0pphBIH3QpH8Ds= +SHA256 (cargo/rayon-core-1.11.0.tar.gz) = S4+VvWlm9ch3dmORYKZr2KuYldnUqwHdup/GBmGuvo0= SHA256 (cargo/redox_syscall-0.2.16.tar.gz) = +1pYwYVbS2gZ1ZASFVYD8LIq0wytdSYAqt/LaVJlUZo= -SHA256 (cargo/regex-1.6.0.tar.gz) = TE6zJnF0uMbC9lQRZiORCg/vCcR1P43YPbKcSKDfmIs= -SHA256 (cargo/regex-automata-0.1.10.tar.gz) = bCMNc/uNjBucCzE1xRQqis7joFWPuNtc8ctl+NeGITI= -SHA256 (cargo/regex-syntax-0.6.27.tar.gz) = o/h7c84RsWGaPGMy9FNB4ARxc3cei4tz+Hv+77e1YkQ= -SHA256 (cargo/relative-path-1.7.2.tar.gz) = DfMtgs7dFJk4aHewYuvoch+AbegLCNGDxwGE7xfdHUI= -SHA256 (cargo/remove_dir_all-0.5.3.tar.gz) = Os0SVmVCKXOjOsnT3S34XtrQ9K6bANr7GgXkOp9e+Oc= -SHA256 (cargo/reqwest-0.11.11.tar.gz) = t1qmmj8Gu8xm7eM68q8lPG96hrHKADP2DFgKJwdPv5I= +SHA256 (cargo/regex-1.7.1.tar.gz) = SKqldIulcfuVzSyFwJ9ikhXTpuzpQrqhAJUK8Do09zM= +SHA256 (cargo/regex-syntax-0.6.28.tar.gz) = RWxgO+Po1EiwcvQQkAwJ+vFk+84tSARW9Q7qbiX5yEg= +SHA256 (cargo/relative-path-1.8.0.tar.gz) = S/JSEnCTLDx77RpZFRIivXZDx5MQ8pFvAZJeHhYlVpg= +SHA256 (cargo/reqwest-0.11.14.tar.gz) = Ie7ZDshXCVLVO3cuz48gaqHsmj12slIcVsQpc/LZHuk= SHA256 (cargo/ring-0.16.20.tar.gz) = MFPPUuI2o+10bfx0WqnKzxt5HYRr2vQS9gqNfW4XyPw= -SHA256 (cargo/roxmltree-0.13.1.tar.gz) = 2/fXsepkbTgNDoFTFYBjptp+/jDdvzGEBChI4/im9nE= +SHA256 (cargo/roxmltree-0.18.0.tar.gz) = 2PWVpFe2uMbNpmpIUD6S7o0ZNC+QWUjynDgyAOyesdg= SHA256 (cargo/rust-stemmers-1.2.0.tar.gz) = 5GogNgGf24iBMdt6TIR6EGOnST+XHtlOqCxn6tpjylQ= +SHA256 (cargo/rustc-hash-1.1.0.tar.gz) = CNQ/eqawjUnzgs3mp5ggR8NCbblJsUJLxLfsmuEsbOI= SHA256 (cargo/rustc_version-0.4.0.tar.gz) = v6D1hSJtLmgJfU+V0ROxW4OoLoGaslcX7AWQ2VhO82Y= -SHA256 (cargo/rustls-0.20.6.tar.gz) = WquO5scJftYFf0PBh6YkGNDAWkvV8Ys1cdtQ7g+c4DM= -SHA256 (cargo/rustls-pemfile-1.0.1.tar.gz) = CGSu/1P4wFqgjYbl74OdPfzweuui2zLxLbDvcW6HvVU= -SHA256 (cargo/ryu-1.0.11.tar.gz) = RQGr3/OugqHBtHehclLrac7p5m65FcGrqk9E2HPfnwk= +SHA256 (cargo/rustix-0.36.9.tar.gz) = /Vxv8R/s1VtAdG0ZlaAvLrN1v4wA0ZLVIe4J9CvvN7w= +SHA256 (cargo/rustls-0.20.8.tar.gz) = //ePx00XUpT06DsoNDMV/8+xFLFW8Bhel0HLVXD1Di8= +SHA256 (cargo/rustls-pemfile-1.0.2.tar.gz) = 0ZS1bViAOkNjW9w5jNF+OD1vcfkYK5oZLBJ8pCSUpZs= +SHA256 (cargo/ryu-1.0.13.tar.gz) = +RM5wEZ95iNgZJ+NPhhcqN5CJP8oH2YADeXrKnenkEE= SHA256 (cargo/safemem-0.3.3.tar.gz) = 73A7fLWTNeri65POtmTA636mv1ZwedhD4JQgIZZo4HI= SHA256 (cargo/same-file-1.0.6.tar.gz) = k/wdw6qpv+2V4C5urau0uvfjB4sL0bTXtrC2g3iQBQI= -SHA256 (cargo/sass-rs-0.2.2.tar.gz) = yrz3xuVQU/NZkRGHrEAUCarS3BQzjK6XLewmb+5Iar0= -SHA256 (cargo/sass-sys-0.4.22.tar.gz) = kzvKI7QCN38Ktx55cyqCbe/8dIATdGrDMU9qvH+fxRw= -SHA256 (cargo/schannel-0.1.20.tar.gz) = iNZzEUZGLqJdkkSy7V/R1xbSXFLk1Uqk+w88TphU2+I= +SHA256 (cargo/schannel-0.1.21.tar.gz) = cTz7BscFnzWI+4BEwPrR0J48AdIl4luSINv9zxbbsbM= SHA256 (cargo/scoped_threadpool-0.1.9.tar.gz) = HVH131r0OrPxNgtCn6XgFSrFzowL1khcrkkDMuloRqg= SHA256 (cargo/scopeguard-1.1.0.tar.gz) = 0pqwxtP8Dukv5m4tmfcA6rF6jVfRwdO3SDgPsguqeM0= +SHA256 (cargo/scratch-1.0.5.tar.gz) = F5LbA1zpW+YMP4hTAXs5mSCSgcJOK6W8jlm/l6DFkME= SHA256 (cargo/sct-0.7.0.tar.gz) = 1T3Nt8n4FYk3p5gbSKzP05pDr0GFkaXQCMeyK14bfKQ= -SHA256 (cargo/security-framework-2.6.1.tar.gz) = LcFPFy+vigGUo63tYicSsN4naCGt3FdPpU/AoRZ+ENw= -SHA256 (cargo/security-framework-sys-2.6.1.tar.gz) = AWChOhd6Rb+0POccAVgJmEdPVWrYVNy8qTbdKEGlxVY= -SHA256 (cargo/semver-1.0.13.tar.gz) = k/aEHnCQA9aLst7ujDQ1cr9EYAPsIKWD5297Fc6/NxE= -SHA256 (cargo/serde-1.0.143.tar.gz) = U+jl1bcJJPdP9cbWTZpazZFCIRfGD0jE4HhVI4olRVM= -SHA256 (cargo/serde_derive-1.0.143.tar.gz) = 09jo3lV67mPCa4W5R/Xlm2kNBFTHU/Ot61zXg1q4g5E= -SHA256 (cargo/serde_json-1.0.83.tar.gz) = ON0E48gnnnWzHvKdvc7r/lrYn00JNyE8U/fUnQGz1ac= +SHA256 (cargo/security-framework-2.8.2.tar.gz) = ozK+AVCNgU/tZL8o95ihRtc3khIRKZYv3zNbs8SaQlQ= +SHA256 (cargo/security-framework-sys-2.8.0.tar.gz) = Mcm7KWBy6WH8vYhTUR3TnC2L4t6x4XxoYLHTBzKzI7Q= +SHA256 (cargo/semver-1.0.17.tar.gz) = vr02MybQXsPi9TKrdmBoDzsCEw14DCmbynNGnVIbwO0= +SHA256 (cargo/serde-1.0.156.tar.gz) = MUtbCSwK3hfAAUKVHlDO0RDsJ86jBLEDfGlpJGwkaaQ= +SHA256 (cargo/serde_derive-1.0.156.tar.gz) = 1+KcRgHja87HSiIyKNznlfTNNhY0Gkr5NSDKGoN8CH0= +SHA256 (cargo/serde_json-1.0.94.tar.gz) = HFM6WcnYqToJxqsx8P1eX03RuPyUNIBAKYOYhHZdBOo= +SHA256 (cargo/serde_spanned-0.6.1.tar.gz) = Dv2Mr1VqbOvTsoXK9IAEX8wawE9r14awmm8RrzDE/PQ= SHA256 (cargo/serde_urlencoded-0.7.1.tar.gz) = 00kcFHFcoilMTWqI8V6Ec5eIwdAw7tjBEENqr9qi8/0= -SHA256 (cargo/serde_yaml-0.9.9.tar.gz) = 9QhF9o1caTqsfXKiVBXd0hy4GCwE6v5Ee3OvVaBfnhs= -SHA256 (cargo/sha-1-0.10.0.tar.gz) = Ao9I1RP5Z4zaKPbkBkdVs/uyr2rNZy8sIJtiMj966g8= +SHA256 (cargo/serde_yaml-0.9.19.tar.gz) = +C5sjAR6pQpzKGMtBnvK5u84dyp54o2vMvc14OTz3RA= SHA256 (cargo/sha-1-0.8.2.tar.gz) = 99lNC+3pI7POph8/H/V/+M39d7QA+4+ZmJSeDPBBY98= -SHA256 (cargo/sha2-0.10.2.tar.gz) = Vd6uxg+B7v48zg3FC9qS1tjojyon33xQM7Qq/rHtJnY= -SHA256 (cargo/similar-2.2.0.tar.gz) = Yqx/kA2zK/P9EuARfdPcTadLxS66rJfzlmhEbYlpSAM= +SHA256 (cargo/sha2-0.10.6.tar.gz) = gua3lf4uOx6EW6/LJ6o1QFxNR838kq9fyNMAL3bOvcA= +SHA256 (cargo/simd-adler32-0.3.5.tar.gz) = I4q/u3fBkVEQrZaEZWCLaOhp4HcmIsllZxTnPloaUi8= +SHA256 (cargo/similar-2.2.1.tar.gz) = QgrLRK/a4DghDJnmmq4kEJ8y8VUAqnCOgdRsnynVX88= SHA256 (cargo/siphasher-0.3.10.tar.gz) = e9PjIGiZrz+LEq8oT6/AOMwdwrQdG4ndFylyIcXSJd4= -SHA256 (cargo/slab-0.4.7.tar.gz) = RhSnayqL4AWMqp27r2bZiFJ9htADwRqU+9M112Ye3O8= +SHA256 (cargo/skeptic-0.13.7.tar.gz) = FtI7AVZ2yQoPAcGXv9x4bCA0LHOgr92pAlrbC8QpQKg= +SHA256 (cargo/slab-0.4.8.tar.gz) = ZSg1HJvIqyI1P513bbOaICiOjWw374z+MxfPh17s/C0= SHA256 (cargo/slug-0.1.4.tar.gz) = s7x2LmpLbG/Krec+d/nrxpkbZ2+IuyNYvdtWVg8HM3M= -SHA256 (cargo/smallvec-1.9.0.tar.gz) = L9DbdJWX2R/4Yv0dVeqH94VadEqEJaZGlbb8ojfR2tE= -SHA256 (cargo/socket2-0.4.4.tar.gz) = ZtcrdZQ2rjKJiirwoUIY2/Ve/eP+6xcOtiNjfbhe4eA= +SHA256 (cargo/smallvec-1.10.0.tar.gz) = pQe+/nlUBEVjQd+rEM72bq1MBB9iuLEbu5K//l0JU+A= +SHA256 (cargo/socket2-0.4.9.tar.gz) = ZKSpEe7YXa8Yg0z6qGp5t9Jm/5P/W6FABUJiGUgO1mI= SHA256 (cargo/spin-0.5.2.tar.gz) = bmPP8yCuLFeQRnm6fLYygKPcRhOIW+r7FI7nv5qpBC0= -SHA256 (cargo/spin-0.9.4.tar.gz) = f2ACp2e/+eg/ju7PiD7LgBGHWiGujaQ7/7gXpX54zAk= +SHA256 (cargo/spin-0.9.6.tar.gz) = tdbgJQuTyEJ6F3uEnRRKltWsxXAGFJR5QD14YatyHjQ= SHA256 (cargo/static_assertions-1.1.0.tar.gz) = ouuTSbZESzJocuFA6xz158UiFU1p56D/sPuBwGs3VD8= -SHA256 (cargo/string_cache-0.8.4.tar.gz) = ITSUt6K1AxRihgSTeM4CtIIgBRmszDGHLui+kfqCCgg= +SHA256 (cargo/string_cache-0.8.7.tar.gz) = +RE452JC9XXrHTs4tPE2LxDTpD9H0YKls1mvSIoCKTs= SHA256 (cargo/string_cache_codegen-0.5.2.tar.gz) = a7MCibcivk/3SkCMPMJ+3qrWVuBssf6PqSMfpZxyiYg= SHA256 (cargo/strsim-0.10.0.tar.gz) = c0c8Dlnm1YEsXf4qBkpkRJSfCJ4g7smi5VBllklORiM= -SHA256 (cargo/svg_metadata-0.4.2.tar.gz) = 0582Ji7+YQlqF6pCFAsORLkYmAbD+nGrPP8SNCmTjrA= -SHA256 (cargo/syn-1.0.99.tar.gz) = WNvvbsZVBV4guGsVqMxtQ5zKGbZnU3rGoTaVctFRqxM= +SHA256 (cargo/svg_metadata-0.4.4.tar.gz) = pC89LG9UOoxXzbQ0aXM08z+vVvmswUHiu+S7GZQFUgA= +SHA256 (cargo/syn-1.0.109.tar.gz) = crZBkbJ1tm/+JGnorywc/juvpntSnq15Km0BYIiLQjc= SHA256 (cargo/syntect-5.0.0.tar.gz) = xsRUwn2dfZqEx4A6qjxQzQiNKQb+PG5C2jIJqmI1dqg= -SHA256 (cargo/tap-1.0.1.tar.gz) = VZN+F5kYWxKGPUR/Qll+1p2ZKGhrjYih3xc3agl9g2k= SHA256 (cargo/tar-0.4.38.tar.gz) = S1WAfANE4ebATXyWX1KJw5qNlK4j7VwLV6q6xUn4ccY= -SHA256 (cargo/tempfile-3.3.0.tar.gz) = XNse9OrurdyPvTceUBcFcGSvCRGQLvNrOYAfZ8xteeQ= +SHA256 (cargo/tempfile-3.4.0.tar.gz) = rxj3rhrNNUuZJALp7FhkNZ1pPNinncvvWfdokXAcHpU= SHA256 (cargo/tendril-0.4.3.tar.gz) = 0koSDF/EZKNFgkDuAsKZ68udZ7UknIhIsJ1jncqNe7A= -SHA256 (cargo/tera-1.17.0.tar.gz) = HUaF5yyzXw63QxnI/i07Yek9pWCYQc3iy4f8w76lbSA= -SHA256 (cargo/termcolor-1.1.3.tar.gz) = urJNMLkRsjdvOhPMLNRDFC8Mgd2gTBGGk+NbODV1d1U= -SHA256 (cargo/terminal_size-0.1.17.tar.gz) = YzwaVGzuhhoabQ3Gnr7KaTv0KWZhunhSudIdFZ4FBt8= -SHA256 (cargo/test-case-2.2.1.tar.gz) = B66pKelIiZi2StxBTCn+ViA5jwHC4/WBZBIrF+VnptU= -SHA256 (cargo/test-case-macros-2.2.1.tar.gz) = yVlo7txvxPXCGSDg9CZPeOxeTFa7OU8xm+zBpYMLPlQ= -SHA256 (cargo/textwrap-0.15.0.tar.gz) = sRQdTWEJWyhBniLLC78CdV9eVOBSb5fx49HRYOYIhfs= -SHA256 (cargo/thiserror-1.0.32.tar.gz) = 9fZYa392StwCMfTHm+e5IOdmuy8+UbNmHNsmOCjxmZQ= -SHA256 (cargo/thiserror-impl-1.0.32.tar.gz) = Err8W1RQfgFJzfGxRaXYCrgKkLzZJ130PU//aEYPbCE= +SHA256 (cargo/tera-1.18.1.tar.gz) = laZldRMC8ioDxWch4jCU5NwisEqA84Hmc3oHv3p8cMA= +SHA256 (cargo/termcolor-1.2.0.tar.gz) = vlXPiUL+rFx2XCyZNCKAaEPJqaRdTVxAetbdLqleubY= +SHA256 (cargo/test-case-3.0.0.tar.gz) = Z5sBn7JB2mLMRJszsiTRnr4cZ2e0lVaXZRFd1/f5+6Q= +SHA256 (cargo/test-case-core-3.0.0.tar.gz) = ctwhtYh/QDLEZWUC0IXcKPKvu2hvJfIWRyuwUm9LG4g= +SHA256 (cargo/test-case-macros-3.0.0.tar.gz) = 83homOC+FRqW9zD9UpsOihD1mQ+ip+oU43yidhPAUZA= +SHA256 (cargo/textwrap-0.16.0.tar.gz) = IioiKlv+G7pKd7RexIinQbPLiHLl5JlFH9fQEpycfD0= +SHA256 (cargo/thiserror-1.0.39.tar.gz) = pasBbbUQVG2FYpeIKAffjaZqFvuMQQHLizAFSw1bLZw= +SHA256 (cargo/thiserror-impl-1.0.39.tar.gz) = VCDULpCvDDjDKQq8yiW5s73zefyfVcUo9TomnZyaJn4= SHA256 (cargo/thread_local-1.1.4.tar.gz) = VRbCe3gxHFC/QsBxQlxWCseZsRwwsx+H4wgZZf5eAYA= -SHA256 (cargo/threadpool-1.8.1.tar.gz) = 0FDmCzPUHBkQizLOoyFkAzqQE/47RsvURXVZv793r6o= -SHA256 (cargo/tiff-0.7.3.tar.gz) = cllmLjLR4hkyHrMJ1fnYmLd5dp2Bt252LAfI5dOPy2U= -SHA256 (cargo/time-0.3.13.tar.gz) = 23b/n6SxRYs8fwd/P/mIc5QFhGDSHmNDVbJzqvEe6kU= -SHA256 (cargo/time-macros-0.2.4.tar.gz) = QmV7Gm9NgXzajnoKziYf4MyUbPOoAxQ5CyLMYa4IB5I= -SHA256 (cargo/tinystr-0.3.4.tar.gz) = KXOO7bQ4jZ6mIO6rk4SIT8Pwb1hqLt21a+3FiFEmx8E= +SHA256 (cargo/tiff-0.8.1.tar.gz) = dEkzT5/yuvKQ1V1zmDp9b6FeARmPrvcq8H4qjbhR5HE= +SHA256 (cargo/time-0.3.20.tar.gz) = zQy/7LTRm16nW7Ma2QTrW5+hPyEHnDuSAX699JmaWJA= +SHA256 (cargo/time-core-0.1.0.tar.gz) = LhU+HxrK74rMU35otEkG0ttkNuKzWsLGtCZA//kfAP0= +SHA256 (cargo/time-macros-0.2.8.tar.gz) = /YCmV+cdqBS45dYNM3T8bTUEUGIkXYAiR0iuUi3XbzY= +SHA256 (cargo/tinystr-0.7.1.tar.gz) = esP1toVukx4V4HtHjpjIBFI5gppl+RVtT6fneIGXpe8= SHA256 (cargo/tinyvec-1.6.0.tar.gz) = h8xc6zh1uyDCiQAFpOImpGUSZKXHXtskIbUoYaCgy1A= -SHA256 (cargo/tinyvec_macros-0.1.0.tar.gz) = zadNp+GmZPeVux+Kh+xAb7iaAlIs9uUGINAWrdbbv1w= -SHA256 (cargo/tokio-1.20.1.tar.gz) = eoMl9jp9R3TdBB42OyQJ7Rxcu9D4Z3leZh3wZrKwpYE= -SHA256 (cargo/tokio-native-tls-0.3.0.tar.gz) = 99mVZgvSt/jBVoQUwRJgdsE/u3JcQBEtwBILeOubcXs= +SHA256 (cargo/tinyvec_macros-0.1.1.tar.gz) = HzzLrDEf6gX4b2GQS0YrVfs9+IN6Nm38YBoBYdBTLyA= +SHA256 (cargo/tokio-1.26.0.tar.gz) = AyAdAcPCeinIpc7ltVqT3a4cz28I9lNlwskY+MG3b2Q= +SHA256 (cargo/tokio-native-tls-0.3.1.tar.gz) = u652q5M8hXdu+ryXFWndYRnFgNj11Eh2newXZL95bvI= SHA256 (cargo/tokio-rustls-0.23.4.tar.gz) = xD7oOQMRPgOYTLnlzr5sBKURYmnpAOPduo8GimKt2lk= -SHA256 (cargo/tokio-util-0.7.3.tar.gz) = zEY82N7dw3cNIPmFIUPVC/YJTmQLSFyy4YmiCZCF/0U= -SHA256 (cargo/toml-0.5.9.tar.gz) = jYLhp3WGIqRl+M7gd2FMc0hNrFuDbAL/akDV0QEDJNc= +SHA256 (cargo/tokio-util-0.7.7.tar.gz) = VCfYlFMAkyXeDY80LJSQAJ926ZnLdnLXfkYmdEj35rI= +SHA256 (cargo/toml-0.5.11.tar.gz) = 9Pfw3Y1QqFOlMcQmNZBFsZmPBCGdiHmYEHYs1K0xQjQ= +SHA256 (cargo/toml-0.7.3.tar.gz) = tAOs9vK7CFnJPH8Nlny0p1p6xVIQD5Mi+vZNwEdmmyE= +SHA256 (cargo/toml_datetime-0.6.1.tar.gz) = OrjtLt7hC1ATKu1fMxMzQosBHJlAK1pTQVTtFXRvliI= +SHA256 (cargo/toml_edit-0.19.7.tar.gz) = 3BhGZQGs2KxqP2Fd0po0OPjKa7OxlTcTizEG5XViEnQ= SHA256 (cargo/tower-service-0.3.2.tar.gz) = trwcnOK1E1rH+TxykY/Df+uHK9xqVTOouF60uGv9rlI= -SHA256 (cargo/tracing-0.1.36.tar.gz) = L86VZ71gpn0IoWSIdWchujkvJPKQBkAogeQ7GarGQwc= -SHA256 (cargo/tracing-core-0.1.29.tar.gz) = Wu6kMDB2VYoAcUuCP5rWfViju9od+D2IJ9IRkxVuIvc= -SHA256 (cargo/try-lock-0.2.3.tar.gz) = WVR7znHZw4uD2cDpK2BmxCUzcfFQBd7www2WV/UMdkI= -SHA256 (cargo/typenum-1.15.0.tar.gz) = 3PgaxZ7cF8yGl/8xHo9e8tmfy9mBezTOxm+QtsPf2Yc= -SHA256 (cargo/ucd-trie-0.1.4.tar.gz) = iVcFmcT+VYXeKziKq0fpn3+k6SOKE5n3B6AuNWBYFBw= +SHA256 (cargo/tracing-0.1.37.tar.gz) = jOjDOo1IvUXWJKblI0Rf0h7BPTZTzVH2gav2dBj1Trg= +SHA256 (cargo/tracing-core-0.1.30.tar.gz) = JOsDug6rH9hFBQBYzl5hZVjo+Nj8pjPmsWP+JceXITo= +SHA256 (cargo/try-lock-0.2.4.tar.gz) = NSjs/RLEZsbxYzY8ry0CpxFh3V4cxq57NCB+otQtge0= +SHA256 (cargo/typenum-1.16.0.tar.gz) = SXlh75PZdOI+tvQz61/ht5MLZZ8G0S3sb8RKj1VMC7o= +SHA256 (cargo/ucd-trie-0.1.5.tar.gz) = nnnE2ZbtuBbJHkMIUGd0RS5V6Vw8neB7ZynhfhWl74E= SHA256 (cargo/uncased-0.9.7.tar.gz) = CbAXArD9Cz+tz5jgmHgLrdqHQtT0p2dmFcrZDorHNiI= SHA256 (cargo/unic-char-property-0.9.0.tar.gz) = qMV6QH2bb6ArR5XrgcW2ZSBgoVp5A+qYHz1yPmwL4iE= SHA256 (cargo/unic-char-range-0.9.0.tar.gz) = A5gCLV9wBBT2uJnhC4NIIxq/kXP6kxRMvBpDuXk8H7w= SHA256 (cargo/unic-common-0.9.0.tar.gz) = gNf/glpqZU7oWmPoD5LwVPkE8h59EtpOIvmDSkqqNbw= -SHA256 (cargo/unic-langid-0.9.0.tar.gz) = czKPzXMKAwvbGd3yPhkhh6awHNmL5tMUBiKokSlFnOU= -SHA256 (cargo/unic-langid-impl-0.9.0.tar.gz) = GkqO6vBJSGLBQEyV7C9MM6Ks/1B29kMUtGXj3a4bk00= +SHA256 (cargo/unic-langid-0.9.1.tar.gz) = OY+a1yOdtE/Q+A/gaNEv8i14NUCAMypQd9xvUvFNzy8= +SHA256 (cargo/unic-langid-impl-0.9.1.tar.gz) = 41v9LyuHllRbVdfT/T6JoGE/aKDRyLwoy3/5a0EaNf8= SHA256 (cargo/unic-segment-0.9.0.tar.gz) = 5O1dJr5X+E8XYVcnDBEu9XuG3rrJzSHaqrvlbbD4jyM= SHA256 (cargo/unic-ucd-segment-0.9.0.tar.gz) = IHnBIqYiBbQh9JnaEPPuD3aX8BL1W2deACSDxz6jRwA= SHA256 (cargo/unic-ucd-version-0.9.0.tar.gz) = lr0vIjf+RQ/NCh0vX06RcREk94V7oulkJHd26+63sMQ= SHA256 (cargo/unicase-2.6.0.tar.gz) = UPN75hd5RgKqu+7gvk8lncF3j6vgXi1n7o95Mm1ctPY= -SHA256 (cargo/unicode-bidi-0.3.8.tar.gz) = CZtxKDAdKF953dVbmoPV5rnpfJLg6g2uvucmPpMt6ZI= -SHA256 (cargo/unicode-ident-1.0.3.tar.gz) = xPWzehVJmajz+YzCOmKNhQ4VRHnNlN7PNBRpbhLjGq8= -SHA256 (cargo/unicode-normalization-0.1.21.tar.gz) = hUy9xPe8auGcgg1Eq9wyd6w+GyuT2yCmNoJdkyL7YOY= -SHA256 (cargo/unicode-segmentation-1.9.0.tar.gz) = fogg9dd39iJNxL42MiIpcawwFk1KJY1ZVkB5lVTr/Zk= -SHA256 (cargo/unsafe-libyaml-0.2.2.tar.gz) = kxF5M0pWOVvPZLpeD/VngTgcGlgyF4KAx9f5HRZ5rrA= +SHA256 (cargo/unicode-bidi-0.3.11.tar.gz) = UktorKHQXgP98D/NzixslLba9tFoYd2qfk8rZjipBSw= +SHA256 (cargo/unicode-ident-1.0.8.tar.gz) = 5UZKh7I58TpjpQHycBVldUuuktJD1Lt+sS9tV9Imm/Q= +SHA256 (cargo/unicode-normalization-0.1.22.tar.gz) = XFcT8PxLXbZooqxjzbe7RGnYyf7QR7HQKSzHsM4rqSE= +SHA256 (cargo/unicode-segmentation-1.10.1.tar.gz) = HdYkCYVniVEYiGYJQxp8O49RbkHTDgZD8D2UWSoUfjY= +SHA256 (cargo/unicode-width-0.1.10.tar.gz) = wO3R5bFGU/eDdwvOSk2rtKUQilNwpfXYz+hxDDYfbIs= +SHA256 (cargo/unsafe-libyaml-0.2.7.tar.gz) = rSAkRSr9OHS/U5aV4Er2cyugZRdCTb+Vj9sWoB8772w= SHA256 (cargo/untrusted-0.7.1.tar.gz) = oVbGhMkep9YmJlCbzjy04dntXE2Xj3tDUmWPlqTCa0o= -SHA256 (cargo/url-2.2.2.tar.gz) = pQfDg7LTO1/DXRhh535rOD0Viy2l4U/lG4Pf7fb9V4w= +SHA256 (cargo/url-2.3.1.tar.gz) = DWjHma51diuMP+N1/rZgDvVgLIg8XSHrUcCfIrg8RkM= SHA256 (cargo/utf-8-0.7.6.tar.gz) = CcyO5y0qm+zy8v6+AgW77Y/GYVt8tCmtBi3Ht93QNqk= SHA256 (cargo/vcpkg-0.2.15.tar.gz) = rM1Opi97t6gv4jBm+wlX1I72d/buuCFfNy9S5IuzJCY= SHA256 (cargo/version_check-0.9.4.tar.gz) = SYdLUWe2XXGTuKuhVn9cfZPQAcr8NGAM7gA+2nh+SD8= @@ -361,16 +391,16 @@ SHA256 (cargo/walkdir-2.3.2.tar.gz) = gIzyc1zUtoZhE/ZIt5HGrcVxRTe8Ii2TR7sgM4b/2l SHA256 (cargo/want-0.3.0.tar.gz) = HOipaMsc0RDRNv+LgZpVbW+22Rk2PGFTT2hgx+sXK6A= SHA256 (cargo/wasi-0.11.0+wasi-snapshot-preview1.tar.gz) = nI2H5ytko7TbKNEc4pI3wkYYj09RBX1lp+q2O3mH5CM= SHA256 (cargo/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = zM3fMlVP7MastYX4KjKnLii0j4xMGIPd/u6qlvfY5Rk= -SHA256 (cargo/wasm-bindgen-0.2.82.tar.gz) = /HZS4/bEcGyNnNVIMsSkzLm1M24sO9FU1czPvxwfX30= -SHA256 (cargo/wasm-bindgen-backend-0.2.82.tar.gz) = ZizUSAVYa9UpcblYax34XNu9kRLk702PQVWcM03GrD8= -SHA256 (cargo/wasm-bindgen-futures-0.4.32.tar.gz) = +nb7Ihofis3fW1Ss6FkSYGmArWYax6UDtFcP/TpiTa0= -SHA256 (cargo/wasm-bindgen-macro-0.2.82.tar.gz) = smDxPTASBx37FRKEnAM7GSUDg3OupIztMBLAnflSxgI= -SHA256 (cargo/wasm-bindgen-macro-support-0.2.82.tar.gz) = W+jmVL3Zt5IWwpKauQchqoL69lxIzfCL3E5/UTV7gNo= -SHA256 (cargo/wasm-bindgen-shared-0.2.82.tar.gz) = ZZjdC9PH1RCV/2UxpbI+AqzcgYBOMNjwevt3tyFaFAo= -SHA256 (cargo/web-sys-0.3.59.tar.gz) = 7QVasn+UFCMZfrhrIDVyCxo85AUE3wgsrC7MbtczNaE= +SHA256 (cargo/wasm-bindgen-0.2.84.tar.gz) = MfjcvCHzDZuPLqkm7LWPa5EZLBfp0zWUs99YsgB8pTs= +SHA256 (cargo/wasm-bindgen-backend-0.2.84.tar.gz) = lc6Q/VvMBq9VpkGoZCjuQinkTgcDOWOiKQqOJBYHzLk= +SHA256 (cargo/wasm-bindgen-futures-0.4.34.tar.gz) = 8hng0hG6QCZpafbb3ZBjbaEvdb7k/J1sI9EmDa21FFQ= +SHA256 (cargo/wasm-bindgen-macro-0.2.84.tar.gz) = TCH3fAvtw3/V3CH4l4lKXKAee7FZiEVZRhhirpDAtMU= +SHA256 (cargo/wasm-bindgen-macro-support-0.2.84.tar.gz) = Kv+BMG/Kw8dRWtThd/UhtcmhXysI9OMtgjBmEC81pfY= +SHA256 (cargo/wasm-bindgen-shared-0.2.84.tar.gz) = AEb+9+KMOATl44v6MeoqD3OQUxm2d+V+vjfkk1iYm10= +SHA256 (cargo/web-sys-0.3.61.tar.gz) = 4zuZ9LI7o+7BpTrCZONadV8A6WbgBlB31gJ8D1dbC5c= SHA256 (cargo/webp-0.2.2.tar.gz) = zwIvgh8WYHmkB9AAq1foTeAg5m/7v07d6Zm8fW43HK4= SHA256 (cargo/webpki-0.22.0.tar.gz) = 8JXXgZLiCBgwgcwHvFUV71UhY5evSLhz5e3NcmN/ob0= -SHA256 (cargo/webpki-roots-0.22.4.tar.gz) = 8cdg8NNmpsJKAu14FuI+aR9dkikflNFeg2AG/RGwTa8= +SHA256 (cargo/webpki-roots-0.22.6.tar.gz) = tsceQNfSw0pRBjAftjInTKNyQs0MnT5k2+zjcaQKLYc= SHA256 (cargo/weezl-0.1.7.tar.gz) = kZMWTU3gOpJtkJ07x8MFQ87LNUAMAhFHksLK4g1eLbs= SHA256 (cargo/winapi-0.2.8.tar.gz) = Fn3J1pSam4V/NFEnXpEcP0QlWELB96dvM8VRA6kJCHo= SHA256 (cargo/winapi-0.3.9.tar.gz) = XIOaZ0/NepiVLlkyQupACr6TmSdGdh44ZBQF0osA9Bk= @@ -378,90 +408,106 @@ SHA256 (cargo/winapi-build-0.1.1.tar.gz) = LTFe7js0rKR5ey2msT7Ygmbm1hJWKgxGOQr4K SHA256 (cargo/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = rDuHxjYgQm3ZuZHlzgMp7/VFvMu7NPO+Cf9vtqtRt7Y= SHA256 (cargo/winapi-util-0.1.5.tar.gz) = cOxs6FuxWBUcrl5ch/lajpfSwMSwASI/M6M0485d4Xg= SHA256 (cargo/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = cS4ieEHQV8HuHNL7Ivp+WlRhro5I+iynnsQs/BkxGD8= -SHA256 (cargo/windows-sys-0.36.1.tar.gz) = 6gQVWhaln56reG/hKkpFDnXNsXX54NgNoeF9sJ9VuNI= -SHA256 (cargo/windows_aarch64_msvc-0.36.1.tar.gz) = m7jD/Tmt4tZ+mHSsTz2yHw1xC+4A/nyrFpSewYTuqkc= -SHA256 (cargo/windows_i686_gnu-0.36.1.tar.gz) = GA5szwHa9MQmuEbfxm2x/FGPB0uqeTqn2bmq7/rWo7Y= -SHA256 (cargo/windows_i686_msvc-0.36.1.tar.gz) = 4ueRcUiygS0e6vrrIql+SBPfpgo/j3jr4gS8yI8S8CQ= -SHA256 (cargo/windows_x86_64_gnu-0.36.1.tar.gz) = Tc0XG4d2xBuXUh5doSei2GrSgBFIB9Cyqx5GK8dk2eE= -SHA256 (cargo/windows_x86_64_msvc-0.36.1.tar.gz) = yBHKSoyFPvQgq9hZK6U927rJBBD6tpA7PnmXKmMfdoA= +SHA256 (cargo/windows-sys-0.42.0.tar.gz) = Wj4YIPCLhRP2dverbB+Z/zEvuXtVPTD/TdhvnxVyiqc= +SHA256 (cargo/windows-sys-0.45.0.tar.gz) = dSg75e+ygx036hQjZfAJwC7CA80po+vsvAk9UjFbZtA= +SHA256 (cargo/windows-targets-0.42.2.tar.gz) = jlGAwAzUTJsciK2zaTKR8c2TYF3tgMJQp11HJ1a00HE= +SHA256 (cargo/windows_aarch64_gnullvm-0.42.2.tar.gz) = WXpRGFcLaLwI2NWRJTMsVPG6nZre7e71uZsCuisGmPg= +SHA256 (cargo/windows_aarch64_msvc-0.42.2.tar.gz) = 4I6IZKYPBu8ND/S6BBJNuLD7O+V3alzUdkHpQuWMTUM= +SHA256 (cargo/windows_i686_gnu-0.42.2.tar.gz) = xh2SfY2kHalqgfApSJNT5oc5c3077KQxRciv7JoxqE8= +SHA256 (cargo/windows_i686_msvc-0.42.2.tar.gz) = RNhAtuxkn0gKQcjYD5xlEIuS2JNF3ZQCe/4GrERNEGA= +SHA256 (cargo/windows_x86_64_gnu-0.42.2.tar.gz) = jekSuLj+tVwGSGfPBH3aCX+S1R761bSR37mPa7twyzY= +SHA256 (cargo/windows_x86_64_gnullvm-0.42.2.tar.gz) = JtQbRqNtRTdIrt7xSG1ceoXbIuVq/zRkOYTqhVFOlKM= +SHA256 (cargo/windows_x86_64_msvc-0.42.2.tar.gz) = muxdozFSQVjG0aSsCrFUEUnAuVBf3gZCOwL17wEGufA= +SHA256 (cargo/winnow-0.3.6.tar.gz) = I9AgtEH5KZbIDZSukWboUB5Zx7tWEhGJ3J6rO9ghaWY= SHA256 (cargo/winreg-0.10.1.tar.gz) = gND04nLIXe8TlHY4CxL5rGCSZondLgHUkjIi9AWAhp0= SHA256 (cargo/winres-0.1.12.tar.gz) = to2yYe9Z6eUoBvaIAgYx6YdZK9g2Ge3M2pxH1CzeT2w= SHA256 (cargo/ws-0.9.2.tar.gz) = Jf6Qx18jagoAJH1ZACJq6k8tewXMw02p56iID/WbWEg= SHA256 (cargo/ws2_32-sys-0.2.1.tar.gz) = 1Zzv69DIkvot1t5YHpNzAdhVLLREic3/A1xhh8tj+l4= -SHA256 (cargo/wyz-0.2.0.tar.gz) = heYLDRtfmdslVpNOIZNwIHdqXTFSC/Fp6FGsROZCAhQ= SHA256 (cargo/xattr-0.2.3.tar.gz) = bRUmu+Wq616waIX02Ye836XiMYcFXem4P+ABVqgh+rw= -SHA256 (cargo/xml-rs-0.8.4.tar.gz) = 0tfTlIYT91yY/ZMoz9zEWsxNNgZVKJ0KfU7JMTkiAKM= -SHA256 (cargo/xmlparser-0.13.3.tar.gz) = EUuisk0hZ+9tZ9fQTIzIZSK4f0kAJfOfAwO321v149g= +SHA256 (cargo/xmlparser-0.13.5.tar.gz) = TSXHW/nqEsQECpf4KRVHaLu842Yofi3ARK8WDNeaE/0= SHA256 (cargo/yada-0.5.0.tar.gz) = ttEst6V7vyq2cO2VRbrjZIBIVH+QOSeaic4AAgjlhcE= SHA256 (cargo/yaml-rust-0.4.5.tar.gz) = VsGTbEzHocmrIaHrtgLrlCuoaMvUSpnLfNxYkjNeHIU= -SHA256 (zola-0.16.1.tar.gz) = wVP9DMFDWTCkhxFl5q1IZeNShGXz9B0GcamDcSFoisc= +SHA256 (cargo/zune-inflate-0.2.51.tar.gz) = oBcot5+5t+KKjBH3FeHNjcLNp0FqAH1mysVc67OorGs= +SHA256 (zola-0.17.2.tar.gz) = RxI484B2gDyyrxxTz0GCgK5RaU+8wuVH2j9nFacYx1A= SIZE (cargo/adler-1.0.2.tar.gz) = 12778 -SIZE (cargo/adler32-1.2.0.tar.gz) = 6411 -SIZE (cargo/ahash-0.8.0.tar.gz) = 39776 -SIZE (cargo/aho-corasick-0.7.18.tar.gz) = 112923 -SIZE (cargo/ammonia-3.2.0.tar.gz) = 44332 -SIZE (cargo/android_system_properties-0.1.4.tar.gz) = 4637 +SIZE (cargo/ahash-0.7.6.tar.gz) = 38030 +SIZE (cargo/ahash-0.8.3.tar.gz) = 42416 +SIZE (cargo/aho-corasick-0.7.20.tar.gz) = 111440 +SIZE (cargo/ammonia-3.3.0.tar.gz) = 46061 +SIZE (cargo/android_system_properties-0.1.5.tar.gz) = 5243 SIZE (cargo/any_ascii-0.1.7.tar.gz) = 220683 -SIZE (cargo/anyhow-1.0.61.tar.gz) = 43202 -SIZE (cargo/arrayvec-0.4.12.tar.gz) = 26551 +SIZE (cargo/anyhow-1.0.69.tar.gz) = 43576 SIZE (cargo/arrayvec-0.5.2.tar.gz) = 27838 +SIZE (cargo/arrayvec-0.7.2.tar.gz) = 29341 SIZE (cargo/assert-json-diff-2.0.2.tar.gz) = 10874 SIZE (cargo/atty-0.2.14.tar.gz) = 5470 SIZE (cargo/autocfg-1.1.0.tar.gz) = 13272 -SIZE (cargo/base64-0.13.0.tar.gz) = 62070 +SIZE (cargo/base64-0.21.0.tar.gz) = 72180 SIZE (cargo/bincode-1.3.3.tar.gz) = 28958 -SIZE (cargo/bit_field-0.10.1.tar.gz) = 10576 +SIZE (cargo/bit_field-0.10.2.tar.gz) = 10568 SIZE (cargo/bitflags-1.3.2.tar.gz) = 23021 -SIZE (cargo/bitvec-0.19.6.tar.gz) = 147956 -SIZE (cargo/block-buffer-0.10.2.tar.gz) = 10258 +SIZE (cargo/block-buffer-0.10.4.tar.gz) = 10538 SIZE (cargo/block-buffer-0.7.3.tar.gz) = 7179 SIZE (cargo/block-padding-0.1.5.tar.gz) = 7342 -SIZE (cargo/bstr-0.2.17.tar.gz) = 330350 +SIZE (cargo/bstr-1.3.0.tar.gz) = 340998 SIZE (cargo/build_const-0.2.2.tar.gz) = 4511 -SIZE (cargo/bumpalo-3.10.0.tar.gz) = 78915 +SIZE (cargo/bumpalo-3.12.0.tar.gz) = 81604 SIZE (cargo/byte-tools-0.3.1.tar.gz) = 5526 SIZE (cargo/bytecount-0.3.2.tar.gz) = 11026 SIZE (cargo/bytecount-0.6.3.tar.gz) = 12416 -SIZE (cargo/bytemuck-1.11.0.tar.gz) = 37041 +SIZE (cargo/bytemuck-1.13.1.tar.gz) = 42309 SIZE (cargo/byteorder-1.4.3.tar.gz) = 22512 SIZE (cargo/bytes-0.4.12.tar.gz) = 46361 -SIZE (cargo/bytes-1.2.1.tar.gz) = 54857 -SIZE (cargo/cc-1.0.73.tar.gz) = 57880 -SIZE (cargo/cedarwood-0.4.5.tar.gz) = 12132 +SIZE (cargo/bytes-1.4.0.tar.gz) = 58080 +SIZE (cargo/camino-1.1.4.tar.gz) = 32290 +SIZE (cargo/cargo-platform-0.1.2.tar.gz) = 11645 +SIZE (cargo/cargo_metadata-0.14.2.tar.gz) = 17469 +SIZE (cargo/cc-1.0.79.tar.gz) = 62624 +SIZE (cargo/cedarwood-0.4.6.tar.gz) = 12726 SIZE (cargo/cfg-if-0.1.10.tar.gz) = 7933 SIZE (cargo/cfg-if-1.0.0.tar.gz) = 7934 -SIZE (cargo/chrono-0.4.22.tar.gz) = 185570 -SIZE (cargo/chrono-tz-0.6.3.tar.gz) = 589734 -SIZE (cargo/chrono-tz-build-0.0.3.tar.gz) = 5768 -SIZE (cargo/clap-3.2.17.tar.gz) = 213699 -SIZE (cargo/clap_complete-3.2.4.tar.gz) = 31618 -SIZE (cargo/clap_derive-3.2.17.tar.gz) = 28217 +SIZE (cargo/chrono-0.4.24.tar.gz) = 191330 +SIZE (cargo/chrono-tz-0.6.1.tar.gz) = 585749 +SIZE (cargo/chrono-tz-build-0.0.2.tar.gz) = 5840 +SIZE (cargo/clap-3.2.23.tar.gz) = 219435 +SIZE (cargo/clap-4.1.8.tar.gz) = 207175 +SIZE (cargo/clap_complete-4.1.4.tar.gz) = 33288 +SIZE (cargo/clap_derive-3.2.18.tar.gz) = 28208 +SIZE (cargo/clap_derive-4.1.8.tar.gz) = 27889 SIZE (cargo/clap_lex-0.2.4.tar.gz) = 9652 +SIZE (cargo/clap_lex-0.3.2.tar.gz) = 9650 +SIZE (cargo/codemap-0.1.3.tar.gz) = 9483 +SIZE (cargo/codespan-reporting-0.11.1.tar.gz) = 48963 SIZE (cargo/color_quant-1.1.0.tar.gz) = 6649 SIZE (cargo/colored-2.0.0.tar.gz) = 21619 -SIZE (cargo/console-0.15.1.tar.gz) = 31674 +SIZE (cargo/console-0.15.5.tar.gz) = 34788 SIZE (cargo/convert_case-0.4.0.tar.gz) = 8098 SIZE (cargo/core-foundation-0.9.3.tar.gz) = 27059 SIZE (cargo/core-foundation-sys-0.8.3.tar.gz) = 17519 -SIZE (cargo/cpufeatures-0.2.2.tar.gz) = 10655 +SIZE (cargo/cpufeatures-0.2.5.tar.gz) = 11251 SIZE (cargo/crc-1.8.1.tar.gz) = 9114 SIZE (cargo/crc32fast-1.3.2.tar.gz) = 38661 -SIZE (cargo/crossbeam-channel-0.5.6.tar.gz) = 90292 -SIZE (cargo/crossbeam-deque-0.8.2.tar.gz) = 21237 -SIZE (cargo/crossbeam-epoch-0.9.10.tar.gz) = 46918 -SIZE (cargo/crossbeam-utils-0.8.11.tar.gz) = 40887 +SIZE (cargo/crossbeam-channel-0.5.7.tar.gz) = 90257 +SIZE (cargo/crossbeam-deque-0.8.3.tar.gz) = 21746 +SIZE (cargo/crossbeam-epoch-0.9.14.tar.gz) = 48524 +SIZE (cargo/crossbeam-utils-0.8.15.tar.gz) = 42326 +SIZE (cargo/crunchy-0.2.2.tar.gz) = 2995 SIZE (cargo/crypto-common-0.1.6.tar.gz) = 8760 -SIZE (cargo/css-minify-0.2.2.tar.gz) = 18731 -SIZE (cargo/csv-1.1.6.tar.gz) = 886999 +SIZE (cargo/css-minify-0.3.1.tar.gz) = 19917 +SIZE (cargo/csv-1.2.1.tar.gz) = 887936 SIZE (cargo/csv-core-0.1.10.tar.gz) = 25668 -SIZE (cargo/ctrlc-3.2.2.tar.gz) = 12699 -SIZE (cargo/deflate-1.0.0.tar.gz) = 62722 +SIZE (cargo/ctrlc-3.2.5.tar.gz) = 13282 +SIZE (cargo/cxx-1.0.92.tar.gz) = 195895 +SIZE (cargo/cxx-build-1.0.92.tar.gz) = 84461 +SIZE (cargo/cxxbridge-flags-1.0.92.tar.gz) = 5254 +SIZE (cargo/cxxbridge-macro-1.0.92.tar.gz) = 59533 SIZE (cargo/derive_more-0.99.17.tar.gz) = 55771 SIZE (cargo/deunicode-0.4.3.tar.gz) = 109535 -SIZE (cargo/digest-0.10.3.tar.gz) = 18990 +SIZE (cargo/digest-0.10.6.tar.gz) = 19527 SIZE (cargo/digest-0.8.1.tar.gz) = 9449 +SIZE (cargo/displaydoc-0.2.3.tar.gz) = 17060 SIZE (cargo/doc-comment-0.3.3.tar.gz) = 4123 -SIZE (cargo/either-1.7.0.tar.gz) = 15492 +SIZE (cargo/either-1.8.1.tar.gz) = 16027 SIZE (cargo/elasticlunr-rs-3.0.1.tar.gz) = 99022 SIZE (cargo/encode_unicode-0.3.6.tar.gz) = 45741 SIZE (cargo/encoding-0.2.33.tar.gz) = 88798 @@ -471,82 +517,91 @@ SIZE (cargo/encoding-index-simpchinese-1.20141219.5.tar.gz) = 130962 SIZE (cargo/encoding-index-singlebyte-1.20141219.5.tar.gz) = 14950 SIZE (cargo/encoding-index-tradchinese-1.20141219.5.tar.gz) = 120862 SIZE (cargo/encoding_index_tests-0.1.4.tar.gz) = 1631 -SIZE (cargo/encoding_rs-0.8.31.tar.gz) = 1370113 -SIZE (cargo/env_logger-0.9.0.tar.gz) = 33573 -SIZE (cargo/exr-1.4.2.tar.gz) = 235974 +SIZE (cargo/encoding_rs-0.8.32.tar.gz) = 1370046 +SIZE (cargo/env_logger-0.9.3.tar.gz) = 33291 +SIZE (cargo/errno-0.2.8.tar.gz) = 9276 +SIZE (cargo/errno-dragonfly-0.1.2.tar.gz) = 1810 +SIZE (cargo/error-chain-0.12.4.tar.gz) = 29274 +SIZE (cargo/exr-1.6.3.tar.gz) = 242130 SIZE (cargo/fake-simd-0.1.2.tar.gz) = 5398 -SIZE (cargo/fastrand-1.8.0.tar.gz) = 11369 -SIZE (cargo/filetime-0.2.17.tar.gz) = 14484 -SIZE (cargo/flate2-1.0.24.tar.gz) = 70191 +SIZE (cargo/fastrand-1.9.0.tar.gz) = 11910 +SIZE (cargo/filetime-0.2.20.tar.gz) = 15027 +SIZE (cargo/flate2-1.0.25.tar.gz) = 70210 SIZE (cargo/flume-0.10.14.tar.gz) = 65389 SIZE (cargo/fnv-1.0.7.tar.gz) = 11266 SIZE (cargo/foreign-types-0.3.2.tar.gz) = 7504 SIZE (cargo/foreign-types-shared-0.1.1.tar.gz) = 5672 -SIZE (cargo/form_urlencoded-1.0.1.tar.gz) = 8773 +SIZE (cargo/form_urlencoded-1.1.0.tar.gz) = 8734 SIZE (cargo/fsevent-0.4.0.tar.gz) = 7292 SIZE (cargo/fsevent-sys-2.0.1.tar.gz) = 3984 SIZE (cargo/fuchsia-zircon-0.3.3.tar.gz) = 22565 SIZE (cargo/fuchsia-zircon-sys-0.3.3.tar.gz) = 7191 -SIZE (cargo/funty-1.1.0.tar.gz) = 11631 SIZE (cargo/futf-0.1.5.tar.gz) = 11344 -SIZE (cargo/futures-channel-0.3.23.tar.gz) = 31951 -SIZE (cargo/futures-core-0.3.23.tar.gz) = 14605 -SIZE (cargo/futures-io-0.3.23.tar.gz) = 8906 -SIZE (cargo/futures-sink-0.3.23.tar.gz) = 7850 -SIZE (cargo/futures-task-0.3.23.tar.gz) = 11825 -SIZE (cargo/futures-util-0.3.23.tar.gz) = 155793 +SIZE (cargo/futures-channel-0.3.27.tar.gz) = 32278 +SIZE (cargo/futures-core-0.3.27.tar.gz) = 14709 +SIZE (cargo/futures-io-0.3.27.tar.gz) = 8912 +SIZE (cargo/futures-sink-0.3.27.tar.gz) = 7853 +SIZE (cargo/futures-task-0.3.27.tar.gz) = 11854 +SIZE (cargo/futures-util-0.3.27.tar.gz) = 158556 SIZE (cargo/fxhash-0.2.1.tar.gz) = 4102 SIZE (cargo/generic-array-0.12.4.tar.gz) = 18212 SIZE (cargo/generic-array-0.14.6.tar.gz) = 15889 SIZE (cargo/getrandom-0.1.16.tar.gz) = 25077 -SIZE (cargo/getrandom-0.2.7.tar.gz) = 28854 +SIZE (cargo/getrandom-0.2.8.tar.gz) = 30553 SIZE (cargo/gh-emoji-1.0.7.tar.gz) = 21780 SIZE (cargo/gif-0.11.4.tar.gz) = 634244 -SIZE (cargo/glob-0.3.0.tar.gz) = 18724 -SIZE (cargo/globset-0.4.9.tar.gz) = 22929 +SIZE (cargo/glob-0.3.1.tar.gz) = 18880 +SIZE (cargo/globset-0.4.10.tar.gz) = 22923 SIZE (cargo/globwalk-0.8.1.tar.gz) = 13705 -SIZE (cargo/h2-0.3.13.tar.gz) = 161962 -SIZE (cargo/half-1.8.2.tar.gz) = 41874 +SIZE (cargo/grass-0.12.3.tar.gz) = 10481 +SIZE (cargo/grass_compiler-0.12.3.tar.gz) = 163650 +SIZE (cargo/h2-0.3.16.tar.gz) = 162883 +SIZE (cargo/half-2.2.1.tar.gz) = 47021 SIZE (cargo/hashbrown-0.11.2.tar.gz) = 85713 SIZE (cargo/hashbrown-0.12.3.tar.gz) = 102968 -SIZE (cargo/heck-0.4.0.tar.gz) = 11161 +SIZE (cargo/heck-0.4.1.tar.gz) = 11567 SIZE (cargo/hermit-abi-0.1.19.tar.gz) = 9979 +SIZE (cargo/hermit-abi-0.2.6.tar.gz) = 13027 +SIZE (cargo/hermit-abi-0.3.1.tar.gz) = 13793 SIZE (cargo/html5ever-0.26.0.tar.gz) = 72921 -SIZE (cargo/http-0.2.8.tar.gz) = 105591 +SIZE (cargo/http-0.2.9.tar.gz) = 100146 SIZE (cargo/http-body-0.4.5.tar.gz) = 9242 -SIZE (cargo/httparse-1.7.1.tar.gz) = 29379 +SIZE (cargo/httparse-1.8.0.tar.gz) = 29954 SIZE (cargo/httpdate-1.0.2.tar.gz) = 10673 -SIZE (cargo/humansize-1.1.1.tar.gz) = 9131 +SIZE (cargo/humansize-2.1.3.tar.gz) = 11953 SIZE (cargo/humantime-2.1.0.tar.gz) = 16749 -SIZE (cargo/hyper-0.14.20.tar.gz) = 183885 -SIZE (cargo/hyper-rustls-0.23.0.tar.gz) = 29432 +SIZE (cargo/hyper-0.14.25.tar.gz) = 195127 +SIZE (cargo/hyper-rustls-0.23.2.tar.gz) = 30993 SIZE (cargo/hyper-tls-0.5.0.tar.gz) = 13257 -SIZE (cargo/iana-time-zone-0.1.44.tar.gz) = 14640 -SIZE (cargo/idna-0.2.3.tar.gz) = 271023 -SIZE (cargo/ignore-0.4.18.tar.gz) = 53174 -SIZE (cargo/image-0.24.3.tar.gz) = 265521 -SIZE (cargo/indexmap-1.9.1.tar.gz) = 54114 -SIZE (cargo/inflate-0.4.5.tar.gz) = 17715 +SIZE (cargo/iana-time-zone-0.1.53.tar.gz) = 20176 +SIZE (cargo/iana-time-zone-haiku-0.1.1.tar.gz) = 7200 +SIZE (cargo/idna-0.3.0.tar.gz) = 271128 +SIZE (cargo/ignore-0.4.20.tar.gz) = 53551 +SIZE (cargo/image-0.24.5.tar.gz) = 270381 +SIZE (cargo/indexmap-1.9.2.tar.gz) = 54627 SIZE (cargo/inotify-0.7.1.tar.gz) = 24637 SIZE (cargo/inotify-sys-0.1.5.tar.gz) = 6965 -SIZE (cargo/insta-1.18.2.tar.gz) = 532942 +SIZE (cargo/insta-1.28.0.tar.gz) = 543398 SIZE (cargo/instant-0.1.12.tar.gz) = 6128 +SIZE (cargo/io-lifetimes-1.0.6.tar.gz) = 36068 SIZE (cargo/iovec-0.1.4.tar.gz) = 8720 -SIZE (cargo/ipnet-2.5.0.tar.gz) = 25808 -SIZE (cargo/itoa-0.4.8.tar.gz) = 11926 -SIZE (cargo/itoa-1.0.3.tar.gz) = 10481 -SIZE (cargo/jieba-rs-0.6.6.tar.gz) = 4313683 -SIZE (cargo/jobserver-0.1.24.tar.gz) = 21303 -SIZE (cargo/jpeg-decoder-0.2.6.tar.gz) = 741477 -SIZE (cargo/js-sys-0.3.59.tar.gz) = 78849 -SIZE (cargo/kamadak-exif-0.5.4.tar.gz) = 51746 +SIZE (cargo/ipnet-2.7.1.tar.gz) = 26989 +SIZE (cargo/is-terminal-0.4.4.tar.gz) = 7744 +SIZE (cargo/itoa-1.0.6.tar.gz) = 10410 +SIZE (cargo/jieba-rs-0.6.7.tar.gz) = 4313903 +SIZE (cargo/jobserver-0.1.26.tar.gz) = 22645 +SIZE (cargo/jpeg-decoder-0.3.0.tar.gz) = 742671 +SIZE (cargo/js-sys-0.3.61.tar.gz) = 80158 +SIZE (cargo/kamadak-exif-0.5.5.tar.gz) = 54457 SIZE (cargo/kernel32-sys-0.2.2.tar.gz) = 24537 +SIZE (cargo/lasso-0.6.0.tar.gz) = 65816 SIZE (cargo/lazy_static-1.4.0.tar.gz) = 10443 SIZE (cargo/lazycell-1.3.0.tar.gz) = 12502 -SIZE (cargo/lebe-0.5.1.tar.gz) = 8050 +SIZE (cargo/lebe-0.5.2.tar.gz) = 8422 SIZE (cargo/lexical-core-0.7.6.tar.gz) = 494385 SIZE (cargo/lexical-sort-0.3.1.tar.gz) = 63689 -SIZE (cargo/libc-0.2.131.tar.gz) = 595288 +SIZE (cargo/libc-0.2.140.tar.gz) = 669153 +SIZE (cargo/libm-0.2.6.tar.gz) = 113690 SIZE (cargo/libwebp-sys-0.4.2.tar.gz) = 5079881 SIZE (cargo/lindera-0.14.0.tar.gz) = 21733 SIZE (cargo/lindera-cc-cedict-builder-0.13.5.tar.gz) = 10117 @@ -558,199 +613,208 @@ SIZE (cargo/lindera-ipadic-builder-0.13.5.tar.gz) = 12759 SIZE (cargo/lindera-ko-dic-builder-0.13.5.tar.gz) = 14925 SIZE (cargo/lindera-unidic-builder-0.13.5.tar.gz) = 11012 SIZE (cargo/line-wrap-0.1.1.tar.gz) = 10010 +SIZE (cargo/link-cplusplus-1.0.8.tar.gz) = 7674 SIZE (cargo/linked-hash-map-0.5.6.tar.gz) = 15049 -SIZE (cargo/lock_api-0.4.7.tar.gz) = 25371 +SIZE (cargo/linux-raw-sys-0.1.4.tar.gz) = 878981 +SIZE (cargo/lock_api-0.4.9.tar.gz) = 25685 SIZE (cargo/log-0.4.17.tar.gz) = 38028 SIZE (cargo/lzma-rs-0.2.0.tar.gz) = 26439 SIZE (cargo/mac-0.1.1.tar.gz) = 4838 SIZE (cargo/maplit-1.0.2.tar.gz) = 8871 SIZE (cargo/markup5ever-0.11.0.tar.gz) = 34667 -SIZE (cargo/matches-0.1.9.tar.gz) = 2246 SIZE (cargo/memchr-2.5.0.tar.gz) = 65812 -SIZE (cargo/memoffset-0.6.5.tar.gz) = 7686 +SIZE (cargo/memoffset-0.8.0.tar.gz) = 8912 SIZE (cargo/mime-0.3.16.tar.gz) = 15206 SIZE (cargo/mime_guess-2.0.4.tar.gz) = 26399 SIZE (cargo/minidom-0.12.0.tar.gz) = 20966 -SIZE (cargo/minify-html-0.9.2.tar.gz) = 116493 -SIZE (cargo/minify-js-0.1.5.tar.gz) = 52891 -SIZE (cargo/miniz_oxide-0.5.3.tar.gz) = 53452 +SIZE (cargo/minify-html-0.10.8.tar.gz) = 117131 +SIZE (cargo/minify-js-0.4.3.tar.gz) = 18268 +SIZE (cargo/minimal-lexical-0.2.1.tar.gz) = 94841 +SIZE (cargo/miniz_oxide-0.6.2.tar.gz) = 54536 SIZE (cargo/mio-0.6.23.tar.gz) = 103554 -SIZE (cargo/mio-0.8.4.tar.gz) = 93013 +SIZE (cargo/mio-0.8.6.tar.gz) = 93658 SIZE (cargo/mio-extras-2.0.6.tar.gz) = 16292 SIZE (cargo/miow-0.2.2.tar.gz) = 22044 -SIZE (cargo/mockito-0.31.0.tar.gz) = 28089 +SIZE (cargo/mockito-0.31.1.tar.gz) = 28194 SIZE (cargo/mutate_once-0.1.1.tar.gz) = 4276 SIZE (cargo/nanorand-0.7.0.tar.gz) = 18437 -SIZE (cargo/native-tls-0.2.10.tar.gz) = 28590 -SIZE (cargo/net2-0.2.37.tar.gz) = 21311 +SIZE (cargo/native-tls-0.2.11.tar.gz) = 29008 +SIZE (cargo/net2-0.2.38.tar.gz) = 20626 SIZE (cargo/new_debug_unreachable-1.0.4.tar.gz) = 2561 -SIZE (cargo/nix-0.24.2.tar.gz) = 264176 -SIZE (cargo/nodrop-0.1.14.tar.gz) = 7667 +SIZE (cargo/nix-0.26.2.tar.gz) = 277973 SIZE (cargo/nom-5.1.2.tar.gz) = 136174 -SIZE (cargo/nom-6.1.2.tar.gz) = 147539 +SIZE (cargo/nom-7.1.3.tar.gz) = 117570 SIZE (cargo/nom-bibtex-0.3.0.tar.gz) = 11587 SIZE (cargo/nom-tracable-0.5.2.tar.gz) = 6886 SIZE (cargo/nom-tracable-macros-0.5.2.tar.gz) = 1575 SIZE (cargo/nom_locate-1.0.0.tar.gz) = 14149 SIZE (cargo/nom_locate-2.1.0.tar.gz) = 17937 SIZE (cargo/notify-4.0.17.tar.gz) = 54419 -SIZE (cargo/num-format-0.4.0.tar.gz) = 59791 +SIZE (cargo/num-format-0.4.4.tar.gz) = 61509 SIZE (cargo/num-integer-0.1.45.tar.gz) = 22529 SIZE (cargo/num-rational-0.4.1.tar.gz) = 27889 SIZE (cargo/num-traits-0.2.15.tar.gz) = 49262 -SIZE (cargo/num_cpus-1.13.1.tar.gz) = 14752 +SIZE (cargo/num_cpus-1.15.0.tar.gz) = 15680 SIZE (cargo/num_threads-0.1.6.tar.gz) = 7334 -SIZE (cargo/once_cell-1.13.0.tar.gz) = 31726 +SIZE (cargo/once_cell-1.17.1.tar.gz) = 32856 SIZE (cargo/onig-6.4.0.tar.gz) = 32616 SIZE (cargo/onig_sys-69.8.1.tar.gz) = 638216 SIZE (cargo/opaque-debug-0.2.3.tar.gz) = 5643 -SIZE (cargo/open-3.0.2.tar.gz) = 15275 -SIZE (cargo/openssl-0.10.41.tar.gz) = 219460 +SIZE (cargo/open-3.4.0.tar.gz) = 17490 +SIZE (cargo/openssl-0.10.46.tar.gz) = 248171 SIZE (cargo/openssl-macros-0.1.0.tar.gz) = 5566 SIZE (cargo/openssl-probe-0.1.5.tar.gz) = 7227 -SIZE (cargo/openssl-sys-0.9.75.tar.gz) = 60028 -SIZE (cargo/os_str_bytes-6.3.0.tar.gz) = 22928 +SIZE (cargo/openssl-sys-0.9.81.tar.gz) = 62918 +SIZE (cargo/os_str_bytes-6.4.1.tar.gz) = 23101 SIZE (cargo/parking_lot-0.12.1.tar.gz) = 40967 -SIZE (cargo/parking_lot_core-0.9.3.tar.gz) = 32256 +SIZE (cargo/parking_lot_core-0.9.7.tar.gz) = 32412 +SIZE (cargo/parse-js-0.10.3.tar.gz) = 49643 SIZE (cargo/parse-zoneinfo-0.3.0.tar.gz) = 76590 SIZE (cargo/path-slash-0.2.1.tar.gz) = 8821 SIZE (cargo/pathdiff-0.2.1.tar.gz) = 7142 -SIZE (cargo/percent-encoding-2.1.0.tar.gz) = 9748 -SIZE (cargo/pest-2.2.1.tar.gz) = 83657 -SIZE (cargo/pest_derive-2.2.1.tar.gz) = 14146 -SIZE (cargo/pest_generator-2.2.1.tar.gz) = 14252 -SIZE (cargo/pest_meta-2.2.1.tar.gz) = 28303 +SIZE (cargo/percent-encoding-2.2.0.tar.gz) = 10075 +SIZE (cargo/pest-2.5.6.tar.gz) = 107851 +SIZE (cargo/pest_derive-2.5.6.tar.gz) = 18436 +SIZE (cargo/pest_generator-2.5.6.tar.gz) = 17068 +SIZE (cargo/pest_meta-2.5.6.tar.gz) = 33430 SIZE (cargo/phf-0.10.1.tar.gz) = 5406 SIZE (cargo/phf-0.11.1.tar.gz) = 17232 SIZE (cargo/phf_codegen-0.10.0.tar.gz) = 3402 SIZE (cargo/phf_codegen-0.11.1.tar.gz) = 9426 SIZE (cargo/phf_generator-0.10.0.tar.gz) = 7525 SIZE (cargo/phf_generator-0.11.1.tar.gz) = 11075 +SIZE (cargo/phf_macros-0.10.0.tar.gz) = 3552 SIZE (cargo/phf_shared-0.10.0.tar.gz) = 4095 SIZE (cargo/phf_shared-0.11.1.tar.gz) = 10320 -SIZE (cargo/pin-project-1.0.11.tar.gz) = 56669 -SIZE (cargo/pin-project-internal-1.0.11.tar.gz) = 27900 +SIZE (cargo/pin-project-1.0.12.tar.gz) = 56972 +SIZE (cargo/pin-project-internal-1.0.12.tar.gz) = 27956 SIZE (cargo/pin-project-lite-0.2.9.tar.gz) = 27713 SIZE (cargo/pin-utils-0.1.0.tar.gz) = 7580 -SIZE (cargo/pkg-config-0.3.25.tar.gz) = 16838 -SIZE (cargo/plist-1.3.1.tar.gz) = 44772 -SIZE (cargo/png-0.17.5.tar.gz) = 80450 -SIZE (cargo/ppv-lite86-0.2.16.tar.gz) = 22245 +SIZE (cargo/pkg-config-0.3.26.tar.gz) = 18662 +SIZE (cargo/plist-1.4.2.tar.gz) = 46187 +SIZE (cargo/png-0.17.7.tar.gz) = 80979 +SIZE (cargo/ppv-lite86-0.2.17.tar.gz) = 22242 SIZE (cargo/precomputed-hash-0.1.1.tar.gz) = 1640 SIZE (cargo/proc-macro-error-1.0.4.tar.gz) = 25293 SIZE (cargo/proc-macro-error-attr-1.0.4.tar.gz) = 7971 -SIZE (cargo/proc-macro2-1.0.43.tar.gz) = 41512 +SIZE (cargo/proc-macro-hack-0.5.20+deprecated.tar.gz) = 15045 +SIZE (cargo/proc-macro2-1.0.52.tar.gz) = 42982 SIZE (cargo/pulldown-cmark-0.9.2.tar.gz) = 115824 +SIZE (cargo/pure-rust-locales-0.5.6.tar.gz) = 159349 SIZE (cargo/quick-error-1.2.3.tar.gz) = 15066 SIZE (cargo/quick-xml-0.17.2.tar.gz) = 102776 +SIZE (cargo/quick-xml-0.27.1.tar.gz) = 146699 SIZE (cargo/quickxml_to_serde-0.5.0.tar.gz) = 13768 -SIZE (cargo/quote-1.0.21.tar.gz) = 28030 -SIZE (cargo/radium-0.5.3.tar.gz) = 7588 +SIZE (cargo/quote-1.0.26.tar.gz) = 28397 SIZE (cargo/rand-0.7.3.tar.gz) = 112246 SIZE (cargo/rand-0.8.5.tar.gz) = 87113 SIZE (cargo/rand_chacha-0.2.2.tar.gz) = 13267 SIZE (cargo/rand_chacha-0.3.1.tar.gz) = 15251 SIZE (cargo/rand_core-0.5.1.tar.gz) = 21116 -SIZE (cargo/rand_core-0.6.3.tar.gz) = 21938 +SIZE (cargo/rand_core-0.6.4.tar.gz) = 22666 SIZE (cargo/rand_hc-0.2.0.tar.gz) = 11670 -SIZE (cargo/rayon-1.5.3.tar.gz) = 167246 -SIZE (cargo/rayon-core-1.9.3.tar.gz) = 65300 +SIZE (cargo/rayon-1.7.0.tar.gz) = 169488 +SIZE (cargo/rayon-core-1.11.0.tar.gz) = 73118 SIZE (cargo/redox_syscall-0.2.16.tar.gz) = 24012 -SIZE (cargo/regex-1.6.0.tar.gz) = 239329 -SIZE (cargo/regex-automata-0.1.10.tar.gz) = 114533 -SIZE (cargo/regex-syntax-0.6.27.tar.gz) = 297300 -SIZE (cargo/relative-path-1.7.2.tar.gz) = 23738 -SIZE (cargo/remove_dir_all-0.5.3.tar.gz) = 9184 -SIZE (cargo/reqwest-0.11.11.tar.gz) = 142667 +SIZE (cargo/regex-1.7.1.tar.gz) = 239648 +SIZE (cargo/regex-syntax-0.6.28.tar.gz) = 299288 +SIZE (cargo/relative-path-1.8.0.tar.gz) = 24865 +SIZE (cargo/reqwest-0.11.14.tar.gz) = 145216 SIZE (cargo/ring-0.16.20.tar.gz) = 5082615 -SIZE (cargo/roxmltree-0.13.1.tar.gz) = 38393 +SIZE (cargo/roxmltree-0.18.0.tar.gz) = 42463 SIZE (cargo/rust-stemmers-1.2.0.tar.gz) = 2351301 +SIZE (cargo/rustc-hash-1.1.0.tar.gz) = 9331 SIZE (cargo/rustc_version-0.4.0.tar.gz) = 12175 -SIZE (cargo/rustls-0.20.6.tar.gz) = 259289 -SIZE (cargo/rustls-pemfile-1.0.1.tar.gz) = 19171 -SIZE (cargo/ryu-1.0.11.tar.gz) = 47007 +SIZE (cargo/rustix-0.36.9.tar.gz) = 293797 +SIZE (cargo/rustls-0.20.8.tar.gz) = 270142 +SIZE (cargo/rustls-pemfile-1.0.2.tar.gz) = 19347 +SIZE (cargo/ryu-1.0.13.tar.gz) = 46823 SIZE (cargo/safemem-0.3.3.tar.gz) = 7778 SIZE (cargo/same-file-1.0.6.tar.gz) = 10183 -SIZE (cargo/sass-rs-0.2.2.tar.gz) = 7268 -SIZE (cargo/sass-sys-0.4.22.tar.gz) = 340560 -SIZE (cargo/schannel-0.1.20.tar.gz) = 41579 +SIZE (cargo/schannel-0.1.21.tar.gz) = 41719 SIZE (cargo/scoped_threadpool-0.1.9.tar.gz) = 7800 SIZE (cargo/scopeguard-1.1.0.tar.gz) = 11470 +SIZE (cargo/scratch-1.0.5.tar.gz) = 8013 SIZE (cargo/sct-0.7.0.tar.gz) = 27502 -SIZE (cargo/security-framework-2.6.1.tar.gz) = 71688 -SIZE (cargo/security-framework-sys-2.6.1.tar.gz) = 17717 -SIZE (cargo/semver-1.0.13.tar.gz) = 29653 -SIZE (cargo/serde-1.0.143.tar.gz) = 76400 -SIZE (cargo/serde_derive-1.0.143.tar.gz) = 54877 -SIZE (cargo/serde_json-1.0.83.tar.gz) = 144566 +SIZE (cargo/security-framework-2.8.2.tar.gz) = 77045 +SIZE (cargo/security-framework-sys-2.8.0.tar.gz) = 17911 +SIZE (cargo/semver-1.0.17.tar.gz) = 29685 +SIZE (cargo/serde-1.0.156.tar.gz) = 77019 +SIZE (cargo/serde_derive-1.0.156.tar.gz) = 55113 +SIZE (cargo/serde_json-1.0.94.tar.gz) = 144406 +SIZE (cargo/serde_spanned-0.6.1.tar.gz) = 7828 SIZE (cargo/serde_urlencoded-0.7.1.tar.gz) = 12822 -SIZE (cargo/serde_yaml-0.9.9.tar.gz) = 62987 -SIZE (cargo/sha-1-0.10.0.tar.gz) = 12239 +SIZE (cargo/serde_yaml-0.9.19.tar.gz) = 63861 SIZE (cargo/sha-1-0.8.2.tar.gz) = 12338 -SIZE (cargo/sha2-0.10.2.tar.gz) = 20213 -SIZE (cargo/similar-2.2.0.tar.gz) = 50996 +SIZE (cargo/sha2-0.10.6.tar.gz) = 20558 +SIZE (cargo/simd-adler32-0.3.5.tar.gz) = 12132 +SIZE (cargo/similar-2.2.1.tar.gz) = 51147 SIZE (cargo/siphasher-0.3.10.tar.gz) = 9889 -SIZE (cargo/slab-0.4.7.tar.gz) = 16647 +SIZE (cargo/skeptic-0.13.7.tar.gz) = 13108 +SIZE (cargo/slab-0.4.8.tar.gz) = 16928 SIZE (cargo/slug-0.1.4.tar.gz) = 6640 -SIZE (cargo/smallvec-1.9.0.tar.gz) = 28396 -SIZE (cargo/socket2-0.4.4.tar.gz) = 44048 +SIZE (cargo/smallvec-1.10.0.tar.gz) = 31564 +SIZE (cargo/socket2-0.4.9.tar.gz) = 45421 SIZE (cargo/spin-0.5.2.tar.gz) = 12004 -SIZE (cargo/spin-0.9.4.tar.gz) = 30180 +SIZE (cargo/spin-0.9.6.tar.gz) = 34146 SIZE (cargo/static_assertions-1.1.0.tar.gz) = 18480 -SIZE (cargo/string_cache-0.8.4.tar.gz) = 16380 +SIZE (cargo/string_cache-0.8.7.tar.gz) = 16655 SIZE (cargo/string_cache_codegen-0.5.2.tar.gz) = 8156 SIZE (cargo/strsim-0.10.0.tar.gz) = 11355 -SIZE (cargo/svg_metadata-0.4.2.tar.gz) = 488377 -SIZE (cargo/syn-1.0.99.tar.gz) = 236084 +SIZE (cargo/svg_metadata-0.4.4.tar.gz) = 488903 +SIZE (cargo/syn-1.0.109.tar.gz) = 237611 SIZE (cargo/syntect-5.0.0.tar.gz) = 809452 -SIZE (cargo/tap-1.0.1.tar.gz) = 11316 SIZE (cargo/tar-0.4.38.tar.gz) = 49158 -SIZE (cargo/tempfile-3.3.0.tar.gz) = 27578 +SIZE (cargo/tempfile-3.4.0.tar.gz) = 30591 SIZE (cargo/tendril-0.4.3.tar.gz) = 37210 -SIZE (cargo/tera-1.17.0.tar.gz) = 97712 -SIZE (cargo/termcolor-1.1.3.tar.gz) = 17242 -SIZE (cargo/terminal_size-0.1.17.tar.gz) = 9141 -SIZE (cargo/test-case-2.2.1.tar.gz) = 7530 -SIZE (cargo/test-case-macros-2.2.1.tar.gz) = 10092 -SIZE (cargo/textwrap-0.15.0.tar.gz) = 52998 -SIZE (cargo/thiserror-1.0.32.tar.gz) = 17241 -SIZE (cargo/thiserror-impl-1.0.32.tar.gz) = 15347 +SIZE (cargo/tera-1.18.1.tar.gz) = 102781 +SIZE (cargo/termcolor-1.2.0.tar.gz) = 17917 +SIZE (cargo/test-case-3.0.0.tar.gz) = 7711 +SIZE (cargo/test-case-core-3.0.0.tar.gz) = 9383 +SIZE (cargo/test-case-macros-3.0.0.tar.gz) = 3413 +SIZE (cargo/textwrap-0.16.0.tar.gz) = 53722 +SIZE (cargo/thiserror-1.0.39.tar.gz) = 18729 +SIZE (cargo/thiserror-impl-1.0.39.tar.gz) = 15057 SIZE (cargo/thread_local-1.1.4.tar.gz) = 13106 -SIZE (cargo/threadpool-1.8.1.tar.gz) = 14408 -SIZE (cargo/tiff-0.7.3.tar.gz) = 1417896 -SIZE (cargo/time-0.3.13.tar.gz) = 92610 -SIZE (cargo/time-macros-0.2.4.tar.gz) = 18421 -SIZE (cargo/tinystr-0.3.4.tar.gz) = 19341 +SIZE (cargo/tiff-0.8.1.tar.gz) = 1417977 +SIZE (cargo/time-0.3.20.tar.gz) = 111856 +SIZE (cargo/time-core-0.1.0.tar.gz) = 6597 +SIZE (cargo/time-macros-0.2.8.tar.gz) = 24295 +SIZE (cargo/tinystr-0.7.1.tar.gz) = 15631 SIZE (cargo/tinyvec-1.6.0.tar.gz) = 45991 -SIZE (cargo/tinyvec_macros-0.1.0.tar.gz) = 1817 -SIZE (cargo/tokio-1.20.1.tar.gz) = 590375 -SIZE (cargo/tokio-native-tls-0.3.0.tar.gz) = 20759 +SIZE (cargo/tinyvec_macros-0.1.1.tar.gz) = 5865 +SIZE (cargo/tokio-1.26.0.tar.gz) = 646327 +SIZE (cargo/tokio-native-tls-0.3.1.tar.gz) = 20676 SIZE (cargo/tokio-rustls-0.23.4.tar.gz) = 27024 -SIZE (cargo/tokio-util-0.7.3.tar.gz) = 90513 -SIZE (cargo/toml-0.5.9.tar.gz) = 55667 +SIZE (cargo/tokio-util-0.7.7.tar.gz) = 100405 +SIZE (cargo/toml-0.5.11.tar.gz) = 54910 +SIZE (cargo/toml-0.7.3.tar.gz) = 47227 +SIZE (cargo/toml_datetime-0.6.1.tar.gz) = 10765 +SIZE (cargo/toml_edit-0.19.7.tar.gz) = 94609 SIZE (cargo/tower-service-0.3.2.tar.gz) = 6847 -SIZE (cargo/tracing-0.1.36.tar.gz) = 73238 -SIZE (cargo/tracing-core-0.1.29.tar.gz) = 58969 -SIZE (cargo/try-lock-0.2.3.tar.gz) = 4158 -SIZE (cargo/typenum-1.15.0.tar.gz) = 40741 -SIZE (cargo/ucd-trie-0.1.4.tar.gz) = 45365 +SIZE (cargo/tracing-0.1.37.tar.gz) = 73888 +SIZE (cargo/tracing-core-0.1.30.tar.gz) = 60351 +SIZE (cargo/try-lock-0.2.4.tar.gz) = 4467 +SIZE (cargo/typenum-1.16.0.tar.gz) = 42477 +SIZE (cargo/ucd-trie-0.1.5.tar.gz) = 45391 SIZE (cargo/uncased-0.9.7.tar.gz) = 10525 SIZE (cargo/unic-char-property-0.9.0.tar.gz) = 6809 SIZE (cargo/unic-char-range-0.9.0.tar.gz) = 7020 SIZE (cargo/unic-common-0.9.0.tar.gz) = 2558 -SIZE (cargo/unic-langid-0.9.0.tar.gz) = 3899 -SIZE (cargo/unic-langid-impl-0.9.0.tar.gz) = 33921 +SIZE (cargo/unic-langid-0.9.1.tar.gz) = 4001 +SIZE (cargo/unic-langid-impl-0.9.1.tar.gz) = 36438 SIZE (cargo/unic-segment-0.9.0.tar.gz) = 34848 SIZE (cargo/unic-ucd-segment-0.9.0.tar.gz) = 39262 SIZE (cargo/unic-ucd-version-0.9.0.tar.gz) = 2246 SIZE (cargo/unicase-2.6.0.tar.gz) = 23478 -SIZE (cargo/unicode-bidi-0.3.8.tar.gz) = 36575 -SIZE (cargo/unicode-ident-1.0.3.tar.gz) = 35031 -SIZE (cargo/unicode-normalization-0.1.21.tar.gz) = 121745 -SIZE (cargo/unicode-segmentation-1.9.0.tar.gz) = 93241 -SIZE (cargo/unsafe-libyaml-0.2.2.tar.gz) = 61118 +SIZE (cargo/unicode-bidi-0.3.11.tar.gz) = 43762 +SIZE (cargo/unicode-ident-1.0.8.tar.gz) = 41962 +SIZE (cargo/unicode-normalization-0.1.22.tar.gz) = 122604 +SIZE (cargo/unicode-segmentation-1.10.1.tar.gz) = 98416 +SIZE (cargo/unicode-width-0.1.10.tar.gz) = 18968 +SIZE (cargo/unsafe-libyaml-0.2.7.tar.gz) = 61483 SIZE (cargo/untrusted-0.7.1.tar.gz) = 7924 -SIZE (cargo/url-2.2.2.tar.gz) = 68555 +SIZE (cargo/url-2.3.1.tar.gz) = 72777 SIZE (cargo/utf-8-0.7.6.tar.gz) = 10422 SIZE (cargo/vcpkg-0.2.15.tar.gz) = 228735 SIZE (cargo/version_check-0.9.4.tar.gz) = 14895 @@ -758,16 +822,16 @@ SIZE (cargo/walkdir-2.3.2.tar.gz) = 23516 SIZE (cargo/want-0.3.0.tar.gz) = 6550 SIZE (cargo/wasi-0.11.0+wasi-snapshot-preview1.tar.gz) = 28131 SIZE (cargo/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = 31521 -SIZE (cargo/wasm-bindgen-0.2.82.tar.gz) = 166376 -SIZE (cargo/wasm-bindgen-backend-0.2.82.tar.gz) = 25764 -SIZE (cargo/wasm-bindgen-futures-0.4.32.tar.gz) = 15217 -SIZE (cargo/wasm-bindgen-macro-0.2.82.tar.gz) = 11808 -SIZE (cargo/wasm-bindgen-macro-support-0.2.82.tar.gz) = 18529 -SIZE (cargo/wasm-bindgen-shared-0.2.82.tar.gz) = 7197 -SIZE (cargo/web-sys-0.3.59.tar.gz) = 697461 +SIZE (cargo/wasm-bindgen-0.2.84.tar.gz) = 172947 +SIZE (cargo/wasm-bindgen-backend-0.2.84.tar.gz) = 26344 +SIZE (cargo/wasm-bindgen-futures-0.4.34.tar.gz) = 15117 +SIZE (cargo/wasm-bindgen-macro-0.2.84.tar.gz) = 12857 +SIZE (cargo/wasm-bindgen-macro-support-0.2.84.tar.gz) = 19076 +SIZE (cargo/wasm-bindgen-shared-0.2.84.tar.gz) = 7219 +SIZE (cargo/web-sys-0.3.61.tar.gz) = 706333 SIZE (cargo/webp-0.2.2.tar.gz) = 1848930 SIZE (cargo/webpki-0.22.0.tar.gz) = 58663 -SIZE (cargo/webpki-roots-0.22.4.tar.gz) = 250591 +SIZE (cargo/webpki-roots-0.22.6.tar.gz) = 242386 SIZE (cargo/weezl-0.1.7.tar.gz) = 42166 SIZE (cargo/winapi-0.2.8.tar.gz) = 455145 SIZE (cargo/winapi-0.3.9.tar.gz) = 1200382 @@ -775,20 +839,24 @@ SIZE (cargo/winapi-build-0.1.1.tar.gz) = 669 SIZE (cargo/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815 SIZE (cargo/winapi-util-0.1.5.tar.gz) = 10164 SIZE (cargo/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998 -SIZE (cargo/windows-sys-0.36.1.tar.gz) = 3347053 -SIZE (cargo/windows_aarch64_msvc-0.36.1.tar.gz) = 661960 -SIZE (cargo/windows_i686_gnu-0.36.1.tar.gz) = 818115 -SIZE (cargo/windows_i686_msvc-0.36.1.tar.gz) = 724575 -SIZE (cargo/windows_x86_64_gnu-0.36.1.tar.gz) = 790934 -SIZE (cargo/windows_x86_64_msvc-0.36.1.tar.gz) = 661999 +SIZE (cargo/windows-sys-0.42.0.tar.gz) = 3006791 +SIZE (cargo/windows-sys-0.45.0.tar.gz) = 2568659 +SIZE (cargo/windows-targets-0.42.2.tar.gz) = 5492 +SIZE (cargo/windows_aarch64_gnullvm-0.42.2.tar.gz) = 364071 +SIZE (cargo/windows_aarch64_msvc-0.42.2.tar.gz) = 666981 +SIZE (cargo/windows_i686_gnu-0.42.2.tar.gz) = 736236 +SIZE (cargo/windows_i686_msvc-0.42.2.tar.gz) = 724951 +SIZE (cargo/windows_x86_64_gnu-0.42.2.tar.gz) = 699373 +SIZE (cargo/windows_x86_64_gnullvm-0.42.2.tar.gz) = 364068 +SIZE (cargo/windows_x86_64_msvc-0.42.2.tar.gz) = 666936 +SIZE (cargo/winnow-0.3.6.tar.gz) = 176641 SIZE (cargo/winreg-0.10.1.tar.gz) = 25725 SIZE (cargo/winres-0.1.12.tar.gz) = 19772 SIZE (cargo/ws-0.9.2.tar.gz) = 65009 SIZE (cargo/ws2_32-sys-0.2.1.tar.gz) = 4697 -SIZE (cargo/wyz-0.2.0.tar.gz) = 12926 SIZE (cargo/xattr-0.2.3.tar.gz) = 11959 -SIZE (cargo/xml-rs-0.8.4.tar.gz) = 52690 -SIZE (cargo/xmlparser-0.13.3.tar.gz) = 25732 +SIZE (cargo/xmlparser-0.13.5.tar.gz) = 26225 SIZE (cargo/yada-0.5.0.tar.gz) = 13308 SIZE (cargo/yaml-rust-0.4.5.tar.gz) = 47783 -SIZE (zola-0.16.1.tar.gz) = 16621202 +SIZE (cargo/zune-inflate-0.2.51.tar.gz) = 37087 +SIZE (zola-0.17.2.tar.gz) = 17827268 diff --git a/www/zola/modules.inc b/www/zola/modules.inc index 62b4d6315..58fbfc620 100644 --- a/www/zola/modules.inc +++ b/www/zola/modules.inc @@ -1,70 +1,82 @@ MODCARGO_CRATES += adler 1.0.2 # 0BSD OR MIT OR Apache-2.0 -MODCARGO_CRATES += adler32 1.2.0 # Zlib -MODCARGO_CRATES += ahash 0.8.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += aho-corasick 0.7.18 # Unlicense/MIT -MODCARGO_CRATES += ammonia 3.2.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += android_system_properties 0.1.4 # MIT/Apache-2.0 +MODCARGO_CRATES += ahash 0.7.6 # MIT OR Apache-2.0 +MODCARGO_CRATES += ahash 0.8.3 # MIT OR Apache-2.0 +MODCARGO_CRATES += aho-corasick 0.7.20 # Unlicense OR MIT +MODCARGO_CRATES += ammonia 3.3.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += android_system_properties 0.1.5 # MIT/Apache-2.0 MODCARGO_CRATES += any_ascii 0.1.7 # ISC -MODCARGO_CRATES += anyhow 1.0.61 # MIT OR Apache-2.0 -MODCARGO_CRATES += arrayvec 0.4.12 # MIT/Apache-2.0 +MODCARGO_CRATES += anyhow 1.0.69 # MIT OR Apache-2.0 MODCARGO_CRATES += arrayvec 0.5.2 # MIT/Apache-2.0 +MODCARGO_CRATES += arrayvec 0.7.2 # MIT OR Apache-2.0 MODCARGO_CRATES += assert-json-diff 2.0.2 # MIT MODCARGO_CRATES += atty 0.2.14 # MIT MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT -MODCARGO_CRATES += base64 0.13.0 # MIT/Apache-2.0 +MODCARGO_CRATES += base64 0.21.0 # MIT OR Apache-2.0 MODCARGO_CRATES += bincode 1.3.3 # MIT -MODCARGO_CRATES += bit_field 0.10.1 # Apache-2.0/MIT +MODCARGO_CRATES += bit_field 0.10.2 # Apache-2.0/MIT MODCARGO_CRATES += bitflags 1.3.2 # MIT/Apache-2.0 -MODCARGO_CRATES += bitvec 0.19.6 # MIT MODCARGO_CRATES += block-buffer 0.7.3 # MIT OR Apache-2.0 -MODCARGO_CRATES += block-buffer 0.10.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += block-buffer 0.10.4 # MIT OR Apache-2.0 MODCARGO_CRATES += block-padding 0.1.5 # MIT OR Apache-2.0 -MODCARGO_CRATES += bstr 0.2.17 # MIT OR Apache-2.0 +MODCARGO_CRATES += bstr 1.3.0 # MIT OR Apache-2.0 MODCARGO_CRATES += build_const 0.2.2 # MIT -MODCARGO_CRATES += bumpalo 3.10.0 # MIT/Apache-2.0 +MODCARGO_CRATES += bumpalo 3.12.0 # MIT/Apache-2.0 MODCARGO_CRATES += byte-tools 0.3.1 # MIT OR Apache-2.0 MODCARGO_CRATES += bytecount 0.3.2 # Apache-2.0/MIT MODCARGO_CRATES += bytecount 0.6.3 # Apache-2.0/MIT -MODCARGO_CRATES += bytemuck 1.11.0 # Zlib OR Apache-2.0 OR MIT +MODCARGO_CRATES += bytemuck 1.13.1 # Zlib OR Apache-2.0 OR MIT MODCARGO_CRATES += byteorder 1.4.3 # Unlicense OR MIT MODCARGO_CRATES += bytes 0.4.12 # MIT -MODCARGO_CRATES += bytes 1.2.1 # MIT -MODCARGO_CRATES += cc 1.0.73 # MIT/Apache-2.0 -MODCARGO_CRATES += cedarwood 0.4.5 # BSD-2-Clause +MODCARGO_CRATES += bytes 1.4.0 # MIT +MODCARGO_CRATES += camino 1.1.4 # MIT OR Apache-2.0 +MODCARGO_CRATES += cargo-platform 0.1.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += cargo_metadata 0.14.2 # MIT +MODCARGO_CRATES += cc 1.0.79 # MIT OR Apache-2.0 +MODCARGO_CRATES += cedarwood 0.4.6 # BSD-2-Clause MODCARGO_CRATES += cfg-if 0.1.10 # MIT/Apache-2.0 MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0 -MODCARGO_CRATES += chrono 0.4.22 # MIT/Apache-2.0 -MODCARGO_CRATES += chrono-tz 0.6.3 # MIT/Apache-2.0 -MODCARGO_CRATES += chrono-tz-build 0.0.3 # MIT/Apache-2.0 -MODCARGO_CRATES += clap 3.2.17 # MIT OR Apache-2.0 -MODCARGO_CRATES += clap_complete 3.2.4 # MIT OR Apache-2.0 -MODCARGO_CRATES += clap_derive 3.2.17 # MIT OR Apache-2.0 +MODCARGO_CRATES += chrono 0.4.24 # MIT/Apache-2.0 +MODCARGO_CRATES += chrono-tz 0.6.1 # MIT/Apache-2.0 +MODCARGO_CRATES += chrono-tz-build 0.0.2 # MIT/Apache-2.0 +MODCARGO_CRATES += clap 3.2.23 # MIT OR Apache-2.0 +MODCARGO_CRATES += clap 4.1.8 # MIT OR Apache-2.0 +MODCARGO_CRATES += clap_complete 4.1.4 # MIT OR Apache-2.0 +MODCARGO_CRATES += clap_derive 3.2.18 # MIT OR Apache-2.0 +MODCARGO_CRATES += clap_derive 4.1.8 # MIT OR Apache-2.0 MODCARGO_CRATES += clap_lex 0.2.4 # MIT OR Apache-2.0 +MODCARGO_CRATES += clap_lex 0.3.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += codemap 0.1.3 # MIT/Apache-2.0 +MODCARGO_CRATES += codespan-reporting 0.11.1 # Apache-2.0 MODCARGO_CRATES += color_quant 1.1.0 # MIT MODCARGO_CRATES += colored 2.0.0 # MPL-2.0 -MODCARGO_CRATES += console 0.15.1 # MIT +MODCARGO_CRATES += console 0.15.5 # MIT MODCARGO_CRATES += convert_case 0.4.0 # MIT MODCARGO_CRATES += core-foundation 0.9.3 # MIT / Apache-2.0 MODCARGO_CRATES += core-foundation-sys 0.8.3 # MIT / Apache-2.0 -MODCARGO_CRATES += cpufeatures 0.2.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += cpufeatures 0.2.5 # MIT OR Apache-2.0 MODCARGO_CRATES += crc 1.8.1 # MIT OR Apache-2.0 MODCARGO_CRATES += crc32fast 1.3.2 # MIT OR Apache-2.0 -MODCARGO_CRATES += crossbeam-channel 0.5.6 # MIT OR Apache-2.0 -MODCARGO_CRATES += crossbeam-deque 0.8.2 # MIT OR Apache-2.0 -MODCARGO_CRATES += crossbeam-epoch 0.9.10 # MIT OR Apache-2.0 -MODCARGO_CRATES += crossbeam-utils 0.8.11 # MIT OR Apache-2.0 +MODCARGO_CRATES += crossbeam-channel 0.5.7 # MIT OR Apache-2.0 +MODCARGO_CRATES += crossbeam-deque 0.8.3 # MIT OR Apache-2.0 +MODCARGO_CRATES += crossbeam-epoch 0.9.14 # MIT OR Apache-2.0 +MODCARGO_CRATES += crossbeam-utils 0.8.15 # MIT OR Apache-2.0 +MODCARGO_CRATES += crunchy 0.2.2 # MIT MODCARGO_CRATES += crypto-common 0.1.6 # MIT OR Apache-2.0 -MODCARGO_CRATES += css-minify 0.2.2 # Apache-2.0/MIT -MODCARGO_CRATES += csv 1.1.6 # Unlicense/MIT +MODCARGO_CRATES += css-minify 0.3.1 # Apache-2.0/MIT +MODCARGO_CRATES += csv 1.2.1 # Unlicense/MIT MODCARGO_CRATES += csv-core 0.1.10 # Unlicense/MIT -MODCARGO_CRATES += ctrlc 3.2.2 # MIT/Apache-2.0 -MODCARGO_CRATES += deflate 1.0.0 # MIT/Apache-2.0 +MODCARGO_CRATES += ctrlc 3.2.5 # MIT/Apache-2.0 +MODCARGO_CRATES += cxx 1.0.92 # MIT OR Apache-2.0 +MODCARGO_CRATES += cxx-build 1.0.92 # MIT OR Apache-2.0 +MODCARGO_CRATES += cxxbridge-flags 1.0.92 # MIT OR Apache-2.0 +MODCARGO_CRATES += cxxbridge-macro 1.0.92 # MIT OR Apache-2.0 MODCARGO_CRATES += derive_more 0.99.17 # MIT MODCARGO_CRATES += deunicode 0.4.3 # BSD-3-Clause MODCARGO_CRATES += digest 0.8.1 # MIT OR Apache-2.0 -MODCARGO_CRATES += digest 0.10.3 # MIT OR Apache-2.0 +MODCARGO_CRATES += digest 0.10.6 # MIT OR Apache-2.0 +MODCARGO_CRATES += displaydoc 0.2.3 # MIT OR Apache-2.0 MODCARGO_CRATES += doc-comment 0.3.3 # MIT -MODCARGO_CRATES += either 1.7.0 # MIT/Apache-2.0 +MODCARGO_CRATES += either 1.8.1 # MIT OR Apache-2.0 MODCARGO_CRATES += elasticlunr-rs 3.0.1 # MIT/Apache-2.0 MODCARGO_CRATES += encode_unicode 0.3.6 # MIT/Apache-2.0 MODCARGO_CRATES += encoding 0.2.33 # MIT @@ -74,82 +86,91 @@ MODCARGO_CRATES += encoding-index-simpchinese 1.20141219.5 # CC0-1.0 MODCARGO_CRATES += encoding-index-singlebyte 1.20141219.5 # CC0-1.0 MODCARGO_CRATES += encoding-index-tradchinese 1.20141219.5 # CC0-1.0 MODCARGO_CRATES += encoding_index_tests 0.1.4 # CC0-1.0 -MODCARGO_CRATES += encoding_rs 0.8.31 # (Apache-2.0 OR MIT) AND BSD-3-Clause -MODCARGO_CRATES += env_logger 0.9.0 # MIT/Apache-2.0 -MODCARGO_CRATES += exr 1.4.2 # BSD-3-Clause +MODCARGO_CRATES += encoding_rs 0.8.32 # (Apache-2.0 OR MIT) AND BSD-3-Clause +MODCARGO_CRATES += env_logger 0.9.3 # MIT OR Apache-2.0 +MODCARGO_CRATES += errno 0.2.8 # MIT/Apache-2.0 +MODCARGO_CRATES += errno-dragonfly 0.1.2 # MIT +MODCARGO_CRATES += error-chain 0.12.4 # MIT/Apache-2.0 +MODCARGO_CRATES += exr 1.6.3 # BSD-3-Clause MODCARGO_CRATES += fake-simd 0.1.2 # MIT/Apache-2.0 -MODCARGO_CRATES += fastrand 1.8.0 # Apache-2.0 OR MIT -MODCARGO_CRATES += filetime 0.2.17 # MIT/Apache-2.0 -MODCARGO_CRATES += flate2 1.0.24 # MIT OR Apache-2.0 +MODCARGO_CRATES += fastrand 1.9.0 # Apache-2.0 OR MIT +MODCARGO_CRATES += filetime 0.2.20 # MIT/Apache-2.0 +MODCARGO_CRATES += flate2 1.0.25 # MIT OR Apache-2.0 MODCARGO_CRATES += flume 0.10.14 # Apache-2.0/MIT MODCARGO_CRATES += fnv 1.0.7 # Apache-2.0 / MIT MODCARGO_CRATES += foreign-types 0.3.2 # MIT/Apache-2.0 MODCARGO_CRATES += foreign-types-shared 0.1.1 # MIT/Apache-2.0 -MODCARGO_CRATES += form_urlencoded 1.0.1 # MIT/Apache-2.0 +MODCARGO_CRATES += form_urlencoded 1.1.0 # MIT OR Apache-2.0 MODCARGO_CRATES += fsevent 0.4.0 # MIT MODCARGO_CRATES += fsevent-sys 2.0.1 # MIT MODCARGO_CRATES += fuchsia-zircon 0.3.3 # BSD-3-Clause MODCARGO_CRATES += fuchsia-zircon-sys 0.3.3 # BSD-3-Clause -MODCARGO_CRATES += funty 1.1.0 # MIT MODCARGO_CRATES += futf 0.1.5 # MIT / Apache-2.0 -MODCARGO_CRATES += futures-channel 0.3.23 # MIT OR Apache-2.0 -MODCARGO_CRATES += futures-core 0.3.23 # MIT OR Apache-2.0 -MODCARGO_CRATES += futures-io 0.3.23 # MIT OR Apache-2.0 -MODCARGO_CRATES += futures-sink 0.3.23 # MIT OR Apache-2.0 -MODCARGO_CRATES += futures-task 0.3.23 # MIT OR Apache-2.0 -MODCARGO_CRATES += futures-util 0.3.23 # MIT OR Apache-2.0 +MODCARGO_CRATES += futures-channel 0.3.27 # MIT OR Apache-2.0 +MODCARGO_CRATES += futures-core 0.3.27 # MIT OR Apache-2.0 +MODCARGO_CRATES += futures-io 0.3.27 # MIT OR Apache-2.0 +MODCARGO_CRATES += futures-sink 0.3.27 # MIT OR Apache-2.0 +MODCARGO_CRATES += futures-task 0.3.27 # MIT OR Apache-2.0 +MODCARGO_CRATES += futures-util 0.3.27 # MIT OR Apache-2.0 MODCARGO_CRATES += fxhash 0.2.1 # Apache-2.0/MIT MODCARGO_CRATES += generic-array 0.12.4 # MIT MODCARGO_CRATES += generic-array 0.14.6 # MIT MODCARGO_CRATES += getrandom 0.1.16 # MIT OR Apache-2.0 -MODCARGO_CRATES += getrandom 0.2.7 # MIT OR Apache-2.0 +MODCARGO_CRATES += getrandom 0.2.8 # MIT OR Apache-2.0 MODCARGO_CRATES += gh-emoji 1.0.7 # MIT MODCARGO_CRATES += gif 0.11.4 # MIT/Apache-2.0 -MODCARGO_CRATES += glob 0.3.0 # MIT/Apache-2.0 -MODCARGO_CRATES += globset 0.4.9 # Unlicense OR MIT +MODCARGO_CRATES += glob 0.3.1 # MIT OR Apache-2.0 +MODCARGO_CRATES += globset 0.4.10 # Unlicense OR MIT MODCARGO_CRATES += globwalk 0.8.1 # MIT -MODCARGO_CRATES += h2 0.3.13 # MIT -MODCARGO_CRATES += half 1.8.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += grass 0.12.3 # MIT +MODCARGO_CRATES += grass_compiler 0.12.3 # MIT +MODCARGO_CRATES += h2 0.3.16 # MIT +MODCARGO_CRATES += half 2.2.1 # MIT OR Apache-2.0 MODCARGO_CRATES += hashbrown 0.11.2 # Apache-2.0/MIT MODCARGO_CRATES += hashbrown 0.12.3 # MIT OR Apache-2.0 -MODCARGO_CRATES += heck 0.4.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += heck 0.4.1 # MIT OR Apache-2.0 MODCARGO_CRATES += hermit-abi 0.1.19 # MIT/Apache-2.0 +MODCARGO_CRATES += hermit-abi 0.2.6 # MIT/Apache-2.0 +MODCARGO_CRATES += hermit-abi 0.3.1 # MIT OR Apache-2.0 MODCARGO_CRATES += html5ever 0.26.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += http 0.2.8 # MIT OR Apache-2.0 +MODCARGO_CRATES += http 0.2.9 # MIT OR Apache-2.0 MODCARGO_CRATES += http-body 0.4.5 # MIT -MODCARGO_CRATES += httparse 1.7.1 # MIT/Apache-2.0 +MODCARGO_CRATES += httparse 1.8.0 # MIT/Apache-2.0 MODCARGO_CRATES += httpdate 1.0.2 # MIT/Apache-2.0 -MODCARGO_CRATES += humansize 1.1.1 # MIT/Apache-2.0 +MODCARGO_CRATES += humansize 2.1.3 # MIT/Apache-2.0 MODCARGO_CRATES += humantime 2.1.0 # MIT/Apache-2.0 -MODCARGO_CRATES += hyper 0.14.20 # MIT -MODCARGO_CRATES += hyper-rustls 0.23.0 # Apache-2.0/ISC/MIT +MODCARGO_CRATES += hyper 0.14.25 # MIT +MODCARGO_CRATES += hyper-rustls 0.23.2 # Apache-2.0/ISC/MIT MODCARGO_CRATES += hyper-tls 0.5.0 # MIT/Apache-2.0 -MODCARGO_CRATES += iana-time-zone 0.1.44 # MIT OR Apache-2.0 -MODCARGO_CRATES += idna 0.2.3 # MIT/Apache-2.0 -MODCARGO_CRATES += ignore 0.4.18 # Unlicense/MIT -MODCARGO_CRATES += image 0.24.3 # MIT -MODCARGO_CRATES += indexmap 1.9.1 # Apache-2.0 OR MIT -MODCARGO_CRATES += inflate 0.4.5 # MIT +MODCARGO_CRATES += iana-time-zone 0.1.53 # MIT OR Apache-2.0 +MODCARGO_CRATES += iana-time-zone-haiku 0.1.1 # MIT OR Apache-2.0 +MODCARGO_CRATES += idna 0.3.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += ignore 0.4.20 # Unlicense OR MIT +MODCARGO_CRATES += image 0.24.5 # MIT +MODCARGO_CRATES += indexmap 1.9.2 # Apache-2.0 OR MIT MODCARGO_CRATES += inotify 0.7.1 # ISC MODCARGO_CRATES += inotify-sys 0.1.5 # ISC -MODCARGO_CRATES += insta 1.18.2 # Apache-2.0 +MODCARGO_CRATES += insta 1.28.0 # Apache-2.0 MODCARGO_CRATES += instant 0.1.12 # BSD-3-Clause +MODCARGO_CRATES += io-lifetimes 1.0.6 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT MODCARGO_CRATES += iovec 0.1.4 # MIT/Apache-2.0 -MODCARGO_CRATES += ipnet 2.5.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += itoa 0.4.8 # MIT OR Apache-2.0 -MODCARGO_CRATES += itoa 1.0.3 # MIT OR Apache-2.0 -MODCARGO_CRATES += jieba-rs 0.6.6 # MIT -MODCARGO_CRATES += jobserver 0.1.24 # MIT/Apache-2.0 -MODCARGO_CRATES += jpeg-decoder 0.2.6 # MIT / Apache-2.0 -MODCARGO_CRATES += js-sys 0.3.59 # MIT/Apache-2.0 -MODCARGO_CRATES += kamadak-exif 0.5.4 # BSD-2-Clause +MODCARGO_CRATES += ipnet 2.7.1 # MIT OR Apache-2.0 +MODCARGO_CRATES += is-terminal 0.4.4 # MIT +MODCARGO_CRATES += itoa 1.0.6 # MIT OR Apache-2.0 +MODCARGO_CRATES += jieba-rs 0.6.7 # MIT +MODCARGO_CRATES += jobserver 0.1.26 # MIT/Apache-2.0 +MODCARGO_CRATES += jpeg-decoder 0.3.0 # MIT / Apache-2.0 +MODCARGO_CRATES += js-sys 0.3.61 # MIT/Apache-2.0 +MODCARGO_CRATES += kamadak-exif 0.5.5 # BSD-2-Clause MODCARGO_CRATES += kernel32-sys 0.2.2 # MIT +MODCARGO_CRATES += lasso 0.6.0 # MIT OR Apache-2.0 MODCARGO_CRATES += lazy_static 1.4.0 # MIT/Apache-2.0 MODCARGO_CRATES += lazycell 1.3.0 # MIT/Apache-2.0 -MODCARGO_CRATES += lebe 0.5.1 # LICENSE.md +MODCARGO_CRATES += lebe 0.5.2 # BSD-3-Clause MODCARGO_CRATES += lexical-core 0.7.6 # MIT/Apache-2.0 MODCARGO_CRATES += lexical-sort 0.3.1 # MIT OR Apache-2.0 -MODCARGO_CRATES += libc 0.2.131 # MIT OR Apache-2.0 +MODCARGO_CRATES += libc 0.2.140 # MIT OR Apache-2.0 +MODCARGO_CRATES += libm 0.2.6 # MIT OR Apache-2.0 MODCARGO_CRATES += libwebp-sys 0.4.2 # MIT MODCARGO_CRATES += lindera 0.14.0 # MIT MODCARGO_CRATES += lindera-cc-cedict-builder 0.13.5 # MIT @@ -161,199 +182,208 @@ MODCARGO_CRATES += lindera-ipadic-builder 0.13.5 # MIT MODCARGO_CRATES += lindera-ko-dic-builder 0.13.5 # MIT MODCARGO_CRATES += lindera-unidic-builder 0.13.5 # MIT MODCARGO_CRATES += line-wrap 0.1.1 # Apache-2.0 +MODCARGO_CRATES += link-cplusplus 1.0.8 # MIT OR Apache-2.0 MODCARGO_CRATES += linked-hash-map 0.5.6 # MIT/Apache-2.0 -MODCARGO_CRATES += lock_api 0.4.7 # MIT OR Apache-2.0 +MODCARGO_CRATES += linux-raw-sys 0.1.4 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +MODCARGO_CRATES += lock_api 0.4.9 # MIT OR Apache-2.0 MODCARGO_CRATES += log 0.4.17 # MIT OR Apache-2.0 MODCARGO_CRATES += lzma-rs 0.2.0 # MIT MODCARGO_CRATES += mac 0.1.1 # MIT/Apache-2.0 MODCARGO_CRATES += maplit 1.0.2 # MIT/Apache-2.0 MODCARGO_CRATES += markup5ever 0.11.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += matches 0.1.9 # MIT MODCARGO_CRATES += memchr 2.5.0 # Unlicense/MIT -MODCARGO_CRATES += memoffset 0.6.5 # MIT +MODCARGO_CRATES += memoffset 0.8.0 # MIT MODCARGO_CRATES += mime 0.3.16 # MIT/Apache-2.0 MODCARGO_CRATES += mime_guess 2.0.4 # MIT MODCARGO_CRATES += minidom 0.12.0 # MPL-2.0 -MODCARGO_CRATES += minify-html 0.9.2 # MIT -MODCARGO_CRATES += minify-js 0.1.5 # Apache-2.0 -MODCARGO_CRATES += miniz_oxide 0.5.3 # MIT OR Zlib OR Apache-2.0 +MODCARGO_CRATES += minify-html 0.10.8 # MIT +MODCARGO_CRATES += minify-js 0.4.3 # Apache-2.0 +MODCARGO_CRATES += minimal-lexical 0.2.1 # MIT/Apache-2.0 +MODCARGO_CRATES += miniz_oxide 0.6.2 # MIT OR Zlib OR Apache-2.0 MODCARGO_CRATES += mio 0.6.23 # MIT -MODCARGO_CRATES += mio 0.8.4 # MIT +MODCARGO_CRATES += mio 0.8.6 # MIT MODCARGO_CRATES += mio-extras 2.0.6 # MIT OR Apache-2.0 MODCARGO_CRATES += miow 0.2.2 # MIT/Apache-2.0 -MODCARGO_CRATES += mockito 0.31.0 # MIT +MODCARGO_CRATES += mockito 0.31.1 # MIT MODCARGO_CRATES += mutate_once 0.1.1 # BSD-2-Clause MODCARGO_CRATES += nanorand 0.7.0 # Zlib -MODCARGO_CRATES += native-tls 0.2.10 # MIT/Apache-2.0 -MODCARGO_CRATES += net2 0.2.37 # MIT/Apache-2.0 +MODCARGO_CRATES += native-tls 0.2.11 # MIT/Apache-2.0 +MODCARGO_CRATES += net2 0.2.38 # MIT/Apache-2.0 MODCARGO_CRATES += new_debug_unreachable 1.0.4 # MIT -MODCARGO_CRATES += nix 0.24.2 # MIT -MODCARGO_CRATES += nodrop 0.1.14 # MIT/Apache-2.0 +MODCARGO_CRATES += nix 0.26.2 # MIT MODCARGO_CRATES += nom 5.1.2 # MIT -MODCARGO_CRATES += nom 6.1.2 # MIT +MODCARGO_CRATES += nom 7.1.3 # MIT MODCARGO_CRATES += nom-bibtex 0.3.0 # MIT MODCARGO_CRATES += nom-tracable 0.5.2 # MIT OR Apache-2.0 MODCARGO_CRATES += nom-tracable-macros 0.5.2 # MIT OR Apache-2.0 MODCARGO_CRATES += nom_locate 1.0.0 # MIT MODCARGO_CRATES += nom_locate 2.1.0 # MIT MODCARGO_CRATES += notify 4.0.17 # CC0-1.0 -MODCARGO_CRATES += num-format 0.4.0 # MIT/Apache-2.0 +MODCARGO_CRATES += num-format 0.4.4 # MIT/Apache-2.0 MODCARGO_CRATES += num-integer 0.1.45 # MIT OR Apache-2.0 MODCARGO_CRATES += num-rational 0.4.1 # MIT OR Apache-2.0 MODCARGO_CRATES += num-traits 0.2.15 # MIT OR Apache-2.0 -MODCARGO_CRATES += num_cpus 1.13.1 # MIT OR Apache-2.0 +MODCARGO_CRATES += num_cpus 1.15.0 # MIT OR Apache-2.0 MODCARGO_CRATES += num_threads 0.1.6 # MIT OR Apache-2.0 -MODCARGO_CRATES += once_cell 1.13.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += once_cell 1.17.1 # MIT OR Apache-2.0 MODCARGO_CRATES += onig 6.4.0 # MIT MODCARGO_CRATES += onig_sys 69.8.1 # MIT MODCARGO_CRATES += opaque-debug 0.2.3 # MIT OR Apache-2.0 -MODCARGO_CRATES += open 3.0.2 # MIT -MODCARGO_CRATES += openssl 0.10.41 # Apache-2.0 +MODCARGO_CRATES += open 3.4.0 # MIT +MODCARGO_CRATES += openssl 0.10.46 # Apache-2.0 MODCARGO_CRATES += openssl-macros 0.1.0 # MIT/Apache-2.0 MODCARGO_CRATES += openssl-probe 0.1.5 # MIT/Apache-2.0 -MODCARGO_CRATES += openssl-sys 0.9.75 # MIT -MODCARGO_CRATES += os_str_bytes 6.3.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += openssl-sys 0.9.81 # MIT +MODCARGO_CRATES += os_str_bytes 6.4.1 # MIT OR Apache-2.0 MODCARGO_CRATES += parking_lot 0.12.1 # MIT OR Apache-2.0 -MODCARGO_CRATES += parking_lot_core 0.9.3 # MIT OR Apache-2.0 +MODCARGO_CRATES += parking_lot_core 0.9.7 # MIT OR Apache-2.0 +MODCARGO_CRATES += parse-js 0.10.3 # Apache-2.0 MODCARGO_CRATES += parse-zoneinfo 0.3.0 # MIT MODCARGO_CRATES += path-slash 0.2.1 # MIT MODCARGO_CRATES += pathdiff 0.2.1 # MIT/Apache-2.0 -MODCARGO_CRATES += percent-encoding 2.1.0 # MIT/Apache-2.0 -MODCARGO_CRATES += pest 2.2.1 # MIT/Apache-2.0 -MODCARGO_CRATES += pest_derive 2.2.1 # MIT/Apache-2.0 -MODCARGO_CRATES += pest_generator 2.2.1 # MIT/Apache-2.0 -MODCARGO_CRATES += pest_meta 2.2.1 # MIT/Apache-2.0 +MODCARGO_CRATES += percent-encoding 2.2.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += pest 2.5.6 # MIT/Apache-2.0 +MODCARGO_CRATES += pest_derive 2.5.6 # MIT/Apache-2.0 +MODCARGO_CRATES += pest_generator 2.5.6 # MIT/Apache-2.0 +MODCARGO_CRATES += pest_meta 2.5.6 # MIT/Apache-2.0 MODCARGO_CRATES += phf 0.10.1 # MIT MODCARGO_CRATES += phf 0.11.1 # MIT MODCARGO_CRATES += phf_codegen 0.10.0 # MIT MODCARGO_CRATES += phf_codegen 0.11.1 # MIT MODCARGO_CRATES += phf_generator 0.10.0 # MIT MODCARGO_CRATES += phf_generator 0.11.1 # MIT +MODCARGO_CRATES += phf_macros 0.10.0 # MIT MODCARGO_CRATES += phf_shared 0.10.0 # MIT MODCARGO_CRATES += phf_shared 0.11.1 # MIT -MODCARGO_CRATES += pin-project 1.0.11 # Apache-2.0 OR MIT -MODCARGO_CRATES += pin-project-internal 1.0.11 # Apache-2.0 OR MIT +MODCARGO_CRATES += pin-project 1.0.12 # Apache-2.0 OR MIT +MODCARGO_CRATES += pin-project-internal 1.0.12 # Apache-2.0 OR MIT MODCARGO_CRATES += pin-project-lite 0.2.9 # Apache-2.0 OR MIT MODCARGO_CRATES += pin-utils 0.1.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += pkg-config 0.3.25 # MIT OR Apache-2.0 -MODCARGO_CRATES += plist 1.3.1 # MIT -MODCARGO_CRATES += png 0.17.5 # MIT OR Apache-2.0 -MODCARGO_CRATES += ppv-lite86 0.2.16 # MIT/Apache-2.0 +MODCARGO_CRATES += pkg-config 0.3.26 # MIT OR Apache-2.0 +MODCARGO_CRATES += plist 1.4.2 # MIT +MODCARGO_CRATES += png 0.17.7 # MIT OR Apache-2.0 +MODCARGO_CRATES += ppv-lite86 0.2.17 # MIT/Apache-2.0 MODCARGO_CRATES += precomputed-hash 0.1.1 # MIT MODCARGO_CRATES += proc-macro-error 1.0.4 # MIT OR Apache-2.0 MODCARGO_CRATES += proc-macro-error-attr 1.0.4 # MIT OR Apache-2.0 -MODCARGO_CRATES += proc-macro2 1.0.43 # MIT OR Apache-2.0 +MODCARGO_CRATES += proc-macro-hack 0.5.20+deprecated # MIT OR Apache-2.0 +MODCARGO_CRATES += proc-macro2 1.0.52 # MIT OR Apache-2.0 MODCARGO_CRATES += pulldown-cmark 0.9.2 # MIT +MODCARGO_CRATES += pure-rust-locales 0.5.6 # MIT OR Apache-2.0 MODCARGO_CRATES += quick-error 1.2.3 # MIT/Apache-2.0 MODCARGO_CRATES += quick-xml 0.17.2 # MIT +MODCARGO_CRATES += quick-xml 0.27.1 # MIT MODCARGO_CRATES += quickxml_to_serde 0.5.0 # MIT -MODCARGO_CRATES += quote 1.0.21 # MIT OR Apache-2.0 -MODCARGO_CRATES += radium 0.5.3 # MIT +MODCARGO_CRATES += quote 1.0.26 # MIT OR Apache-2.0 MODCARGO_CRATES += rand 0.7.3 # MIT OR Apache-2.0 MODCARGO_CRATES += rand 0.8.5 # MIT OR Apache-2.0 MODCARGO_CRATES += rand_chacha 0.2.2 # MIT OR Apache-2.0 MODCARGO_CRATES += rand_chacha 0.3.1 # MIT OR Apache-2.0 MODCARGO_CRATES += rand_core 0.5.1 # MIT OR Apache-2.0 -MODCARGO_CRATES += rand_core 0.6.3 # MIT OR Apache-2.0 +MODCARGO_CRATES += rand_core 0.6.4 # MIT OR Apache-2.0 MODCARGO_CRATES += rand_hc 0.2.0 # MIT/Apache-2.0 -MODCARGO_CRATES += rayon 1.5.3 # MIT OR Apache-2.0 -MODCARGO_CRATES += rayon-core 1.9.3 # MIT OR Apache-2.0 +MODCARGO_CRATES += rayon 1.7.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += rayon-core 1.11.0 # MIT OR Apache-2.0 MODCARGO_CRATES += redox_syscall 0.2.16 # MIT -MODCARGO_CRATES += regex 1.6.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += regex-automata 0.1.10 # Unlicense/MIT -MODCARGO_CRATES += regex-syntax 0.6.27 # MIT OR Apache-2.0 -MODCARGO_CRATES += relative-path 1.7.2 # MIT/Apache-2.0 -MODCARGO_CRATES += remove_dir_all 0.5.3 # MIT/Apache-2.0 -MODCARGO_CRATES += reqwest 0.11.11 # MIT/Apache-2.0 +MODCARGO_CRATES += regex 1.7.1 # MIT OR Apache-2.0 +MODCARGO_CRATES += regex-syntax 0.6.28 # MIT OR Apache-2.0 +MODCARGO_CRATES += relative-path 1.8.0 # MIT/Apache-2.0 +MODCARGO_CRATES += reqwest 0.11.14 # MIT OR Apache-2.0 MODCARGO_CRATES += ring 0.16.20 # LICENSE -MODCARGO_CRATES += roxmltree 0.13.1 # MIT/Apache-2.0 +MODCARGO_CRATES += roxmltree 0.18.0 # MIT OR Apache-2.0 MODCARGO_CRATES += rust-stemmers 1.2.0 # MIT/BSD-3-Clause +MODCARGO_CRATES += rustc-hash 1.1.0 # Apache-2.0/MIT MODCARGO_CRATES += rustc_version 0.4.0 # MIT/Apache-2.0 -MODCARGO_CRATES += rustls 0.20.6 # Apache-2.0/ISC/MIT -MODCARGO_CRATES += rustls-pemfile 1.0.1 # Apache-2.0 OR ISC OR MIT -MODCARGO_CRATES += ryu 1.0.11 # Apache-2.0 OR BSL-1.0 +MODCARGO_CRATES += rustix 0.36.9 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +MODCARGO_CRATES += rustls 0.20.8 # Apache-2.0/ISC/MIT +MODCARGO_CRATES += rustls-pemfile 1.0.2 # Apache-2.0 OR ISC OR MIT +MODCARGO_CRATES += ryu 1.0.13 # Apache-2.0 OR BSL-1.0 MODCARGO_CRATES += safemem 0.3.3 # MIT/Apache-2.0 MODCARGO_CRATES += same-file 1.0.6 # Unlicense/MIT -MODCARGO_CRATES += sass-rs 0.2.2 # MIT -MODCARGO_CRATES += sass-sys 0.4.22 # MIT -MODCARGO_CRATES += schannel 0.1.20 # MIT +MODCARGO_CRATES += schannel 0.1.21 # MIT MODCARGO_CRATES += scoped_threadpool 0.1.9 # MIT MODCARGO_CRATES += scopeguard 1.1.0 # MIT/Apache-2.0 +MODCARGO_CRATES += scratch 1.0.5 # MIT OR Apache-2.0 MODCARGO_CRATES += sct 0.7.0 # Apache-2.0/ISC/MIT -MODCARGO_CRATES += security-framework 2.6.1 # MIT OR Apache-2.0 -MODCARGO_CRATES += security-framework-sys 2.6.1 # MIT OR Apache-2.0 -MODCARGO_CRATES += semver 1.0.13 # MIT OR Apache-2.0 -MODCARGO_CRATES += serde 1.0.143 # MIT OR Apache-2.0 -MODCARGO_CRATES += serde_derive 1.0.143 # MIT OR Apache-2.0 -MODCARGO_CRATES += serde_json 1.0.83 # MIT OR Apache-2.0 +MODCARGO_CRATES += security-framework 2.8.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += security-framework-sys 2.8.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += semver 1.0.17 # MIT OR Apache-2.0 +MODCARGO_CRATES += serde 1.0.156 # MIT OR Apache-2.0 +MODCARGO_CRATES += serde_derive 1.0.156 # MIT OR Apache-2.0 +MODCARGO_CRATES += serde_json 1.0.94 # MIT OR Apache-2.0 +MODCARGO_CRATES += serde_spanned 0.6.1 # MIT OR Apache-2.0 MODCARGO_CRATES += serde_urlencoded 0.7.1 # MIT/Apache-2.0 -MODCARGO_CRATES += serde_yaml 0.9.9 # MIT OR Apache-2.0 +MODCARGO_CRATES += serde_yaml 0.9.19 # MIT OR Apache-2.0 MODCARGO_CRATES += sha-1 0.8.2 # MIT OR Apache-2.0 -MODCARGO_CRATES += sha-1 0.10.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += sha2 0.10.2 # MIT OR Apache-2.0 -MODCARGO_CRATES += similar 2.2.0 # Apache-2.0 +MODCARGO_CRATES += sha2 0.10.6 # MIT OR Apache-2.0 +MODCARGO_CRATES += simd-adler32 0.3.5 # MIT +MODCARGO_CRATES += similar 2.2.1 # Apache-2.0 MODCARGO_CRATES += siphasher 0.3.10 # MIT/Apache-2.0 -MODCARGO_CRATES += slab 0.4.7 # MIT +MODCARGO_CRATES += skeptic 0.13.7 # MIT/Apache-2.0 +MODCARGO_CRATES += slab 0.4.8 # MIT MODCARGO_CRATES += slug 0.1.4 # MIT/Apache-2.0 -MODCARGO_CRATES += smallvec 1.9.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += socket2 0.4.4 # MIT OR Apache-2.0 +MODCARGO_CRATES += smallvec 1.10.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += socket2 0.4.9 # MIT OR Apache-2.0 MODCARGO_CRATES += spin 0.5.2 # MIT -MODCARGO_CRATES += spin 0.9.4 # MIT +MODCARGO_CRATES += spin 0.9.6 # MIT MODCARGO_CRATES += static_assertions 1.1.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += string_cache 0.8.4 # MIT / Apache-2.0 +MODCARGO_CRATES += string_cache 0.8.7 # MIT OR Apache-2.0 MODCARGO_CRATES += string_cache_codegen 0.5.2 # MIT OR Apache-2.0 MODCARGO_CRATES += strsim 0.10.0 # MIT -MODCARGO_CRATES += svg_metadata 0.4.2 # Apache-2.0/MIT -MODCARGO_CRATES += syn 1.0.99 # MIT OR Apache-2.0 +MODCARGO_CRATES += svg_metadata 0.4.4 # Apache-2.0/MIT +MODCARGO_CRATES += syn 1.0.109 # MIT OR Apache-2.0 MODCARGO_CRATES += syntect 5.0.0 # MIT -MODCARGO_CRATES += tap 1.0.1 # MIT MODCARGO_CRATES += tar 0.4.38 # MIT/Apache-2.0 -MODCARGO_CRATES += tempfile 3.3.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += tempfile 3.4.0 # MIT OR Apache-2.0 MODCARGO_CRATES += tendril 0.4.3 # MIT/Apache-2.0 -MODCARGO_CRATES += tera 1.17.0 # MIT -MODCARGO_CRATES += termcolor 1.1.3 # Unlicense OR MIT -MODCARGO_CRATES += terminal_size 0.1.17 # MIT OR Apache-2.0 -MODCARGO_CRATES += test-case 2.2.1 # MIT -MODCARGO_CRATES += test-case-macros 2.2.1 # MIT -MODCARGO_CRATES += textwrap 0.15.0 # MIT -MODCARGO_CRATES += thiserror 1.0.32 # MIT OR Apache-2.0 -MODCARGO_CRATES += thiserror-impl 1.0.32 # MIT OR Apache-2.0 +MODCARGO_CRATES += tera 1.18.1 # MIT +MODCARGO_CRATES += termcolor 1.2.0 # Unlicense OR MIT +MODCARGO_CRATES += test-case 3.0.0 # MIT +MODCARGO_CRATES += test-case-core 3.0.0 # MIT +MODCARGO_CRATES += test-case-macros 3.0.0 # MIT +MODCARGO_CRATES += textwrap 0.16.0 # MIT +MODCARGO_CRATES += thiserror 1.0.39 # MIT OR Apache-2.0 +MODCARGO_CRATES += thiserror-impl 1.0.39 # MIT OR Apache-2.0 MODCARGO_CRATES += thread_local 1.1.4 # Apache-2.0/MIT -MODCARGO_CRATES += threadpool 1.8.1 # MIT/Apache-2.0 -MODCARGO_CRATES += tiff 0.7.3 # MIT -MODCARGO_CRATES += time 0.3.13 # MIT OR Apache-2.0 -MODCARGO_CRATES += time-macros 0.2.4 # MIT OR Apache-2.0 -MODCARGO_CRATES += tinystr 0.3.4 # Apache-2.0/MIT +MODCARGO_CRATES += tiff 0.8.1 # MIT +MODCARGO_CRATES += time 0.3.20 # MIT OR Apache-2.0 +MODCARGO_CRATES += time-core 0.1.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += time-macros 0.2.8 # MIT OR Apache-2.0 +MODCARGO_CRATES += tinystr 0.7.1 # Unicode-DFS-2016 MODCARGO_CRATES += tinyvec 1.6.0 # Zlib OR Apache-2.0 OR MIT -MODCARGO_CRATES += tinyvec_macros 0.1.0 # MIT OR Apache-2.0 OR Zlib -MODCARGO_CRATES += tokio 1.20.1 # MIT -MODCARGO_CRATES += tokio-native-tls 0.3.0 # MIT +MODCARGO_CRATES += tinyvec_macros 0.1.1 # MIT OR Apache-2.0 OR Zlib +MODCARGO_CRATES += tokio 1.26.0 # MIT +MODCARGO_CRATES += tokio-native-tls 0.3.1 # MIT MODCARGO_CRATES += tokio-rustls 0.23.4 # MIT/Apache-2.0 -MODCARGO_CRATES += tokio-util 0.7.3 # MIT -MODCARGO_CRATES += toml 0.5.9 # MIT/Apache-2.0 +MODCARGO_CRATES += tokio-util 0.7.7 # MIT +MODCARGO_CRATES += toml 0.5.11 # MIT/Apache-2.0 +MODCARGO_CRATES += toml 0.7.3 # MIT OR Apache-2.0 +MODCARGO_CRATES += toml_datetime 0.6.1 # MIT OR Apache-2.0 +MODCARGO_CRATES += toml_edit 0.19.7 # MIT OR Apache-2.0 MODCARGO_CRATES += tower-service 0.3.2 # MIT -MODCARGO_CRATES += tracing 0.1.36 # MIT -MODCARGO_CRATES += tracing-core 0.1.29 # MIT -MODCARGO_CRATES += try-lock 0.2.3 # MIT -MODCARGO_CRATES += typenum 1.15.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += ucd-trie 0.1.4 # MIT OR Apache-2.0 +MODCARGO_CRATES += tracing 0.1.37 # MIT +MODCARGO_CRATES += tracing-core 0.1.30 # MIT +MODCARGO_CRATES += try-lock 0.2.4 # MIT +MODCARGO_CRATES += typenum 1.16.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += ucd-trie 0.1.5 # MIT OR Apache-2.0 MODCARGO_CRATES += uncased 0.9.7 # MIT OR Apache-2.0 MODCARGO_CRATES += unic-char-property 0.9.0 # MIT/Apache-2.0 MODCARGO_CRATES += unic-char-range 0.9.0 # MIT/Apache-2.0 MODCARGO_CRATES += unic-common 0.9.0 # MIT/Apache-2.0 -MODCARGO_CRATES += unic-langid 0.9.0 # MIT/Apache-2.0 -MODCARGO_CRATES += unic-langid-impl 0.9.0 # MIT/Apache-2.0 +MODCARGO_CRATES += unic-langid 0.9.1 # MIT/Apache-2.0 +MODCARGO_CRATES += unic-langid-impl 0.9.1 # MIT/Apache-2.0 MODCARGO_CRATES += unic-segment 0.9.0 # MIT/Apache-2.0 MODCARGO_CRATES += unic-ucd-segment 0.9.0 # MIT/Apache-2.0 MODCARGO_CRATES += unic-ucd-version 0.9.0 # MIT/Apache-2.0 MODCARGO_CRATES += unicase 2.6.0 # MIT/Apache-2.0 -MODCARGO_CRATES += unicode-bidi 0.3.8 # MIT OR Apache-2.0 -MODCARGO_CRATES += unicode-ident 1.0.3 # (MIT OR Apache-2.0) AND Unicode-DFS-2016 -MODCARGO_CRATES += unicode-normalization 0.1.21 # MIT/Apache-2.0 -MODCARGO_CRATES += unicode-segmentation 1.9.0 # MIT/Apache-2.0 -MODCARGO_CRATES += unsafe-libyaml 0.2.2 # MIT +MODCARGO_CRATES += unicode-bidi 0.3.11 # MIT OR Apache-2.0 +MODCARGO_CRATES += unicode-ident 1.0.8 # (MIT OR Apache-2.0) AND Unicode-DFS-2016 +MODCARGO_CRATES += unicode-normalization 0.1.22 # MIT/Apache-2.0 +MODCARGO_CRATES += unicode-segmentation 1.10.1 # MIT/Apache-2.0 +MODCARGO_CRATES += unicode-width 0.1.10 # MIT/Apache-2.0 +MODCARGO_CRATES += unsafe-libyaml 0.2.7 # MIT MODCARGO_CRATES += untrusted 0.7.1 # ISC -MODCARGO_CRATES += url 2.2.2 # MIT/Apache-2.0 +MODCARGO_CRATES += url 2.3.1 # MIT OR Apache-2.0 MODCARGO_CRATES += utf-8 0.7.6 # MIT OR Apache-2.0 MODCARGO_CRATES += vcpkg 0.2.15 # MIT/Apache-2.0 MODCARGO_CRATES += version_check 0.9.4 # MIT/Apache-2.0 @@ -361,16 +391,16 @@ MODCARGO_CRATES += walkdir 2.3.2 # Unlicense/MIT MODCARGO_CRATES += want 0.3.0 # MIT MODCARGO_CRATES += wasi 0.9.0+wasi-snapshot-preview1 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT MODCARGO_CRATES += wasi 0.11.0+wasi-snapshot-preview1 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT -MODCARGO_CRATES += wasm-bindgen 0.2.82 # MIT/Apache-2.0 -MODCARGO_CRATES += wasm-bindgen-backend 0.2.82 # MIT/Apache-2.0 -MODCARGO_CRATES += wasm-bindgen-futures 0.4.32 # MIT/Apache-2.0 -MODCARGO_CRATES += wasm-bindgen-macro 0.2.82 # MIT/Apache-2.0 -MODCARGO_CRATES += wasm-bindgen-macro-support 0.2.82 # MIT/Apache-2.0 -MODCARGO_CRATES += wasm-bindgen-shared 0.2.82 # MIT/Apache-2.0 -MODCARGO_CRATES += web-sys 0.3.59 # MIT/Apache-2.0 +MODCARGO_CRATES += wasm-bindgen 0.2.84 # MIT/Apache-2.0 +MODCARGO_CRATES += wasm-bindgen-backend 0.2.84 # MIT/Apache-2.0 +MODCARGO_CRATES += wasm-bindgen-futures 0.4.34 # MIT/Apache-2.0 +MODCARGO_CRATES += wasm-bindgen-macro 0.2.84 # MIT/Apache-2.0 +MODCARGO_CRATES += wasm-bindgen-macro-support 0.2.84 # MIT/Apache-2.0 +MODCARGO_CRATES += wasm-bindgen-shared 0.2.84 # MIT/Apache-2.0 +MODCARGO_CRATES += web-sys 0.3.61 # MIT/Apache-2.0 MODCARGO_CRATES += webp 0.2.2 # MIT OR Apache-2.0 MODCARGO_CRATES += webpki 0.22.0 # LICENSE -MODCARGO_CRATES += webpki-roots 0.22.4 # MPL-2.0 +MODCARGO_CRATES += webpki-roots 0.22.6 # MPL-2.0 MODCARGO_CRATES += weezl 0.1.7 # MIT OR Apache-2.0 MODCARGO_CRATES += winapi 0.2.8 # MIT MODCARGO_CRATES += winapi 0.3.9 # MIT/Apache-2.0 @@ -378,19 +408,23 @@ MODCARGO_CRATES += winapi-build 0.1.1 # MIT MODCARGO_CRATES += winapi-i686-pc-windows-gnu 0.4.0 # MIT/Apache-2.0 MODCARGO_CRATES += winapi-util 0.1.5 # Unlicense/MIT MODCARGO_CRATES += winapi-x86_64-pc-windows-gnu 0.4.0 # MIT/Apache-2.0 -MODCARGO_CRATES += windows-sys 0.36.1 # MIT OR Apache-2.0 -MODCARGO_CRATES += windows_aarch64_msvc 0.36.1 # MIT OR Apache-2.0 -MODCARGO_CRATES += windows_i686_gnu 0.36.1 # MIT OR Apache-2.0 -MODCARGO_CRATES += windows_i686_msvc 0.36.1 # MIT OR Apache-2.0 -MODCARGO_CRATES += windows_x86_64_gnu 0.36.1 # MIT OR Apache-2.0 -MODCARGO_CRATES += windows_x86_64_msvc 0.36.1 # MIT OR Apache-2.0 +MODCARGO_CRATES += windows-sys 0.42.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += windows-sys 0.45.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += windows-targets 0.42.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += windows_aarch64_gnullvm 0.42.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += windows_aarch64_msvc 0.42.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += windows_i686_gnu 0.42.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += windows_i686_msvc 0.42.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += windows_x86_64_gnu 0.42.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += windows_x86_64_gnullvm 0.42.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += windows_x86_64_msvc 0.42.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += winnow 0.3.6 # MIT MODCARGO_CRATES += winreg 0.10.1 # MIT MODCARGO_CRATES += winres 0.1.12 # MIT MODCARGO_CRATES += ws 0.9.2 # MIT MODCARGO_CRATES += ws2_32-sys 0.2.1 # MIT -MODCARGO_CRATES += wyz 0.2.0 # MIT MODCARGO_CRATES += xattr 0.2.3 # MIT/Apache-2.0 -MODCARGO_CRATES += xml-rs 0.8.4 # MIT -MODCARGO_CRATES += xmlparser 0.13.3 # MIT/Apache-2.0 +MODCARGO_CRATES += xmlparser 0.13.5 # MIT/Apache-2.0 MODCARGO_CRATES += yada 0.5.0 # MIT OR Apache-2.0 MODCARGO_CRATES += yaml-rust 0.4.5 # MIT/Apache-2.0 +MODCARGO_CRATES += zune-inflate 0.2.51 # MIT OR Apache-2.0 diff --git a/x11/Makefile b/x11/Makefile index fa0803df1..552e335c3 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -165,7 +165,6 @@ SUBDIR += libqaccessibilityclient SUBDIR += libqtolm SUBDIR += libquotient - SUBDIR += libxcvt SUBDIR += libxdg-basedir SUBDIR += lightly SUBDIR += lsw diff --git a/x11/copyq/Makefile b/x11/copyq/Makefile index b931dc5c5..7af590124 100644 --- a/x11/copyq/Makefile +++ b/x11/copyq/Makefile @@ -1,7 +1,7 @@ COMMENT = Qt5 based clipboard manager GH_ACCOUNT = hluk GH_PROJECT = CopyQ -GH_TAGNAME = v7.0.0 +GH_TAGNAME = v7.1.0 PKGNAME = ${DISTNAME:L} CATEGORIES = x11 diff --git a/x11/copyq/distinfo b/x11/copyq/distinfo index f3d6ca5ef..e002b255e 100644 --- a/x11/copyq/distinfo +++ b/x11/copyq/distinfo @@ -1,2 +1,2 @@ -SHA256 (CopyQ-7.0.0.tar.gz) = WJi6ICX46fYaS0cy6FrfOxZT+tILXB8bDIeae3LNTUg= -SIZE (CopyQ-7.0.0.tar.gz) = 3323354 +SHA256 (CopyQ-7.1.0.tar.gz) = zgJlsKhjUP2nv6Gp1LdNeUpAd1UbKBhgEmg1Z9b9gVg= +SIZE (CopyQ-7.1.0.tar.gz) = 3351093 diff --git a/x11/gnome/control-center/Makefile b/x11/gnome/control-center/Makefile index 4d297dfed..aa7354425 100644 --- a/x11/gnome/control-center/Makefile +++ b/x11/gnome/control-center/Makefile @@ -3,7 +3,7 @@ COMMENT= GNOME settings GNOME_PROJECT= gnome-control-center -GNOME_VERSION= 44.3 +GNOME_VERSION= 44.4 CATEGORIES= x11 diff --git a/x11/gnome/control-center/distinfo b/x11/gnome/control-center/distinfo index 765c1162c..ed824dd43 100644 --- a/x11/gnome/control-center/distinfo +++ b/x11/gnome/control-center/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/gnome-control-center-44.3.tar.xz) = BmplBS/D7ProYAJehfeX5qsrh6WMT4q5xm7CBxioDHo= -SIZE (gnome/gnome-control-center-44.3.tar.xz) = 7634240 +SHA256 (gnome/gnome-control-center-44.4.tar.xz) = kcKj4sF5WyW//4w1mjkhe/Tmd1BO49+tm+uzlxUZ4Vc= +SIZE (gnome/gnome-control-center-44.4.tar.xz) = 7641656 diff --git a/x11/gnome/control-center/patches/patch-panels_user-accounts_cc-user-panel_c b/x11/gnome/control-center/patches/patch-panels_user-accounts_cc-user-panel_c index 79145dafb..8b394ebac 100644 --- a/x11/gnome/control-center/patches/patch-panels_user-accounts_cc-user-panel_c +++ b/x11/gnome/control-center/patches/patch-panels_user-accounts_cc-user-panel_c @@ -4,7 +4,7 @@ so that symbols can be resolved in the user panel. Index: panels/user-accounts/cc-user-panel.c --- panels/user-accounts/cc-user-panel.c.orig +++ panels/user-accounts/cc-user-panel.c -@@ -1543,6 +1543,8 @@ cc_user_panel_init (CcUserPanel *self) +@@ -1546,6 +1546,8 @@ cc_user_panel_init (CcUserPanel *self) g_type_ensure (CC_TYPE_AVATAR_CHOOSER); g_type_ensure (CC_TYPE_LIST_ROW); diff --git a/x11/gnome/gucharmap/Makefile b/x11/gnome/gucharmap/Makefile index f8f72b93f..d4aa8f286 100644 --- a/x11/gnome/gucharmap/Makefile +++ b/x11/gnome/gucharmap/Makefile @@ -1,8 +1,7 @@ COMMENT= Unicode character map for the GNOME project GNOME_PROJECT= gucharmap -GNOME_VERSION= 15.0.4 -REVISION= 1 +GNOME_VERSION= 15.1.0 # override gnome MODULE MASTER_SITES = https://gitlab.gnome.org/GNOME/${GNOME_PROJECT}/-/archive/${GNOME_VERSION}/ diff --git a/x11/gnome/gucharmap/distinfo b/x11/gnome/gucharmap/distinfo index be1aea9d6..5b468978e 100644 --- a/x11/gnome/gucharmap/distinfo +++ b/x11/gnome/gucharmap/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/gucharmap-15.0.4.tar.gz) = wnbgw5hdA5mH2FGY3cb5Nff0BTGn5UM6CzvDXvZVM58= -SIZE (gnome/gucharmap-15.0.4.tar.gz) = 2073544 +SHA256 (gnome/gucharmap-15.1.0.tar.gz) = nWiXoEMTcpCZuzY6xtRRiRE0FLiJg7Hr2Bm6ESBAhHM= +SIZE (gnome/gucharmap-15.1.0.tar.gz) = 2075814 diff --git a/x11/gnome/gucharmap/patches/patch-gucharmap_gucharmap-unicode-info_h b/x11/gnome/gucharmap/patches/patch-gucharmap_gucharmap-unicode-info_h deleted file mode 100644 index 4cf3fc4ce..000000000 --- a/x11/gnome/gucharmap/patches/patch-gucharmap_gucharmap-unicode-info_h +++ /dev/null @@ -1,13 +0,0 @@ -XXX ugly workaround unbreak with unicode-ucd >=15.1.0 - -Index: gucharmap/gucharmap-unicode-info.h ---- gucharmap/gucharmap-unicode-info.h.orig -+++ gucharmap/gucharmap-unicode-info.h -@@ -57,6 +57,7 @@ typedef enum { - GUCHARMAP_UNICODE_VERSION_13_0, - GUCHARMAP_UNICODE_VERSION_14_0, - GUCHARMAP_UNICODE_VERSION_15_0, -+ GUCHARMAP_UNICODE_VERSION_15_1, - GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_15_0 /* private, will move forward with each revision */ - } GucharmapUnicodeVersion; - diff --git a/x11/gnome/gucharmap/patches/patch-gucharmap_gucharmap-window_c b/x11/gnome/gucharmap/patches/patch-gucharmap_gucharmap-window_c deleted file mode 100644 index 1d4f74b36..000000000 --- a/x11/gnome/gucharmap/patches/patch-gucharmap_gucharmap-window_c +++ /dev/null @@ -1,14 +0,0 @@ -XXX ugly workaround unbreak with unicode-ucd >=15.1.0 - -Index: gucharmap/gucharmap-window.c ---- gucharmap/gucharmap-window.c.orig -+++ gucharmap/gucharmap-window.c -@@ -454,7 +454,7 @@ help_about (GSimpleAction *action, - gtk_show_about_dialog (GTK_WINDOW (guw), - "program-name", _("GNOME Character Map"), - "version", VERSION, -- "comments", _("Based on the Unicode Character Database 15.0.0"), -+ "comments", _("Based on the Unicode Character Database 15.1.0"), - "copyright", "Copyright © 2004 Noah Levitt\n" - "Copyright © 1991–2022 Unicode, Inc.\n" - "Copyright © 2007–2022 Christian Persch\n" diff --git a/x11/gnome/gucharmap/patches/patch-gucharmap_unicode-i18n_h b/x11/gnome/gucharmap/patches/patch-gucharmap_unicode-i18n_h deleted file mode 100644 index ae800f570..000000000 --- a/x11/gnome/gucharmap/patches/patch-gucharmap_unicode-i18n_h +++ /dev/null @@ -1,25 +0,0 @@ -From 95a8e7e9f3db60c1378f767dbe18e43f1cf1fc5d Mon Sep 17 00:00:00 2001 -From: Christian Persch <chpe@src.gnome.org> -Date: Fri, 4 Aug 2023 21:29:31 +0200 -Subject: [PATCH] unicode: i18n update for 15.1.0 - -Index: gucharmap/unicode-i18n.h ---- gucharmap/unicode-i18n.h.orig -+++ gucharmap/unicode-i18n.h -@@ -1,7 +1,7 @@ - unicode-i18n.h for extraction by gettext - THIS IS A GENERATED FILE. CHANGES WILL BE OVERWRITTEN. - Generated by ./gen-guch-unicode-tables.pl --Generated from UCD version 15.0.0 -+Generated from UCD version 15.1.0 - - N_("Basic Latin") - N_("Latin-1 Supplement") -@@ -323,6 +323,7 @@ N_("CJK Unified Ideographs Extension C") - N_("CJK Unified Ideographs Extension D") - N_("CJK Unified Ideographs Extension E") - N_("CJK Unified Ideographs Extension F") -+N_("CJK Unified Ideographs Extension I") - N_("CJK Compatibility Ideographs Supplement") - N_("CJK Unified Ideographs Extension G") - N_("CJK Unified Ideographs Extension H") diff --git a/x11/gnome/gucharmap/patches/patch-meson_build b/x11/gnome/gucharmap/patches/patch-meson_build index 931f17d49..f28a57840 100644 --- a/x11/gnome/gucharmap/patches/patch-meson_build +++ b/x11/gnome/gucharmap/patches/patch-meson_build @@ -1,20 +1,9 @@ -- XXX ugly workaround unbreak with unicode-ucd >=15.1.0 - - ERROR: C shared or static library 'dl' not found - ERROR: Assert failed: -Wl,-Bsymbolic-functions is required but not supported Index: meson.build --- meson.build.orig +++ meson.build -@@ -46,7 +46,7 @@ pcre2_req_version = '10.21' - # changes to gucharmap. Therefore, you should NOT upgrade the unicode version - # of a released gucharmap, but upgrade to the gucharmap version corresponding - # to the desired unicode version. --unicode_req_version = '15.0.0' -+unicode_req_version = '15.1.0' - - # API - @@ -125,18 +125,6 @@ config_h.set('ENABLE_DEBUG', enable_debug) # FIXME AC_USE_SYSTEM_EXTENSIONS also supported non-gnu systems config_h.set10('_GNU_SOURCE', true) diff --git a/x11/gnome/libadwaita/Makefile b/x11/gnome/libadwaita/Makefile index 45d94b278..a34969f22 100644 --- a/x11/gnome/libadwaita/Makefile +++ b/x11/gnome/libadwaita/Makefile @@ -1,15 +1,15 @@ COMMENT= building blocks for modern adaptive GNOME apps GNOME_PROJECT= libadwaita -GNOME_VERSION= 1.3.5 +GNOME_VERSION= 1.4.0 EPOCH= 0 -SHARED_LIBS += adwaita-1 1.5 # 0 +SHARED_LIBS += adwaita-1 1.6 # 0 # LGPLv2.1+ PERMIT_PACKAGE= Yes -WANTLIB += c fribidi gio-2.0 glib-2.0 gobject-2.0 graphene-1.0 +WANTLIB += appstream c fribidi gio-2.0 glib-2.0 gobject-2.0 graphene-1.0 WANTLIB += gtk-4 intl m pango-1.0 COMPILER= base-clang ports-gcc @@ -23,7 +23,8 @@ MODGNOME_TOOLS= desktop-file-utils gobject-introspection vala \ BUILD_DEPENDS= www/sassc -LIB_DEPENDS= x11/gtk+4 +LIB_DEPENDS= devel/appstream \ + x11/gtk+4 DEBUG_PACKAGES= ${BUILD_PACKAGES} diff --git a/x11/gnome/libadwaita/distinfo b/x11/gnome/libadwaita/distinfo index 5d2608451..7fb410868 100644 --- a/x11/gnome/libadwaita/distinfo +++ b/x11/gnome/libadwaita/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/libadwaita-1.3.5.tar.xz) = +qP/DzbbGKtJQvSQSilSk8yxRHVbm7hRMTk/IBkmtYY= -SIZE (gnome/libadwaita-1.3.5.tar.xz) = 3150996 +SHA256 (gnome/libadwaita-1.4.0.tar.xz) = 5RoJilTUNWghj8SPz1LoDjb0abPOkS2M6cMIo36fR8I= +SIZE (gnome/libadwaita-1.4.0.tar.xz) = 3953136 diff --git a/x11/gnome/libadwaita/pkg/PLIST b/x11/gnome/libadwaita/pkg/PLIST index eb89dec3f..1db328fca 100644 --- a/x11/gnome/libadwaita/pkg/PLIST +++ b/x11/gnome/libadwaita/pkg/PLIST @@ -10,6 +10,8 @@ include/libadwaita-1/adw-application.h include/libadwaita-1/adw-avatar.h include/libadwaita-1/adw-banner.h include/libadwaita-1/adw-bin.h +include/libadwaita-1/adw-breakpoint-bin.h +include/libadwaita-1/adw-breakpoint.h include/libadwaita-1/adw-button-content.h include/libadwaita-1/adw-carousel-indicator-dots.h include/libadwaita-1/adw-carousel-indicator-lines.h @@ -27,14 +29,19 @@ include/libadwaita-1/adw-flap.h include/libadwaita-1/adw-fold-threshold-policy.h include/libadwaita-1/adw-header-bar.h include/libadwaita-1/adw-leaflet.h +include/libadwaita-1/adw-length-unit.h include/libadwaita-1/adw-main.h include/libadwaita-1/adw-message-dialog.h include/libadwaita-1/adw-navigation-direction.h +include/libadwaita-1/adw-navigation-split-view.h +include/libadwaita-1/adw-navigation-view.h +include/libadwaita-1/adw-overlay-split-view.h include/libadwaita-1/adw-password-entry-row.h include/libadwaita-1/adw-preferences-group.h include/libadwaita-1/adw-preferences-page.h include/libadwaita-1/adw-preferences-row.h include/libadwaita-1/adw-preferences-window.h +include/libadwaita-1/adw-spin-row.h include/libadwaita-1/adw-split-button.h include/libadwaita-1/adw-spring-animation.h include/libadwaita-1/adw-spring-params.h @@ -43,6 +50,7 @@ include/libadwaita-1/adw-status-page.h include/libadwaita-1/adw-style-manager.h include/libadwaita-1/adw-swipe-tracker.h include/libadwaita-1/adw-swipeable.h +include/libadwaita-1/adw-switch-row.h include/libadwaita-1/adw-tab-bar.h include/libadwaita-1/adw-tab-button.h include/libadwaita-1/adw-tab-overview.h @@ -50,6 +58,7 @@ include/libadwaita-1/adw-tab-view.h include/libadwaita-1/adw-timed-animation.h include/libadwaita-1/adw-toast-overlay.h include/libadwaita-1/adw-toast.h +include/libadwaita-1/adw-toolbar-view.h include/libadwaita-1/adw-version.h include/libadwaita-1/adw-view-stack.h include/libadwaita-1/adw-view-switcher-bar.h @@ -74,6 +83,7 @@ share/locale/da/LC_MESSAGES/libadwaita.mo share/locale/de/LC_MESSAGES/libadwaita.mo share/locale/el/LC_MESSAGES/libadwaita.mo share/locale/en_GB/LC_MESSAGES/libadwaita.mo +share/locale/eo/LC_MESSAGES/libadwaita.mo share/locale/es/LC_MESSAGES/libadwaita.mo share/locale/eu/LC_MESSAGES/libadwaita.mo share/locale/fa/LC_MESSAGES/libadwaita.mo diff --git a/x11/gnome/librsvg/Makefile b/x11/gnome/librsvg/Makefile index 8aee3ad3e..efcfad75f 100644 --- a/x11/gnome/librsvg/Makefile +++ b/x11/gnome/librsvg/Makefile @@ -5,7 +5,7 @@ COMMENT= SAX-based render library for SVG files # !!! /!\ make sure both distinfo are updated on version change: # make makesum && make RUST_ARCHS= makesum GNOME_PROJECT= librsvg -STABLE_VERSION= 2.56.3 +STABLE_VERSION= 2.56.4 OLD_VERSION= 2.40.21 DISTFILES= librsvg-${STABLE_VERSION}${EXTRACT_SUFX}:0 \ librsvg-${OLD_VERSION}${EXTRACT_SUFX}:1 diff --git a/x11/gnome/librsvg/distinfo b/x11/gnome/librsvg/distinfo index 00e907a11..c7e32c485 100644 --- a/x11/gnome/librsvg/distinfo +++ b/x11/gnome/librsvg/distinfo @@ -299,7 +299,7 @@ SHA256 (gnome/gnome/winnow-0.5.0.tar.gz) = gfrJdC/RrRvZZDuZExn3LdAxAW1Et3A5oml36 SHA256 (gnome/gnome/xml5ever-0.17.0.tar.gz) = QDTh0Fr5i1GtchRSdzBibwGWgteXuji1FokhIRjY5lA= SHA256 (gnome/gnome/yeslogic-fontconfig-sys-4.0.1.tar.gz) = 7GV/0yu8vq71x7yOELPblbFD+rjbClAHl3Pb+Tb9T3M= SHA256 (gnome/librsvg-2.40.21.tar.xz) = 92KJBfHK2oTofisUiD7VfYCU3KMoHVvLJOzkJ56akro= -SHA256 (gnome/librsvg-2.56.3.tar.xz) = WjKASKAtAUZFzSf2EUD04LESgPssfyohhk/gxZrBzog= +SHA256 (gnome/librsvg-2.56.4.tar.xz) = 6of9z1FZNI/LCLFMQ+kanT2eRdwgBqh10XEbtltnQPU= SIZE (gnome/gnome/adler-1.0.2.tar.gz) = 12778 SIZE (gnome/gnome/aho-corasick-1.0.2.tar.gz) = 167694 SIZE (gnome/gnome/android-tzdata-0.1.1.tar.gz) = 7674 @@ -601,4 +601,4 @@ SIZE (gnome/gnome/winnow-0.5.0.tar.gz) = 142099 SIZE (gnome/gnome/xml5ever-0.17.0.tar.gz) = 41208 SIZE (gnome/gnome/yeslogic-fontconfig-sys-4.0.1.tar.gz) = 6694 SIZE (gnome/librsvg-2.40.21.tar.xz) = 1655860 -SIZE (gnome/librsvg-2.56.3.tar.xz) = 5641500 +SIZE (gnome/librsvg-2.56.4.tar.xz) = 5658192 diff --git a/x11/icewm/Makefile b/x11/icewm/Makefile index 194ff9761..acfc9f06d 100644 --- a/x11/icewm/Makefile +++ b/x11/icewm/Makefile @@ -1,7 +1,7 @@ # unconditionally uses machine/apmvar.h and related structures/defines ONLY_FOR_ARCHS= ${APM_ARCHS} -V= 3.4.1 +V= 3.4.2 COMMENT= small and fast window manager DISTNAME= icewm-${V} EXTRACT_SUFX= .tar.lz diff --git a/x11/icewm/distinfo b/x11/icewm/distinfo index bd4c12714..ef2f7d1cc 100644 --- a/x11/icewm/distinfo +++ b/x11/icewm/distinfo @@ -1,2 +1,2 @@ -SHA256 (icewm-3.4.1.tar.lz) = mZiONdDtO4ftIx5+ikS7KmfLNkUzcrLpEVlqkU1MJzs= -SIZE (icewm-3.4.1.tar.lz) = 1828032 +SHA256 (icewm-3.4.2.tar.lz) = tkxLPlh+IB7kvkjna16UupH8cTkoEnV9h3601EEWceI= +SIZE (icewm-3.4.2.tar.lz) = 1828756 diff --git a/x11/kde-applications/akonadi/Makefile b/x11/kde-applications/akonadi/Makefile index f1e3d42b9..a957f41b1 100644 --- a/x11/kde-applications/akonadi/Makefile +++ b/x11/kde-applications/akonadi/Makefile @@ -1,6 +1,7 @@ COMMENT = PIM Storage Service DISTNAME = akonadi-${VERSION} CATEGORIES = databases productivity +REVISION = 0 HOMEPAGE = https://kontact.kde.org @@ -37,15 +38,16 @@ BUILD_DEPENDS += databases/mariadb,-server \ devel/kf5/kcompletion \ devel/kf5/kdbusaddons \ x11/qt5/qtbase,-mysql \ - x11/qt5/qtbase,-psql + x11/qt5/qtbase,-psql \ + databases/sqlite3 RUN_DEPENDS = devel/kf5/kdesignerplugin \ misc/shared-mime-info \ x11/qt5/qtbase,-mysql \ - x11/qt5/qtbase,-psql + x11/qt5/qtbase,-psql \ + databases/sqlite3 -LIB_DEPENDS = databases/sqlite3 \ - devel/kf5/kconfig \ +LIB_DEPENDS = devel/kf5/kconfig \ devel/kf5/kconfigwidgets \ devel/kf5/kcoreaddons \ devel/kf5/kcrash \ diff --git a/x11/kde-plasma/Makefile.inc b/x11/kde-plasma/Makefile.inc index 383f2db40..2f767713b 100644 --- a/x11/kde-plasma/Makefile.inc +++ b/x11/kde-plasma/Makefile.inc @@ -17,7 +17,7 @@ MODULES := devel/kf5 \ # LGPLv2.1+, GPLv2+, GPLv3 PERMIT_PACKAGE ?= Yes -VERSION ?= 5.27.7 +VERSION ?= 5.27.8 SITES ?= ${MASTER_SITE_KDE:=stable/plasma/${VERSION}/} diff --git a/x11/kde-plasma/breeze-gtk/distinfo b/x11/kde-plasma/breeze-gtk/distinfo index 868efdfc8..c2b7d369f 100644 --- a/x11/kde-plasma/breeze-gtk/distinfo +++ b/x11/kde-plasma/breeze-gtk/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/breeze-gtk-5.27.7.tar.xz) = KTKU7QtRwHSW/owu3oQetuLvQZJnJeEWWMcghUPZWOg= -SIZE (plasma/breeze-gtk-5.27.7.tar.xz) = 40752 +SHA256 (plasma/breeze-gtk-5.27.8.tar.xz) = QA9FK3Pb5K+jzjRuR2n+0TeYv2QT7dXnSiUEwg7v6s4= +SIZE (plasma/breeze-gtk-5.27.8.tar.xz) = 40744 diff --git a/x11/kde-plasma/breeze/distinfo b/x11/kde-plasma/breeze/distinfo index 07c462f87..e7c55da7a 100644 --- a/x11/kde-plasma/breeze/distinfo +++ b/x11/kde-plasma/breeze/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/breeze-5.27.7.tar.xz) = v/3PMUAJtvywICpY5Is+YqTL90H18pnCV5mPRt6kzPE= -SIZE (plasma/breeze-5.27.7.tar.xz) = 87595004 +SHA256 (plasma/breeze-5.27.8.tar.xz) = zaSCU8t0pPGMDtvDBlphBVyvyxZzYsTpC+UhgrDnPkQ= +SIZE (plasma/breeze-5.27.8.tar.xz) = 87595040 diff --git a/x11/kde-plasma/kactivitymanagerd/distinfo b/x11/kde-plasma/kactivitymanagerd/distinfo index 46b50cd48..93c205d6b 100644 --- a/x11/kde-plasma/kactivitymanagerd/distinfo +++ b/x11/kde-plasma/kactivitymanagerd/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/kactivitymanagerd-5.27.7.tar.xz) = LfJFMwYS15CQmAJprXxOd2FQWY5YN2Gsg/YozB/6+7Q= -SIZE (plasma/kactivitymanagerd-5.27.7.tar.xz) = 127232 +SHA256 (plasma/kactivitymanagerd-5.27.8.tar.xz) = 1Ets4eeDn95bBbdFh18oLuDOVCZ/CkRZqnS22+3oMtk= +SIZE (plasma/kactivitymanagerd-5.27.8.tar.xz) = 127288 diff --git a/x11/kde-plasma/kde-cli-tools/distinfo b/x11/kde-plasma/kde-cli-tools/distinfo index acc762f51..11d7c528d 100644 --- a/x11/kde-plasma/kde-cli-tools/distinfo +++ b/x11/kde-plasma/kde-cli-tools/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/kde-cli-tools-5.27.7.tar.xz) = qtsk5hU0UREcIldO4nseViul6SPwomCoF+1YohaKIa8= -SIZE (plasma/kde-cli-tools-5.27.7.tar.xz) = 666908 +SHA256 (plasma/kde-cli-tools-5.27.8.tar.xz) = oroClXupB39NCXsqocXD9/TyX/1yoYwUotg3HpQUZ6M= +SIZE (plasma/kde-cli-tools-5.27.8.tar.xz) = 666812 diff --git a/x11/kde-plasma/kde-gtk-config/Makefile b/x11/kde-plasma/kde-gtk-config/Makefile index f1b23c86f..907662f41 100644 --- a/x11/kde-plasma/kde-gtk-config/Makefile +++ b/x11/kde-plasma/kde-gtk-config/Makefile @@ -6,8 +6,8 @@ WANTLIB += KF5ConfigGui KF5ConfigWidgets KF5CoreAddons KF5DBusAddons WANTLIB += KF5GuiAddons KF5WidgetsAddons KF5WindowSystem Qt5Core WANTLIB += Qt5DBus Qt5Gui Qt5Svg Qt5Widgets Qt5Xml X11 atk-1.0 WANTLIB += c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0 -WANTLIB += glib-2.0 gobject-2.0 gtk-3 harfbuzz intl kdecorations2 -WANTLIB += kdecorations2private m pango-1.0 pangocairo-1.0 +WANTLIB += glib-2.0 gobject-2.0 gtk-3 harfbuzz kdecorations2 kdecorations2private +WANTLIB += m pango-1.0 pangocairo-1.0 BUILD_DEPENDS = www/libsass \ www/sass \ diff --git a/x11/kde-plasma/kde-gtk-config/distinfo b/x11/kde-plasma/kde-gtk-config/distinfo index 73ec31952..d8153fec4 100644 --- a/x11/kde-plasma/kde-gtk-config/distinfo +++ b/x11/kde-plasma/kde-gtk-config/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/kde-gtk-config-5.27.7.tar.xz) = rioeRo9BMqjvz2GBiEfUU+c/i3AQ2QCmoUBv196QHI8= -SIZE (plasma/kde-gtk-config-5.27.7.tar.xz) = 77108 +SHA256 (plasma/kde-gtk-config-5.27.8.tar.xz) = l3xpQ4PjK8jyM9lC9hZdZAuRBRtoqunBQJRmMiqm2dM= +SIZE (plasma/kde-gtk-config-5.27.8.tar.xz) = 77120 diff --git a/x11/kde-plasma/kdecoration/distinfo b/x11/kde-plasma/kdecoration/distinfo index 835e78263..d88deb9a0 100644 --- a/x11/kde-plasma/kdecoration/distinfo +++ b/x11/kde-plasma/kdecoration/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/kdecoration-5.27.7.tar.xz) = 7yakmdUfTanmwloCCdCLXo3O3dyG4GZTf0byDwAfcpQ= -SIZE (plasma/kdecoration-5.27.7.tar.xz) = 52960 +SHA256 (plasma/kdecoration-5.27.8.tar.xz) = 3q0+P8b6Sllq0zmKlfH34ZDEPVf5y31q9El6PTywyIk= +SIZE (plasma/kdecoration-5.27.8.tar.xz) = 52952 diff --git a/x11/kde-plasma/kdeplasma-addons/distinfo b/x11/kde-plasma/kdeplasma-addons/distinfo index ecbd3a14f..c6981e26e 100644 --- a/x11/kde-plasma/kdeplasma-addons/distinfo +++ b/x11/kde-plasma/kdeplasma-addons/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/kdeplasma-addons-5.27.7.tar.xz) = Ucc9iHL85/O8VKj79ICkDAF41j9wP+aWch0Ebzol71A= -SIZE (plasma/kdeplasma-addons-5.27.7.tar.xz) = 822048 +SHA256 (plasma/kdeplasma-addons-5.27.8.tar.xz) = azWGirHhLZkQ8AJcwrXPggyL6Ao5ISoNmCZQtZxPZUY= +SIZE (plasma/kdeplasma-addons-5.27.8.tar.xz) = 822128 diff --git a/x11/kde-plasma/kgamma5/distinfo b/x11/kde-plasma/kgamma5/distinfo index f427de53d..31cb6c7af 100644 --- a/x11/kde-plasma/kgamma5/distinfo +++ b/x11/kde-plasma/kgamma5/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/kgamma5-5.27.7.tar.xz) = 1F6I1O4cbP+gte8IXEp9AoreN+LapyJT50lB2bz1rmw= -SIZE (plasma/kgamma5-5.27.7.tar.xz) = 88448 +SHA256 (plasma/kgamma5-5.27.8.tar.xz) = SD8MJxrP+MOFHidWdKcFygmlJp9QodLVCZkPWMHwNBY= +SIZE (plasma/kgamma5-5.27.8.tar.xz) = 88448 diff --git a/x11/kde-plasma/khotkeys/distinfo b/x11/kde-plasma/khotkeys/distinfo index 86853e96f..dacc5796d 100644 --- a/x11/kde-plasma/khotkeys/distinfo +++ b/x11/kde-plasma/khotkeys/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/khotkeys-5.27.7.tar.xz) = bYUEHcWaTgxnJsl8PzDK9tIrj5YLz8OfzdKU8WU478Y= -SIZE (plasma/khotkeys-5.27.7.tar.xz) = 1895248 +SHA256 (plasma/khotkeys-5.27.8.tar.xz) = jOIjgEPhkUgCpsSzxe1HITPfcl3DJk2TwPF1moZioR4= +SIZE (plasma/khotkeys-5.27.8.tar.xz) = 1895272 diff --git a/x11/kde-plasma/kinfocenter/distinfo b/x11/kde-plasma/kinfocenter/distinfo index 4ec6d8c72..01d09e815 100644 --- a/x11/kde-plasma/kinfocenter/distinfo +++ b/x11/kde-plasma/kinfocenter/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/kinfocenter-5.27.7.tar.xz) = cu6IciE/CMLZEOgnEtstJHc8KHAc27nn0j9nF5FAFZY= -SIZE (plasma/kinfocenter-5.27.7.tar.xz) = 1016068 +SHA256 (plasma/kinfocenter-5.27.8.tar.xz) = r29in2i6s2lyGXfw4XSc8dLRsRI039THMppCEg+q2cw= +SIZE (plasma/kinfocenter-5.27.8.tar.xz) = 1016252 diff --git a/x11/kde-plasma/kmenuedit/distinfo b/x11/kde-plasma/kmenuedit/distinfo index b15f53efb..b0646cfe3 100644 --- a/x11/kde-plasma/kmenuedit/distinfo +++ b/x11/kde-plasma/kmenuedit/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/kmenuedit-5.27.7.tar.xz) = Z6vyv5FmwMd5dELtz8XW9+ukpXWsaJhZtlHqxQn5wFg= -SIZE (plasma/kmenuedit-5.27.7.tar.xz) = 932128 +SHA256 (plasma/kmenuedit-5.27.8.tar.xz) = rggKk/QwBhLT94MqkDxEc7Sa5A+IDJRNGnwvOZYU858= +SIZE (plasma/kmenuedit-5.27.8.tar.xz) = 932112 diff --git a/x11/kde-plasma/kscreen/distinfo b/x11/kde-plasma/kscreen/distinfo index 32a0ec98f..e99e0ce59 100644 --- a/x11/kde-plasma/kscreen/distinfo +++ b/x11/kde-plasma/kscreen/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/kscreen-5.27.7.tar.xz) = ONdV4bAVhOHCGpJbKrBGwPj5d7scTnXUNuvJxjMWCg8= -SIZE (plasma/kscreen-5.27.7.tar.xz) = 185132 +SHA256 (plasma/kscreen-5.27.8.tar.xz) = FMsrOZ6gVsJVE4K1PkVlI4b2t+nfqZYVqxW8eqyPBBs= +SIZE (plasma/kscreen-5.27.8.tar.xz) = 185204 diff --git a/x11/kde-plasma/kscreenlocker/distinfo b/x11/kde-plasma/kscreenlocker/distinfo index e22066c80..636bb483a 100644 --- a/x11/kde-plasma/kscreenlocker/distinfo +++ b/x11/kde-plasma/kscreenlocker/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/kscreenlocker-5.27.7.tar.xz) = wgE7UQ7XFLDyVEs3OTuCyx1mmd7IKciQbRDdJJqew4c= -SIZE (plasma/kscreenlocker-5.27.7.tar.xz) = 160856 +SHA256 (plasma/kscreenlocker-5.27.8.tar.xz) = mj+TgyjstMU2i7y34/WnnK/uPfR6Vt5oU9Soe/Us/RY= +SIZE (plasma/kscreenlocker-5.27.8.tar.xz) = 160892 diff --git a/x11/kde-plasma/ksshaskpass/distinfo b/x11/kde-plasma/ksshaskpass/distinfo index e70f17455..04a61d825 100644 --- a/x11/kde-plasma/ksshaskpass/distinfo +++ b/x11/kde-plasma/ksshaskpass/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/ksshaskpass-5.27.7.tar.xz) = 4TF1rPGsHrlaJFSrMLV+HoKaMhRaes+TH4klRuRuvm4= -SIZE (plasma/ksshaskpass-5.27.7.tar.xz) = 28040 +SHA256 (plasma/ksshaskpass-5.27.8.tar.xz) = Z8QZulWUKGbbUdcKiJlfZxOqoMOgzK0oMi/uOG2Fma0= +SIZE (plasma/ksshaskpass-5.27.8.tar.xz) = 28024 diff --git a/x11/kde-plasma/ksystemstats/distinfo b/x11/kde-plasma/ksystemstats/distinfo index dd93aa11f..6955f116e 100644 --- a/x11/kde-plasma/ksystemstats/distinfo +++ b/x11/kde-plasma/ksystemstats/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/ksystemstats-5.27.7.tar.xz) = fD+JmOb1q9Gt/SL+YnK58Xi7TbcWo9jfwWL0bkxZpbs= -SIZE (plasma/ksystemstats-5.27.7.tar.xz) = 116584 +SHA256 (plasma/ksystemstats-5.27.8.tar.xz) = LhZVQ0r6u5orRretS4gR0tgZQfo7qQWJpKP+Wt4IkVo= +SIZE (plasma/ksystemstats-5.27.8.tar.xz) = 116592 diff --git a/x11/kde-plasma/kwayland-integration/distinfo b/x11/kde-plasma/kwayland-integration/distinfo index 23dc5cdd5..0cc24efc8 100644 --- a/x11/kde-plasma/kwayland-integration/distinfo +++ b/x11/kde-plasma/kwayland-integration/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/kwayland-integration-5.27.7.tar.xz) = HnmXaIoylWP2LOdTToIyakMX2ezxJAPRLnDU0jcxbrs= -SIZE (plasma/kwayland-integration-5.27.7.tar.xz) = 25776 +SHA256 (plasma/kwayland-integration-5.27.8.tar.xz) = en23o3wdYfwzzwroFK2DLodVkRAh/I08rzZrU0Noc4U= +SIZE (plasma/kwayland-integration-5.27.8.tar.xz) = 25776 diff --git a/x11/kde-plasma/kwin/Makefile b/x11/kde-plasma/kwin/Makefile index 224320abf..fd62af5df 100644 --- a/x11/kde-plasma/kwin/Makefile +++ b/x11/kde-plasma/kwin/Makefile @@ -19,7 +19,7 @@ WANTLIB += KScreenLocker Qt5Concurrent Qt5Core Qt5DBus Qt5Gui WANTLIB += Qt5Network Qt5Qml Qt5QmlModels Qt5Quick Qt5Widgets WANTLIB += Qt5X11Extras Qt5Xml SM X11 X11-xcb Xext Xi c drm epoxy WANTLIB += fontconfig freetype gbm glib-2.0 gthread-2.0 input -WANTLIB += intl kdecorations2 kdecorations2private lcms2 m qaccessibilityclient-qt5 +WANTLIB += kdecorations2 kdecorations2private lcms2 m qaccessibilityclient-qt5 WANTLIB += udev wayland-client wayland-server xcb xcb-composite WANTLIB += xcb-cursor xcb-damage xcb-glx xcb-icccm xcb-keysyms WANTLIB += xcb-present xcb-randr xcb-render xcb-shape xcb-shm diff --git a/x11/kde-plasma/kwin/distinfo b/x11/kde-plasma/kwin/distinfo index b63c964e9..781ca5740 100644 --- a/x11/kde-plasma/kwin/distinfo +++ b/x11/kde-plasma/kwin/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/kwin-5.27.7.tar.xz) = y/9VugGEY7wFuihmY66h17D0iZPcPHeLVRTjT825Wi8= -SIZE (plasma/kwin-5.27.7.tar.xz) = 7626216 +SHA256 (plasma/kwin-5.27.8.tar.xz) = 5ybNaGSIBa886YtrNg6t17poHmz0NYsatXhjzScHMuk= +SIZE (plasma/kwin-5.27.8.tar.xz) = 7631012 diff --git a/x11/kde-plasma/kwrited/distinfo b/x11/kde-plasma/kwrited/distinfo index 89e7d3ab2..64842d1a5 100644 --- a/x11/kde-plasma/kwrited/distinfo +++ b/x11/kde-plasma/kwrited/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/kwrited-5.27.7.tar.xz) = FuxBdFy75cFi1YCKskZj3HQkjHGdMkyBBH/RZX0Bj6g= -SIZE (plasma/kwrited-5.27.7.tar.xz) = 23428 +SHA256 (plasma/kwrited-5.27.8.tar.xz) = SRe50zMRnLmSng/aDtSyxnmvmGp3hpLRkgLq9gmchXg= +SIZE (plasma/kwrited-5.27.8.tar.xz) = 23444 diff --git a/x11/kde-plasma/layer-shell-qt/distinfo b/x11/kde-plasma/layer-shell-qt/distinfo index 2aadb5306..3b8f1aaba 100644 --- a/x11/kde-plasma/layer-shell-qt/distinfo +++ b/x11/kde-plasma/layer-shell-qt/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/layer-shell-qt-5.27.7.tar.xz) = J8ROfbc78qpnKHGei7hIwbDBx6cEyGNJpBlXeSDG9CE= -SIZE (plasma/layer-shell-qt-5.27.7.tar.xz) = 18452 +SHA256 (plasma/layer-shell-qt-5.27.8.tar.xz) = dy8quhcQurWfTJSKjpYo8gWnxqTavrQYsyScWZDGiKs= +SIZE (plasma/layer-shell-qt-5.27.8.tar.xz) = 18452 diff --git a/x11/kde-plasma/libkscreen/distinfo b/x11/kde-plasma/libkscreen/distinfo index 015f1fc25..1231dc8b1 100644 --- a/x11/kde-plasma/libkscreen/distinfo +++ b/x11/kde-plasma/libkscreen/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/libkscreen-5.27.7.tar.xz) = hrUb80BsNTr9ei4fR+JRHQYDE9i9ii73+nOjvxU+Pqs= -SIZE (plasma/libkscreen-5.27.7.tar.xz) = 116032 +SHA256 (plasma/libkscreen-5.27.8.tar.xz) = lFYv1Y3il6MQKV4fcboZzpHDpBBOrkCysyEs48ZqgyA= +SIZE (plasma/libkscreen-5.27.8.tar.xz) = 116068 diff --git a/x11/kde-plasma/libksysguard/distinfo b/x11/kde-plasma/libksysguard/distinfo index 154781058..55153c55f 100644 --- a/x11/kde-plasma/libksysguard/distinfo +++ b/x11/kde-plasma/libksysguard/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/libksysguard-5.27.7.tar.xz) = aCqTklLjWlK3+VpvW/zHy5g/o7UnWuOzd6uAQLKSyxg= -SIZE (plasma/libksysguard-5.27.7.tar.xz) = 880568 +SHA256 (plasma/libksysguard-5.27.8.tar.xz) = oCTAGDsK7R4vtGYboOMZQvVKSmMM6xTKdFrF92JF/X0= +SIZE (plasma/libksysguard-5.27.8.tar.xz) = 884408 diff --git a/x11/kde-plasma/milou/distinfo b/x11/kde-plasma/milou/distinfo index 1f3ea45a2..7f89b1210 100644 --- a/x11/kde-plasma/milou/distinfo +++ b/x11/kde-plasma/milou/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/milou-5.27.7.tar.xz) = gWkL/8nVhEXAmvZGcNgM1Tc12y8No2pIR9NGbsWpCFM= -SIZE (plasma/milou-5.27.7.tar.xz) = 58492 +SHA256 (plasma/milou-5.27.8.tar.xz) = TZx2qNMqIgIKAj8O3wTxNgv0qQEXZggqY8AmYOacCOc= +SIZE (plasma/milou-5.27.8.tar.xz) = 58540 diff --git a/x11/kde-plasma/oxygen-sounds/distinfo b/x11/kde-plasma/oxygen-sounds/distinfo index ed6274d31..27b5d879d 100644 --- a/x11/kde-plasma/oxygen-sounds/distinfo +++ b/x11/kde-plasma/oxygen-sounds/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/oxygen-sounds-5.27.7.tar.xz) = +Il8/YX+HnxqDYuc6f2v4cuHgRLjBGdmNxPJ65ZSUow= -SIZE (plasma/oxygen-sounds-5.27.7.tar.xz) = 1896436 +SHA256 (plasma/oxygen-sounds-5.27.8.tar.xz) = 1pfX6XHgGf16mFWgzz091dHGqWxVtSK7O9/f7J2lpAU= +SIZE (plasma/oxygen-sounds-5.27.8.tar.xz) = 1896428 diff --git a/x11/kde-plasma/oxygen/Makefile b/x11/kde-plasma/oxygen/Makefile index d4517d00a..d15458803 100644 --- a/x11/kde-plasma/oxygen/Makefile +++ b/x11/kde-plasma/oxygen/Makefile @@ -1,6 +1,5 @@ COMMENT = style for Qt/KDE Applications DISTNAME = oxygen-${VERSION} -REVISION = 0 SHARED_LIBS = oxygenstyle5 1.0 SHARED_LIBS += oxygenstyleconfig5 0.0 diff --git a/x11/kde-plasma/oxygen/distinfo b/x11/kde-plasma/oxygen/distinfo index 3ca891df3..43045eacb 100644 --- a/x11/kde-plasma/oxygen/distinfo +++ b/x11/kde-plasma/oxygen/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/oxygen-5.27.7.tar.xz) = ohj8Ly97KX3la3X0E8WsqwOY+MSnoEOhuZuZ0VJWOY0= -SIZE (plasma/oxygen-5.27.7.tar.xz) = 2785964 +SHA256 (plasma/oxygen-5.27.8.tar.xz) = XyuF2E+/gVMQ4Jw1Lvm+kl6/agC9+aAZAWCf9ryDxIs= +SIZE (plasma/oxygen-5.27.8.tar.xz) = 2785564 diff --git a/x11/kde-plasma/plasma-desktop/distinfo b/x11/kde-plasma/plasma-desktop/distinfo index 631e4b8d9..722c49335 100644 --- a/x11/kde-plasma/plasma-desktop/distinfo +++ b/x11/kde-plasma/plasma-desktop/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/plasma-desktop-5.27.7.tar.xz) = IpqoOIaaBeNR218tgWCMnc4hbP64Xx+359V16IaTU9o= -SIZE (plasma/plasma-desktop-5.27.7.tar.xz) = 14715084 +SHA256 (plasma/plasma-desktop-5.27.8.tar.xz) = 32YKCprWg0ESrdWZmC/QxrmRw2ttPCfhMJAoxNA+vK4= +SIZE (plasma/plasma-desktop-5.27.8.tar.xz) = 14718232 diff --git a/x11/kde-plasma/plasma-nano/distinfo b/x11/kde-plasma/plasma-nano/distinfo index 08460398e..1662e94dd 100644 --- a/x11/kde-plasma/plasma-nano/distinfo +++ b/x11/kde-plasma/plasma-nano/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/plasma-nano-5.27.7.tar.xz) = 0ypKgz85yUxTvzxkF0M4wiZYLkLrk/9C+aBx25c5jJM= -SIZE (plasma/plasma-nano-5.27.7.tar.xz) = 74368 +SHA256 (plasma/plasma-nano-5.27.8.tar.xz) = wvJVgZ9Wt9on0tBgWFx9LNxBPIh+8rCkIFqy0U2IppQ= +SIZE (plasma/plasma-nano-5.27.8.tar.xz) = 74380 diff --git a/x11/kde-plasma/plasma-pa/Makefile b/x11/kde-plasma/plasma-pa/Makefile index e693032d9..57e404b07 100644 --- a/x11/kde-plasma/plasma-pa/Makefile +++ b/x11/kde-plasma/plasma-pa/Makefile @@ -8,7 +8,7 @@ WANTLIB += ${COMPILER_LIBCXX} KF5ConfigCore KF5ConfigGui KF5CoreAddons WANTLIB += KF5Declarative KF5GlobalAccel KF5I18n KF5Notifications WANTLIB += KF5Package KF5QuickAddons Qt5Core Qt5DBus Qt5Gui Qt5Network WANTLIB += Qt5Qml Qt5QmlModels Qt5Quick Qt5Widgets Qt5Xml canberra -WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl m pulse pulse-mainloop-glib +WANTLIB += gio-2.0 glib-2.0 gobject-2.0 m pulse pulse-mainloop-glib BUILD_DEPENDS = x11/qt5/qtquickcontrols2 \ x11/gtk-vnc diff --git a/x11/kde-plasma/plasma-pa/distinfo b/x11/kde-plasma/plasma-pa/distinfo index 27cbe73b1..81105f753 100644 --- a/x11/kde-plasma/plasma-pa/distinfo +++ b/x11/kde-plasma/plasma-pa/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/plasma-pa-5.27.7.tar.xz) = THP7cq9zpSWPt9OE7qZQhLdjQa6cVWUqSR4RY8tG4u0= -SIZE (plasma/plasma-pa-5.27.7.tar.xz) = 163440 +SHA256 (plasma/plasma-pa-5.27.8.tar.xz) = aSNBMtsaunlMFl1xSQwViwmWgPpQIar/7RA++f0+1ws= +SIZE (plasma/plasma-pa-5.27.8.tar.xz) = 163588 diff --git a/x11/kde-plasma/plasma-sdk/distinfo b/x11/kde-plasma/plasma-sdk/distinfo index ee0cc94d0..b48a87484 100644 --- a/x11/kde-plasma/plasma-sdk/distinfo +++ b/x11/kde-plasma/plasma-sdk/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/plasma-sdk-5.27.7.tar.xz) = BuGmN7rpkfgiSfbrBSwtPdtUn+zk9KGFQi76DIMXbck= -SIZE (plasma/plasma-sdk-5.27.7.tar.xz) = 320904 +SHA256 (plasma/plasma-sdk-5.27.8.tar.xz) = n5YdXOOl/n6UXrOX0QNDWVRmm6ulIfBKgaQDRfR0kLs= +SIZE (plasma/plasma-sdk-5.27.8.tar.xz) = 320828 diff --git a/x11/kde-plasma/plasma-workspace-wallpapers/distinfo b/x11/kde-plasma/plasma-workspace-wallpapers/distinfo index ea78df5e2..1ca638b22 100644 --- a/x11/kde-plasma/plasma-workspace-wallpapers/distinfo +++ b/x11/kde-plasma/plasma-workspace-wallpapers/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/plasma-workspace-wallpapers-5.27.7.tar.xz) = 3sVxzjcOo0SnDYLxavgugZfIr8CYwOfUf76NW2sFOKA= -SIZE (plasma/plasma-workspace-wallpapers-5.27.7.tar.xz) = 94032284 +SHA256 (plasma/plasma-workspace-wallpapers-5.27.8.tar.xz) = r5b6icJoUlG5e67GNRwAT6Hil49acb67oOlkkPrLf+I= +SIZE (plasma/plasma-workspace-wallpapers-5.27.8.tar.xz) = 94031664 diff --git a/x11/kde-plasma/plasma-workspace/Makefile b/x11/kde-plasma/plasma-workspace/Makefile index a1e8d9dbf..d0eea6e83 100644 --- a/x11/kde-plasma/plasma-workspace/Makefile +++ b/x11/kde-plasma/plasma-workspace/Makefile @@ -39,9 +39,11 @@ MODKDE5_TRANSLATIONS = Yes MODKDE5_ICON_CACHE = Yes MODKDE5_DOCS = Yes -BUILD_DEPENDS = x11/kde-plasma/kwin +BUILD_DEPENDS = x11/kde-plasma/kwin \ + devel/kf5/kquickcharts RUN_DEPENDS = devel/desktop-file-utils \ + devel/kf5/kquickcharts \ multimedia/phonon-backend/gstreamer \ sysutils/coreutils \ x11/dbus,-suid \ diff --git a/x11/kde-plasma/plasma-workspace/distinfo b/x11/kde-plasma/plasma-workspace/distinfo index f83c7db97..461389d67 100644 --- a/x11/kde-plasma/plasma-workspace/distinfo +++ b/x11/kde-plasma/plasma-workspace/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/plasma-workspace-5.27.7.tar.xz) = BkKUHc31E6wgFJSJfixQl6Ly24vm3NtZfK4aQ9guzl8= -SIZE (plasma/plasma-workspace-5.27.7.tar.xz) = 19465984 +SHA256 (plasma/plasma-workspace-5.27.8.tar.xz) = pWXSmFHyjgADAYViySm31KyPAINpI8EtGZtJZNO2DvA= +SIZE (plasma/plasma-workspace-5.27.8.tar.xz) = 19465764 diff --git a/x11/kde-plasma/plasma-workspace/patches/patch-lookandfeel_org_kde_breeze_contents_splash_Splash_qml b/x11/kde-plasma/plasma-workspace/patches/patch-lookandfeel_org_kde_breeze_contents_splash_Splash_qml index 0dfb9b86d..1c1fdad84 100644 --- a/x11/kde-plasma/plasma-workspace/patches/patch-lookandfeel_org_kde_breeze_contents_splash_Splash_qml +++ b/x11/kde-plasma/plasma-workspace/patches/patch-lookandfeel_org_kde_breeze_contents_splash_Splash_qml @@ -3,9 +3,9 @@ Index: lookandfeel/org.kde.breeze/contents/splash/Splash.qml --- lookandfeel/org.kde.breeze/contents/splash/Splash.qml.orig +++ lookandfeel/org.kde.breeze/contents/splash/Splash.qml @@ -37,7 +37,7 @@ Rectangle { - anchors.centerIn: parent + asynchronous: true - source: "images/plasma.svgz" + source: "images/kde-puffy.svgz" diff --git a/x11/kde-plasma/polkit-kde-agent-1/distinfo b/x11/kde-plasma/polkit-kde-agent-1/distinfo index 508b9bb92..ef6289924 100644 --- a/x11/kde-plasma/polkit-kde-agent-1/distinfo +++ b/x11/kde-plasma/polkit-kde-agent-1/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/polkit-kde-agent-1-5.27.7.tar.xz) = jEkG8T8KizFCP24utCFj/qOpUXrexRiz8WXZmsq2z1w= -SIZE (plasma/polkit-kde-agent-1-5.27.7.tar.xz) = 52760 +SHA256 (plasma/polkit-kde-agent-1-5.27.8.tar.xz) = WJc3FcyneJyqHG/6HV996Yi5UqqTF8r3URnOgA/5z40= +SIZE (plasma/polkit-kde-agent-1-5.27.8.tar.xz) = 52784 diff --git a/x11/kde-plasma/qqc2-breeze-style/distinfo b/x11/kde-plasma/qqc2-breeze-style/distinfo index 3b4916a4d..5f8e0c102 100644 --- a/x11/kde-plasma/qqc2-breeze-style/distinfo +++ b/x11/kde-plasma/qqc2-breeze-style/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/qqc2-breeze-style-5.27.7.tar.xz) = BLT1ShdflyXS8Pj3lal+0Jqy+gdDIXG7TEvyiKSVWTI= -SIZE (plasma/qqc2-breeze-style-5.27.7.tar.xz) = 65988 +SHA256 (plasma/qqc2-breeze-style-5.27.8.tar.xz) = u5Q1IiPgvCOeKwJ3SSCUwvaGizEJsCyCRH6Zkn0d8cA= +SIZE (plasma/qqc2-breeze-style-5.27.8.tar.xz) = 66036 diff --git a/x11/kde-plasma/systemsettings/distinfo b/x11/kde-plasma/systemsettings/distinfo index b2e3556d3..a4d3c22fe 100644 --- a/x11/kde-plasma/systemsettings/distinfo +++ b/x11/kde-plasma/systemsettings/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/systemsettings-5.27.7.tar.xz) = fB3aFEx7zWRoMxiVo33xnTUsyEcyo9YL1idBpsmqbG4= -SIZE (plasma/systemsettings-5.27.7.tar.xz) = 226204 +SHA256 (plasma/systemsettings-5.27.8.tar.xz) = PpQRcVot+yApYRELZx0gcXUFbCKvUb3/zgEzbrh0P7k= +SIZE (plasma/systemsettings-5.27.8.tar.xz) = 226216 diff --git a/x11/kde-plasma/xdg-desktop-portal-kde/distinfo b/x11/kde-plasma/xdg-desktop-portal-kde/distinfo index cc40d08c0..64763d8b6 100644 --- a/x11/kde-plasma/xdg-desktop-portal-kde/distinfo +++ b/x11/kde-plasma/xdg-desktop-portal-kde/distinfo @@ -1,2 +1,2 @@ -SHA256 (plasma/xdg-desktop-portal-kde-5.27.7.tar.xz) = zNv5utZGXek0xNwwpvtNQ3aHLK8AFLkcN0nicUD+CM0= -SIZE (plasma/xdg-desktop-portal-kde-5.27.7.tar.xz) = 141512 +SHA256 (plasma/xdg-desktop-portal-kde-5.27.8.tar.xz) = fh/fJExjY6c/SHxen4VLCIhc2nSqf0Kb2c60w1wnP1M= +SIZE (plasma/xdg-desktop-portal-kde-5.27.8.tar.xz) = 142484 diff --git a/x11/kde-plasma/xdg-desktop-portal-kde/pkg/PLIST b/x11/kde-plasma/xdg-desktop-portal-kde/pkg/PLIST index 0c6033e6b..e06b80307 100644 --- a/x11/kde-plasma/xdg-desktop-portal-kde/pkg/PLIST +++ b/x11/kde-plasma/xdg-desktop-portal-kde/pkg/PLIST @@ -51,6 +51,7 @@ share/locale/zh_CN/LC_MESSAGES/xdg-desktop-portal-kde.mo share/locale/zh_TW/LC_MESSAGES/xdg-desktop-portal-kde.mo share/qlogging-categories5/xdp-kde.categories share/xdg-desktop-portal/ +share/xdg-desktop-portal/kde-portals.conf share/xdg-desktop-portal/portals/ share/xdg-desktop-portal/portals/kde.portal @tag update-desktop-database diff --git a/x11/libxcvt/Makefile b/x11/libxcvt/Makefile deleted file mode 100644 index 1302b87d5..000000000 --- a/x11/libxcvt/Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -COMMENT = VESA CVT standard timing modeline generation library -V = 0.1.2 -PKGNAME = libxcvt-${V} -DISTNAME = libxcvt-libxcvt-${V} - -SHARED_LIBS += xcvt 0.0 # 0.0 - -CATEGORIES = x11 - -HOMEPAGE = https://gitlab.freedesktop.org/xorg/lib/libxcvt - -# X11 -PERMIT_PACKAGE = Yes -WANTLIB += c m - -MASTER_SITES = https://gitlab.freedesktop.org/xorg/lib/libxcvt/-/archive/libxcvt-${V}/ - -COMPILER_LANGS = c - -MODULES = devel/meson - -.include <bsd.port.mk> diff --git a/x11/libxcvt/distinfo b/x11/libxcvt/distinfo deleted file mode 100644 index 5fc8a76ba..000000000 --- a/x11/libxcvt/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (libxcvt-libxcvt-0.1.2.tar.gz) = 2At8czGtCiwsgUaW+QEm4zqqB9dZ6ZI6QMvOZtAq3xM= -SIZE (libxcvt-libxcvt-0.1.2.tar.gz) = 10265 diff --git a/x11/libxcvt/pkg/DESCR b/x11/libxcvt/pkg/DESCR deleted file mode 100644 index 8aa83fe67..000000000 --- a/x11/libxcvt/pkg/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -libxcvt is a library providing a standalone version of the X server -implementation of the VESA CVT standard timing modelines generator. - -libxcvt also provides a standalone version of the command line tool cvt copied -from the Xorg implementation and is meant to be a direct replacement to the -version provided by the Xorg server. diff --git a/x11/libxcvt/pkg/PLIST b/x11/libxcvt/pkg/PLIST deleted file mode 100644 index 74016d341..000000000 --- a/x11/libxcvt/pkg/PLIST +++ /dev/null @@ -1,7 +0,0 @@ -@bin bin/cvt -include/libxcvt/ -include/libxcvt/libxcvt.h -include/libxcvt/libxcvt_mode.h -@lib lib/libxcvt.so.${LIBxcvt_VERSION} -lib/pkgconfig/libxcvt.pc -@man man/man1/cvt.1 diff --git a/x11/qt5/qtwebengine/Makefile b/x11/qt5/qtwebengine/Makefile index 740e66c16..9deff1f70 100644 --- a/x11/qt5/qtwebengine/Makefile +++ b/x11/qt5/qtwebengine/Makefile @@ -15,7 +15,7 @@ COMMENT = Chromium-based web engine for Qt5 # Many parts are copied from www/chromium port, so keep in sync DISTNAME = qtwebengine-everywhere-opensource-src-${QT5_WEBENGINE_VERSION} QT5NAME = QtWebEngine -REVISION = 2 +REVISION = 4 CATEGORIES = www @@ -130,6 +130,7 @@ pre-configure: pre-build: ${SUBST_CMD} ${CHROMESRC}/build/gn_run_binary.py \ + ${WRKSRC}/src/3rdparty/chromium/third_party/pdfium/core/fxge/fx_ge_linux.cpp \ ${CHROMESRC}/v8/tools/run.py \ ${CHROMESRC}/tools/protoc_wrapper/protoc_wrapper.py diff --git a/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_pdfium_core_fxge_fx_ge_linux_cpp b/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_pdfium_core_fxge_fx_ge_linux_cpp index 5676ab51e..e674b7974 100644 --- a/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_pdfium_core_fxge_fx_ge_linux_cpp +++ b/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_pdfium_core_fxge_fx_ge_linux_cpp @@ -10,15 +10,23 @@ Index: src/3rdparty/chromium/third_party/pdfium/core/fxge/fx_ge_linux.cpp #error "Included on the wrong platform" #endif -@@ -165,9 +165,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf +@@ -165,10 +165,16 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override { auto pInfo = std::make_unique<CFX_LinuxFontInfo>(); if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) { - pInfo->AddPath("/usr/share/fonts"); - pInfo->AddPath("/usr/share/X11/fonts/Type1"); - pInfo->AddPath("/usr/share/X11/fonts/TTF"); ++#if defined(OS_BSD) ++ pInfo->AddPath("${X11BASE}/X11/fonts/Type1"); ++ pInfo->AddPath("${X11BASE}/X11/fonts/TTF"); ++ pInfo->AddPath("${LOCALBASE}/share/fonts/noto"); ++ pInfo->AddPath("${LOCALBASE}/share/fonts"); ++#else + pInfo->AddPath("/usr/X11R6/lib/X11/fonts/Type1"); + pInfo->AddPath("/usr/X11R6/lib/X11/fonts/TTF"); pInfo->AddPath("/usr/local/share/fonts"); ++#endif } return pInfo; + } diff --git a/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_pdfium_public_fpdfview_h b/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_pdfium_public_fpdfview_h new file mode 100644 index 000000000..444369c44 --- /dev/null +++ b/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_pdfium_public_fpdfview_h @@ -0,0 +1,29 @@ +Index: src/3rdparty/chromium/third_party/pdfium/public/fpdfview.h +--- src/3rdparty/chromium/third_party/pdfium/public/fpdfview.h.orig ++++ src/3rdparty/chromium/third_party/pdfium/public/fpdfview.h +@@ -176,25 +176,7 @@ typedef int FPDF_ANNOT_APPEARANCEMODE; + // Dictionary value types. + typedef int FPDF_OBJECT_TYPE; + +-#if defined(COMPONENT_BUILD) +-// FPDF_EXPORT should be consistent with |export| in the pdfium_fuzzer +-// template in testing/fuzzers/BUILD.gn. +-#if defined(WIN32) +-#if defined(FPDF_IMPLEMENTATION) +-#define FPDF_EXPORT __declspec(dllexport) +-#else +-#define FPDF_EXPORT __declspec(dllimport) +-#endif // defined(FPDF_IMPLEMENTATION) +-#else +-#if defined(FPDF_IMPLEMENTATION) + #define FPDF_EXPORT __attribute__((visibility("default"))) +-#else +-#define FPDF_EXPORT +-#endif // defined(FPDF_IMPLEMENTATION) +-#endif // defined(WIN32) +-#else +-#define FPDF_EXPORT +-#endif // defined(COMPONENT_BUILD) + + #if defined(WIN32) && defined(FPDFSDK_EXPORTS) + #define FPDF_CALLCONV __stdcall