PR#3: libre/iceweasel: 1:80.0.1-1.parabola1 for x86_64 - abslibre

abslibre

#3 libre/iceweasel: 1:80.0.1-1.parabola1 for x86_64

Closed 3 years ago by grizzlyuser. Opened 3 years ago by grizzlyuser.

iceweasel_80.0.1-1.parabola1 into master

libre/iceweasel: Sync with upstream 80.0.1

grizzlyuser • 3 years ago

2e943dd

libre/iceweasel: Drop origin params from DDG search

grizzlyuser • 3 years ago

49b5e9e

libre/iceweasel: Disable remote search config

grizzlyuser • 3 years ago

9ee7218

libre/iceweasel: Drop diff removed by upstream

grizzlyuser • 3 years ago

febf389

libre/iceweasel/PKGBUILD

file modified

+15 -14

		`@@ -44,7 +44,7 @@`

		`pkgname=iceweasel`
		`epoch=1`
		`- pkgver=80.0`
		`+ pkgver=80.0.1`
		`pkgrel=1`
		`pkgrel+=.parabola1`
		`_brandingver=80.0`
		`@@ -78,19 +78,19 @@`
		`build-arm-libopus.patch)`
		`source_i686=('avoid-libxul-OOM-python-check.patch'`
		`'rust-static-disable-network-test-on-static-libraries.patch')`
		`- sha256sums=('380d9853e0712442ba2d4acd85c0e09c19ad36561a3ea8932705ad6b8a91146a'`
		`+ sha256sums=('596b085e32a2d683ba960e161ea65c6271f90f576d4bf956e0d48e83af992c21'`
		`'SKIP'`
		`'3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75'`
		`- '44be8e819b8334ed36e9410d62dbc6c16dd8f8329a191403bfdce3cf2e9181fc')`
		`- sha256sums+=('228b7d316ab6836a6e69aa7070033b1ae073f3579474a49d8c306702b1c1413e'`
		`- 'SKIP'`
		`- '5cfcadbd168c52b1b1e3f2f2c45911a4ae1a9d8a05918be68475a31985607bd8'`
		`- '0ed6b8efa00f73a96bceaba2d6a31fb11d416106729ab9b8289b191eb9acccfa'`
		`- '714998c5fc379f54a66ff80a845b7880169cd5b4094b77b719a99d33b65c0940')`
		`- sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'`
		`- '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')`
		`+ '44be8e819b8334ed36e9410d62dbc6c16dd8f8329a191403bfdce3cf2e9181fc'`
		`+ '228b7d316ab6836a6e69aa7070033b1ae073f3579474a49d8c306702b1c1413e'`
		`+ 'SKIP'`
		`+ '5cfcadbd168c52b1b1e3f2f2c45911a4ae1a9d8a05918be68475a31985607bd8'`
		`+ '0ed6b8efa00f73a96bceaba2d6a31fb11d416106729ab9b8289b191eb9acccfa'`
		`+ '0ace0929a7487bd3d464a432e9be643a8f62d135cdfc1b4b2c55846aee8c04dc')`
		`sha256sums_i686=('bf2829f280ef05a608584ce7ec95875e147f315bac9609f5e18052bc03e3c4f9'`
		`'e661665ee00ecec66c33e115b0af3474452022f0d8ceda634a6315dc8cb99014')`
		`+ sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'`
		`+ '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')`
		`validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>`
		`validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin`
		`validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger`
		`@@ -287,6 +287,11 @@`
		`pushd browser/components/search/extensions`
		`sed -i "${_remove_engines_sed}" list.json`
		`sed -i 's\|https://duckduckgo.com/\|https://html.duckduckgo.com/html/\|' ddg/manifest.json`
		`+`
		`+ # Removing URL parameters that let DuckDuckGo know the place in UI`
		`+ # the search was ran from (like address bar, context menu, etc.)`
		`+ jq 'del(.chrome_settings_overrides.search_provider.params)' ddg/manifest.json > manifest.json.tmp \`
		`+ && mv manifest.json.tmp ddg/manifest.json`

		`# Sanity-check search-engines patching`
		`_removed_engines_regex='Bing\|Google\|Seznam\|Twitter\|Yahoo\|Yandex\|Яндекс\|amazon\|bing\|google\|ebay\|twitter'`
		`@@ -374,10 +379,6 @@`
		`export CXXFLAGS+=" -mmmx"`
		`;;`
		`x86_64)`
		`- # -fno-plt with cross-LTO -> LLVM ERROR: Function Import: link error`
		`- CFLAGS="${CFLAGS/-fno-plt/}"`
		`- CXXFLAGS="${CXXFLAGS/-fno-plt/}"`
		`-`
		`# clang-9 -> error: unknown argument: '-fvar-tracking-assignments'`
		`CFLAGS="${CFLAGS/-fvar-tracking-assignments/}"`
		`CXXFLAGS="${CXXFLAGS/-fvar-tracking-assignments/}"`

libre/iceweasel/bug1654465.diff

file removed

