icecat: updating package

5 files changed, 182 insertions, 217 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 88bd70c09..fd050fb27 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): emulatorman <andre.paulista@adinet.com.uy>
-# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (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>
@@ -14,108 +14,102 @@
 # the value for 'browser.dictionaries.download.url' in 'libre.patch'
 
 _pgo=false
-
-_pkgname=icecat
-pkgver=13.0.1
+pkgname=icecat
+pkgver=14.0
 pkgrel=2
-
-if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
-if $_pgo; then
-  pkgname+='-pgo'
-fi
-
-pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2' 'MPL' 'LGPL')
+pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
+arch=(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'
+  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.3'
+  sqlite3
+  startup-notification
 )
 makedepends=(
-  'autoconf2.13'
-  'diffutils'
-  'imagemagick'
-  'libidl2'
-  'librsvg'
-  'libxslt'
-  'mesa'
-  'pkg-config'
-  'python2'
-  'unzip'
-  'wireless_tools'
-  'zip'
+  autoconf2.13
+  diffutils
+  imagemagick
+  libidl2
+  librsvg
+  libxslt
+  mesa
+  pkg-config
+  python2
+  unzip
+  wireless_tools
+  zip
+)
+optdepends=(
+  'wireless_tools: Location detection via available WiFi networks'
 )
 if $_pgo; then
-  makedepends+=('xorg-server-xvfb')
+  makedepends+=(xorg-server-xvfb)
   options=(!ccache)
 fi
