summaryrefslogtreecommitdiff
path: root/libre/iceweasel
diff options
context:
space:
mode:
Diffstat (limited to 'libre/iceweasel')
-rw-r--r--libre/iceweasel/PKGBUILD26
-rw-r--r--libre/iceweasel/avoid-libxul-OOM-python-check.patch2
2 files changed, 15 insertions, 13 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index f3668831f..1ee90ada9 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -40,7 +40,7 @@
# privacy:
# - Remove Google API keys and usage
# - Disable Mozilla telemetry and crash reporting (good manners
-# because of all of the other patching we're doing
+# because of all of the other patching we're doing)
#
# [1]: https://www.mozilla.org/en-US/foundation/trademarks/policy/
@@ -51,7 +51,7 @@ epoch=1
pkgver=73.0
pkgrel=1
pkgrel+=.parabola1
-_brandingver=70.0
+_brandingver=73.0
_brandingrel=1
pkgdesc="Standalone web browser derived from Mozilla Firefox"
arch=(x86_64)
@@ -83,19 +83,19 @@ source_armv7h=(arm.patch
build-arm-libopus.patch)
source_i686=('rust-static-disable-network-test-on-static-libraries.patch'
'avoid-libxul-OOM-python-check.patch')
-sha256sums=('1fa59aedc8469c3e6ffb12449ab7de2f93776f7679eedebfb74aa309b694956f'
+sha256sums=('b57af802aae32d7f4624ce8b373701236b76904abcb893ded9e0cb5805ba6e17'
'SKIP'
'5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c'
'f573d00835afe066ef1887bfea35099933ee07aeadc4c0d603972127e600cfc4'
- 'e90956067d8549f02864d612369ed8714d7173f0ee07bbfb4374a7323b4a733e'
+ '091b32290e1cbb8597bd31c770f3b850d2cecc0e8ca591bb50956fde67c0a449'
'SKIP'
- '1169ccda88642881e0ba024f0c82fce9ac3064d3587517f9960e88cae479ce3e'
+ 'dbcd5e241ea559c611bb651b41d5f763375f5c5517390c47a0faa60544867772'
'dfed11d97f1d4198a3dc608be159b6b53a11054f376cdb73bb0fe9a487ae9418'
- '4979e733215492372c196cdb93ec61eac1fbbd44f44e637dbd420040c8d9affe')
-sha256sums_armv7h=('2bb1f6b9b66a00f4f98eb5cdb2f25972018efe042153503cbc8c494780d7225e'
- '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
+ '940772282aa7b9e6fcb59ac27994fda548b8ab9fb73cc778d422d359fdd9bb93')
sha256sums_i686=('4da71f6614dce71db8e9ec2d317514aae90838c2c65620d435f0df06b45b578b'
- '5a3e038a57c4576dcb88766d41cbfda5ad109d5cfe41d2000f7ba25563bf00f2')
+ '1882cd2a1689d41c3111abe45dab7215a5b292d5fff24fdde9af25af7b891a59')
+sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
+ '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
@@ -296,9 +296,11 @@ build() {
CXXFLAGS="${CXXFLAGS/-fno-plt/}"
fi
- # DEBUG: clang-9: error: unknown argument: '-fvar-tracking-assignments'
- CFLAGS="${CFLAGS/-fvar-tracking-assignments/}"
- CXXFLAGS="${CXXFLAGS/-fvar-tracking-assignments/}"
+ if [[ $CARCH != i686 ]]; then
+ # DEBUG: clang-9: error: unknown argument: '-fvar-tracking-assignments'
+ CFLAGS="${CFLAGS/-fvar-tracking-assignments/}"
+ CXXFLAGS="${CXXFLAGS/-fvar-tracking-assignments/}"
+ fi
## [ARCH-SPECIFIC CONFIG] ##
case ${CARCH} in
diff --git a/libre/iceweasel/avoid-libxul-OOM-python-check.patch b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
index 9ab81bb7b..1e41e7b17 100644
--- a/libre/iceweasel/avoid-libxul-OOM-python-check.patch
+++ b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
@@ -4,7 +4,7 @@ diff -rauN a/config/rules.mk b/config/rules.mk
@@ -663,7 +663,7 @@
$(RM) $@
endif
- $(MKSHLIB) $($@_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
+ $(MKSHLIB) $($@_OBJS) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
- $(call py_action,check_binary,--target $@)
+# $(call py_action,check_binary,--target $@)