| |
@@ -47,10 +47,10 @@
|
| |
|
| |
pkgname=iceweasel
|
| |
epoch=1
|
| |
- pkgver=90.0
|
| |
+ pkgver=92.0
|
| |
pkgrel=1
|
| |
pkgrel+=.parabola1
|
| |
- _brandingver=87.0-1
|
| |
+ _brandingver=91.0-1
|
| |
pkgdesc="Standalone web browser derived from Mozilla Firefox"
|
| |
arch=(x86_64)
|
| |
arch+=(i686 armv7h)
|
| |
@@ -61,12 +61,7 @@
|
| |
autoconf2.13 rust clang llvm jack nodejs cbindgen nasm
|
| |
python-setuptools python-psutil python-zstandard lld dump_syms)
|
| |
makedepends+=(quilt libxslt imagemagick git jq python-jsonschema)
|
| |
- if [[ "${CARCH}" == 'i686' ]]
|
| |
- then makedepends=(${makedepends[*]/llvm/llvm10}) # FIXME: i686 configure fails with LLVM11
|
| |
- makedepends=(${makedepends[*]/clang/clang10}) # rustup: error while loading shared libraries: libLLVM-10.so
|
| |
- # makedepends=(${makedepends[*]/rust/rust=1:1.49.0})
|
| |
- # makedepends=(${makedepends[*]/gcc/gcc10})
|
| |
- fi
|
| |
+ makedepends_i686=(gcc10)
|
| |
optdepends=('networkmanager: Location detection via available WiFi networks'
|
| |
'libnotify: Notification integration'
|
| |
'pulseaudio: Audio support'
|
| |
@@ -79,26 +74,26 @@
|
| |
0001-Use-remoting-name-for-GDK-application-names.patch
|
| |
$pkgname.desktop)
|
| |
source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig}
|
| |
- 9001-always-sync-remote-settings-with-local-dump.patch
|
| |
- 9002-preference-defaults.patch
|
| |
- 9003-misc-libre.patch
|
| |
+ 9001-FSDG-always-sync-remote-settings-with-local-dump.patch
|
| |
+ 9002-FSDG-preference-defaults.patch
|
| |
+ 9003-FSDG-misc.patch
|
| |
process-json-files.py
|
| |
vendor.js.in)
|
| |
source_armv7h=(arm.patch
|
| |
build-arm-libopus.patch)
|
| |
source_i686=('avoid-libxul-OOM-python-check.patch'
|
| |
'rust-static-disable-network-test-on-static-libraries.patch')
|
| |
- sha256sums=('43a943e7d7660c6d7f5b41c95b344b7fd6a4a88ad0bb45dbd844b372ea60d58b'
|
| |
+ sha256sums=('299a472373021cc9194449c9f4bb962d5f74ef05e8af0448c589761ea34fbc84'
|
| |
'SKIP'
|
| |
- '7e7435e8171426e87a84cecf9eb017cb969c9c85d973feb78c1e05771972b6e9'
|
| |
+ 'd7c7a65c4b7ec9ea40df129724ffb369d3f775b0514e3c267c52eec6d284b5e6'
|
| |
'9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')
|
| |
- sha256sums+=('e0a0c7434a057dffdce49bb3e5f53fa190aef24f2666cdc50262170df8fec94f'
|
| |
+ sha256sums+=('b3cf2d984a979a1daf997efaa46358c601a7b3e957cbc21f4155ea0a72def8e5'
|
| |
'SKIP'
|
| |
- '798d5d167ff4c8030aebd9dbc931df80c34f08a6aed718b878b064e47e4b4f16'
|
| |
- 'f6114bfe02716442658874e80e553d1cd5fadf4626b461fb94cfb2623cd34b7b'
|
| |
+ '6ebbf18792cb57067f500fd4575c341d4708c5c0a232d676471f87dfa590621b'
|
| |
+ 'afeaeb6e9a6af901b57e25d85014e5c792efe4ff9dabb58663377f487b9d2887'
|
| |
'39e3a5e1ad137e21f842a44d7e3bd24050292d2b41fe59b4e7c7dfed52a195dd'
|
| |
- '90e710662f06c619de8752b088ce56bf3779f24168387b1c18e733391bedd143'
|
| |
- '4e4ef3f5643da6a23b05de9266c1b2c5310483638b23670944374e12aa446a35')
|
| |
+ '9386f1c50506cd20ab6d212335d5e4417faeb2aea371dd46f2d107d171e80b83'
|
| |
+ 'c93ce98e1cb64033079343ff1f3037fab6a3bc6d3eb5bc14c5edb70e2d45965d')
|
| |
sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353'
|
| |
'10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041')
|
| |
sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
|
| |
@@ -230,11 +225,11 @@
|
| |
ac_add_options --enable-linker=bfd
|
| |
ac_add_options --disable-lto
|
| |
ac_add_options --disable-rust-simd
|
| |
- export CC=gcc
|
| |
- export CXX=g++
|
| |
- export AR=gcc-ar
|
| |
- export NM=gcc-nm
|
| |
- export RANLIB=gcc-ranlib
|
| |
+ export CC=gcc-10
|
| |
+ export CXX=g++-10
|
| |
+ export AR=gcc-ar-10
|
| |
+ export NM=gcc-nm-10
|
| |
+ export RANLIB=gcc-ranlib-10
|
| |
END
|
| |
|
| |
# readelf: Error: Unable to seek to 0x801db328 for section headers
|
| |
@@ -356,8 +351,8 @@
|
| |
rm testing/mozbase/mozproxy/tests/files/mitm5-linux-firefox-amazon.zip
|
| |
|
| |
# Disable/neutralize Remote Settings (as best we can)
|
| |
- echo "applying 9001-always-sync-remote-settings-with-local-dump.patch"
|
| |
- patch -Np1 --no-backup-if-mismatch -i ../9001-always-sync-remote-settings-with-local-dump.patch
|
| |
+ echo "applying 9001-FSDG-always-sync-remote-settings-with-local-dump.patch"
|
| |
+ patch -Np1 --no-backup-if-mismatch -i ../9001-FSDG-always-sync-remote-settings-with-local-dump.patch
|
| |
|
| |
# Verify Remote Settings patching
|
| |
local settings_server='firefox.settings.services.mozilla.com'
|
| |
@@ -372,12 +367,12 @@
|
| |
|
| |
python ../process-json-files.py "${srcdir}"/firefox-${pkgver} "${brandingsrcdir}"
|
| |
|
| |
- echo "applying 9002-preference-defaults.patch"
|
| |
- patch -Np1 --no-backup-if-mismatch -i "${srcdir}"/9002-preference-defaults.patch
|
| |
+ echo "applying 9002-FSDG-preference-defaults.patch"
|
| |
+ patch -Np1 --no-backup-if-mismatch -i "${srcdir}"/9002-FSDG-preference-defaults.patch
|
| |
|
| |
# Remove remaining non-free bits
|
| |
- echo "applying 9003-misc-libre.patch"
|
| |
- patch -Np1 --no-backup-if-mismatch -i "${srcdir}"/9003-misc-libre.patch
|
| |
+ echo "applying 9003-FSDG-misc.patch"
|
| |
+ patch -Np1 --no-backup-if-mismatch -i "${srcdir}"/9003-FSDG-misc.patch
|
| |
}
|
| |
|
| |
build() {
|
| |
Built and smoke tested for x86_64 and i686. Didn't try to build for armv7h, sorry.
Requires https://pagure.io/iceweasel/pull-request/5
Please note, this PR is to merge only 3 latest commits from https://pagure.io/abslibre/commits/iceweasel branch. Although it looks like it's for a lot more commits, that's because master branch is outdated on Pagure and I don't have permissions to update it from Parabola master branch.