-
-url="http://www.gnu.org/software/gnuzilla/"
-install=icecat.install
-source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/${pkgname}-${pkgver}.tar.gz
-        mozconfig
-        mozconfig.pgo
-        xulrunner-copy-stub.patch
-        libre.patch
-        icecat.desktop
-        icecat-safe.desktop
-        icecat-install-dir.patch
-        vendor.js
-        cairo.patch)
-
-md5sums=('ba249f3e889089dc64615333dd324791'
-         '3117865902d1a20ab61d75707be9888e'
-         'ac29b01c189f20abae2f3eef1618ffc0'
-         '683c4540ab84c220937feb7d1a1450ee'
-         'cd52a6e3f138fa92267600cc53ff4247'
-         'e81ad01dbc16ba28bf92ba4b7c309ca7'
-         'd93fe402b87cd000a869e1fd6badc6c9'
-         '268e65c8fcae6152e156c09760a18dfd'
-         '0d053487907de4376d67d8f499c5502b'
-         '721c59ffc14f14cb0d3a90b7e84df70e')
-
-if [ "$_pkgname" != "$pkgname" ]; then
-  provides+=("$_pkgname")
-  conflicts+=("$_pkgname")
-fi
+options=(!emptydirs)
+url=http://www.gnu.org/software/gnuzilla/
+install=$pkgname.install
+source=(
+  ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
+  mozconfig
+  mozconfig.pgo
+  xulrunner-copy-stub.patch
+  libre.patch
+  $pkgname.desktop
+  $pkgname-safe.desktop
+  $pkgname-install-dir.patch
+  vendor.js
+  cairo.patch
+)
+md5sums=(
+  6bb02202cd568e8a4f43239b8f52a4a7
+  3117865902d1a20ab61d75707be9888e
+  ac29b01c189f20abae2f3eef1618ffc0
+  3009b176cc5f9b1e416b1bf7c45b064b
+  72e6bb9ebebe555b4ab961add3df3b27
+  e81ad01dbc16ba28bf92ba4b7c309ca7
+  d93fe402b87cd000a869e1fd6badc6c9
+  b320085e7effa2890a79f4f45760614b
+  0d053487907de4376d67d8f499c5502b
+  c8552d030494443218d88792f4dbbd0f
+)
 
 build() {
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
-  export PYTHON="/usr/bin/python2"
-  mv "$_pkgname-$pkgver" "$srcdir/mozilla-build"
-  cd "$srcdir/mozilla-build"
-
-  patch -Np1 -i "$srcdir/icecat-install-dir.patch" # install to /usr/lib/$pkgname
-  patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix
-  patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff
-  patch -Np1 -i "$srcdir/cairo.patch"
-
-  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+  mv $pkgname-$pkgver $srcdir/gnuzilla-build
+  cd $srcdir/gnuzilla-build
 
+  cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch
   if $_pgo; then
-    cat "$srcdir/mozconfig.pgo" >> .mozconfig
+    cat $srcdir/mozconfig.pgo >> .mozconfig
   fi
+  patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname
+  patch -Np1 -i $srcdir/xulrunner-copy-stub.patch # small fix
+  patch -Np1 -i $srcdir/libre.patch # Remove Google+Mozilla stuff
+  patch -Np1 -i $srcdir/cairo.patch # fix cairo
+
+  # Fix for use nspr, sqlite and nss external
+  sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
+    browser/installer/Makefile.in
 
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
     browser/base/Makefile.in
 
   # This is a bug, we should fix it.
-  if [ "$CARCH" = "mips64el" ]; then
+  if [ $CARCH = mips64el ]; then
       # Fix MIPS N32 support.
       sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
           js/src/assembler/wtf/Platform.h
@@ -129,44 +123,43 @@ build() {
   fi
 
   chmod +x build/unix/run-icecat.sh # fix bug for bad file permition
+  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"
+    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS
     kill $! || true
   else
-    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS
   fi
 }
 
 package() {
-  cd "$srcdir/mozilla-build"
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
+  cd $srcdir/gnuzilla-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/pref
 
-  brandingdir="browser/branding/unofficial"
-  icondir="$pkgdir/usr/share/icons/hicolor"
+  brandingdir=browser/branding/unofficial
+  icondir=$pkgdir/usr/share/icons/hicolor
   for i in 16x16 32x32 48x48; do
-    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
+    install -Dm644 $brandingdir/default${i/x*/}.png $icondir/$i/apps/$pkgname.png
   done
 
-  install -d                                  "$pkgdir/usr/share/applications"
-  install -m644 "$srcdir/icecat.desktop"      "$pkgdir/usr/share/applications"
-  install -m644 "$srcdir/icecat-safe.desktop" "$pkgdir/usr/share/applications"
+  for d in $pkgname $pkgname-safe; do
+    install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop
+  done
 
-  rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins}
-  ln -sf /usr/share/hunspell            "$pkgdir/usr/lib/$_pkgname/dictionaries"
-  ln -sf /usr/share/hyphen              "$pkgdir/usr/lib/$_pkgname/hyphenation"
-  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$_pkgname/plugins"
-  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins"
+  rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation,searchplugins,plugins}
+  ln -sf /usr/share/hunspell            $pkgdir/usr/lib/$pkgname/dictionaries
+  ln -sf /usr/share/hyphen              $pkgdir/usr/lib/$pkgname/hyphenation
+  ln -sf /usr/lib/mozilla/plugins       $pkgdir/usr/lib/$pkgname/plugins
+  ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/searchplugins
 
   # We don't want the development stuff
-  rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
-
-  # Fix a bug with https-everywhere (duplicate rules)
-  #rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD"
+  rm -rf $pkgdir/usr/{include,lib/$pkgname-devel,share/idl}
 
   # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
+  ln -sf $pkgname $pkgdir/usr/lib/$pkgname/$pkgname-bin
 }
diff --git a/libre/icecat/cairo.patch b/libre/icecat/cairo.patch
index 981eff883..a1fabee90 100644
--- a/libre/icecat/cairo.patch
+++ b/libre/icecat/cairo.patch
@@ -1,16 +1,6 @@
-From: Uli Schlachter <psychon@znc.in>
-Date: Thu, 17 May 2012 10:51:11 +0200
-Subject: Bug 722975 - Make system cairo work again
-
----
- gfx/thebes/gfxPlatform.cpp |   16 ++++------------
- 1 file changed, 4 insertions(+), 12 deletions(-)
-
-diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
-index fb06fba..a0edefc 100644
 --- a/gfx/thebes/gfxPlatform.cpp
 +++ b/gfx/thebes/gfxPlatform.cpp
-@@ -436,11 +436,9 @@ void SourceBufferDestroy(void *srcBuffer)
+@@ -459,11 +459,9 @@ void SourceBufferDestroy(void *srcBuffer)
    static_cast<SourceSurface*>(srcBuffer)->Release();
  }
  
