Merge branch 'master' into yml

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,15 +6,11 @@ body:
       value: |
         Welcome! Thanks for taking the time to submit a bug report.
         
-        If you're looking for a place to ask a question, please use the [GitHub Discussions](https://github.com/bromite/bromite/discussions).
+        If you are looking for a place to ask a question to the Bromite community then please use the [GitHub Discussions](https://github.com/bromite/bromite/discussions) instead.
         
-        Now, make sure you have acknowledged and completed this template before submitting your issue.
+        Make sure you have acknowledged and completed this template before submitting your issue.
         
-        Please read it carefully; we reserve the right to close and ignore your issue if you do not pay attention.
+        Please read it carefully: incorrect issues will be automatically closed and ignored.
-        
-        Please note for the fourth checkbox that if the bug is reproducible on the Chromium build, then it might be a configuration issue or an upstream bug.
-        Upstream bugs can be reported on the [Chromium issue tracker](https://bugs.chromium.org/p/chromium/issues/list).
-        Do not forget to read the [Chromium project bug reporting guidelines](https://www.chromium.org/for-testers/bug-reporting-guidelines/).
         
   - type: checkboxes
     id: preliminary_checklist
@@ -27,31 +23,37 @@ body:
           required: true
         - label: "I have updated Bromite to the latest version. The bug is reproducible on this latest version."
           required: true
-        - label: "I have made sure that this is not a [Chromium](https://github.com/bromite/chromium/releases) bug (in other words, this bug is related to functionality that does not exist in Chromium). I have done this by installing and testing the corresponding version of Chromium."
+
-          required: true
+  - type: dropdown
+    id: is_chromium
+    attributes:
+      label: Can the bug be reproduced with corresponding Chromium version?
+      description: |
+          Please pick the same version of Chromium as Bromite from here: https://github.com/bromite/chromium/releases
+          If the bug is reproducible then it might be a configuration issue or an upstream bug. Upstream bugs can be reported on the [Chromium issue tracker](https://bugs.chromium.org/p/chromium/issues/list) and
+          do not forget to read [Chromium project bug reporting guidelines](https://www.chromium.org/for-testers/bug-reporting-guidelines) first.
+          
+          If the bug is related to functionality that does not exist in Chromium then answer "No".
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+    validations:
+      required: true
 
   - type: input
     id: bromite_version
     attributes:
       label: Bromite version
-      description: What version of Bromite are you running? Please specify a single version. Again, make sure you are running the latest version.
+      description: What version of Bromite are you using? Please specify a single version e.g. `96.0.4664.1`. If this is not the latest version then please update and retry before submitting this bug report.
-    validations:
-      required: true
-
-  - type: input
-    id: android_version
-    attributes:
-      label: Android version
-      description: What version of Android are you running? Please specify a single version.
-      placeholder: (e.g. 8.1, 9, 10, etc.)
     validations:
       required: true
 
   - type: dropdown
     id: device_architecture
     attributes:
-      label: What is your device's architecture?
+      label: Device architecture
-      multiple: true
+      multiple: false
       options:
         - arm
         - arm64
@@ -60,6 +62,32 @@ body:
     validations:
       required: true
 
+  - type: dropdown
+    id: android_version
+    attributes:
+      label: Android version
+      multiple: false
+      description: What version of Android are you running?
+      options:
+        - 12
+        - 11
+        - 10
+        - 9
+        - 8.1
+        - 8.0
+        - 7.1
+        - 7.0
+        - 6
+        - 5.1
+        - 5.0
+        - 4.4
+        - 4.3
+        - 4.2
+        - 4.1
+        - 4.0
+    validations:
+      required: true
+
   - type: input
     id: device_model
     attributes:
@@ -75,20 +103,19 @@ body:
       label: Changed flags
       description: |
         These are the flags changed under `chrome://flags`.
-        Report all blue-highlighted flags here.
+        Report all the flags with non-default configuration (they will be blue-highlighted).
-        Those are the flags with non-default configuration.
         
-        If no flags are changed, please say so.
+        If no flags are changed then write 'no flags changed'.
-      placeholder: (e.g. show-overdraw-feedback, enable-parallel-downloading, etc.)
+      placeholder: show-overdraw-feedback, enable-parallel-downloading
     validations:
       required: true
 
   - type: dropdown
-    id: system_webview
+    id: is_system_webview
     attributes:
       label: Is this issue related to the System WebView?
       description: Please note that no support for System WebView installation is provided.
-      multiple: true
+      multiple: false
       options:
         - "Yes"
         - "No"
@@ -96,10 +123,10 @@ body:
       required: true
 
   - type: dropdown
-    id: incognito
+    id: is_incognito
     attributes:
       label: Is this bug happening in an incognito tab?
-      multiple: true
+      multiple: false
       options:
         - "Yes"
         - "No"
@@ -109,9 +136,9 @@ body:
   - type: dropdown
     id: adblock
     attributes:
-      label: Is this bug related to adblock?
+      label: Is this bug caused by the adblocker?
-      description: Is the bug caused by the adblocker? You can test this by allowing ads for the site.
+      description: You can test this by temporarily allowing ads for the site.
-      multiple: true
+      multiple: false
       options:
         - "Yes"
         - "No"
@@ -124,10 +151,10 @@ body:
       label: Is this bug a crash?
       description: |
         1. No.
-        2. Yes, I have attached the crash report dump that I downloaded from `chrome://crashes`.
+        2. Yes, I have attached the crash report dump that I downloaded from `chrome://crashes`
-        3. Yes, this is a copy-paste of the crash dump:
+        3. Yes, I have copy/pasted the crash dump
       placeholder: |
-        Paste the logcat dump individuated with 'adb logcat | grep chromium'.
+        Drag the crash report dump here to attach it or paste the logcat dump individuated with `adb logcat | grep chromium`.
     validations:
       required: true
 
@@ -144,9 +171,9 @@ body:
     attributes:
       label: Steps to reproduce the bug
       description: |
-        Try to explain how to cause the bug as clearly as possible.
+        Explain how to cause the bug as clearly as possible. Bugs that are not reproducible cannot be investigated.
         
-        Also, do not just write "any website"; please specify which URLs can be used to reproduce the issue.
+        Also, do not write "any website": please specify which URLs can be used to reproduce the issue.
       placeholder: |
         Steps to reproduce the bug (e.g.):
         1. Go to '...'
@@ -171,5 +198,7 @@ body:
       description: |
         If applicable, add screenshots to help explain your problem.
         Otherwise, ignore this section.
+      placeholder: |
+        Drag the screenshot files here to attach them.
     validations:
       required: false

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -6,14 +6,13 @@ body:
       value: |
         Welcome! Thanks for taking time to submit a feature request.
         
-        If you're looking for a place to ask a question, please use the [GitHub Discussions](https://github.com/bromite/bromite/discussions).
+        If you are looking for a place to ask a question to the Bromite community then please use the [GitHub Discussions](https://github.com/bromite/bromite/discussions) instead.
         
-        Now, make sure you have acknowledged and completed this template before submitting your issue.
+        Make sure you have acknowledged and completed this template before submitting your issue.
         
-        Please read it carefully; we reserve the right to close and ignore your issue if you do not pay attention.
+        Please read it carefully: incorrect issues will be automatically closed and ignored.
         
-        Things to note:
+        Note:
-          - Do not submit feature requests for extensions support or for adding a search engine.
           - Features unrelated to privacy will not be considered.
           - Do not ask "I would like feature X which is available in browser Y."
 
@@ -22,27 +21,37 @@ body:
     attributes:
       label: Preliminary checklist
       options:
-        - label: "I have read the [README](https://github.com/bromite/bromite/blob/master/README.md)."
+        - label: "I have read the [README](https://github.com/bromite/bromite/blob/master/README.md)"
           required: true
-        - label: "I have searched the existing issues for my feature request. This is a new ticket, NOT a duplicate or related to another issue."
+        - label: "I have read the [FAQs](https://github.com/bromite/bromite/blob/master/FAQ.md)."
           required: true
-        - label: "I have read the [FAQ](https://github.com/bromite/bromite/blob/master/FAQ.md)."
+        - label: "I have searched [existing issues](https://github.com/bromite/bromite/issues) for my feature request. This is a new issue (NOT a duplicate) and is not related to another issue."
-          required: true
-        - label: "I have read the [Wiki](https://github.com/bromite/bromite/wiki)."
           required: true
 
+  - type: dropdown
+    id: is_privacy_related
+    attributes:
+      label: Is your feature request related to privacy?
+      description: Features that are not related to privacy are not considered.
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+    validations:
+      required: true
+
   - type: textarea
-    id: patch_available
+    id: is_patch_available
     attributes:
       label: Is there a patch available for this feature somewhere?
-      description: If so, please provide a link and related license information.
+      description: If yes please provide URL and related license information.
     validations:
       required: true
 
   - type: textarea
     id: solution_description
     attributes:
-      label: Describe the solution / feature you would like
+      label: Describe the solution you would like
       description: A clear and concise description of what you want to happen.
     validations:
       required: true

build/bromite_patches_list.txt

@@ -94,7 +94,7 @@ Restore-Search-Ready-Omnibox-flag.patch
 disable-AdsBlockedInfoBar.patch
 Bromite-AdBlockUpdaterService.patch
 Replace-DoH-probe-domain-with-RIPE-domain.patch
-Increase-number-of-autocomplete-matches-from-5-to-10.patch
+Increase-number-of-autocomplete-matches-to-10.patch
 Disable-requests-for-single-word-Omnibar-searches.patch
 Disable-some-signed-exchange-features.patch
 Add-flag-to-disable-WebGL.patch

build/patches/Battery-API-return-nothing.patch

@@ -8,6 +8,7 @@ Include @thestinger's fix for correct charging/unknown values
  1 file changed, 4 insertions(+), 22 deletions(-)
 
 diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
+index 840da4b66f62..7879bdb4e0c1 100644
 --- a/third_party/blink/renderer/modules/battery/battery_manager.cc
 +++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
 @@ -70,46 +70,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
@@ -19,12 +20,12 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
  }
  
  double BatteryManager::chargingTime() {
--  return battery_status_.charging_time();
+-  return battery_status_.charging_time().InSecondsF();
 +  return 0.0;
  }
  
  double BatteryManager::dischargingTime() {
--  return battery_status_.discharging_time();
+-  return battery_status_.discharging_time().InSecondsF();
 +  return std::numeric_limits<double>::infinity();
  }
  
@@ -61,3 +62,6 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
  }
  
  void BatteryManager::RegisterWithDispatcher() {
+-- 
+2.30.2
+

build/patches/Switch-to-fstack-protector-strong.patch

@@ -10,19 +10,21 @@ The size increase on Android is something they care a lot about since some
 devices have very little storage space. That also means ever so slightly
 higher memory/cache usage but not by the full 2-3%.
 ---
- build/config/compiler/BUILD.gn | 6 +-----
+ build/config/compiler/BUILD.gn | 8 +-------
- 1 file changed, 1 insertion(+), 5 deletions(-)
+ 1 file changed, 1 insertion(+), 7 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -335,16 +335,12 @@ config("compiler") {
+@@ -338,18 +338,12 @@ config("compiler") {
          cflags += [ "-fstack-protector" ]
        }
      } else if ((is_posix && !is_chromeos_ash && !is_nacl) || is_fuchsia) {
 -      # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc supports it.
 -      # See also https://crbug.com/533294
--      cflags += [ "--param=ssp-buffer-size=4" ]
+-      if (current_os != "zos") {
+-        cflags += [ "--param=ssp-buffer-size=4" ]
+-      }
 -
        # The x86 toolchain currently has problems with stack-protector.
        if (is_android && current_cpu == "x86") {