Thu Jan 10 00:05:41 PST 2013

6 files changed, 220 insertions, 206 deletions

diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 0d257856f..597b2f855 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,30 +1,37 @@
-# $Id: PKGBUILD 174272 2013-01-03 16:15:01Z andyrtr $
+# $Id: PKGBUILD 174970 2013-01-09 16:29:59Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
 pkgver=1.0.29
-pkgrel=1
+pkgrel=3
 pkgdesc="OpenPrinting CUPS Filters"
 arch=('i686' 'x86_64')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
 license=('GPL')
-depends=('lcms2' 'poppler>=0.20.5' 'qpdf')
+depends=('lcms2' 'poppler>=0.22.0' 'qpdf>=4.0.0')
 makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check
 optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
 	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
 	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly')
 backup=(etc/fonts/conf.d/99pdftoopvp.conf)
 options=(!libtool)
-source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz cups-browsed.service)
+source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz
+        cups-browsed.service
+        poppler_buildfix.diff)
 md5sums=('0640a02a3fb88d3dbdb224e3becd400d'
-         '4c9f97eae201798000483c4e7109e690')
+         '4c9f97eae201798000483c4e7109e690'
+         'bd97d1d9dbd4feec3a0330fd9fb7a03c')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
+  
+  # fix build with poppler 0.22
+  patch -Np0 -i ${srcdir}/poppler_buildfix.diff
+  
   ./configure --prefix=/usr  \
     --sysconfdir=/etc \
     --with-rcdir=no \
