From 867dbcc116fbed767fa4262aedf445546bb11d06 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 12 Jan 2013 16:47:23 -0500 Subject: libre/{icecat,iceweasel-libre}: clean up a bit * don't duplicate the mis64el fix in iceweasel * clean up whitespace and quoting * re-order a few things * don't give geticeweasel.org as iceweasel's url * don't symlink /usr/lib/mozilla/plugins to /usr/lib/$pkgbase/plugins * more elegant version of debfile() for iceweasel. * drop i586 from arch=(), ours has changed too greatly --- libre/icecat/PKGBUILD | 40 +++++++++++++++++--------- libre/iceweasel-libre/PKGBUILD | 64 ++++++++++++++++++------------------------ 2 files changed, 54 insertions(+), 50 deletions(-) diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index c94062713..2cb4f355f 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -17,12 +17,24 @@ # 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' +# Version Configuration ############################################## + _pgo=false + pkgname=icecat pkgver=17.0.1 pkgrel=1 + +###################################################################### + if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi -pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!' +if $_pgo; then pkgname+='-pgo'; fi +if [ "$pkgbase" != "$pkgname" ]; then + provides+=("$pkgbase=$pkgver") + conflicts+=("$pkgbase") +fi + +pkgdesc="The GNUzilla web browser, based on Mozilla Firefox." arch=( 'i686' 'mips64el' @@ -66,12 +78,12 @@ makedepends=( 'wireless_tools' 'zip' ) -optdepends=('wireless_tools: Location detection via available WiFi networks') +[[ $CARCH != mips64el ]] && makedepends+=('yasm') if $_pgo; then - makedepends+=(xorg-server-xvfb) - options=(!ccache) + makedepends+=('xorg-server-xvfb') + options+=(!ccache) fi -options=(!emptydirs) +optdepends=('wireless_tools: Location detection via available WiFi networks') url=http://www.gnu.org/software/gnuzilla/ install=$pkgname.install source=( @@ -105,7 +117,7 @@ build() { cp ../mozconfig .mozconfig if $_pgo; then - cat $srcdir/mozconfig.pgo >> .mozconfig + cat ../mozconfig.pgo >> .mozconfig fi patch -Np1 -i ../$pkgname-install-dir.patch patch -Np1 -i ../xulrunner-copy-stub.patc @@ -121,7 +133,7 @@ build() { browser/base/Makefile.in # This is a bug, we should fix it. - if [ $CARCH = mips64el ]; then + if [[ $CARCH == mips64el ]]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ js/src/assembler/wtf/Platform.h @@ -147,8 +159,8 @@ build() { Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & fi - _fail=0 - make -f client.mk build || _fail=1 + _fail=0 + make -f client.mk build || _fail=1 if $_pgo; then kill $! || true @@ -172,10 +184,12 @@ package() { install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop done - rm -rf "$pkgdir/usr/lib/$pkgbase/"{dictionaries,hyphenation,searchplugins,plugins} - ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries" - ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation" - ln -s /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$pkgbase/plugins" + # Use system-provided dictionaries + rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation} + ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries" + ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation" + # use mozilla-searchplugins + rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins" # We don't want the development stuff diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 01be6223d..a3e2363f0 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,28 +14,33 @@ # Contributor: evr # Contributor: Muhammad 'MJ' Jassim +# Version Configuration ############################################## + _pgo=false -# We're getting this from Debian Experimental _debname=iceweasel _debver=17.0.1 _debrel=1 -_debrepo=http://ftp.debian.org/debian/pool/main/ -debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } +_debrepo=http://ftp.debian.org/debian/pool/main pkgbase=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} pkgrel=4 +###################################################################### + +debfile() { echo "${_debrepo}/${1:0:1}/${1%_*}/${1}"; } + if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi -if $_pgo; then - pkgname+='-pgo' +if $_pgo; then pkgname+='-pgo'; fi +if [ "$pkgbase" != "$pkgname" ]; then + provides+=("$pkgbase=$pkgver") + conflicts+=("$pkgbase") fi -pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox." +pkgdesc="A libre version of Debian Iceweasel, the web browser based on Mozilla Firefox." arch=( - 'i586' 'i686' 'mips64el' 'x86_64' @@ -79,17 +84,16 @@ makedepends=( 'wireless_tools' 'zip' ) -[ "$CARCH" != "mips64el" ] && makedepends+=('yasm') +[[ $CARCH != mips64el ]] && makedepends+=('yasm') if $_pgo; then makedepends+=('xorg-server-xvfb') - options=(!ccache) + options+=(!ccache) fi - optdepends=('wireless_tools: Location detection via available WiFi networks') -url="http://www.geticeweasel.org/" +url="http://packages.debian.org/source/experimental/$_debname" install=iceweasel.install -source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" +source=($(debfile ${_debname}_${_debver}.orig.tar.bz2) + $(debfile ${_debname}_${_debver}-${_debrel}.debian.tar.gz) mozconfig mozconfig.pgo xulrunner-copy-stub.patch @@ -109,11 +113,6 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' '52e52f840a49eb1d14be1c0065b03a93' '65f68090d2a69b467bd2707d0c4ea3bd') -if [ "$pkgbase" != "$pkgname" ]; then - provides+=("$pkgbase=$pkgver") - conflicts+=("$pkgbase") -fi - build() { export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' @@ -132,7 +131,7 @@ build() { cp ../mozconfig .mozconfig if $_pgo; then - cat "$srcdir/mozconfig.pgo" >> .mozconfig + cat ../mozconfig.pgo >> .mozconfig fi patch -Np1 -i ../Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -141,23 +140,12 @@ build() { patch -Np1 -i ../libre.patch patch -Np1 -i ../shared-libs.patch -# From js on abslibre-mips64el.git - if [ "$CARCH" = "mips64el" ]; then - msg "Force disabling JIT." - sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ - js/src/assembler/wtf/Platform.h - sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.{in,ref} - - echo "ac_add_options --disable-methodjit" >> .mozconfig - echo "ac_add_options --disable-tracejit" >> .mozconfig - fi - # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in # This is a bug, we should fix it. - if [ $CARCH = mips64el ]; then + if [[ $CARCH == mips64el ]]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ js/src/assembler/wtf/Platform.h @@ -181,8 +169,8 @@ build() { Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & fi - _fail=0 - make -f client.mk build || _fail=1 + _fail=0 + make -f client.mk build || _fail=1 if $_pgo; then kill $! || true @@ -209,10 +197,12 @@ package() { install -Dm644 debian/iceweasel.desktop \ "$pkgdir/usr/share/applications/$pkgbase.desktop" - rm -rf "$pkgdir/usr/lib/$pkgbase/"{dictionaries,hyphenation,searchplugins,plugins} - ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries" - ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation" - ln -s /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$pkgbase/plugins" + # Use system-provided dictionaries + rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation} + ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries" + ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation" + # use mozilla-searchplugins + rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins" # We don't want the development stuff -- cgit v1.2.3-54-g00ecf