@@ -24,7 +14,7 @@ index fb06fba..a0edefc 100644
    origSurf->SetData(&kSourceSurface, NULL, NULL);
  }
  
-@@ -512,14 +510,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa
+@@ -535,14 +533,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa
                                                       imgSurface->Stride(),
                                                       format);
  
diff --git a/libre/icecat/icecat-install-dir.patch b/libre/icecat/icecat-install-dir.patch
index 6609650da..eb698f307 100644
--- a/libre/icecat/icecat-install-dir.patch
+++ b/libre/icecat/icecat-install-dir.patch
@@ -1,9 +1,8 @@
-diff -Nur icecat-12.0.orig/config/autoconf.mk.in icecat-12.0/config/autoconf.mk.in
---- icecat-12.0.orig/config/autoconf.mk.in	2011-12-31 17:07:52.000000000 -0500
-+++ icecat-12.0/config/autoconf.mk.in	2011-12-31 17:11:18.000000000 -0500
+--- a/config/autoconf.mk.in
++++ b/config/autoconf.mk.in
 @@ -74,8 +74,8 @@
  mandir		= @mandir@
- idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
  
 -installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 -sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
@@ -12,9 +11,9 @@ diff -Nur icecat-12.0.orig/config/autoconf.mk.in icecat-12.0/config/autoconf.mk.
  
  DIST		= $(DEPTH)/dist
  LIBXUL_SDK      = @LIBXUL_SDK@
-diff -Nur icecat-12.0.orig/js/src/config/autoconf.mk.in icecat-12.0/js/src/config/autoconf.mk.in
---- icecat-12.0.orig/js/src/config/autoconf.mk.in	2011-12-20 18:28:21.000000000 -0500
-+++ icecat-12.0/js/src/config/autoconf.mk.in	2011-12-31 17:11:43.000000000 -0500
+diff -Nur a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
+--- a/js/src/config/autoconf.mk.in
++++ b/js/src/config/autoconf.mk.in
 @@ -60,8 +60,8 @@
  datadir		= @datadir@
  mandir		= @mandir@
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index a4c76b6f5..18dfcc177 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,36 +1,27 @@
-diff -Naur icecat-13.0.1/browser/app/profile/firefox.js icecat-13.0.1-libre/browser/app/profile/firefox.js
---- icecat-13.0.1/browser/app/profile/firefox.js	2012-07-12 14:27:37.000000000 -0300
-+++ icecat-13.0.1-libre/browser/app/profile/firefox.js	2012-07-17 21:35:32.600229972 -0300
-@@ -65,6 +65,7 @@
+diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
+--- a/browser/app/profile/firefox.js
++++ b/browser/app/profile/firefox.js
+@@ -70,6 +70,7 @@
  pref("extensions.getAddons.cache.enabled", true);
  pref("extensions.getAddons.maxResults", 15);
- pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
- pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
- pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
- pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-@@ -82,7 +83,7 @@
+ pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html");
+ pref("extensions.getAddons.search.browseURL","http://www.gnu.org/software/gnuzilla/addons.html");
+ pref("extensions.getAddons.search.url","http://www.gnu.org/software/gnuzilla/addons.html");
+ pref("extensions.webservice.discoverURL","http://www.gnu.org/software/gnuzilla/addons.html");
+@@ -87,7 +88,7 @@
  pref("extensions.update.autoUpdateDefault", true);
  
  // Dictionary download preference
 -pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "about:blank");
++pref("browser.dictionaries.download.url","http://www.gnu.org/software/gnuzilla/addons.html");
  
  // The minimum delay in seconds for the timer to fire.
  // default=2 minutes
