diff options
| -rw-r--r-- | mozilla-testing/icecat/PKGBUILD | 76 | ||||
| -rw-r--r-- | mozilla-testing/icecat/mozconfig | 9 | ||||
| -rw-r--r-- | mozilla-testing/icecat/mozconfig.pgo | 4 | ||||
| -rw-r--r-- | mozilla-testing/iceweasel-libre/PKGBUILD | 15 |
4 files changed, 66 insertions, 38 deletions
diff --git a/mozilla-testing/icecat/PKGBUILD b/mozilla-testing/icecat/PKGBUILD index b2b5eadef..2261f8f53 100644 --- a/mozilla-testing/icecat/PKGBUILD +++ b/mozilla-testing/icecat/PKGBUILD @@ -1,3 +1,4 @@ +# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org> # Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: Figue <ffigue at gmail> # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> @@ -10,12 +11,20 @@ # If you are updating this package, don't forget to update the version number in # the value for 'browser.dictionaries.download.url' in 'libre.patch' -pkgname=icecat +_pgo=false + +_pkgname=icecat pkgver=9.0.1 pkgrel=2 + +if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi +if $_pgo; then + pkgname+='-pgo' +fi + pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!" arch=('i686' 'x86_64' 'mips64el') -license=('MPL' 'GPL' 'LGPL') +license=('GPL2' 'MPL' 'LGPL') depends=( 'alsa-lib' 'dbus-glib' @@ -43,81 +52,92 @@ makedepends=( 'pkg-config' 'python2' 'wireless_tools' - 'xorg-server-xvfb' 'yasm' 'zip' ) +if $_pgo; then + makedepends+=('xorg-server-xvfb') + options=(!ccache) +fi + url="http://www.gnu.org/software/gnuzilla/" install=icecat.install source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz mozconfig + mozconfig.pgo icecat.desktop icecat-safe.desktop libre.patch firefox-install-dir.patch vendor.js) +if [ "$_pkgname" != "$pkgname" ]; then + provides+=("$_pkgname") + conflicts+=("$_pkgname") +fi + build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff + if $_pgo; then + cat "$srcdir/mozconfig.pgo" >> .mozconfig + fi + # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" - LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & - LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" - kill $! || true + if $_pgo; then + LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & + LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" + kill $! || true + else + LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" + fi } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" make -j1 -f client.mk DESTDIR="$pkgdir" install - install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$pkgname/defaults/pref" + install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref" brandingdir="browser/branding/unofficial" + icondir="$pkgdir/usr/share/icons/hicolor" for i in 16x16 32x32 48x48; do - install -Dm644 "$brandingdir/default${i/x*/}.png" "$pkgdir/usr/share/icons/hicolor/$i/apps/$pkgname.png" + install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png" done install -d "$pkgdir/usr/share/applications" install -m644 "$srcdir/icecat.desktop" "$pkgdir/usr/share/applications" install -m644 "$srcdir/icecat-safe.desktop" "$pkgdir/usr/share/applications" - rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation,searchplugins,plugins} - 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/"{dictionaries,hyphenation,searchplugins,plugins} + 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" # We don't want the development stuff - rm -rf "$pkgdir"/usr/{include,lib/$pkgname-devel,share/idl} + rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} # Fix a bug with https-everywhere (duplicate rules) rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD" # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin" + ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin" } md5sums=('a135581da2fd2845f268d7ca91054c06' - '9c0cd5b45a3c4b04b872b6a900f62286' - '0e5057d9427c6cd5e2f3b78fe34f50d9' - '44959606e4a704e68a913e73fc941926' - 'e81ad01dbc16ba28bf92ba4b7c309ca7' - 'd93fe402b87cd000a869e1fd6badc6c9' - '07e65752416e615fe04ce586bc58f86b' - '1e4bcac59e93d21fffa6a1d1ad235247' - '0d053487907de4376d67d8f499c5502b') -md5sums=('a135581da2fd2845f268d7ca91054c06' - '9c0cd5b45a3c4b04b872b6a900f62286' + '6f3a8fd65c416216a1b56b0c2d2d81aa' + 'ac29b01c189f20abae2f3eef1618ffc0' 'e81ad01dbc16ba28bf92ba4b7c309ca7' 'd93fe402b87cd000a869e1fd6badc6c9' '07e65752416e615fe04ce586bc58f86b' diff --git a/mozilla-testing/icecat/mozconfig b/mozilla-testing/icecat/mozconfig index c1305ac60..b769079d8 100644 --- a/mozilla-testing/icecat/mozconfig +++ b/mozilla-testing/icecat/mozconfig @@ -33,14 +33,9 @@ ac_add_options --disable-installer # Optimization ac_add_options --enable-optimize -# PGO -ac_add_options --enable-profile-guided-optimization -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' -mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' - export MOZILLA_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir # IceCat export MOZ_PHOENIX=1 @@ -55,3 +50,5 @@ ac_add_options --with-user-appdir=.gnuzilla ac_add_options --disable-safe-browsing export BUILD_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 + +# Build-generated diff --git a/mozilla-testing/icecat/mozconfig.pgo b/mozilla-testing/icecat/mozconfig.pgo new file mode 100644 index 000000000..b0c249ebf --- /dev/null +++ b/mozilla-testing/icecat/mozconfig.pgo @@ -0,0 +1,4 @@ +# PGO +ac_add_options --enable-profile-guided-optimization +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD index c0febff7c..d848ef1df 100644 --- a/mozilla-testing/iceweasel-libre/PKGBUILD +++ b/mozilla-testing/iceweasel-libre/PKGBUILD @@ -1,5 +1,12 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Henry Jensen <hjensen@connochaetos.org> +# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org> +# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: Figue <ffigue at gmail> +# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> +# Contributor (Parabola): vando <facundo@esdebian.org> +# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> +# Thank you very much to the older contributors: +# Contributor: evr <evanroman at gmail> +# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> _pgo=false @@ -15,6 +22,7 @@ pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} pkgrel=2 +if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then pkgname+='-pgo' fi @@ -74,7 +82,6 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" region.properties vendor.js) -if [ -z "$_pkgname" ]; then _pkgname=$pkgname; fi if [ "$_pkgname" != "$pkgname" ]; then provides+=("$_pkgname") conflicts+=("$_pkgname") @@ -104,7 +111,7 @@ build() { msg2 "Starting normal build..." cd "$srcdir/$_pkgname-$pkgver" - + cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix |