firefox: adjust changes for 122.0 release
This commit is contained in:
parent
f0e2584c44
commit
11d7a71f0e
3 changed files with 16 additions and 16 deletions
|
|
@ -18,18 +18,18 @@ diff --git a/third_party/sqlite3/src/sqlite3.c b/third_party/sqlite3/src/sqlite3
|
|||
index dd3b5c5..7339893 100644
|
||||
--- a/third_party/sqlite3/src/sqlite3.c
|
||||
+++ b/third_party/sqlite3/src/sqlite3.c
|
||||
@@ -14589,9 +14589,9 @@ typedef INT16_TYPE LogEst;
|
||||
# if defined(i386) || defined(__i386__) || defined(_M_IX86) || \
|
||||
@@ -14875,9 +14875,9 @@ typedef INT16_TYPE LogEst;
|
||||
# elif defined(i386) || defined(__i386__) || defined(_M_IX86) || \
|
||||
defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
|
||||
defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
|
||||
- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
|
||||
+ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || defined(__LITTLE_ENDIAN__)
|
||||
# define SQLITE_BYTEORDER 1234
|
||||
-# elif defined(sparc) || defined(__ppc__) || \
|
||||
+# elif defined(sparc) || defined(__BIG_ENDIAN__) || \
|
||||
defined(__ARMEB__) || defined(__AARCH64EB__)
|
||||
# define SQLITE_BYTEORDER 4321
|
||||
# define SQLITE_BYTEORDER 1234
|
||||
-# elif defined(sparc) || defined(__ARMEB__) || defined(__AARCH64EB__)
|
||||
+# elif defined(sparc) || defined(__ARMEB__) || defined(__AARCH64EB__) || defined(__BIG_ENDIAN__)
|
||||
# define SQLITE_BYTEORDER 4321
|
||||
# else
|
||||
# define SQLITE_BYTEORDER 0
|
||||
@@ -35670,7 +35670,7 @@ SQLITE_PRIVATE int sqlite3VListNameToNum(VList *pIn, const char *zName, int nNam
|
||||
return (sqlite_uint64)hi << 32 | lo;
|
||||
}
|
||||
|
|
@ -39,15 +39,15 @@ index dd3b5c5..7339893 100644
|
|||
|
||||
__inline__ sqlite_uint64 sqlite3Hwtime(void){
|
||||
unsigned long long retval;
|
||||
@@ -203580,9 +203580,9 @@ struct RtreeMatchArg {
|
||||
# if defined(i386) || defined(__i386__) || defined(_M_IX86) || \
|
||||
@@ -207003,9 +207003,9 @@ struct RtreeMatchArg {
|
||||
# elif defined(i386) || defined(__i386__) || defined(_M_IX86) || \
|
||||
defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
|
||||
defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
|
||||
- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
|
||||
+ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || defined(__LITTLE_ENDIAN__)
|
||||
# define SQLITE_BYTEORDER 1234
|
||||
-# elif defined(sparc) || defined(__ppc__) || \
|
||||
+# elif defined(sparc) || defined(__BIG_ENDIAN__) || \
|
||||
defined(__ARMEB__) || defined(__AARCH64EB__)
|
||||
# define SQLITE_BYTEORDER 4321
|
||||
# define SQLITE_BYTEORDER 1234
|
||||
-# elif defined(sparc) || defined(__ARMEB__) || defined(__AARCH64EB__)
|
||||
+# elif defined(sparc) || defined(__ARMEB__) || defined(__AARCH64EB__) || defined(__BIG_ENDIAN__)
|
||||
# define SQLITE_BYTEORDER 4321
|
||||
# else
|
||||
# define SQLITE_BYTEORDER 0
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ class SearchConfig(RemoteSettings):
|
|||
'main/search-config.json',
|
||||
)
|
||||
SCHEMA_PATH = arguments.MAIN_PATH / \
|
||||
'toolkit/components/search/schema/search-engine-config-schema.json'
|
||||
'toolkit/components/search/schema/search-config-schema.json'
|
||||
OUTPUT_PATH = JSON_PATHS[0]
|
||||
|
||||
_DUCKDUCKGO_SEARCH_ENGINE_ID = 'ddg@search.mozilla.org'
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#
|
||||
# Copyright (C) 2008-2023 Ruben Rodriguez <ruben@trisquel.info>
|
||||
# Copyright (C) 2015 Santiago Rodriguez <santi@trisquel.info>
|
||||
# Copyright (C) 2023 Luis Guzman <ark@switnet.org>
|
||||
# Copyright (C) 2024 Luis Guzman <ark@switnet.org>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue