Sun Jan 20 00:52:22 PST 2013

8 files changed, 195 insertions, 158 deletions

diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
index 1170df1d5..be0a6dd07 100644
--- a/libre/iceape-l10n/PKGBUILD
+++ b/libre/iceape-l10n/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
@@ -11,7 +11,7 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceape
-_debver=2.7.11
+_debver=2.7.12
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,6 @@ pkgbase=iceape-l10n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=2.7.11
 pkgver=${_debver}.${_debrel}
 pkgrel=1
 
@@ -31,13 +30,15 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/source/sid/iceape"
 license=('MPL')
 depends=("iceape-libre>=$pkgver")
-  
-source=()
+makedepends=('unzip' 'zip')
+source=('region.properties')
 for lang in ${_langpacks[@]}
 do
     source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
 done
 
+_path="/usr/lib/iceape/extensions"
+
 build() {
   cd "${srcdir}"
   for f in *.deb
@@ -45,10 +46,21 @@ build() {
       bsdtar xf $f
       bsdtar xf data.tar.gz
   done
-}
 
-_path="/usr/lib/iceape/extensions"
+  cd $srcdir/$_path
 
+  for i in ${_langpacks[@]}
+  do
+    cd $srcdir/$_path
+    unzip -q langpack-$i@iceape.mozilla.org.xpi -d $i
+    rm langpack-$i@iceape.mozilla.org.xpi
+    install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
+    cd $i
+    zip -q -r $srcdir/$_path/langpack-$i@iceape.mozilla.org.xpi .
+  done
+
+  cd $srcdir
+}
 
 for lang in ${_langpacks[@]}
 do
@@ -62,26 +74,27 @@ package_iceape-l10n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('fb27360aff6250e7d483803583a5cd78'
-         '236c7aacd7e6416a37aff95f7bfa6a80'
-         'f17d76128ab529415078cafe63b61d50'
-         '07a5c72158427db8c5a990be6eb2d036'
-         'fddbcf27d00f1f4d92fed197ace8dd1b'
-         '96eb3291200c44ffdc3ab1d1446f00b7'
-         '04dec3bee388ae66cd434342ab03074f'
-         'bdef8b38501e7d6805b5304ef2bf8425'
-         '90b5d0ab0ab2eb3b75e5f80cb6d289bb'
-         '97f940c39b84a90b0e16eaeca4fa7806'
-         '34644b44381ae1da46f2fa308fd1cf34'
-         'a6240664344798568276dd5dbdd27fb2'
-         '61aedef6a89b400584dde82b5e97ff0f'
-         'abe7a9172876b30c4677b1f4c2237fc9'
-         '60f3c543fbdb72cc12aef8f2369101ff'
-         'c002da281c0d0fa357f92edd2b8cd12c'
-         'c17ab30f25f05024879afdf85fa4c516'
-         '250a08a999d6d1d6086ffbd17d60fbb4'
-         '609ce8793ea0d5465da7195e4d956fef'
-         '060226599bac5bc8ddb64417ef1a0108'
-         'eaa827909690bfa8dfdc621164e23ca8'
-         '3fb66893b5ea3b959de48ef16fb26c74'
-         '6f2d77e767efa0b0d4cb56df9ccd0a2f')
+md5sums=('428246ef3fb64103ff2cf5eaae2a92ca'
+         '22a14a6a2f03d0004a1fa990892094ef'
+         'af2379ea50672fe37ff8550d5c9e20a0'
+         'e5975c3b1ffaa5fcb3f5203cdfe8e0fb'
+         '21fcbd011acc382f5ec7a32aa04562ef'
+         '8fbf821c811c55514a100ae5d5e9e844'
+         'bd8f18e0d0f233e0a1c1a518537798a5'
+         '037cbb6fe0576f7f5bbbf956928f01e1'
+         '56964b577fcb077a9b81d07c59cc5af3'
+         'd2fb622717114a921efb37f028f31c6c'
+         '6abe2dbab7fcbdaf43e77290ca6853c9'
+         '558a2d29be749f6506f774703c58952f'
+         '7abdc6eb4154b88509a6c4f119c943a7'
+         '5a4fad9c23c8d19833ac5c76ad9aca4a'
+         '8d45110acc90f388923f01fb9cfca947'
+         'd1acbe2ef1120e70d5365476aa8679f9'
+         '604de00ea6ee06565212804b0d499df3'
+         'ceee78a29bd2f947558f04489ee50f54'
+         'afc6e343f0635a3ee5b7a22af947e8b8'
+         '455bab7a596cb43ac4ad80cb89a78b25'
+         '92a985b40aec8b3726ba22f45667994d'
+         'bc8c98f0518617ed2220fb3bfb03e165'
+         '449c91720751538f09ad3d555dbe2fce'
+         '8843be8937963d094d4272ac33019082')
diff --git a/libre/iceape-l10n/region.properties b/libre/iceape-l10n/region.properties
new file mode 100644
index 000000000..4399d8db7
--- /dev/null
+++ b/libre/iceape-l10n/region.properties
@@ -0,0 +1,32 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Default search engine
+browser.search.defaultenginename=DuckDuckGo HTML
+
+# Search engine order (order displayed in the search bar dropdown)s
+browser.search.order.1=DuckDuckGo HTML
+browser.search.order.2=DuckDuckGo Lite
+browser.search.order.3=Seeks Search
+
+# URL for site-specific search engines
+# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
+# to be searched and the user's search query. Place them in the appropriate location
+# for your locale's URL but do not translate them.
+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
+
+# increment this number when anything gets changed in the list below.  This will
+# cause Firefox to re-read these prefs and inject any new handlers into the 
+# profile database.  Note that "new" is defined as "has a different URL"; this
+# means that it's not possible to update the name of existing handler, so 
+# don't make any spelling errors here.
+gecko.handlerService.defaultHandlersVersion=3
+
+# The default set of protocol handlers for irc:
+gecko.handlerService.schemes.irc.0.name=Freenode
+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+
+# The default set of protocol handlers for ircs:
+gecko.handlerService.schemes.ircs.0.name=Freenode
+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 2595a36f9..c46631628 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Sid
 _debname=iceape
-_debver=2.7.11
+_debver=2.7.12
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,9 +11,9 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=1
 pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey."
-arch=('i586' 'i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
 makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-ply' 'librsvg' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
@@ -29,13 +29,13 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         ${_pkgname}-2.0-lang.patch
         clrf.patch
         libre.patch)
-md5sums=('40473b4c662975eda865e1fc35c4953b'
-         'f704b69cc0328c83edd6223420fbd412'
+md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908'
+         '1fb9c4affad5f030c4e3544aadeaeea2'
          '60ba9e8f2fafd20e41268af534a55ea7'
          '7266333e31731af8bb50c2eca8d0bd26'
          '25b6fe16ac24cd5c852213e5c1adb272'
          'c395d443a8c4c16880c7322bcf174743'
-         'ebe66195898c89644138ffc88ba26a24')
+         '3e0a275b57e5ccfeb7573e716693441a')
 
 build() {
   export QUILT_PATCHES=debian/patches
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
index 6273a05a9..e316dbf4c 100644
--- a/libre/iceape-libre/libre.patch
+++ b/libre/iceape-libre/libre.patch
@@ -47,13 +47,13 @@
 -gecko.handlerService.schemes.irc.0.name=Mibbit
 -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
 +gecko.handlerService.schemes.irc.0.name=Freenode
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
  
  # The default set of protocol handlers for ircs:
 -gecko.handlerService.schemes.ircs.0.name=Mibbit
 -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
 +gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
 --- comm-release.orig/mozilla/modules/libpref/src/init/all.js	2012-03-16 04:46:09.000000000 -0300
 +++ comm-release/mozilla/modules/libpref/src/init/all.js	2012-05-12 04:03:52.163831535 -0300
 @@ -47,7 +47,7 @@
diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD
index 7ee93cf06..197e3e236 100644
--- a/libre/icecat-l10n/PKGBUILD
+++ b/libre/icecat-l10n/PKGBUILD
@@ -1,9 +1,8 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
-# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
-
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
 # Based on firefox-i18n package
 
 # When updating to a newer upstream release:
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index b2b937601..8e0172208 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
-# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
@@ -11,7 +11,7 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=18.0
+_debver=18.0.1
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,9 +22,8 @@ pkgbase=iceweasel-l10n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=18.0
 pkgver=$_debver.$_debrel
-pkgrel=5
+pkgrel=1
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
@@ -76,91 +75,91 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
 done
 
 md5sums=('428246ef3fb64103ff2cf5eaae2a92ca'
-         '08556c8d27a4313b5e67e655d2e1e828'
-         '9fa01f43db09b12cd724f94c28883a9e'
-         '0d1ef852709fcae1842105d675c22312'
-         '56247c867b52a19808ca72f7fceb349a'
-         'dd670bcc609c06139671bf953f26d7b8'
-         'df233884b68c8f37ff9b757b6480ae94'
-         'd2aa803c6e1d1ebbaf9d4f6ad73f2aa8'
-         'd0f512e8bf97110a60b16de59b15869b'
-         '54045555373497393ded8bccc0dc1784'
-         '61cb757a64268141518ed9dad4795106'
-         '62f338f7bcd7fb50ef2f61936c0e4990'
-         '97b2c6a0de5d60b4e5696973aedd3cfc'
-         'd916a0b470264a9271509ed7a109e360'
-         '6f442a2989b814f20f4b73975bc97a5c'
-         '6117d8d24dad056f143feb3e061702dd'
-         'c759f731a415f99a73e20090f4893184'
-         'b481b08da143ff45a84d32285249fcfd'
-         '828f9a5b69634b39d48bfdf472a957bd'
-         '12d4b6779cb50777303381d35f539c4c'
-         '8609fd343e1e91724f50d6833d3e2f82'
-         '331acfbad62badfd48713d9b461efcf3'
-         '49216a2ea50fcd01057bd7b0d14a78e2'
-         'b0738cf3f5ce546134150e082cffaf61'
-         '9f03cd24990c897e75594229517c1e9a'
-         '5667260492203f29bba1b2732ce20b77'
-         'a1dd5872ab73a1a14ce3e285138445da'
-         '03e82d09ba4026ab10df5cfc3b78ca5f'
-         '1e92e7b3725cdfa94fc705ab54c7c6aa'
-         '35d9a0ccfa3c95a3a56f29c7a5bc4e6b'
-         '656dbfb6ac9efbeb4e58b5b9fc5fda03'
-         '29a343077a3de07ce9bb3e4d24d6a11a'
-         '831e09a24d4d40cb1bb45f980b7fa251'
-         '8488c98293d6f16caf99cf556f999611'
-         '92b07db5dcb8fc95ac8f5706b94d7ed5'
-         'fa9ee1b85adbd15c46ca075d94e62a14'
-         '19383d5cb3ed6de8599118dd9f54889e'
-         'fdff305ce5b154b12907fa302419548c'
-         '24df7d71f1a70e8225e80d15a53d3777'
-         '793bfd1301c4e989e2f904ad9f6b3adc'
-         '06d4e4423df0908254e422d207292858'
-         'd53dce3f9b3a5de374dd6c10ebe3665c'
-         '382e5237a81fbbbaab499c5c6646b308'
-         '1da9f5ce8cbd3bdcc46f932b7458574f'
-         'd635c40c88a7430a2103c13cdf1b58d3'
-         'd1eac26314ade41883b24b91cd9e01c6'
-         '6e65dd6b8cb0fbd4395e548926043e70'
-         '97e8c9b3db047651a38f29366867c92e'
-         '87433742c0b21c7655988d5586667d77'
-         'ac5cab1c45e0accf718cf624c8545dea'
-         'd3f2ff9a817dff71fa05ffe5f3f45db8'
-         'd1909b644b4495343b6d041c15683ad2'
-         '5c79b17dd9d0d83f749f52d489b347a7'
-         '433f0456e52420955a3689d2b18b7a94'
-         '90ee54b793a100b74f1b91ca2acb103b'
-         '0544d0e7e26a0c07379f0c6ca22708d8'
-         'c75d55a574f525f5f08574cb01a2ee20'
-         'b43589a4b08112996c756db467015eab'
-         '82782fd09a815441622187ed8839b0ee'
-         '52de8e6386f0232d13c6768092089c23'
-         '091e065f1723fa7fa7701ced828e24ed'
-         'a036b50e5915e5b37257fa048e8d7a60'
-         '1037213a49539a069b9e223dacfbdc94'
-         '251b43c207b4fb0842a913e658f868c3'
-         '1aac06560c3a0957087eab1d2034eba3'
-         '964b3edfd3221d8e412ef695bd9a7b00'
-         '45a900da3f1cc4834b32b190c67c42af'
-         'cad9df2808fd8f009d27142a729f21d6'
-         '192eaff8883db984c42ee43e3a5303f4'
-         '1000e395379bc6ef3b9c2c891f615e44'
-         '1da3d8777bc0595dea09fdd7222b55f3'
-         '0fbdd7294e21936ae75aca56d4d7252c'
-         'af481ef78e4ffe7b4cbf892c5cb10cc2'
-         'fc884a9a8203c56196993f6ed65069ca'
-         '1bebdd6e194cbb746f81725e317eb9b4'
-         '4c75d146f27aa2a70b0219954baa8965'
-         'd832ceafecac23a0659f7a766f6d98de'
-         'ed056fa5b30ddf55042699713c629503'
-         '8e698f20270de2b2fbaf9c1f09257c06'
-         'e864caf42db46efbaa229f36af572ee4'
-         '013864da4a811e894ba1605e7f93e80e'
-         '69be7804b3d6a6bb5683554cbc324bed'
-         'efc6a8427f080706d7d590a7b0eacadd'
-         '40c41e04514e3cbcae33b15a062b3811'
-         '164850087cdf79d57569ee9d4e1a8d2d'
-         '226de7be23de61db7df718ef93f7c906'
-         'fb331d7fd4f1c853192111663e2672a0'
-         '5dd0a89e43aa0f263fc7c1d4302dbfd6'
-         '8e602db8304ddafad17fd8098125d37b')
+         '5bff9acef5bdfd10fff5e3f36ff7c8bc'
+         '5ada703cfdc40e32c5c145380e979e1a'
+         'e8b198ad4673ef12538f17e73529f9f8'
+         'ba77a8937f6d0bc84ad789950ef42c70'
+         'd940e1ccb7f501555500b17f5ea28e74'
+         '7325a84d999c3ea5f884cff15e1a4210'
+         'f35c32e53f07774efa39bec386aa35c6'
+         '2d2a628958c5ad0f66077ae1703f61ba'
+         '458c5cee205f12ced09f8baab1605e11'
+         '7271c461eb02608d193208c5da94280e'
+         'a505e69bf7cbb4caadcd5dfa67da1b78'
+         '0b0e10b39d115aedc1dfc0967068df95'
+         '09153faa23ca0a953aa22cc3989eba5e'
+         'da9779d4a64f1bbab1195c9801fb678c'
+         '1815468f85d1eea9f018a72bb83889d3'
+         '6103d52fb61b4bb7e921870ff05c98af'
+         'c3f0e46e2cfb68bf30363c92dcd9934d'
+         '5214d31f5cd5c077f09a0c275f936c25'
+         'ad4f664710dfa896b969f25b824d7086'
+         'ba2339dce1b84f0e7c0b77331572d6f5'
+         '28fb3e3e873cf5d03207e220eebf2ab0'
+         'a6f6ea487f6577ddf4cb2ef10ed5e401'
+         '8143ba212c6ef5f1dfc311ce84861450'
+         '5a6db78ee5cd6b41c02b7f65e666a045'
+         '63869ca68431ee4c7d3769f4ef8b68e1'
+         '5e87285fa518d1a95a7a63a2587497b7'
+         '969c213166c8ecd7cc752c557a1c056d'
+         '0c47f76ca2fb3d747be170fd61fa36cb'
+         '01f67291435616996e968f41259b91bd'
+         'f785b30e48ea4ee4af286325b020c545'
+         '58684c98cfc9d35d3d37f827268e72ac'
+         '2ec870106c72d0772f65f6a129547cb1'
+         '98d5cec52877790042830e8be41db1ca'
+         '654ee0ebb10cfbfe9b8b6540548f08e7'
+         '5a60a9cd96e0900a6cfbf37f7a68b715'
+         'e6e276eb4b8b7c1eb5a3593b07b9a84a'
+         '0c788fece8760fb61509c0fe1ac7eff4'
+         '98cba049bae024ae7dc7426f6adf09d2'
+         '2d37f79f57d38008e64c9a52a05c91a4'
+         'aeffb314945de717ef8a417653bcba3d'
+         '910b595a09b98f4eae1f4e6ddcae6ad5'
+         '9c5babdcd0ecbac8e487bed05cf5fe1a'
+         'f94018f378dcd11d8d63ebbd4a595ca1'
+         'bb4cc3cdb7995333babe6462d1aaef06'
+         '7a3d8e89625858fea797f33e7a426c25'
+         'd1fbf396db41d77da0b3f9f2528c8c96'
+         'cfa20a918d3adad42313fc2db86c63b8'
+         'fa213ce6abfa19a6067e64c149e90b27'
+         '8c2a0ec2e38504c6f4657d9f00c3b4f0'
+         '3ff17d0759b40c4d308b8f28b698dba1'
+         '2fc7cc5a0d2d0794c7f08156fd65619d'
+         'ed57c5f168e53cec827695ac4c18ec10'
+         'c8b05f70068e8a8255d8f28f3171df5f'
+         'adc1d1e78c6c42624b1e312be7dec90c'
+         '1f667156cd0b9e23effcbf8e26d01839'
+         'dd112d0dbbcc45b38036694e5c82a6aa'
+         'f37be06f19a3e6e60727466896bc6b65'
+         'ec947261ee12d58c1a9998ea8136f744'
+         'a3434e5da7b65559de7c4adcb14906d3'
+         'b8984e5ab770cd3f0fd70cbc33ba1150'
+         'a06634264be552d2e64189a761c7cc3c'
+         '417246fb8b66c806bdb903801f975627'
+         'b9e367b2d4f96ea111ae46c22801b0bf'
+         '0a245b319c1dc40ef95a24ca5b0fca9d'
+         '7a08d4e4d7a10f12a4d79fe96e2c1f51'
+         'f4d71f4e0a1794ccc25463cced9457d4'
+         '778089e056b6e8b1aaef1a4769153059'
+         'c3855b0c99342acddca0a7e6d9dc126f'
+         '9bbd6dbf2df859fcbbf366e753dfcdd6'
+         '338ea8d0681d2df2409a2398c3ae3694'
+         'e783a6e96d080413a60d1200fa0ac8a7'
+         'd1af3e947fc8a8aca39bec88aaeda708'
+         'e53c6a92a5533a706abb6abbe761508e'
+         '5d139a83f2b5e1625142f06a63147a28'
+         'd671a0fd8a4f8eb08d4b9ab52372d667'
+         'af9bf9f8a04dc898fad49083824fea6a'
+         '78184aa445a574ed6f57e926c7ab25c4'
+         '62f54d64f86204a45fc12557a4a76eb0'
+         '0ee43e97979aff7b7e2bb3d9e42a6e00'
+         '6fe3c2ed768593d942461f462fadd508'
+         '469ff3256c7322f15a71e0fd81e09f57'
+         '74bb076c39c409d9c795722d692561dc'
+         'fc439b2e9dfff5111d0fea9fdeef30de'
+         '546c8cac927262e9166e01f4634a22cb'
+         '1009936f51fad91899c6f0144040f174'
+         '700322fdfe534fa47579895c87a93808'
+         'fbdd5acbff2ef4d73665766d1f0cd815'
+         'b3cc9c95ce6146453c8929213b04d9fe')
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index 69fe5c072..f59454192 100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -67,7 +67,7 @@ index d7fec75..d531b83 100644
  component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js

  contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}

 diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js

