Merge branch 'master' of ssh://gparabola/abslibre-mips64el

Conflicts:
	core/glibc/PKGBUILD

1 files changed, 17 insertions, 13 deletions

diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD
index c0febff7c..9ade92f8b 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
 
@@ -13,8 +20,9 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=2.1
 
+if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
 if $_pgo; then
   pkgname+='-pgo'
 fi
@@ -48,10 +56,10 @@ makedepends=(
   'librsvg'
   'libxslt'
   'mesa'
-  'p7zip-libre'
   'pkg-config'
   'python2'
   'quilt'
+  'unzip'
   'wireless_tools'
   'yasm'
   'zip'
@@ -74,9 +82,8 @@ 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")
+  provides+=("$_pkgname=$pkgver")
   conflicts+=("$_pkgname")
 fi
 
@@ -98,13 +105,10 @@ build() {
   cd "${srcdir}"
   dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
 
-  # This will make life more sane
-  cd "${srcdir}"
-  ln -s "${_debname}-${_debver}" "${_pkgname}-${pkgver}"
-
   msg2 "Starting normal build..."
-  cd "$srcdir/$_pkgname-$pkgver"
-  
+  mv "${_debname}-${_debver}" "$srcdir/mozilla-build"
+  cd "$srcdir/mozilla-build"
+
   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
@@ -132,7 +136,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/mozilla-build"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
   install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref"