From 565d99dfabbaced54ae20ed89a4d521d78cc020d Mon Sep 17 00:00:00 2001 From: Sertonix Date: Sat, 10 Aug 2024 23:34:00 +0200 Subject: community/librewolf: upgrade to 130.0-1 --- community/librewolf/APKBUILD | 28 +++++++++++++++++++++------- community/librewolf/nrappkit-qsort.patch | 32 -------------------------------- community/librewolf/vendor-prefs.js | 3 --- 3 files changed, 21 insertions(+), 42 deletions(-) delete mode 100644 community/librewolf/nrappkit-qsort.patch diff --git a/community/librewolf/APKBUILD b/community/librewolf/APKBUILD index 17dea8a6155..0d361aec7ce 100644 --- a/community/librewolf/APKBUILD +++ b/community/librewolf/APKBUILD @@ -5,8 +5,9 @@ # Contributor: Sertonix # Maintainer: Sertonix pkgname=librewolf -pkgver=128.0.3_p2 +pkgver=130.0_p1 pkgrel=0 +_settings_commit=5d986d14fd0171d2edfe26642232b2d99dde8fbf pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom." url="https://librewolf.net/" # s390x blocked by lld @@ -77,14 +78,15 @@ riscv64) ;; *) subpackages="$subpackages $pkgname-dbg" ;; esac -source="$pkgname-$pkgver.tar.gz::https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/${pkgver/_p/-}/librewolf-${pkgver/_p/-}.source.tar.gz +source="$pkgname-source-$pkgver.tar.gz::https://codeberg.org/librewolf/source/archive/${pkgver/_p/-}.tar.gz + $pkgname-settings-$_settings_commit.tar.gz::https://codeberg.org/librewolf/settings/archive/$_settings_commit.tar.gz + firefox-${pkgver%_p*}.tar.xz::https://ftp.mozilla.org/pub/firefox/releases/${pkgver%_p*}/source/firefox-${pkgver%_p*}.source.tar.xz fix-fortify-system-wrappers.patch fix-rust-target.patch fix-webrtc-glibcisms.patch force-can-use-pack-relative-relocs.patch icu74.patch lfs64.patch - nrappkit-qsort.patch no-ccache-stats.patch ppc-musttail.patch python-deps.patch @@ -101,7 +103,7 @@ source="$pkgname-$pkgver.tar.gz::https://gitlab.com/api/v4/projects/32320088/pac # tests are hard to run options="!check" -builddir="$srcdir"/$pkgname-${pkgver/_p/-} +builddir="$srcdir"/source/librewolf-${pkgver/_p/-} _mozappdir=/usr/lib/$pkgname # help our shared-object scanner to find the libs @@ -501,6 +503,17 @@ _clear_vendor_checksums() { } prepare() { + cd "$srcdir"/source + rmdir settings + ln -s ../settings settings + mv ../firefox-${pkgver%_p*} librewolf-${pkgver/_p/-} + + # We don't bundle the rebranded locales at the moment and they are + # downloaded without any checksum. + sed -i -e 's/bash/true/' scripts/librewolf-patches.py + + python3 scripts/librewolf-patches.py ${pkgver%_p*} ${pkgver#*_p} + default_prepare export CFLAGS="${CFLAGS/-fstack-clash-protection/} -g0 -O2" @@ -723,14 +736,15 @@ intl() { } sha512sums=" -0f1454db9518c70f69d67790600d30138a1666b16a3ae61f1aa47094568d430d3b62e5452aaeff3aa9897b818eecf4266f387be04083c487c355f4d502573460 librewolf-128.0.3_p2.tar.gz +0f67250158d9aa3ffda700d7be0699ca6a3839cf12202ff8d2e9cd20de1081995868097ef5b8c253f30895a4af036dbc069bbfe4298740578143f4b77ebcd501 librewolf-source-130.0_p1.tar.gz +15e0f4650dd8997540334b9ef7b7bebbfb9beb5af969c7a8b7ccc177cb25c6f9ec849461fc02382316357fb50cab9c15363409cd136ef0dde350cb0a9d414b9d librewolf-settings-5d986d14fd0171d2edfe26642232b2d99dde8fbf.tar.gz +d0d11b38d9e02fa15298ec13336bb086668b4f36b3ce9ced218a265327fd4822b9fea4303402631947ea3c20490c414de87f8df3e7c23d2e02b70f0456b9af40 firefox-130.0.tar.xz 19eea840aa9c1c21e7bd1f832ec078989fe6f08fca40baa271be7e74f1cffeb5ab8d3218a93e664b8d90a41506dede524e2a5174cd47580866109bc6711ea969 fix-fortify-system-wrappers.patch cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch 305c874fdea3096e9c4c6aa6520ac64bb1c347c4b59db8360096646593fe684c3b5377874d91cecd33d56d1410b4714fbdea2b514923723ecbeff79d51265d9b fix-webrtc-glibcisms.patch b7a2beef126569d71242198f2503bb6a32acd1ea89080ef7bed6ba0f0d10819282c2c346c6f729d81cd90e328e607b88acaac8785ed057cc8cb562e315890334 force-can-use-pack-relative-relocs.patch 0f6c1f4b32b2f501c03db14b67a94419acf1ac58a5ea9efeacd47dc85d73194e479efcf056949c74a0ef9deebc2ba178564bec45dba871fabfc5c909123e003d icu74.patch e75daab5573ec6e28d3940a9bb98304d572dfb26ce7c1709e99fdd75dfa58abce170c96de683f8dc2224ea2e118aa7d78affbd54f99c4e328a4641685d64bd7d lfs64.patch -be6647a7e86363df7f57dff74acb0b6364a6d6927c99a88f3e35c6dedf82f1fe1511d362d0995868de5b842eb1f391bb8d17a89ae6f568a86a4dfd5b20499174 nrappkit-qsort.patch c0437a6753f3f350968fa12d250efdfe1bea77baf0e4c06b072b5cc9e78c774dbf4506bc536337030d349fb3ba4460097b75b0c7c5b8fb2d39d8b0a392948936 no-ccache-stats.patch ea9ca4bae9c56497ec6de6ba8599e8428c6ba623c71ea9e40655970102c70b9407dc4e8403d068781174b15e03ab484a89463c9e8623cfac32d82fbbe43cb65e ppc-musttail.patch 4de65266f5fc1c5bf1d7cd00a0e4728a1ec96b7680b5ea72d6e9ed463b7a0bba11792b3411d25ef1e26f62408eb7f8b06dc62209dbb0454c779d8858d8d59725 python-deps.patch @@ -741,5 +755,5 @@ f8c3555ef6207933cbffbf4fc101a9b4c0d2990c0063162f0f0bde70ef0b46f86bfac42e71106951 67bc0be3da973e6859256bf9be4df7100837430e6076fc0bd623f504c35e02e6c191e9c5a3a1d202e5ad4d89f874f254a09e164e39c7bfd97bbc8d4c8d0632a5 sqlite-ppc.patch 73e9c51977d1a675c38fafeaa7478499d002d0dbfc8741ed7d9810ac39fb190870bd3295b86f7c9f7e8191f0fda7b7d6454d0a4cc1d7c61f3810a4d3a165180f librewolf.desktop b6ceaf541ecb16a91398e1f629c7479e37c42c467e78980895ade8fe16feeb307ead50c839bac72f18bf74b7be46382c431a1361b3194cf3dffc6d58d67f82e5 distribution.ini -c0e59dd38cb30a3adfa904dd8a7dbcaa7336ccd30b82eb84985777da3ee94832922f806a128490ae0976c9d15126d756d488389fcbb1f08e5ff394f405ec1a13 vendor-prefs.js +bd20f3a9606890d239b9a7fb66f75c7aa860622005613186e3dda8804fd9d8a89a00ace19b34c198e6bb5620b1c5ae36edc82a2edf437251df2dcbca67180ce7 vendor-prefs.js " diff --git a/community/librewolf/nrappkit-qsort.patch b/community/librewolf/nrappkit-qsort.patch deleted file mode 100644 index 6747c21bc36..00000000000 --- a/community/librewolf/nrappkit-qsort.patch +++ /dev/null @@ -1,32 +0,0 @@ -missing include to use qsort() - ---- a/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry_local.c 2024-07-09 18:11:39.207125821 +0200 -+++ b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry_local.c 2024-07-09 18:12:07.657013364 +0200 -@@ -53,6 +53,7 @@ - #include - #endif - #include -+#include - #include "registry.h" - #include "registry_int.h" - #include "registry_vtbl.h" -@@ -62,6 +63,10 @@ - #include "r_errors.h" - #include "r_macros.h" - -+static int nr_compare_string(const void *arg1, const void *arg2) { -+ return strcasecmp(*(const char **)arg1, *(const char **)arg2); -+} -+ - /* if C were an object-oriented language, nr_scalar_registry_node and - * nr_array_registry_node would subclass nr_registry_node, but it isn't - * object-oriented language, so this is used in cases where the pointer -@@ -1067,7 +1072,7 @@ - } - - assert(sizeof(*arg.children) == sizeof(NR_registry)); -- qsort(arg.children, arg.length, sizeof(*arg.children), (void*)strcasecmp); -+ qsort(arg.children, arg.length, sizeof(*arg.children), nr_compare_string); - - *length = arg.length; - diff --git a/community/librewolf/vendor-prefs.js b/community/librewolf/vendor-prefs.js index 875fb910410..115617e0f17 100644 --- a/community/librewolf/vendor-prefs.js +++ b/community/librewolf/vendor-prefs.js @@ -7,6 +7,3 @@ pref("spellchecker.dictionary_path", "/usr/share/hunspell"); // Don't disable our bundled extensions in the application directory pref("extensions.autoDisableScopes", 11); pref("extensions.shownSelectionUI", true); - -// Disable Privacy-Preserving Attribution Measurement -pref("dom.private-attribution.submission.enabled", false); -- cgit v1.2.3