-index a6598fe..8f83da8 100644

+index 52722e9..0448444 100644

 --- a/browser/components/migration/src/FirefoxProfileMigrator.js

 +++ b/browser/components/migration/src/FirefoxProfileMigrator.js

 @@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {

@@ -78,12 +78,12 @@ index a6598fe..8f83da8 100644
 +FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";

  FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");

  

- const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);

+ this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);

 diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm

-index 0669aa8..19552e3 100644

+index 1f60879..fc83a99 100644

 --- a/browser/components/migration/src/MigrationUtils.jsm

 +++ b/browser/components/migration/src/MigrationUtils.jsm

-@@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({

+@@ -403,11 +403,6 @@ this.MigrationUtils = Object.freeze({

     * @see nsIStringBundle

     */

    getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {

@@ -95,7 +95,7 @@ index 0669aa8..19552e3 100644
      if (aReplacements === undefined)

        return getMigrationBundle().GetStringFromName(aKey);

      return getMigrationBundle().formatStringFromName(

-@@ -622,6 +617,17 @@ let MigrationUtils = Object.freeze({

+@@ -622,6 +617,17 @@ this.MigrationUtils = Object.freeze({

    },

  

    /**

@@ -114,7 +114,7 @@ index 0669aa8..19552e3 100644
     */

    finishMigration: function MU_finishMigration() {

 diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js

-index 744f117..59e5a4c 100644

+index f67823b..36016b8 100644

 --- a/browser/components/migration/src/ProfileMigrator.js

 +++ b/browser/components/migration/src/ProfileMigrator.js

 @@ -12,6 +12,7 @@ function ProfileMigrator() {

@@ -184,10 +184,10 @@ index 260bc29..52b32cc 100644
 -64_firefox=Bookmarks Backups

 +64_self=Bookmarks Backups

 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn

-index 339ffda..6999b26 100644

+index 687c8d8..203d8cf 100644

 --- a/toolkit/content/jar.mn

 +++ b/toolkit/content/jar.mn

-@@ -38,7 +38,7 @@ toolkit.jar:

+@@ -39,7 +39,7 @@ toolkit.jar:

  +  content/global/mozilla.xhtml               (mozilla.xhtml)

     content/global/nsDragAndDrop.js            (nsDragAndDrop.js)

     content/global/resetProfile.css            (resetProfile.css)

@@ -267,7 +267,7 @@ index f35c227..7062886 100644
  

  %{C++

 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp

-index 68a52e6..02bb30e 100644

+index e3dd0df..ef7bb74 100644

 --- a/toolkit/xre/nsAppRunner.cpp

 +++ b/toolkit/xre/nsAppRunner.cpp

 @@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index e34ed131e..4f7d77337 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=false
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=18.0
+_debver=18.0.1
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=$_debver.$_debrel
-pkgrel=6
+pkgrel=1
 
 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
 if $_pgo; then
@@ -52,11 +52,10 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel-install-dir.patch
         vendor.js
         shared-libs.patch
-        bug677092.patch
         replace-urls.txt
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('366e1e4847d7e00eba77ee5a4be0d3db'
-         '6a571d3a3b355c331f67d57702f4fccf'
+md5sums=('5d481dd35a304702d1f311eeb3f1149f'
+         '6a4781e8ddc1b166f36930c4864e095f'
          '619e8f7c8596838a7daf2b7ce2e54cd3'
          'ac29b01c189f20abae2f3eef1618ffc0'
          '1ee2d4bcacee73d671b9ffa17a02abaa'
@@ -64,9 +63,8 @@ md5sums=('366e1e4847d7e00eba77ee5a4be0d3db'
          'abf5ecb74caa857abb42bcfbb3442d9c'
          '6dd547c72bb875a3101135a1c32d4783'
          '52e52f840a49eb1d14be1c0065b03a93'
-         '23520aca140fb0dd3e1b6f21b21f591f'
          'a8fc4658d45b6bf9350023e5c3f34e56'
-         '65f68090d2a69b467bd2707d0c4ea3bd')
+         '46a4b19b414065b99b870ea79b454f6e')
 
 if [ "$_pkgname" != "$pkgname" ]; then
   provides+=("$_pkgname=$pkgver")
@@ -100,11 +98,7 @@ build() {
   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/shared-libs.patch"
-  
-  # Back out https://bugzilla.mozilla.org/show_bug.cgi?id=677092
-  # in order to fix https://bugzilla.mozilla.org/show_bug.cgi?id=818468
-  patch -Rp1 -i ../bug677092.patch
-  
+
   # Replace common URLs
   sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
     if [[ -n $moz_url ]]; then
@@ -115,12 +109,12 @@ build() {
         | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
     fi
   done
-  
+
   # Patch anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
 
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
-  
+
   if $_pgo; then
     cat "$srcdir/mozconfig.pgo" >> .mozconfig
   fi