diff --git a/testing/librewolf/APKBUILD b/testing/librewolf/APKBUILD index d47fa6af9a6..9b5dc43676b 100644 --- a/testing/librewolf/APKBUILD +++ b/testing/librewolf/APKBUILD @@ -6,11 +6,11 @@ # Maintainer: Sertonix _pkgname=Librewolf pkgname=librewolf -_pkgver=121.0.1 +_pkgver=122.0 _pkgrel=1 pkgver="$_pkgver"_p"$_pkgrel" -_releasedate=2024-01-13 -pkgrel=1 +_releasedate=2024-01-23 +pkgrel=0 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom." url="https://librewolf.net/" # s390x blocked by lld @@ -727,9 +727,9 @@ intl() { } sha512sums=" -aac597ba42246d5715716182ba5e6ed6a549879aff89dbc46c884d4d49b495cac5be5318cdfa40f54f4941b0bbcdfb865178706a5f9aec4bf760f3137c826d34 librewolf-121.0.1-1.tar.gz +d392318160535f68662dcff4333ab9ca829e2246b39b4a10b6abf65b33b4e7f2e29366e1783c8c05a406c599192c79a9cb3a483226b19c060ded339d1daea650 librewolf-122.0-1.tar.gz 454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch -2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch +19eea840aa9c1c21e7bd1f832ec078989fe6f08fca40baa271be7e74f1cffeb5ab8d3218a93e664b8d90a41506dede524e2a5174cd47580866109bc6711ea969 fix-fortify-system-wrappers.patch cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch 305c874fdea3096e9c4c6aa6520ac64bb1c347c4b59db8360096646593fe684c3b5377874d91cecd33d56d1410b4714fbdea2b514923723ecbeff79d51265d9b fix-webrtc-glibcisms.patch b7a2beef126569d71242198f2503bb6a32acd1ea89080ef7bed6ba0f0d10819282c2c346c6f729d81cd90e328e607b88acaac8785ed057cc8cb562e315890334 force-can-use-pack-relative-relocs.patch @@ -743,7 +743,7 @@ b12dbff6513ac8c231d91c257a9accecc034d9ea9c31d99ca0454334ccf80fe7b50d6a356182dc46 2518f2fc75b5db30058e0735f47d60fdf1e7adfaeee4b33fb2afb1bd9a616ce943fd88f4404d0802d4083703f4acf1d5ad42377218d025bc768807fbaf7e1609 sandbox-fork.patch b7d0a6126bdf6c0569f80aabf5b37ed2c7a35712eb8a0404a2d85381552f5555d4f97d213ea26cec6a45dc2785f22439376ed5f8e78b4fd664ef0223307b333e sandbox-largefile.patch 94433c5ffdbe579c456d95c5f053f61fcbab2f652fa90bc69dcc27d9a1507a8e5c677adeadae9a7a75cc9a55184c1040737f4dfd10b279c088ef016561e6f135 sandbox-sched_setscheduler.patch -157a434f3354fccdff206301cf719010381515cdc1ea1c33c722ec27ad37c9e54110b930c89478fa0f7d3c90bc6299d32ef8b709803cbe9ed52ab834a1fbc3ad sqlite-ppc.patch +67bc0be3da973e6859256bf9be4df7100837430e6076fc0bd623f504c35e02e6c191e9c5a3a1d202e5ad4d89f874f254a09e164e39c7bfd97bbc8d4c8d0632a5 sqlite-ppc.patch 73e9c51977d1a675c38fafeaa7478499d002d0dbfc8741ed7d9810ac39fb190870bd3295b86f7c9f7e8191f0fda7b7d6454d0a4cc1d7c61f3810a4d3a165180f librewolf.desktop b6ceaf541ecb16a91398e1f629c7479e37c42c467e78980895ade8fe16feeb307ead50c839bac72f18bf74b7be46382c431a1361b3194cf3dffc6d58d67f82e5 distribution.ini bd20f3a9606890d239b9a7fb66f75c7aa860622005613186e3dda8804fd9d8a89a00ace19b34c198e6bb5620b1c5ae36edc82a2edf437251df2dcbca67180ce7 vendor-prefs.js diff --git a/testing/librewolf/fix-fortify-system-wrappers.patch b/testing/librewolf/fix-fortify-system-wrappers.patch index 17cf7e303da..a1a89c6520b 100644 --- a/testing/librewolf/fix-fortify-system-wrappers.patch +++ b/testing/librewolf/fix-fortify-system-wrappers.patch @@ -1,13 +1,11 @@ The wrapper features.h gets pulled in by system headers causing thigns to break. We work around it by simply not wrap features.h ---- ./config/system-headers.mozbuild.orig -+++ ./config/system-headers.mozbuild -@@ -229,7 +229,6 @@ - 'execinfo.h', - 'extras.h', - 'fcntl.h', -- 'features.h', - 'fenv.h', - 'ffi.h', - 'fibdef.h', +diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild +index 07d48e7..d2ce2b2 100644 +--- a/config/system-headers.mozbuild ++++ b/config/system-headers.mozbuild +@@ -227,3 +227,2 @@ system_headers = [ + "fcntl.h", +- "features.h", + "fenv.h", diff --git a/testing/librewolf/sqlite-ppc.patch b/testing/librewolf/sqlite-ppc.patch index 8135474455c..30d80281f71 100644 --- a/testing/librewolf/sqlite-ppc.patch +++ b/testing/librewolf/sqlite-ppc.patch @@ -10,44 +10,30 @@ is big endian. Also disable some inline assembly stuff on ppc that is never used with gcc and probably was never tested with modern machines. + +rebased 2024-01-24 by @ptrcnull: +upstream removed the __ppc__ check, +adding a __LITTLE_ENDIAN__ check to match what they do --- third_party/sqlite3/src/sqlite3.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/third_party/sqlite3/src/sqlite3.c b/third_party/sqlite3/src/sqlite3.c -index dd3b5c5..7339893 100644 +index 9443127..8593d8a 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) || \ - 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 - # else -@@ -35670,7 +35670,7 @@ SQLITE_PRIVATE int sqlite3VListNameToNum(VList *pIn, const char *zName, int nNam - return (sqlite_uint64)hi << 32 | lo; - } +@@ -14874,2 +14874,4 @@ typedef INT16_TYPE LogEst; + # define SQLITE_BYTEORDER 4321 ++# elif defined(__LITTLE_ENDIAN__) && __LITTLE_ENDIAN__==1 ++# define SQLITE_BYTEORDER 1234 + # elif defined(i386) || defined(__i386__) || defined(_M_IX86) || \ +@@ -36340,3 +36342,3 @@ SQLITE_PRIVATE int sqlite3VListNameToNum(VList *pIn, const char *zName, int nNam -#elif !defined(__STRICT_ANSI__) && (defined(__GNUC__) && defined(__ppc__)) +#elif 0 - __inline__ sqlite_uint64 sqlite3Hwtime(void){ - unsigned long long retval; -@@ -203580,9 +203580,9 @@ struct RtreeMatchArg { - # if 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 - # else +@@ -207002,2 +207004,4 @@ struct RtreeMatchArg { + # define SQLITE_BYTEORDER 4321 ++# elif defined(__LITTLE_ENDIAN__) && __LITTLE_ENDIAN__==1 ++# define SQLITE_BYTEORDER 1234 + # elif defined(i386) || defined(__i386__) || defined(_M_IX86) || \