diff --git a/libre/cups-filters-libre/poppler_buildfix.diff b/libre/cups-filters-libre/poppler_buildfix.diff
new file mode 100644
index 000000000..b646efd6b
--- /dev/null
+++ b/libre/cups-filters-libre/poppler_buildfix.diff
@@ -0,0 +1,61 @@
+=== modified file 'NEWS'
+--- NEWS	2013-01-02 18:23:25 +0000
++++ NEWS	2013-01-09 10:42:32 +0000
+@@ -1,6 +1,11 @@
+ NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02
+ -----------------------------------------------------
+ 
++CHANGES IN V1.0.30
++
++	- pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani
++	  from BBR Inc. (Bug #1089).
++
+ CHANGES IN V1.0.29
+ 
+ 	- Fixed ./configure option "--with-rcdir=no". Thanks to Jiri
+
+=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx'
+--- filter/pdftoopvp/OPVPOutputDev.cxx	2012-07-20 08:32:55 +0000
++++ filter/pdftoopvp/OPVPOutputDev.cxx	2013-01-09 10:42:32 +0000
+@@ -1804,8 +1804,14 @@
+   maskSplash = new Splash(maskBitmap, gFalse);
+   maskColor[0] = 0;
+   maskSplash->clear(maskColor);
++#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
+   maskSplash->drawImage(&imageSrc, &imgMaskData,
+ 			splashModeMono8, gFalse, maskWidth, maskHeight, mat);
++#else
++  maskSplash->drawImage(&imageSrc, &imgMaskData,
++			splashModeMono8, gFalse, maskWidth, maskHeight,
++                        mat,gFalse);
++#endif
+   delete imgMaskData.imgStr;
+   maskStr->close();
+   gfree(imgMaskData.lookup);
+
+=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx'
+--- filter/pdftoopvp/oprs/OPRS.cxx	2012-09-10 19:56:59 +0000
++++ filter/pdftoopvp/oprs/OPRS.cxx	2013-01-09 10:42:32 +0000
+@@ -5,6 +5,9 @@
+ //========================================================================
+ 
+ #include <config.h>
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+@@ -235,7 +238,11 @@
+ 			      SplashColorMode srcMode, GBool srcAlpha,
+ 			      int w, int h, SplashCoord *mat) {
+     if (rasterMode) {
++#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
+ 	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
++#else
++	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
++#endif
+     } else {
+ 	return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
+     }
+
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index f1b53b605..437e959d3 100644
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -9,8 +9,8 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=17.0.1
-_debrel=2
+_debver=18.0
+_debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -20,7 +20,7 @@ pkgbase=iceweasel-i18n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=17.0.1
+_pkgver=18.0
 pkgver=$_debver.$_debrel
 pkgrel=1
 
@@ -56,91 +56,91 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('bfcf60a7c392c4a961147fab028e2f3a'
-         '3adc81ef09416701d75cc2b68863ab71'
-         'd1c7296f27be61e8506bc14e3cea6d7c'
-         'cd9b943301dd07244eb5ec8a469524d5'
-         'b501ea7ee7c32f9c3522c45e576b82da'
-         'c1f9a597d30a75446cca70617f9b7d06'
-         '124bddefc8d8b835b6b57d8992fcab06'
-         'b033cf6889dc09e595daa2a48cc8ded3'
-         'a4938e59f69fe4cee190a56ac50044ea'
-         'ab0d0933917428a0652708dce0b5cfa6'
-         'a3efa0cac151556296423734ae0b9b0d'
-         '46de0d3c71f45ad0cfe8525bbe774ae9'
-         '2c736e710892440f6dcee1841dbd7681'
-         'df77b365ee1014d0e7bf052617534aa8'
-         'f7a3f5284d8f9d1f98a407ac162ad13c'
-         '736d679607437cde9a44f315c03d62a7'
-         '0d20bdf8c98ba1525bcb32a125874de8'
-         '6fb81b76ddf2df461e4e332b42027144'
-         'a4c86f8ea687f1710f4952a732c7e3ef'
-         '6fc112fccb7467008b1d8246e4c55fa0'
-         '13a202e640dfcbcc102da513354d2d22'
-         '35d7ebf315d56339552508e13668a9bc'
-         '2dc6f461b4dd0a7e6402476c64159479'
-         '72141640e0a9e32bed5ff941f2f375fb'
-         '33aa87399a302d233b30a909912b6b92'
-         '7b304f9bd315ba542f20f5e44965ac7a'
-         '8819847d626ef1c84e4150b4a0bccc97'
-         '0a432cfca308c32316fe139a02782084'
-         '5cf26da9d36ec4118d4023b990f8244d'
-         '54b093eb4556f3385c12b8787451210b'
-         '4a5f0ada4951fa1602e83cb61a172ae2'
-         'c3fff5a4a31a799fafbaeed74d429a8b'
-         '772aabab84c69e6575302789626501e3'
-         'd4ab725f098fa07b6bf7b6cda975b5f4'
-         '960262717e79549db34efa26719a8441'
-         '2694e0c34f8b1ea1e717a3f63ac0dc46'
-         '297f3f6bfc2a35e551f89a15074e6f5e'
-         'edfa98ed872dd38e39532d181c101ee2'
-         'f8b924d171dada496fe1668a5495f1ce'
-         'f372213171b843be6f394ceee83a9132'
-         '8d4fabd9ac5a00e5a8baa6528d9b4feb'
-         'a3626c4edd9e9a4e8c7edc9a3ada06da'
-         '9d972a22d5e93990310223a8ca011e12'
-         '6e888a089a0118e79abb239921f95395'
-         '7f17bbcd346ac54ea8940e1c5f05a366'
-         '81ab2c6a24af3ceeacac2c216a529ce0'
-         '5595bdc0baa7a55f803cdf69b9738fcc'
-         '7cc94fedb659b353583b23ef7ae0666c'
-         'a01e06ecc2352c1bab4139b99073450a'
-         'e2b8630f68718b8ee7038c9485828653'
-         '06c80e586de69d060b627df92737f619'
-         '92280563e9ebd794cdb2ef1e53bf227b'
-         '5331a0ff6a6f8a2b7983a3e8870fe8df'
-         '2d452b1c4f21759f470c95464ce00a62'
-         '7043f221184cf4120dfa08a9f7781f5f'
-         '4b7508c40fc3be22aed3d2318add3c4e'
-         '4eb1f073552f470156faac871aaf675a'
-         '1e699248f644dffc605bd1a7a2a9358a'
-         '8ea797b2108add003ea5f6f2181b1f5e'
-         '2afda212223d73ce56f78952e05a1f02'
-         '525aab2f11ebd0029c10cc5bdfa128c7'
-         'd61c3a36bb1cce1fbabd16630e1eaf83'
-         '66f808754db7864c8ed52235600863a2'
-         'a01221e51ea5d09fc7ae7df839b85cf1'
-         '225a0afccc4db77b6b3302dfe680dfed'
-         '3087a16e5ea61864c9bb14e6d9b99a41'
-         'a5a8a3a32483f582bc2a2461be821f8f'
-         '30bec04f1653090f001bb788140312c9'
-         'fb20d0a2e93f22a1448f10c930c04363'
-         '29faf5333e2cac03313dcb0f1bf3a1f4'
-         '1ad2db69bb765347abb310978ec70b53'
-         '37a0e5d35788ae8a8fd84c74d1d63737'
-         '963faeca032dd071ed20ad26414c789e'
-         '9cb6030b31882f118e0fa5bac5378dcd'
-         '68bdac015cbc1fc04ff76a6b27141ea8'
-         '79e4d4f72a13d701bf74bb18785110c5'
-         '516eeca239f934bf6f1cb99460a64187'
-         'c7bd6ea08d6485a5a2c47314afb2f121'
-         '2449532d04dec088673b2881407b902f'
-         '7dcf35c35d514e4321ef679d306cfc51'
-         'df147de85ddec58d18a72bdb4c4836eb'
-         'e538c35be0497500b779ac1dae2fdee6'
-         '2eeaee6c772623ff192cbba1f1871c2d'
-         '2e6a5a11b1e110cbf73495d2549015ed'
-         '87486a10980d5f82144956105b240cbd'
-         'cfda927e1d589e4f2b15e9cf1ef803f7'
-         '7785e2b1393e080a753a4a0000c94895'
-         'b57a36ab82768ecaee01ac3d2d6ef55d')
+md5sums=('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')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 581a0c00b..12cdb98d5 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,8 +14,8 @@ _pgo=false
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=17.0.1
-_debrel=2
+_debver=18.0
+_debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -32,14 +32,15 @@ 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' '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.14.1' 'sqlite3' 'startup-notification')
+makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'zip')
 [ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
 if $_pgo; then
   makedepends+=('xorg-server-xvfb')
   options=(!ccache)
 fi
 
+optdepends=('networkmanager: Location detection via available WiFi networks')
 url="http://www.geticeweasel.org/"
 install=iceweasel.install
 source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
@@ -52,11 +53,11 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         vendor.js
         shared-libs.patch
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
-         '062bbd20d1de7e01e8e11667c24de960'
-         'eab149c1994ab14392e55af3abb08e80'
+md5sums=('366e1e4847d7e00eba77ee5a4be0d3db'
+         '6a571d3a3b355c331f67d57702f4fccf'
+         '619e8f7c8596838a7daf2b7ce2e54cd3'
          'ac29b01c189f20abae2f3eef1618ffc0'
-         'c8040002668fae7d1b950833bae51607'
+         '7d16be01a546d7733ab28db980d230f3'
          '2823e0ecdefc16b590a9997f9228924a'
          'abf5ecb74caa857abb42bcfbb3442d9c'
          '0d053487907de4376d67d8f499c5502b'
@@ -69,6 +70,12 @@ if [ "$_pkgname" != "$pkgname" ]; then
 fi
 
 build() {
+  # WebRTC build tries to execute "python" and expects Python 2
+  # Workaround taken from chromium PKGBUILD on Archlinux
+  mkdir "$srcdir/python2-path"
+  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+  export PATH="$srcdir/python2-path:$PATH"
+
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index cd3d49f2f..83ba6e04e 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,6 +1,6 @@
-diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/browser/app/profile/firefox.js
---- iceweasel-17.0.1.orig/browser/app/profile/firefox.js	2012-11-29 02:43:23.000000000 -0200
-+++ iceweasel-17.0.1/browser/app/profile/firefox.js	2012-12-04 17:00:51.691456154 -0200
+diff -urN iceweasel-18.0.orig/browser/app/profile/firefox.js iceweasel-18.0/browser/app/profile/firefox.js
+--- iceweasel-18.0.orig/browser/app/profile/firefox.js	2013-01-10 01:04:16.600370827 -0200
++++ iceweasel-18.0/browser/app/profile/firefox.js	2013-01-09 19:58:30.691632825 -0200
 @@ -37,11 +37,10 @@
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
@@ -17,17 +17,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
  
  // Blocklist preferences
  pref("extensions.blocklist.enabled", true);
-@@ -194,7 +193,8 @@
- pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
-                                             // Themes every day
- // Non-symmetric (not shared by extensions) extension-specific [update] preferences
--pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas");
-+pref("extensions.getMoreExtensionsURL", "http://www.gnu.org/software/gnuzilla/addons.html#addons");
-+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes");
- pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
- pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
-                                                 // restart.
-@@ -329,18 +328,18 @@
+@@ -328,18 +327,18 @@
  pref("browser.download.panel.removeFinishedDownloads", false);
  
  // search engines URL
@@ -51,7 +41,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
  
  // search bar results always open in a new tab
  pref("browser.search.openintab", false);
-@@ -571,7 +570,7 @@
+@@ -570,7 +569,7 @@
  pref("accessibility.typeaheadfind.flashBar", 1);
  
  // plugin finder service url
@@ -60,7 +50,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
  
  // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
  pref("plugins.hide_infobar_for_missing_plugin", false);
-@@ -624,23 +623,23 @@
+@@ -622,23 +621,23 @@
  pref("browser.send_pings", false);
  
  /* initial web feed readers list */
@@ -96,7 +86,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
  pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed");
  
  pref("browser.feeds.handler", "ask");
-@@ -651,7 +650,7 @@
+@@ -649,7 +648,7 @@
  // region.properties file is newer than the version number in the handler
  // service datastore, it will add any new handlers it finds in the prefs (as
  // seeded by this file) to its datastore.  
@@ -105,7 +95,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
  
  // The default set of web-based protocol handlers shown in the application
  // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers
-@@ -659,65 +658,65 @@
+@@ -657,65 +656,65 @@
  // protocol not currently listed here), we should go ahead and add those.
  
  // webcal
@@ -216,11 +206,10 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
  
  // Name of the about: page contributed by safebrowsing to handle display of error
  // pages on phishing/malware hits.  (bug 399233)
-@@ -1164,13 +1167,3 @@
- // might keep around more than this, but we'll try to get down to this value).
+@@ -1168,14 +1167,4 @@
  // (This is intentionally on the high side; see bug 746055.)
  pref("image.mem.max_decoded_image_kb", 256000);
--
+ 
 -// Example social provider
 -pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}");
 -// Comma-separated list of nsIURI::prePaths that are allowed to activate
@@ -230,6 +219,8 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
 -pref("social.sidebar.unload_timeout_ms", 10000);
 -pref("social.active", false);
 -pref("social.toast-notifications.enabled", true);
+-
+ pref("dom.identity.enabled", false);
 diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties
 --- iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-20 00:45:50.000000000 -0200
 +++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-28 21:45:00.486713730 -0200
@@ -461,10 +452,10 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i
 +        <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A>
      </DL><p>
  </DL><p>
-diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.js
---- iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js	2012-11-29 02:43:23.000000000 -0200
-+++ iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.js	2012-12-04 02:08:18.095477555 -0200
-@@ -5,99 +5,42 @@
+diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-18.0/browser/base/content/abouthome/aboutHome.js
+--- iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js	2013-01-04 21:44:27.000000000 -0200
++++ iceweasel-18.0/browser/base/content/abouthome/aboutHome.js	2013-01-10 00:53:04.008909619 -0200
+@@ -5,70 +5,41 @@
  // If a definition requires additional params, check that the final search url
  // is handled correctly by the engine.
  const SEARCH_ENGINES = {
@@ -529,39 +520,10 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew
 -           "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" +
 -           "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
 -           "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
+-#ifdef XP_MACOSX
+-  , imageHD: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIwAAAA4CAYAAAAvmxBdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAGrFJREFUeNrtfHt4VdW172+utZOASLJ5+BaIFrUeXkFsa0Fl++gDnznVVlvFxt7aqvUUarXtse3Bau35ak/rZ9XT26NtfOvV6wFET+FYCQEKWqsQIT5RCAgSXnlnrzXneNw/1lphJSSQ8BB7bub3zW+LO3uN+fiNMcf4jTEX0N/6W3/rb/2tv30smtnXB3zmRi2FQakxQNKX3WkW9S/tgW3HLpmQM543A0BWVSHMYGIwOTDxzxrOf3/RQQfMZ2/SLAvKhTFVBGUqKFONH2QAzwOMF38awHhYZAxWAqhe/iszp3+b970d/sInc57vz/J8L2eMB2MAEYkBQ6DQ3dRw4dq7AUjcP3rAfPZmLWXCLHKoIAcQAUxaB5EaEfc6AEBhjDEwmcx43/fO9HxT4vkReBIAAZgjgodW3NcPnn1sHgD/iHknn+0d6s8XEUhsXXac/34WAAGw8afuT8GZ3X055YeSJcIsG+pMZwFn0UihezRofPt3G54f/0E8cNMN+Myo8jVTCgYd823PLzrPeIBnABiUQ1F+UoWsVOYb33mkoKp/7/dKyT0AGc47X4s0sjBEoLxbBqAQAMfWRfe38B4BM+VHUkYOs8mi1FrABbK4dcvK73zwp1M3xYPOxANKBqbpCdXNGb0UwPKRF74xpfDQ0t+K54+IvlKoahmAhaO/mv/ZmicG3tqPgT61ZM2dZMQJOYhIdByRM/F3dCCOox4Bc3oEliqyyNoQCPPusXceKZqRsigu7pwaWBowiRb46+f9Q1V2wl1nDx09/R7jF30x9adNlN8yPx4DHwht+B/cBIBoRqeIE4hE/oshTcB0wNbT6/o/zrhFyohR5ZxmrVWE+fDxdx4puhGAH4OkPe5B6pykeJAc/7cDEMZ/095Y870P339m+BXs2v4kbCFsm9u2vnpJ3bzR7wAo2B/R2v+PjSnyXcRxtOLUSXFxwAFz5i2SZUIVO82SBWye/vLOIwNvjL8OYqCEfXCmJAZPHkC7sK1REbj2+lmbq86qTVmmfuuyN2cTiREWKCvACgml9kDL7HQksehsZmSdA6yVpsa6P38v3swg7m4vN1dGXrThKGP8yS5fP33j/LEvxKDbl2f2A0YFCtkZQDOaPjLAnP4jrmBGjh1AVhG2ttxfX33++vjY2eeNXf/siLUAzgEwMJZrY2vF/Vu/t4BRqCqgCmj07wMVHXUCzJQfUlZE72ICnANcqNj21h8eiK1AX46gXh29KT9H+rd9XxBjYGCgig7QHOgjPgMAKigXQZYpsi4uCOc3v35zY2wF9ufGSgxA7fdd9g8ho9ol4P4ojiQWnSUMMANECrJNy1NWYH8eGfsEvJbLv1IK1XIAUwEtA0xplJMwjcaYlTDeShg8dOgjj6/cJxNYfWIWkHJoh5yyjkSZ8RbB89YBZq4/pXafGeuzb9WciXJxo2B2houqgAjABJCLOwFMqFv57+bBxMIAJm1det3avnl1OYCLAeSgWhofaY1QXQSRuYc+/OiD3QLmUzNdqTBKhRVMADsF5beuToXJB90KtFz+lVIVniXOVUAUqjpXVB4WwPjGTPB8/0zjeTnjezl43szmKy6vNkDF4MeeXNc3oJyUhfAMkJsJkSxUVrLos6o6z/O8Ucb3phrPzyHKeVTwkpPXseg3Cqe+1SfG+swfaw6KGTAoJ5eyGF3IBeEIJB2AcXxb0FI/L45uFQBMGiu6Z3ai9eqrclBUClFWVatV5GERNT5wEVQnQLUcIuVNX75kFjn60rA5c1d0AoywlkcxfdwZ2LSgbOmBZAv70povu7RcyFUqcZYdPbxix44fnLv8pbYUOWh+P3ZM9uJRo34xoLDgq8b3YTxvqhqsaPzyJTdmn36msjdyqPqkMhWqBFGZMtV8uDX4zMjp2zemyEoPgGn4zyOvGzy48A54GcD3Sz1jFrqqE+4uOOvdmb0ASlYEs5mQE9afUdhy0yv3lHzwya/8ZcjgI0+5yssU3QKYkgQ4Ivp60LL1n8kBQfOWuvdnj6uLldgHQKoKxU7HV/eg2y1XXXmXEs1U0ZVb29o//4k5c5P5eQB+s+68aVeUFBTcCxUoS6kRWfjhueecc9SfX3ytA9QTr7eVACqYFDYEwnbB2qcHHg6gLY6ODhpomi77coUyVaojhKH9+ZHzF/wqXiztEg34APxNX/jCvQOLCi83fpy8UsCJXHLYnGdn785S0uKTyyBUBXJZcW5x4bSN56ciyLQcD4Bf/+ThVwwbUvRb+JkoswqAWX5b9Lm1M3uSM/UnUiaCKiZk2blvvnxX0ePxuBNAmpMur51wyLBPzjVeBBoVwIXBk6vuP+SG+LkcuwkWAA96/JjZKnKxkACkkFb5Nztz220xX9bJlWi+6opKFalQlpqlmzZNu6B6SaJ0knKJ/DW5qd8p8TO3x6ABqza1EE06cdmy9wDAY5LjmBTMkQnUnZ42H0ywNF52aU6FK4UY5NySI+cv+E3MCnMM5HyqtwFoO3rBgmuDMFjGjiCOIEQwzH9c+7lzju+JTaYlJ2ehUqXMWWFqeurFxqsAFMVf25Ss9kTOEZdvebClJbxTyUGZoEzwlL/b9tzRX+pOztSfSBZApSqyIrL45buKnkaUJEzLCN5+csxr+ab6fyILkI2OIZYBlx9/2bYvpLgw2+EqKLKdwoceVKJp+tfuEpYKZcaW1tZbLqheEsbj3GV+oxdV3x0GwQZrHUIiWKIST3VmDG54zFrKrBBWiGgSyx9Uv6Xh0n/MKlGlOII4h80trQ+kuJt8HGklZHg6FZF/Y/uOb7O1YOvAzkGtKxmoehe6SYNEpkErwZIFC4I2fuLKf2tLtDOPzumPhA6wAPJDLt1yuzjaAEcAMUCMApXfvPP7IcO6gkYFs4RRpgy49qanUsAPu/T8W48e/YwL6S/kYtBYwM8U/yu6KVlQUShr9CkKyK7b1vDVy0qVeaYygaxbdeK85/8a/z7sYR3zgXM1gXUInEPoCEw8PR6z8YQxaidQPh6RrgrPEOZS4chKjFuydEEKFD1xQgrAnfO3V98Jw/B5dhFgmByU+MK/nnrq6K6gcQtPyqlIubJAibCxPv/fsVVNgCI9yGEAQdBq71NHUEdQIoBo5PBBeklazuQfSpYFM0UAFsDmd2yMf9+1XkUT3otc8AiRwpFChCBCI0detGbSLtYr5uw6tk26XctZwgxhRt65ZSmr1t389M1Jk85wzKcHRAiJkCfasDnI/0sMGN+jlLMrAigMhp0+f+TBBIw4milEYOcQBHZZAoZeEIgKgIIgeJbD2MqEFhxaDAFmdAWMisxQFigzlAUnX9e4rA9yeHuTna3koBQBRogxwOPvxNbQAAA7VHQEFKSQKEFIu4lA5d3HiiuFNB4XQZlhUHBK11QO0oRdD7ouROVCkeJZG7ak/KBOYHlz4sTy1WVlVY5oYego2+bs82+3tFw6YcVrp01dteqpxNfyhKQuGlxCMSsKBh570ABT/8XP5dhRVpyDWAd2Ns0O9yrhWdfcMpvCEByEoNCCwhBgvgBdM+PM5TH5FPW+1ZLo8de2viehe12dhVoHOAtDPO61O4o+kYCTnE5wVuGsxlzKHul7BUDKdomKgwpB2QHAyNiP2Dl+0Z2WRXZ9YP0F55WJczvX0jp09U3fLiurWD1+/NqQaHZIVNbu3O1vt7aM+fSqVRWXvPvu0pRldwAkQ5brjO+NMh0kgMIvGjYZwIKETPxIrYt1U5M8iThKJil9yZGc++ab298dP36Jb8wZohqhQHRErKEeAA6fG5FT5yIlYYI6tzfOvtiQni3MYDw0ChqEgUMyejyAdwGwDeW4ZI9FAGQOmwzgv/cERmZbDXhnKBNUGMJkUhGVduSSJJ1P6rw8HIalJo7ilBkchgCgL48fVzLceDc4kZnWUdap1AQi10x+660n4jXyk1M7ZXEZgHhMUkMO4NjphQGMf8h56Fx++ZE1a+1xZC2Szjs3sk9uUEhUbSMvP3LeyOGZ0tKJiearo1J1DHVRPYmS7JUcG2g1pxxUsooBnpmQWAOb10YbKGygcKFCZOC0XqxrRKokCBQG5euX77In2k1P+2hhWEZBAAoCuCCEcW7E2xMn/m6oYo0jyjnmuc3Off6UN96YMvmtt5LILSmQ61r3xAA0I+xqPBiIejAd1f7e2MPPfvm4LQs/89a+bP6nZuSzfsaU+T7g+UBixYQVRFGS01kFO22srRy0EgA4CEvFRHS3MANMY/fGbybmlQqAFSBVsCp8kWwCGA5dqefFShnnRV77ecHYU37iXuqLoB0tsuIo34v3NfJR1GlJsrnOuiXGy1y8k+rwxh573srSD/6rbLdra7yMqgjUCGAULR8uWr0LJPYAGApCeCbKNygLPKIxJ65YOSU+YpLUUCYGiqBzQVy3Ft1zbevnJl60UARqACgcVDo9ZZr63Mqua68QxlpmrWJC1FmrmLSKCFVktcpZrbKhzg4D26E5Lgjg8vnoMwwh1hU/dvTRo/qcDyJqcESw5Dp6o3XNHVrqLDSubAdFjuXwwWZcX+Wc9APboKxQUoiLurXaIYfCpjlCDsoxZ6OCouLRt+xpbY3nA8aDMR6E2+9vffOWxl02cQ+Bbdjevt7l83D5ABRaKNHYO484YmgMkoJ4jElCOL8Lz9NN87YumrRDxc2DElQZKgIVhZcZcO1hZ74wtK/H0thvtuXGXdM2S0S/ziQ1FPJiG7pHwvbgDhtKnQ0VNhCEeUHQLmiuf2fymieGvJGY8DCfX+yCEC5xWIlwtO+P6+s4VESJGS4+liwxKjZ/2FGRZvPhYgktxEZdHWOAr2P34ihWIQWTgJ2CnWJbo9Ymz1g/5+h1QsF9wgKJ19Z4hV874fKNE3cnx8v4V8H4UOjqhvce+zW6qdWVlOvSjQsDlw/WUT4A5QNQGIJDizMPHXR+CiRBb4GSzlYr26Z7vYKSC42nUOPBqA9VU1I0ZOJPEYWj1NvVW/3AoEUAFgO4IzZ1hYk2jf9WUw7IjCIXHUVhXrFp/sQtKZPIoXXr/PjoSkZeoHo6gP/bFyeciECqcHG3IrXp37a2SF3xQNPxRAXgq5nS1bHsDWCYALYAu+h0W/impI8Pad9ec/vAoWVTjV84Nsn5FAwcvmDMN5rOqf1jyatdHzjuGjvThloKYH3b5qVXt77544ZuN1QEKknF3a6ImfDee4tWjBrV6R5Qoeq1AP6Avaxx8gDolhdPXAh2qzQmZFQ4ZhALrj/mvLpT+qhxya0BP5VVZQBkA6jNR0AJ2xUUcjKGjsx4k3PVYUwaJU6rJ3reLiHlHppjBjF3fLYSzU/noEZ83611VusoVJBVsFWAdezim/3jemSFe+SNIsvCpAhCXf7TBZI+PnTr4nO2t2xcME3ZroYKIouEEqDoxfHfav/GxOttFgBOucGWll0XVqrqXYDWNLz3aG7bsovWp4i2TvkhScLqNBezq/M/zxLBxV2Yx/75yCPP6usc04CJ+B3bcLMwQTiK+0UIwgz1ip8+4pyaYX0x0SnWMkjnYGygkm9nBO0MGzoI2TTDyQBw7ubNawPmeZYZNt5wZhrxX8OHX9yXSTJzGcVgIWasbs8/hc7XRzXM670cg0Vs5H+MHm6u74ucrb/KlAlFPoySoqFFn+rm+OCGV762df2cYWe4fP0M5qDWhoowRIm1/h+s1YZx3wrVOV1LDhXMaGzfXntF46vXtMQRS/clsqRRT9SNd0GMBo6edRStZbKeg4D//ciQIcP2CTDbqsdVKQePq1JMFkXxv4qO9AaMfPGoaeuG9kXp0LkU0wGgMFC1gYAdAeyg0m3IrE3W3mtTvodjRpHq9X3xL4h5Qsq63P/z9ra6LqScvvmBPkwOTex2lnf4wNee/47fa99NGGVJ8Zl1qP3UPfwkdr15mDDV+Y3Pf+Kh9c9kz9pee89J7dvevaRt+7qLbVv47y5UUKggp3BB/okNz0/aHI8332OaIgELxWDpptQtt6X+Qcu03nVYGQYxjxzl+7/eGyvjdYrCtv31JiW7QTjy6qWj83jF4AeP/MLaodiHRtZBXAihEEIWkq4eSgGmvKGhqpX5d1YEVhiWBaI6Zf6QITN7s5ELhw4tZZavkwhIZMOC1rZfo5s64nPv4+1NzXot2/hYiqKckglH4/7eRojCOospSt6u2ijfS1Hv3I0SdVy5aam9ecumBeOqN8w7aRkxSlMVdRDmRHa4m5xWPKPEusUA6maIrcy/cCKwInASKaCoXrlo2LAH+xpMpAEjLauu2ObaNnxVmZqUHaI8SaR+KnIhTPHCo6ZtOn6vk4qUPNNGnV2PJ0ptENweMq92zHBMcMwwIrfMLS6etKdJEnMlCYOZm9YE4dUPkWvsIUckJ/+SZwd5PCEOEBc5rh7jgrqf+VfvSc7mO/xZSihVAra3YMY/PqqrUhZVe7C8yRHTBqAVQJuQN5idgJ2ASQAz4PJjptWevKc0RZQ0TQATRWDd/dmFDQ2VeaLH0z4dRVTK9EXZ7IqFJSXH7W6eLw0blntp2NAydGOSqPGVs/5mW9ZcJGKbRSxELIRDCFuIuAmiBa8eMW37rcdc1JDtM+3PYdSp43k9/ulPgmDrsnz+vFBktRWBZYEVKSlUfeH5wYPP7u5Hfy4uzi4oLq50IjkSaXrf2vIfBPnV6PlKiwKg0XfyNe2BPkmJ8+oUGeh/bLjNu7En0Gy+w5sppLcyKRra9IZJ98hTvciop9MPSSFUwGTnEjHICsgpyKHYHzjquWMvrJ+wewUENPFjCIAxk3uStyIMbw5FVieWJvJpBE5kgqq+X1VcPGdRcfHMxSUluSUlJbmlUZ+1tKRkLRGVnrZ9Rw12rSLtsDpFg8vmfbpw0HH3wcuMMSaiao2XAbwMjPFhPL/ReN6DfsY8tHHekN0WXR929vqsCpWruFshPEqFo3IyADuWTxgea1rYTbRVeEMmc+SnCwp+OcB4l3kmLq0D4BnzkA/MMUBjvDMXC1DBqlkCFr9N9E//HIZpPyDsQVuTFwsMfP273k8GFeLbvo9izwe8DGA8VMPgIc/D2piALlPFDGWUMqNuazOun/RbeQU7L/zl0cfC+SPOXjG84NBRawCvJNoSE7PiBgr5Xx/MKf7jLnzIbUPKlHVF5C11KgJfD9+shY8Vxjd30780rEvP8bFDDvnVQGO+lU5MeTDwzM5aTbOzNyrw/XNbWx9JFLknk+sjqjobUHJq9XS/cNj3jZcZAc9PwBIDyAeMD2O8RhhvpTFYqYpGqMQOM2UhlFOhsvjfgNJ6ofxyoZaXbHPt8mDNjDU9ACYBbyGAAT/KZEZ/MpO5qciYyRlgROeJGSh0nQCL21Ufmx4EL8dMpqScRt4DFVAAYMCtORx+0Rhz7aFF+GJBBmNM/JKklGo1KlBtHZ474U79P9hZOZcQYb0unD/mwu05qADCZwE4C8Y7I3kTk4kFx+mUuzfMKf5e+rn+rUMq4PR4hFII0gw0xpdvGAWGoDqHf9m8IuV8m2Qtf1pQMPok37+50JhpHlC8EzwRcAzwOqs+Vkv06I+da04nInd3RvuxgCIAhcUTF5zvFQ79oucP+Cy8zIjE6qQnt5Pviu5IqAogVKNCNSrBUte6blnrqi/Vo3O9rI3Pc7cbP6sgGQcAf7rvl3zK908uBKjAGK5jrrmNKKHj/RS3E6L3V2USLUzkZAB4i75pTivwwQMyoKYQ685+QOtScvzUHPbIlJ54ZVsuDPTrZDmnQqUQggo1qkoNRDyFeJ6XGQfjF0fW3O9YWxW6adNzw36Dzm/JKEJ0k7QgtfiSygd1vSrkdZ3jlb6fneT7Y+MN1xrmVX9gbkw9q1MdsemFU5wkpwqSRSw49gfZAcPPHOsVlIww/sBjjPEVnqfGZEQlWKVCjWK31TW/dv56pCruU126TGxPl+USIrAgNQ7TQ+pNukQqfalLNimApvMt6CZMTvsiu3VOJ17XnrNWZ9m85oK8Qmz4sFB+CeXrF29dfOqG1PwKs6fOKyvKjrnb8wrHGD8TWfCOEoX85zb96dgXY9leN2NM+y3SJZG4u7XsSldIykFPz09NHxbRT2U3M11AsKf8aRqtnBqQoG91oWkGOS0/XaQo2Pf3u5mUDK9LukD7Mv5Tv9teSQ4VzipsINUtW9Zct/mFiRu7WbcOuQNP+MXQ4hGX3mEKBl1mjB9bbwAqSz6cf+TZ8Qaabta/u6hM92ItpZs5dvyor5R/dwvp9QAa6eFzfxRlpVMk2mXh93czeyPn1Bn5ShWtYAJsyEve+OPgC7Hzmgx3USDtejQedlbtDX7h0Ns6HChV5LcvP7rpb1+qx/690dHrtewL05c2c7ZLtrM91fOpDGjXyvT9+WYBPQAg3NPcey1n4vVtFUJSIfGNjJZNy2ekkqzpazIJOefSoTaA9q1VY+5Wbvs9NAoYVBkFh5Sesi9lJ/u6lt5+WETpoi2MPpZU/k9szmKGtVGRWBjQ6g3zP78pxfSGKb+tJ4LPAsi31S/+uXCUlVZmCIc+DlI15L4Cpr/1FA1d0VLqAilzgcCGChdQc5eoTXqpkNS66hv1YLsUElURiG1sOZj7lunf3v3fwlBKjRfX9EjEHKcscV98D40zRKIqgEpz4yvTVnfjU/VbmL/r4yhwTTbPCNsZNi8g50/OnvbCsXu5wQqVURCBuOb7seu98n7A/L23Tc8NX8mW6pL73UoOhYPH/GJv/I7Dzlqbg5pRUG1q++A//+Ng+4f9gDlATVzLHfErZiHioKrnH37uhgeG597sdYnIYeeszypQqQawre9dHNbd0Yj9/5KnfsB8DJpuXXj8Q+ryj3dUZglD1Uz3MsWvHX7uh1fv6QGHn7upAmrWQpEV2zSt+bVptamw+6C9VaP/hcoHrvkABgydUjPLywy6Oboh6HW6PgLjLYqStqYRQHKDMQflMhXOQrnata27tvGvufrEn8ZBfmdPP2AO7NpmAAw85B8qTyjKlt1svAHTjPGLk4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiMNAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC"
+-#endif
 -  , params: "source=hp&channel=np"
--  }
--
--, "Яндекс":
--  {
--    image: "data:image/png;base64," +
--           "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
--           "bWFnZVJlYWR5ccllPAAABWFJREFUeNrsWWtsVEUUnltLH7tbaeuDbfCBojUoBTGmooLE+Igx+gON" +
--           "RvEJhEQNUdEYA0Ji4xNf2Bg1iBJJrGBC+CEBNYoxxmh94CMKRE2MitBqoZRi6bbdZT3TfhM/TmZ2" +
--           "u5jGsOEkX8/0ztzp3HPP4zu3UTabNUfEI9YwgzAxjUbBGkG7IAv0CwYE53rWC+KChFloRh329igN" +
--           "zD8keJR+P2DvEbgnrjp4eWT65GerSZuU6FWii9Fj5pGHvC6ow/WpdP1C7SV3Bm18eNpDG2a0oA0P" +
--           "v0qFSn3IMPOKxChsmBJ1/TpBEuNn1NxRB8XOoJSYRabfrCiG0FGiDXMZ9HeC73PfGpkOST0vmYGi" +
--           "LEraMCdB/5jP46xhnhaj7C3Sal2qjFSDcU8eb4m2m4xpHvKWYwSTBd2Cr1HBrIwVnCXYIdiiNrDh" +
--           "Wi8YQLVzZ+mDt/ar9acK5gqOE6wTvKvmE4JzsN83ghSu1+AMMcGngr/pnnHYM4nzrRX8EapKm5Fc" +
--           "3/bwlAn/Jt/EtJdNmdvidjxcpyrjT+D6Fx7LPoA5jf3ktU5metY9rtZcRHNn0vV3cO0rtf6GwN9v" +
--           "DCXfX6AbVLL1hJJOxIM6UtwnJG7ORuIaMl5W7W297g2MmwR3YLxQcDmty3jOdongCrrXyRTBaoyf" +
--           "x5qdgjZ4qzfHbCQ3mzXcChcYH8hhIGf0zwQ3Ch6k8/Ae9yEM3hc8LFguWIm5uwIvwYXhPdA2RNbT" +
--           "/BLoFsECwXsw1gUIZa9h7NvZivGLgkk010eHjv5jbitXD1HiWVMhuB7jDXR9E/R0Qa3nPvvmTxZc" +
--           "7fGWyQhNK6/R9b8Ev4aSr0HyunWQ3Q/li8/hdh8JTiOD+DpPa7jegHtriUN35zDMRMEJGH9J17dB" +
--           "18KzO9V9NvndjbH1sB9objp0u+CT4VYlJ5txKLvpDMFsIJ/EwYOs9bsEp+RYeyz0nx7y6ORsGu8K" +
--           "EM2kx1ts7rkXL+YxNd8I/TOcoCDDOB5jY/Fj/P4cEmVTjr0SlKNCOcjJ8fQgodAcQ/d/i/BLK8Oo" +
--           "ZtYcLVgGD1wq2K7mx0LvKITHaFlCbny/oI4M43uQDJJkL3KH5RWnB/auh96ax9AGnKQdoZNAyO4T" +
--           "VHv4VobC+XzPntWUMgpivtwzufbgWbVpSHYh4V0DnrA6YETrCWdgvGUYIboX9KEahqlFcq0GT2HZ" +
--           "jwrXBW4zJ/C8FYdqmEWUb94aZniUUbXJVbmm0N6/5zjbPnohcfKePiDlSfBJeO0r9Bx8pi7oEw/F" +
--           "MPMp8S0roARHar+QYS6FXp9nv230dicVcA7LaZoxHo/ncfIbEdi6Qgxje4vFRL5aRqA/uxn6Vc9c" +
--           "muK/lXqeuQXsPwZMdi0RPedxH1AFva0QwyygavDkCBjlFuy/HJWhksLQgOVyxWqh3mYx7RND2Pi8" +
--           "0n1+baawmU9e2o6x/XR7raIQVb4mskGQQaO4ydNENlATeTE1kXOQc/agXDpZqhq42dQL2US9G1Wl" +
--           "G5XEzaWJbyTBddzcTuSmAYTMOKybQWsmeppIbk5nqcbxJ1RHO37B10TeRL3KU543kUKF0J8leqgq" +
--           "8ae8PdAd6ltPL954LXQV/m4HEbgaYqjT6KNZHWhAKd5+mzpDN4WflUdw5koweitv4lldX2QpxQSc" +
--           "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" +
--           "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
--           "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
--  }
 +           "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
 +           "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
 +           "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
@@ -595,11 +557,10 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew
 +           "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
 +           "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
 +           "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
-+  }
+   }
  };
  