-77

		`@@ -1,77 +0,0 @@`
		`- build/moz.configure/rust.configure \| 2 +-`
		`- config/makefiles/rust.mk \| 5 +++++`
		`- .../mozbuild/test/configure/test_toolchain_configure.py \| 14 --------------`
		`- 3 files changed, 6 insertions(+), 15 deletions(-)`
		`-`
		`- diff --git c/build/moz.configure/rust.configure i/build/moz.configure/rust.configure`
		`- index aaa693059d95..c90ae5ca7b25 100644`
		`- --- c/build/moz.configure/rust.configure`
		`- +++ i/build/moz.configure/rust.configure`
		`- @@ -146,7 +146,7 @@ def rust_compiler(rustc_info, cargo_info, build_project):`
		`- or by directly running the installer from https://rustup.rs/`
		`- '''))`
		`- if build_project == 'tools/crashreporter':`
		`- - rustc_min_version = Version('1.31.0')`
		`- + rustc_min_version = Version('1.38.0')`
		`- else:`
		`- rustc_min_version = Version('1.43.0')`
		`- cargo_min_version = rustc_min_version`
		`- diff --git c/config/makefiles/rust.mk i/config/makefiles/rust.mk`
		`- index a9abcc9af4c0..b5c7973104ce 100644`
		`- --- c/config/makefiles/rust.mk`
		`- +++ i/config/makefiles/rust.mk`
		`- @@ -63,6 +63,11 @@ ifndef MOZ_DEBUG_RUST`
		`- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))`
		`- cargo_rustc_flags += -Clto`
		`- endif`
		`- +# Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when`
		`- +# using -Clto.`
		`- +ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION)))`
		`- +RUSTFLAGS += -Cembed-bitcode=yes`
		`- +endif`
		`- endif`
		`- endif`
		`-`
		`- diff --git c/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py i/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py`
		`- index e1921ece6865..759d4d98cc0d 100755`
		`- --- c/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py`
		`- +++ i/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py`
		`- @@ -1796,38 +1796,24 @@ class RustTest(BaseConfigureTest):`
		`- arm_arch=7, fpu='neon', thumb2=True, float_abi='softfp')),`
		`- 'thumbv7neon-linux-androideabi')`
		`-`
		`- - self.assertEqual(`
		`- - self.get_rust_target('arm-unknown-linux-androideabi',`
		`- - version='1.32.0',`
		`- - arm_target=ReadOnlyNamespace(`
		`- - arm_arch=7, fpu='neon', thumb2=True, float_abi='softfp')),`
		`- - 'armv7-linux-androideabi')`
		`- -`
		`- self.assertEqual(`
		`- self.get_rust_target('arm-unknown-linux-androideabi',`
		`- arm_target=ReadOnlyNamespace(`
		`- arm_arch=7, fpu='neon', thumb2=False, float_abi='softfp')),`
		`- 'armv7-linux-androideabi')`
		`-`
		`- self.assertEqual(`
		`- self.get_rust_target('arm-unknown-linux-androideabi',`
		`- arm_target=ReadOnlyNamespace(`
		`- arm_arch=7, fpu='vfpv2', thumb2=True, float_abi='softfp')),`
		`- 'armv7-linux-androideabi')`
		`-`
		`- self.assertEqual(`
		`- self.get_rust_target('armv7-unknown-linux-gnueabihf',`
		`- arm_target=ReadOnlyNamespace(`
		`- arm_arch=7, fpu='neon', thumb2=True, float_abi='hard')),`
		`- 'thumbv7neon-unknown-linux-gnueabihf')`
		`-`
		`- - self.assertEqual(`
		`- - self.get_rust_target('armv7-unknown-linux-gnueabihf',`
		`- - version='1.32.0',`
		`- - arm_target=ReadOnlyNamespace(`
		`- - arm_arch=7, fpu='neon', thumb2=True, float_abi='hard')),`
		`- - 'armv7-unknown-linux-gnueabihf')`
		`- -`
		`- self.assertEqual(`
		`- self.get_rust_target('armv7-unknown-linux-gnueabihf',`
		`- arm_target=ReadOnlyNamespace(`

libre/iceweasel/vendor.js.in

file modified

		`@@ -321,3 +321,7 @@`
		`// Setting these preferences just in case and to not frustrate users.`
		`pref("app.normandy.api_url", "http://127.0.0.1/");`
		`pref("app.normandy.enabled", false);`
		`+`
		`+ // Disable Mozilla's remote configuration of search engines`
		`+ // See https://bugzilla.mozilla.org/show_bug.cgi?id=1542235`
		`+ pref("browser.search.modernConfig", false);`

grizzlyuser commented 3 years ago

Built only for x86_64.

i686 build failed, please see:
prepare log: https://termbin.com/kkko
part of build log with errors: https://termbin.com/041a (termbin refused to store the whole log since it's too big, over 5 MB.

armv7h build failed with the same errors as in previous versions. This time I tried to build outside of VM, on x86_64 system with qemu-user-static-binfmt. Probably needs to be built inside ARM VM.