-@@ -247,7 +248,7 @@
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
- // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
- pref("browser.startup.page",                1);
--pref("browser.startup.homepage",            "chrome://branding/locale/browserconfig.properties");
-+pref("browser.startup.homepage",            "about:home");
- 
- // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
- // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-diff -Naur icecat-13.0.1/browser/base/content/aboutHome.js icecat-13.0.1-libre/browser/base/content/abouthome/aboutHome.js
---- icecat-13.0.1/browser/base/content/abouthome/aboutHome.js	2012-07-12 14:27:37.000000000 -0300
-+++ icecat-13.0.1-libre/browser/base/content/abouthome/aboutHome.js	2012-07-17 23:19:05.593724417 -0300
-@@ -37,104 +37,6 @@
+diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
+--- a/browser/base/content/abouthome/aboutHome.js
++++ b/browser/base/content/abouthome/aboutHome.js
+@@ -38,104 +38,6 @@
   *
   * ***** END LICENSE BLOCK ***** */
  
@@ -135,18 +126,19 @@ diff -Naur icecat-13.0.1/browser/base/content/aboutHome.js icecat-13.0.1-libre/b
  // The process of adding a new default snippet involves:
  //   * add a new entity to aboutHome.dtd
  //   * add a <span/> for it in aboutHome.xhtml
-@@ -142,7 +44,7 @@
+@@ -143,7 +45,7 @@
  // The <a/> part of the snippet will be linked to the corresponding url.
  const DEFAULT_SNIPPETS_URLS = [
-   "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
+-  "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
 -, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
++  "https://www.gnu.org/software/gnuzilla/?WT.mc_ID=default1"
 +, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2"
  ];
  
  const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
-diff -Naur icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.properties icecat-13.0.1-libre/browser/locales/en-US/chrome/browser-region/region.properties
---- icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.properties	2012-07-12 14:27:37.000000000 -0300
-+++ icecat-13.0.1-libre/browser/locales/en-US/chrome/browser-region/region.properties	2012-07-17 22:01:56.786224684 -0300
+diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
+--- a/browser/locales/en-US/chrome/browser-region/region.properties
++++ b/browser/locales/en-US/chrome/browser-region/region.properties
 @@ -1,28 +1,28 @@
  # Default search engine
 -browser.search.defaultenginename=Google
@@ -183,7 +175,7 @@ diff -Naur icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.prop
  # 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=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
+-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
 +browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
  
  # increment this number when anything gets changed in the list below.  This will
@@ -210,9 +202,9 @@ diff -Naur icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.prop
 +# 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 -Naur icecat-13.0.1/browser/locales/generic/profile/bookmarks.html.in icecat-13.0.1-libre/browser/locales/generic/profile/bookmarks.html.in
---- icecat-13.0.1/browser/locales/generic/profile/bookmarks.html.in	2012-07-12 14:27:37.000000000 -0300
-+++ icecat-13.0.1-libre/browser/locales/generic/profile/bookmarks.html.in	2012-07-17 23:34:22.488558721 -0300
+diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
+--- a/browser/locales/generic/profile/bookmarks.html.in
++++ b/browser/locales/generic/profile/bookmarks.html.in
 @@ -11,13 +11,20 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
@@ -240,9 +232,9 @@ diff -Naur icecat-13.0.1/browser/locales/generic/profile/bookmarks.html.in iceca
 +        <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 -Naur icecat-13.0.1/build/pgo/blueprint/elements.html icecat-13.0.1-libre/build/pgo/blueprint/elements.html
---- icecat-13.0.1/build/pgo/blueprint/elements.html	2012-07-12 14:27:37.000000000 -0300
-+++ icecat-13.0.1-libre/build/pgo/blueprint/elements.html	2012-07-17 21:44:48.052812473 -0300
+diff -Nur a/build/pgo/blueprint/elements.html b/build/pgo/blueprint/elements.html
+--- a/build/pgo/blueprint/elements.html
++++ b/build/pgo/blueprint/elements.html
 @@ -143,7 +143,7 @@
        </p>
        <p>
@@ -252,9 +244,9 @@ diff -Naur icecat-13.0.1/build/pgo/blueprint/elements.html icecat-13.0.1-libre/b
        </p>
        <p>
          <abbr title="extended abbr text should show when mouse over">&lt;abbr&gt; abbr - extended text when mouseover.</abbr><br>