- // The process of adding a new default snippet involves:
-@@ -106,13 +49,15 @@
+@@ -78,8 +49,8 @@
  //   * add an entry here in the proper ordering (based on spans)
  // The <a/> part of the snippet will be linked to the corresponding url.
  const DEFAULT_SNIPPETS_URLS = [
@@ -610,33 +571,17 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew
  ];
  
  const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
+@@ -141,10 +112,6 @@
+   if (searchEngineInfo.image) {
+     let logoElt = document.getElementById("searchEngineLogo");
+     logoElt.src = searchEngineInfo.image;
+-#ifdef XP_MACOSX
+-    if (searchEngineInfo.imageHD && window.matchMedia("(min-resolution: 2dppx)"))
+-      logoElt.src = searchEngineInfo.imageHD;
+-#endif
+     logoElt.alt = searchEngineName;
+   }
  
--let gSearchEngine;
-+// Bug with dom.storage.enabled set as false
-+// We are using DDG HTML as a default in this case.
-+let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?q=_searchTerms_"};
- 
- document.addEventListener("DOMContentLoaded", function init() {
-   setupSearchEngine();
-@@ -142,13 +87,13 @@
- 
- function setupSearchEngine()
- {
--  gSearchEngine = JSON.parse(localStorage["search-engine"]);
--
--  if (!gSearchEngine)
--    return;
-+  if (localStorage && localStorage["search-engine"]) {
-+        gSearchEngine = JSON.parse(localStorage["search-engine"]);
-+  }
- 
-+  
-   // Look for extended information, like logo and links.
--  let searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name];
-+  var searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name];
-   if (searchEngineInfo) {
-     for (let prop in searchEngineInfo)
-       gSearchEngine[prop] = searchEngineInfo[prop];
 diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties iceweasel-17.0.1/debian/branding/locales/browserconfig.properties
 --- iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties	2012-12-01 07:21:01.000000000 -0200
 +++ iceweasel-17.0.1/debian/branding/locales/browserconfig.properties	2012-12-04 16:47:47.039271071 -0200
@@ -668,25 +613,25 @@ diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties
 +# 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/
-diff -urN iceweasel-17.0.1.orig/debian/branding/firefox-branding.js iceweasel-17.0.1/debian/branding/firefox-branding.js
---- iceweasel-17.0.1.orig/debian/branding/firefox-branding.js	2012-12-01 07:21:01.000000000 -0200
-+++ iceweasel-17.0.1/debian/branding/firefox-branding.js	2012-12-04 16:22:08.817372515 -0200
-@@ -1,3 +1,7 @@
+diff -urN iceweasel-18.0.orig/debian/branding/firefox-branding.js iceweasel-18.0/debian/branding/firefox-branding.js
+--- iceweasel-18.0.orig/debian/branding/firefox-branding.js	2013-01-08 17:55:47.000000000 -0200
++++ iceweasel-18.0/debian/branding/firefox-branding.js	2013-01-10 01:49:05.807790675 -0200
+@@ -1,3 +1,6 @@
  pref("startup.homepage_override_url","");
  pref("startup.homepage_welcome_url","");
  pref("app.releaseNotesURL", "http://mozilla.debian.net/%LOCALE%/%APP%/%VERSION%/releasenotes/");
 +
-+// Disable localstorage for privacy reasons. We will rewrite about:home js to
-+// fix the bug.
++// Disable localstorage for privacy reasons.
 +pref("dom.storage.enabled", false);
-diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.css
---- iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css	2012-11-29 02:43:23.000000000 -0200
-+++ iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.css	2012-12-04 06:31:10.410410656 -0200
-@@ -66,7 +66,7 @@
+diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css iceweasel-18.0/browser/base/content/abouthome/aboutHome.css
+--- iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css	2013-01-04 21:44:27.000000000 -0200
++++ iceweasel-18.0/browser/base/content/abouthome/aboutHome.css		2013-01-10 01:35:44.497079456 -0200
+@@ -66,8 +66,7 @@
  #searchEngineLogo {
    display: inline-block;
    height: 28px;
 -  width: 70px;
+-  min-width: 70px;
 +  width: 47px;
  }
  
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index e79896323..8b5e52d9e 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -21,9 +21,6 @@ ac_add_options --with-pthreads
 
 # Features
 ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-tests
@@ -32,9 +29,6 @@ ac_add_options --disable-installer
 
 # Optimization
 ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
 # Iceweasel