diff --git a/.gitattributes b/.gitattributes index cc2d335b83..a21ce3334f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -*.sql text eol=lf +*.sql text eol=lf +app/win/zotero.exe.tar.xz filter=lfs diff=lfs merge=lfs -text diff --git a/app/config.sh b/app/config.sh index cd9d63661f..4824390917 100644 --- a/app/config.sh +++ b/app/config.sh @@ -3,7 +3,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # Version of Gecko to build with GECKO_VERSION_MAC="102.10.0esr" GECKO_VERSION_LINUX="102.10.0esr" -GECKO_VERSION_WIN="102.9.0esr" +GECKO_VERSION_WIN="102.10.0esr" RUST_VERSION=1.60.0 # URL prefix for custom builds of Firefox components diff --git a/app/win/mozilla-102.patch b/app/win/mozilla-102.patch index 55a022f90d..45d39a93db 100644 --- a/app/win/mozilla-102.patch +++ b/app/win/mozilla-102.patch @@ -1,7 +1,7 @@ diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp --- a/browser/app/nsBrowserApp.cpp +++ b/browser/app/nsBrowserApp.cpp -@@ -149,19 +149,28 @@ static bool IsArg(const char* arg, const +@@ -149,19 +149,30 @@ static bool IsArg(const char* arg, const #endif return false; @@ -12,6 +12,8 @@ diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp static int do_main(int argc, char* argv[], char* envp[]) { + // Allow profile downgrade for Zotero + _putenv_s("MOZ_ALLOW_DOWNGRADE", "1"); ++ // Don't create dedicated profile (default-esr) ++ _putenv_s("MOZ_LEGACY_PROFILES", "1"); + // Allow firefox.exe to launch XULRunner apps via -app // Note that -app must be the *first* argument. diff --git a/app/win/zotero.exe.tar.xz b/app/win/zotero.exe.tar.xz index 45fa075097..9071e078d9 100644 Binary files a/app/win/zotero.exe.tar.xz and b/app/win/zotero.exe.tar.xz differ