Merge branch 'master' of ssh://gparabola/srv/git/abslibre

1 files changed, 31 insertions, 43 deletions

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 63519ceb9..7532436d7 100644..100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -3,6 +3,8 @@
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
@@ -10,10 +12,10 @@
 
 _pgo=false
 
-# We're getting this from Debian Sid
+# We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=12.0
-_debrel=7
+_debver=16.0.2
+_debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -42,67 +44,56 @@ 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
         libre.patch
         iceweasel-install-dir.patch
-        region.properties
-        vendor.js)
-md5sums=('b45f57bfe21b0e6db4f0683e794917cb'
-         '08aa0a949d9cbb26116490f7878a62fe'
-         'd7ad1c025d2442427a06cc702906ef0d'
+        vendor.js
+        shared-libs.patch
+        Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
+md5sums=('4a4f19048e34f7f0a2d28adc351df1ed'
+         'ee38477dd7ede1c32e559ee74139b5c9'
          'eab149c1994ab14392e55af3abb08e80'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
-         '64be2fab525189c285ee04495d628035'
-         'e529742c0a425648087bc3ce537fe4c5'
-         'f1c76e7e244257856a386ca2de69bdf0'
-         '0d053487907de4376d67d8f499c5502b')
+         '8768dfc39e9f1057c2956bf4405ae58e'
+         'abf5ecb74caa857abb42bcfbb3442d9c'
+         '0d053487907de4376d67d8f499c5502b'
+         '52e52f840a49eb1d14be1c0065b03a93'
+         '0a31239f1008038df5057982fe745dec')
 
 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
 
-  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
+  # 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
 
-  msg2 "Starting normal build..."
-  mv "${_debname}-${_debver}" "$srcdir/mozilla-build"
-  cd "$srcdir/mozilla-build"
+  quilt push -a
 
-  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"
-fi
-
-  cd "$srcdir/mozilla-build"
-  cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
+  patch -Np1 -i "$srcdir/shared-libs.patch"
 
+  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+  
   if $_pgo; then
     cat "$srcdir/mozconfig.pgo" >> .mozconfig
   fi
@@ -136,9 +127,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"
@@ -149,10 +137,10 @@ 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"
+  install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js"
 
   # I don't even know why we're hitting the objdir, and ConnOS didn't.
   _brandingdir=debian/branding