If anyone is interested, please find updated patches for
Iceweasel 73.0-1
Please note that this is WIP. I didn't build it for any of the
architectures. Just started libremakepkg for all 3, and made
sure it proceeded successfully to "compiling..." stage.
Currently x86_64 build is running on my machine. Will post
results for it and also for other two if / when they are ready.
Also note that for ARM patch the option "mk_add_options
MOZ_MAKE_FLAGS="-j2"" is still included, but commented out. I
want to see if it builds without that one.
Commit messages are included in all the patches, please refer to
them for explanations of the changes.
From e5eedd5dbca84123f784c483239cebcff2c7665c Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Wed, 12 Feb 2020 11:44:31 +0200
Subject: [PATCH 1/8] Sync with changes from Arch Linux Firefox 73.0-1
---
libre/iceweasel/PKGBUILD | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 3b7833ca3..ce10526f6 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -47,7 +47,7 @@
pkgname=iceweasel
replaces=('firefox')
epoch=1
-pkgver=72.0.1
+pkgver=73.0
pkgrel=1
pkgrel+=.parabola1
_brandingver=70.0
@@ -103,7 +103,6 @@ prepare() {
cd firefox-$pkgver
# https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
- msg2 "applying 0001-Use-remoting-name-for-GDK-application-names.patch"
patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
cat >../mozconfig <<END
@@ -164,9 +163,9 @@ END
# mozbuild.configure.options.InvalidOptionError: --disable-eme is not available in this configuration
sed -i 's|ac_add_options --disable-eme||' ../mozconfig
- msg2 "applying arm.patch"
+ echo "applying arm.patch"
patch -p1 -i ../arm.patch
- msg2 "applying build-arm-libopus.patch"
+ echo "applying build-arm-libopus.patch"
patch -p1 -i ../build-arm-libopus.patch
;;
i686)
@@ -184,23 +183,22 @@ END
# test failure in rust code (complaining about network functions) when PGO is used,
# see https://bugzilla.mozilla.org/show_bug.cgi?id=1565757
- msg2 "applying rust-static-disable-network-test-on-static-libraries.patch"
patch -p1 -i "$srcdir"/rust-static-disable-network-test-on-static-libraries.patch
# readelf: Error: Unable to seek to 0x801db328 for section headers
- msg2 "applying avoid-libxul-OOM-python-check.patch"
+ echo "applying avoid-libxul-OOM-python-check.patch"
patch -p1 -i "$srcdir"/avoid-libxul-OOM-python-check.patch
;;
x86_64)
;;
- *) error "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;
+ *) echo "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;
;;
esac
## branding ##
- msg2 "applying parabola branding"
+ echo "applying parabola branding"
local brandingsrcdir="${srcdir}/${pkgname}-${_brandingver}"
local brandingdestdir=browser/branding/${pkgname}
rm -rf -- ${brandingdestdir}
@@ -242,7 +240,7 @@ END
## libre patching ##
# Remove remaining non-free bits
- msg2 "applying libre.patch"
+ echo "applying libre.patch"
patch -Np1 -i "$srcdir/libre.patch"
# Disable various components at the source level
@@ -263,7 +261,7 @@ END
# local _remove_engines_sed='s|.*oogle.*| "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-en", "searx", "wikipedia", "yacy"|g'
local _remove_engines_sed='s|.*oogle.*| "ddg", "wikipedia"|g'
local _search_config_file=browser/components/search/extensions/list.json
- msg2 "applying libre-searchengines.patch"
+ echo "applying libre-searchengines.patch"
patch -Np1 -i "$srcdir/libre-searchengines.patch"
sed -i "${_remove_engines_sed}" ${_search_config_file}
@@ -322,13 +320,13 @@ build() {
;;
x86_64)
# Do 3-tier PGO
- msg2 "Building instrumented browser..."
+ echo "Building instrumented browser..."
cat >.mozconfig ../mozconfig - <<END
ac_add_options --enable-profile-generate=cross
END
./mach build
- msg2 "Profiling instrumented browser..."
+ echo "Profiling instrumented browser..."
./mach package
LLVM_PROFDATA=llvm-profdata \
JARLOG_FILE="$PWD/jarlog" \
@@ -336,16 +334,16 @@ END
./mach python build/pgo/profileserver.py
if [[ ! -s merged.profdata ]]; then
- error "No profile data produced."
+ echo "No profile data produced."
return 1
fi
if [[ ! -s jarlog ]]; then
- error "No jar log produced."
+ echo "No jar log produced."
return 1
fi
- msg2 "Removing instrumented browser..."
+ echo "Removing instrumented browser..."
./mach clobber
cat >.mozconfig ../mozconfig - <<END
@@ -355,18 +353,18 @@ ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata
ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog
END
;;
- *) error "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;
+ *) echo "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;
;;
esac
# sanity checks
# each of the [ARCH-SPECIFIC CONFIG] branches above should have created .mozconfig
- [[ ! -f .mozconfig ]] && error ".mozconfig file not found in source root" && return 1
+ [[ ! -f .mozconfig ]] && echo ".mozconfig file not found in source root" && return 1
- msg2 "Building optimized browser..."
+ echo "Building optimized browser..."
./mach build
- msg2 "Building symbol archive..."
+ echo "Building symbol archive..."
./mach buildsymbols
}
@@ -440,7 +438,7 @@ END
;;
x86_64)
;;
- *) error "no [ARCH-SPECIFIC INSTALL] for arch: ${CARCH}" ; return 1 ;
+ *) echo "no [ARCH-SPECIFIC INSTALL] for arch: ${CARCH}" ; return 1 ;
;;
esac
@@ -455,3 +453,4 @@ END
fi
}
+# vim:set sw=2 et:
--
2.25.0
From 21887cf189c47fbea43eec9fe49a36de64880fe7 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Wed, 12 Feb 2020 12:39:16 +0200
Subject: [PATCH 2/8] Sync with changes from Arch Linux ARM Firefox 73.0-1
Let's stick as close to upstream as possible. I've made these changes
after comparing PKGBUILDs from Arch Linux and Arch Linux ARM. For ARM,
some options like "ac_add_options --enable-hardening" are commented,
and that does not mean they can be replaced by e.g.
"ac_add_options --disable-hardening". Instead, that means these options
are just reset to default values, which can be different now or later.
Also rearranged changed options to appear in the same order as they are
in upstream PKGBUILD, so they a bit easier to compare later.
---
libre/iceweasel/PKGBUILD | 31 ++++++++++++++++++++-----------
libre/iceweasel/arm.patch | 8 +++++---
2 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index ce10526f6..0ab249e4b 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -5,6 +5,7 @@
# Maintainer (alarm): Kevin Mihelich <ke...@archlinuxarm.org>
# Maintainer (arch32): Andreas Baumann <m...@andreasbaumann.cc>
# Contributor (arch32): Erich Eckner <g...@eckner.net>
+# Contributor (Arch Linux ARM): Kevin Mihelich <ke...@archlinuxarm.org>
# Contributor: Andreas Grapentin <andr...@grapentin.org>
# Contributor: Luke Shumaker <luke...@parabola.nu>
# Contributor: André Silva <emulator...@hyperbola.info>
@@ -147,20 +148,27 @@ END
## [ARCH-SPECIFIC CONFIG] ##
case ${CARCH} in
armv7h)
+ sed -i '
+ /--enable-hardening/d
+ /--enable-optimize/d
+ /--enable-rust-simd/d
+ ' ../mozconfig
+
cat >>../mozconfig <<END
-ac_add_options --disable-hardening
-ac_add_options --disable-optimize
-ac_add_options --enable-optimize="-g0 -O2"
-ac_add_options --disable-rust-simd
-ac_add_options --disable-lto
export CC=clang
export CXX=clang++
+ac_add_options --disable-webrtc
ac_add_options --disable-elf-hack
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1641623
ac_add_options --disable-av1
+ac_add_options --enable-optimize="-g0 -O2"
+#mk_add_options MOZ_MAKE_FLAGS="-j2"
END
# mk_add_options MOZ_MAKE_FLAGS=${MAKEFLAGS} # from archlinuxarm
# mozbuild.configure.options.InvalidOptionError: --disable-eme is not available in this configuration
+ # EME is disabled anyway in the built package, but better check if it exists for ARM each new release.
sed -i 's|ac_add_options --disable-eme||' ../mozconfig
echo "applying arm.patch"
@@ -280,10 +288,12 @@ build() {
# LTO needs more open files
ulimit -n 4096
- # -fno-plt with cross-LTO causes obscure LLVM errors
- # LLVM ERROR: Function Import: link error
- CFLAGS="${CFLAGS/-fno-plt/}"
- CXXFLAGS="${CXXFLAGS/-fno-plt/}"
+ if [[ $CARCH != armv7h ]]; then
+ # -fno-plt with cross-LTO causes obscure LLVM errors
+ # LLVM ERROR: Function Import: link error
+ CFLAGS="${CFLAGS/-fno-plt/}"
+ CXXFLAGS="${CXXFLAGS/-fno-plt/}"
+ fi
# DEBUG: clang-9: error: unknown argument: '-fvar-tracking-assignments'
CFLAGS="${CFLAGS/-fvar-tracking-assignments/}"
@@ -296,8 +306,7 @@ build() {
export CFLAGS+=" -g0"
export CXXFLAGS+=" -g0"
export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
-# export RUSTFLAGS="-Cdebuginfo=0" # from archlinuxarm
- export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off" # archlinuxarm has --disable-lto but not -Clto=off
+ export RUSTFLAGS="-Cdebuginfo=0"
# skipping PGO "instrumented browser"; so we have the final .mozconfig now
cp ../mozconfig .mozconfig
diff --git a/libre/iceweasel/arm.patch b/libre/iceweasel/arm.patch
index c0f15ee60..9e2ed1510 100644
--- a/libre/iceweasel/arm.patch
+++ b/libre/iceweasel/arm.patch
@@ -1,6 +1,8 @@
-diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
-index 636537f847..0f3461af16 100644
---- a/js/src/wasm/WasmSignalHandlers.cpp
+https://bugzilla.mozilla.org/show_bug.cgi?id=1526653
+
+diff --git a/js/src/wasm/WasmSignalHandlers.cpp.orig b/js/src/wasm/WasmSignalHandlers.cpp
+index 636537f..0f3461a 100644
+--- a/js/src/wasm/WasmSignalHandlers.cpp.orig
+++ b/js/src/wasm/WasmSignalHandlers.cpp
@@ -244,7 +244,7 @@ using mozilla::DebugOnly;
// emulation here.
--
2.25.0
From 4ea95313a7626419f3eeef7f4ea62284a038c689 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Wed, 12 Feb 2020 12:40:21 +0200
Subject: [PATCH 3/8] Drop patching of source code comments and non-user-facing
documentation
There are 2k+ files in Firefox source code that contain
'Firefox' (case sensitive). I guess it's not practical to patch them
all that way. Batch search and replace looks like a better approach,
more like in Abrowser from Trisquel.
---
libre/iceweasel/libre.patch | 41 -------------------------------------
1 file changed, 41 deletions(-)
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 018ab6e5d..3dbc2cad0 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -15,21 +15,6 @@ index ecb82a2..5d522ef 100644
-# addon install
-origin install 1 https://private-network.firefox.com
-origin install 1 https://fpn.firefox.com
-diff --git a/browser/components/newtab/docs/index.rst b/browser/components/newtab/docs/index.rst
-index ea1e42a..855b245 100644
---- a/browser/components/newtab/docs/index.rst
-+++ b/browser/components/newtab/docs/index.rst
-@@ -1,8 +1,8 @@
- ======================
--Firefox Home (New Tab)
-+Iceweasel Home (New Tab)
- ======================
-
--All files related to Firefox Home, which includes content that appears on `about:home`,
-+All files related to Iceweasel Home, which includes content that appears on `about:home`,
- `about:newtab`, and `about:welcome`, can we found in the `browser/components/newtab` directory.
- Some of these source files (such as `.js`, `.jsx`, and `.sass`) require an additional build step.
- We are working on migrating this to work with `mach`, but in the meantime, please
diff --git a/browser/components/preferences/in-content/sync.inc.xhtml b/browser/components/preferences/in-content/sync.inc.xhtml
index 7d37d26..4ebbc06 100644
--- a/browser/components/preferences/in-content/sync.inc.xhtml
@@ -57,19 +42,6 @@ index 7d37d26..4ebbc06 100644
</groupbox>
<vbox id="hasFxaAccount">
-diff --git a/browser/locales/en-US/browser/newtab/newtab.ftl b/browser/locales/en-US/browser/newtab/newtab.ftl
-index 0737833..7cb90d6 100644
---- a/browser/locales/en-US/browser/newtab/newtab.ftl
-+++ b/browser/locales/en-US/browser/newtab/newtab.ftl
-@@ -2,7 +2,7 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
--### Firefox Home / New Tab strings for about:home / about:newtab.
-+### Iceweasel Home / New Tab strings for about:home / about:newtab.
-
- newtab-page-title = New Tab
- newtab-settings-button =
diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl
index dabfadc..3ce732e 100644
--- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl
@@ -193,19 +165,6 @@ index 2d3c7b4..00221d3 100644
</dl>
-#endif
</dl>
-diff --git a/devtools/client/locales/en-US/sourceeditor.properties b/devtools/client/locales/en-US/sourceeditor.properties
-index 9427244..c17d490 100644
---- a/devtools/client/locales/en-US/sourceeditor.properties
-+++ b/devtools/client/locales/en-US/sourceeditor.properties
-@@ -4,7 +4,7 @@
-
- # LOCALIZATION NOTE These strings are used inside the Source Editor component.
- # This component is used whenever source code is displayed for the purpose of
--# being edited, inside the Firefox developer tools (like Style Editor).
-+# being edited, inside the Iceweasel developer tools (like Style Editor).
-
- # LOCALIZATION NOTE The correct localization of this file might be to keep it
- # in English, or another language commonly spoken among web developers.
diff --git a/devtools/client/whats-new/src/main.js b/devtools/client/whats-new/src/main.js
index 0a31843..c01e488 100644
--- a/devtools/client/whats-new/src/main.js
--
2.25.0
From 177b72991f6fd9c34c98112ff30b3b0586b2bc31 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Wed, 12 Feb 2020 12:40:51 +0200
Subject: [PATCH 4/8] Update rebranding of DevTools What's New tab
---
libre/iceweasel/libre.patch | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 3dbc2cad0..adb1e8256 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -178,6 +178,15 @@ index 0a31843..c01e488 100644
linkText: "Read more",
linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/72?${utmParams}`,
features: [
+@@ -39,7 +39,7 @@ const release = {
+ href: `https://wiki.developer.mozilla.org/docs/Tools/Debugger/How_to/Set_a_watchpoint_on_a_property?${utmParams}`,
+ },
+ {
+- header: `Improvements to VS Codeâs Debugger for Firefox`,
++ header: `Improvements to VS Codeâs Debugger for Iceweasel`,
+ description: `A new source map integration makes debugging faster and also integrates with VSCodeâs new column breakpoints UI for fine-grained control. The new Watchpoints can be used via VSCodeâs Data Points.`,
+ href: `https://marketplace.visualstudio.com/items?itemName=firefox-devtools.vscode-firefox-debug`,
+ },
@@ -66,29 +66,6 @@ const release = {
],
};
--
2.25.0
From a6bb8d23ef20f20fb294e6220263e4a69a23fbe0 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Wed, 12 Feb 2020 13:14:10 +0200
Subject: [PATCH 7/8] Rebrand wordmark in new tab in Private Browsing mode
---
libre/iceweasel/libre.patch | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 96852f0ae..e95b3b0d6 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -312,3 +312,16 @@ index edd871b..77870fe 100644
addon-page-options-button =
.title = Tools for all add-ons
+diff --git a/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css b/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css
+index 2d1aca3..dcb1afd 100644
+--- a/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css
++++ b/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css
+@@ -63,7 +63,7 @@ p {
+ }
+
+ .wordmark {
+- background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center;
++ background: url("chrome://branding/content/about-wordmark.svg") no-repeat center center;
+ background-size: 172px;
+ -moz-context-properties: fill;
+ display: inline-block;
--
2.25.0
From 33815b3ad6c23fe1b209754a61cf280f04363a43 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Wed, 12 Feb 2020 13:13:20 +0200
Subject: [PATCH 6/8] Disable 'What's New' gift icon in toolbar and main menu.
---
libre/iceweasel/vendor.js.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libre/iceweasel/vendor.js.in b/libre/iceweasel/vendor.js.in
index f530b75e2..505495fd7 100644
--- a/libre/iceweasel/vendor.js.in
+++ b/libre/iceweasel/vendor.js.in
@@ -315,3 +315,7 @@ pref("extensions.getAddons.search.browseURL", "https://www.parabola.nu/packages/
// Make extensions work on Mozilla domains
pref("extensions.webextensions.restrictedDomains", "");
+
+// Disable 'What's New' gift icon in toolbar and main menu.
+// It shows downloaded news that sometimes contain links to non-free software like mobile Firefox.
+pref("browser.messaging-system.whatsNewPanel.enabled", false);
--
2.25.0
From 49ee1f5d27162a780fd2c36ce1c3f9590c6545dc Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Wed, 12 Feb 2020 13:12:59 +0200
Subject: [PATCH 5/8] Change search placeholder in about:addons
---
libre/iceweasel/libre.patch | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index adb1e8256..96852f0ae 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -301,5 +301,14 @@ index edd871b..77870fe 100644
- .placeholder = Search addons.mozilla.org
+ .placeholder = Search www.parabola.nu/packages
.searchbuttonlabel = Search
-
+
search-header-shortcut =
+@@ -482,7 +482,7 @@ theme-heading-search-label = Find more themes
+ extension-heading-search-label = Find more extensions
+ default-heading-search-label = Find more add-ons
+ addons-heading-search-input =
+- .placeholder = Search addons.mozilla.org
++ .placeholder = Search www.parabola.nu/packages
+
+ addon-page-options-button =
+ .title = Tools for all add-ons
--
2.25.0
From 24d77ee79519cbec9a372043f541bf0253652713 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Wed, 12 Feb 2020 13:44:15 +0200
Subject: [PATCH 8/8] updpkgsums and minor fixes for i686
i686 builds with gcc not clang, no need to remove debug flags for it.
---
libre/iceweasel/PKGBUILD | 18 +++++++++---------
.../avoid-libxul-OOM-python-check.patch | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 0ab249e4b..cc7f44c1b 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/
@@ -83,17 +83,15 @@ 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'
'SKIP'
- '1169ccda88642881e0ba024f0c82fce9ac3064d3587517f9960e88cae479ce3e'
+ '65ec3e27e325c0ecffeae24a5f67dd538f8afee026d33261ca41273589c8aa8b'
'dfed11d97f1d4198a3dc608be159b6b53a11054f376cdb73bb0fe9a487ae9418'
- '4979e733215492372c196cdb93ec61eac1fbbd44f44e637dbd420040c8d9affe')
-sha256sums_armv7h=('2bb1f6b9b66a00f4f98eb5cdb2f25972018efe042153503cbc8c494780d7225e'
- '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
+ '42cabd0f82c2d2078119e060aab4174665b08fbf8095e238ddd1372ffaeef267')
sha256sums_i686=('4da71f6614dce71db8e9ec2d317514aae90838c2c65620d435f0df06b45b578b'
'5a3e038a57c4576dcb88766d41cbfda5ad109d5cfe41d2000f7ba25563bf00f2')
validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <rele...@mozilla.com>
@@ -295,9 +293,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 $@)
--
2.25.0
_______________________________________________
Dev mailing list
Dev@lists.parabola.nu
https://lists.parabola.nu/mailman/listinfo/dev
