From 86285d128130e52a03d1edc11783e6ed82b5a35d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Dec 2012 23:01:47 -0500 Subject: mv libre/debhelper pcr; split, update libre/dpkg --- libre/debhelper/PKGBUILD | 29 ------- libre/dpkg/PKGBUILD | 142 +++++++++++++++++++++++++++-------- libre/dpkg/compare | 26 +++++++ libre/dpkg/compare.mk | 8 ++ libre/dpkg/dpkg-arch.patch | 17 ----- libre/dpkg/dpkg-gzip-rsyncable.patch | 11 +++ libre/dpkg/dpkg-rsyncable.patch | 12 --- pcr/debhelper/PKGBUILD | 29 +++++++ 8 files changed, 183 insertions(+), 91 deletions(-) delete mode 100644 libre/debhelper/PKGBUILD create mode 100755 libre/dpkg/compare create mode 100644 libre/dpkg/compare.mk delete mode 100644 libre/dpkg/dpkg-arch.patch create mode 100644 libre/dpkg/dpkg-gzip-rsyncable.patch delete mode 100644 libre/dpkg/dpkg-rsyncable.patch create mode 100644 pcr/debhelper/PKGBUILD diff --git a/libre/debhelper/PKGBUILD b/libre/debhelper/PKGBUILD deleted file mode 100644 index 60ff8f267..000000000 --- a/libre/debhelper/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer (AUR): Antoine Lubineau -# Contributor (AUR): Andrei "Garoth" Thorp -# Contributor (Parabola): Luke Shumaker - -_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid -debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; } - -pkgname=debhelper -pkgver=9.20120322 -pkgrel=1 -pkgdesc="A collection of programs that can be used in a debian/rules file to automate common tasks" -arch=('any') -url="http://packages.debian.org/${pkgname}" -license='GPL3' -depends=('binutils' 'dpkg' 'file' 'html2text' 'man-db' 'perl') -makedepends=('po4a') -source=(`debfile ${pkgname}`/${pkgname}_$pkgver.tar.gz) - -build() { - cd "$srcdir/$pkgname" - make -} - -package() { - cd "$srcdir/$pkgname" - make DESTDIR="$pkgdir" install -} - -md5sums=('9ea56782e6396a59ec49f45f9c4a603f') diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD index 175b80610..aa82d36e6 100644 --- a/libre/dpkg/PKGBUILD +++ b/libre/dpkg/PKGBUILD @@ -1,49 +1,125 @@ +# Maintainer: Luke Shumaker # Maintainer (AUR): Jochen Schalanda +# Contributor (AUR): Pierre Carrier # Contributor (AUR): Thomas Dziedzic # Contributor (AUR): Chris Giles # Contributor (AUR): seblu # Contributor (AUR): squiddo -# Contributor (Parabola): Luke Shumaker - -_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid -debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; } - -# TODO: split into (dpkg dpkg-devtools dselect dpkg-perl) -pkgname=dpkg -pkgver=1.16.2 -pkgrel=1 -pkgdesc="The Debian Package Manager and utilities. Don't use it instead of 'pacman'." -arch=('i686' 'x86_64') -url="http://packages.debian.org/${pkgname}" + +pkgbase=dpkg +#pkgname=(dpkg dpkg-devtools dselect libdpkg perl-dpkg) +pkgname=(dpkg-devtools perl-dpkg) +pkgdesc="Debian Package manager and utilities" license=('GPL2') -depends=('bzip2' 'perl-timedate') -makedepends=('gcc' 'make' 'patch') -optdepends=('fakeroot') -replaces=(dpkg-ubuntu) -conflits=(dpkg-ubuntu) -source=(`debfile ${pkgname}`/${pkgname}_${pkgver}.tar.bz2 - dpkg-rsyncable.patch dpkg-arch.patch) + +pkgver=1.16.9 +url="http://packages.debian.org/source/sid/dpkg" +_debrepo=http://ftp.debian.org/debian/pool/main # Debian Sid + +pkgrel=1.1 +debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; } +arch=('i686' 'x86_64' 'mips64el') +depends=('bzip2' 'xz' 'zlib' 'ncurses') +checkdepends=('perl-test-pod') +makedepends=('perl-io-string' 'perl-timedate') +source=("$(debfile ${pkgbase} ${pkgver}).tar.xz" + dpkg-gzip-rsyncable.patch) + +###################################################################### + +# This is really gross. +# It uses the debian control files to help us split the package. +# Shame on the dpkg developers for not putting that logic into the build system. +_destdir="$srcdir/$pkgbase-$pkgver/debian/pkg-makepkg" +_debhelper_install() { + local debname=$1 + cd "$_destdir" + + # main files + sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \ + | while read pattern dest; do + if [[ -z $dest ]]; then + for file in $pattern; do + install -d "$pkgdir/${file%/*}" + cp -a "$file" "$pkgdir/$file" || true + done + else + install -d "$pkgdir/$dest/" + cp -a "$pattern" "$pkgdir/$dest/" || true + fi + done + + # manpages + sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null \ + | while read pattern; do + for file in $pattern; do + install -d "$pkgdir/${file%/*}" + cp -a "$file" "$pkgdir/$file" || true + done + done + + # other documentation + install -d "$pkgdir/usr/share/doc/$pkgname/" + sed '/^\s*$/d' ../$debname.docs 2>/dev/null \ + | while read file; do + gzip \ + < "$srcdir/$pkgbase-$pkgver/$file" \ + > "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz" + done + + # symlinks + sed '/^\s*$/d' ../$debname.links 2>/dev/null \ + | while read file link; do + ln -s "/$file" "$pkgdir/$link" + done +} + +###################################################################### build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" - patch -p1 -i "${srcdir}/dpkg-rsyncable.patch" - patch -p1 -i "${srcdir}/dpkg-arch.patch" # Architecture detection + patch -p0 -i "${srcdir}/dpkg-gzip-rsyncable.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --without-start-stop-daemon + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma make + make DESTDIR="$_destdir" install +} + +check() { + cd "${srcdir}/${pkgbase}-${pkgver}" + make check +} + +package_dpkg() { + pkgdesc="Debian Package manager" + provides+=(start-stop-daemon) + conflicts+=(start-stop-daemon) + _debhelper_install dpkg } -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install +package_dpkg-devtools() { + pkgdesc="Debian Package development tools" + arch=(any) + depends+=(perl-dpkg) + _debhelper_install dpkg-dev +} + +package_dselect() { + pkgdesc="Debian Package manager high-level interface" + _debhelper_install dselect +} + +package_libdpkg() { + pkgdesc="Debian Package manager library (static)" + _debhelper_install libdpkg-dev +} - # Variables - install -d "${pkgdir}/var/${pkgname}/updates/" - touch "${pkgdir}/var/lib/${pkgname}/{status,available}" +package_perl-dpkg() { + pkgdesc="Debian Package perl modules" + arch=(any) + _debhelper_install libdpkg-perl } -md5sums=('629ba7ee2024e6a5c0ff807aa2db02f8' - 'bc36609f6191c5b509fae58c21966c95' - '24ab12e79989a2e7f31653fb1dd3cdf9') +md5sums=('4df9319b2d17e19cdb6fe94dacee44da' + '5ab63758999e9bb10f84bce79a0307b2') diff --git a/libre/dpkg/compare b/libre/dpkg/compare new file mode 100755 index 000000000..4556440a5 --- /dev/null +++ b/libre/dpkg/compare @@ -0,0 +1,26 @@ +#!/bin/bash +# compare the packages extracted in pkg/ to the packages from debian + +_check() { + local pacpkg=$1 + local debpkg=$2 + + libremessages msg "dpkg:$debpkg -> pacman:$pacpkg" + + make -f compare.mk tmp/$pacpkg.pacman.filelist tmp/$debpkg.debian.filelist &>/dev/null + + echo -e 'pacman\tdpkg' + comm -3 \ + <(sed -e 's|\.gz$||' tmp/$pacpkg.pacman.filelist|sort) \ + <(sed -e 's|\.gz$||' -e '/^usr\/share\/man\/..\/man.\//d' -e 's|usr/share/perl5/|&vendor_perl/|' -e "s|$debpkg|$pacpkg|g" tmp/$debpkg.debian.filelist|sort) +} + +mkdir -p tmp + +_check dpkg dpkg +_check dpkg-devtools dpkg-dev +_check dselect dselect +_check libdpkg libdpkg-dev +_check perl-dpkg libdpkg-perl + +rm -rf tmp diff --git a/libre/dpkg/compare.mk b/libre/dpkg/compare.mk new file mode 100644 index 000000000..88219f283 --- /dev/null +++ b/libre/dpkg/compare.mk @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +# Assist file for ./compare + +tmp/%.debian.filelist: + curl http://packages.debian.org/sid/all/$*/filelist|sed -n "/
/,/<\/pre>/{ s|.*
||; s|
.*||; /./p }"|sed 's|/||'|sort > $@
+
+tmp/%.pacman.filelist:
+	( cd pkg/$* && find * -not -type d; ) | sort > $@
diff --git a/libre/dpkg/dpkg-arch.patch b/libre/dpkg/dpkg-arch.patch
deleted file mode 100644
index 66e7a2ef2..000000000
--- a/libre/dpkg/dpkg-arch.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru dpkg-1.16.2.orig/scripts/Dpkg/Arch.pm dpkg-1.16.2/scripts/Dpkg/Arch.pm
---- dpkg-1.16.2.orig/scripts/Dpkg/Arch.pm	2012-03-19 02:40:08.000000000 -0400
-+++ dpkg-1.16.2/scripts/Dpkg/Arch.pm	2012-04-02 16:14:55.000000000 -0400
-@@ -49,12 +49,7 @@
-     {
- 	return $build_arch if defined $build_arch;
- 
--	# Note: We *always* require an installed dpkg when inferring the
--	# build architecture. The bootstrapping case is handled by
--	# dpkg-architecture itself, by avoiding computing the DEB_BUILD_
--	# variables when they are not requested.
--
--	my $build_arch = `dpkg --print-architecture`;
-+	my $build_arch = `uname -m`;
- 	syserr("dpkg --print-architecture failed") if $? >> 8;
- 
- 	chomp $build_arch;
diff --git a/libre/dpkg/dpkg-gzip-rsyncable.patch b/libre/dpkg/dpkg-gzip-rsyncable.patch
new file mode 100644
index 000000000..3daf6d76e
--- /dev/null
+++ b/libre/dpkg/dpkg-gzip-rsyncable.patch
@@ -0,0 +1,11 @@
+--- ./scripts/Dpkg/Compression.pm.orig	2012-04-27 04:49:02.000000000 +0200
++++ ./scripts/Dpkg/Compression.pm	2012-05-27 22:23:18.530628795 +0200
+@@ -52,7 +52,7 @@
+ my $COMP = {
+     "gzip" => {
+ 	"file_ext" => "gz",
+-	"comp_prog" => [ "gzip", "--no-name", "--rsyncable" ],
++	"comp_prog" => [ "gzip", "--no-name" ],
+ 	"decomp_prog" => [ "gunzip" ],
+ 	"default_level" => 9,
+     },
diff --git a/libre/dpkg/dpkg-rsyncable.patch b/libre/dpkg/dpkg-rsyncable.patch
deleted file mode 100644
index e7e58dfdf..000000000
--- a/libre/dpkg/dpkg-rsyncable.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru dpkg-1.16.2.orig/scripts/Dpkg/Compression.pm dpkg-1.16.2/scripts/Dpkg/Compression.pm
---- dpkg-1.16.2.orig/scripts/Dpkg/Compression.pm	2012-03-19 02:40:08.000000000 -0400
-+++ dpkg-1.16.2/scripts/Dpkg/Compression.pm	2012-04-02 16:26:27.000000000 -0400
-@@ -52,7 +52,7 @@
- my $COMP = {
-     "gzip" => {
- 	"file_ext" => "gz",
--	"comp_prog" => [ "gzip", "--no-name", "--rsyncable" ],
-+	"comp_prog" => [ "gzip", "--no-name"],
- 	"decomp_prog" => [ "gunzip" ],
- 	"default_level" => 9,
-     },
diff --git a/pcr/debhelper/PKGBUILD b/pcr/debhelper/PKGBUILD
new file mode 100644
index 000000000..60ff8f267
--- /dev/null
+++ b/pcr/debhelper/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer (AUR): Antoine Lubineau 
+# Contributor (AUR): Andrei "Garoth" Thorp 
+# Contributor (Parabola): Luke Shumaker 
+
+_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid
+debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; }
+
+pkgname=debhelper
+pkgver=9.20120322
+pkgrel=1
+pkgdesc="A collection of programs that can be used in a debian/rules file to automate common tasks"
+arch=('any')
+url="http://packages.debian.org/${pkgname}"
+license='GPL3'
+depends=('binutils' 'dpkg' 'file' 'html2text' 'man-db' 'perl')
+makedepends=('po4a')
+source=(`debfile ${pkgname}`/${pkgname}_$pkgver.tar.gz)
+
+build() {
+  cd "$srcdir/$pkgname"
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+  make DESTDIR="$pkgdir" install
+}
+
+md5sums=('9ea56782e6396a59ec49f45f9c4a603f')
-- 
cgit v1.2.3


From d4c88a78dac3584ab65d02708557048b8edad30f Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Fri, 11 Jan 2013 09:45:06 -0500
Subject: fix libre/dpkg (pkgrel 1.1->1.2) to work with gpg2 as the default gpg

---
 libre/dpkg/PKGBUILD        | 10 ++++++----
 libre/dpkg/dpkg-gpg2.patch | 11 +++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 libre/dpkg/dpkg-gpg2.patch

diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index aa82d36e6..5d7534534 100644
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
@@ -16,14 +16,14 @@ pkgver=1.16.9
 url="http://packages.debian.org/source/sid/dpkg"
 _debrepo=http://ftp.debian.org/debian/pool/main # Debian Sid
 
-pkgrel=1.1
+pkgrel=1.2
 debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
 arch=('i686' 'x86_64' 'mips64el')
 depends=('bzip2' 'xz' 'zlib' 'ncurses')
 checkdepends=('perl-test-pod')
 makedepends=('perl-io-string' 'perl-timedate')
 source=("$(debfile ${pkgbase} ${pkgver}).tar.xz"
-        dpkg-gzip-rsyncable.patch)
+        dpkg-gzip-rsyncable.patch dpkg-gpg2.patch)
 
 ######################################################################
 
@@ -79,7 +79,8 @@ _debhelper_install() {
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  patch -p0 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
+  patch -Np0 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
+  patch -Np1 -i "${srcdir}/dpkg-gpg2.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma
   make
@@ -122,4 +123,5 @@ package_perl-dpkg() {
 }
 
 md5sums=('4df9319b2d17e19cdb6fe94dacee44da'
-         '5ab63758999e9bb10f84bce79a0307b2')
+         '5ab63758999e9bb10f84bce79a0307b2'
+         '74b7ce3045690a8fc290104f10cf8d42')
diff --git a/libre/dpkg/dpkg-gpg2.patch b/libre/dpkg/dpkg-gpg2.patch
new file mode 100644
index 000000000..28671c484
--- /dev/null
+++ b/libre/dpkg/dpkg-gpg2.patch
@@ -0,0 +1,11 @@
+--- dpkg-1.16.9/scripts/Dpkg/Source/Package.pm.orig	2013-01-09 01:28:47.000000000 -0500
++++ dpkg-1.16.9/scripts/Dpkg/Source/Package.pm	2013-01-09 01:30:51.000000000 -0500
+@@ -344,7 +344,7 @@
+     my $dsc = $self->get_filename();
+     my @exec;
+     if (find_command('gpgv')) {
+-        push @exec, "gpgv";
++        push @exec, "gpgv", "--verify";
+     } elsif (find_command('gpg')) {
+         push @exec, "gpg", "--no-default-keyring", "-q", "--verify";
+     }
-- 
cgit v1.2.3


From 07d1af1bca9525df579a3805d46d6819d23cb242 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Fri, 28 Dec 2012 21:09:44 -0500
Subject: mv libre/mozilla-devscripts pcr

---
 libre/mozilla-devscripts/PKGBUILD | 32 --------------------------------
 pcr/mozilla-devscripts/PKGBUILD   | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 libre/mozilla-devscripts/PKGBUILD
 create mode 100644 pcr/mozilla-devscripts/PKGBUILD

diff --git a/libre/mozilla-devscripts/PKGBUILD b/libre/mozilla-devscripts/PKGBUILD
deleted file mode 100644
index ef7ea7641..000000000
--- a/libre/mozilla-devscripts/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Michał Masłowski  
-# Contributor: Márcio Silva 
-
-pkgname=mozilla-devscripts
-pkgver=0.32
-pkgrel=1
-pkgdesc="Development scripts used by Debian Mozilla's addons packages"
-arch=("any")
-url="http://packages.debian.org/source/unstable/mozilla-devscripts"
-license=('GPL' 'custom')
-depends=("python2" "zip" "unzip")
-_debrepo=http://ftp.debian.org/debian/pool/main/
-source=("${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.dsc"
-        "${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.tar.gz")
-md5sums=("386a5854601f29dca4a293f90f6c2a69"
-         "230126afa15fa654eb254bb4e61b4a93")
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  # Adapt it to Arch's Python naming.
-  find . -type f | xargs -L1 sed -i "s:#!/usr/bin/python:#!/usr/bin/python2:"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  # The Makefile expects the system to have standard Python name, so
-  # do this directly here.
-  python2 setup.py install --root="$pkgdir/"
-  install -Dm644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/copyright"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/mozilla-devscripts/PKGBUILD b/pcr/mozilla-devscripts/PKGBUILD
new file mode 100644
index 000000000..ef7ea7641
--- /dev/null
+++ b/pcr/mozilla-devscripts/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Michał Masłowski  
+# Contributor: Márcio Silva 
+
+pkgname=mozilla-devscripts
+pkgver=0.32
+pkgrel=1
+pkgdesc="Development scripts used by Debian Mozilla's addons packages"
+arch=("any")
+url="http://packages.debian.org/source/unstable/mozilla-devscripts"
+license=('GPL' 'custom')
+depends=("python2" "zip" "unzip")
+_debrepo=http://ftp.debian.org/debian/pool/main/
+source=("${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.dsc"
+        "${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.tar.gz")
+md5sums=("386a5854601f29dca4a293f90f6c2a69"
+         "230126afa15fa654eb254bb4e61b4a93")
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  # Adapt it to Arch's Python naming.
+  find . -type f | xargs -L1 sed -i "s:#!/usr/bin/python:#!/usr/bin/python2:"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  # The Makefile expects the system to have standard Python name, so
+  # do this directly here.
+  python2 setup.py install --root="$pkgdir/"
+  install -Dm644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/copyright"
+}
+
+# vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3


