diff options
Diffstat (limited to 'libre/icecat/PKGBUILD')
| -rw-r--r-- | libre/icecat/PKGBUILD | 83 |
1 files changed, 53 insertions, 30 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 31a7bde09..6727d45a5 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -10,46 +10,52 @@ # Contributor: evr <evanroman at gmail> # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> -_pgo=false +_pgo=true pkgname=icecat -pkgver=17.0.1 -pkgrel=10 +pkgver=24.0 +pkgrel=1 pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.' arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) -depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base wireless_tools hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) -makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 unzip zip) -options=(!emptydirs) +depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) +makedepends=(autoconf2.13 diffutils gstreamer0.10-base imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 unzip zip) +options=(!emptydirs !makeflags) if $_pgo; then makedepends+=(xorg-server-xvfb) options+=(!ccache) fi -optdepends=('networkmanager: Location detection via available WiFi networks') +optdepends=('networkmanager: Location detection via available WiFi networks' + 'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing' + 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding' + 'gstreamer0.10-good-plugins: webm and mp4 demuxing' + 'gstreamer0.10-ugly-plugins: h.264 decoding' + 'libpulse: PulseAudio audio driver') url=http://www.gnu.org/software/gnuzilla/ install=$pkgname.install source=( - ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz + ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::2}/$pkgname-$pkgver.tar.gz mozconfig mozconfig.pgo - xulrunner-copy-stub.patch libre.patch $pkgname.desktop $pkgname-safe.desktop $pkgname-install-dir.patch vendor.js + icecat-20.0.1-fixed-loading-icon.png #cairo.patch ) + md5sums=( - c88a29aa92fc41a07e777a0e63ac5f7e - 5154141da7cf38102927e3addb49ccac - 383e8e2a97a8b13fe56d153adb6878b6 - 3009b176cc5f9b1e416b1bf7c45b064b - 0c358e8357e3629de6982246ace629ea + 0d3fdcec3f5fde494dedb595387e8f21 + 71dce16848bc51503a154841ce99427b + df08eaa1ac3bc6c2356be4fbf8ec8932 + b5198ac730fc09e3d0297523b28289c4 b41f82994fa056ffa5f8e6d99570e27a b30ba2b5562558d510fdd09d626d0faa 64826fcf48816b13090042eefddbaa58 2c48d9feffb909df35b552f9c5c555d5 + 6e335a517c68488941340ee1c23f97b0 #c8552d030494443218d88792f4dbbd0f ) @@ -64,7 +70,6 @@ prepare() { fi patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname - patch -Np1 -i $srcdir/xulrunner-copy-stub.patch # small fix patch -Np1 -i $srcdir/libre.patch # Remove Google+Mozilla stuff #patch -Np1 -i $srcdir/cairo.patch # fix cairo @@ -100,9 +105,17 @@ prepare() { # WebRTC build tries to execute "python" and expects Python 2 ln -s /usr/bin/python2 "$srcdir/path/python" + # Use gold, as Mozilla can use some of its features, such as safe ICF + #ln -s /usr/bin/ld.gold "$srcdir/path/ld" + # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + + # Fix tab loading icon (flickers with libpng 1.6) + # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 + cp "$srcdir/icecat-20.0.1-fixed-loading-icon.png" \ + browser/themes/linux/tabbrowser/loading.png } build() { @@ -111,19 +124,27 @@ build() { export PATH="$srcdir/path:$PATH" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" export PYTHON="/usr/bin/python2" - export MOZ_MAKE_FLAGS="$MAKEFLAGS" - unset MAKEFLAGS - - if $_pgo; then - # Enable PGO - export DISPLAY=:99 - Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - _fail=0 - make -f client.mk build MOZ_PGO=1 || _fail=1 + if [[ $CARCH == i686 ]]; then + # Work around memory address space exhaustion during linking on i686 + LDFLAGS+=' -Wl,--no-keep-memory' + fi - kill $! || true - return $_fail + if $_pgo; then + if [[ $CARCH != i686 ]]; then + # Set up PGO + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + + if ! make -f client.mk build MOZ_PGO=1; then + kill $! + return 1 + fi + + kill $! || true + else + make -f client.mk build + fi else make -f client.mk build fi @@ -133,7 +154,7 @@ package() { cd $srcdir/gnuzilla-build make -j1 -f client.mk DESTDIR=$pkgdir install - install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/defaults/preferences/vendor.js" + install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" brandingdir=browser/branding/unofficial icondir=$pkgdir/usr/share/icons/hicolor @@ -145,11 +166,13 @@ package() { install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop done - rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation,searchplugins,plugins} + rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation} ln -sf /usr/share/hunspell $pkgdir/usr/lib/$pkgname/dictionaries ln -sf /usr/share/hyphen $pkgdir/usr/lib/$pkgname/hyphenation - ln -sf /usr/lib/mozilla/plugins $pkgdir/usr/lib/$pkgname/plugins - ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/searchplugins + + rm -rf $pkgdir/usr/lib/$pkgname/{searchplugins,plugins} + ln -sf /usr/lib/mozilla/plugins $pkgdir/usr/lib/$pkgname/browser/plugins + ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/browser/searchplugins # We don't want the development stuff rm -rf $pkgdir/usr/{include,lib/$pkgname-devel,share/idl} |