-diff -Naur icecat-13.0.1/dom/ipc/test.xul icecat-13.0.1-libre/dom/ipc/test.xul
---- icecat-13.0.1/dom/ipc/test.xul	2012-07-12 14:27:37.000000000 -0300
-+++ icecat-13.0.1-libre/dom/ipc/test.xul	2012-07-17 21:48:08.242020288 -0300
+diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
+--- a/dom/ipc/test.xul
++++ b/dom/ipc/test.xul
 @@ -294,6 +294,6 @@
                 oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
    </toolbar>
@@ -263,9 +255,9 @@ diff -Naur icecat-13.0.1/dom/ipc/test.xul icecat-13.0.1-libre/dom/ipc/test.xul
 +  <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="page" remote="true"/>
    <label id="messageLog" value="" crop="center"/>
  </window>
-diff -Naur icecat-13.0.1/layout/ipc/test-ipcbrowser.xul icecat-13.0.1-libre/layout/ipc/test-ipcbrowser.xul
---- icecat-13.0.1/layout/ipc/test-ipcbrowser.xul	2012-07-12 14:27:37.000000000 -0300
-+++ icecat-13.0.1-libre/layout/ipc/test-ipcbrowser.xul	2012-07-17 21:48:50.526879514 -0300
+diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
+--- a/layout/ipc/test-ipcbrowser.xul
++++ b/layout/ipc/test-ipcbrowser.xul
 @@ -69,6 +69,6 @@
         label="setViewportScale"/>
    </toolbar>
@@ -274,10 +266,10 @@ diff -Naur icecat-13.0.1/layout/ipc/test-ipcbrowser.xul icecat-13.0.1-libre/layo
 +  <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="content"
             remote="true"/>
  </window>
-diff -Naur icecat-13.0.1/mobile/android/app/mobile.js icecat-13.0.1-libre/mobile/android/app/mobile.js
---- icecat-13.0.1/mobile/android/app/mobile.js	2012-07-12 14:27:37.000000000 -0300
-+++ icecat-13.0.1-libre/mobile/android/app/mobile.js	2012-07-17 22:14:47.293560718 -0300
-@@ -226,13 +226,13 @@
+diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
+--- a/mobile/android/app/mobile.js
++++ b/mobile/android/app/mobile.js
+@@ -230,13 +230,13 @@
  /* preferences for the Get Add-ons pane */
  pref("extensions.getAddons.cache.enabled", true);
  pref("extensions.getAddons.maxResults", 15);
@@ -288,28 +280,19 @@ diff -Naur icecat-13.0.1/mobile/android/app/mobile.js icecat-13.0.1-libre/mobile
 -pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/");
 -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
 -pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.browseAddons","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html");
  
  /* preference for the locale picker */
  pref("extensions.getLocales.get.url", "");
-@@ -252,7 +252,7 @@
- pref("dom.disable_window_open_dialog_feature", true);
- 
- pref("keyword.enabled", true);
--pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
- 
- pref("accessibility.typeaheadfind", false);
- pref("accessibility.typeaheadfind.timeout", 5000);
-diff -Naur icecat-13.0.1/mobile/locales/en-US/chrome/region.properties icecat-13.0.1-libre/mobile/locales/en-US/chrome/region.properties
---- icecat-13.0.1/mobile/locales/en-US/chrome/region.properties	2012-07-12 14:27:37.000000000 -0300
-+++ icecat-13.0.1-libre/mobile/locales/en-US/chrome/region.properties	2012-07-17 22:01:03.952816711 -0300
+diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties
+--- a/mobile/locales/en-US/chrome/region.properties
++++ b/mobile/locales/en-US/chrome/region.properties
 @@ -1,18 +1,18 @@
  # Default search engine
 -browser.search.defaultenginename=Google
@@ -331,7 +314,7 @@ diff -Naur icecat-13.0.1/mobile/locales/en-US/chrome/region.properties icecat-13
 +browser.contentHandlers.types.1.uri=about:blank
  
  # Keyword URL (for location bar searches)
--keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
+-keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
 +keyword.URL=https://duckduckgo.com/lite/?q=
  
  # increment this number when anything gets changed in the list below.  This will
@@ -354,9 +337,9 @@ diff -Naur icecat-13.0.1/mobile/locales/en-US/chrome/region.properties icecat-13
 +gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
 +gecko.handlerService.schemes.mailto.1.name=
 +gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
