diff options
| author | Moonchild <moonchild@palemoon.org> | 2023-09-01 15:47:57 +0200 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2023-09-01 15:47:57 +0200 |
| commit | 3ac20629e35c3b6241c340371929e761a5b38c93 (patch) | |
| tree | f5aecdb9afbfad75e11f7d88b46bf16c5d32c90b | |
| parent | 093830a7af377958ebb236e8f2dd0be0521e23a4 (diff) | |
| parent | 764f4602a07299d7804b5bbe8ab76db3f54cc10e (diff) | |
| download | palemoon-32.4.0_Release.tar.gz | |
Merge branch 'master' into release32.4.0_Release32.4.0_RC1
# Conflicts:
# palemoon/config/version.txt
# platform
| -rw-r--r-- | palemoon/branding/shared/pref/uaoverrides.inc | 5 | ||||
| -rw-r--r-- | palemoon/config/version.txt | 2 | ||||
| -rw-r--r-- | palemoon/installer/package-manifest.in | 10 | ||||
| m--------- | platform | 0 |
4 files changed, 12 insertions, 5 deletions
diff --git a/palemoon/branding/shared/pref/uaoverrides.inc b/palemoon/branding/shared/pref/uaoverrides.inc index eee2805b2..2dcfa87a5 100644 --- a/palemoon/branding/shared/pref/uaoverrides.inc +++ b/palemoon/branding/shared/pref/uaoverrides.inc @@ -71,7 +71,12 @@ pref("@GUAO_PREF@.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLI pref("@GUAO_PREF@.studio.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @GRE_VERSION_SLICE@ @FX_SLICE@ @PM_SLICE@");
// The following domains do not like the Goanna slice
+pref("@GUAO_PREF@.bab.la","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
+pref("@GUAO_PREF@.babla.gr","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
+pref("@GUAO_PREF@.collinsdictionary.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
+pref("@GUAO_PREF@.dictionary.cambridge.org","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
pref("@GUAO_PREF@.hitbox.tv","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
+pref("@GUAO_PREF@.ldoceonline.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
pref("@GUAO_PREF@.yuku.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ @PM_SLICE@");
// ============================================================================
diff --git a/palemoon/config/version.txt b/palemoon/config/version.txt index 5460b2460..d72ac48f0 100644 --- a/palemoon/config/version.txt +++ b/palemoon/config/version.txt @@ -1 +1 @@ -32.3.1
\ No newline at end of file +32.4.0
\ No newline at end of file diff --git a/palemoon/installer/package-manifest.in b/palemoon/installer/package-manifest.in index c46831a1c..e0cebab95 100644 --- a/palemoon/installer/package-manifest.in +++ b/palemoon/installer/package-manifest.in @@ -75,8 +75,10 @@ @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@ #endif #ifndef MOZ_SYSTEM_HUNSPELL +#ifndef XP_SOLARIS @BINPATH@/@DLL_PREFIX@hunspell@DLL_SUFFIX@ #endif +#endif #ifndef MOZ_SYSTEM_NSPR #ifndef MOZ_FOLD_LIBS @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @@ -340,12 +342,12 @@ ; Shutdown Terminator -#if defined(CLANG_CXX) -#if defined(MOZ_ASAN) || defined(MOZ_TSAN) -@BINPATH@/llvm-symbolizer +#ifndef XP_MACOSX +#if defined(MOZ_ASAN) || defined(MOZ_TSAN) || defined(MOZ_LSAN) || defined(MOZ_UBSAN) +@BINPATH@/llvm-symbolizer@BIN_SUFFIX@ #endif #endif -#if defined(MOZ_ASAN) && defined(CLANG_CL) +#if defined(MOZ_ASAN) && defined(XP_WIN) @BINPATH@/clang_rt.asan_dynamic-*.dll #endif diff --git a/platform b/platform -Subproject 3b029cdfe482e5097ee09fa1998591faf9c1005 +Subproject 2d48de9998d5c4f768af051ce997777be126f8c |