Pier Angelo Vendrame pushed to branch base-browser-145.0a1-16.0-1 at The Tor Project / Applications / Tor Browser

Commits:

5 changed files:

Changes:

  • testing/testsuite-targets.mk
    ... ... @@ -151,7 +151,7 @@ download-wpt-manifest:
    151 151 
     	$(call py_action,download_wpt_manifest)
    152 152
    153 153 
     define package_archive
    154 
    -package-tests-$(1): stage-all package-tests-prepare-dest download-wpt-manifest
    154 
    +package-tests-$(1): stage-all package-tests-prepare-dest
    155 155 
     	$$(call py_action,test_archive, \
    156 156 
     		$(1) \
    157 157 
     		'$$(abspath $$(test_archive_dir))/$$(PKG_BASENAME).$(1).tests.$(2)')

  • toolkit/components/search/content/base-browser-search-engine-icons.json
    ... ... @@ -2,6 +2,9 @@
    2 2 
       "ddg": [
    3 3 
         { "url": "chrome://global/content/search/duckduckgo.ico", "imageSize": 32 }
    4 4 
       ],
    5 
    +  "ddg-noai": [
    6 
    +    { "url": "chrome://global/content/search/duckduckgo.ico", "imageSize": 32 }
    7 
    +  ],
    5 8 
       "startpage": [
    6 9 
         {
    7 10 
           "url": "chrome://global/content/search/startpage-16.png",

  • toolkit/components/search/content/base-browser-search-engines.json
    ... ... @@ -17,6 +17,24 @@
    17 17 
         "recordType": "engine",
    18 18 
         "variants": [{ "environment": { "allRegionsAndLocales": true } }]
    19 19 
       },
    20 
    +  {
    21 
    +    "base": {
    22 
    +      "aliases": ["ddgnoai"],
    23 
    +      "classification": "general",
    24 
    +      "name": "DuckDuckGo (no AI)",
    25 
    +      "urls": {
    26 
    +        "search": {
    27 
    +          "base": "https://noai.duckduckgo.com/",
    28 
    +          "params": [],
    29 
    +          "searchTermParamName": "q"
    30 
    +        }
    31 
    +      }
    32 
    +    },
    33 
    +    "id": "91687f02-56dd-4fef-ba26-bf139dff3166",
    34 
    +    "identifier": "ddg-noai",
    35 
    +    "recordType": "engine",
    36 
    +    "variants": [{ "environment": { "allRegionsAndLocales": true } }]
    37 
    +  },
    20 38 
       {
    21 39 
         "base": {
    22 40 
           "aliases": ["startpage", "sp"],
    ... ... @@ -39,5 +57,14 @@
    39 57 
         "recordType": "defaultEngines",
    40 58 
         "globalDefault": "ddg",
    41 59 
         "globalDefaultPrivate": "ddg"
    60 
    +  },
    61 
    +  {
    62 
    +    "recordType": "engineOrders",
    63 
    +    "orders": [
    64 
    +      {
    65 
    +        "environment": { "allRegionsAndLocales": true },
    66 
    +        "order": ["ddg", "ddg-noai", "startpage"]
    67 
    +      }
    68 
    +    ]
    42 69 
       }
    43 70 
     ]

  • toolkit/components/search/tests/xpcshell/test_base_browser.js
    ... ... @@ -4,12 +4,15 @@
    4 4 
     /**
    5 5 
      * This tests the SearchService to check our override of the remote settings is
    6 6 
      * working as expected.
    7 
    + *
    8 
    + * When adding new engines, it should be enough to change expectedURLs below.
    7 9 
      */
    8 10
    9 11 
     "use strict";
    10 12
    11 13 
     const expectedURLs = {
    12 14 
       ddg: "https://duckduckgo.com/?q=test",
    15 
    +  "ddg-noai": "https://noai.duckduckgo.com/?q=test",
    13 16 
       startpage: "https://www.startpage.com/sp/search?q=test",
    14 17 
     };
    15 18 
     const defaultEngine = "ddg";
    ... ... @@ -45,3 +48,11 @@ add_task(function test_checkSearchURLs() {
    45 48 
         Assert.equal(foundUrl, url, `The URL of ${engine.name} is not altered.`);
    46 49 
       }
    47 50 
     });
    51 
    +
    52 
    +add_task(async function test_iconsDoesNotFail() {
    53 
    +  for (const id of Object.keys(expectedURLs)) {
    54 
    +    const engine = Services.search.getEngineById(id);
    55 
    +    // No need to assert anything, as in case of error this method should throw.
    56 
    +    await engine.getIconURL();
    57 
    +  }
    58 
    +});

  • toolkit/mozapps/update/updater/updater.cpp
    ... ... @@ -3326,6 +3326,10 @@ int NS_main(int argc, NS_tchar** argv) {
    3326 3326 
       putenv(const_cast<char*>("MOZ_USING_SERVICE="));
    3327 3327 
     #endif
    3328 3328
    3329 
    +#if defined(XP_UNIX) && !defined(XP_MACOSX)
    3330 
    +  unsetenv("FONTCONFIG_PATH");
    3331 
    +#endif
    3332 
    +
    3329 3333 
       if (argc == 2 && NS_tstrcmp(argv[1], NS_T("--channels-allowed")) == 0) {
    3330 3334 
     #ifdef MOZ_VERIFY_MAR_SIGNATURE
    3331 3335 
         int rv = PopulategMARStrings();

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c9beb7e3f24809e150694399ba37dab2a7ba0d15...7d9ea4aaaf947e107c47f9022a5966a109ecca90 at 1763998565