-diff -Naur icecat-13.0.1/mobile/xul/app/mobile.js icecat-13.0.1-libre/mobile/xul/app/mobile.js
---- icecat-13.0.1/mobile/xul/app/mobile.js	2012-07-12 14:27:37.000000000 -0300
-+++ icecat-13.0.1-libre/mobile/xul/app/mobile.js	2012-07-17 22:08:34.513828987 -0300
+diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js
+--- a/mobile/xul/app/mobile.js
++++ b/mobile/xul/app/mobile.js
 @@ -221,13 +221,13 @@
  /* preferences for the Get Add-ons pane */
  pref("extensions.getAddons.cache.enabled", true);
@@ -368,13 +351,13 @@ diff -Naur icecat-13.0.1/mobile/xul/app/mobile.js icecat-13.0.1-libre/mobile/xul
 -pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
 -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
 -pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.browseAddons","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html");
  
  /* preference for the locale picker */
  pref("extensions.getLocales.get.url", "");
@@ -382,26 +365,26 @@ diff -Naur icecat-13.0.1/mobile/xul/app/mobile.js icecat-13.0.1-libre/mobile/xul
  pref("dom.disable_window_open_dialog_feature", true);
  
  pref("keyword.enabled", true);
--pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
+-pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=");
++pref("keyword.URL","https://duckduckgo.com/lite/?q=");
  
  pref("accessibility.typeaheadfind", false);
  pref("accessibility.typeaheadfind.timeout", 5000);
-diff -Naur icecat-13.0.1/modules/libpref/src/init/all.js icecat-13.0.1-libre/modules/libpref/src/init/all.js
---- icecat-13.0.1/modules/libpref/src/init/all.js	2012-07-12 14:27:37.000000000 -0300
-+++ icecat-13.0.1-libre/modules/libpref/src/init/all.js	2012-07-17 22:16:45.176878991 -0300
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
- //  The first character after a period must be alphabetic.
+diff -Nur a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
+--- a/modules/libpref/src/init/all.js
++++ b/modules/libpref/src/init/all.js
+@@ -52,7 +52,7 @@
+  *  - Computed values (e.g. 50 * 1024) don't work.
+  */
  
--pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
+-pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
++pref("keyword.URL","https://duckduckgo.com/lite/?q=");
  pref("keyword.enabled", false);
  pref("general.useragent.locale", "chrome://global/locale/intl.properties");
  pref("general.useragent.compatMode.firefox", false);
-diff -Naur icecat-13.0.1/toolkit/locales/en-US/chrome/global-region/region.properties icecat-13.0.1-libre/toolkit/locales/en-US/chrome/global-region/region.properties
---- icecat-13.0.1/toolkit/locales/en-US/chrome/global-region/region.properties	2012-07-12 14:27:37.000000000 -0300
-+++ icecat-13.0.1-libre/toolkit/locales/en-US/chrome/global-region/region.properties	2012-07-17 21:58:17.176492031 -0300
+diff -Naur a/toolkit/locales/en-US/chrome/global-region/region.properties b/toolkit/locales/en-US/chrome/global-region/region.properties
+--- a/toolkit/locales/en-US/chrome/global-region/region.properties
++++ b/toolkit/locales/en-US/chrome/global-region/region.properties
 @@ -4,10 +4,10 @@
  pluginStartupMessage=Starting Plugin for type
  
diff --git a/libre/icecat/xulrunner-copy-stub.patch b/libre/icecat/xulrunner-copy-stub.patch
index d69bb4b16..8ccf127df 100644
--- a/libre/icecat/xulrunner-copy-stub.patch
+++ b/libre/icecat/xulrunner-copy-stub.patch
@@ -1,6 +1,6 @@
---- icecat-12.0/browser/app/Makefile.in~	2011-12-25 16:19:29.000000000 -0500
-+++ icecat-12.0/browser/app/Makefile.in		2011-12-25 16:19:55.000000000 -0500
-@@ -224,7 +224,7 @@
+--- a/browser/app/Makefile.in
++++ b/browser/app/Makefile.in
+@@ -233,7 +233,7 @@
  else
  ifdef LIBXUL_SDK
  libs::