mirror of
https://github.com/zen-browser/desktop.git
synced 2025-07-08 00:10:00 +02:00
Fixed addon updates
This commit is contained in:
parent
41dd9b684e
commit
8f7b8506a6
10 changed files with 73 additions and 13 deletions
10
.vscode/settings.json
vendored
10
.vscode/settings.json
vendored
|
@ -17,6 +17,14 @@
|
||||||
"string": "cpp",
|
"string": "cpp",
|
||||||
"string_view": "cpp",
|
"string_view": "cpp",
|
||||||
"span": "cpp",
|
"span": "cpp",
|
||||||
"vector": "cpp"
|
"vector": "cpp",
|
||||||
|
"charconv": "cpp",
|
||||||
|
"chrono": "cpp",
|
||||||
|
"optional": "cpp",
|
||||||
|
"format": "cpp",
|
||||||
|
"ratio": "cpp",
|
||||||
|
"system_error": "cpp",
|
||||||
|
"regex": "cpp",
|
||||||
|
"type_traits": "cpp"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
2
l10n
2
l10n
|
@ -1 +1 @@
|
||||||
Subproject commit 57a77d3dc93f11e771a11317f10a31e9f6a532c6
|
Subproject commit 33a69b1500f90d860d13ec5cd92ee2effe409e7b
|
|
@ -33,7 +33,7 @@
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/zen-browser/core#readme",
|
"homepage": "https://github.com/zen-browser/core#readme",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@zen-browser/surfer": "^1.4.13"
|
"@zen-browser/surfer": "^1.4.14"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"husky": "^9.1.5",
|
"husky": "^9.1.5",
|
||||||
|
|
10
pnpm-lock.yaml
generated
10
pnpm-lock.yaml
generated
|
@ -9,8 +9,8 @@ importers:
|
||||||
.:
|
.:
|
||||||
dependencies:
|
dependencies:
|
||||||
'@zen-browser/surfer':
|
'@zen-browser/surfer':
|
||||||
specifier: ^1.4.13
|
specifier: ^1.4.14
|
||||||
version: 1.4.13
|
version: 1.4.14
|
||||||
devDependencies:
|
devDependencies:
|
||||||
husky:
|
husky:
|
||||||
specifier: ^9.1.5
|
specifier: ^9.1.5
|
||||||
|
@ -119,8 +119,8 @@ packages:
|
||||||
'@types/node@17.0.45':
|
'@types/node@17.0.45':
|
||||||
resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
|
resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
|
||||||
|
|
||||||
'@zen-browser/surfer@1.4.13':
|
'@zen-browser/surfer@1.4.14':
|
||||||
resolution: {integrity: sha512-dPDullNjRx9dcnB/Di/EYmspgKvHsW8J5o1i1xQS6SgaDpqtYqTlaZGRWyYkfJvn+iIpgfrmKcoXYmor0okhdQ==}
|
resolution: {integrity: sha512-v8M8eSoHxduSETxRD1P9suLOzPm1c2vPXexTVXIAh+5Kzd+nHyOKpbjteSDcB3tL5W0s76nLb9WhwZShcxpT/A==}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
ansi-escapes@7.0.0:
|
ansi-escapes@7.0.0:
|
||||||
|
@ -1003,7 +1003,7 @@ snapshots:
|
||||||
|
|
||||||
'@types/node@17.0.45': {}
|
'@types/node@17.0.45': {}
|
||||||
|
|
||||||
'@zen-browser/surfer@1.4.13':
|
'@zen-browser/surfer@1.4.14':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@resvg/resvg-js': 1.4.0
|
'@resvg/resvg-js': 1.4.0
|
||||||
async-icns: 1.0.2
|
async-icns: 1.0.2
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
|
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
|
||||||
index b8aa71126c2bb4521caf25f9caf845a8a429dc64..59cdc2e9998e802d6c79ff967eaa30088a3b7a21 100644
|
index a39a4f287ef843f7e0cdeac8320eeff81318116f..f84cdb85c249221522089667010d547cfab67819 100644
|
||||||
--- a/browser/app/profile/firefox.js
|
--- a/browser/app/profile/firefox.js
|
||||||
+++ b/browser/app/profile/firefox.js
|
+++ b/browser/app/profile/firefox.js
|
||||||
@@ -3110,3 +3110,5 @@ pref("toolkit.contentRelevancy.enabled", false);
|
@@ -3190,3 +3190,5 @@ pref("toolkit.contentRelevancy.enabled", false);
|
||||||
pref("toolkit.contentRelevancy.ingestEnabled", false);
|
pref("toolkit.contentRelevancy.ingestEnabled", false);
|
||||||
// Pref to enable extra logging for the content relevancy feature
|
// Pref to enable extra logging for the content relevancy feature
|
||||||
pref("toolkit.contentRelevancy.log", false);
|
pref("toolkit.contentRelevancy.log", false);
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 7692662dd76d087ca905fa898273e0059a4dba92
|
Subproject commit 64768bd518043029665f7cb914d5e801d1f20497
|
13
src/toolkit/modules/AppConstants-sys-mjs.patch
Normal file
13
src/toolkit/modules/AppConstants-sys-mjs.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs
|
||||||
|
index a20e45c6135d24e42594700fe57184a560facd0f..7650dd88dc67d774c3af05704f2539ff92e21be2 100644
|
||||||
|
--- a/toolkit/modules/AppConstants.sys.mjs
|
||||||
|
+++ b/toolkit/modules/AppConstants.sys.mjs
|
||||||
|
@@ -338,6 +338,8 @@ export var AppConstants = Object.freeze({
|
||||||
|
MOZ_UPDATE_CHANNEL: "@MOZ_UPDATE_CHANNEL@",
|
||||||
|
MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@",
|
||||||
|
|
||||||
|
+ ZEN_FIREFOX_VERSION: "@ZEN_FIREFOX_VERSION@",
|
||||||
|
+
|
||||||
|
DEBUG_JS_MODULES: "@DEBUG_JS_MODULES@",
|
||||||
|
|
||||||
|
MOZ_BING_API_CLIENTID: "@MOZ_BING_API_CLIENTID@",
|
12
src/toolkit/modules/moz-build.patch
Normal file
12
src/toolkit/modules/moz-build.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
|
||||||
|
index 6ba1e92026f6f1618ce3a477f74bb6d0fa20f7c1..ccf3fa076771da7c9a5cb2bb732558cb73d810af 100644
|
||||||
|
--- a/toolkit/modules/moz.build
|
||||||
|
+++ b/toolkit/modules/moz.build
|
||||||
|
@@ -281,6 +281,7 @@ for var in (
|
||||||
|
"DLL_SUFFIX",
|
||||||
|
"DEBUG_JS_MODULES",
|
||||||
|
"OMNIJAR_NAME",
|
||||||
|
+ "ZEN_FIREFOX_VERSION"
|
||||||
|
):
|
||||||
|
DEFINES[var] = CONFIG[var] or ""
|
||||||
|
|
|
@ -1,8 +1,22 @@
|
||||||
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
|
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
|
||||||
index dfef4ee7bd74a232f8f9eaa158303e59a2a32e62..77864261c8dbf2947738b97733553da67608c060 100644
|
index 1f85d2831f2f71ebe4c7216bd604926d71e5189e..fb0d07554a592339f5a794151d953cb9269afd75 100644
|
||||||
--- a/toolkit/moz.configure
|
--- a/toolkit/moz.configure
|
||||||
+++ b/toolkit/moz.configure
|
+++ b/toolkit/moz.configure
|
||||||
@@ -905,9 +905,9 @@ set_define("MOZ_AV1", av1)
|
@@ -81,6 +81,13 @@ option(
|
||||||
|
)
|
||||||
|
set_config("MOZ_INCLUDE_SOURCE_INFO", True, when="MOZ_INCLUDE_SOURCE_INFO")
|
||||||
|
|
||||||
|
+option(
|
||||||
|
+ env="ZEN_FIREFOX_VERSION",
|
||||||
|
+ default="130.0",
|
||||||
|
+ help="Set the version of the browser",
|
||||||
|
+)
|
||||||
|
+set_config("ZEN_FIREFOX_VERSION", "130.0", when="ZEN_FIREFOX_VERSION")
|
||||||
|
+
|
||||||
|
option(
|
||||||
|
"--with-distribution-id",
|
||||||
|
nargs=1,
|
||||||
|
@@ -905,9 +912,9 @@ set_define("MOZ_AV1", av1)
|
||||||
option("--disable-jxl", help="Disable jxl image support")
|
option("--disable-jxl", help="Disable jxl image support")
|
||||||
|
|
||||||
|
|
||||||
|
|
13
src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
Normal file
13
src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs
|
||||||
|
index 2f855e6e48f420e3782d3be31cfdfa6c40db479b..911a6494812f0496ac928489244f2ac7bf0ed025 100644
|
||||||
|
--- a/toolkit/mozapps/extensions/AddonManager.sys.mjs
|
||||||
|
+++ b/toolkit/mozapps/extensions/AddonManager.sys.mjs
|
||||||
|
@@ -1214,7 +1214,7 @@ var AddonManagerInternal = {
|
||||||
|
ITEM_VERSION: aAddon.version,
|
||||||
|
ITEM_STATUS: addonStatus,
|
||||||
|
APP_ID: Services.appinfo.ID,
|
||||||
|
- APP_VERSION: aAppVersion ? aAppVersion : Services.appinfo.version,
|
||||||
|
+ APP_VERSION: AppConstants.ZEN_FIREFOX_VERSION,
|
||||||
|
REQ_VERSION: UPDATE_REQUEST_VERSION,
|
||||||
|
APP_OS: Services.appinfo.OS,
|
||||||
|
APP_ABI: Services.appinfo.XPCOMABI,
|
Loading…
Add table
Add a link
Reference in a new issue