updating iceweasel-libre package

1 files changed, 16 insertions, 38 deletions

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index b4e914356..7962c8148 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -4,6 +4,7 @@
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
 # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
@@ -21,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=3
+pkgrel=4
 
 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
 if $_pgo; then
@@ -43,7 +44,6 @@ url="http://www.geticeweasel.org/"
 install=iceweasel.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc"
         mozconfig
         mozconfig.pgo
         xulrunner-copy-stub.patch
@@ -53,63 +53,44 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
 md5sums=('e440446bb92dc1c0311346c68024590b'
          'cb8bfb543002a5d78db7e8661f9f87ec'
-         'a9848e41461776bc4bf8d2de824b1204'
          'eab149c1994ab14392e55af3abb08e80'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
-         'e87d5decbb4dc0013beceaa61acfc7a1'
+         '54bd934ac23839601c7d23a60fbefe6a'
          'e529742c0a425648087bc3ce537fe4c5'
          '0d053487907de4376d67d8f499c5502b'
-         '41ce105f0c1877fe22e0c0ec45e09565')
+         'efda47526ba76ef926b236bf2cda2456')
 
 if [ "$_pkgname" != "$pkgname" ]; then
   provides+=("$_pkgname=$pkgver")
   conflicts+=("$_pkgname")
 fi
 
-dpkg-source() {
-  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+build() {
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
-  mv mozilla-release "${_debname}-${_debver}"
-  mv debian "${_debname}-${_debver}"
-  cd "${_debname}-${_debver}"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
+  export PYTHON="/usr/bin/python2"
+  export DEBIAN_BUILD="mozilla-release"
+  mv debian "${srcdir}/${DEBIAN_BUILD}"
+  cd "${srcdir}/${DEBIAN_BUILD}"
 
-# Doesn't apply and seems unimportant
+  # Doesn't apply and seems unimportant
   rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
 
-# This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it
+  # This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it
   rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
 
   quilt push -a
-  find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
-  cd ..
-}
 
-build() {
-# Don't run this if we're using -e
-if [ $NOEXTRACT -eq 0 ]; then
-  msg2 "Applying Debian patches..."
-  cd "${srcdir}"
-  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
-
-  msg2 "Starting normal build..."
-  mv "${_debname}-${_debver}" "$srcdir/mozilla-build"
-  cd "$srcdir/mozilla-build"
-
-  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+  patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
   patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
   patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix
   patch -Np1 -i "$srcdir/libre.patch"
 
-# Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
-  patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch"
-
-fi
-
-  cd "$srcdir/mozilla-build"
-
+  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+  
   if $_pgo; then
     cat "$srcdir/mozconfig.pgo" >> .mozconfig
   fi
@@ -132,9 +113,6 @@ fi
       echo 'ac_add_options --disable-jemalloc' >> .mozconfig
   fi
 
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
-  export PYTHON="/usr/bin/python2"
-
   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"
@@ -145,7 +123,7 @@ fi
 }
 
 package() {
-  cd "$srcdir/mozilla-build"
+  cd "${srcdir}/${DEBIAN_BUILD}"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
   install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref"