diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1 index 1e06067b6..17aa67f9d 100644 --- a/build/winsign/sign.ps1 +++ b/build/winsign/sign.ps1 @@ -35,7 +35,9 @@ Start-Job -Name "SurferInit" -ScriptBlock { param($PWD) cd $PWD npm run import -- --verbose - npm run surfer -- ci --brand release + $surferJson = Get-Content surfer.json | ConvertFrom-Json + $version = $surferJson.brands.release.release.displayVersion + npm run ci -- $version } -Verbose -ArgumentList $PWD -Debug echo "Downloading artifacts info" diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig index 0e725a01e..408d8884e 100644 --- a/configs/windows/mozconfig +++ b/configs/windows/mozconfig @@ -22,6 +22,9 @@ if test "$ZEN_CROSS_COMPILING"; then fi fi +ac_add_options --disable-maintenance-service +ac_add_options --disable-bits-download + if test "$SURFER_COMPAT" = "x86_64"; then ac_add_options --target=x86_64-pc-windows-msvc diff --git a/package.json b/package.json index ea0542817..8844e4840 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,8 @@ "ffprefs": "cd tools/ffprefs && cargo run --bin ffprefs -- ../../", "lc": "surfer license-check", "lc:fix": "surfer license-check --fix", - "use-moz-src": "cd engine && ./mach use-moz-src" + "use-moz-src": "cd engine && ./mach use-moz-src", + "ci": "surfer ci --brand release --display-version" }, "repository": { "type": "git", diff --git a/src/browser/installer/package-manifest-in.patch b/src/browser/installer/package-manifest-in.patch index 8634232ff..7cc6a9526 100644 --- a/src/browser/installer/package-manifest-in.patch +++ b/src/browser/installer/package-manifest-in.patch @@ -1,8 +1,18 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in -index 70f268914f1078ef45e86d295f4bb2ce179a05e0..9eb138023bc9de6211a3e814b0525da612156a78 100644 +index 70f268914f1078ef45e86d295f4bb2ce179a05e0..73d8ffc4457468e8a57ad2c29e4d49f45436bf00 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -369,9 +369,9 @@ bin/libfreebl_64int_3.so +@@ -361,17 +361,17 @@ bin/libfreebl_64int_3.so + ; [MaintenanceService] + ; + #ifdef MOZ_MAINTENANCE_SERVICE +-@BINPATH@/maintenanceservice.exe +-@BINPATH@/maintenanceservice_installer.exe ++;@BINPATH@/maintenanceservice.exe ++;@BINPATH@/maintenanceservice_installer.exe + #endif + + ; [Crash Reporter] ; #ifdef MOZ_CRASHREPORTER #ifdef XP_MACOSX diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs index e0b76019a..0606498ff 100644 --- a/src/zen/compact-mode/ZenCompactMode.mjs +++ b/src/zen/compact-mode/ZenCompactMode.mjs @@ -661,7 +661,7 @@ var gZenCompactModeManager = { requestAnimationFrame(() => { delete this._hasHoveredUrlbar; }); - }, 0); + }, 10); }, 0); }); }, diff --git a/surfer.json b/surfer.json index 8c0d54fe0..a98050d72 100644 --- a/surfer.json +++ b/surfer.json @@ -19,7 +19,7 @@ "brandShortName": "Zen", "brandFullName": "Zen Browser", "release": { - "displayVersion": "1.16.2b", + "displayVersion": "1.16.3b", "github": { "repo": "zen-browser/desktop" },