From b453854f5cbc46a46f1a35fb853e252e18951885 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Sat, 12 Jan 2013 16:01:34 -0500
Subject: libre/{icecat,iceweasel-libre}: run through moz-normalize-*

---
 libre/icecat/PKGBUILD           | 15 +++++++--
 libre/icecat/mozconfig          | 70 ++++++++++++++++++++---------------------
 libre/iceweasel-libre/PKGBUILD  | 53 +++++++++++++++++++++++++++----
 libre/iceweasel-libre/mozconfig | 62 ++++++++++++++++++------------------
 4 files changed, 123 insertions(+), 77 deletions(-)

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index cc5889c7a..9f901f3b6 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -8,7 +8,7 @@
 # Contributor (Arch): Jakub Schmidtke 
 # Thank you very much to the older contributors:
 # Contributor: evr 
-# Contributor: Muhammad 'MJ' Jassim  
+# Contributor: Muhammad 'MJ' Jassim 
 
 # If you are updating this package, don't forget to update the version number in
 # the value for 'browser.dictionaries.download.url' in 'libre.patch'
@@ -17,9 +17,18 @@ _pgo=false
 pkgname=icecat
 pkgver=17.0.1
 pkgrel=1
+if [[ -z $pkgbase ]]; then pkgbase=$pkgname; 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)
+arch=(
+  i686
+  mips64el
+  x86_64
+)
+license=(
+  GPL2
+  LGPL
+  MPL
+)
 depends=(
   alsa-lib
   dbus-glib
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index 5df8547f7..934ea9f0d 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -1,60 +1,58 @@
 . $topsrcdir/browser/config/mozconfig
 
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
 # System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
 ac_add_options --disable-system-cairo
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-pixman
+ac_add_options --enable-system-sqlite
 ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
 
 # 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
-ac_add_options --disable-mochitest
+ac_add_options --disable-gnomevfs
 ac_add_options --disable-installer
+ac_add_options --disable-mochitest
+ac_add_options --disable-safe-browsing
+ac_add_options --disable-tests
+ac_add_options --disable-updater
+ac_add_options --enable-gio
+ac_add_options --enable-startup-notification
 
+# Vendor settings
 # Optimization
 ac_add_options --enable-optimize
-
+ac_add_options --libdir=/usr/lib
+ac_add_options --prefix=/usr
+export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
-# Icecat
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
+# Platform settings
+#ac_add_options --build=i586-pc-linux-gnu
+#ac_add_options --host=i586-pc-linux-gnu
+#export USE_SHORT_LIBNAME=1
+#mk_add_options USE_SHORT_LIBNAME=1
 
+# Application settings
 ac_add_options --disable-official-branding
 ac_add_options --with-branding=browser/branding/unofficial
 ac_add_options --with-distribution-id=org.gnu.gnuzilla
 ac_add_options --with-user-appdir=.gnuzilla
+# Icecat
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
 
-# ConnochaetOS
-#ac_add_options --build=i586-pc-linux-gnu
-#ac_add_options --host=i586-pc-linux-gnu
-#export USE_SHORT_LIBNAME=1
-#mk_add_options USE_SHORT_LIBNAME=1
-
-# Parabola
-ac_add_options --disable-safe-browsing
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
+# Other
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
 # Build-generated
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 56f1e4dfa..b58061577 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -8,7 +8,7 @@
 # Contributor (Arch): Jakub Schmidtke 
 # Thank you very much to the older contributors:
 # Contributor: evr 
-# Contributor: Muhammad 'MJ' Jassim  
+# Contributor: Muhammad 'MJ' Jassim 
 
 _pgo=false
 
@@ -29,11 +29,52 @@ if $_pgo; then
   pkgname+='-pgo'
 fi
 
+if [[ -z $pkgbase ]]; then pkgbase=$pkgname; 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')
+arch=(
+  'i586'
+  'i686'
+  'mips64el'
+  'x86_64'
+)
+license=(
+  'GPL2'
+  'LGPL'
+  'MPL'
+)
+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'
+)
 [ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
 if $_pgo; then
   makedepends+=('xorg-server-xvfb')
@@ -93,7 +134,7 @@ build() {
   patch -Np1 -i "$srcdir/shared-libs.patch"
 
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
-  
+
   if $_pgo; then
     cat "$srcdir/mozconfig.pgo" >> .mozconfig
   fi
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index e79896323..619398aae 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -1,55 +1,53 @@
 . $topsrcdir/browser/config/mozconfig
 
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
 # System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
 ac_add_options --enable-system-cairo
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-pixman
+ac_add_options --enable-system-sqlite
 ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
 
 # 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
-ac_add_options --disable-mochitest
+ac_add_options --disable-gnomevfs
 ac_add_options --disable-installer
+ac_add_options --disable-mochitest
+ac_add_options --disable-safe-browsing
+ac_add_options --disable-tests
+ac_add_options --disable-updater
+ac_add_options --enable-gio
+ac_add_options --enable-startup-notification
 
+# Vendor settings
 # Optimization
 ac_add_options --enable-optimize
-
+ac_add_options --libdir=/usr/lib
+ac_add_options --prefix=/usr
+export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
-# Iceweasel
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=debian/branding
-
-# ConnochaetOS
+# Platform settings
 #ac_add_options --build=i586-pc-linux-gnu
 #ac_add_options --host=i586-pc-linux-gnu
 #export USE_SHORT_LIBNAME=1
 #mk_add_options USE_SHORT_LIBNAME=1
 
-# Parabola
-ac_add_options --disable-safe-browsing
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
+# Application settings
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=debian/branding
+
+# Other
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
 # Build-generated
-- 
cgit v1.2.3


From 6bafdd178eae7fe285a158da7ff6176deb9ca5e2 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Sat, 12 Jan 2013 16:44:09 -0500
Subject: libre/{icecat,iceweasel-libre}: fix PGO, make more similar to firefox

The biggest part of that change is using the variable "pkgbase" so they
don't all have to be different.

Note that I ran firefox through moz-normalize before comparing them.
---
 libre/icecat/PKGBUILD               | 135 ++++++++++++++++++++----------------
 libre/icecat/mozconfig.pgo          |   4 +-
 libre/iceweasel-libre/PKGBUILD      |  95 ++++++++++++++-----------
 libre/iceweasel-libre/mozconfig.pgo |   4 +-
 4 files changed, 130 insertions(+), 108 deletions(-)

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 9f901f3b6..c94062713 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -1,11 +1,15 @@
-# Contributor (ConnochaetOS): Henry Jensen 
+# Maintainer: Márcio Silva 
 # Contributor (Parabola): Luke Shumaker 
-# Contributor: Figue 
 # Contributor (Parabola): fauno 
 # Contributor (Parabola): vando 
 # Contributor (Parabola): André Silva 
-# Maintainer (Parabola): Márcio Silva 
+
+# Maintainer (ConnochaetOS): Henry Jensen 
+
+# Maintainer (Arch) : Ionut Biru 
 # Contributor (Arch): Jakub Schmidtke 
+
+# Contributor: Figue 
 # Thank you very much to the older contributors:
 # Contributor: evr 
 # Contributor: Muhammad 'MJ' Jassim 
@@ -20,50 +24,49 @@ pkgrel=1
 if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
 pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
 arch=(
-  i686
-  mips64el
-  x86_64
+  'i686'
+  'mips64el'
+  'x86_64'
 )
 license=(
-  GPL2
-  LGPL
-  MPL
+  'GPL2'
+  'LGPL'
+  'MPL'
 )
 depends=(
-  alsa-lib
-  dbus-glib
-  desktop-file-utils
-  gtk2
-  hicolor-icon-theme
-  hunspell
-  libevent
-  libnotify
-  libvpx
-  libxt
-  mime-types
-  mozilla-common
-  mozilla-searchplugins
+  '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
+  'sqlite'
+  'startup-notification'
 )
 makedepends=(
-  autoconf2.13
-  diffutils
-  imagemagick
-  libidl2
-  librsvg
-  libxslt
-  mesa
-  pkg-config
-  python2
-  unzip
-  wireless_tools
-  zip
-)
-optdepends=(
-  'wireless_tools: Location detection via available WiFi networks'
+  'autoconf2.13'
+  'diffutils'
+  'imagemagick'
+  'imake'
+  '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)
   options=(!ccache)
@@ -100,14 +103,14 @@ build() {
   mv $pkgname-$pkgver $srcdir/gnuzilla-build
   cd $srcdir/gnuzilla-build
 
-  cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch
+  cp ../mozconfig .mozconfig
   if $_pgo; then
     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
+  patch -Np1 -i ../$pkgname-install-dir.patch
+  patch -Np1 -i ../xulrunner-copy-stub.patc
+  patch -Np1 -i ../libre.patch
+  #patch -Np1 -i ../cairo.patch
 
   # Fix for use nspr, sqlite and nss external
   sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
@@ -132,43 +135,53 @@ 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
+
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
+  export PYTHON="/usr/bin/python2"
+  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  unset MAKEFLAGS
+
+  if $_pgo; then
+    export MOZ_PGO=1
+    export DISPLAY=:99
+    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+  fi
+
+   _fail=0
+   make -f client.mk build || _fail=1
 
   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
     kill $! || true
-  else
-    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS
   fi
+  return $_fail
 }
 
 package() {
   cd $srcdir/gnuzilla-build
-  make -j1 -f client.mk DESTDIR=$pkgdir install
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
 
-  install -Dm644 $srcdir/vendor.js $pkgdir/usr/lib/$pkgname/defaults/pref
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js"
 
   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/$pkgbase.png
   done
 
   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/$pkgbase/"{dictionaries,hyphenation,searchplugins,plugins}
+  ln -s /usr/share/hunspell            "$pkgdir/usr/lib/$pkgbase/dictionaries"
+  ln -s /usr/share/hyphen              "$pkgdir/usr/lib/$pkgbase/hyphenation"
+  ln -s /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$pkgbase/plugins"
+  ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins"
 
   # We don't want the development stuff
-  rm -rf $pkgdir/usr/{include,lib/$pkgname-devel,share/idl}
+  rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl}
 
-  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $pkgname $pkgdir/usr/lib/$pkgname/$pkgname-bin
+  #workaround for now
+  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin"
 }
diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo
index b0c249ebf..57d11eed0 100644
--- a/libre/icecat/mozconfig.pgo
+++ b/libre/icecat/mozconfig.pgo
@@ -1,4 +1,2 @@
 # PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index b58061577..01be6223d 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -1,11 +1,15 @@
-# Contributor (ConnochaetOS): Henry Jensen 
+# Maintainer: Márcio Silva 
 # Contributor (Parabola): Luke Shumaker 
-# Contributor: Figue 
 # Contributor (Parabola): fauno 
 # Contributor (Parabola): vando 
 # Contributor (Parabola): André Silva 
-# Contributor (Parabola): Márcio Silva 
+
+# Maintainer (ConnochaetOS): Henry Jensen 
+
+# Maintainer (Arch) : Ionut Biru 
 # Contributor (Arch): Jakub Schmidtke 
+
+# Contributor: Figue 
 # Thank you very much to the older contributors:
 # Contributor: evr 
 # Contributor: Muhammad 'MJ' Jassim 
@@ -19,17 +23,16 @@ _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
-_pkgname=iceweasel
+pkgbase=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
 pkgrel=4
 
-if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
+if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
 if $_pgo; then
   pkgname+='-pgo'
 fi
 
-if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
 pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox."
 arch=(
   'i586'
@@ -56,14 +59,15 @@ depends=(
   'mime-types'
   'mozilla-common'
   'mozilla-searchplugins'
-  'nss>=3.13.1'
-  'sqlite3'
+  'nss>=3.13.3'
+  'sqlite'
   'startup-notification'
 )
 makedepends=(
   'autoconf2.13'
   'diffutils'
   'imagemagick'
+  'imake'
   'libidl2'
   'librsvg'
   'libxslt'
@@ -81,6 +85,7 @@ if $_pgo; then
   options=(!ccache)
 fi
 
+optdepends=('wireless_tools: Location detection via available WiFi networks')
 url="http://www.geticeweasel.org/"
 install=iceweasel.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
@@ -104,17 +109,15 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
          '52e52f840a49eb1d14be1c0065b03a93'
          '65f68090d2a69b467bd2707d0c4ea3bd')
 
-if [ "$_pkgname" != "$pkgname" ]; then
-  provides+=("$_pkgname=$pkgver")
-  conflicts+=("$_pkgname")
+if [ "$pkgbase" != "$pkgname" ]; then
+  provides+=("$pkgbase=$pkgver")
+  conflicts+=("$pkgbase")
 fi
 
 build() {
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
-  export PYTHON="/usr/bin/python2"
   export DEBIAN_BUILD="mozilla-release"
   mv debian "${srcdir}/${DEBIAN_BUILD}"
   cd "${srcdir}/${DEBIAN_BUILD}"
@@ -127,18 +130,17 @@ build() {
 
   quilt push -a
 
-  patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
-  patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
-  patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix
-  patch -Np1 -i "$srcdir/libre.patch"
-  patch -Np1 -i "$srcdir/shared-libs.patch"
-
-  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
-
+  cp ../mozconfig .mozconfig
   if $_pgo; then
     cat "$srcdir/mozconfig.pgo" >> .mozconfig
   fi
 
+  patch -Np1 -i ../Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+  patch -Np1 -i ../iceweasel-install-dir.patch
+  patch -Np1 -i ../xulrunner-copy-stub.patch
+  patch -Np1 -i ../libre.patch
+  patch -Np1 -i ../shared-libs.patch
+
 # From js on abslibre-mips64el.git
   if [ "$CARCH" = "mips64el" ]; then
       msg "Force disabling JIT."
@@ -155,7 +157,7 @@ build() {
     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
@@ -168,44 +170,55 @@ build() {
       echo 'ac_add_options --disable-jemalloc' >> .mozconfig
   fi
 
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
+  export PYTHON="/usr/bin/python2"
+  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  unset MAKEFLAGS
+
+  if $_pgo; then
+    export MOZ_PGO=1
+    export DISPLAY=:99
+    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+  fi
+
+   _fail=0
+   make -f client.mk build || _fail=1
+
   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"
     kill $! || true
-  else
-    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
   fi
+  return $_fail
 }
 
 package() {
   cd "${srcdir}/${DEBIAN_BUILD}"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
-  install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js"
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js"
 
   # I don't even know why we're hitting the objdir, and ConnOS didn't.
   _brandingdir=debian/branding
   brandingdir=moz-objdir/$_brandingdir
   icondir="$pkgdir/usr/share/icons/hicolor"
   for i in 16x16 32x32 48x48 64x64; do
-    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
+    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$pkgbase.png"
   done
-  install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png"
-  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg"
+  install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$pkgbase.png"
+  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$pkgbase.svg"
 
-  install -d                                  "$pkgdir/usr/share/applications"
-  install -m644 debian/iceweasel.desktop      "$pkgdir/usr/share/applications"
-  #install -m644 debian/iceweasel-safe.desktop "$pkgdir/usr/share/applications"
+  install -Dm644 debian/iceweasel.desktop \
+    "$pkgdir/usr/share/applications/$pkgbase.desktop"
 
-  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/$pkgbase/"{dictionaries,hyphenation,searchplugins,plugins}
+  ln -s /usr/share/hunspell            "$pkgdir/usr/lib/$pkgbase/dictionaries"
+  ln -s /usr/share/hyphen              "$pkgdir/usr/lib/$pkgbase/hyphenation"
+  ln -s /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$pkgbase/plugins"
+  ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins"
 
   # We don't want the development stuff
-  rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
+  rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl}
 
-  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
+  #workaround for now
+  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin"
 }
diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo
index b0c249ebf..57d11eed0 100644
--- a/libre/iceweasel-libre/mozconfig.pgo
+++ b/libre/iceweasel-libre/mozconfig.pgo
@@ -1,4 +1,2 @@
 # PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
-- 
cgit v1.2.3


From 867dbcc116fbed767fa4262aedf445546bb11d06 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Sat, 12 Jan 2013 16:47:23 -0500
Subject: libre/{icecat,iceweasel-libre}: clean up a bit

 * don't duplicate the mis64el fix in iceweasel
 * clean up whitespace and quoting
 * re-order a few things
 * don't give geticeweasel.org as iceweasel's url
 * don't symlink /usr/lib/mozilla/plugins to /usr/lib/$pkgbase/plugins
 * more elegant version of debfile() for iceweasel.
 * drop i586 from arch=(), ours has changed too greatly
---
 libre/icecat/PKGBUILD          | 40 +++++++++++++++++---------
 libre/iceweasel-libre/PKGBUILD | 64 ++++++++++++++++++------------------------
 2 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index c94062713..2cb4f355f 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -17,12 +17,24 @@
 # If you are updating this package, don't forget to update the version number in
 # the value for 'browser.dictionaries.download.url' in 'libre.patch'
 
+# Version Configuration ##############################################
+
 _pgo=false
+
 pkgname=icecat
 pkgver=17.0.1
 pkgrel=1
+
+######################################################################
+
 if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
-pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
+if $_pgo; then pkgname+='-pgo'; fi
+if [ "$pkgbase" != "$pkgname" ]; then
+  provides+=("$pkgbase=$pkgver")
+  conflicts+=("$pkgbase")
+fi
+
+pkgdesc="The GNUzilla web browser, based on Mozilla Firefox."
 arch=(
   'i686'
   'mips64el'
@@ -66,12 +78,12 @@ makedepends=(
   'wireless_tools'
   'zip'
 )
-optdepends=('wireless_tools: Location detection via available WiFi networks')
+[[ $CARCH != mips64el ]] && makedepends+=('yasm')
 if $_pgo; then
-  makedepends+=(xorg-server-xvfb)
-  options=(!ccache)
+  makedepends+=('xorg-server-xvfb')
+  options+=(!ccache)
 fi
-options=(!emptydirs)
+optdepends=('wireless_tools: Location detection via available WiFi networks')
 url=http://www.gnu.org/software/gnuzilla/
 install=$pkgname.install
 source=(
@@ -105,7 +117,7 @@ build() {
 
   cp ../mozconfig .mozconfig
   if $_pgo; then
-    cat $srcdir/mozconfig.pgo >> .mozconfig
+    cat ../mozconfig.pgo >> .mozconfig
   fi
   patch -Np1 -i ../$pkgname-install-dir.patch
   patch -Np1 -i ../xulrunner-copy-stub.patc
@@ -121,7 +133,7 @@ build() {
     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
@@ -147,8 +159,8 @@ build() {
     Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
   fi
 
-   _fail=0
-   make -f client.mk build || _fail=1
+  _fail=0
+  make -f client.mk build || _fail=1
 
   if $_pgo; then
     kill $! || true
@@ -172,10 +184,12 @@ package() {
     install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop
   done
 
-  rm -rf "$pkgdir/usr/lib/$pkgbase/"{dictionaries,hyphenation,searchplugins,plugins}
-  ln -s /usr/share/hunspell            "$pkgdir/usr/lib/$pkgbase/dictionaries"
-  ln -s /usr/share/hyphen              "$pkgdir/usr/lib/$pkgbase/hyphenation"
-  ln -s /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$pkgbase/plugins"
+  # Use system-provided dictionaries
+  rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation}
+  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries"
+  ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation"
+  # use mozilla-searchplugins
+  rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins
   ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins"
 
   # We don't want the development stuff
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 01be6223d..a3e2363f0 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,28 +14,33 @@
 # Contributor: evr 
 # Contributor: Muhammad 'MJ' Jassim 
 
+# Version Configuration ##############################################
+
 _pgo=false
 
-# We're getting this from Debian Experimental
 _debname=iceweasel
 _debver=17.0.1
 _debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+_debrepo=http://ftp.debian.org/debian/pool/main
 
 pkgbase=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
 pkgrel=4
 
+######################################################################
+
+debfile() { echo "${_debrepo}/${1:0:1}/${1%_*}/${1}"; }
+
 if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
-if $_pgo; then
-  pkgname+='-pgo'
+if $_pgo; then pkgname+='-pgo'; fi
+if [ "$pkgbase" != "$pkgname" ]; then
+  provides+=("$pkgbase=$pkgver")
+  conflicts+=("$pkgbase")
 fi
 
-pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox."
+pkgdesc="A libre version of Debian Iceweasel, the web browser based on Mozilla Firefox."
 arch=(
-  'i586'
   'i686'
   'mips64el'
   'x86_64'
@@ -79,17 +84,16 @@ makedepends=(
   'wireless_tools'
   'zip'
 )
-[ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
+[[ $CARCH != mips64el ]] && makedepends+=('yasm')
 if $_pgo; then
   makedepends+=('xorg-server-xvfb')
-  options=(!ccache)
+  options+=(!ccache)
 fi
-
 optdepends=('wireless_tools: Location detection via available WiFi networks')
-url="http://www.geticeweasel.org/"
+url="http://packages.debian.org/source/experimental/$_debname"
 install=iceweasel.install
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+source=($(debfile ${_debname}_${_debver}.orig.tar.bz2)
+        $(debfile ${_debname}_${_debver}-${_debrel}.debian.tar.gz)
         mozconfig
         mozconfig.pgo
         xulrunner-copy-stub.patch
@@ -109,11 +113,6 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
          '52e52f840a49eb1d14be1c0065b03a93'
          '65f68090d2a69b467bd2707d0c4ea3bd')
 
-if [ "$pkgbase" != "$pkgname" ]; then
-  provides+=("$pkgbase=$pkgver")
-  conflicts+=("$pkgbase")
-fi
-
 build() {
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
@@ -132,7 +131,7 @@ build() {
 
   cp ../mozconfig .mozconfig
   if $_pgo; then
-    cat "$srcdir/mozconfig.pgo" >> .mozconfig
+    cat ../mozconfig.pgo >> .mozconfig
   fi
 
   patch -Np1 -i ../Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -141,23 +140,12 @@ build() {
   patch -Np1 -i ../libre.patch
   patch -Np1 -i ../shared-libs.patch
 
-# From js on abslibre-mips64el.git
-  if [ "$CARCH" = "mips64el" ]; then
-      msg "Force disabling JIT."
-      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
-          js/src/assembler/wtf/Platform.h
-      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.{in,ref}
-
-      echo "ac_add_options --disable-methodjit" >> .mozconfig
-      echo "ac_add_options --disable-tracejit" >> .mozconfig
-  fi
-
   # 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
@@ -181,8 +169,8 @@ build() {
     Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
   fi
 
-   _fail=0
-   make -f client.mk build || _fail=1
+  _fail=0
+  make -f client.mk build || _fail=1
 
   if $_pgo; then
     kill $! || true
@@ -209,10 +197,12 @@ package() {
   install -Dm644 debian/iceweasel.desktop \
     "$pkgdir/usr/share/applications/$pkgbase.desktop"
 
-  rm -rf "$pkgdir/usr/lib/$pkgbase/"{dictionaries,hyphenation,searchplugins,plugins}
-  ln -s /usr/share/hunspell            "$pkgdir/usr/lib/$pkgbase/dictionaries"
-  ln -s /usr/share/hyphen              "$pkgdir/usr/lib/$pkgbase/hyphenation"
-  ln -s /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$pkgbase/plugins"
+  # Use system-provided dictionaries
+  rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation}
+  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries"
+  ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation"
+  # use mozilla-searchplugins
+  rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins
   ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins"
 
   # We don't want the development stuff
-- 
cgit v1.2.3


From c3f41f14797cb2f0340a60237f5daeb3a1fcdc05 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Sat, 12 Jan 2013 17:00:09 -0500
Subject: libre/icecat: tidy up, rename files

PKGBUILD-only:
 * do the build in "mozilla-release", to match firefox
PKGBUILD and file changes:
 * mv {,bug-}xulrunner-copy-stub.patch
 * rm cairo.patch # was unapplied
 * mv {icecat,firefox}-install-dir.patch
 * mv {icecat,firefox}.install
 * rm gcc47.patch # was unapplied
 * rm icecat-safe.desktop # no longer offered for firefox
 * add shared-libs.patch from firefox, this was done by a sed script

 *
---
 libre/icecat/PKGBUILD                      | 79 +++++++++++-------------------
 libre/icecat/bug-xulrunner-copy-stub.patch | 11 +++++
 libre/icecat/cairo.patch                   | 33 -------------
 libre/icecat/firefox-install-dir.patch     | 30 ++++++++++++
 libre/icecat/firefox.install               | 13 +++++
 libre/icecat/gcc47.patch                   | 75 ----------------------------
 libre/icecat/icecat-install-dir.patch      | 30 ------------
 libre/icecat/icecat-safe.desktop           | 78 -----------------------------
 libre/icecat/icecat.install                | 13 -----
 libre/icecat/shared-libs.patch             | 12 +++++
 libre/icecat/xulrunner-copy-stub.patch     | 11 -----
 11 files changed, 95 insertions(+), 290 deletions(-)
 create mode 100644 libre/icecat/bug-xulrunner-copy-stub.patch
 delete mode 100644 libre/icecat/cairo.patch
 create mode 100644 libre/icecat/firefox-install-dir.patch
 create mode 100644 libre/icecat/firefox.install
 delete mode 100644 libre/icecat/gcc47.patch
 delete mode 100644 libre/icecat/icecat-install-dir.patch
 delete mode 100644 libre/icecat/icecat-safe.desktop
 delete mode 100644 libre/icecat/icecat.install
 create mode 100644 libre/icecat/shared-libs.patch
 delete mode 100644 libre/icecat/xulrunner-copy-stub.patch

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 2cb4f355f..e82263c30 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -14,9 +14,6 @@
 # Contributor: evr 
 # Contributor: Muhammad 'MJ' Jassim 
 
-# If you are updating this package, don't forget to update the version number in
-# the value for 'browser.dictionaries.download.url' in 'libre.patch'
-
 # Version Configuration ##############################################
 
 _pgo=false
@@ -72,7 +69,6 @@ makedepends=(
   'librsvg'
   'libxslt'
   'mesa'
-  'pkg-config'
   'python2'
   'unzip'
   'wireless_tools'
@@ -85,48 +81,34 @@ if $_pgo; then
 fi
 optdepends=('wireless_tools: Location detection via available WiFi networks')
 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=(
-  c88a29aa92fc41a07e777a0e63ac5f7e
-  a22327391a1995703436ed42fe703d3f
-  ac29b01c189f20abae2f3eef1618ffc0
-  3009b176cc5f9b1e416b1bf7c45b064b
-  f4cffe48e84283026da634424f4bbee6
-  e81ad01dbc16ba28bf92ba4b7c309ca7
-  d93fe402b87cd000a869e1fd6badc6c9
-  64826fcf48816b13090042eefddbaa58
-  0d053487907de4376d67d8f499c5502b
-  #c8552d030494443218d88792f4dbbd0f
-)
+install=firefox.install
+options=(!emptydirs)
+source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
+	mozilla-bug-756390.patch::https://bugzilla.mozilla.org/attachment.cgi?id=629706
+        bug-xulrunner-copy-stub.patch libre.patch mozconfig.pgo
+        mozconfig $pkgbase.desktop firefox-install-dir.patch vendor.js shared-libs.patch)
+md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e'
+         '78bbfc17be8ef2104699875300a22316'
+         '3009b176cc5f9b1e416b1bf7c45b064b'
+         'f4cffe48e84283026da634424f4bbee6'
+         'e4cd438a0b2a42dfb14bc7716e901e5f'
+         'd35394f58d9893609a352cd4c82731dc'
+         'e81ad01dbc16ba28bf92ba4b7c309ca7'
+         '64826fcf48816b13090042eefddbaa58'
+         '0d053487907de4376d67d8f499c5502b'
+         '52e52f840a49eb1d14be1c0065b03a93')
 
 build() {
-  mv $pkgname-$pkgver $srcdir/gnuzilla-build
-  cd $srcdir/gnuzilla-build
+  mv $pkgname-$pkgver mozilla-release
+  cd mozilla-release
 
   cp ../mozconfig .mozconfig
-  if $_pgo; then
-    cat ../mozconfig.pgo >> .mozconfig
-  fi
-  patch -Np1 -i ../$pkgname-install-dir.patch
-  patch -Np1 -i ../xulrunner-copy-stub.patc
+  if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi
+  patch -Np1 -i ../firefox-install-dir.patch
+  patch -Np1 -i ../shared-libs.patch
   patch -Np1 -i ../libre.patch
-  #patch -Np1 -i ../cairo.patch
-
-  # Fix for use nspr, sqlite and nss external
-  sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
-    browser/installer/Makefile.in
+  patch -Np1 -i ../bug-xulrunner-copy-stub.patch
+  patch -Np1 -i ../mozilla-bug-756390.patch
 
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
@@ -146,8 +128,6 @@ build() {
       echo 'ac_add_options --disable-jemalloc' >> .mozconfig
   fi
 
-  chmod +x build/unix/run-icecat.sh # fix bug for bad file permition
-
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
   export PYTHON="/usr/bin/python2"
   export MOZ_MAKE_FLAGS="$MAKEFLAGS"
@@ -169,20 +149,19 @@ build() {
 }
 
 package() {
-  cd $srcdir/gnuzilla-build
+  cd mozilla-release
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
   install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js"
 
   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/$pkgbase.png
+  for i in 16 32 48; do
+      install -Dm644 $brandingdir/default$i.png \
+        "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgbase.png"
   done
 
-  for d in $pkgname $pkgname-safe; do
-    install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop
-  done
+  install -Dm644 ../$pkgbase.desktop \
+    "$pkgdir/usr/share/applications/$pkgbase.desktop"
 
   # Use system-provided dictionaries
   rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation}
diff --git a/libre/icecat/bug-xulrunner-copy-stub.patch b/libre/icecat/bug-xulrunner-copy-stub.patch
new file mode 100644
index 000000000..8ccf127df
--- /dev/null
+++ b/libre/icecat/bug-xulrunner-copy-stub.patch
@@ -0,0 +1,11 @@
+--- a/browser/app/Makefile.in
++++ b/browser/app/Makefile.in
+@@ -233,7 +233,7 @@
+ else
+ ifdef LIBXUL_SDK
+ libs::
+-	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
++	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX)
+ endif
+ endif
+ 
diff --git a/libre/icecat/cairo.patch b/libre/icecat/cairo.patch
deleted file mode 100644
index a1fabee90..000000000
--- a/libre/icecat/cairo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/gfx/thebes/gfxPlatform.cpp
-+++ b/gfx/thebes/gfxPlatform.cpp
-@@ -459,11 +459,9 @@ void SourceBufferDestroy(void *srcBuffer)
-   static_cast(srcBuffer)->Release();
- }
- 
--void SourceSnapshotDetached(cairo_surface_t *nullSurf)
-+void SourceSnapshotDetached(void *nullSurf)
- {
--  gfxImageSurface* origSurf =
--    static_cast(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
--
-+  gfxImageSurface *origSurf = static_cast(nullSurf);
-   origSurf->SetData(&kSourceSurface, NULL, NULL);
- }
- 
-@@ -535,14 +533,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa
-                                                      imgSurface->Stride(),
-                                                      format);
- 
--    cairo_surface_t *nullSurf =
--	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
--    cairo_surface_set_user_data(nullSurf,
--				&kSourceSurface,
--				imgSurface,
--				NULL);
--    cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
--    cairo_surface_destroy(nullSurf);
-+    cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
-+		(const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get());
-   }
- 
-   srcBuffer->AddRef();
diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch
new file mode 100644
index 000000000..7a72b9c9d
--- /dev/null
+++ b/libre/icecat/firefox-install-dir.patch
@@ -0,0 +1,30 @@
+diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk
+--- a/config/baseconfig.mk
++++ b/config/baseconfig.mk
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+ 
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_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)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
+ 
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nur a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
+--- a/js/src/config/baseconfig.mk
++++ b/js/src/config/baseconfig.mk
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
+ 
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ 
+ ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
diff --git a/libre/icecat/firefox.install b/libre/icecat/firefox.install
new file mode 100644
index 000000000..c1fe8284a
--- /dev/null
+++ b/libre/icecat/firefox.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
diff --git a/libre/icecat/gcc47.patch b/libre/icecat/gcc47.patch
deleted file mode 100644
index 829d59510..000000000
--- a/libre/icecat/gcc47.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-
-# HG changeset patch
-# User Martin Stránský 
-# Date 1328886461 -3600
-# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349
-# Parent  67017dd3b7f6650e6bcd5b6f545e0309e8de7049
-Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
-
-diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc
---- a/ipc/chromium/src/base/file_util_linux.cc
-+++ b/ipc/chromium/src/base/file_util_linux.cc
-@@ -1,15 +1,18 @@
- // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
- #include "base/file_util.h"
-
- #include 
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include 
-+#endif
-
- #include 
- #include 
-
- #include "base/eintr_wrapper.h"
- #include "base/file_path.h"
- #include "base/string_util.h"
-
-diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc
---- a/ipc/chromium/src/base/message_pump_libevent.cc
-+++ b/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -1,16 +1,19 @@
- // Copyright (c) 2008 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
- #include "base/message_pump_libevent.h"
-
- #include 
- #include 
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include 
-+#endif
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
- #include "base/scoped_nsautorelease_pool.h"
- #include "base/scoped_ptr.h"
- #include "base/time.h"
- #include "third_party/libevent/event.h"
-
-diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc
---- a/ipc/chromium/src/base/time_posix.cc
-+++ b/ipc/chromium/src/base/time_posix.cc
-@@ -8,16 +8,19 @@
- #include 
- #endif
- #include 
- #ifdef ANDROID
- #include 
- #else
- #include 
- #endif
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include 
-+#endif
-
- #include 
-
- #include "base/basictypes.h"
- #include "base/logging.h"
-
- namespace base {
diff --git a/libre/icecat/icecat-install-dir.patch b/libre/icecat/icecat-install-dir.patch
deleted file mode 100644
index 7a72b9c9d..000000000
--- a/libre/icecat/icecat-install-dir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk
---- a/config/baseconfig.mk
-+++ b/config/baseconfig.mk
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_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)
-+includedir := $(includedir)/$(MOZ_APP_NAME)
-+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- DIST = $(DEPTH)/dist
- 
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -Nur a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
---- a/js/src/config/baseconfig.mk
-+++ b/js/src/config/baseconfig.mk
-@@ -1,7 +1,7 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
diff --git a/libre/icecat/icecat-safe.desktop b/libre/icecat/icecat-safe.desktop
deleted file mode 100644
index 87acc970c..000000000
--- a/libre/icecat/icecat-safe.desktop
+++ /dev/null
@@ -1,78 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/icecat -safe-mode %u
-Icon=icecat
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=GNU IceCat - Safe Mode
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html
-StartupNotify=false
-Categories=Application;Network;
diff --git a/libre/icecat/icecat.install b/libre/icecat/icecat.install
deleted file mode 100644
index c1fe8284a..000000000
--- a/libre/icecat/icecat.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
diff --git a/libre/icecat/shared-libs.patch b/libre/icecat/shared-libs.patch
new file mode 100644
index 000000000..1f22b2b0d
--- /dev/null
+++ b/libre/icecat/shared-libs.patch
@@ -0,0 +1,12 @@
+diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
+--- mozilla-release.orig/browser/installer/Makefile.in	2012-07-17 16:19:29.480356991 +0000
++++ mozilla-release/browser/installer/Makefile.in	2012-07-17 17:32:41.250937293 +0000
+@@ -50,7 +50,7 @@
+ MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
+ # Some files have been already bundled with xulrunner
+ ifndef SYSTEM_LIBXUL
+-MOZ_PKG_FATAL_WARNINGS = 1
++MOZ_PKG_FATAL_WARNINGS = 0
+ endif
+ 
+ MOZ_NONLOCALIZED_PKG_LIST = \
diff --git a/libre/icecat/xulrunner-copy-stub.patch b/libre/icecat/xulrunner-copy-stub.patch
deleted file mode 100644
index 8ccf127df..000000000
--- a/libre/icecat/xulrunner-copy-stub.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/browser/app/Makefile.in
-+++ b/browser/app/Makefile.in
-@@ -233,7 +233,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
--	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX)
- endif
- endif
- 
-- 
cgit v1.2.3


From 7ffb3a2380d08711d92b9d1735117a07839b4844 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Sat, 12 Jan 2013 17:04:47 -0500
Subject: libre/icecat: sync files with versions from firefox and upstream

 * firefox-install-dir.patch: use version from firefox package
 * icecat.desktop: merge with version from firefox package
 * mozconfig: merge with versions from icecat upstream and firefox package
---
 libre/icecat/PKGBUILD                  |  6 ++--
 libre/icecat/firefox-install-dir.patch | 12 +++----
 libre/icecat/icecat.desktop            | 58 ++++++++++++++++++++++++++++------
 libre/icecat/mozconfig                 | 21 ++++--------
 4 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index e82263c30..eccf8b89b 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -92,9 +92,9 @@ md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e'
          '3009b176cc5f9b1e416b1bf7c45b064b'
          'f4cffe48e84283026da634424f4bbee6'
          'e4cd438a0b2a42dfb14bc7716e901e5f'
-         'd35394f58d9893609a352cd4c82731dc'
-         'e81ad01dbc16ba28bf92ba4b7c309ca7'
-         '64826fcf48816b13090042eefddbaa58'
+         'd71509923cfede3e634756fee899e492'
+         'daa249d183fcf09942ff30db1b279f1e'
+         '150ac0fb3ac7b2114c8e8851a9e0516c'
          '0d053487907de4376d67d8f499c5502b'
          '52e52f840a49eb1d14be1c0065b03a93')
 
diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch
index 7a72b9c9d..9c115f0eb 100644
--- a/libre/icecat/firefox-install-dir.patch
+++ b/libre/icecat/firefox-install-dir.patch
@@ -1,6 +1,6 @@
-diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk
---- a/config/baseconfig.mk
-+++ b/config/baseconfig.mk
+diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk
+--- mozilla-release.orig/config/baseconfig.mk	2012-10-09 07:34:41.762092280 +0000
++++ mozilla-release/config/baseconfig.mk	2012-10-09 07:40:53.052771576 +0000
 @@ -1,9 +1,9 @@
  INCLUDED_AUTOCONF_MK = 1
  
@@ -15,9 +15,9 @@ diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk
  DIST = $(DEPTH)/dist
  
  # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -Nur a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
---- a/js/src/config/baseconfig.mk
-+++ b/js/src/config/baseconfig.mk
+diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk
+--- mozilla-release.orig/js/src/config/baseconfig.mk	2012-10-09 07:34:58.411973276 +0000
++++ mozilla-release/js/src/config/baseconfig.mk	2012-10-09 07:39:55.143186168 +0000
 @@ -1,7 +1,7 @@
  INCLUDED_AUTOCONF_MK = 1
  
diff --git a/libre/icecat/icecat.desktop b/libre/icecat/icecat.desktop
index 8a7cad93d..668d5104f 100644
--- a/libre/icecat/icecat.desktop
+++ b/libre/icecat/icecat.desktop
@@ -1,11 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/icecat %u
-Icon=icecat
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=GNU IceCat
+Name=IceCat
 GenericName=Web Browser
 GenericName[af]=Web Blaaier
 GenericName[ar]=متصفح ويب
@@ -73,6 +67,50 @@ GenericName[xh]=Umkhangeli zincwadi we Web
 GenericName[zh_CN]=网页浏览器
 GenericName[zh_TW]=網頁瀏覽器
 GenericName[zu]=Umcingi we-Web
-MimeType=text/html
-StartupNotify=false
-Categories=Application;Network;
+Comment=Browse the World Wide Web
+Comment[ar]=تصفح الشبكة العنكبوتية العالمية
+Comment[ast]=Restola pela Rede
+Comment[bn]=ইন্টারনেট ব্রাউজ করুন
+Comment[ca]=Navegueu per la web
+Comment[cs]=Prohlížení stránek World Wide Webu
+Comment[da]=Surf på internettet
+Comment[de]=Im Internet surfen
+Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
+Comment[es]=Navegue por la web
+Comment[et]=Lehitse veebi
+Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
+Comment[fi]=Selaa Internetin WWW-sivuja
+Comment[fr]=Naviguer sur le Web
+Comment[gl]=Navegar pola rede
+Comment[he]=גלישה ברחבי האינטרנט
+Comment[hr]=Pretražite web
+Comment[hu]=A világháló böngészése
+Comment[it]=Esplora il web
+Comment[ja]=ウェブを閲覧します
+Comment[ko]=웹을 돌아 다닙니다
+Comment[ku]=Li torê bigere
+Comment[lt]=Naršykite internete
+Comment[nb]=Surf på nettet
+Comment[nl]=Verken het internet
+Comment[nn]=Surf på nettet
+Comment[no]=Surf på nettet
+Comment[pl]=Przeglądanie stron WWW
+Comment[pt]=Navegue na Internet
+Comment[pt_BR]=Navegue na Internet
+Comment[ro]=Navigați pe Internet
+Comment[ru]=Доступ в Интернет
+Comment[sk]=Prehliadanie internetu
+Comment[sl]=Brskajte po spletu
+Comment[sv]=Surfa på webben
+Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
+Comment[uk]=Перегляд сторінок Інтернету
+Comment[vi]=Để duyệt các trang web
+Comment[zh_CN]=浏览互联网
+Comment[zh_TW]=瀏覽網際網路
+Exec=/usr/lib/icecat/icecat %u
+Icon=icecat
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+StartupNotify=true
+Categories=Network;WebBrowser;
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index 934ea9f0d..c5cea7185 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -20,35 +20,28 @@ ac_add_options --with-system-zlib
 ac_add_options --disable-crashreporter
 ac_add_options --disable-gnomevfs
 ac_add_options --disable-installer
-ac_add_options --disable-mochitest
 ac_add_options --disable-safe-browsing
 ac_add_options --disable-tests
 ac_add_options --disable-updater
 ac_add_options --enable-gio
+#ac_add_options --enable-gstreamer
 ac_add_options --enable-startup-notification
 
 # Vendor settings
-# Optimization
-ac_add_options --enable-optimize
+ac_add_options --enable-optimize="-pipe -O3"
 ac_add_options --libdir=/usr/lib
 ac_add_options --prefix=/usr
-export BUILD_OFFICIAL=1
+# Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
-# Platform settings
-#ac_add_options --build=i586-pc-linux-gnu
-#ac_add_options --host=i586-pc-linux-gnu
-#export USE_SHORT_LIBNAME=1
-#mk_add_options USE_SHORT_LIBNAME=1
 
 # Application settings
 ac_add_options --disable-official-branding
+# since with-user-appdir with .gnuzilla doesn't do the trick,
+# use app-basename instead
+ac_add_options --with-app-basename=icecat
 ac_add_options --with-branding=browser/branding/unofficial
 ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
-# Icecat
+ac_add_options --with-user-appdir=.mozilla
 export MOZ_PHOENIX=1
 mk_add_options MOZ_PHOENIX=1
 
-- 
cgit v1.2.3


From 5de695ea50febaae46715f04dfe1552964ade357 Mon Sep 17 00:00:00 2001
From: Luke Shumaker 
Date: Sat, 12 Jan 2013 17:05:43 -0500
Subject: libre/icecat: use vendor.js to simplify libre.patch

---
 libre/icecat/PKGBUILD    |   4 +-
 libre/icecat/libre.patch | 587 -----------------------------------------------
 libre/icecat/vendor.js   |  12 +
 3 files changed, 14 insertions(+), 589 deletions(-)

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index eccf8b89b..c51add2a9 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -90,12 +90,12 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
 md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e'
          '78bbfc17be8ef2104699875300a22316'
          '3009b176cc5f9b1e416b1bf7c45b064b'
-         'f4cffe48e84283026da634424f4bbee6'
+         'a497587cf150ba27ab25cb52f5311044'
          'e4cd438a0b2a42dfb14bc7716e901e5f'
          'd71509923cfede3e634756fee899e492'
          'daa249d183fcf09942ff30db1b279f1e'
          '150ac0fb3ac7b2114c8e8851a9e0516c'
-         '0d053487907de4376d67d8f499c5502b'
+         '11df9602256561bcf59f15e7f6aaf0ee'
          '52e52f840a49eb1d14be1c0065b03a93')
 
 build() {
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index bf2dff437..8fa1c2a20 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,216 +1,6 @@
-diff -Nur a/browser/branding/unofficial/locales/browserconfig.properties b/browser/branding/unofficial/locales/browserconfig.properties
---- a/browser/branding/unofficial/locales/browserconfig.properties
-+++ b/browser/branding/unofficial/locales/browserconfig.properties
-@@ -3,5 +3,29 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- # Do NOT localize or otherwise change these values
-+
-+# Default startup homepage
- browser.startup.homepage=about:home
--browser.search.defaultenginename="DuckDuckGo"
-+
-+# 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
-+
-+# 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/
-+
-+# 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 -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 --- a/browser/app/profile/firefox.js	2012-12-01 16:06:30.000000000 -0200
 +++ b/browser/app/profile/firefox.js	2012-12-04 20:42:20.753633713 -0200
-@@ -324,15 +324,15 @@
- pref("browser.search.searchEnginesURL","http://www.gnu.org/software/gnuzilla/addons.html#search%20engines");
- 
- // pointer to the default engine name
--pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
-+pref("browser.search.defaultenginename",      "chrome://branding/locale/browserconfig.properties");
- 
- // disable logging for the search service by default
- pref("browser.search.log", false);
- 
- // Ordering of Search Engines in the Engine list. 
--pref("browser.search.order.1",                "chrome://browser-region/locale/region.properties");
--pref("browser.search.order.2",                "chrome://browser-region/locale/region.properties");
--pref("browser.search.order.3",                "chrome://browser-region/locale/region.properties");
-+pref("browser.search.order.1",                "chrome://branding/locale/browserconfig.properties");
-+pref("browser.search.order.2",                "chrome://branding/locale/browserconfig.properties");
-+pref("browser.search.order.3",                "chrome://branding/locale/browserconfig.properties");
- 
- // search bar results always open in a new tab
- pref("browser.search.openintab", false);
-@@ -616,23 +616,23 @@
- pref("browser.send_pings", false);
- 
- /* initial web feed readers list */
--pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties");
--pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.0.title", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.contentHandlers.types.0.uri", "chrome://branding/locale/browserconfig.properties");
- pref("browser.contentHandlers.types.0.type", "application/vnd.mozilla.maybe.feed");
--pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties");
--pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.1.title", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.contentHandlers.types.1.uri", "chrome://branding/locale/browserconfig.properties");
- pref("browser.contentHandlers.types.1.type", "application/vnd.mozilla.maybe.feed");
--pref("browser.contentHandlers.types.2.title", "chrome://browser-region/locale/region.properties");
--pref("browser.contentHandlers.types.2.uri", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.2.title", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.contentHandlers.types.2.uri", "chrome://branding/locale/browserconfig.properties");
- pref("browser.contentHandlers.types.2.type", "application/vnd.mozilla.maybe.feed");
--pref("browser.contentHandlers.types.3.title", "chrome://browser-region/locale/region.properties");
--pref("browser.contentHandlers.types.3.uri", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.3.title", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.contentHandlers.types.3.uri", "chrome://branding/locale/browserconfig.properties");
- pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed");
--pref("browser.contentHandlers.types.4.title", "chrome://browser-region/locale/region.properties");
--pref("browser.contentHandlers.types.4.uri", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.4.title", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.contentHandlers.types.4.uri", "chrome://branding/locale/browserconfig.properties");
- pref("browser.contentHandlers.types.4.type", "application/vnd.mozilla.maybe.feed");
--pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties");
--pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.5.title", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.contentHandlers.types.5.uri", "chrome://branding/locale/browserconfig.properties");
- pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed");
- 
- pref("browser.feeds.handler", "ask");
-@@ -643,7 +643,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.  
--pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties");
-+pref("gecko.handlerService.defaultHandlersVersion", "chrome://branding/locale/browserconfig.properties");
- 
- // The default set of web-based protocol handlers shown in the application
- // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers
-@@ -651,65 +651,65 @@
- // protocol not currently listed here), we should go ahead and add those.
- 
- // webcal
--pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties");
-+pref("gecko.handlerService.schemes.webcal.0.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.webcal.1.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.webcal.2.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.webcal.3.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
- 
- // mailto
--pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties");
-+pref("gecko.handlerService.schemes.mailto.0.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.mailto.1.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.mailto.2.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.mailto.3.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
- 
- // irc
--pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties");
-+pref("gecko.handlerService.schemes.irc.0.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.irc.1.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.irc.2.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.irc.3.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
- 
- // ircs
--pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties");
-+pref("gecko.handlerService.schemes.ircs.0.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.ircs.1.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.ircs.2.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.ircs.3.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
- 
- // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287
- pref("gecko.handlerService.allowRegisterFromDifferentHost", false);
- 
- #ifdef MOZ_SAFE_BROWSING
--pref("browser.safebrowsing.enabled", true);
--pref("browser.safebrowsing.malware.enabled", true);
-+pref("browser.safebrowsing.enabled", false);
-+pref("browser.safebrowsing.malware.enabled", false);
- pref("browser.safebrowsing.debug", false);
- 
--pref("browser.safebrowsing.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
--pref("browser.safebrowsing.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
--pref("browser.safebrowsing.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
--pref("browser.safebrowsing.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?");
--pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%");
--pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%");
--pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%");
--pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
--pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
-+pref("browser.safebrowsing.updateURL", "");
-+pref("browser.safebrowsing.keyURL", "");
-+pref("browser.safebrowsing.gethashURL", "");
-+pref("browser.safebrowsing.reportURL", "");
-+pref("browser.safebrowsing.reportGenericURL", "");
-+pref("browser.safebrowsing.reportErrorURL", "");
-+pref("browser.safebrowsing.reportPhishURL", "");
-+pref("browser.safebrowsing.reportMalwareURL", "");
-+pref("browser.safebrowsing.reportMalwareErrorURL", "");
- 
--pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/");
--pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
-+pref("browser.safebrowsing.warning.infoURL", "");
-+pref("browser.safebrowsing.malware.reportURL", "");
- 
- // Name of the about: page contributed by safebrowsing to handle display of error
- // pages on phishing/malware hits.  (bug 399233)
 @@ -1149,13 +1149,3 @@
  // might keep around more than this, but we'll try to get down to this value).
  // (This is intentionally on the high side; see bug 746055.)
@@ -225,380 +15,3 @@ diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 -pref("social.sidebar.unload_timeout_ms", 10000);
 -pref("social.active", false);
 -pref("social.toast-notifications.enabled", true);
-diff -Nur a/browser/branding/unofficial/content/aboutHome.js b/browser/branding/unofficial/content/aboutHome.js
---- a/browser/branding/unofficial/content/aboutHome.js
-+++ b/browser/branding/unofficial/content/aboutHome.js
-@@ -5,100 +5,41 @@
- // If a definition requires additional params, check that the final search url
- // is handled correctly by the engine.
- const SEARCH_ENGINES = {
--  "Duck Duck Go": {
--      image: "data:image/png;base64,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"},
--  "Google": {
-+  "DuckDuckGo HTML": {
-     image: "data:image/png;base64," +
--           "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
--           "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
--           "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
--           "Vivt6Ztzz5y5b+7yf//3f/9/38PoW7gYY+i7uDDG39heJfT/q91LGTiTIcWJkCxzxDmCCBGCkBEO" +
--           "FDCm5CPs+CGWYvcliRxEzDwgu9I/IzZClonQgT/jC9Eu3GFTz6sdKc57kIzHWKaFjIA2wz++Zhkn" +
--           "yblMIDkAFIcDDFcQ+vtjGJuaOlKPkB2G4V4U9kcu8zfWlPtPVX/g9zZ7QwE03jDTqzWVndBUc57a" +
--           "Up91gToce0cf3R05El5u6gYyNQ0BKK/x/nNmjKwwxBmx8/eSNHiWsVLXlBJ/7UdTazcN3gn3bYEw" +
--           "FmG3pvOobRuScoc+ibEyF6GsUugrgEYuMGD4nqltmJjqFBkt+gcJ/ed0SZIA5crZ+gumrpQ0H319" +
--           "ogBFh6aJFoGmQguf2n7tu62HnvgJ1cPBcN3m6dAnX4CM4QAQigmxdQthm9EEJ58bY3bOl/CQ2YE5" +
--           "pu24LdBwZE7De+M+4gBAs/IntETphOHD4FOzNoNPbjuzBkn+48/9qKXywWPcM99Edvh2siPfHeyc" +
--           "nH8mU/pM2pJLsfshI0KCNRv7viiYYXW7sRnmxTFQhCp3G9/CTqzLsht3jtkrmGJdgGF0xmYpQx5G" +
--           "KBEInWdWSs4pnm6bLD3i95WJsDG7jmtiXFYwlmF2WXATmCPROE05IGa3G33sxPrsL014tGRMVo5D" +
--           "uVdirD/8zJBluQgC9qSF2JKcV9cuPwudsbq1YLqCydjYGOkSngYtKq36vJUs6jqhuqXtgCvursty" +
--           "uHOnSZIMWROnc/dR2J5pYAZO3tF0rOwvAXI/jvKZ/vN6zVNuHQGWjYNx/SWGiohtH9R1Y17HDRvf" +
--           "4XtUCEoaQwyGbEOr5QZ3HeeLbRwrosnRNB5lHNwpuBn+HK2KWFsLcd34scWpGJd5g6Ener61faoQ" +
--           "bOXk6OsWpycnP98yYdzMrLINxYks+3h1fvZlHfE6M6LXu0oa4mPko8s7TL70kuSnOmVIMxvW5n2v" +
--           "00111fF1htzXWiwpnrJAw8FbD60qXtHn9o9LUrJ6r2CUBoOnDpQeKxu0ncPhntgRwKLRcErUVd9t" +
--           "k1falinlvLLmLr7WHfndsh/t0WOdg9Dt1cOHTyrctWutRGzH5ZbNjcQ0FpEce+lMQwCnpMRqnSQ3" +
--           "Qu50hFIzMXJnSsjt+aI+fG/kiOwUStcFQuG9AMor0GUI0da6btoyKxIKnWKaXlR/zajFCYWlXNBB" +
--           "WslMKz+tpOEezkIxJtJzuvfl5ia1DCiQnuki6+MiXzRlR47s9Lwdaa1bCKAc4uscXnX5mwFvzdO6" +
--           "JnlQSv8lgiOUERZ1QYLG4PqJE+ZItl2y4MDB3wjma8/XnGiuavSuUMNhKNOshdyZkmViD7EAGBrX" +
--           "K9gzA1CYqPZEfEoAEK91eN3jTELIlRT7jnuhm9M5mxrmJZVNvjUio0VEC3Exr2ryLTbVCJI0/ZfL" +
--           "e/TI5ZusfbXbKAcjP2706msTQRHiH3pxa2ghgIlkU+9b91zqRA6OK6MIQh+nG8HP6wT4PPzD3n3z" +
--           "lxoRiohl5eVd/1G/qC2Ug8LBOcMYh5PYd6mqemTRJ8d88axb3r//NTkYT2tQ1e27W3yzo+aamh0k" +
--           "NoWIcfeJ1Ss8A2EU0xgqflEkYQBGBuYAe3hByAHiNVBcqyRdLzEjYLhpEGFk/CaHXFtZX79RD4WR" +
--           "Bl4plOWR3MhkbI0DMOHfFhNjaEK6Neas1D9Rg3qVHQFwLHIV9DkN01miaxD6LNUjQpKPMQLHl522" +
--           "jWAVtQxELTM7agBN+AdcGwYNvJREtDwjrOL5hQWpVf36TTtcVFRhGMaAlxsbpw+prCwt/fRTHoZE" +
--           "MVS1Sna5r5CUpKExisc0RVFix4BoKEFHlDES78dIcYjdf0FRhapqH5tQxAyTtiOwZHVTk3dWdnaV" +
--           "zFgv27a5RzfKlt6PAiOZFQWmrUTy2Y3WFntPdgruhXVWxIFRA2ZIBq9QqeP18PvlBPAtRq0gHGNQ" +
--           "uHbN4ej+qJDDmMZIaaZZYASC/MzTe1RScmmdqlZce/z4CLFfW7RoppWsSP1Wy7R5NeTpfMNnU+s2" +
--           "pGIZ2KC4oEGoOOCb/7aNpkKbWKsswhhoUrQZBmPdp/hXcWDUQCjIGZFByLB2Su9ogaUaRhAa8hsG" +
--           "DxXFCmlB8CBKleyhZynXiWkwv6VRpEVYkBtnBGq28bMPZcmjC0rKCxPLFqy4GDWbVwSOPemLGhvP" +
--           "SMJNlc2+es0fQGYo5HnH59sCoMQLWVU0LV4ISqHjf/obtbQQxCbMnPngRcM25MbCB5giDo+Hl6Xg" +
--           "qtVd6yqWeu7e91RyR++Rd28OthAUaLZRa+0Rrg+SNxQqD0dDyRx9lmqY6brOVDi7HFHV9/mWvV5z" +
--           "r63aSCF0yDOlcla7NZrFmA3AeH2E1052/ebi1ZZ6ej3oh8eZ2fe1vtPqOTi495SaHygOOc1/dOFj" +
--           "QnsYhdMw44lFaMysU6dOBCBvRcCB35fl+0X4am3COCaakdoVjVaoZgW1dESJnSd5hiz/7NU02Qbd" +
--           "4dpDYdLL7wizOLW5OGoRTAM+G0VCBrg0yDOMXRGJPB8GNpim2efF7Ozi9hgA4Hfxm0b53NbW/Zyy" +
--           "i7bQlyJBFjIjDF1ViKe29xhEJizP0Flw6S76klhfrX+j8C7dt/8BPRxpsGnGyqKfGRQ7O20OVr80" +
--           "NVT9bIMIBwhrygMsLr7RcKvT9bUq1zXLumVtdvaAs56V+GK+3UMXEK15HzU1jvANHa47/YIGJ2cT" +
--           "DmAWSIZtUdT9tiDpNjEQpZ1pJpumqiKih0AfSHTB2X7/2w2GsT4CNM8k5NlnPJ7Eyg+vT0+faVqW" +
--           "Z2tEu1cYaC3fQxsPnaS/swAYN2K/qnhQHpgAKC6/Xx6Qgtmkilo2Z9WHrFHQnO/Bf/rtoctPlOVM" +
--           "az35/pKIyhCAh6SUQre4H/M+L7lAqJl+RvKsVeHw0pBlntJME2VQunVzRsaERCfuyMzMfyszMzN+" +
--           "ak52XTQ2333prxdJzuyRXGSw7KjFEnlUwYF1zrROLbxO4umwcVOWkjV0z51YyXqaEQsR9djYQMX4" +
--           "TTwVQst8NiVlPqS+Upj0EAyZB9+tcB4ZByJ71V5C7ntcj550Q4KBTl7pvjFVmtbnYvSQ7ACcEZoD" +
--           "fTUwbgDE490fN6B5o5fRjdAXiDNBGKLwNVMLZnTJLPrDh1hypAFHAkTzXnNqc+GHfG75oYxVYN0k" +
--           "YEwQXPEAcuF9ZIH/01ku1/ChivJHkNCeMk8sCNXChCdhQr7+6uvC4RU4d8RJ1PRuV64JKdDSU3su" +
--           "HuHMuKJUcuWMhMU4QHwflWBHgFEb4tXuSs3gEaLV7bdDlXvU6rm7hKH8SobmmawohUNkeSDUghdD" +
--           "0vfXMrbnYdOoSij6Eg108TFje6EOMwbjwZ0zUHeXA5GGANoz6jm2VwCotikBcN7YpvHEtvrDnoqh" +
--           "t58kuzpDJcoPhQDO6YGn3+pTK/007QYUoClgOUHpWAUuldPV4VYYn8rXfMDpHN4NS4McOBpsJ7fZ" +
--           "9utrbNvLWYdzrq5H3PO+Hfmy8GCKaI7U7o/3wq6ObklOIkhykcD+sbuFMeKAcKYos8RvSczhEgLM" +
--           "EioJknDoTEznWLDNJb5RO2POPBfqf2frdFN3LAz6Im+agU9e+Xzn8HLod+dcueXnDk/vX2DZlQaK" +
--           "/ebpLV0miPmcCXs1xZySWC9JMA/Fz3/CeXZbgcTCIEVMqiSAkFguxQ0mX06IX9KueIuPpV/xPCS+" +
--           "ttQGnDMs6Tej8SaseF4LN9c9cnxNj6VxI8Q+3em9Hx+c3PmW1UDztMZtXVLEfdymbGAJ60kJGZQm" +
--           "tH99bE8YGN/wd/mgxdG7NFDb8/ZohryYA5HguHhI5uYO27vyoqtrmAiXr31JX/V48CuY8R8FJhxE" +
--           "eeEAQWk9HnYlFmMJoRKG03QLtUJ7/93FvpXXJ7wM/6Za4l71UEu5pWkoucv0Be0tm95vmUdy5t5k" +
--           "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" +
--           "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
--           "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
--  , 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" +
-+           "RRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VS" +
-+           "da6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQ" +
-+           "HxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/q" +
-+           "yT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYH" +
-+           "V349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8" +
-+           "t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVX" +
-+           "yyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EH" +
-+           "v4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SM" +
-+           "yAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpsl" +
-+           "j09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxN" +
-+           "v62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYV" +
-+           "QTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4k" +
-+           "wJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjze" +
-+           "RMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG" +
-+           "5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBx" +
-+           "tp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMM" +
-+           "ak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWD" +
-+           "uek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJ" +
-+           "MbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMx" +
-+           "Aov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4G" +
-+           "SawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2" +
-+           "dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46" +
-+           "jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC" +
-+           "36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KO" +
-+           "GKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwv" +
-+           "YzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vV" +
-+           "w7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6u" +
-+           "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
-+           "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
-+           "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
-   }
- };
- 
-@@ -115,8 +56,8 @@
- const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
- 
- // Bug with dom.storage.enabled set as false
--// We are using DDG as a default in this case.
--let gSearchEngine = {"name": "Duck Duck Go", "searchUrl": "https://duckduckgo.com/html/?t=icecat&q=_searchTerms_"};
-+// 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();
-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
-@@ -3,30 +3,18 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- # Default search engine
--browser.search.defaultenginename=DuckDuckGo
-+browser.search.defaultenginename=DuckDuckGo HTML
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=DuckDuckGo
--browser.search.order.2=Google
--browser.search.order.3=Yahoo
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=Bloglines
--browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s
--browser.contentHandlers.types.1.title=My Yahoo
--browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
--browser.contentHandlers.types.2.title=Google
--browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
--
--# Keyword URL (for location bar searches)
--keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+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://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+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 
-@@ -34,3 +22,11 @@
- # 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/
-+
-+# 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 -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 @@
-     
@bookmarks_toolbarfolder@

- 
@bookmarks_toolbarfolder_description@
-     

--        
@getting_started@
-+        
Parabola GNU/Linux-libre
-     

--    
@firefox_heading@

-+    
Parabola GNU/Linux-libre

-     

--        
@firefox_help@
--        
@firefox_customize@
--        
@firefox_community@
--        
@firefox_about@
-+        
Parabola GNU/Linux-libre
-+        
Parabola GNU/Linux-libre Packages
-+        
Parabola GNU/Linux-libre Wiki
-+        
Parabola GNU/Linux-libre Labs
-+    

-+    
Free Software Foundation

-+    

-+        
Free Software Foundation
-+        
LibrePlanet
-+        
Free addons
-+        
h-node
-     

- 

-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 @@
-       

-       

-         <a> anchor

--        <a> a + href
-+        <a> a + href
-       

-       

-         <abbr> abbr - extended text when mouseover.

-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;"/>
-   
- 
--  
-+  
-   

-       

-         <a> anchor

--        <a> a + href
-+        <a> a + href
-       

-       

-         <abbr> abbr - extended text when mouseover.

-diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
---- iceweasel-13.0.orig/dom/ipc/test.xul	2012-06-01 09:03:55.000000000 -0300
-+++ iceweasel-13.0/dom/ipc/test.xul		2012-06-05 20:40:59.453890004 -0300
-@@ -294,6 +294,6 @@
-                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
-   
- 
--  
-+  
-   
@bookmarks_toolbarfolder@

- 
@bookmarks_toolbarfolder_description@
-     

--        
@getting_started@
-+        
Parabola GNU/Linux-libre
-     

--    
@firefox_heading@

-+    
Parabola GNU/Linux-libre

-     

--        
@firefox_help@
--        
@firefox_customize@
--        
@firefox_community@
--        
@firefox_about@
-+        
Parabola GNU/Linux-libre
-+        
Parabola GNU/Linux-libre Packages
-+        
Parabola GNU/Linux-libre Wiki
-+        
Parabola GNU/Linux-libre Labs
-+    

-+    
Free Software Foundation

-+    

-+        
Free Software Foundation
-+        
LibrePlanet
-+        
Free addons
-+        
h-node
-     

- 

-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 @@
+ #searchText {
+diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2013-01-04 18:44:27.000000000 -0500
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2013-01-10 18:26:10.000000000 -0500
+@@ -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 +96,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,99 +133,74 @@ 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,7 +49,7 @@
  //   * add an entry here in the proper ordering (based on spans)
  // The  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"
--, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
 +  "http://packages.debian.org/experimental/iceweasel"
-+, "https://www.gnu.org/software/gnuzilla/addons.html"
+ , "https://www.gnu.org/software/gnuzilla/addons.html"
  ];
  
- const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
- 
--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_"};
+diff -ruN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-04 18:44:28.000000000 -0500
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-10 18:18:10.000000000 -0500
+@@ -21,7 +21,7 @@
+ # 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://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
  
- document.addEventListener("DOMContentLoaded", function init() {
-   setupSearchEngine();
-@@ -142,13 +87,13 @@
+ # 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 
+@@ -30,20 +30,10 @@
+ # don't make any spelling errors here.
+ gecko.handlerService.defaultHandlersVersion=3
  
- function setupSearchEngine()
- {
--  gSearchEngine = JSON.parse(localStorage["search-engine"]);
+-# The default set of protocol handlers for webcal:
+-gecko.handlerService.schemes.webcal.0.name=30 Boxes
+-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
 -
--  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
-@@ -1,3 +1,27 @@
- # Do NOT localize or otherwise change these values
-+
-+# Default startup homepage
- browser.startup.homepage=about:home
- 
-+# 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
-+
-+# 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:
+-# The default set of protocol handlers for mailto:
+-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
+-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s 
+-gecko.handlerService.schemes.mailto.1.name=Gmail
+-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
+-
+ # The default set of protocol handlers for irc:
+-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/
-+
-+# The default set of protocol handlers for ircs:
++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/
-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 @@
- 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.
-+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 @@
- #searchEngineLogo {
-   display: inline-block;
-   height: 28px;
--  width: 70px;
-+  width: 47px;
- }
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul
+--- mozilla-release.orig/dom/ipc/test.xul	2013-01-04 18:44:31.000000000 -0500
++++ mozilla-release/dom/ipc/test.xul	2013-01-10 18:19:26.000000000 -0500
+@@ -299,6 +299,6 @@
+                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
+   
  
- #searchText {
+-  
++  
+