From 8f7b183f7fc7c3a71d9d3375f4f2e00be6efb0ad Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Thu, 25 Jan 2018 18:42:39 +0100 Subject: libre/iceweasel: updated to 58.0 --- libre/iceweasel/PKGBUILD | 583 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 430 insertions(+), 153 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index c96f61c0c..5dc2010c4 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -1,3 +1,7 @@ +# $Id$ +# Maintainer (Arch): Jan Alexander Steffens (heftig) +# Contributor (Arch): Ionut Biru +# Contributor (Arch): Jakub Schmidtke # Maintainer: Andreas Grapentin # Contributor: André Silva # Contributor: Márcio Silva @@ -5,125 +9,126 @@ # Contributor: Luke Shumaker # Contributor: fauno # Contributor: vando -# Contributor (Arch): Jakub Schmidtke # Contributor: Figue # Contributor: taro-k # Contributor: Michał Masłowski # Contributor: Luke R. # Contributor: Isaac David # Contributor: bill-auger -# Thank you very much to the older contributors: # Contributor: evr # Contributor: Muhammad 'MJ' Jassim -_oldname=firefox -pkgname=iceweasel +# parabola changes and rationale: +# - rebranded to iceweasel +# - added to makedepends: mozilla-searchplugins, quilt, libxslt, imagemagick +# - removed from makedepends: mercurial +# - using tarball instead of repository +# - added replaces and conflicts for firefox +# - removed google api keys and usage +_pkgname=firefox +pkgname=iceweasel epoch=1 -pkgver=57.0.4 +pkgver=58.0 pkgrel=1 -_brandingver=57.0 -_brandingrel=1 -_parabolarepo=https://repo.parabola.nu/other/iceweasel -arch=(i686 x86_64 armv7h) - -pkgdesc="Iceweasel, the libre web browser based on Mozilla Firefox." -url="https://wiki.parabola.nu/$pkgname" +_bver=58.0 +_brel=1 +pkgdesc="Libre standalon web browser based on Mozilla Firefox" +arch=(x86_64 i686 armv7h) license=(MPL GPL LGPL) - -depends=(alsa-lib dbus-glib ffmpeg gtk2 gtk3 hunspell libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font) +url="https://wiki.parabola.nu/$pkgname" +depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg + nss hunspell sqlite ttf-font libpulse libvpx icu) depends_x86_64=("icu>=60" "icu<61") depends_i686=("icu>=60" "icu<61") depends_armv7h=("icu>=60" "icu<61") -makedepends=(autoconf2.13 diffutils gconf imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip) -makedepends_i686=(rust clang llvm) -makedepends_x86_64=("${makedepends_i686[@]}") +makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb + autoconf2.13 rust clang llvm jack mozilla-searchplugins quilt libxslt imagemagick) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' + 'pulseaudio: Audio support' 'speech-dispatcher: Text-to-Speech') - -replaces=("$_oldname-libre" "$pkgname-libre" "$_oldname") -conflicts=("$_oldname-libre" "$pkgname-libre" "$_oldname") - -options=(!emptydirs !makeflags !strip debug) - -source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname-$pkgver.source.tar.xz" - "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz" - "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz.sig" - mozconfig - libre.patch - remove-default-and-shell-icons-in-packaging-manifest.patch - drm-free.png - gnu_headshadow.png - parabola-banner.png - watermark.svg +options=(!emptydirs !makeflags !strip) +replaces=("$_pkgname") +conflicts=("$_pkgname") +_parabolarepo=https://repo.parabola.nu/other/iceweasel +source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz $pkgname.desktop - $pkgname-install-dir.patch - vendor.js - distribution.ini - enable-object-directory-paths.patch - mozilla-1253216.patch - no-crmf.patch - mozilla-build-arm.patch - wifi-disentangle.patch - wifi-fix-interface.patch) -sha256sums=('97cced69abfd5c57d968f0095631f86beff4f7b61883edd5a4f207e7f9c43b33' - 'e93f2363d7b414d207250eb1c63d955681f158c8d5678ef3d2e9232cdb0382c7' - 'SKIP' - '71e20557568330c29553201a6009060feb65921b021fff8053ad9f7cb67670fa' - '7b7d608f738d0f48be923b6b61281918cfb35f372d7b9fc7b1b7133efa2dd17f' - '6e23fe534394bbab0041f5935cd23c2590285f7541b0a10f3042905676b1561e' - '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' - '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' - '3ba321484226e4cbd9b139d584339a51613b1d27c5c290f07a97e2a54facf16f' - '642b214b219e3c7668abed7119c3fadaeee9da80e98aba93a42ea8128eccd73c' - '250f7aaa3c1362f9d2bb2211cd605eab93a5e806e8540f184979d41acf46142a' + $pkgname-install-dir.patch no-crmf.diff + https://repo.parabola.nu/other/iceweasel/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig} + libre.patch) +sha256sums=('0e0a39caabf94d7467d8bb4008fa9e7340a7be57b8c78ccf0cf98791a3bfaaff' + 'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa' '46e588300797bda599c8f5157437fd79f88b6e1179f2fde49e0405e435e03efa' - 'e2a344b7296d3cd7d30cef083d5a6f1a26bd93711e770671b21ff8d343b83901' - 'd28b14a870aa100273243039d08ab9e64d325c28b6291413441146ebdf5d38ee' - 'ce1765c7812da53dc555103d54998d57890def127aa034b37f21dbfab65dde65' - 'fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65' - 'c0ceaaa83a0c79035cdb39b6c130064409dffa546ae2d576fa061b52e4a0392f' - '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a' - 'f068b84ad31556095145d8fefc012dd3d1458948533ed3fff6cbc7250b6e73ed' - 'e98a3453d803cc7ddcb81a7dc83f883230dd8591bdf936fc5a868428979ed1f1') -validpgpkeys=( - 'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin -) + 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb' + '482cfe2d92f0b9638061eaf1b457abe0a8c8a0521bd67767e5c5010868612d25' + 'SKIP' + '12170e0539997396f83c511317377cf4cc5af74177c6c1db14275ebf0b932bb9') +validpgpkeys=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin prepare() { - cd "$srcdir/$_oldname-$pkgver" + mkdir path + ln -s /usr/bin/python2 path/python - local brandingdir="$srcdir/$pkgname-$_brandingver" + cd "$srcdir/$_pkgname-$pkgver" + patch -Np1 -i ../$pkgname-install-dir.patch - # Prepare branding for the Iceweasel packages + # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 + patch -Np1 -i ../no-crmf.diff + + cat >.mozconfig < browser/base/content/newtab/newTab.xhtml - # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968 - patch -Np1 -i ../wifi-disentangle.patch - patch -Np1 -i ../wifi-fix-interface.patch - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 - patch -Np1 -i "$srcdir/no-crmf.patch" - - mkdir "$srcdir/path" - ln -s /usr/bin/python2 "$srcdir/path/python" - # Load our searchplugins rm -rv browser/locales/searchplugins cp -av /usr/lib/mozilla/searchplugins browser/locales @@ -160,82 +152,367 @@ prepare() { sed -i 's|[;]1|;0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService" sed -i '/pocket/d' browser/extensions/moz.build || die "failed to wipe pocket" sed -i '/activity-stream/d' browser/extensions/moz.build || die "failed to wipe activity-stream" - - # ARM-specific changes: - if [[ "$CARCH" == arm* ]]; then - sed -i '/ac_add_options --enable-rust/d' .mozconfig - echo "ac_add_options --disable-ion" >> .mozconfig - echo "ac_add_options --disable-elf-hack" >> .mozconfig - echo "ac_add_options --disable-webrtc" >> .mozconfig - - # Disable gold linker, reduce memory consumption at link time - sed -i '/ac_add_options --enable-gold/d' .mozconfig - LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" - echo "ac_add_options --disable-tests" >> .mozconfig - echo "ac_add_options --disable-debug" >> .mozconfig - - patch -p1 -i ../mozilla-1253216.patch - patch -p1 -i ../mozilla-build-arm.patch - fi } build() { - cd "$srcdir/$_oldname-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" # _FORTIFY_SOURCE causes configure failures CPPFLAGS+=" -O2" - # Hardening - LDFLAGS+=" -Wl,-z,now" - - # GCC 6 - CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" - CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" - export PATH="$srcdir/path:$PATH" - export PYTHON="/usr/bin/python2" - make -f client.mk build + # Do PGO + #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \ + # MOZ_PGO=1 ./mach build + ./mach build + ./mach buildsymbols } package() { - cd "$srcdir/$_oldname-$pkgver" - - make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install + cd "$srcdir/$_pkgname-$pkgver" + DESTDIR="$pkgdir" ./mach install + find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} + + + local _shortver=$(echo $pkgver | cut -d'.' -f1,2) + _vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" + install -Dm644 /dev/stdin "$_vendorjs" <