summaryrefslogtreecommitdiff
path: root/libre/iceweasel
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2023-10-22 21:41:31 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2023-10-26 22:55:41 -0400
commit2959980b509c4907dd738b2b52d1b090e7513f41 (patch)
tree5da1bd841ef5793a292e5989816335ebd2f4b38c /libre/iceweasel
parentacd84279cd95156aa0ba34c23856763fbfd5b6fb (diff)
[icecat][icewesel]: minimize diffs across PKGBUILDs
Diffstat (limited to 'libre/iceweasel')
-rw-r--r--libre/iceweasel/PKGBUILD10
1 files changed, 4 insertions, 6 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 500f97540..ebcc871d3 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -165,7 +165,6 @@ source+=(
vendor.js.in
zstandard-0.21.0.diff
)
-source_armv7h=(build-arm-libopus.patch)
source_i686=(
avoid-libxul-OOM-python-check.patch
rust-static-disable-network-test-on-static-libraries.patch
@@ -192,7 +191,6 @@ sha256sums+=('b701b4c47fca2661feeabe172e398c76c8015ee08ff4cc3cc2f7c3ef2ed692a7'
'00cb44a91b42942f17258ad165810866ff123777b667a5691ea0745ba72f4332' # process-json-files.py
'86bd54db6026ff65bd24ac4f05d0679a645ff447e2f81b0ee44037c0c4285e06' # vendor.js.in
'aa663d899e924f4979114584cad671dad3b93dd9b0dfe28bb1cf11ddf92e6d47') # zstandard-0.21.0.diff
-sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
sha256sums_i686=('a8786bb747ae8a12d28268f6731621810e13f405b664373b23a3070d5ed21302' # avoid-libxul-OOM-python-check.patch
'b25d9fb901afc5447bcd87416741f705eb7188502e10097387d5b0c86417fd01' # rust-static-disable-network-test-on-static-libraries.patch
'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1' # firefox-111.0.1-fdlibm.patch
@@ -210,7 +208,6 @@ b2sums+=('a22044292e464b3922eb2e4a8cf0993524d232eeb4a8602707589d00f690498d3b76e5
'085c4631ec8cfdf5842068d882185c783e976b1fde74167bb71ef4d7db8c70c12844177b17e76f858ba3ce2a402848ac8fc19910dcbefd29887abfaf5faac5e4' # process-json-files.py
'f3f344196d03499f3f0392d5dfc5310e131d8c85772edd340faf1df3f04ebf2931eb1dda1b7fe6870d61d498618f4d8ae9f1dd446acbe83e0ce324e04b38f3f9' # vendor.js.in
'2e568bb28f23f0f9225ca68a5084e3e835f6bd15046eea9d615d3462146da649c1b6b7439b4d768759bda2658d54ca73c9b3479e5e0b6d7a58822664dbe45aa2') # zstandard-0.21.0.diff
-b2sums_armv7h=('6e5980e56343a23bce4fcda58f6abc8f2debca0c278c87b09e53abb17ff15849c26e8df3bbff2388985f8fe5a4e9be9982c602ef7159546f0ae335fca1000a41')
b2sums_i686=('01e1bcb331b6147b822fe4c45dd195f38e670db08bdff16db1c21dc2d529f4f783d5798cde415fec782c8fc9cf79ce70dadcc013be3c9d4f5a09fc3a1ee0744d' # avoid-libxul-OOM-python-check.patch
'32c60a9259f9ab6b950c0a3af81e4c36c14160860d3b9da70aa3fbc3676e5fd2b2705b02d7e6b6ac49f9510577de89ab2334abe3b0a126e3d70e65ac42ba62c9' # rust-static-disable-network-test-on-static-libraries.patch
'05c7c9727201971650df4ca2e00539767fc9e159539835c641fccab5ec9577a7294e8f62f5d0670158316e5467ea121c03a36fd4ba153e1d60f3402f0430548d' # firefox-111.0.1-fdlibm.patch
@@ -259,6 +256,8 @@ readonly _USE_ALT_LINKER=$(case "${CARCH}" in i686|x86_64) echo 1 ;; *) echo 0 ;
case "${CARCH}" in
armv7h)
makedepends=( ${makedepends[*]/wasi-*/} ) # armv7h has no wasi compiler
+
+ depends+=( libicudata.so libicui18n.so libicuuc.so ) # --with-system-icu
;;
esac
@@ -361,8 +360,6 @@ prepare() {
# mozilla #1787405 and #1791267
sed -i "s|# 'LIBYUV_DISABLE_NEON',|'LIBYUV_DISABLE_NEON',|" media/libyuv/libyuv/libyuv.gyp
! grep "# 'LIBYUV_DISABLE_NEON'," media/libyuv/libyuv/libyuv.gyp || ! echo "error patching media/libyuv/libyuv/libyuv.gyp" || exit 1
-
- patch -p1 -i ../build-arm-libopus.patch
;;
i686)
# readelf: Error: Unable to seek to 0x801db328 for section headers
@@ -513,6 +510,7 @@ END
elif [[ $CARCH == "aarch64" ]]; then
echo 'ac_add_options --enable-rust-simd' >> .mozconfig
fi
+
echo 'ac_add_options --enable-optimize="-g0 -O2"' >> .mozconfig
echo "mk_add_options MOZ_MAKE_FLAGS=\"${MAKEFLAGS}\"" >> .mozconfig
@@ -520,7 +518,7 @@ END
# archarm patching is under the 'technical patching' section
- # NOTE: At this point in the recipe, the arch, arch32, and parabola PKGBUILDs
+ # At this point in the recipe, the arch, arch32, and parabola PKGBUILDs
# have prepared a temporary ${srcdir}/mozconfig; but the archarm PKGBUILD
# writes directly to the final firefox-$pkgver/.mozconfig.
# We allowed .mozconfig to be written above, only to minimize the diff against archarm.