From 30bb760ab651189385e50ba9ad9dfe4880408085 Mon Sep 17 00:00:00 2001 From: Eloston Date: Fri, 8 Dec 2017 05:27:17 +0000 Subject: [PATCH 1/5] Rename option for extension MIME handling Rename "Install always" to "Always prompt for install" to better reflect its behavior. --- .../add-flag-to-configure-extension-downloading.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/patches/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch b/resources/patches/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch index d22847ce..4d4bedd5 100644 --- a/resources/patches/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch +++ b/resources/patches/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch @@ -12,9 +12,9 @@ + {"Download as regular file", + "extension-mime-request-handling", + "download-as-regular-file"}, -+ {"Install always", ++ {"Always prompt for install", + "extension-mime-request-handling", -+ "install-always"}, ++ "always-prompt-for-install"}, +}; + const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = { @@ -83,7 +83,7 @@ + *base::CommandLine::ForCurrentProcess(); + if (command_line.HasSwitch("extension-mime-request-handling") && + command_line.GetSwitchValueASCII("extension-mime-request-handling") == -+ "install-always") { ++ "always-prompt-for-install") { + return true; + } // No allowed install sites specified, disallow by default. From 8e56c44449c5a6e3061878de45ffbd85cd7c2245 Mon Sep 17 00:00:00 2001 From: Eloston Date: Fri, 8 Dec 2017 05:48:07 +0000 Subject: [PATCH 2/5] Update FAQ section about CWS extensions * Add new information about the extension MIME handling option * Add information about changing the `prodversion` request argument --- FAQ.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/FAQ.md b/FAQ.md index 162c1dfb..12868c7a 100644 --- a/FAQ.md +++ b/FAQ.md @@ -16,10 +16,12 @@ Yes, but not via the web interface. Adapted from [inox-patchset](https://raw.git Since there is no Webstore plugin, you cannot install extensions directly from the store, but you can download and install any extension manually. - https://clients2.google.com/service/update2/crx?response=redirect&prodversion=48.0&x=id%3D[EXTENSION_ID]%26installsource%3Dondemand%26uc + https://clients2.google.com/service/update2/crx?response=redirect&prodversion=[VERSION]&x=id%3D[EXTENSION_ID]%26installsource%3Dondemand%26uc + +To download a extension, replace [EXTENSION_ID] with the extension-id from the Chrome Web Store, and [VERSION] with the browser's version. For example, `cjpalhdlnbpafiamejdnhcphjbkeiagm` is the extension id of uBlock Origin, and `62.0` is for the 62.0.x.x browser versions + +Since version 62, an option `chrome://flags/#extension-mime-request-handling` was added to allow configuring of the behavior when the browser requests for a CRX or User Script file. This changes the behavior of the Chrome Web Store URL above. -To download a extension just replace [EXTENSION_ID] with the extension-id from the WebStore -(For example cjpalhdlnbpafiamejdnhcphjbkeiagm is the extension id of uBlock Origin). You have 4 options to install an extension: * **User script** From 48004c81c3641b72e94cdd4efe8bc2fbddc02bed Mon Sep 17 00:00:00 2001 From: tectiv3 Date: Sat, 16 Dec 2017 13:52:54 +0900 Subject: [PATCH 3/5] Add patch for libsafe_browsing error #301 --- resources/configs/macos/patch_order | 1 + .../macos/fix-gn-bootstrap.patch | 4 +- .../macos/fix-gn-safe_browsing.patch | 46 +++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 resources/patches/ungoogled-chromium/macos/fix-gn-safe_browsing.patch diff --git a/resources/configs/macos/patch_order b/resources/configs/macos/patch_order index 3908e1c5..b860e9dd 100644 --- a/resources/configs/macos/patch_order +++ b/resources/configs/macos/patch_order @@ -2,3 +2,4 @@ ungoogled-chromium/macos/disable-symbol-order-verification.patch ungoogled-chromium/macos/add-trknotify-gn-dependency.patch ungoogled-chromium/macos/fix-widevine-macos.patch ungoogled-chromium/macos/fix-gn-bootstrap.patch +ungoogled-chromium/macos/fix-gn-safe_browsing.patch diff --git a/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch b/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch index 03ae9266..d6e14fed 100644 --- a/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch +++ b/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch @@ -1,7 +1,7 @@ # Fix GN bootstrap.py script on macOS ---- tools/gn/bootstrap/bootstrap.py -+++ tools/gn/bootstrap/bootstrap.py +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py @@ -707,10 +707,18 @@ 'base/process/process_iterator_mac.cc', 'base/process/process_metrics_mac.cc', diff --git a/resources/patches/ungoogled-chromium/macos/fix-gn-safe_browsing.patch b/resources/patches/ungoogled-chromium/macos/fix-gn-safe_browsing.patch new file mode 100644 index 00000000..32f69bfe --- /dev/null +++ b/resources/patches/ungoogled-chromium/macos/fix-gn-safe_browsing.patch @@ -0,0 +1,46 @@ +# Fix GN safe_browsing on macOS + +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -1222,7 +1222,7 @@ + "-Wno-user-defined-warnings", + + # TODO(thakis): https://crbug.com/753973 +- "-Wno-enum-compare-switch", ++ # "-Wno-enum-compare-switch", + ] + } else if (use_xcode_clang && xcode_version_int >= 830) { + # This is necessary to allow a progressive transition from using xcode 8.0 + +--- a/chrome/browser/BUILD.gn ++++ b/chrome/browser/BUILD.gn +@@ -1532,7 +1532,6 @@ + "//chrome/browser/metrics/variations:chrome_ui_string_overrider_factory", + "//chrome/browser/net:probe_message_proto", + "//chrome/browser/profiling_host", +- "//chrome/browser/safe_browsing", + "//chrome/browser/ssl:proto", + "//chrome/browser/ui", + "//chrome/common/net", + +--- a/chrome/browser/extensions/BUILD.gn ++++ b/chrome/browser/extensions/BUILD.gn +@@ -799,7 +799,6 @@ + "//chrome/browser/devtools", + "//chrome/browser/media/router", + "//chrome/browser/media/router/discovery", +- "//chrome/browser/safe_browsing", + "//chrome/common", + "//chrome/common/extensions:mojo_bindings", + "//chrome/common/extensions/api:api_registration", + +--- a/chrome/browser/ui/BUILD.gn ++++ b/chrome/browser/ui/BUILD.gn +@@ -488,7 +488,6 @@ + "//chrome/browser/engagement:mojo_bindings", + "//chrome/browser/media:mojo_bindings", + "//chrome/browser/profiling_host", +- "//chrome/browser/safe_browsing", + "//chrome/browser/ui/webui/omnibox:mojo_bindings", + "//chrome/browser/ui/webui/usb_internals:mojo_bindings", + "//chrome/common", From b246d53e0855e5e1ee718e3c5de9e74d6bdf05fc Mon Sep 17 00:00:00 2001 From: Eloston Date: Tue, 19 Dec 2017 08:15:57 +0000 Subject: [PATCH 4/5] Update version.ini to 62.0.3202.94-2 --- resources/version.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/version.ini b/resources/version.ini index 5c5f88bc..469a3a78 100644 --- a/resources/version.ini +++ b/resources/version.ini @@ -1,3 +1,3 @@ [main] chromium_version = 62.0.3202.94 -release_revision = 1 +release_revision = 2 From d4c96eb1ba01a509746e96870138d003055743f0 Mon Sep 17 00:00:00 2001 From: Eloston Date: Thu, 28 Dec 2017 06:52:57 +0000 Subject: [PATCH 5/5] Remove use_gnome_keyring=false for linux_rooted This setting does not work in 62 on Debian 9, so it is being removed to prevent confusion. --- resources/configs/linux_rooted/gn_flags | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/configs/linux_rooted/gn_flags b/resources/configs/linux_rooted/gn_flags index da923c2c..3a0376f5 100644 --- a/resources/configs/linux_rooted/gn_flags +++ b/resources/configs/linux_rooted/gn_flags @@ -13,7 +13,6 @@ use_allocator="none" use_cups=true use_custom_libcxx=false use_gconf=false -use_gnome_keyring=false use_gold=true use_jumbo_build=true use_kerberos=true