From 11d7a71f0e155364ebfac3968d0ef8ea3ef4e793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Fri, 19 Jan 2024 07:48:37 +0000
Subject: [PATCH] firefox: adjust changes for 122.0 release
---
.../firefox/patch_changes/sqlite-ppc.patch | 28 +++++++++----------
helpers/DATA/firefox/process-json-files.py | 2 +-
helpers/make-firefox | 2 +-
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/helpers/DATA/firefox/patch_changes/sqlite-ppc.patch b/helpers/DATA/firefox/patch_changes/sqlite-ppc.patch
index 81354744..c9dfdd89 100644
--- a/helpers/DATA/firefox/patch_changes/sqlite-ppc.patch
+++ b/helpers/DATA/firefox/patch_changes/sqlite-ppc.patch
@@ -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
diff --git a/helpers/DATA/firefox/process-json-files.py b/helpers/DATA/firefox/process-json-files.py
index 897bcfb9..aa7e832d 100644
--- a/helpers/DATA/firefox/process-json-files.py
+++ b/helpers/DATA/firefox/process-json-files.py
@@ -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'
diff --git a/helpers/make-firefox b/helpers/make-firefox
index 5dbe45c7..362a9672 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -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
--
GitLab