From b4911e2d7c84b51a315d5967c91972cb86436727 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Fri, 28 Jan 2022 12:02:56 -0500
Subject: [PATCH] Raise minimum versions of browsers

For the following reasons:

- Support for CSS `gap`, so as to remove the need to
  fall back onto classic popup panel, and thus making
  it possible to fully remove long-ago deprecated
  classic panel (announced in 1.27.0)[1]:
  https://developer.mozilla.org/en-US/docs/Web/CSS/gap

- Support for dynamic import:
  https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import

Firefox's minimum version is raised to 68 because it's
the oldest ESR version supporting the features above.
From now on, minimum version of Firefox will always be
an ESR one.

---

[1] https://github.com/gorhill/uBlock/releases/tag/1.27.0
---
 platform/chromium/manifest.json |  2 +-
 platform/firefox/manifest.json  |  2 +-
 platform/opera/manifest.json    |  2 +-
 src/js/start.js                 | 15 +++------------
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json
index f9ab901be..aa83f5f04 100644
--- a/platform/chromium/manifest.json
+++ b/platform/chromium/manifest.json
@@ -70,7 +70,7 @@
   },
   "incognito": "split",
   "manifest_version": 2,
-  "minimum_chrome_version": "61.0",
+  "minimum_chrome_version": "66.0",
   "name": "uBlock Origin",
   "options_ui": {
     "page": "dashboard.html",
diff --git a/platform/firefox/manifest.json b/platform/firefox/manifest.json
index 621663fc7..70b4dbd56 100644
--- a/platform/firefox/manifest.json
+++ b/platform/firefox/manifest.json
@@ -15,7 +15,7 @@
   "browser_specific_settings": {
     "gecko": {
       "id": "uBlock0@raymondhill.net",
-      "strict_min_version": "60.0"
+      "strict_min_version": "68.0"
     }
   },
   "commands": {
diff --git a/platform/opera/manifest.json b/platform/opera/manifest.json
index 2545566ee..ac669271d 100644
--- a/platform/opera/manifest.json
+++ b/platform/opera/manifest.json
@@ -69,7 +69,7 @@
   },
   "incognito": "split",
   "manifest_version": 2,
-  "minimum_opera_version": "48.0",
+  "minimum_opera_version": "53.0",
   "name": "uBlock Origin",
   "options_page": "dashboard.html",
   "permissions": [
diff --git a/src/js/start.js b/src/js/start.js
index 623ec3bd3..b695833a3 100644
--- a/src/js/start.js
+++ b/src/js/start.js
@@ -487,19 +487,10 @@ contextMenu.update();
 // default UI according to platform.
 if (
     browser.browserAction instanceof Object &&
-    browser.browserAction.setPopup instanceof Function
+    browser.browserAction.setPopup instanceof Function &&
+    µb.hiddenSettings.uiFlavor === 'classic'
 ) {
-    const env = vAPI.webextFlavor;
-    if (
-        µb.hiddenSettings.uiFlavor === 'classic' || (
-            µb.hiddenSettings.uiFlavor === 'unset' && (
-                env.soup.has('chromium') && env.major < 66 ||
-                env.soup.has('firefox') && env.major < 68
-            )
-        )
-    ) {
-        browser.browserAction.setPopup({ popup: 'popup.html' });
-    }
+    browser.browserAction.setPopup({ popup: 'popup.html' });
 }
 
 // https://github.com/uBlockOrigin/uBlock-issues/issues/717