diff --git a/.github/scripts/github_generate_release_note.sh b/.github/scripts/github_generate_release_note.sh index f10f708..6b4fc41 100755 --- a/.github/scripts/github_generate_release_note.sh +++ b/.github/scripts/github_generate_release_note.sh @@ -13,10 +13,20 @@ _release_tag_version="${_chromium_version}-${_ungoogled_revision}.${_package_rev _gh_run_href="https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" touch ./github_release_note.md -printf '## Ungoogled-Chromium macOS %s\n' "$_release_tag_version" | tee -a ./github_release_note.md -printf '\n' | tee -a ./github_release_note.md +printf '## Ungoogled-Chromium macOS %s\n\n' "$_release_tag_version" | tee -a ./github_release_note.md + +if [ -f $_root_dir/announcements.md ]; then + printf '### Announcements %s\n\n' | tee -a ./github_release_note.md + + _announcement="${_root_dir}/announcements.md" + cat $_announcement | tee -a ./github_release_note.md + + printf '\n' | tee -a ./github_release_note.md + printf '### Release Assets Info %s\n\n' | tee -a ./github_release_note.md +fi + cat $_arm64_hash_name | tee -a ./github_release_note.md printf '\n' | tee -a ./github_release_note.md cat $_x64_hash_name | tee -a ./github_release_note.md -printf '\n' | tee -a ./github_release_note.md +printf '\n\n---\n\n' | tee -a ./github_release_note.md printf 'See [this GitHub Actions Run](%s) for the [Workflow file](%s/workflow) used as well as the build logs and artifacts\n' "$_gh_run_href" "$_gh_run_href" | tee -a ./github_release_note.md diff --git a/README.md b/README.md index 9a901c6..7b7a8ba 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,19 @@ macOS packaging for [ungoogled-chromium](//github.com/Eloston/ungoogled-chromium **Source Code**: It is recommended to use a tag via `git checkout` (see building instructions below). You may also use `master`, but it is for development and may not be stable. +## Announcements + +Many people have asked for notarizing (signing) the Ungoogled-Chromium macOS build ([ungoogled-chromium#859](https://github.com/ungoogled-software/ungoogled-chromium/issues/859), [#63](https://github.com/ungoogled-software/ungoogled-chromium-macos/issues/63), [#179](https://github.com/ungoogled-software/ungoogled-chromium-macos/issues/179)). + +As all Ungoogled-Chromium maintainers are maintaining the software on a voluntary basis, we unfortunately do not have the funds for the Apple Developer Program membership, which is required for notarization. + +As of now, I, [@Cubik65536](https://github.com/Cubik65536), the maintainer of Ungoogled-Chromium macOS, am seeking sponsors to help me cover the cost of the Apple Developer Program fee. If you're interested in getting the "official" Ungoogled-Chromium macOS build notarized, please consider sponsoring me through [GitHub Sponsors](https://github.com/sponsors/Cubik65536) or [Buy me a Coffee](https://buymeacoffee.com/cubik65536). + +Note that: + +1. These sponsorship accounts are under the name of `Cubik65536`. All sponsor records (i.e. who’s sponsoring) will be public unless you choose to make it private. When sponsoring, you can leave a message specifying that it is for Ungoogled-Chromium, so you will be able to be credited in a sponsor list in the future. +2. There are already some other volunteers who have offered notarized builds, and it is worth mentioning that there are no real differences between their build and the "official" build (released under `ungoogled-software` organization), as people behind the `ungoogled-software` organization are also all volunteers. + ## Building ### Software requirements diff --git a/announcements.md b/announcements.md new file mode 100644 index 0000000..2af9dcf --- /dev/null +++ b/announcements.md @@ -0,0 +1,10 @@ +Many people have asked for notarizing (signing) the Ungoogled-Chromium macOS build ([ungoogled-chromium#859](https://github.com/ungoogled-software/ungoogled-chromium/issues/859), [#63](https://github.com/ungoogled-software/ungoogled-chromium-macos/issues/63), [#179](https://github.com/ungoogled-software/ungoogled-chromium-macos/issues/179)). + +As all Ungoogled-Chromium maintainers are maintaining the software on a voluntary basis, we unfortunately do not have the funds for the Apple Developer Program membership, which is required for notarization. + +As of now, I, [@Cubik65536](https://github.com/Cubik65536), the maintainer of Ungoogled-Chromium macOS, am seeking sponsors to help me cover the cost of the Apple Developer Program fee. If you're interested in getting the "official" Ungoogled-Chromium macOS build notarized, please consider sponsoring me through [GitHub Sponsors](https://github.com/sponsors/Cubik65536) or [Buy me a Coffee](https://buymeacoffee.com/cubik65536). + +Note that: + +1. These sponsorship accounts are under the name of `Cubik65536`. All sponsor records (i.e. who’s sponsoring) will be public unless you choose to make it private. When sponsoring, you can leave a message specifying that it is for Ungoogled-Chromium, so you will be able to be credited in a sponsor list in the future. +2. There are already some other volunteers who have offered notarized builds, and it is worth mentioning that there are no real differences between their build and the "official" build (released under `ungoogled-software` organization), as people behind the `ungoogled-software` organization are also all volunteers. diff --git a/downloads-arm64.ini b/downloads-arm64.ini index f329200..dbf75fc 100644 --- a/downloads-arm64.ini +++ b/downloads-arm64.ini @@ -18,7 +18,7 @@ sha512 = 8678a2baf8d0c1c0e74ccf64c0dfdbb634e4c99d5770f20cf670f0a725885c668d7950e output_path = third_party/node/mac_arm64/node-darwin-arm64 [rust] -version = 2024-05-07 +version = 2024-06-15 url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-aarch64-apple-darwin.tar.xz download_filename = rust-nightly-%(version)s-aarch64-apple-darwin.tar.xz output_path = third_party/rust-toolchain diff --git a/downloads-x86-64.ini b/downloads-x86-64.ini index eb2f746..b31e908 100644 --- a/downloads-x86-64.ini +++ b/downloads-x86-64.ini @@ -18,7 +18,7 @@ sha512 = 0e2ad3e108a6a2e938180ac958094476d5217e77176ecd18f6eb7f295ac2890781577c6 output_path = third_party/node/mac/node-darwin-x64 [rust] -version = 2024-05-07 +version = 2024-06-15 url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-x86_64-apple-darwin.tar.xz download_filename = rust-nightly-%(version)s-x86_64-apple-darwin.tar.xz output_path = third_party/rust-toolchain diff --git a/patches/series b/patches/series index 9411ef2..08e6488 100644 --- a/patches/series +++ b/patches/series @@ -10,4 +10,3 @@ ungoogled-chromium/macos/fix-libpng-build.patch ungoogled-chromium/macos/fix-runTsc-log-info.patch ungoogled-chromium/macos/no-unknown-warnings.patch ungoogled-chromium/macos/mark-remap_alloc-used.patch -ungoogled-chromium/macos/fix-ninja-1.12-dependency.patch diff --git a/patches/ungoogled-chromium/macos/disable-clang-version-check.patch b/patches/ungoogled-chromium/macos/disable-clang-version-check.patch index 0120bd3..bdd17b7 100644 --- a/patches/ungoogled-chromium/macos/disable-clang-version-check.patch +++ b/patches/ungoogled-chromium/macos/disable-clang-version-check.patch @@ -1,17 +1,18 @@ --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1597,7 +1597,7 @@ config("compiler_deterministic") { +@@ -1605,8 +1605,7 @@ config("compiler_deterministic") { } config("clang_revision") { -- if (is_clang && clang_base_path == default_clang_base_path) { +- if (is_clang && clang_base_path == default_clang_base_path && +- current_os != "zos") { + if (false) { update_args = [ "--print-revision", "--verify-version=$clang_version", --- a/build/toolchain/toolchain.gni +++ b/build/toolchain/toolchain.gni -@@ -47,7 +47,7 @@ declare_args() { +@@ -51,7 +51,7 @@ declare_args() { if (llvm_android_mainline) { # https://crbug.com/1481060 clang_version = "17" } else { diff --git a/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch b/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch index 3e472e6..dc18602 100644 --- a/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch +++ b/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch @@ -2,7 +2,7 @@ --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1264,7 +1264,7 @@ if (is_win) { +@@ -1256,7 +1256,7 @@ if (is_win) { # TOOD(crbug/1163903#c8) - thakis@ look into why profile and coverage # instrumentation adds these symbols in different orders diff --git a/patches/ungoogled-chromium/macos/fix-build-with-rust.patch b/patches/ungoogled-chromium/macos/fix-build-with-rust.patch index fbd7b75..b2ef505 100644 --- a/patches/ungoogled-chromium/macos/fix-build-with-rust.patch +++ b/patches/ungoogled-chromium/macos/fix-build-with-rust.patch @@ -1,6 +1,6 @@ --- a/build/config/clang/BUILD.gn +++ b/build/config/clang/BUILD.gn -@@ -245,8 +245,6 @@ clang_lib("compiler_builtins") { +@@ -252,8 +252,6 @@ clang_lib("compiler_builtins") { } else { libname = "ios" } @@ -28,7 +28,7 @@ # Rust targets to be rebuilt, which allows you to update your toolchain and # not break incremental builds. - rustc_version = "" -+ rustc_version = "rustc 1.80.0-nightly (7d83a4c13 2024-05-06)" ++ rustc_version = "rustc 1.81.0-nightly (f8e566053 2024-06-14)" # If you're using a Rust toolchain as specified by rust_sysroot_absolute, # you can specify whether it supports nacl here. diff --git a/patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch b/patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch index 1388a56..5db79fb 100644 --- a/patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch +++ b/patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1961,10 +1961,6 @@ static_library("browser") { +@@ -1989,10 +1989,6 @@ static_library("browser") { "//chrome/browser/ui", "//chrome/browser/storage_access_api", "//chrome/browser/top_level_storage_access_api:permissions", @@ -13,8 +13,8 @@ "//chrome/browser/ip_protection", # TODO(crbug.com/40110173): Eliminate usages of browser.h from Media Router. -@@ -2097,7 +2093,6 @@ static_library("browser") { - "//chrome/browser/resource_coordinator:mojo_bindings", +@@ -2093,7 +2089,6 @@ static_library("browser") { + "//chrome/browser/promos:utils", "//chrome/browser/resource_coordinator:tab_manager_features", "//chrome/browser/resources/accessibility:resources", - "//chrome/browser/safe_browsing", @@ -23,8 +23,8 @@ "//chrome/browser/safe_browsing:verdict_cache_manager_factory", --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -772,9 +772,6 @@ source_set("extensions") { - # TODO(crbug.com/40124309): Remove this circular dependency. +@@ -769,9 +769,6 @@ source_set("extensions") { + # TODO(crbug.com/346472679): Remove this circular dependency. "//chrome/browser/web_applications/extensions", - # TODO(crbug.com/41437292): Remove this circular dependency. @@ -33,7 +33,7 @@ # TODO(crbug.com/343037853): Remove this circular dependency. "//chrome/browser/themes", -@@ -795,8 +792,6 @@ source_set("extensions") { +@@ -794,8 +791,6 @@ source_set("extensions") { "//chrome/common", "//chrome/common/extensions/api", "//components/omnibox/browser", @@ -52,15 +52,7 @@ "//chrome/browser/web_applications", --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -423,7 +423,6 @@ static_library("ui") { - "//components/cross_device/logging", - "//components/dom_distiller/core", - "//components/paint_preview/buildflags", -- "//components/safe_browsing:buildflags", - "//components/sync", - "//components/sync_user_events", - "//components/translate/content/browser", -@@ -631,17 +630,8 @@ static_library("ui") { +@@ -621,17 +621,8 @@ static_library("ui") { "//components/reading_list/features:flags", "//components/renderer_context_menu", "//components/resources", @@ -78,7 +70,7 @@ "//components/schema_org/common:improved_mojom", "//components/search", "//components/search_engines", -@@ -764,7 +754,6 @@ static_library("ui") { +@@ -744,7 +735,6 @@ static_library("ui") { # TODO(crbug.com/40161499): Remove this circular dependency. "//chrome/browser/devtools", "//chrome/browser/favicon", @@ -86,36 +78,17 @@ "//chrome/browser/profiling_host", "//chrome/browser/permissions", -@@ -6991,26 +6980,6 @@ static_library("ui") { - } - } - -- if (safe_browsing_mode > 0) { -- deps += [ -- "//components/safe_browsing/content/browser:safe_browsing_blocking_page", -- ] -- } -- -- if (safe_browsing_mode == 1) { -- sources += [ -- "webui/reset_password/reset_password_ui.cc", -- "webui/reset_password/reset_password_ui.h", -- ] -- -- deps += [ -- "//chrome/browser/ui/webui/reset_password:mojo_bindings", -- "//chrome/common/safe_browsing:proto", -- "//components/safe_browsing/core/browser/password_protection:password_protection_metrics_util", -- "//components/safe_browsing/core/common/proto:csd_proto", -- ] -- } -- - if (use_dbus) { - deps += [ "//dbus" ] - } +@@ -6785,7 +6775,6 @@ static_library("ui_public_dependencies") + "//components/dom_distiller/core", + "//components/enterprise/buildflags", + "//components/paint_preview/buildflags", +- "//components/safe_browsing:buildflags", + "//components/segmentation_platform/public", + "//components/sync", + "//components/sync_user_events", --- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc -@@ -415,8 +415,12 @@ void DownloadProtectionService::ShowDeta +@@ -416,8 +416,12 @@ void DownloadProtectionService::ShowDeta Profile* profile = Profile::FromBrowserContext( content::DownloadItemUtils::GetBrowserContext(item)); if (profile && @@ -130,7 +103,7 @@ learn_more_url = GURL(chrome::kAdvancedProtectionDownloadLearnMoreURL); --- a/chrome/browser/download/notification/download_item_notification.cc +++ b/chrome/browser/download/notification/download_item_notification.cc -@@ -969,9 +969,13 @@ std::u16string DownloadItemNotification: +@@ -970,9 +970,13 @@ std::u16string DownloadItemNotification: } case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: { bool requests_ap_verdicts = @@ -146,7 +119,7 @@ ? IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT_IN_ADVANCED_PROTECTION --- a/chrome/browser/ui/webui/downloads/downloads_ui.cc +++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc -@@ -40,6 +40,7 @@ +@@ -41,6 +41,7 @@ #include "components/history/core/common/pref_names.h" #include "components/prefs/pref_service.h" #include "components/profile_metrics/browser_profile_type.h" @@ -154,7 +127,7 @@ #include "components/safe_browsing/core/common/features.h" #include "components/strings/grit/components_strings.h" #include "content/public/browser/download_manager.h" -@@ -69,10 +70,12 @@ content::WebUIDataSource* CreateAndAddDo +@@ -70,10 +71,12 @@ content::WebUIDataSource* CreateAndAddDo source, base::make_span(kDownloadsResources, kDownloadsResourcesSize), IDR_DOWNLOADS_DOWNLOADS_HTML); @@ -171,30 +144,26 @@ static constexpr webui::LocalizedString kStrings[] = { --- a/chrome/browser/ui/views/download/download_danger_prompt_views.cc +++ b/chrome/browser/ui/views/download/download_danger_prompt_views.cc -@@ -203,17 +203,18 @@ std::u16string DownloadDangerPromptViews - download_->GetFileNameToReportUser().LossyDisplayName()); - } - case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: { -+#if BUILDFLAG(FULL_SAFE_BROWSING) - if (safe_browsing::AdvancedProtectionStatusManagerFactory:: - GetForProfile(profile_) - ->IsUnderAdvancedProtection()) { - return l10n_util::GetStringFUTF16( - IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT_IN_ADVANCED_PROTECTION, - download_->GetFileNameToReportUser().LossyDisplayName()); -- } else { -+ } else -+#endif - return l10n_util::GetStringFUTF16( - IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT, - download_->GetFileNameToReportUser().LossyDisplayName()); -- } - } - case download::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED: { - return l10n_util::GetStringFUTF16( +@@ -179,11 +179,15 @@ std::u16string DownloadDangerPromptViews + filename); + case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: + return l10n_util::GetStringFUTF16( +- safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile( ++ #if BUILDFLAG(FULL_SAFE_BROWSING) ++ safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile( + profile_) + ->IsUnderAdvancedProtection() + ? IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT_IN_ADVANCED_PROTECTION + : IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT, ++ #else ++ IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT ++ #endif + filename); + case download::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED: + return l10n_util::GetStringFUTF16(IDS_PROMPT_DOWNLOAD_CHANGES_SETTINGS, --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc -@@ -1020,11 +1020,13 @@ ui::ImageModel DownloadItemView::GetIcon +@@ -1021,11 +1021,13 @@ ui::ImageModel DownloadItemView::GetIcon switch (danger_type) { case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: @@ -210,7 +179,7 @@ case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST: --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -7518,13 +7518,9 @@ test("unit_tests") { +@@ -7304,13 +7304,9 @@ test("unit_tests") { "//chrome/browser/renderer_host:history_swiper", "//chrome/browser/updater:browser_updater_client", "//chrome/common/notifications", @@ -226,7 +195,7 @@ # The test fetches resources which means Mac need the app bundle to exist --- a/chrome/services/file_util/BUILD.gn +++ b/chrome/services/file_util/BUILD.gn -@@ -44,10 +44,6 @@ source_set("file_util") { +@@ -46,10 +46,6 @@ source_set("file_util") { deps += [ "//components/services/filesystem/public/mojom" ] } @@ -239,7 +208,7 @@ "safe_archive_analyzer.cc", --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -2161,11 +2161,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -2197,11 +2197,6 @@ const PolicyToPreferenceMapEntry kSimple #endif #endif // BUILDFLAG(CHROME_CERTIFICATE_POLICIES_SUPPORTED) diff --git a/patches/ungoogled-chromium/macos/fix-ninja-1.12-dependency.patch b/patches/ungoogled-chromium/macos/fix-ninja-1.12-dependency.patch deleted file mode 100644 index 205bd7e..0000000 --- a/patches/ungoogled-chromium/macos/fix-ninja-1.12-dependency.patch +++ /dev/null @@ -1,85 +0,0 @@ -# https://chromium-review.googlesource.com/c/chromium/src/+/5641516 ---- a/chrome/browser/ui/views/side_panel/BUILD.gn -+++ b/chrome/browser/ui/views/side_panel/BUILD.gn -@@ -222,5 +222,25 @@ static_library("side_panel") { - "//ui/gfx:color_utils", - "//ui/gfx/geometry:geometry_skia", - "//ui/webui", -+ -+ # TODO(crbug.com/345645751): Use //chrome/browser instead after fixing cyclic dependency. -+ "//components/enterprise/common/proto:connectors_proto", -+ -+ # TODO(crbug.com/346711540,crbug.com/346699817,crbug.com/345645751, -+ # crbug.com/346694160,crbug.com/346709958,crbug.com/346707816): -+ # Use //chrome/browser/ui instead after fixing cyclic dependency. -+ "//chrome/browser/cart:mojo_bindings", -+ "//chrome/browser/companion/visual_query", -+ "//chrome/browser/ui:webui_name_variants", -+ "//chrome/browser/ui/webui/side_panel/bookmarks:mojo_bindings", -+ "//chrome/browser/ui/webui/side_panel/customize_chrome:mojo_bindings", -+ "//chrome/browser/ui/webui/side_panel/reading_list:mojo_bindings", -+ "//components/enterprise/buildflags", -+ "//components/page_image_service/mojom:mojo_bindings", -+ "//components/paint_preview/buildflags", -+ "//components/segmentation_platform/public/proto", -+ "//components/user_education/webui", -+ "//components/webapps/common:mojo_bindings", -+ "//ui/webui/resources/cr_components/commerce:mojo_bindings", - ] - } ---- a/chrome/browser/ui/BUILD.gn -+++ b/chrome/browser/ui/BUILD.gn -@@ -422,7 +422,9 @@ static_library("ui") { - "//chrome/browser/ui/tabs:tab_enums", - "//components/cross_device/logging", - "//components/dom_distiller/core", -+ "//components/enterprise/buildflags", - "//components/paint_preview/buildflags", -+ "//components/segmentation_platform/public", - "//components/sync", - "//components/sync_user_events", - "//components/translate/content/browser", -@@ -539,7 +541,6 @@ static_library("ui") { - "//components/embedder_support:browser_util", - "//components/encrypted_messages:encrypted_message_proto", - "//components/enterprise", -- "//components/enterprise/buildflags:buildflags", - "//components/error_page/content/browser", - "//components/facilitated_payments/core/features", - "//components/favicon/content", -@@ -640,7 +641,6 @@ static_library("ui") { - "//components/security_interstitials/core:unsafe_resource", - "//components/security_state/content", - "//components/security_state/core", -- "//components/segmentation_platform/public", - "//components/send_tab_to_self", - "//components/sessions", - "//components/signin/core/browser", -@@ -2169,7 +2169,6 @@ static_library("ui") { - "//components/omnibox/browser:mojo_bindings", - "//components/page_load_metrics/browser", - "//components/paint_preview/browser", -- "//components/paint_preview/buildflags", - "//components/paint_preview/common", - "//components/paint_preview/public", - "//components/password_manager/content/common", -@@ -6350,7 +6349,6 @@ static_library("ui") { - sources += get_target_outputs(":webui_name_variants") - - deps += [ -- ":webui_name_variants", - "side_search:side_search_tab_data_proto", - "//base", - "//chrome/browser:main_extra_parts", -@@ -6409,7 +6407,10 @@ static_library("ui") { - "//ui/lottie", - "//ui/views:buildflags", - ] -- public_deps += [ "//ui/base/dragdrop/mojom:mojom_headers" ] -+ public_deps += [ -+ ":webui_name_variants", -+ "//ui/base/dragdrop/mojom:mojom_headers", -+ ] - - allow_circular_includes_from += [ "//chrome/browser/ui/views" ] - diff --git a/patches/ungoogled-chromium/macos/fix-runTsc-log-info.patch b/patches/ungoogled-chromium/macos/fix-runTsc-log-info.patch index 8f9fd1f..712e8e2 100644 --- a/patches/ungoogled-chromium/macos/fix-runTsc-log-info.patch +++ b/patches/ungoogled-chromium/macos/fix-runTsc-log-info.patch @@ -1,6 +1,6 @@ --- a/third_party/devtools-frontend/src/third_party/typescript/ts_library.py +++ b/third_party/devtools-frontend/src/third_party/typescript/ts_library.py -@@ -53,7 +53,7 @@ logging.basicConfig( +@@ -51,7 +51,7 @@ logging.basicConfig( def runTsc(tsconfig_location): cmd = [NODE_LOCATION, TSC_LOCATION, '-p', tsconfig_location] diff --git a/patches/ungoogled-chromium/macos/mark-remap_alloc-used.patch b/patches/ungoogled-chromium/macos/mark-remap_alloc-used.patch index 161fab7..50c2c91 100644 --- a/patches/ungoogled-chromium/macos/mark-remap_alloc-used.patch +++ b/patches/ungoogled-chromium/macos/mark-remap_alloc-used.patch @@ -1,6 +1,6 @@ --- a/build/rust/std/remap_alloc.cc +++ b/build/rust/std/remap_alloc.cc -@@ -75,7 +75,11 @@ extern "C" { +@@ -73,7 +73,11 @@ extern "C" { __attribute__((visibility("default"))) __attribute__((weak)) #endif #else @@ -12,17 +12,17 @@ #endif // COMPONENT_BUILD // This must exist as the stdlib depends on it to prove that we know the -@@ -85,8 +89,13 @@ extern "C" { +@@ -83,8 +87,13 @@ extern "C" { // Marked as weak as when Rust drives linking it includes this symbol itself, // and we don't want a collision due to C++ being in the same link target, where // C++ causes us to explicitly link in the stdlib and this symbol here. +#if BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64) -+[[maybe_unused]] __attribute__(( -+ used)) unsigned char __rust_no_alloc_shim_is_unstable; ++[[maybe_unused]] ++__attribute__((used)) unsigned char __rust_no_alloc_shim_is_unstable; +#else - [[maybe_unused]] __attribute__(( - weak)) unsigned char __rust_no_alloc_shim_is_unstable; + [[maybe_unused]] + __attribute__((weak)) unsigned char __rust_no_alloc_shim_is_unstable; +#endif REMAP_ALLOC_ATTRIBUTES void* __rust_alloc(size_t size, size_t align) { - // This mirrors kMaxSupportedAlignment from + #if !PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) diff --git a/retrieve_and_unpack_resource.sh b/retrieve_and_unpack_resource.sh index 089a759..08aba7f 100755 --- a/retrieve_and_unpack_resource.sh +++ b/retrieve_and_unpack_resource.sh @@ -47,7 +47,7 @@ while getopts 'gp' OPTION; do _rustc_dir="$_rust_dir/rustc" _rustc_lib_dir="$_rust_dir/rustc/lib/rustlib/$_rust_name/lib" - echo "rustc 1.80.0-nightly (7d83a4c13 2024-05-06)" > "$_rust_flag_file" + echo "rustc 1.81.0-nightly (f8e566053 2024-06-14)" > "$_rust_flag_file" mkdir $_rust_bin_dir ln -s "$_rust_dir/rustc/bin/rustc" "$_rust_bin_dir/rustc" diff --git a/ungoogled-chromium b/ungoogled-chromium index 1ff6cbe..2617072 160000 --- a/ungoogled-chromium +++ b/ungoogled-chromium @@ -1 +1 @@ -Subproject commit 1ff6cbe678a9dddee4da4b30a64815049c1a1b32 +Subproject commit 26170723f07b64daf7a7a3885d2586244d0d8fa5