Merge branch 'dev' of https://github.com/zen-browser/desktop into dev

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"

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

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",

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

src/zen/compact-mode/ZenCompactMode.mjs

@@ -661,7 +661,7 @@ var gZenCompactModeManager = {
           requestAnimationFrame(() => {
             delete this._hasHoveredUrlbar;
           });
-        }, 0);
+        }, 10);
       }, 0);
     });
   },

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"
         },