diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 313 |
1 files changed, 160 insertions, 153 deletions
@@ -1,3 +1,7 @@ +# $Id$ +# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor (Arch): Ionut Biru <ibiru@archlinux.org> +# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> # Maintainer: Andreas Grapentin <andreas@grapentin.org> # Contributor: André Silva <emulatorman@hyperbola.info> # Contributor: Márcio Silva <coadde@hyperbola.info> @@ -5,124 +9,150 @@ # Contributor: Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: fauno <fauno@kiwwwi.com.ar> # Contributor: vando <facundo@esdebian.org> -# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> # Contributor: Figue <ffigue at gmail> # Contributor: taro-k <taro-k@movasense_com> # Contributor: Michał Masłowski <mtjm@mtjm.eu> # Contributor: Luke R. <g4jc@openmailbox.org> # Contributor: Isaac David <isacdaavid@isacdaavid.info> # Contributor: bill-auger <bill-auger@programmer.net> -# Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> -_oldname=firefox -pkgname=iceweasel +# parabola changes and rationale: +# - rebranded to iceweasel +# - removed google api keys and usage +# - removed use of firefox-symbolic.svg +# - added makedepends: mozilla-searchplugins, quilt, libxslt, imagemagick +# - added replaces, conflicts: firefox +_pkgname=firefox +pkgname=iceweasel epoch=1 -pkgver=57.0.4 -pkgrel=1.arcfour1 -_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" +pkgver=59.0 +pkgrel=2 +_bver=59.0 +_brel=1 +pkgdesc="Libre standalone web browser based on Mozilla Firefox" +arch=(x86_64) +arch+=(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) -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 librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip) -makedepends_i686=(rust clang llvm) -makedepends_x86_64=("${makedepends_i686[@]}") +url="https://wiki.parabola.nu/$pkgname" +depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg + nss hunspell sqlite ttf-font libpulse libvpx icu) +makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb + autoconf2.13 rust mercurial clang llvm jack gtk2) +makedepends+=(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") +# https://archive.mozilla.org/pub/firefox/releases/$pkgver/SOURCE +_commit=c61f5f5ead48c78a80c80db5c489bdc7cfaf8175 +source=(firefox-$pkgver.tar.bz::https://hg.mozilla.org/releases/mozilla-release/archive/$_commit.tar.bz2 $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' + no-crmf.diff) +source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig} + libre.patch + vendor.js) +sha256sums=('fb5ff29e2bc68fa5ebb8bd8c800b597fcb2dd5820899aef3372380c99a0acec6' + 'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa' + 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb' + '7ee098251254cbfbcdf78463d3af95089e38d7942a5c7936dacbcf0c5fb1c5b8' 'SKIP' - '8656d1314eda65f81a2b536f7dd1274f6d82ef1aee6573dc14b024749a6f1df4' - '7b7d608f738d0f48be923b6b61281918cfb35f372d7b9fc7b1b7133efa2dd17f' - '6e23fe534394bbab0041f5935cd23c2590285f7541b0a10f3042905676b1561e' - '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' - '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' - '3ba321484226e4cbd9b139d584339a51613b1d27c5c290f07a97e2a54facf16f' - '642b214b219e3c7668abed7119c3fadaeee9da80e98aba93a42ea8128eccd73c' - '250f7aaa3c1362f9d2bb2211cd605eab93a5e806e8540f184979d41acf46142a' - '46e588300797bda599c8f5157437fd79f88b6e1179f2fde49e0405e435e03efa' - '2788719e3f619e509aa50c0facf98fb5dd24d71220b096e698adeaeee492b929' - 'd28b14a870aa100273243039d08ab9e64d325c28b6291413441146ebdf5d38ee' - 'ce1765c7812da53dc555103d54998d57890def127aa034b37f21dbfab65dde65' - 'fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65' - 'c0ceaaa83a0c79035cdb39b6c130064409dffa546ae2d576fa061b52e4a0392f' - '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a' - 'f068b84ad31556095145d8fefc012dd3d1458948533ed3fff6cbc7250b6e73ed' - 'e98a3453d803cc7ddcb81a7dc83f883230dd8591bdf936fc5a868428979ed1f1') -validpgpkeys=( - 'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin -) + '12170e0539997396f83c511317377cf4cc5af74177c6c1db14275ebf0b932bb9' + 'a3d82a2b4a61637c3813957c48e8ed0e16afc0138b198d2ec0c61f3dbb8977d2') +validpgpkeys=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin prepare() { - cd "$srcdir/$_oldname-$pkgver" + mkdir path + ln -s /usr/bin/python2 path/python - local brandingdir="$srcdir/$pkgname-$_brandingver" + cd mozilla-release-$_commit - # Prepare branding for the Iceweasel packages - mkdir -v browser/branding/$pkgname + # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 + patch -Np1 -i ../no-crmf.diff + + cat >.mozconfig <<END +ac_add_options --enable-application=browser + +ac_add_options --prefix=/usr +ac_add_options --enable-release +ac_add_options --enable-gold +ac_add_options --enable-pie +ac_add_options --enable-optimize="-O2" +ac_add_options --enable-rust-simd + +# Branding +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/iceweasel +ac_add_options --enable-update-channel=release +ac_add_options --with-distribution-id=nu.parabola +export MOZ_TELEMETRY_REPORTING=0 +export MOZ_ADDON_SIGNING=0 +export MOZ_REQUIRE_SIGNING=0 + +# System libraries +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-icu +ac_add_options --with-system-jpeg +ac_add_options --with-system-libvpx +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi + +# Features +ac_add_options --enable-alsa +ac_add_options --enable-jack +ac_add_options --enable-startup-notification +ac_add_options --disable-crashreporter +ac_add_options --disable-eme +ac_add_options --disable-tests +ac_add_options --disable-updater +ac_add_options --disable-webrtc +END + + if [[ "$CARCH" == arm* ]]; then + sed -i \ + -e '/enable-gold/s/^/#/' \ + -e '/enable-pie/s/^/#/' \ + -e '/enable-optimize/d' \ + .mozconfig + + cat >> .mozconfig << END +ac_add_options --disable-webrtc +ac_add_options --disable-elf-hack +ac_add_options --disable-stylo +ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns" +END + fi - # copy the branding files + # perform rebranding + local brandingdir="$srcdir/$pkgname-$_bver" + mkdir -v browser/branding/$pkgname cp -va $brandingdir/branding/* browser/branding/$pkgname - # patch export QUILT_PATCHES=$brandingdir/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - quilt push -av # Put "Start Page" branding images in the source code - install -m644 "$srcdir/"{drm-free,gnu_headshadow,parabola-banner}.png \ + install -m644 "$brandingdir/branding/"{drm-free,gnu_headshadow,parabola-banner}.png \ browser/base/content/abouthome - install -m644 "$srcdir/watermark.svg" \ + install -m644 "$brandingdir/branding/watermark.svg" \ browser/extensions/onboarding/content/img - # Useless since we are doing it ourselves - patch -Np1 -i "$srcdir/remove-default-and-shell-icons-in-packaging-manifest.patch" - - # Enable object directory paths for Iceweasel rebranding - patch -Np1 -i "$srcdir/enable-object-directory-paths.patch" - - # Install to /usr/lib/iceweasel - patch -Np1 -i "$srcdir/$pkgname-install-dir.patch" + # produce icons + for i in 128; do + rsvg-convert -w $i -h $i "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \ + -o "browser/branding/iceweasel/default$i.png" + done # Patch and remove anything that's left patch -Np1 -i "$srcdir/libre.patch" @@ -135,21 +165,8 @@ prepare() { \|installLinux| s|true|false| ' browser/base/content/browser-plugins.js - # Load our build config, disable SafeSearch - cp "$srcdir/mozconfig" .mozconfig - - # override the new newtab obscenity with the abouthome stuff - cat browser/base/content/abouthome/aboutHome.xhtml > 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" + # replace newtab page with abouthome + #cat browser/base/content/abouthome/aboutHome.xhtml > browser/base/content/newtab/newTab.xhtml # Load our searchplugins rm -rv browser/locales/searchplugins @@ -160,82 +177,72 @@ 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 mozilla-release-$_commit # _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" + export MOZ_SOURCE_REPO="$_repo" - 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 mozilla-release-$_commit + DESTDIR="$pkgdir" ./mach install + find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} + install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" local shortver=$(echo $pkgver | cut -d'.' -f1,2) sed -i "s/@PKGVER@/$shortver/g" "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" + + _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini" + install -Dm644 /dev/stdin "$_distini" <<END +[Global] +id=parabola +version=1.0 +about=Iceweasel for Parabola GNU/Linux-libre + +[Preferences] +app.distributor=parabola +app.distributor.channel=$pkgname +app.partner.parabola=parabola +END - local brandingdir="$srcdir/$pkgname-$_brandingver" - - # install iceweasel icons - local icondir="$pkgdir/usr/share/icons/hicolor" for i in 16 22 24 32 48 64 128 192 256 384; do - rsvg-convert -w $i -h $i "$brandingdir/branding/${pkgname}_icon.svg" \ - -o "$brandingdir/default$i.png" - install -Dm644 "$brandingdir/default$i.png" \ - "$icondir/${i}x${i}/apps/$pkgname.png" + rsvg-convert -w $i -h $i "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \ + -o "browser/branding/iceweasel/default$i.png" + install -Dm644 "browser/branding/iceweasel/default$i.png" \ + "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png" done - install -Dm644 "$brandingdir/branding/${pkgname}_icon.svg" \ - "$icondir/scalable/apps/$pkgname.svg" + install -Dm644 "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \ + "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg" - # Parabola rebranding - install -m644 "$srcdir/distribution.ini" \ - "$pkgdir/usr/lib/$pkgname/distribution" - - # Install Iceweasel desktop - install -d "$pkgdir/usr/share/applications" - install -m644 "$srcdir/$pkgname.desktop" \ - "$pkgdir/usr/share/applications" + install -Dm644 ../$pkgname.desktop \ + "$pkgdir/usr/share/applications/$pkgname.desktop" # Use system-provided dictionaries - rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation} - ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries" - ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation" + rm -r "$pkgdir/usr/lib/$pkgname/dictionaries" + ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries" + ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation" + + # Install a wrapper to avoid confusion about binary path + install -Dm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <<END +#!/bin/sh +exec /usr/lib/$pkgname/$pkgname "\$@" +END - # Replace duplicate binary with symlink + # Replace duplicate binary with wrapper # https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin" + ln -srf "$pkgdir/usr/bin/$pkgname" \ + "$pkgdir/usr/lib/$pkgname/$pkgname-bin" } |