1 files changed, 10 insertions, 37 deletions
diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD
index f601af07a..c630fbb35 100644
--- a/mozilla-testing/iceweasel-libre/PKGBUILD
+++ b/mozilla-testing/iceweasel-libre/PKGBUILD
@@ -30,40 +30,8 @@ fi
 pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox."
 arch=('i586' 'i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
-depends=(
-  'alsa-lib'
-  'dbus-glib'
-  'desktop-file-utils'
-  'gtk2'
-  'hicolor-icon-theme'
-  'hunspell'
-  'libevent'
-  'libnotify'
-  'libvpx'
-  'libxt'
-  'mime-types'
-  'mozilla-common'
-  'mozilla-searchplugins'
-  'nss>=3.13.1'
-  'sqlite3'
-  'startup-notification'
-)
-makedepends=(
-  'autoconf2.13'
-  'diffutils'
-  'imagemagick'
-  'libidl2'
-  'librsvg'
-  'libxslt'
-  'mesa'
-  'pkg-config'
-  'python2'
-  'quilt'
-  'unzip'
-  'wireless_tools'
-  'yasm'
-  'zip'
-)
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.13.1' 'sqlite3' 'startup-notification')
+makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'wireless_tools' 'yasm' 'zip')
 if $_pgo; then
   makedepends+=('xorg-server-xvfb')
   options=(!ccache)
@@ -87,7 +55,7 @@ md5sums=('bc86bf0d74649f9b3fcde6dfa914141e'
          'eab149c1994ab14392e55af3abb08e80'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
-         '3c1a7d6984b47a0ab36a5d8e6672cb2b'
+         '24fb7dba021ef94a351ebd3750cc0451'
          'e529742c0a425648087bc3ce537fe4c5'
          'f1c76e7e244257856a386ca2de69bdf0'
          '0d053487907de4376d67d8f499c5502b')
@@ -106,14 +74,17 @@ dpkg-source() {
   mv debian "${_debname}-${_debver}"
   cd "${_debname}-${_debver}"
 
+# Doesn't apply and seems unimportant
   rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
 
-  quilt push -af
+  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
@@ -126,6 +97,9 @@ build() {
   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/
 
   if $_pgo; then
@@ -180,4 +154,3 @@ package() {
   # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
   ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
 }
-