Thu Jan 30 03:47:11 UTC 2014

author: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-01-30 03:49:22 +0000
committer: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-01-30 03:49:22 +0000
commit: abecd94e38c95522f241c335c76aa3150e43eedd (patch)
tree: e1aa639a866772861431c2ab8ced2ee79100ae9d
parent: 0a521de4508e14363c59922ab2744ab699e30288 (diff)
53 files changed, 742 insertions, 3324 deletions
diff --git a/community/elasticsearch/PKGBUILD b/community/elasticsearch/PKGBUILD
index af8d71bb0..150a9376d 100644
--- a/community/elasticsearch/PKGBUILD
+++ b/community/elasticsearch/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 103723 2014-01-10 13:09:44Z mtorromeo $
+# $Id: PKGBUILD 104999 2014-01-29 16:48:56Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost>
 # Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer>
 
 pkgname=elasticsearch
 pkgver=0.90.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Distributed RESTful search engine built on top of Lucene"
 arch=('i686' 'x86_64')
 url="http://www.elasticsearch.org/"
@@ -15,6 +15,7 @@ install='elasticsearch.install'
 source=(
   "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
   elasticsearch.service
+  elasticsearch@.service
   elasticsearch-tmpfile.conf
 )
 
@@ -66,10 +67,12 @@ package() {
   install -Dm644 bin/elasticsearch.in.sh "$pkgdir/usr/share/elasticsearch/elasticsearch.in.sh"
 
   install -Dm644 "$srcdir/elasticsearch.service" "$pkgdir/usr/lib/systemd/system/elasticsearch.service"
+  install -Dm644 "$srcdir/elasticsearch@.service" "$pkgdir/usr/lib/systemd/system/elasticsearch@.service"
 
   install -Dm644 "$srcdir/elasticsearch-tmpfile.conf" "$pkgdir/usr/lib/tmpfiles.d/elasticsearch.conf"
 }
 
 sha256sums=('78c87f600878a6cab41c1d447f6a40b25892a59f8fb49da11392a682884fb8df'
             '09a4027780d73103c26f311c64774dcbc47b5e1d54789c1f2d9c697f518f2eeb'
+            'e3dd705bec204b8572456344b90c4773f867965a1215c22b6e9518f0aa268a2d'
             '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f')
diff --git a/community/elasticsearch/elasticsearch@.service b/community/elasticsearch/elasticsearch@.service
new file mode 100644
index 000000000..b2940c91d
--- /dev/null
+++ b/community/elasticsearch/elasticsearch@.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=ElasticSearch
+After=network.target
+
+[Service]
+User=elasticsearch
+Type=forking
+PIDFile=/run/elasticsearch/%I.pid
+ExecStart=/usr/bin/elasticsearch -p /run/elasticsearch/%I.pid -Des.config=/etc/elasticsearch/%I.yml
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD
index f915f62d4..5f7a8487f 100644
--- a/community/keepalived/PKGBUILD
+++ b/community/keepalived/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 103345 2014-01-03 19:09:45Z seblu $
+# $Id: PKGBUILD 104971 2014-01-28 23:21:57Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=keepalived
-pkgver=1.2.10
+pkgver=1.2.11
 pkgrel=1
 pkgdesc='Failover and monitoring daemon for LVS clusters'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ backup=('etc/keepalived/keepalived.conf')
 depends=('openssl' 'popt' 'libnl1')
 source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz"
         'keepalived.service')
-md5sums=('d838c23d80682650315d1ae447dad48a'
+md5sums=('6a5cee0d9e0a6b84b251b044cd8f3523'
          '0a5171f4298528315e8a8004b55befb7')
 
 build() {
diff --git a/community/mate-panel/PKGBUILD b/community/mate-panel/PKGBUILD
index 5319266e0..9fa14e4a8 100644
--- a/community/mate-panel/PKGBUILD
+++ b/community/mate-panel/PKGBUILD
@@ -1,11 +1,8 @@
-# $Id: PKGBUILD 104195 2014-01-16 16:33:39Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
 
 pkgname=mate-panel
-pkgver=1.6.1
-pkgrel=4
+pkgver=1.6.2
+pkgrel=1
 pkgdesc="The MATE Panel"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
@@ -19,7 +16,7 @@ makedepends=('gobject-introspection' 'mate-common' 'mate-doc-utils'
 options=('!emptydirs')
 groups=('mate')
 source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ccd8d01e14d12d09a9c807b98990c02868323c71')
+sha1sums=('a02d8a678b9235f231002feb4ecef7171939161e')
 install=${pkgname}.install
 
 build() {
diff --git a/community/mate-screensaver/PKGBUILD b/community/mate-screensaver/PKGBUILD
index f15ac9bd5..a7600ea20 100644
--- a/community/mate-screensaver/PKGBUILD
+++ b/community/mate-screensaver/PKGBUILD
@@ -1,10 +1,8 @@
-# $Id: PKGBUILD 104210 2014-01-16 17:01:37Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
 
 pkgname=mate-screensaver
-pkgver=1.6.1
-pkgrel=6
+pkgver=1.6.2
+pkgrel=2
 pkgdesc='Screensaver for MATE'
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
@@ -15,10 +13,8 @@ makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser' 'xmlto')
 optdepends=('mate-power-manager: Add power management support.')
 options=('!emptydirs')
 groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"
-        mate-screensaver.pam)
-sha1sums=('3b4c0c1554fdf96def14efa8f9e100d29dc05984'
-          '9d88ef9b5a494f3914858bed89e0f94e412dfced')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('f8101af15e909ca40c1546bda637712e00458a67')
 install=${pkgname}.install
 
 build() {
diff --git a/community/mate-screensaver/mate-screensaver.pam b/community/mate-screensaver/mate-screensaver.pam
deleted file mode 100644
index c776a5410..000000000
--- a/community/mate-screensaver/mate-screensaver.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth        required     pam_unix_auth.so
-auth        optional     pam_gnome_keyring.so
diff --git a/community/phantomjs/PKGBUILD b/community/phantomjs/PKGBUILD
index a9e2d5690..05628853f 100644
--- a/community/phantomjs/PKGBUILD
+++ b/community/phantomjs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104700 2014-01-24 16:28:53Z fyan $
+# $Id: PKGBUILD 104973 2014-01-29 04:07:48Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: grimsock <lord.grimsock at gmail dot com>
 # Contributor: Dieter Plaetinck <dieter@plaetinck.be>
@@ -6,7 +6,7 @@
 # Contributor: Henry Tang <henryykt@gmail.com>
 
 pkgname=phantomjs
-pkgver=1.9.6
+pkgver=1.9.7
 pkgrel=1
 pkgdesc="Headless WebKit with JavaScript API"
 url="http://www.phantomjs.org/"
@@ -18,6 +18,7 @@ source=("git+https://github.com/ariya/${pkgname}.git#tag=$pkgver")
 
 build() {
   cd $pkgname
+
   # workaround for http://code.google.com/p/phantomjs/issues/detail?id=635
   sed -i 's/QMAKE_LFLAGS+=-fuse-ld=gold/#QMAKE_LFLAGS+=-fuse-ld=gold/' src/qt/src/3rdparty/webkit/Source/common.pri
 
diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD
index 1e349b355..663b1cde2 100644
--- a/community/task/PKGBUILD
+++ b/community/task/PKGBUILD
@@ -6,12 +6,12 @@
 
 pkgname=task
 pkgver=2.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A command-line todo list manager"
 arch=('i686' 'x86_64')
 url="http://taskwarrior.org/projects/show/taskwarrior/"
 license=('MIT')
-depends=('util-linux')
+depends=('util-linux' 'gnutls')
 makedepends=('cmake')
 optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon' 'perl-json: for perl export addon')
 source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz)
diff --git a/community/xmind/PKGBUILD b/community/xmind/PKGBUILD
index be506239e..26b9502c2 100644
--- a/community/xmind/PKGBUILD
+++ b/community/xmind/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 105001 2014-01-29 18:13:52Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Christoph Drexler <chrdr at gmx dot at>
 # Contributor: Jelle van der Waa <jellevdwaa@gmail.com>
 
 pkgname=xmind
-pkgver=3.4.0
-_pkgdate=201311050558
+pkgver=3.4.1
+_pkgdate=201401221918
 pkgrel=1
 pkgdesc="Brainstorming and Mind Mapping Software"
 arch=('i686' 'x86_64')
@@ -17,11 +17,10 @@ depends=('desktop-file-utils' 'fontconfig' 'libxrender' 'java-runtime' 'shared-m
 optdepends=('lame: needed for the feature audio notes')
 install=xmind.install
 source=(http://dl2.xmind.net/xmind-downloads/${pkgname}-linux-${pkgver}.${_pkgdate}_${_arch}.deb)
-[ "${CARCH}" = "i686" ] && md5sums=('7e5d4a8218397cdefa5a6c4ecaed7cbd')
-[ "${CARCH}" = "x86_64" ] && md5sums=('6dcaeb46ab9b88c1904f594b9b1eebc8')
+[ "${CARCH}" = "i686" ] && sha512sums=('780fb661d51d68326d4478810d806eab4312b6f21538d4f2dde786f63bd2b9527ec73c25414b83e5aecf496ef78da932697cab2ef099005966a9b13d0f0c5413')
+[ "${CARCH}" = "x86_64" ] && sha512sums=('bfa6f4f3b07091c667fb05fcb4a9f22594f474c6dc34d1439f60bb3769c3c62d583366c2ebd61779c152461553537a2422627f8ad7006be5400f59d4553583f6')
 
 build() {
-  cd "${srcdir}"
   ar x "${pkgname}-linux-${pkgver}.${_pkgdate}_${_arch}.deb"
   bsdtar -xf data.tar.gz
 }
diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD
index 4a6ce828c..257d66c15 100644
--- a/core/libpcap/PKGBUILD
+++ b/core/libpcap/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 200644 2013-11-30 17:42:00Z thomas $
+# $Id: PKGBUILD 204851 2014-01-29 11:26:56Z andyrtr $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=libpcap
-pkgver=1.5.1
+pkgver=1.5.3
 pkgrel=1
 pkgdesc="A system-independent interface for user-level packet capture"
 arch=('i686' 'x86_64')
 url="http://www.tcpdump.org/"
 license=('BSD')
 depends=('glibc' 'libnl' 'sh' 'libusbx')
-makedepends=('flex')
+makedepends=('flex' 'bluez-libs')
 source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig})
-sha256sums=('259db4fe1e9f0b6b9c43a057ec5916dec7d0a821b00d6d6c4dff7db2445fa7e4'
+sha256sums=('9ae92159c1060f15e6a90f2c4ad227268b6aaa382c316fa49a31c496b9979e93'
             'SKIP')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-ipv6 --with-libnl
+  ./configure --prefix=/usr \
+    --enable-ipv6 \
+    --enable-bluetooth \
+    --with-libnl
   make
 }
 
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 81cae3171..a378864ec 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 200685 2013-12-02 11:59:05Z svenstaro $
+# $Id: PKGBUILD 204853 2014-01-29 13:51:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
-pkgver=2.8.12.1
-pkgrel=3
+pkgver=2.8.12.2
+pkgrel=1
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/"
@@ -15,7 +15,7 @@ optdepends=('qt4: cmake-gui')
 install="${pkgname}.install"
 source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
         "findfreetype.patch")
-md5sums=('9d38cd4e2c94c3cea97d0e2924814acc'
+md5sums=('17c6513483d23590cbce6957ec6d1e66'
          '90321de1d9d46cd8d6609d0509dbd7b0')
 
 build() {
diff --git a/extra/cppunit/PKGBUILD b/extra/cppunit/PKGBUILD
index 4ff85ba24..e1d317dac 100644
--- a/extra/cppunit/PKGBUILD
+++ b/extra/cppunit/PKGBUILD
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD 197901 2013-10-30 11:34:14Z allan $
+# $Id: PKGBUILD 204848 2014-01-29 10:11:42Z andyrtr $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 
 pkgname=cppunit
-pkgver=1.13.1
+pkgver=1.13.2
 pkgrel=1
-_hash=fa9aa839145cdf860bf596532bb8af97
 pkgdesc="A C++ unit testing framework"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/cppunit"
 license=('LGPL')
 depends=('sh' 'gcc-libs')
 options=('!emptydirs')
-source=(http://dev-www.libreoffice.org/src/${_hash}-${pkgname}-${pkgver}.tar.gz)
-md5sums=(${_hash})
+source=(http://dev-www.libreoffice.org/src/${pkgname}-${pkgver}.tar.gz)
+md5sums=('d1c6bdd5a76c66d2c38331e2d287bc01')
 
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd ${pkgname}-${pkgver}
    ./configure --prefix=/usr --disable-static
    make
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
+  cd ${pkgname}-${pkgver}
+  make check
 }
 
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd ${pkgname}-${pkgver}
    make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD
index 4d2b02e42..54d7e808e 100644
--- a/extra/gstreamer-vaapi/PKGBUILD
+++ b/extra/gstreamer-vaapi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200351 2013-11-26 23:08:09Z heftig $
+# $Id: PKGBUILD 204869 2014-01-29 19:22:30Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=gstreamer-vaapi
 pkgname=(gst-vaapi gstreamer0.10-vaapi)
-pkgver=0.5.7
+pkgver=0.5.8
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework VA Plugins"
 arch=(i686 x86_64)
@@ -14,13 +14,18 @@ makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstream
 options=(!emptydirs)
 
 #source=(git://gitorious.org/vaapi/${pkgbase}.git#tag=$pkgver)
-source=($url/$pkgbase-${pkgver}.tar.bz2)
-sha1sums=('6baa794e5f95a22fbb5e0788ec29c8a78f40b5b3')
+source=($url/$pkgbase-${pkgver}.tar.bz2
+        https://gitorious.org/vaapi/gstreamer-videoutils/raw/f56f0ca70eaa39dc8f66f61e991094b385ed71ff:gst-libs/gst/video/gstvideoencoder.c
+        https://gitorious.org/vaapi/gstreamer-videoutils/raw/f56f0ca70eaa39dc8f66f61e991094b385ed71ff:gst-libs/gst/video/gstvideoencoder.h)
+sha1sums=('b0756a5941e3ad2d33a94a550eb9fe3ade0c07e6'
+          'd1edee8caacd6d0868b95fd80c8aab8018105178'
+          'd3f198da32cfe5c305818ca93a941ac5198efa1c')
 
 prepare() {
   mkdir build build-0.10
-  #cd $pkgbase
-  #NO_CONFIGURE=1 ./autogen.sh
+
+  # Fix files not in tarball
+  cp gstvideoencoder.{c,h} $pkgbase-$pkgver/ext/videoutils/gst-libs/gst/video
 }
 
 _build() (
diff --git a/extra/hdf5/PKGBUILD b/extra/hdf5/PKGBUILD
index 4d4eb94e2..3ef74f71e 100644
--- a/extra/hdf5/PKGBUILD
+++ b/extra/hdf5/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198099 2013-10-30 12:47:33Z allan $
+# $Id: PKGBUILD 204867 2014-01-29 19:00:16Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=hdf5
-pkgver=1.8.11
+pkgver=1.8.12
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="General purpose library and file format for storing scientific data"
@@ -14,10 +14,10 @@ license=('custom')
 depends=('zlib' 'sh')
 makedepends=('time')
 source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
-sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e')
+sha1sums=('8414ca0e6ff7d08e423955960d641ec5f309a55f')
 
 build() {
-  cd $srcdir/${pkgname}-${pkgver/_/-}
+  cd "$srcdir/${pkgname}-${pkgver/_/-}"
 
   export CFLAGS="${CFLAGS/O2/O0}"
   export CXXFLAGS="${CFLAGS}"
@@ -34,12 +34,12 @@ build() {
 }
 
 package() {
-  cd $srcdir/${pkgname}-${pkgver/_/-}
+  cd "$srcdir/${pkgname}-${pkgver/_/-}"
 
-  make -j1 DESTDIR=${pkgdir} install
+  make -j1 DESTDIR="${pkgdir}" install
 
-  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
-  install -m644 $srcdir/${pkgname}-${pkgver/_/-}/COPYING \
-          $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
+  install -d -m755 "$pkgdir/usr/share/licenses/${pkgname}"
+  install -m644 "$srcdir/${pkgname}-${pkgver/_/-}/COPYING" \
+          "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" 
 }
 
diff --git a/extra/id3lib/00-add-libz-to-compilation.patch b/extra/id3lib/00-add-libz-to-compilation.patch
new file mode 100644
index 000000000..e93787736
--- /dev/null
+++ b/extra/id3lib/00-add-libz-to-compilation.patch
@@ -0,0 +1,14 @@
+This patch was first introduced in version 3.8.3-3
+
+It fixes http://bugs.debian.org/208672
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -74,6 +74,8 @@
+ 
+ if ID3_NEEDZLIB
+ LDADD        = $(top_builddir)/zlib/src/libz.la
++else
++libid3_la_LIBADD  = -lz
+ endif
+ 
+ libid3_la_LDFLAGS = \
diff --git a/extra/id3lib/05-create-m4-directory.patch b/extra/id3lib/05-create-m4-directory.patch
new file mode 100644
index 000000000..d8111205e
--- /dev/null
+++ b/extra/id3lib/05-create-m4-directory.patch
@@ -0,0 +1,12 @@
+Create a local m4 subdirectory
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -12,6 +12,8 @@
+ # require automake 1.5
+ AUTOMAKE_OPTIONS = 1.5
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ EXTRA_DIST =                    \
+         HISTORY                 \
+         config.h.win32          \
diff --git a/extra/id3lib/10-fix-compilation-with-cpp-headers.patch b/extra/id3lib/10-fix-compilation-with-cpp-headers.patch
new file mode 100644
index 000000000..a9b45ab02
--- /dev/null
+++ b/extra/id3lib/10-fix-compilation-with-cpp-headers.patch
@@ -0,0 +1,22 @@
+This patch imports the proper C++ headers
+--- a/include/id3/id3lib_strings.h
++++ b/include/id3/id3lib_strings.h
+@@ -30,6 +30,7 @@
+ #define _ID3LIB_STRINGS_H_
+ 
+ #include <string>
++#include <cstring>
+ 
+ #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
+ namespace std
+--- a/include/id3/writers.h
++++ b/include/id3/writers.h
+@@ -30,7 +30,7 @@
+ 
+ #include "id3/writer.h"
+ #include "id3/id3lib_streams.h"
+-//#include <string.h>
++#include <cstring>
+ 
+ class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
+ {
diff --git a/extra/id3lib/15-fix-headers-of-main-functions.patch b/extra/id3lib/15-fix-headers-of-main-functions.patch
new file mode 100644
index 000000000..48e01d145
--- /dev/null
+++ b/extra/id3lib/15-fix-headers-of-main-functions.patch
@@ -0,0 +1,45 @@
+This patch fixes some function headers in demo code used during 'make check'
+--- a/examples/demo_info.cpp
++++ b/examples/demo_info.cpp
+@@ -309,7 +309,7 @@
+ 
+ #define DEBUG
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   ID3D_INIT_DOUT();
+ 
+--- a/examples/demo_convert.cpp
++++ b/examples/demo_convert.cpp
+@@ -84,7 +84,7 @@
+   }
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   flags_t ulFlag = ID3TT_ALL;
+   gengetopt_args_info args;
+--- a/examples/demo_copy.cpp
++++ b/examples/demo_copy.cpp
+@@ -81,7 +81,7 @@
+   }
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   int ulFlag = ID3TT_ID3;
+   ID3D_INIT_DOUT();
+--- a/examples/demo_tag.cpp
++++ b/examples/demo_tag.cpp
+@@ -46,7 +46,7 @@
+     os << "v2";
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   int ulFlag = ID3TT_ID3;
+   ID3D_INIT_DOUT();
diff --git a/extra/id3lib/20-create-manpages.patch b/extra/id3lib/20-create-manpages.patch
new file mode 100644
index 000000000..b2ef4ef57
--- /dev/null
+++ b/extra/id3lib/20-create-manpages.patch
@@ -0,0 +1,198 @@
+This patch adds debian-made man pages
+--- /dev/null
++++ b/doc/man/id3info.1
+@@ -0,0 +1,31 @@
++.TH ID3INFO 1 "May 2000" local "User Command"
++.SH NAME
++id3info \- Display id3 tag information.
++.SH SYNOPSIS
++.B id3info
++.RB [
++.I OPTION
++.RB ]
++.RB [
++.I FILE
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3info
++displays both the id3v1 and id3v2 tag information for a file.
++Id3info will not differentiate between the two types of tags.
++.SH OPTIONS
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.SH SEE ALSO
++id3convert(1), id3tag(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
++
+--- /dev/null
++++ b/doc/man/id3tag.1
+@@ -0,0 +1,69 @@
++.TH ID3TAG 1 "May 2000" local "User Command"
++.SH NAME
++id3tag \- Tags an mp3 file with id3v1 and/or id3v2 tags.
++.SH SYNOPSIS
++.B id3tag
++.RB [
++.I OPTION
++.RB ] ...
++.RB [
++.I FILE
++.RB ] ...
++.br
++.SH DESCRIPTION
++.B Id3tag
++will render both types of tag by default.  Only the last
++tag type indicated in the option list will be used.  Non-
++rendered will remain unchanged in the original file.  Will
++also parse and convert Lyrics3 v2.0 frames, but will not
++render them.
++
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-2, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.TP
++.B \-a, \-\-artist ARTIST
++Set the artist information
++.TP
++.B \-s, \-\-song SONG
++Set the song title information
++.TP
++.B \-A, \-\-album ALBUM
++Set the album title information
++.TP
++.B \-c, \-\-comment COMMENT
++Set the comment information
++.TP
++.B \-C, \-\-desc DESCRIPTION
++Set the comment description
++.TP
++.B \-g, \-\-genre num
++Set the genre number
++.TP
++.B \-y, \-\-year num
++Set the year
++.TP
++.B \-t, \-\-track num
++Set the track number
++.TP
++.B \-T, \-\-total num
++Set the total number of tracks on the album
++
++.SH SEE ALSO
++id3convert(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
++
+--- /dev/null
++++ b/doc/man/id3convert.1
+@@ -0,0 +1,47 @@
++.TH ID3CONVERT 1 "May 2000" local "User Command"
++.SH NAME
++id3convert \- Converts between id3v1 and id3v2 tags of an mp3 file.
++.SH SYNOPSIS
++.B id3convert
++.RB [
++.I OPTION
++.RB ]
++.RB [
++.I FILE
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3convert
++converts between id3v1 and id3v2 tags of an mp3 file. Id3convert will render
++both types of tag by default. Only the last tag type indicated in the option
++list will be used. Non-rendered tags will remain unchanged in the original
++file. Id3convert will also parse and convert Lyrics3 v2.0 frames, but will
++not render them.
++
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-1, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-s, \-\-strip
++Strip, rather than render, the tags
++.TP
++.B \-p, \-\-padding
++Use padding in the tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++
++.SH SEE ALSO
++id3tag(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
+--- /dev/null
++++ b/doc/man/id3cp.1
+@@ -0,0 +1,38 @@
++.TH ID3CP 1 "July 2001" local "User Command"
++.SH NAME
++id3cp \- Copies tags from one file to another.
++.SH SYNOPSIS
++.B id3cp
++.RB [
++.I OPTION
++.RB ] ...
++.RB [
++.I SOURCE
++.RB ]
++.RB [
++.I DEST
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3cp
++copies tags from SOURCE to DEST.
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-1, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.SH SEE ALSO
++id3convert(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
diff --git a/extra/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff b/extra/id3lib/30-fix-utf16.patch
index b05d2cf29..3d3f50fed 100644
--- a/extra/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
+++ b/extra/id3lib/30-fix-utf16.patch
@@ -1,6 +1,6 @@
-diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
---- id3lib-3.8.3.orig/ChangeLog	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/ChangeLog	2006-02-22 00:33:59.946214472 +0100
+Patch from 'Spoon' to fix issues with writing certain unicode characters
+--- a/ChangeLog
++++ b/ChangeLog
 @@ -1,3 +1,8 @@
 +2006-02-17  Jerome Couderc
 +
@@ -10,9 +10,8 @@ diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
  2003-03-02 Sunday 17:38   Thijmen Klok <thijmen@id3lib.org>
  
  	* THANKS (1.20): added more people 
-diff -ruN id3lib-3.8.3.orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp
---- id3lib-3.8.3.orig/src/io_helpers.cpp	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/src/io_helpers.cpp	2006-02-22 00:35:02.926639992 +0100
+--- a/src/io_helpers.cpp
++++ b/src/io_helpers.cpp
 @@ -363,11 +363,22 @@
      // Write the BOM: 0xFEFF
      unicode_t BOM = 0xFEFF;
diff --git a/extra/id3lib/id3lib-3.8.3-CVE-2007-4460.patch b/extra/id3lib/40-deal-with-mkstemp.patch
index daa08667b..36c84179f 100644
--- a/extra/id3lib/id3lib-3.8.3-CVE-2007-4460.patch
+++ b/extra/id3lib/40-deal-with-mkstemp.patch
@@ -1,5 +1,10 @@
---- src/tag_file.cpp
-+++ src/tag_file.cpp
+This patch fixes an issues where temporary files were created in an insecure
+way.
+
+It was first intruduced in version 3.8.3-7 and fixes
+http://bugs.debian.org/438540
+--- a/src/tag_file.cpp
++++ b/src/tag_file.cpp
 @@ -242,8 +242,8 @@
      strcpy(sTempFile, filename.c_str());
      strcat(sTempFile, sTmpSuffix.c_str());
diff --git a/extra/id3lib/50-remove-outdated-check.patch b/extra/id3lib/50-remove-outdated-check.patch
new file mode 100644
index 000000000..386da2771
--- /dev/null
+++ b/extra/id3lib/50-remove-outdated-check.patch
@@ -0,0 +1,11 @@
+We don't actually need iomanip.h
+--- a/configure.in
++++ b/configure.in
+@@ -227,7 +227,6 @@
+ )
+ AC_CHECK_HEADERS(               \
+   string                        \
+-  iomanip.h                     \
+   ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
+ )
+ 
diff --git a/extra/id3lib/60-add-c-wrapper-functions.patch b/extra/id3lib/60-add-c-wrapper-functions.patch
new file mode 100644
index 000000000..d72e81c0e
--- /dev/null
+++ b/extra/id3lib/60-add-c-wrapper-functions.patch
@@ -0,0 +1,58 @@
+This patch adds C wrapper functions for field encoding.
+
+It was first introduced in version 3.8.3-8 and fixes
+http://bugs.debian.org/281292
+--- a/include/id3.h
++++ b/include/id3.h
+@@ -104,6 +104,9 @@
+   ID3_C_EXPORT void                 CCONV ID3Field_GetBINARY          (const ID3Field *field, uchar *buffer, size_t buffLength);
+   ID3_C_EXPORT void                 CCONV ID3Field_FromFile           (ID3Field *field, const char *fileName);
+   ID3_C_EXPORT void                 CCONV ID3Field_ToFile             (const ID3Field *field, const char *fileName);
++  ID3_C_EXPORT bool                 CCONV ID3Field_SetEncoding        (ID3Field *field, ID3_TextEnc enc);
++  ID3_C_EXPORT ID3_TextEnc          CCONV ID3Field_GetEncoding        (const ID3Field *field);
++  ID3_C_EXPORT bool                 CCONV ID3Field_IsEncodable        (const ID3Field *field);
+ 
+   /* field-info wrappers */
+   ID3_C_EXPORT char*                CCONV ID3FrameInfo_ShortName     (ID3_FrameID frameid);
+--- a/src/c_wrapper.cpp
++++ b/src/c_wrapper.cpp
+@@ -681,6 +681,39 @@
+     }
+   }
+ 
++  ID3_C_EXPORT bool CCONV
++  ID3Field_SetEncoding(ID3Field *field, ID3_TextEnc enc)
++  {
++    bool changed = false;
++    if (field)
++    {
++      ID3_CATCH(changed = reinterpret_cast<ID3_Field *>(field)->SetEncoding(enc));
++    }
++    return changed;
++  }
++
++  ID3_C_EXPORT ID3_TextEnc CCONV
++  ID3Field_GetEncoding(const ID3Field *field)
++  {
++    ID3_TextEnc enc = ID3TE_NONE;
++    if (field)
++    {
++      ID3_CATCH(enc = reinterpret_cast<const ID3_Field *>(field)->GetEncoding());
++    }
++    return enc;
++  }
++
++  ID3_C_EXPORT bool CCONV
++  ID3Field_IsEncodable(const ID3Field *field)
++  {
++    bool isEncodable = false;
++    if (field)
++    {
++      ID3_CATCH(isEncodable = reinterpret_cast<const ID3_Field *>(field)->IsEncodable());
++    }
++    return isEncodable;
++  }
++
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
diff --git a/extra/id3lib/60-fix_make_check.patch b/extra/id3lib/60-fix_make_check.patch
new file mode 100644
index 000000000..e2bb1b051
--- /dev/null
+++ b/extra/id3lib/60-fix_make_check.patch
@@ -0,0 +1,50 @@
+This patch fixes some function headers and imports in order for 'make check'
+to work.
+
+It was first introduced in version 3.8.3-9
+diff -Naur id3lib-3.8.3.orig/examples/findeng.cpp id3lib-3.8.3/examples/findeng.cpp
+--- id3lib-3.8.3.orig/examples/findeng.cpp	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/examples/findeng.cpp	2009-12-10 00:58:12.173795997 +0100
+@@ -9,7 +9,7 @@
+ using std::cout;
+ using std::endl;
+ 
+-int main(unsigned argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+   ID3D_INIT_DOUT();
+   ID3D_INIT_WARNING();
+diff -Naur id3lib-3.8.3.orig/examples/findstr.cpp id3lib-3.8.3/examples/findstr.cpp
+--- id3lib-3.8.3.orig/examples/findstr.cpp	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/examples/findstr.cpp	2009-12-10 00:57:48.036819825 +0100
+@@ -9,7 +9,7 @@
+ using std::cout;
+ using std::endl;
+ 
+-int main(unsigned argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+   ID3D_INIT_DOUT();
+   ID3D_INIT_WARNING();
+diff -Naur id3lib-3.8.3.orig/examples/test_io.cpp id3lib-3.8.3/examples/test_io.cpp
+--- id3lib-3.8.3.orig/examples/test_io.cpp	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/examples/test_io.cpp	2009-12-10 00:57:03.612111640 +0100
+@@ -11,6 +11,9 @@
+ #include <id3/io_strings.h>
+ #include <id3/utils.h>
+ 
++using std::cin;
++using std::hex;
++using std::dec;
+ using std::cout;
+ using std::endl;
+ using std::cerr;
+@@ -18,7 +21,7 @@
+ using namespace dami;
+ 
+ int
+-main(size_t argc, const char** argv)
++main(int argc, const char** argv)
+ {
+   ID3D_INIT_DOUT();
+   ID3D_INIT_WARNING();
diff --git a/extra/id3lib/60-id3lib-missing-nullpointer-check.patch b/extra/id3lib/60-id3lib-missing-nullpointer-check.patch
new file mode 100644
index 000000000..d4ca5d292
--- /dev/null
+++ b/extra/id3lib/60-id3lib-missing-nullpointer-check.patch
@@ -0,0 +1,12 @@
+This patch adds a check for a null pointer
+--- a/src/header_tag.cpp
++++ b/src/header_tag.cpp
+@@ -54,7 +54,7 @@
+ {
+   size_t bytesUsed = ID3_TagHeader::SIZE;
+ 
+-  if (_info->is_extended)
++  if (_info && _info->is_extended)
+   {
+     bytesUsed += _info->extended_bytes;
+   }
diff --git a/extra/id3lib/60-spelling.patch b/extra/id3lib/60-spelling.patch
new file mode 100644
index 000000000..7547aa3d5
--- /dev/null
+++ b/extra/id3lib/60-spelling.patch
@@ -0,0 +1,107 @@
+This patch fixes some minor spelling mistakes
+diff -Naur id3lib-3.8.3.orig//ChangeLog id3lib-3.8.3//ChangeLog
+--- id3lib-3.8.3.orig//ChangeLog	2010-06-08 05:21:47.817061336 +0200
++++ id3lib-3.8.3//ChangeLog	2010-06-08 05:21:05.320811354 +0200
+@@ -2266,7 +2266,7 @@
+ 	* examples/demo_info.cpp (1.19): 
+ 	(PrintInformation): When printing synced lyrics info, now uses a 
+ 	MemoryReader, BinaryNumberReader, and TextReader to extract the 
+-	infromation from the binary field.  This is a cheat, since these 
++	information from the binary field.  This is a cheat, since these 
+ 	classes aren't normally exposed to folks using the library. 
+ 	Hopefully they will be exposed soon enough for the next major
+ 	release.  
+diff -Naur id3lib-3.8.3.orig//doc/id3v2.3.0.html id3lib-3.8.3//doc/id3v2.3.0.html
+--- id3lib-3.8.3.orig//doc/id3v2.3.0.html	2010-06-08 05:21:47.859810543 +0200
++++ id3lib-3.8.3//doc/id3v2.3.0.html	2010-06-08 05:21:05.373811128 +0200
+@@ -2157,7 +2157,7 @@
+  64.Native American
+  65.Cabaret
+  66.New Wave
+- 67.Psychadelic
++ 67.Psychedelic
+  68.Rave
+  69.Showtunes
+  70.Trailer
+@@ -2254,4 +2254,4 @@
+ Email: <a href="mailto:johan@id3.org">johan@id3.org</a>
+ </p>
+ 
+-</body></html>
+\ No newline at end of file
++</body></html>
+diff -Naur id3lib-3.8.3.orig//doc/id3v2.3.0.txt id3lib-3.8.3//doc/id3v2.3.0.txt
+--- id3lib-3.8.3.orig//doc/id3v2.3.0.txt	2010-06-08 05:21:47.860810639 +0200
++++ id3lib-3.8.3//doc/id3v2.3.0.txt	2010-06-08 05:21:05.374811307 +0200
+@@ -1929,7 +1929,7 @@
+      64.Native American
+      65.Cabaret
+      66.New Wave
+-     67.Psychadelic
++     67.Psychedelic
+      68.Rave
+      69.Showtunes
+      70.Trailer
+diff -Naur id3lib-3.8.3.orig//id3com/id3com.idl id3lib-3.8.3//id3com/id3com.idl
+--- id3lib-3.8.3.orig//id3com/id3com.idl	2010-06-08 05:21:47.818060988 +0200
++++ id3lib-3.8.3//id3com/id3com.idl	2010-06-08 05:21:05.355061546 +0200
+@@ -179,7 +179,7 @@
+       /* USER */ ID3_TERMSOFUSE,        /**< Terms of use */
+       /* USLT */ ID3_UNSYNCEDLYRICS,    /**< Unsynchronized lyric/text transcription */
+       /* WCOM */ ID3_WWWCOMMERCIALINFO, /**< Commercial information */
+-      /* WCOP */ ID3_WWWCOPYRIGHT,      /**< Copyright/Legal infromation */
++      /* WCOP */ ID3_WWWCOPYRIGHT,      /**< Copyright/Legal information */
+       /* WOAF */ ID3_WWWAUDIOFILE,      /**< Official audio file webpage */
+       /* WOAR */ ID3_WWWARTIST,         /**< Official artist/performer webpage */
+       /* WOAS */ ID3_WWWAUDIOSOURCE,    /**< Official audio source webpage */
+diff -Naur id3lib-3.8.3.orig//include/id3/globals.h id3lib-3.8.3//include/id3/globals.h
+--- id3lib-3.8.3.orig//include/id3/globals.h	2010-06-08 05:21:47.818060988 +0200
++++ id3lib-3.8.3//include/id3/globals.h	2010-06-08 05:22:27.395811102 +0200
+@@ -313,7 +313,7 @@
+   /* USER */ ID3FID_TERMSOFUSE,        /**< Terms of use */
+   /* USLT */ ID3FID_UNSYNCEDLYRICS,    /**< Unsynchronized lyric/text transcription */
+   /* WCOM */ ID3FID_WWWCOMMERCIALINFO, /**< Commercial information */
+-  /* WCOP */ ID3FID_WWWCOPYRIGHT,      /**< Copyright/Legal infromation */
++  /* WCOP */ ID3FID_WWWCOPYRIGHT,      /**< Copyright/Legal information */
+   /* WOAF */ ID3FID_WWWAUDIOFILE,      /**< Official audio file webpage */
+   /* WOAR */ ID3FID_WWWARTIST,         /**< Official artist/performer webpage */
+   /* WOAS */ ID3FID_WWWAUDIOSOURCE,    /**< Official audio source webpage */
+@@ -608,7 +608,7 @@
+   "Native American",   //64
+   "Cabaret",           //65
+   "New Wave",          //66
+-  "Psychadelic",       //67
++  "Psychedelic",       //67
+   "Rave",              //68
+   "Showtunes",         //69
+   "Trailer",           //70
+@@ -686,7 +686,7 @@
+   "Christian Rock ",       //141
+   "Merengue",              //142
+   "Salsa",                 //143
+-  "Trash Metal",           //144
++  "Thrash Metal",          //144
+   "Anime",                 //145
+   "JPop",                  //146
+   "Synthpop"               //147
+diff -Naur id3lib-3.8.3.orig//src/field.cpp id3lib-3.8.3//src/field.cpp
+--- id3lib-3.8.3.orig//src/field.cpp	2010-06-08 05:21:47.818060988 +0200
++++ id3lib-3.8.3//src/field.cpp	2010-06-08 05:21:05.373811128 +0200
+@@ -719,7 +719,7 @@
+ // USER       ID3FID_TERMSOFUSE        Terms of use
+ // USLT  ULT  ID3FID_UNSYNCEDLYRICS    Unsynchronized lyric/text transcription
+ // WCOM  WCM  ID3FID_WWWCOMMERCIALINFO Commercial information
+-// WCOP  WCM  ID3FID_WWWCOPYRIGHT      Copyright/Legal infromation
++// WCOP  WCM  ID3FID_WWWCOPYRIGHT      Copyright/Legal information
+ // WOAF  WCP  ID3FID_WWWAUDIOFILE      Official audio file webpage
+ // WOAR  WAF  ID3FID_WWWARTIST         Official artist/performer webpage
+ // WOAS  WAR  ID3FID_WWWAUDIOSOURCE    Official audio source webpage
+@@ -813,7 +813,7 @@
+   {ID3FID_TERMSOFUSE,        ""   , "USER", false, false, ID3FD_TermsOfUse,    "Terms of use"},
+   {ID3FID_UNSYNCEDLYRICS,    "ULT", "USLT", false, false, ID3FD_GeneralText,   "Unsynchronized lyric/text transcription"},
+   {ID3FID_WWWCOMMERCIALINFO, "WCM", "WCOM", false, false, ID3FD_URL,           "Commercial information"},
+-  {ID3FID_WWWCOPYRIGHT,      "WCP", "WCOP", false, false, ID3FD_URL,           "Copyright/Legal infromation"},
++  {ID3FID_WWWCOPYRIGHT,      "WCP", "WCOP", false, false, ID3FD_URL,           "Copyright/Legal information"},
+   {ID3FID_WWWAUDIOFILE,      "WAF", "WOAF", false, false, ID3FD_URL,           "Official audio file webpage"},
+   {ID3FID_WWWARTIST,         "WAR", "WOAR", false, false, ID3FD_URL,           "Official artist/performer webpage"},
+   {ID3FID_WWWAUDIOSOURCE,    "WAS", "WOAS", false, false, ID3FD_URL,           "Official audio source webpage"},
diff --git a/extra/id3lib/61-fix_vbr_stack_smash.patch b/extra/id3lib/61-fix_vbr_stack_smash.patch
new file mode 100644
index 000000000..9bf33e978
--- /dev/null
+++ b/extra/id3lib/61-fix_vbr_stack_smash.patch
@@ -0,0 +1,19 @@
+Description: Fix crashes when reading VBR MP3 file.
+Bug-Ubuntu: https://launchpad.net/bugs/444466
+Origin: upstream, http://sourceforge.net/tracker/?func=detail&aid=937707&group_id=979&atid=300979
+Forwarded: yes
+Author: Urs Fleisch
+
+Index: id3lib3.8.3-3.8.3/src/mp3_parse.cpp
+===================================================================
+--- id3lib3.8.3-3.8.3.orig/src/mp3_parse.cpp	2009-10-06 23:12:10.381250132 +0200
++++ id3lib3.8.3-3.8.3/src/mp3_parse.cpp	2009-10-06 23:14:09.545252591 +0200
+@@ -465,7 +465,7 @@
+   // from http://www.xingtech.com/developer/mp3/
+ 
+   const size_t VBR_HEADER_MIN_SIZE = 8;     // "xing" + flags are fixed
+-  const size_t VBR_HEADER_MAX_SIZE = 116;   // frames, bytes, toc and scale are optional
++  const size_t VBR_HEADER_MAX_SIZE = 120;   // frames, bytes, toc and scale are optional
+ 
+   if (mp3size >= vbr_header_offest + VBR_HEADER_MIN_SIZE) 
+   {
diff --git a/extra/id3lib/PKGBUILD b/extra/id3lib/PKGBUILD
index 269acf934..5d1ae757d 100644
--- a/extra/id3lib/PKGBUILD
+++ b/extra/id3lib/PKGBUILD
@@ -1,34 +1,81 @@
-# $Id: PKGBUILD 198108 2013-10-30 12:50:19Z allan $
-# Contributor: Jochem Kossen <j.kossen@home.nl>
+# $Id: PKGBUILD 204871 2014-01-29 20:02:59Z guillaume $
+# Maintainer : Guillaume ALAUX <guillaume@archlinux.org>
+# Contributor: Jochem Kossen   <j.kossen@home.nl>
+# Contributor: rtfreedman      <rob.til.freedman@googlemail.com>
 
 pkgname=id3lib
 pkgver=3.8.3
-pkgrel=13
-pkgdesc="An open-source, cross-platform software development library for reading, writing, and manipulating ID3v1 and ID3v2 tags"
+pkgrel=14
+pkgdesc='Library for reading, writing, and manipulating ID3v1 and ID3v2 tags'
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://id3lib.sourceforge.net/"
 depends=('zlib' 'gcc-libs')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'patch_id3lib_3.8.3_UTF16_writing_bug.diff'
-        'id3lib-3.8.3-CVE-2007-4460.patch'
-        'id3lib-3.8.3-gcc-4.3.patch')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        00-add-libz-to-compilation.patch
+        05-create-m4-directory.patch
+        10-fix-compilation-with-cpp-headers.patch
+        15-fix-headers-of-main-functions.patch
+        20-create-manpages.patch
+        30-fix-utf16.patch
+        40-deal-with-mkstemp.patch
+        50-remove-outdated-check.patch
+        60-add-c-wrapper-functions.patch
+        60-fix_make_check.patch
+        60-id3lib-missing-nullpointer-check.patch
+        60-spelling.patch
+        61-fix_vbr_stack_smash.patch)
+
 md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7'
-         '196c65adee1ba511ddacef2de0dfd102'
-         '78e90e15ddd1122b66da352b6c3b00ff'
-         'fdbffd2d9d289ed0d730950c78d4ebc4')
+         '9428ef38283d13adb6e349089537a63f'
+         '5a78e0fe586fba334eae2a29e4bf5a28'
+         '88f21f1bf4f697be8030706bbec11705'
+         'b3de841cd2eda0d37c8c8330119e12d4'
+         'd922a91abcdee1ffce26b512b171c2aa'
+         '74ba59c03f91fedbe4dd8045b29c7e15'
+         'd2d06d46df3867d73746f584d1e6fcc5'
+         'd3a61d07a2bfa83f4ac6290794789022'
+         '93ef4b26ad08027e28d3f80ad6e492b4'
+         '5c4b53a3d5543c5c50b23d6d5b9f230b'
+         '964fa0db0da7b1495b34b81bd36539fd'
+         '26c74a90267892bbaca1e162919121d0'
+         '0973e285cdc420130b984a259cdd8ae0')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  patch -p1 -i ${srcdir}/00-add-libz-to-compilation.patch
+  patch -p1 -i ${srcdir}/05-create-m4-directory.patch
+  patch -p1 -i ${srcdir}/10-fix-compilation-with-cpp-headers.patch
+  patch -p1 -i ${srcdir}/15-fix-headers-of-main-functions.patch
+  patch -p1 -i ${srcdir}/20-create-manpages.patch
+  patch -p1 -i ${srcdir}/30-fix-utf16.patch
+  patch -p1 -i ${srcdir}/40-deal-with-mkstemp.patch
+  patch -p1 -i ${srcdir}/60-add-c-wrapper-functions.patch
+  patch -p1 -i ${srcdir}/60-fix_make_check.patch
+  patch -p1 -i ${srcdir}/60-id3lib-missing-nullpointer-check.patch
+  patch -p1 -i ${srcdir}/60-spelling.patch
+  patch -p1 -i ${srcdir}/61-fix_vbr_stack_smash.patch
+  patch -p1 -i ${srcdir}/50-remove-outdated-check.patch
+
+  libtoolize -fc
+  aclocal
+  autoconf
+  automake --add-missing --copy
+}
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/patch_id3lib_3.8.3_UTF16_writing_bug.diff
-  patch -p0 -i "${srcdir}"/id3lib-3.8.3-CVE-2007-4460.patch
-  patch -p1 -i "${srcdir}"/id3lib-3.8.3-gcc-4.3.patch
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
-  sed -i -e 's/^LIBS =/LIBS = -lz -lstdc++/' src/Makefile
   make
 }
 
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/id3lib/id3lib-3.8.3-gcc-4.3.patch b/extra/id3lib/id3lib-3.8.3-gcc-4.3.patch
deleted file mode 100644
index f5ec498b6..000000000
--- a/extra/id3lib/id3lib-3.8.3-gcc-4.3.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Naur id3lib-3.8.3-orig/configure id3lib-3.8.3/configure
---- id3lib-3.8.3-orig/configure      2008-05-24 23:39:36.000000000 -0400
-+++ id3lib-3.8.3/configure   2008-05-24 23:39:57.000000000 -0400
-@@ -10296,8 +10296,7 @@
- 
- for ac_header in \
-   string                        \
--  iomanip.h                     \
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- 
-diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h
---- id3lib-3.8.3-orig/include/id3/id3lib_strings.h	2008-03-05 18:19:46.000000000 -0600
-+++ id3lib-3.8.3/include/id3/id3lib_strings.h	2008-03-05 18:19:38.000000000 -0600
-@@ -30,6 +30,7 @@
- #define _ID3LIB_STRINGS_H_
- 
- #include <string>
-+#include <cstring>
- 
- #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
- namespace std
-diff -Naur id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h
---- id3lib-3.8.3-orig/include/id3/writers.h	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/include/id3/writers.h	2008-03-05 18:23:05.000000000 -0600
-@@ -30,7 +30,7 @@
- 
- #include "id3/writer.h"
- #include "id3/id3lib_streams.h"
--//#include <string.h>
-+#include <string.h>
- 
- class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
- {
-diff -Naur id3lib-3.8.3-orig/examples/demo_convert.cpp id3lib-3.8.3/examples/demo_convert.cpp
---- id3lib-3.8.3-orig/examples/demo_convert.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_convert.cpp	2008-03-05 18:26:50.000000000 -0600
-@@ -84,7 +84,7 @@
-   }
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   flags_t ulFlag = ID3TT_ALL;
-   gengetopt_args_info args;
-diff -Naur id3lib-3.8.3-orig/examples/demo_info.cpp id3lib-3.8.3/examples/demo_info.cpp
---- id3lib-3.8.3-orig/examples/demo_info.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_info.cpp	2008-03-05 18:27:40.000000000 -0600
-@@ -309,7 +309,7 @@
- 
- #define DEBUG
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   ID3D_INIT_DOUT();
- 
-diff -Naur id3lib-3.8.3-orig/examples/demo_tag.cpp id3lib-3.8.3/examples/demo_tag.cpp
---- id3lib-3.8.3-orig/examples/demo_tag.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_tag.cpp	2008-03-05 18:31:20.000000000 -0600
-@@ -46,7 +46,7 @@
-     os << "v2";
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   int ulFlag = ID3TT_ID3;
-   ID3D_INIT_DOUT();
-diff -Naur id3lib-3.8.3-orig/examples/demo_copy.cpp id3lib-3.8.3/examples/demo_copy.cpp
---- id3lib-3.8.3-orig/examples/demo_copy.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_copy.cpp	2008-03-05 18:32:44.000000000 -0600
-@@ -81,7 +81,7 @@
-   }
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   int ulFlag = ID3TT_ID3;
-   ID3D_INIT_DOUT();
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 640058bf7..9cc2085df 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204309 2014-01-17 05:30:07Z andyrtr $
+# $Id: PKGBUILD 204857 2014-01-29 14:49:34Z guillaume $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,18 +6,19 @@
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_icedtea_ver=2.4.4
+_icedtea_ver=2.4.5
 
 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
 _JDK_UPDATE_VERSION=51
-_CORBA_CHANGESET=e540fd592221
-_JAXP_CHANGESET=2e2bf2d8be16
-_JAXWS_CHANGESET=5aceb5a787b1
-_JDK_CHANGESET=1fe539ed00bc
-_LANGTOOLS_CHANGESET=3f5408abf14b
-_OPENJDK_CHANGESET=796d1bf47b24
 
-_HOTSPOT_CHANGESET=a8a33cc2dd4b # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
+_CORBA_CHANGESET=3594dbde270d
+_JAXP_CHANGESET=8fe156ad49e2
+_JAXWS_CHANGESET=32ea8b1ed91a
+_JDK_CHANGESET=9db88c18e114
+_LANGTOOLS_CHANGESET=dabd37b7e295
+_OPENJDK_CHANGESET=410eb7fef869
+
+_HOTSPOT_CHANGESET=2cb58882dac3 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -47,14 +48,15 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('ddce5dadaca4a24e8ecd632d5299fefd76f3bdcd7040bfbded3de3b1dffd56b3'
-            'abe048022f46f4d04130b2cf6a1b1d897bdca981518349d34fe5b415310f7782'
-            '77c3285f6abdefe7f19fc4c698ef1f4fe533f38941314e7e7077c34fa5eb4456'
-            '48bb8ece00ef62c6c0161dd90e5789419594dfb5d08163781dac9ffc00c0a3f8'
-            'ee2a7165b78693c3bb61a90128b60934704e9a5c6c7514abfbb61e41531b9919'
-            '16373b85dc5123cfe1816ec04f7d14e9a048c6eee7eb7c22b5b816fa1fd5e9bc'
-            '4375ccfacc49793dd0f13cb73ce3c684218bce71008fc237f3b6da754f4dfea6'
-            'cb5f109ae32c07301bc3a017c334ca3a7723124ff217d46127a16ade516d2902'
+
+sha256sums=('10c08eeffaa0602b23cb957a2595a2ad3ab474cbe47b12743bbdd79037d5883d'
+            '2de151c7275d91ef082e63fcc0957c5f9290404ec6e20ecfa1e752e16bfab707'
+            'd1f97e143fe94ae3a56b45bb5a90f8ab10ec2be4ff770a788f0a1ac677e27a7d'
+            '0a2a40186cedfbeb8f87b0bc86bea2830943943081d4289fc74f7a783b2e1af3'
+            '08a169b6b02883759ec7a412aa91aa3e37480761cb50b95d092dbcdb2fc9a3d0'
+            '285e5b8ccbb29f3f9f9ea9ea7856d1ed97465c57d091fbcd9b2e55a1ffbb543e'
+            '86cb370ce2084c4b699d8c002ebe6c026e86206ffa82a2f3d7906aadb94ed79f'
+            'd8c1681ae76e660c1888065933cedbbc1309869c7a2fb98f07c424716d5ebaf9'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
             'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
diff --git a/extra/libao/PKGBUILD b/extra/libao/PKGBUILD
index c08182ef0..b90178b57 100644
--- a/extra/libao/PKGBUILD
+++ b/extra/libao/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198123 2013-10-30 12:55:41Z allan $
+# $Id: PKGBUILD 204844 2014-01-29 00:25:51Z bisson $
 # Contributor: dorphell <dorphell@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libao
-pkgver=1.1.0
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
 pkgdesc='Cross-platform audio output library and plugins'
 url='http://xiph.org/ao/'
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('libpulse')
 backup=('etc/libao.conf')
 source=("http://downloads.xiph.org/releases/ao/${pkgname}-${pkgver}.tar.gz"
         'libao.conf')
-sha1sums=('9301bc4886f170c7122ab62677fb71cf001c04fd'
+sha1sums=('6b1d2c6a2e388e3bb6ebea158d51afef18aacc56'
           '603f5e6715e7e50e1c8e8c1935c45a897c46e9af')
 
 conflicts=('libao-pulse')
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 4df4996ea..4d233049c 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 202771 2013-12-27 14:33:26Z juergen $
+# $Id: PKGBUILD 204865 2014-01-29 18:43:38Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
-pkgver=5.31.0
-pkgrel=2
+pkgver=5.32.1
+pkgrel=1
 pkgdesc="A sophisticated computer algebra system"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,11 +17,11 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/
 options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima
 install=maxima.install
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop")
-sha1sums=('07623644b2962d68388cfd3f507e3d381e33ce02'                                          
+sha1sums=('8667c9e26fdb2889ceb0641b0abc7372aadd591a'
           '4398ebb1ec85ccfa12f37516a56d60c26f74b18b')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # set correct python executable to create docs
   sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
@@ -35,15 +35,15 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
   # install some freedesktop.org compatibility
-  install -Dm644 ${srcdir}/${pkgname}.desktop \
-  	${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -Dm644 "${srcdir}/${pkgname}.desktop" \
+  	"${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
   # make sure, we have a nice icon for the desktop file at the right place ;)
-  install -d ${pkgdir}/usr/share/pixmaps/
+  install -d "${pkgdir}/usr/share/pixmaps/"
   ln -s /usr/share/maxima/${pkgver}/xmaxima/maxima-new.png \
-	${pkgdir}/usr/share/pixmaps/${pkgname}.png
+	"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
 }
diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD
index 2ccdd166c..55dd2c338 100644
--- a/extra/socat/PKGBUILD
+++ b/extra/socat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186472 2013-05-27 06:47:24Z bisson $
+# $Id: PKGBUILD 204846 2014-01-29 01:50:38Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=socat
-pkgver=1.7.2.2
+pkgver=1.7.2.3
 pkgrel=1
 pkgdesc='Multipurpose relay'
 url='http://www.dest-unreach.org/socat/'
@@ -12,7 +12,7 @@ license=('GPL2')
 arch=('i686' 'x86_64')
 depends=('readline' 'openssl')
 source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('588294c17373d52a8ac877dcd599ef26f14b110b')
+sha1sums=('580c56b6aadab6b71562e1c5a963c22e8ace6e32')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xcb-util-wm/PKGBUILD b/extra/xcb-util-wm/PKGBUILD
index 55868ba5c..9dfa665e2 100644
--- a/extra/xcb-util-wm/PKGBUILD
+++ b/extra/xcb-util-wm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198495 2013-10-30 15:12:43Z allan $
+# $Id: PKGBUILD 204850 2014-01-29 10:16:49Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=xcb-util-wm
-pkgver=0.3.9
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('libxcb>=1.7')
 makedepends=('xorg-util-macros')
 source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
         'LICENSE')
-sha256sums=('038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030'
+sha256sums=('66f97c18f7d98d3c873fe5db5842d2fca34519274c31ee668551ab8995a2f51f'
             'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9')
 
 build() {
diff --git a/libre/angband-libre/libre.patch b/libre/angband-libre/libre.patch
deleted file mode 100644
index a044bc6fe..000000000
--- a/libre/angband-libre/libre.patch
+++ /dev/null
@@ -1,814 +0,0 @@
-diff --git a/copying.txt b/copying.txt
-index fe1f289..82263b1 100644
---- a/copying.txt
-+++ b/copying.txt
-@@ -23,14 +23,6 @@ exceptions:
-    only under the terms of the Creative Commons Attribution 3.0 licence:
-    http://creativecommons.org/licenses/by/3.0/
- 
-- * Shockbolt's (64x64) graphics are distributed under the licence at the end
--   of this file.  Currently some of the tiles in the 64x64.png tilesheet were
--   resized from tiles made by David Gervais for the 32x32 set.
--
-- * The sounds are licenced under the Creative Commons Attribution-NonCommercial-
--   Sharealike licence.  They were created by Dubtrain <angband@dubtrain.com>.
--   You can find them in Wave format at http://www.dubtrain.com/angband/.
--
-  * The font files are all by Leon Marrick and/or Sheldon Simms III and/or Nick
-    McConnell, all of whom have agreed to their Angband work being released
-    under the GPL.
-@@ -393,25 +385,3 @@ proprietary programs.  If your program is a subroutine library, you may
- consider it more useful to permit linking proprietary applications with the
- library.  If this is what you want to do, use the GNU Lesser General
- Public License instead of this License.
--
--------------------------------------------------------------------------------
--
--The Shockbolt Angband 64x64/128x64 tileset is copyright (C) Raymond Gaustadnes
--2012.  It can be found in the file lib/xtra/graf/128x128.png.
--
--Permission is granted to:
--* use the tileset with in-development and released versions of Angband
--* distribute and make copies of the tileset with in-development and released
--  versions of Angband, as long as no fee is charged for it
--* incorporate tiles designed by the author for variants of Angband and use and
--  distribute them with Angband under the terms above
--
--Permission is not granted to:
--* modify the tileset without the author's permission.
--* incorporate tiles designed for ToME that do not appear in the Angband tileset.
--* use or distribute the tileset with other games or projects.  If you want to
--  use and distribute the tileset with other games or projects, you must obtain
--  explicit permission from the author.  Non-commercial games or projects may
--  be granted permission to use them, and if so, use will be allowed as long
--  as the game or project remains non-commercial.  To use them in commercial
--  games, a non-exclusive licence must be acquired from the author.
-diff --git a/lib/xtra/graf/Makefile b/lib/xtra/graf/Makefile
-index e1e9111..ec54051 100644
---- a/lib/xtra/graf/Makefile
-+++ b/lib/xtra/graf/Makefile
-@@ -1,6 +1,6 @@
- MKPATH=../../../mk/
- include $(MKPATH)buildsys.mk
- 
--DATA = 8x8.png 8x16.png 16x16.png 32x32.png 64x64.png mr_att.png graphics.txt
-+DATA = 8x8.png 8x16.png 16x16.png 32x32.png mr_att.png graphics.txt
- PACKAGE = xtra/graf
- 
-diff --git a/lib/xtra/graf/graphics.txt b/lib/xtra/graf/graphics.txt
-index 28078fc..02f32ab 100644
---- a/lib/xtra/graf/graphics.txt
-+++ b/lib/xtra/graf/graphics.txt
-@@ -47,8 +47,3 @@ N:4:Nomad's tiles
- I:16:16:8x16.png
- P:nomad
- X:0:0:0
--
--N:5:Shockbolt's tiles
--I:64:64:64x64.png
--P:shock
--X:1:29:31
-diff --git a/lib/xtra/sound/Makefile b/lib/xtra/sound/Makefile
-index 0fb522b..a4337fd 100644
---- a/lib/xtra/sound/Makefile
-+++ b/lib/xtra/sound/Makefile
-@@ -1,78 +1,7 @@
- MKPATH=../../../mk/
- include $(MKPATH)buildsys.mk
- 
--DATA = sound.cfg \
--	amb_bell_metal1.mp3		mco_scurry_dry.mp3		plm_drop_boot.mp3 \
--	amb_bell_metal2.mp3		mco_shake_roll.mp3		plm_eat_bite.mp3 \
--	amb_bell_tibet1.mp3		mco_snarl_short.mp3		plm_floor_creak.mp3 \
--	amb_bell_tibet2.mp3		mco_spray_long.mp3		plm_floor_creak2.mp3 \
--	amb_bell_tibet3.mp3		mco_squish_hit.mp3		plm_glass_break.mp3 \
--	amb_door_doom.mp3		mco_squish_snap.mp3		plm_glass_breaking.mp3 \
--	amb_door_iron.mp3		mco_strange_music.mp3		plm_glass_smashing.mp3 \
--	amb_dungeon_echo.mp3		mco_strange_thwoink.mp3		plm_jar_ding.mp3 \
--	amb_dungeon_echowet.mp3		mco_thoing_backwards.mp3	plm_levelup.mp3 \
--	amb_gong_chinese.mp3		mco_thoing_deep.mp3		plm_lock_case.mp3 \
--	amb_gong_low.mp3		mco_thud_crash.mp3		plm_lock_distant.mp3 \
--	amb_gong_strike.mp3		mco_tube_hit.mp3		plm_metal_clank.mp3 \
--	amb_gong_undertone.mp3		plc_bell_warn.mp3		plm_metal_sharpen.mp3 \
--	amb_guitar_chord.mp3		plc_die_laugh.mp3		plm_open_case.mp3 \
--	amb_pulse_low.mp3		plc_hit_anvil.mp3		plm_spell1.mp3 \
--	amb_thunder_rain.mp3		plc_hit_anvil2.mp3		plm_spell2.mp3 \
--	amb_thunder_roll.mp3		plc_hit_arrow.mp3		plm_spell3.mp3 \
--	id_bad_aww.mp3			plc_hit_body.mp3		plm_use_staff.mp3 \
--	id_bad_dang.mp3			plc_hit_groan.mp3		plm_wood_thud.mp3 \
--	id_bad_hmm.mp3			plc_hit_grunt.mp3		plm_zap_rod.mp3 \
--	id_bad_hmph.mp3			plc_hit_grunt2.mp3		pls_bell_bowl.mp3 \
--	id_bad_ohh.mp3			plc_hit_hay.mp3			pls_bell_chime_new.mp3 \
--	id_ego_whoa.mp3			plc_miss_arrow.mp3		pls_bell_glass.mp3 \
--	id_ego_woohoo.mp3		plc_miss_arrow2.mp3		pls_bell_hibell_soft.mp3 \
--	id_ego_yeah.mp3			plc_miss_swish.mp3		pls_bell_mute.mp3 \
--	id_ego_yeah2.mp3		plm_aim_wand.mp3		pls_bell_sustain.mp3 \
--	id_ego_yes.mp3			plm_bang_ceramic.mp3		pls_breathe_in.mp3 \
--	id_good_hey.mp3			plm_bang_dumpster.mp3		pls_man_argoh.mp3 \
--	id_good_hey2.mp3		plm_bang_metal.mp3		pls_man_gulp_new.mp3 \
--	id_good_hmm.mp3			plm_book_pageturn.mp3		pls_man_oooh.mp3 \
--	id_good_huh.mp3			plm_bottle_clinks.mp3		pls_man_scream2.mp3 \
--	id_good_ooh.mp3			plm_break_canister.mp3		pls_man_sigh.mp3 \
--	id_good_ooo.mp3			plm_break_glass.mp3		pls_man_sniff.mp3 \
--	id_good_wow.mp3			plm_break_glass2.mp3		pls_man_sob.mp3 \
--	mco_attack_breath.mp3		plm_break_plates.mp3		pls_man_spit.mp3 \
--	mco_attack_spray.mp3		plm_break_shatter.mp3		pls_man_ugh.mp3 \
--	mco_bite_chew.mp3		plm_break_smash.mp3		pls_man_yell.mp3 \
--	mco_bite_chomp.mp3		plm_break_wood.mp3		pls_tone_blurk.mp3 \
--	mco_bite_dainty.mp3		plm_cabinet_open.mp3		pls_tone_clave6.mp3 \
--	mco_bite_gnash.mp3		plm_cabinet_shut.mp3		pls_tone_clavelo8.mp3 \
--	mco_bite_hard.mp3		plm_chain_light.mp3		pls_tone_conk.mp3 \
--	mco_bite_long.mp3		plm_chest_latch.mp3		pls_tone_elec.mp3 \
--	mco_bite_munch.mp3		plm_chest_unlatch.mp3		pls_tone_goblet.mp3 \
--	mco_bite_regular.mp3		plm_chimes_jangle.mp3		pls_tone_guiro.mp3 \
--	mco_bite_short.mp3		plm_click_dry.mp3		pls_tone_headstock.mp3 \
--	mco_bite_small.mp3		plm_click_switch.mp3			pls_tone_scrape.mp3 \
--	mco_bite_soft.mp3		plm_click_switch2.mp3		pls_tone_stick.mp3 \
--	mco_card_shuffle.mp3		plm_click_switch3.mp3		sto_bell_desk.mp3 \
--	mco_castanet_trill.mp3		plm_click_wood.mp3		sto_bell_ding.mp3 \
--	mco_ceramic_trill.mp3		plm_close_hatch.mp3		sto_bell_dingaling.mp3 \
--	mco_click_vibra.mp3		plm_coins_dump.mp3		sto_bell_jingles.mp3 \
--	mco_creature_choking.mp3	plm_coins_light.mp3		sto_bell_register1.mp3 \
--	mco_creature_groan.mp3		plm_coins_pour.mp3		sto_bell_register2.mp3 \
--	mco_creature_yelp.mp3		plm_coins_shake.mp3		sto_bell_ringing.mp3 \
--	mco_cuica_rubbing.mp3		plm_cork_pop.mp3		sto_bell_shop.mp3 \
--	mco_dino_low.mp3		plm_cork_squeak.mp3		sto_coins_countertop.mp3 \
--	mco_dino_slur.mp3		plm_door_bolt.mp3		sto_man_haha.mp3 \
--	mco_dino_talk.mp3		plm_door_creak.mp3		sto_man_hey.mp3 \
--	mco_dino_yawn.mp3		plm_door_creakshut.mp3		sto_man_whoohaha.mp3 \
--	mco_dub_wobble.mp3		plm_door_dungeon.mp3		sum_angel_song.mp3 \
--	mco_frog_trill.mp3		plm_door_echolock.mp3		sum_bell_crystal.mp3 \
--	mco_hit_whip.mp3		plm_door_entrance.mp3		sum_bell_hand.mp3 \
--	mco_howl_croak.mp3		plm_door_knob.mp3		sum_bell_tone.mp3 \
--	mco_howl_deep.mp3		plm_door_latch.mp3		sum_chime_jangle.mp3 \
--	mco_howl_distressed.mp3		plm_door_open.mp3		sum_ghost_moan.mp3 \
--	mco_howl_high.mp3		plm_door_opening.mp3		sum_ghost_oooo.mp3 \
--	mco_howl_long.mp3		plm_door_rusty.mp3		sum_ghost_wail.mp3 \
--	mco_liquid_squirt.mp3		plm_door_shut.mp3		sum_gong_temple.mp3 \
--	mco_man_mumble.mp3		plm_door_slam.mp3		sum_laugh_evil2.mp3 \
--	mco_mouse_squeaks.mp3		plm_door_squeaky.mp3		sum_lion_growl.mp3  \
--	mco_rubber_thud.mp3		plm_door_wooden.mp3		sum_piano_scrape.mp3
-+DATA = sound.cfg
- 
- PACKAGE = xtra/sound
- 
-diff --git a/lib/xtra/sound/sound.cfg b/lib/xtra/sound/sound.cfg
-index a3f483f..41de805 100644
---- a/lib/xtra/sound/sound.cfg
-+++ b/lib/xtra/sound/sound.cfg
-@@ -9,21 +9,6 @@
- # hit = hit.mp3 hit1.mp3
- #
- 
--#
--# This is the Dubtrain Angband Sound config list, v.3.1.0 - February 24th, 2009
--#
--# Licensed under a Creative Commons non-commercial agreement
--#
--# Inspired by the original Craig's Angband Sound Patch.
--#
--# But with all new sounds.
--#
--# contact angband@dubtrain.com
--#
--# download zipped archive at www.dubtrain.com/angband
--#
--#
--
- [Sound]
- 
- #
-@@ -31,484 +16,484 @@
- #
- 
- # Town during the day.
--ambient_day = amb_thunder_rain.mp3
-+ambient_day =
- 
- # Town during the night.
--ambient_nite = amb_guitar_chord.mp3 amb_thunder_roll.mp3
-+ambient_nite =
- 
- # Dungeon levels 1-20 (50'-1000')
--ambient_dng1 = amb_door_iron.mp3 amb_bell_metal1.mp3
-+ambient_dng1 =
- 
- # Dungeon levels 21-40 (1050'-2000')
--ambient_dng2 = amb_bell_tibet1.mp3 amb_bell_metal2.mp3 amb_gong_strike.mp3
-+ambient_dng2 =
- 
- # Dungeon levels 41-60 (2050'-3000')
--ambient_dng3 = amb_bell_tibet2.mp3 amb_dungeon_echo.mp3 amb_pulse_low.mp3
-+ambient_dng3 =
- 
- # Dungeon levels 61-80 (3050'-4000')
--ambient_dng4 = amb_bell_tibet3.mp3 amb_dungeon_echowet.mp3 amb_gong_undertone.mp3
-+ambient_dng4 =
- 
- # Dungeon levels 81 and beyond (4050'-)
--ambient_dng5 = amb_door_doom.mp3 amb_gong_chinese.mp3 amb_gong_low.mp3
-+ambient_dng5 =
- 
- #
- # Store sounds
- #
- 
- # The shopkeep bought a worthless item.
--store1 = sto_man_hey.mp3
-+store1 =
- 
- # The shopkeep paid too much for an item.
--store2 = id_bad_dang.mp3
-+store2 =
- 
- # The shopkeep got away with a good bargain.
--store3 = sto_man_haha.mp3
-+store3 =
- 
- # The shopkeep got away with a great bargain.
--store4 = sto_man_whoohaha.mp3
-+store4 =
- 
- # You make a normal transaction (buying or selling).
--store5 = sto_coins_countertop.mp3 sto_bell_register1.mp3 sto_bell_register2.mp3
-+store5 =
- 
- # You enter a store.
--store_enter = sto_bell_desk.mp3 sto_bell_ding.mp3 sto_bell_dingaling.mp3 sto_bell_jingles.mp3 sto_bell_ringing.mp3 sto_bell_shop.mp3
-+store_enter =
- 
- # You enter your home.
--store_home = plm_door_entrance.mp3
-+store_home =
- 
- # You leave a store.
--store_leave = plm_door_bolt.mp3
-+store_leave =
- 
- #
- # Player sounds - combat
- #
- 
- # You succeed in a melee attack against a monster.
--hit = plc_hit_hay.mp3 plc_hit_body.mp3
-+hit =
- 
- # It was a good hit!
--hit_good = plc_hit_anvil.mp3
-+hit_good =
- 
- # It was a great hit!
--hit_great = plc_hit_groan.mp3
-+hit_great =
- 
- # It was a superb hit!
--hit_superb = plc_hit_grunt.mp3
-+hit_superb =
- 
- # It was a *GREAT* hit!
--hit_hi_great = plc_hit_grunt2.mp3
-+hit_hi_great =
- 
- # It was a *SUPERB* hit!
--hit_hi_superb = plc_hit_anvil2.mp3
-+hit_hi_superb =
- 
- # You miss a melee attack against a monster.
--miss = plc_miss_arrow2.mp3
-+miss =
- 
- # You fire a missile.
--shoot = plc_miss_swish.mp3 plc_miss_arrow.mp3
-+shoot =
- 
- # You hit something with a missile.
--shoot_hit = plc_hit_arrow.mp3
-+shoot_hit =
- 
- # You receive a hitpoint warning.
--hitpoint_warn = plc_bell_warn.mp3
-+hitpoint_warn =
- 
- # You die.
--death = plc_die_laugh.mp3
-+death =
- 
- #
- # Player sounds - status changes
- #
- 
- # You become blind.
--blind = pls_tone_conk.mp3
-+blind =
- 
- # You become confused.
--confused = pls_man_ugh.mp3
-+confused =
- 
- # You become poisoned.
--poisoned = pls_tone_guiro.mp3
-+poisoned =
- 
- # You become afraid.
--afraid = pls_man_yell.mp3
-+afraid =
- 
- # You become paralyzed.
--paralyzed = pls_man_gulp_new.mp3
-+paralyzed =
- 
- # You feel drugged (chaos effects).
--drugged = pls_breathe_in.mp3
-+drugged =
- 
- # You become slower.
--slow = pls_man_sigh.mp3
-+slow =
- 
- # You become stunned.
--stun = pls_bell_mute.mp3
-+stun =
- 
- # You suffer a cut.
--cut = pls_man_argoh.mp3
-+cut =
- 
- # A stat is drained
--drain_stat = pls_tone_headstock.mp3
-+drain_stat =
- 
- # You recover from a condition (blind, confused, etc.)
--recover = pls_bell_chime_new.mp3
-+recover =
- 
- # You become faster.
--speed = pls_bell_sustain.mp3
-+speed =
- 
- # You attain a mystic shield.
--shield = pls_bell_bowl.mp3
-+shield =
- 
- # You become blessed.
--blessed = sum_angel_song.mp3
-+blessed =
- 
- # You feel heroic.
--hero = pls_tone_goblet.mp3
-+hero =
- 
- # You are bold.
--bold = pls_bell_hibell_soft.mp3
-+bold =
- 
- # You become berserk.
--berserk = pls_man_scream2.mp3
-+berserk =
- 
- # You feel protected from evil.
--prot_evil = pls_bell_glass.mp3
-+prot_evil =
- 
- # You feel invulnerable. (does any item/spell do this anymore?)
--invuln = pls_tone_blurk.mp3
-+invuln =
- 
- # You can see invisible things.
--see_invis = pls_tone_clave6.mp3
-+see_invis =
- 
- # You can see the infrared spectrum
--infrared = pls_tone_clavelo8.mp3
-+infrared =
- 
- # You become resistant to acid.
--res_acid = pls_man_sniff.mp3
-+res_acid =
- 
- # You become resistant to electricity.
--res_elec = pls_tone_elec.mp3
-+res_elec =
- 
- # You become resistant to fire.
--res_fire = pls_tone_scrape.mp3
-+res_fire =
- 
- # You become resistant to cold.
--res_cold = pls_tone_stick.mp3
-+res_cold =
- 
- # You become resistant to poison.
--res_pois = pls_man_spit.mp3
-+res_pois =
- 
- # You become hungry.
--hungry = pls_man_sob.mp3
-+hungry =
- 
- #
- # Player sounds - misc.
- #
- 
- # You pick up money worth less than 200 au.
--money1 = plm_coins_light.mp3 plm_coins_shake.mp3
-+money1 =
- 
- # You pick up money worth between 200 and 600 au.
--money2 = plm_chain_light.mp3 plm_coins_pour.mp3
-+money2 =
- 
- # You pick up money worth 600 au or more.
--money3 = plm_coins_dump.mp3
-+money3 =
- 
- # You (or a monster) drop something on the ground.
--drop = plm_drop_boot.mp3
-+drop =
- 
- # You gain (or regain) a level.
--level = plm_levelup.mp3
-+level =
- 
- # You successfully study a spell or prayer.
--study = plm_book_pageturn.mp3
-+study =
- 
- # You teleport or phase door.
--teleport = plm_chimes_jangle.mp3
-+teleport =
- 
- # You quaff a potion.
--quaff = plm_bottle_clinks.mp3 plm_cork_pop.mp3 plm_cork_squeak.mp3
-+quaff =
- 
- # You zap a rod.
--zap_rod = plm_zap_rod.mp3
-+zap_rod =
- 
- # You take a step.  (unimplemented)
- walk =
- 
- # You teleport someone else away.
--tpother = plm_chimes_jangle.mp3
-+tpother =
- 
- # You bump into a wall or door.
--hitwall = plm_wood_thud.mp3
-+hitwall =
- 
- # You eat something.
--eat = plm_eat_bite.mp3
-+eat =
- 
- # You successfully dig through something.
--dig = plm_metal_clank.mp3
-+dig =
- 
- # You open a door.
--opendoor = plm_door_bolt.mp3 plm_door_creak.mp3 plm_door_dungeon.mp3 plm_door_entrance.mp3 plm_door_open.mp3 plm_door_opening.mp3 plm_door_rusty.mp3 plm_door_squeaky.mp3
-+opendoor =
- 
- # You shut a door.
--shutdoor = plm_bang_dumpster.mp3 plm_cabinet_shut.mp3 plm_close_hatch.mp3 plm_door_creakshut.mp3 plm_door_latch.mp3 plm_door_shut.mp3 plm_door_slam.mp3
-+shutdoor =
- 
- # You teleport from a level (including via recall).
--tplevel = sum_bell_crystal.mp3
-+tplevel =
- 
- # Default "bell" sound for system messages.
--bell = plm_jar_ding.mp3
-+bell =
- 
- # You try to open something that's not a door.
--nothing_to_open = plm_click_switch2.mp3 plm_door_knob.mp3
-+nothing_to_open =
- 
- # You fail to pick a lock.
--lockpick_fail = plm_click_dry.mp3 plm_click_switch.mp3 plm_click_wood.mp3 plm_door_echolock.mp3 plm_door_wooden.mp3
-+lockpick_fail =
- 
- # You pick a lock.
--lockpick = plm_break_wood.mp3 plm_cabinet_open.mp3 plm_chest_unlatch.mp3 plm_lock_case.mp3 plm_lock_distant.mp3 plm_open_case.mp3
-+lockpick =
- 
- # You disarm a trap.
--disarm = plm_bang_ceramic.mp3 plm_chest_latch.mp3 plm_click_switch3.mp3
-+disarm =
- 
- # You go up stairs.
--stairs_up = plm_floor_creak2.mp3
-+stairs_up =
- 
- # You go down stairs.
--stairs_down = plm_floor_creak.mp3
-+stairs_down =
- 
- # You activate an artifact.
--act_artifact = plm_aim_wand.mp3
-+act_artifact =
- 
- # You use a staff.
--use_staff = plm_use_staff.mp3
-+use_staff =
- 
- # An object is destroyed.
--destroy = plm_bang_metal.mp3 plm_break_canister.mp3 plm_break_glass.mp3 plm_break_glass2.mp3 plm_break_plates.mp3 plm_break_shatter.mp3 plm_break_smash.mp3 plm_glass_breaking.mp3 plm_glass_break.mp3 plm_glass_smashing.mp3
-+destroy =
- 
- # You wield or take off something.
--wield = plm_metal_sharpen.mp3
-+wield =
- 
- # You wield a cursed item.
--cursed = pls_man_oooh.mp3
-+cursed =
- 
- # You notice something (generic notice)
--notice = id_bad_hmm.mp3 
-+notice =
- 
- # You notice something about your equipment or inventory.
--pseudo_id = id_good_hmm.mp3 
-+pseudo_id =
- 
- # You successfully cast a spell.
--cast_spell = plm_spell1.mp3 plm_spell2.mp3 plm_spell3.mp3
-+cast_spell =
- 
- # You successfully pray a prayer.
--pray_prayer = sum_angel_song.mp3
-+pray_prayer =
- 
- #
- # Monster Sounds - combat
- #
- 
- # A monster flees in terror.
--flee = mco_creature_yelp.mp3
-+flee =
- 
- # A monster is killed.
--kill = mco_howl_croak.mp3 mco_howl_deep.mp3 mco_howl_distressed.mp3 mco_howl_high.mp3 mco_howl_long.mp3
-+kill =
- 
- # A unique is killed.
--kill_unique = sum_ghost_wail.mp3
-+kill_unique =
- 
- # Morgoth, Lord of Darkness is killed.
--kill_king = amb_guitar_chord.mp3
-+kill_king =
- 
- # Attack - hit
--mon_hit = mco_hit_whip.mp3
-+mon_hit =
- 
- # Attack - touch
--mon_touch = mco_click_vibra.mp3
-+mon_touch =
- 
- # Attack - punch
--mon_punch = mco_squish_snap.mp3
-+mon_punch =
- 
- # Attack - kick
--mon_kick = mco_rubber_thud.mp3
-+mon_kick =
- 
- # Attack - claw
--mon_claw = mco_ceramic_trill.mp3 mco_scurry_dry.mp3
-+mon_claw =
- 
- # Attack - bite
--mon_bite = mco_snarl_short.mp3 mco_bite_soft.mp3  mco_bite_munch.mp3  mco_bite_long.mp3  mco_bite_short.mp3  mco_bite_gnash.mp3  mco_bite_chomp.mp3  mco_bite_regular.mp3  mco_bite_small.mp3  mco_bite_dainty.mp3  mco_bite_hard.mp3  mco_bite_chew.mp3
-+mon_bite =
- 
- # Attack - sting
--mon_sting = mco_castanet_trill.mp3 mco_tube_hit.mp3
-+mon_sting =
- 
- # Attack - butt
--mon_butt = mco_cuica_rubbing.mp3 mco_thud_crash.mp3
-+mon_butt =
- 
- # Attack - crush
--mon_crush = mco_dino_low.mp3 mco_squish_hit.mp3
-+mon_crush =
- 
- # Attack - engulf
--mon_engulf = mco_dino_talk.mp3 mco_dino_yawn.mp3
-+mon_engulf =
- 
- # Attack - crawl
--mon_crawl = mco_card_shuffle.mp3 mco_shake_roll.mp3
-+mon_crawl =
- 
- # Attack - drool
--mon_drool = mco_creature_choking.mp3 mco_liquid_squirt.mp3
-+mon_drool =
- 
- # Attack - spit
--mon_spit = mco_attack_spray.mp3
-+mon_spit =
- 
- # Attack - gaze
--mon_gaze = mco_thoing_backwards.mp3
-+mon_gaze =
- 
- # Attack - wail
--mon_wail = mco_dino_low.mp3
-+mon_wail =
- 
- # Attack - release spores
--mon_spore = mco_dub_wobble.mp3 mco_spray_long.mp3
-+mon_spore =
- 
- # Attack - beg for money
--mon_beg = mco_man_mumble.mp3
-+mon_beg =
- 
- # Attack - insult
--mon_insult = mco_strange_thwoink.mp3
-+mon_insult =
- 
- # Attack - moan
--mon_moan = mco_strange_music.mp3
-+mon_moan =
- 
- # Attack - shriek
--mon_shriek = mco_mouse_squeaks.mp3
-+mon_shriek =
- 
- # Spell - create traps
--mon_create_trap = mco_thoing_deep.mp3
-+mon_create_trap =
- 
- # Spell - cause fear
--mon_cast_fear = mco_creature_groan.mp3 mco_dino_slur.mp3
-+mon_cast_fear =
- 
- # Multiply (breed explosively)
--multiply = mco_frog_trill.mp3
-+multiply =
- 
- #
- # Summons
- #
- 
- # Summon one or more monsters.
--summon_monster = sum_chime_jangle.mp3
-+summon_monster =
- 
- # Summon angels.
--summon_ainu = sum_angel_song.mp3
-+summon_ainu =
- 
- # Summon undead.
--summon_undead = sum_ghost_oooo.mp3
-+summon_undead =
- 
- # Summon animals.
--summon_animal = sum_lion_growl.mp3
-+summon_animal =
- 
- # Summon spiders.
--summon_spider = sum_piano_scrape.mp3
-+summon_spider =
- 
- # Summon hounds.
--summon_hound = sum_lion_growl.mp3
-+summon_hound =
- 
- # Summon hydras.
--summon_hydra = sum_piano_scrape.mp3
-+summon_hydra =
- 
- # Summon demons.
--summon_demon = sum_ghost_wail.mp3 sum_laugh_evil2.mp3
-+summon_demon =
- 
- # Summon dragon.
--summon_dragon = sum_piano_scrape.mp3
-+summon_dragon =
- 
- # Summon greater undead.
--summon_gr_undead = sum_ghost_moan.mp3
-+summon_gr_undead =
- 
- # Summon greater dragons.
--summon_gr_dragon = sum_gong_temple.mp3
-+summon_gr_dragon =
- 
- # Summon greater demons.
--summon_gr_demon = sum_ghost_moan.mp3
-+summon_gr_demon =
- 
- # Summon Ringwraiths.
--summon_ringwraith = sum_bell_hand.mp3
-+summon_ringwraith =
- 
- # Summon uniques.
--summon_unique = sum_bell_tone.mp3
-+summon_unique =
- 
- #
- # Breath weapons
- #
- 
- # Breathe frost.
--breathe_frost = mco_attack_breath.mp3
-+breathe_frost =
- 
- # Breathe electricity.
--breathe_elec = mco_attack_breath.mp3 
-+breathe_elec =
- 
- # Breathe acid.
--breathe_acid = mco_attack_breath.mp3  
-+breathe_acid =
- 
- # Breathe gas.
--breathe_gas = mco_attack_breath.mp3  
-+breathe_gas =
- 
- # Breathe fire.
--breathe_fire = mco_attack_breath.mp3  
-+breathe_fire =
- 
- # Breathe confusion.
--breathe_confusion = mco_attack_breath.mp3  
-+breathe_confusion =
- 
- # Breathe disenchantment.
--breathe_disenchant = mco_attack_breath.mp3  
-+breathe_disenchant =
- 
- # Breathe chaos.
--breathe_chaos = mco_attack_breath.mp3  
-+breathe_chaos =
- 
- # Breathe shards.
--breathe_shards = mco_attack_breath.mp3  
-+breathe_shards =
- 
- # Breathe sound.
--breathe_sound = mco_attack_breath.mp3  
-+breathe_sound =
- 
- # Breathe light.
--breathe_light = mco_attack_breath.mp3  
-+breathe_light =
- 
- # Breathe darkness.
--breathe_dark = mco_attack_breath.mp3  
-+breathe_dark =
- 
- # Breathe nether.
--breathe_nether = mco_attack_breath.mp3  
-+breathe_nether =
- 
- # Breathe nexus.
--breathe_nexus = mco_attack_breath.mp3  
-+breathe_nexus =
- 
- # Breathe time.
--breathe_time = mco_attack_breath.mp3  
-+breathe_time =
- 
- # Breathe inertia.
--breathe_inertia = mco_attack_breath.mp3  
-+breathe_inertia =
- 
- # Breathe gravity.
--breathe_gravity = mco_attack_breath.mp3  
-+breathe_gravity =
- 
- # Breathe plasma.
--breathe_plasma = mco_attack_breath.mp3  
-+breathe_plasma =
- 
- # Breathe force.
--breathe_force = mco_attack_breath.mp3  
-+breathe_force =
- 
- # Breathe the elements (power dragon scale mail).
--breathe_elements = mco_attack_breath.mp3  
-+breathe_elements =
- 
- #
- # Identifying Items
- #
- 
- # Identify a bad item (including bad ego items and artifacts).
--identify_bad = id_bad_aww.mp3 id_bad_dang.mp3 id_bad_hmm.mp3 id_bad_hmph.mp3 id_bad_ohh.mp3
-+identify_bad =
- 
- # Identify a good ego item.
--identify_ego = id_ego_whoa.mp3 id_ego_woohoo.mp3 id_ego_yeah.mp3 id_ego_yeah2.mp3 id_ego_yes.mp3
-+identify_ego =
- 
- # Identify a good artifact.
--identify_art = id_good_hey.mp3 id_good_hey2.mp3 id_good_hmm.mp3 id_good_huh.mp3 id_good_ooh.mp3 id_good_ooo.mp3 id_good_wow.mp3
-+identify_art =
- 
diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD
deleted file mode 100644
index c08273344..000000000
--- a/libre/doublecmd-libre/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# vim:set ft=sh:
-# $Id: PKGBUILD 103163 2013-12-28 11:01:37Z idevolder $
-# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
-# Contributor: (sirocco AT ngs.ru)
-
-_pkgbase=doublecmd
-pkgbase=doublecmd-libre
-pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt')
-pkgver=0.5.8
-_helpver=0.5.5
-pkgrel=1
-url="http://doublecmd.sourceforge.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-install="$_pkgbase.install"
-provides=("$_pkgbase")
-makedepends=('lazarus' 'qt4pas' 'gtk2')
-optdepends=(
-	'lua51: scripting'
-	'p7zip: support for 7zip archives'
-	'unar: support for rar archives'
-)
-source=(
-	"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz"
-	"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-help-$_helpver-src.tar.gz"
-)
-
-build() {
-	cp -a $_pkgbase-$pkgver $_pkgbase-gtk
-	cp -a $_pkgbase-$pkgver $_pkgbase-qt
-
-	cd "$srcdir/$_pkgbase-gtk"
-	if [ "$CARCH" = "i686" ]; then
-		sed -e '/fPIC/d' -i "$srcdir/$_pkgbase-gtk/components/doublecmd/doublecmd_common.lpk"
-	fi
-	sed -e 's/\(export\ lazbuild=\).*/\1"$(which\ lazbuild) --lazarusdir=\/usr\/lib\/lazarus"/' -i build.sh
-	./build.sh beta gtk2
-
-	cd "$srcdir/$_pkgbase-qt"
-	# dont use fPIC on i686
-	if [ "$CARCH" = "i686" ]; then
-		sed -e '/fPIC/d' -i "$srcdir/$_pkgbase-qt/components/doublecmd/doublecmd_common.lpk"
-	fi
-	sed -e 's/\(export\ lazbuild=\).*/\1"$(which\ lazbuild) --lazarusdir=\/usr\/lib\/lazarus"/' -i build.sh
-	./build.sh beta qt
-}
-
-package_doublecmd-libre-gtk2() {
-	pkgdesc="twin-panel (commander-style) file manager (GTK), with unar recommendation"
-	depends=('gtk2')
-	conflicts=('doublecmd-qt' 'doublecmd-gtk2' 'doublecmd-gtk2-libre')
-	replaces=('doublecmd-gtk2' 'doublecmd-gtk2-libre')
-	provides=("doublecmd-gtk2=${pkgver}")
-	cd "$srcdir/$_pkgbase-gtk"
-	sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
-	./install/linux/install.sh --install-prefix="$pkgdir"
-
-	# install doc
-	cd "$srcdir/$_pkgbase-help-$_helpver"
-	cp -a * "$pkgdir/usr/share/$_pkgbase/doc/"
-}
-
-package_doublecmd-libre-qt() {
-	pkgdesc="twin-panel (commander-style) file manager (QT), with unar recommendation"
-	depends=('qt4pas')
-	conflicts=('doublecmd-gtk2' 'doublecmd-qt' 'doublecmd-qt-libre')
-	replaces=('doublecmd-qt' 'doublecmd-qt-libre')
-	provides=("doublecmd-qt=${pkgver}")
-	cd "$srcdir/$_pkgbase-qt"
-	sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
-	./install/linux/install.sh --install-prefix="$pkgdir"
-
-	# install doc
-	cd "$srcdir/$_pkgbase-help-$_helpver"
-	cp -a * "$pkgdir/usr/share/$_pkgbase/doc/"
-}
-
-sha256sums=('bfa85693b6cc06b7fd28ec8bd443ad9fb9d79d27a541e4f4d54bb9da2fb052ea'
-            '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf')
diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD
deleted file mode 100644
index bd697b3f6..000000000
--- a/libre/gummiboot/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 202399 2013-12-21 16:55:19Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Contributor:  Mantas Mikulėnas <grawity@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname="gummiboot"
-pkgver="41"
-pkgrel="1"
-pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)"
-url="http://freedesktop.org/wiki/Software/gummiboot"
-arch=('x86_64' 'i686' 'mips64el')
-license=('LGPL2.1')
-makedepends=('gnu-efi-libs' 'docbook-xsl' 'git')
-depends=('util-linux')
-conflicts=('gummiboot-efi')
-provides=('gummiboot-efi')
-replaces=('gummiboot-efi')
-options=('!strip' '!makeflags')
-source=("git://anongit.freedesktop.org/${pkgname}#commit=ba731cee"
-        'loader.conf'
-        'parabola.conf'
-        'splash-parabola.bmp')
-install="gummiboot.install"
-md5sums=('SKIP'
-         '3d700d13aec5ab1b78a921eaf22e5bfa'
-         '36ee74767ac8734dede1cbd0f4f275d7'
-         'c146ea0e16fff867164e113c48c91fff')
-
-build() {
-	cd ${srcdir}/${pkgname}
-
-	./autogen.sh
-	./configure --sysconfdir=/etc  --with-efi-ldsdir=/usr/lib --libexecdir=/usr/lib --libdir=/usr/lib
-	
-	make
-}
-
-package() {
-	## Install gummiboot example configuration files (can go away with systemd's kernel-install)
-	install -D -m0644 "${srcdir}/loader.conf" "${pkgdir}/usr/lib/gummiboot/loader/loader.conf"
-	install -D -m0644 "${srcdir}/parabola.conf" "${pkgdir}/usr/lib/gummiboot/loader/entries/parabola.conf"
-
-	## ship an Parabola GNU/Linux-libre boot splash (still has to be dropped in manually to take effect)
-	install -D -m0644 "${srcdir}/splash-parabola.bmp" "${pkgdir}/usr/lib/gummiboot/splash-parabola.bmp"
-
-	cd ${srcdir}/${pkgname}
-
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/libre/gummiboot/splash-parabola.bmp b/libre/gummiboot/splash-parabola.bmp
deleted file mode 100644
index 11ceeff28..000000000
--- a/libre/gummiboot/splash-parabola.bmp
+++ /dev/null
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
deleted file mode 100644
index ad6233f39..000000000
--- a/libre/iceweasel-libre/PKGBUILD
+++ /dev/null
@@ -1,240 +0,0 @@
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
-# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Figue <ffigue at gmail>
-# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
-# Thank you very much to the older contributors:
-# Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
-
-_pgo=true
-
-# We're getting this from Debian Experimental
-_debname=iceweasel
-_debver=26.0
-_debrel=deb1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=iceweasel
-pkgname=iceweasel-libre
-epoch=1
-pkgver=$_debver.$_debrel
-pkgrel=2
-
-pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
-arch=(i686 x86_64 mips64el)
-license=(MPL GPL 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 sqlite startup-notification)
-makedepends=(autoconf2.13 diffutils gstreamer0.10-base imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip)
-[ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
-options=(!emptydirs !makeflags)
-if $_pgo; then
-  makedepends+=(xorg-server-xvfb)
-  options+=(!ccache)
-fi
-optdepends=('networkmanager: Location detection via available WiFi networks'
-            'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing'
-            'gstreamer0.10-good-plugins: webm and mp4 demuxing'
-            'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding'
-            'gstreamer0.10-ugly-plugins: h.264 and mp3 decoding'
-            'gstreamer0.10-ffmpeg: more decoders'
-            'libpulse: PulseAudio audio driver')
-url="http://packages.debian.org/experimental/${_pkgname}"
-install=iceweasel.install
-replaces=('firefox')
-conflicts=('firefox')
-provides=('firefox')
-source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
-        "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.gz"
-        mozconfig
-        mozconfig.pgo
-        libre.patch
-        gnu_headshadow.png
-        iceweasel.desktop
-        iceweasel-install-dir.patch
-        vendor.js
-        iceweasel-20.0.1-fixed-loading-icon.png
-        Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
-        Fixup-Reset-Firefox-after-bad-merge.patch)
-md5sums=('219cf21e0642e8a364365286f23d0624'
-         '2001d0477bcefd0eeaab584402133691'
-         '023120a970670dc85cea19393f0b94b6'
-         'df08eaa1ac3bc6c2356be4fbf8ec8932'
-         'fea121a94737ec8641b39e7120a048d3'
-         'b03a979a78484503ba8dddad4f2c96d1'
-         '7b9e5996dd9fe0b186a43a297db1c6b5'
-         '6620e724ec9a1be74e65089d81d802f7'
-         '816013881cfc9a1f4f0ede72b014f8b3'
-         '6e335a517c68488941340ee1c23f97b0'
-         'dbf1c021e5f7ac323197b219bf213c50'
-         '8e165ef85ddd72491f0b48f8954afca6')
-
-prepare() {
-  export DEBIAN_BUILD="mozilla-release"
-
-  export QUILT_PATCHES=debian/patches
-  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
-  export QUILT_DIFF_ARGS='--no-timestamps'
-
-  mv debian "$srcdir/$DEBIAN_BUILD"
-  cd "$srcdir/$DEBIAN_BUILD"
-
-  # Doesn't apply and seems unimportant
-  rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
-
-  # Doesn't works in some parts due it has patches for others locales languages, source code hasn't it
-  rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
-
-  # It needs to be patched after Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
-  rm -v debian/patches/debian-hacks/Fixup-Reset-Firefox-after-bad-merge.patch || true
-
-  quilt push -av
-
-  install -m644 "$srcdir/gnu_headshadow.png" browser/base/content/abouthome # Put gnu_headshadow.png on the source code
-
-  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/Fixup-Reset-Firefox-after-bad-merge.patch"
-  patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
-
-  # Patch and remove anything that's left
-  patch -Np1 -i "$srcdir/libre.patch"
-  sed -i 's|Adobe Flash|SWF Player|g;
-         ' browser/base/content/pageinfo/permissions.js \
-           browser/base/content/browser-plugins.js
-  sed -i '\|URL of the GeoLocation backend|d;
-          \|geo[.]wifi[.]uri|d;
-         ' browser/app/profile/firefox.js \
-           browser/metro/profile/metro.js
-  rm -v browser/base/content/abouthome/snippet*.png || true
-  sed -i "\|abouthome/snippet|d" browser/base/jar.mn
-
-  # Replace common URLs
-  sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
-          \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
-          \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
-          \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
-          \|browser[.]search[.]searchEnginesURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
-         ' browser/app/profile/firefox.js
-
-  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
-
-  if $_pgo; then
-    cat "$srcdir/mozconfig.pgo" >> .mozconfig
-  fi
-
-  # 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
-
-  # This is a bug, we should fix it
-  if [ "$CARCH" = "mips64el" ]; then
-      # Fix MIPS N32 support.
-      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
-          js/src/assembler/wtf/Platform.h
-      # Disable 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
-      echo 'ac_add_options --disable-methodjit' >> .mozconfig
-      echo 'ac_add_options --disable-tracejit' >> .mozconfig
-      echo 'ac_add_options --disable-jemalloc' >> .mozconfig
-  fi
-
-  # Fix PRE_RELEASE_SUFFIX
-  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
-    browser/base/Makefile.in
-
-  mkdir "$srcdir/path"
-
-  # WebRTC build tries to execute "python" and expects Python 2
-  ln -s /usr/bin/python2 "$srcdir/path/python"
-
-  # Use gold, as Mozilla can use some of its features, such as safe ICF
-  #ln -s /usr/bin/ld.gold "$srcdir/path/ld"
-
-  # configure script misdetects the preprocessor without an optimization level
-  # https://bugs.archlinux.org/task/34644
-  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
-
-  # Fix tab loading icon (flickers with libpng 1.6)
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
-  cp "$srcdir/iceweasel-20.0.1-fixed-loading-icon.png" \
-    browser/themes/linux/tabbrowser/loading.png
-}
-
-build() {
-  export DEBIAN_BUILD="mozilla-release"
-
-  cd "$srcdir/$DEBIAN_BUILD"
-
-  export PATH="$srcdir/path:$PATH"
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
-  export PYTHON="/usr/bin/python2"
-
-  if [[ $CARCH == i686 ]]; then
-    # Work around memory address space exhaustion during linking on i686
-    LDFLAGS+=' -Wl,--no-keep-memory'
-  fi
-
-  if $_pgo; then
-    # Set up PGO
-    export DISPLAY=:99
-    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-
-    if ! make -f client.mk build MOZ_PGO=1; then
-      kill $!
-      return 1
-    fi
-
-    kill $! || true
-  else
-    make -f client.mk build
-  fi
-}
-
-package() {
-  export DEBIAN_BUILD="mozilla-release"
-
-  cd "$srcdir/$DEBIAN_BUILD"
-  make -f client.mk DESTDIR="$pkgdir" install
-
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/browser/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"
-  done
-  install -Dm644 "$brandingdir/mozicon128.png"      "$icondir/128x128/apps/$_pkgname.png"
-  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg"
-
-  install -d                                        "$pkgdir/usr/share/applications"
-  install -m644  "$srcdir/iceweasel.desktop"        "$pkgdir/usr/share/applications"
-
-  rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell            "$pkgdir/usr/lib/$_pkgname/dictionaries"
-  ln -sf /usr/share/hyphen              "$pkgdir/usr/lib/$_pkgname/hyphenation"
-
-  rm -rf "$pkgdir/usr/lib/$_pkgname/browser/"{searchplugins,plugins}
-  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$_pkgname/browser/plugins"
-  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/browser/searchplugins"
-
-  # We don't want the development stuff
-  rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
-
-  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
-}
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
deleted file mode 100644
index 2384818b4..000000000
--- a/libre/iceweasel-libre/libre.patch
+++ /dev/null
@@ -1,1220 +0,0 @@
-diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 331edc8..226508d 100644
---- a/browser/app/profile/firefox.js
-+++ b/browser/app/profile/firefox.js
-@@ -242,11 +242,6 @@ pref("browser.slowStartup.notificationDisabled", false);
- pref("browser.slowStartup.timeThreshold", 60000);
- pref("browser.slowStartup.maxSamples", 5);
- 
--// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
--// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
--// repackager of this code using an alternate snippet url, please keep your users safe
--pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
--
- pref("browser.enable_automatic_image_resizing", true);
- pref("browser.chrome.site_icons", true);
- pref("browser.chrome.favicons", true);
-@@ -1283,11 +1278,7 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
- // (This is intentionally on the high side; see bug 746055.)
- pref("image.mem.max_decoded_image_kb", 256000);
- 
--// Default social providers
--pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"shareURL\":\"https://www.facebook.com/sharer/sharer.php?u=%{url}\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\",\"icon32URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAADbklEQVRYCc1Xv08UQRj99tctexAuCEFjRE0kGBEtLDSGqIWNxkYKbTAxNlY2JhaGWltNtNFeKgsKKxITK43/gCYW+IsoRhA4D47bH7fn9+bcvdm5JR7sefolC3Ozu9978+bNN7PayUv3HN3umdY0Y6IWBtSJ0HSTarXqTOiuTep6Lj+tdxAcA8RAgSmwdd2aCDs0clldYALb/FvgYVhjmfliVA2XpjEgWo0Attn42Z6WH1RFor5ehwo9XQIUZMoVn4qlCoVMSo62EvD8Kh0b3U2Xz43R2PBO6mUCGDlAf65V6MadZzT/rUimoccc2kYA4BfPHqJb105RzjJigKhRq9kEJUBIjgYVuXeL7SAI6eD+Abp5dTwVHOmEHxT50d8WBYJqSOdPj5BjW8gZR8UNqFR2xagx/65XFYaMH+BGWwiYpi4UkBPPLxTp9v1Z+lHc4DWvCQXWmIy6EjITgKowVd5Jjv7N3Hd6y5esigoOwpkJIAmMpZpLJGdiaaC4F0UmAj6bD84GCEwmB/qxMmRilmnwb/mpjAocHh4UEoNAt5NLZB7oy9OJo0PxqkAtePdhiSqunyC1LQUwWMPQaOr6GRre258Ajn4cP7KHcEXhsxpXbj+lT19X2TMNGTLVAcjcalS8gDwsQ2UOMhH4k8FkcrEn5E5ub2sKohxLK2VR77Hl9RUcsrgeRIEiVOT6z+tDbIeLy+vk+kGTCbXxycet6xhl//3f6bJEkdHYhA+mLtDIvoH4ieev5+juoxdk5+pjhALYEdXIpEB5w+NlSKSzqVQ/+H7IO6BLtl3fngGMiqhGJgIwlM6qpyUGFjySdk8m0Zg0ubeD7X9OIDEFajltRQgUJaUKx69tdgaQa0FMADuahZPMFtcEwNPm2hA7ZI5sK4aoE2NvYI+o8hkCIe7CwTv68zS0q9Dk5vpbm/8FXxitSzmMFHpsGj0wyLUheTwD2Y9fVgh1Ae0EPUgD9241ZEnld+v5kgnVZ/8fE0brVh5BK+1oCqKKF72Dk7HwBsssB/pklU1dfChy3S659H5+uelgIb+8WRv1/uGTV9Sdb5wJFlfW6fPCalMhwhSU1j2xKwKbP838GcOwJja4TqO0bjdmXxYTy1EYjFdCWoCEYZhseH/GDL3yJPHnuW6YmT7P1SlIA4768Hke4vOcsX8BE346lLHhDUQAAAAASUVORK5CYII=\", \"icon64URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAACNNJREFUeNrtm3tw1NUVxz/399hHHkgCaCBGEFEEREVFYFQcSoOKdkZay4z+4dDpYIsjHWx1WoTMhFi1gzBSpVgVGbU4U1sHfPESKODwEEnRYDFAICEIeZIQshs2u/v73ds/drMsyW7YLEkl2Z6Z32yy+9v7u+fc7znne8+5KzgvAjDunzlv0M13PjDZ6c4cARj0WhEoaZ1tOn3yq9XLf/tNU0O1D5Ad7wq/OpxpaXOL1j5uZAwuaGlVgwNBhULRm0XXBG6HZrlNa9uRrzfM+3DlgjIgGMsA7rl/XDdHOnNf9vosTfVuvTsaQhdkZ4iykh2rHtqydvkxwI58BhjTfv7MmP55E9/1nLNdfU15ACkVvoAaMCRvRPa+re9+DgTaPjMAx+DrJv3M67Mz+6LybWLb4NfTHhxzx31DDhZvOtqGAgNwWbjGICV9XQJB0e/KobcOP1i8qTzaAEYgaDtNU/V5A9hSaUFLuQEt2gVQSgml+j4CUAIppYgK/m0GkCjZ9xGAUNAu0LUhgJRAAAIVzwBSqVRQH4hlAClRKZAFhOgEASoFECBR8QwgUyQGdJT/B8HzCEiBNKhUJzEgBYIgQsTJAkohe9oFZHgHKvQoHtZ9K3tewfiixXABLdoFeuSSEmkF+PH4QTz7+M3o+ENptzvGtS36uSwmjMpAYF10XCllHCYoe84FlLS555Zs5jx6J6ahY+iCl98pJiDNS1hwSZop+cm91zJmxEBefGsPlu1AxKC67V3gf5oGlZSMuz6Dp2fdhWnoAEwaN5T5hsYLb+4hKB1dcgelFDpB8ifk8thDt3DO5+fZxRvxBV0IjQR0EB3KfD1GhJS0GZnnYuGcKTgdF9ZWx4/No/BJjUUrdtJqm4iL+K5SCmSAiWMHMevhcQzNzaa6ron5SzfQ7HeiaSKx+au4m6HupcJKSYZdZVI4dypuV2yo3zoql0VP3cOiFV/Q4jdiGkGhQFqMGpbJL346kbE3DEYIQWNTC39Ysp4Gr4HQtZDyiRhA0NlmSHZbRM7pr1H0m6lckeHqdGXG3jCYoqfupeC17bT49fNRXIFSNrkDTGbNGM9dtw1D10M1DI/Xx3NLP6OqETRdDy1eglPT4rqA7K56gCIrXfHCvHwGZqUnBMtR113FS/N+xHPLtuJpDa1mVobg0emjmX7vqEjsUErhaw1Q8Mo6yk4F0A1HeOW7kIlFx/u7jworRabLpmhuPjmD+iG7YNDrrhnIS09P5cW/buOeO67lkftvJt3tDE06PE7Qsnh++QYOHPOim86wcVUS0+whJug0ghTMmcK1V2eH8m2UHP++nrwhAyIwjiXDcrN5vXAGhqGhFBeMYUvJ0re2sPfgGTTDGUZrEogVopMgmGQWUCgMEWTBE5MZPSLngnGqas/w9j92s31fJfmThvPM7HyMMKRj+qgmOiBHSsnr73/B5r1V6A53KD4k3bFS8dNgckFQoWPxu1kTGDc6N7JqzR4ff/+smE+2H8FSLkx3FluLawhaG3n2iXwcppGoV/Hemt18tK0c3UwLIfUS2nVafBeQJNUXkAF+/dht3H37cKSUBC2bTTv+w98++YazPg1dT0NoIUhruoMd+2sJrtjI7381rQM3iCVrN33N++tL0c30xFNdp0GQeFRYQhcRIO0gv5xxE/fdfSO2bfNVSTmrPtxLZW0A3XSh6VporaLG1XQHu0pOU/TaOhY8+QAuZ3w6vHnnQd74536EkZ50wOsSE0zcugolbWZOG8GM/LGUVdSw6sM97D/UgGa60QxXzMJDZAq6yb7SJgr//CkLn5pOmsvR4Z5dxUdZ9t6XoKfFjNyXkqZjuoBUCpGgCyhp8eDdQ5k++UaWrdrMlr2VSFxoZlpE8YtNWGgGXx9ppnDZpxTMfTCS8gAOlJ5g8ds7kCItTIi6j6FqMVxAC2sV2RB1ekmLCTcNpH+myeyFH7BxT1Voopoe4RKJXQqhmxw45mXh0o/xeH0opThcXs2iv2wmoFyhAnbC4yX+3PgISMDShrA5XHGa3d9UITRniIeTfHASmsGhEz7mL/mI2TPv4sU3t+KzHAnu7JKpCosOkcSIICAB5hZE0OiRCM0Iwb0b6LPQdI5W+Zn/yucoYYayRk+16eK1xqRMDAHtA0r3lep0lNAjO8kfpCpMqpTF4xZEUqA7rIlOCiKpgADVWXc4FQwgEfHPB5AiByTixIDUCYJx+wJoqdIcJV5VOAWygEZcF7BToT2upFDKtuz2BrAtf8v3mju972cBJX2exso6ok6N64BhOtM11xXXPBz6v6340PcuO+DZfaJkzWqgqY3L64Bqaaz0ZV45Mkc308dG2kd97FLSaq4v317gazr5HeCLRoACFTxbfeBw+oDhWYYj4/rw+30H+rb/VMPxXQsbKnbuABqJOi4vogyRiRB5/XNvvz3zytFTDEf61eF9b0dCKTS36c4afymTsgLeQ9Ly13X/aYnzE1Uy6PV7679trNy1xe+tKwPqAH/0Vla0qw65gH7AFeG/Y3Uy9P45o0bm3PTIaplM6lTK9jWf/OBUyQcrpdXaTIyfsXQb9QcLaAn7vJd2vxY5XxBpo8pwDmgFGsLKx1oeh8OVmUUSLXUlrWZPzbdLag9v+BjUqfDzepKAyDDcZbznGHG+1NmqSKHpVlfbadJqLW+o2LHobNX+PUB1WPkfnHwYyTmX6lI7Lehr3F576NM/+T3V3wH17f2w1xkg2ggXuSvga6p8p+bgmpVKWpXAmVh+2AsNEKogdYYAJa0GT03J4obyf60HTgKe6PTTqw0QOpcQ3wXs4LlDZyq2FXrrS4uBmjDxuCw3G5eIgA46yeC5ho11pWsWW35PWTibBC4Xf+9eBLRPg0q2+s5UvHG6bMNqJYPHw7nXutxZYvIIiMoCSgbrPVX/fv7syS+3AKfC5MOmF4iRpP6RjrId8O5vrNhS1NpUWQLUholUr6muXEoatP3emrWNR9e/avk9R8P+HuxNypPkrk93pGdnK0VtXemaN6UdOHo55vdE5b/0NKx+K4AxtAAAAABJRU5ErkJggg==\", \"description\":\"Keep up with friends wherever you go on the web.\",\"author\":\"Facebook\",\"homepageURL\":\"https://www.facebook.com/about/messenger-for-firefox\",\"builtin\":\"true\"}");
--
--pref("social.sidebar.open", true);
--pref("social.sidebar.unload_timeout_ms", 10000);
-+// removed facebook sidebar with Iceweasel.
- 
- pref("dom.identity.enabled", false);
- 
-diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
-index c270318..049fe6e 100644
---- a/browser/base/content/abouthome/aboutHome.css
-+++ b/browser/base/content/abouthome/aboutHome.css
-@@ -49,11 +49,6 @@ a {
-   background-repeat: no-repeat;
- }
- 
--#searchForm,
--#snippets {
--  width: 470px;
--}
--
- #searchForm {
-   display: -moz-box;
- }
-@@ -72,8 +67,7 @@ a {
- #searchEngineLogo {
-   display: inline-block;
-   height: 28px;
--  width: 70px;
--  min-width: 70px;
-+  width: 47px;
- }
- 
- #searchText {
-@@ -145,48 +139,6 @@ a {
-   transition-duration: 0ms;
- }
- 
--#defaultSnippet1,
--#defaultSnippet2,
--#rightsSnippet {
--  display: block;
--  min-height: 38px;
--  background: 30px center no-repeat;
--  padding: 6px 0;
--  -moz-padding-start: 79px;
--}
--
--#rightsSnippet[hidden] {
--  display: none;
--}
--
--#defaultSnippet1:-moz-dir(rtl),
--#defaultSnippet2:-moz-dir(rtl),
--#rightsSnippet:-moz-dir(rtl) {
--  background-position: right 30px center;
--}
--
--#defaultSnippet1 {
--  background-image: url("chrome://browser/content/abouthome/snippet1.png");
--}
--
--#defaultSnippet2 {
--  background-image: url("chrome://browser/content/abouthome/snippet2.png");
--}
--
--#snippets {
--  display: inline-block;
--  text-align: start;
--  margin: 12px 0;
--  color: #3c3c3c;
--  font-size: 75%;
--  /* 12px is the computed font size, 15px the computed line height of the snippets
--     with Segoe UI on a default Windows 7 setup. The 15/12 multiplier approximately
--     converts em from units of font-size to units of line-height. The goal is to
--     preset the height of a three-line snippet to avoid visual moving/flickering as
--     the snippets load. */
--  min-height: calc(15/12 * 3em);
--}
--
- #launcher {
-   display: -moz-box;
-   -moz-box-align: center;
-@@ -335,26 +287,25 @@ body[narrow] #restorePreviousSession::before {
-   width: 32px;
- }
- 
--#aboutMozilla {
-+#aboutGNU {
-   display: block;
--  position: relative; /* pin wordmark to edge of document, not of viewport */
-   -moz-box-ordinal-group: 0;
-   opacity: .5;
-   transition: opacity 150ms;
- }
- 
--#aboutMozilla:hover {
-+#aboutGNU:hover {
-   opacity: 1;
- }
- 
--#aboutMozilla::before {
--  content: url("chrome://browser/content/abouthome/mozilla.png");
-+#aboutGNU::before {
-+  content: url("chrome://browser/content/abouthome/gnu_headshadow.png");
-   display: block;
-   position: absolute;
-   top: 12px;
-   right: 12px;
--  width: 69px;
--  height: 19px;
-+  width: 200px;
-+  height: 110px;
- }
- 
- /* [HiDPI]
-@@ -366,26 +317,6 @@ body[narrow] #restorePreviousSession::before {
-     background-image: url("chrome://branding/content/about-logo@2x.png");
-   }
- 
--  #defaultSnippet1,
--  #defaultSnippet2,
--  #rightsSnippet {
--    background-size: 40px;
--  }
--
--  #defaultSnippet1 {
--    background-image: url("chrome://browser/content/abouthome/snippet1@2x.png");
--  }
--
--  #defaultSnippet2 {
--    background-image: url("chrome://browser/content/abouthome/snippet2@2x.png");
--  }
--
--  .launchButton::before,
--  #aboutMozilla::before {
--    transform: scale(.5);
--    transform-origin: 0 0;
--  }
--
-   #downloads::before {
-     content: url("chrome://browser/content/abouthome/downloads@2x.png");
-   }
-@@ -421,9 +352,5 @@ body[narrow] #restorePreviousSession::before {
-   body[narrow] #restorePreviousSession::before {
-     content: url("chrome://browser/content/abouthome/restore@2x.png");
-   }
--
--  #aboutMozilla::before {
--    content: url("chrome://browser/content/abouthome/mozilla@2x.png");
--  }
- }
- 
-diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
-index 432fcdc..8e85f1f 100644
---- a/browser/base/content/abouthome/aboutHome.js
-+++ b/browser/base/content/abouthome/aboutHome.js
-@@ -3,317 +3,99 @@
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
- const SEARCH_ENGINES = {
--  "Google": {
--    // This is the "2x" image designed for OS X retina resolution, Windows at 192dpi, etc.;
--    // it will be scaled down as necessary on lower-dpi displays.
-+  "DuckDuckGo HTML": {
-     image: "data:image/png;base64," +
--           "iVBORw0KGgoAAAANSUhEUgAAAIwAAAA4CAYAAAAvmxBdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
--           "bWFnZVJlYWR5ccllPAAAGrFJREFUeNrtfHt4VdW172+utZOASLJ5+BaIFrUeXkFsa0Fl++gDnznV" +
--           "VlvFxt7aqvUUarXtse3Bau35ak/rZ9XT26NtfOvV6wFET+FYCQEKWqsQIT5RCAgSXnlnrzXneNw/" +
--           "1lphJSSQ8BB7bub3zW+LO3uN+fiNMcf4jTEX0N/6W3/rb/2tv30smtnXB3zmRi2FQakxQNKX3WkW" +
--           "9S/tgW3HLpmQM543A0BWVSHMYGIwOTDxzxrOf3/RQQfMZ2/SLAvKhTFVBGUqKFONH2QAzwOMF38a" +
--           "wHhYZAxWAqhe/iszp3+b970d/sInc57vz/J8L2eMB2MAEYkBQ6DQ3dRw4dq7AUjcP3rAfPZmLWXC" +
--           "LHKoIAcQAUxaB5EaEfc6AEBhjDEwmcx43/fO9HxT4vkReBIAAZgjgodW3NcPnn1sHgD/iHknn+0d" +
--           "6s8XEUhsXXac/34WAAGw8afuT8GZ3X055YeSJcIsG+pMZwFn0UihezRofPt3G54f/0E8cNMN+Myo" +
--           "8jVTCgYd823PLzrPeIBnABiUQ1F+UoWsVOYb33mkoKp/7/dKyT0AGc47X4s0sjBEoLxbBqAQAMfW" +
--           "Rfe38B4BM+VHUkYOs8mi1FrABbK4dcvK73zwp1M3xYPOxANKBqbpCdXNGb0UwPKRF74xpfDQ0t+K" +
--           "54+IvlKoahmAhaO/mv/ZmicG3tqPgT61ZM2dZMQJOYhIdByRM/F3dCCOox4Bc3oEliqyyNoQCPPu" +
--           "sXceKZqRsigu7pwaWBowiRb46+f9Q1V2wl1nDx09/R7jF30x9adNlN8yPx4DHwht+B/cBIBoRqeI" +
--           "E4hE/oshTcB0wNbT6/o/zrhFyohR5ZxmrVWE+fDxdx4puhGAH4OkPe5B6pykeJAc/7cDEMZ/095Y" +
--           "870P339m+BXs2v4kbCFsm9u2vnpJ3bzR7wAo2B/R2v+PjSnyXcRxtOLUSXFxwAFz5i2SZUIVO82S" +
--           "BWye/vLOIwNvjL8OYqCEfXCmJAZPHkC7sK1REbj2+lmbq86qTVmmfuuyN2cTiREWKCvACgml9kDL" +
--           "7HQksehsZmSdA6yVpsa6P38v3swg7m4vN1dGXrThKGP8yS5fP33j/LEvxKDbl2f2A0YFCtkZQDOa" +
--           "PjLAnP4jrmBGjh1AVhG2ttxfX33++vjY2eeNXf/siLUAzgEwMJZrY2vF/Vu/t4BRqCqgCmj07wMV" +
--           "HXUCzJQfUlZE72ICnANcqNj21h8eiK1AX46gXh29KT9H+rd9XxBjYGCgig7QHOgjPgMAKigXQZYp" +
--           "si4uCOc3v35zY2wF9ufGSgxA7fdd9g8ho9ol4P4ojiQWnSUMMANECrJNy1NWYH8eGfsEvJbLv1IK" +
--           "1XIAUwEtA0xplJMwjcaYlTDeShg8dOgjj6/cJxNYfWIWkHJoh5yyjkSZ8RbB89YBZq4/pXafGeuz" +
--           "b9WciXJxo2B2houqgAjABJCLOwFMqFv57+bBxMIAJm1det3avnl1OYCLAeSgWhofaY1QXQSRuYc+" +
--           "/OiD3QLmUzNdqTBKhRVMADsF5beuToXJB90KtFz+lVIVniXOVUAUqjpXVB4WwPjGTPB8/0zjeTnj" +
--           "ezl43szmKy6vNkDF4MeeXNc3oJyUhfAMkJsJkSxUVrLos6o6z/O8Ucb3phrPzyHKeVTwkpPXseg3" +
--           "Cqe+1SfG+swfaw6KGTAoJ5eyGF3IBeEIJB2AcXxb0FI/L45uFQBMGiu6Z3ai9eqrclBUClFWVatV" +
--           "5GERNT5wEVQnQLUcIuVNX75kFjn60rA5c1d0AoywlkcxfdwZ2LSgbOmBZAv70povu7RcyFUqcZYd" +
--           "Pbxix44fnLv8pbYUOWh+P3ZM9uJRo34xoLDgq8b3YTxvqhqsaPzyJTdmn36msjdyqPqkMhWqBFGZ" +
--           "MtV8uDX4zMjp2zemyEoPgGn4zyOvGzy48A54GcD3Sz1jFrqqE+4uOOvdmb0ASlYEs5mQE9afUdhy" +
--           "0yv3lHzwya/8ZcjgI0+5yssU3QKYkgQ4Ivp60LL1n8kBQfOWuvdnj6uLldgHQKoKxU7HV/eg2y1X" +
--           "XXmXEs1U0ZVb29o//4k5c5P5eQB+s+68aVeUFBTcCxUoS6kRWfjhueecc9SfX3ytA9QTr7eVACqY" +
--           "FDYEwnbB2qcHHg6gLY6ODhpomi77coUyVaojhKH9+ZHzF/wqXiztEg34APxNX/jCvQOLCi83fpy8" +
--           "UsCJXHLYnGdn785S0uKTyyBUBXJZcW5x4bSN56ciyLQcD4Bf/+ThVwwbUvRb+JkoswqAWX5b9Lm1" +
--           "M3uSM/UnUiaCKiZk2blvvnxX0ePxuBNAmpMur51wyLBPzjVeBBoVwIXBk6vuP+SG+LkcuwkWAA96" +
--           "/JjZKnKxkACkkFb5Nztz220xX9bJlWi+6opKFalQlpqlmzZNu6B6SaJ0knKJ/DW5qd8p8TO3x6AB" +
--           "qza1EE06cdmy9wDAY5LjmBTMkQnUnZ42H0ywNF52aU6FK4UY5NySI+cv+E3MCnMM5HyqtwFoO3rB" +
--           "gmuDMFjGjiCOIEQwzH9c+7lzju+JTaYlJ2ehUqXMWWFqeurFxqsAFMVf25Ss9kTOEZdvebClJbxT" +
--           "yUGZoEzwlL/b9tzRX+pOztSfSBZApSqyIrL45buKnkaUJEzLCN5+csxr+ab6fyILkI2OIZYBlx9/" +
--           "2bYvpLgw2+EqKLKdwoceVKJp+tfuEpYKZcaW1tZbLqheEsbj3GV+oxdV3x0GwQZrHUIiWKIST3Vm" +
--           "DG54zFrKrBBWiGgSyx9Uv6Xh0n/MKlGlOII4h80trQ+kuJt8HGklZHg6FZF/Y/uOb7O1YOvAzkGt" +
--           "Kxmoehe6SYNEpkErwZIFC4I2fuLKf2tLtDOPzumPhA6wAPJDLt1yuzjaAEcAMUCMApXfvPP7IcO6" +
--           "gkYFs4RRpgy49qanUsAPu/T8W48e/YwL6S/kYtBYwM8U/yu6KVlQUShr9CkKyK7b1vDVy0qVeaYy" +
--           "gaxbdeK85/8a/z7sYR3zgXM1gXUInEPoCEw8PR6z8YQxaidQPh6RrgrPEOZS4chKjFuydEEKFD1x" +
--           "QgrAnfO3V98Jw/B5dhFgmByU+MK/nnrq6K6gcQtPyqlIubJAibCxPv/fsVVNgCI9yGEAQdBq71NH" +
--           "UEdQIoBo5PBBeklazuQfSpYFM0UAFsDmd2yMf9+1XkUT3otc8AiRwpFChCBCI0detGbSLtYr5uw6" +
--           "tk26XctZwgxhRt65ZSmr1t389M1Jk85wzKcHRAiJkCfasDnI/0sMGN+jlLMrAigMhp0+f+TBBIw4" +
--           "milEYOcQBHZZAoZeEIgKgIIgeJbD2MqEFhxaDAFmdAWMisxQFigzlAUnX9e4rA9yeHuTna3koBQB" +
--           "RogxwOPvxNbQAAA7VHQEFKSQKEFIu4lA5d3HiiuFNB4XQZlhUHBK11QO0oRdD7ouROVCkeJZG7ak" +
--           "/KBOYHlz4sTy1WVlVY5oYego2+bs82+3tFw6YcVrp01dteqpxNfyhKQuGlxCMSsKBh570ABT/8XP" +
--           "5dhRVpyDWAd2Ns0O9yrhWdfcMpvCEByEoNCCwhBgvgBdM+PM5TH5FPW+1ZLo8de2viehe12dhVoH" +
--           "OAtDPO61O4o+kYCTnE5wVuGsxlzKHul7BUDKdomKgwpB2QHAyNiP2Dl+0Z2WRXZ9YP0F55WJczvX" +
--           "0jp09U3fLiurWD1+/NqQaHZIVNbu3O1vt7aM+fSqVRWXvPvu0pRldwAkQ5brjO+NMh0kgMIvGjYZ" +
--           "wIKETPxIrYt1U5M8iThKJil9yZGc++ab298dP36Jb8wZohqhQHRErKEeAA6fG5FT5yIlYYI6tzfO" +
--           "vtiQni3MYDw0ChqEgUMyejyAdwGwDeW4ZI9FAGQOmwzgv/cERmZbDXhnKBNUGMJkUhGVduSSJJ1P" +
--           "6rw8HIalJo7ilBkchgCgL48fVzLceDc4kZnWUdap1AQi10x+660n4jXyk1M7ZXEZgHhMUkMO4Njp" +
--           "hQGMf8h56Fx++ZE1a+1xZC2Szjs3sk9uUEhUbSMvP3LeyOGZ0tKJiearo1J1DHVRPYmS7JUcG2g1" +
--           "pxxUsooBnpmQWAOb10YbKGygcKFCZOC0XqxrRKokCBQG5euX77In2k1P+2hhWEZBAAoCuCCEcW7E" +
--           "2xMn/m6oYo0jyjnmuc3Off6UN96YMvmtt5LILSmQ61r3xAA0I+xqPBiIejAd1f7e2MPPfvm4LQs/" +
--           "89a+bP6nZuSzfsaU+T7g+UBixYQVRFGS01kFO22srRy0EgA4CEvFRHS3MANMY/fGbybmlQqAFSBV" +
--           "sCp8kWwCGA5dqefFShnnRV77ecHYU37iXuqLoB0tsuIo34v3NfJR1GlJsrnOuiXGy1y8k+rwxh57" +
--           "3srSD/6rbLdra7yMqgjUCGAULR8uWr0LJPYAGApCeCbKNygLPKIxJ65YOSU+YpLUUCYGiqBzQVy3" +
--           "Ft1zbevnJl60UARqACgcVDo9ZZr63Mqua68QxlpmrWJC1FmrmLSKCFVktcpZrbKhzg4D26E5Lgjg" +
--           "8vnoMwwh1hU/dvTRo/qcDyJqcESw5Dp6o3XNHVrqLDSubAdFjuXwwWZcX+Wc9APboKxQUoiLurXa" +
--           "IYfCpjlCDsoxZ6OCouLRt+xpbY3nA8aDMR6E2+9vffOWxl02cQ+Bbdjevt7l83D5ABRaKNHYO484" +
--           "YmgMkoJ4jElCOL8Lz9NN87YumrRDxc2DElQZKgIVhZcZcO1hZ74wtK/H0thvtuXGXdM2S0S/ziQ1" +
--           "FPJiG7pHwvbgDhtKnQ0VNhCEeUHQLmiuf2fymieGvJGY8DCfX+yCEC5xWIlwtO+P6+s4VESJGS4+" +
--           "liwxKjZ/2FGRZvPhYgktxEZdHWOAr2P34ihWIQWTgJ2CnWJbo9Ymz1g/5+h1QsF9wgKJ19Z4hV87" +
--           "4fKNE3cnx8v4V8H4UOjqhvce+zW6qdWVlOvSjQsDlw/WUT4A5QNQGIJDizMPHXR+CiRBb4GSzlYr" +
--           "26Z7vYKSC42nUOPBqA9VU1I0ZOJPEYWj1NvVW/3AoEUAFgO4IzZ1hYk2jf9WUw7IjCIXHUVhXrFp" +
--           "/sQtKZPIoXXr/PjoSkZeoHo6gP/bFyeciECqcHG3IrXp37a2SF3xQNPxRAXgq5nS1bHsDWCYALYA" +
--           "u+h0W/impI8Pad9ec/vAoWVTjV84Nsn5FAwcvmDMN5rOqf1jyatdHzjuGjvThloKYH3b5qVXt775" +
--           "44ZuN1QEKknF3a6ImfDee4tWjBrV6R5Qoeq1AP6Avaxx8gDolhdPXAh2qzQmZFQ4ZhALrj/mvLpT" +
--           "+qhxya0BP5VVZQBkA6jNR0AJ2xUUcjKGjsx4k3PVYUwaJU6rJ3reLiHlHppjBjF3fLYSzU/noEZ8" +
--           "3611VusoVJBVsFWAdezim/3jemSFe+SNIsvCpAhCXf7TBZI+PnTr4nO2t2xcME3ZroYKIouEEqDo" +
--           "xfHfav/GxOttFgBOucGWll0XVqrqXYDWNLz3aG7bsovWp4i2TvkhScLqNBezq/M/zxLBxV2Yx/75" +
--           "yCPP6usc04CJ+B3bcLMwQTiK+0UIwgz1ip8+4pyaYX0x0SnWMkjnYGygkm9nBO0MGzoI2TTDyQBw" +
--           "7ubNawPmeZYZNt5wZhrxX8OHX9yXSTJzGcVgIWasbs8/hc7XRzXM670cg0Vs5H+MHm6u74ucrb/K" +
--           "lAlFPoySoqFFn+rm+OCGV762df2cYWe4fP0M5qDWhoowRIm1/h+s1YZx3wrVOV1LDhXMaGzfXntF" +
--           "46vXtMQRS/clsqRRT9SNd0GMBo6edRStZbKeg4D//ciQIcP2CTDbqsdVKQePq1JMFkXxv4qO9AaM" +
--           "fPGoaeuG9kXp0LkU0wGgMFC1gYAdAeyg0m3IrE3W3mtTvodjRpHq9X3xL4h5Qsq63P/z9ra6LqSc" +
--           "vvmBPkwOTex2lnf4wNee/47fa99NGGVJ8Zl1qP3UPfwkdr15mDDV+Y3Pf+Kh9c9kz9pee89J7dve" +
--           "vaRt+7qLbVv47y5UUKggp3BB/okNz0/aHI8332OaIgELxWDpptQtt6X+Qcu03nVYGQYxjxzl+7/e" +
--           "GyvjdYrCtv31JiW7QTjy6qWj83jF4AeP/MLaodiHRtZBXAihEEIWkq4eSgGmvKGhqpX5d1YEVhiW" +
--           "BaI6Zf6QITN7s5ELhw4tZZavkwhIZMOC1rZfo5s64nPv4+1NzXot2/hYiqKckglH4/7eRojCOosp" +
--           "St6u2ijfS1Hv3I0SdVy5aam9ecumBeOqN8w7aRkxSlMVdRDmRHa4m5xWPKPEusUA6maIrcy/cCKw" +
--           "InASKaCoXrlo2LAH+xpMpAEjLauu2ObaNnxVmZqUHaI8SaR+KnIhTPHCo6ZtOn6vk4qUPNNGnV2P" +
--           "J0ptENweMq92zHBMcMwwIrfMLS6etKdJEnMlCYOZm9YE4dUPkWvsIUckJ/+SZwd5PCEOEBc5rh7j" +
--           "grqf+VfvSc7mO/xZSihVAra3YMY/PqqrUhZVe7C8yRHTBqAVQJuQN5idgJ2ASQAz4PJjptWevKc0" +
--           "RZQ0TQATRWDd/dmFDQ2VeaLH0z4dRVTK9EXZ7IqFJSXH7W6eLw0blntp2NAydGOSqPGVs/5mW9Zc" +
--           "JGKbRSxELIRDCFuIuAmiBa8eMW37rcdc1JDtM+3PYdSp43k9/ulPgmDrsnz+vFBktRWBZYEVKSlU" +
--           "feH5wYPP7u5Hfy4uzi4oLq50IjkSaXrf2vIfBPnV6PlKiwKg0XfyNe2BPkmJ8+oUGeh/bLjNu7En" +
--           "0Gy+w5sppLcyKRra9IZJ98hTvciop9MPSSFUwGTnEjHICsgpyKHYHzjquWMvrJ+wewUENPFjCIAx" +
--           "k3uStyIMbw5FVieWJvJpBE5kgqq+X1VcPGdRcfHMxSUluSUlJbmlUZ+1tKRkLRGVnrZ9Rw12rSLt" +
--           "sDpFg8vmfbpw0HH3wcuMMSaiao2XAbwMjPFhPL/ReN6DfsY8tHHekN0WXR929vqsCpWruFshPEqF" +
--           "o3IyADuWTxgea1rYTbRVeEMmc+SnCwp+OcB4l3kmLq0D4BnzkA/MMUBjvDMXC1DBqlkCFr9N9E//" +
--           "HIZpPyDsQVuTFwsMfP273k8GFeLbvo9izwe8DGA8VMPgIc/D2piALlPFDGWUMqNuazOun/RbeQU7" +
--           "L/zl0cfC+SPOXjG84NBRawCvJNoSE7PiBgr5Xx/MKf7jLnzIbUPKlHVF5C11KgJfD9+shY8Vxjd3" +
--           "0780rEvP8bFDDvnVQGO+lU5MeTDwzM5aTbOzNyrw/XNbWx9JFLknk+sjqjobUHJq9XS/cNj3jZcZ" +
--           "Ac9PwBIDyAeMD2O8RhhvpTFYqYpGqMQOM2UhlFOhsvjfgNJ6ofxyoZaXbHPt8mDNjDU9ACYBbyGA" +
--           "AT/KZEZ/MpO5qciYyRlgROeJGSh0nQCL21Ufmx4EL8dMpqScRt4DFVAAYMCtORx+0Rhz7aFF+GJB" +
--           "BmNM/JKklGo1KlBtHZ474U79P9hZOZcQYb0unD/mwu05qADCZwE4C8Y7I3kTk4kFx+mUuzfMKf5e" +
--           "+rn+rUMq4PR4hFII0gw0xpdvGAWGoDqHf9m8IuV8m2Qtf1pQMPok37+50JhpHlC8EzwRcAzwOqs+" +
--           "Vkv06I+da04nInd3RvuxgCIAhcUTF5zvFQ79oucP+Cy8zIjE6qQnt5Pviu5IqAogVKNCNSrBUte6" +
--           "blnrqi/Vo3O9rI3Pc7cbP6sgGQcAf7rvl3zK908uBKjAGK5jrrmNKKHj/RS3E6L3V2USLUzkZAB4" +
--           "i75pTivwwQMyoKYQ685+QOtScvzUHPbIlJ54ZVsuDPTrZDmnQqUQggo1qkoNRDyFeJ6XGQfjF0fW" +
--           "3O9YWxW6adNzw36Dzm/JKEJ0k7QgtfiSygd1vSrkdZ3jlb6fneT7Y+MN1xrmVX9gbkw9q1MdsemF" +
--           "U5wkpwqSRSw49gfZAcPPHOsVlIww/sBjjPEVnqfGZEQlWKVCjWK31TW/dv56pCruU126TGxPl+US" +
--           "IrAgNQ7TQ+pNukQqfalLNimApvMt6CZMTvsiu3VOJ17XnrNWZ9m85oK8Qmz4sFB+CeXrF29dfOqG" +
--           "1PwKs6fOKyvKjrnb8wrHGD8TWfCOEoX85zb96dgXY9leN2NM+y3SJZG4u7XsSldIykFPz09NHxbR" +
--           "T2U3M11AsKf8aRqtnBqQoG91oWkGOS0/XaQo2Pf3u5mUDK9LukD7Mv5Tv9teSQ4VzipsINUtW9Zc" +
--           "t/mFiRu7WbcOuQNP+MXQ4hGX3mEKBl1mjB9bbwAqSz6cf+TZ8Qaabta/u6hM92ItpZs5dvyor5R/" +
--           "dwvp9QAa6eFzfxRlpVMk2mXh93czeyPn1Bn5ShWtYAJsyEve+OPgC7Hzmgx3USDtejQedlbtDX7h" +
--           "0Ns6HChV5LcvP7rpb1+qx/690dHrtewL05c2c7ZLtrM91fOpDGjXyvT9+WYBPQAg3NPcey1n4vVt" +
--           "FUJSIfGNjJZNy2ekkqzpazIJOefSoTaA9q1VY+5Wbvs9NAoYVBkFh5Sesi9lJ/u6lt5+WETpoi2M" +
--           "PpZU/k9szmKGtVGRWBjQ6g3zP78pxfSGKb+tJ4LPAsi31S/+uXCUlVZmCIc+DlI15L4Cpr/1FA1d" +
--           "0VLqAilzgcCGChdQc5eoTXqpkNS66hv1YLsUElURiG1sOZj7lunf3v3fwlBKjRfX9EjEHKcscV98" +
--           "D40zRKIqgEpz4yvTVnfjU/VbmL/r4yhwTTbPCNsZNi8g50/OnvbCsXu5wQqVURCBuOb7seu98n7A" +
--           "/L23Tc8NX8mW6pL73UoOhYPH/GJv/I7Dzlqbg5pRUG1q++A//+Ng+4f9gDlATVzLHfErZiHioKrn" +
--           "H37uhgeG597sdYnIYeeszypQqQawre9dHNbd0Yj9/5KnfsB8DJpuXXj8Q+ryj3dUZglD1Uz3MsWv" +
--           "HX7uh1fv6QGHn7upAmrWQpEV2zSt+bVptamw+6C9VaP/hcoHrvkABgydUjPLywy6Oboh6HW6PgLj" +
--           "LYqStqYRQHKDMQflMhXOQrnata27tvGvufrEn8ZBfmdPP2AO7NpmAAw85B8qTyjKlt1svAHTjPGL" +
--           "k4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiM" +
--           "NAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY" +
--           "0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC"
-+           "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=="
-   }
- };
- 
--// The process of adding a new default snippet involves:
--//   * add a new entity to aboutHome.dtd
--//   * add a <span/> for it in aboutHome.xhtml
--//   * add an entry here in the proper ordering (based on spans)
--// The <a/> part of the snippet will be linked to the corresponding url.
--const DEFAULT_SNIPPETS_URLS = [
--  "https://www.mozilla.org/firefox/features/?utm_source=snippet&utm_medium=snippet&utm_campaign=default+feature+snippet"
--, "https://addons.mozilla.org/firefox/?utm_source=snippet&utm_medium=snippet&utm_campaign=addons"
--];
- 
--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": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?t=iceweasel&q=_searchTerms_"};
- 
--// IndexedDB storage constants.
--const DATABASE_NAME = "abouthome";
--const DATABASE_VERSION = 1;
--const SNIPPETS_OBJECTSTORE_NAME = "snippets";
--
--// This global tracks if the page has been set up before, to prevent double inits
--let gInitialized = false;
--let gObserver = new MutationObserver(function (mutations) {
--  for (let mutation of mutations) {
--    if (mutation.attributeName == "searchEngineName") {
--      setupSearchEngine();
--      if (!gInitialized) {
--        ensureSnippetsMapThen(loadSnippets);
--        gInitialized = true;
--      }
--      return;
--    }
--  }
--});
--
--window.addEventListener("pageshow", function () {
--  // Delay search engine setup, cause browser.js::BrowserOnAboutPageLoad runs
--  // later and may use asynchronous getters.
--  window.gObserver.observe(document.documentElement, { attributes: true });
--  fitToWidth();
--  window.addEventListener("resize", fitToWidth);
--
--  // Ask chrome to update snippets.
--  var event = new CustomEvent("AboutHomeLoad", {bubbles:true});
--  document.dispatchEvent(event);
--});
--
--window.addEventListener("pagehide", function() {
--  window.gObserver.disconnect();
--  window.removeEventListener("resize", fitToWidth);
-+document.addEventListener("DOMContentLoaded", function init() {
-+  setupSearchEngine();
- });
-+window.addEventListener("load", fitToWidth);
-+window.addEventListener("resize", fitToWidth);
- 
--// This object has the same interface as Map and is used to store and retrieve
--// the snippets data.  It is lazily initialized by ensureSnippetsMapThen(), so
--// be sure its callback returned before trying to use it.
--let gSnippetsMap;
--let gSnippetsMapCallbacks = [];
- 
--/**
-- * Ensure the snippets map is properly initialized.
-- *
-- * @param aCallback
-- *        Invoked once the map has been initialized, gets the map as argument.
-- * @note Snippets should never directly manage the underlying storage, since
-- *       it may change inadvertently.
-- */
--function ensureSnippetsMapThen(aCallback)
-+function onSearchSubmit(aEvent)
- {
--  if (gSnippetsMap) {
--    aCallback(gSnippetsMap);
--    return;
--  }
--
--  // Handle multiple requests during the async initialization.
--  gSnippetsMapCallbacks.push(aCallback);
--  if (gSnippetsMapCallbacks.length > 1) {
--    // We are already updating, the callbacks will be invoked when done.
--    return;
--  }
--
--  let invokeCallbacks = function () {
--    if (!gSnippetsMap) {
--      gSnippetsMap = Object.freeze(new Map());
-+  let searchTerms = document.getElementById("searchText").value;
-+  if (gSearchEngine && searchTerms.length > 0) {
-+    const SEARCH_TOKENS = {
-+      "_searchTerms_": encodeURIComponent(searchTerms)
-     }
--
--    for (let callback of gSnippetsMapCallbacks) {
--      callback(gSnippetsMap);
-+    let url = gSearchEngine.searchUrl;
-+    for (let key in SEARCH_TOKENS) {
-+      url = url.replace(key, SEARCH_TOKENS[key]);
-     }
--    gSnippetsMapCallbacks.length = 0;
-+    window.location.href = url;
-   }
- 
--  let openRequest = indexedDB.open(DATABASE_NAME, DATABASE_VERSION);
-+  aEvent.preventDefault();
-+}
- 
--  openRequest.onerror = function (event) {
--    // Try to delete the old database so that we can start this process over
--    // next time.
--    indexedDB.deleteDatabase(DATABASE_NAME);
--    invokeCallbacks();
--  };
- 
--  openRequest.onupgradeneeded = function (event) {
--    let db = event.target.result;
--    if (!db.objectStoreNames.contains(SNIPPETS_OBJECTSTORE_NAME)) {
--      db.createObjectStore(SNIPPETS_OBJECTSTORE_NAME);
--    }
-+function setupSearchEngine()
-+{
-+  if (localStorage && localStorage["search-engine"]) {
-+        gSearchEngine = JSON.parse(localStorage["search-engine"]);
-   }
- 
--  openRequest.onsuccess = function (event) {
--    let db = event.target.result;
--
--    db.onerror = function (event) {
--      invokeCallbacks();
--    }
--
--    db.onversionchange = function (event) {
--      event.target.close();
--      invokeCallbacks();
--    }
--
--    let cache = new Map();
--    let cursorRequest = db.transaction(SNIPPETS_OBJECTSTORE_NAME)
--                          .objectStore(SNIPPETS_OBJECTSTORE_NAME).openCursor();
--    cursorRequest.onerror = function (event) {
--      invokeCallbacks();
--    }
--
--    cursorRequest.onsuccess = function(event) {
--      let cursor = event.target.result;
--
--      // Populate the cache from the persistent storage.
--      if (cursor) {
--        cache.set(cursor.key, cursor.value);
--        cursor.continue();
--        return;
--      }
--
--      // The cache has been filled up, create the snippets map.
--      gSnippetsMap = Object.freeze({
--        get: function (aKey) cache.get(aKey),
--        set: function (aKey, aValue) {
--          db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite")
--            .objectStore(SNIPPETS_OBJECTSTORE_NAME).put(aValue, aKey);
--          return cache.set(aKey, aValue);
--        },
--        has: function (aKey) cache.has(aKey),
--        delete: function (aKey) {
--          db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite")
--            .objectStore(SNIPPETS_OBJECTSTORE_NAME).delete(aKey);
--          return cache.delete(aKey);
--        },
--        clear: function () {
--          db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite")
--            .objectStore(SNIPPETS_OBJECTSTORE_NAME).clear();
--          return cache.clear();
--        },
--        get size() cache.size
--      });
--
--      setTimeout(invokeCallbacks, 0);
--    }
-+  
-+  // Look for extended information, like logo and links.
-+  var searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name];
-+  if (searchEngineInfo) {
-+    for (let prop in searchEngineInfo)
-+      gSearchEngine[prop] = searchEngineInfo[prop];
-   }
--}
- 
--function onSearchSubmit(aEvent)
--{
--  let searchTerms = document.getElementById("searchText").value;
--  let engineName = document.documentElement.getAttribute("searchEngineName");
-+  // Enqueue additional params if required by the engine definition.
-+  if (gSearchEngine.params)
-+    gSearchEngine.searchUrl += "&" + gSearchEngine.params;
- 
--  if (engineName && searchTerms.length > 0) {
--    // Send an event that will perform a search and Firefox Health Report will
--    // record that a search from about:home has occurred.
--    let eventData = JSON.stringify({
--      engineName: engineName,
--      searchTerms: searchTerms
--    });
--    let event = new CustomEvent("AboutHomeSearchEvent", {detail: eventData});
--    document.dispatchEvent(event);
-+  // Add search engine logo.
-+  if (gSearchEngine.image) {
-+    let logoElt = document.getElementById("searchEngineLogo");
-+    logoElt.src = gSearchEngine.image;
-+    logoElt.alt = gSearchEngine.name;
-   }
- 
--  aEvent.preventDefault();
--}
--
--
--function setupSearchEngine()
--{
-   // The "autofocus" attribute doesn't focus the form element
-   // immediately when the element is first drawn, so the
-   // attribute is also used for styling when the page first loads.
-@@ -322,173 +104,6 @@ function setupSearchEngine()
-     searchText.removeEventListener("blur", searchText_onBlur);
-     searchText.removeAttribute("autofocus");
-   });
-- 
--  let searchEngineName = document.documentElement.getAttribute("searchEngineName");
--  let searchEngineInfo = SEARCH_ENGINES[searchEngineName];
--  let logoElt = document.getElementById("searchEngineLogo");
--
--  // Add search engine logo.
--  if (searchEngineInfo && searchEngineInfo.image) {
--    logoElt.parentNode.hidden = false;
--    logoElt.src = searchEngineInfo.image;
--    logoElt.alt = searchEngineName;
--    searchText.placeholder = "";
--  }
--  else {
--    logoElt.parentNode.hidden = true;
--    searchText.placeholder = searchEngineName;
--  }
--
--}
--
--/**
-- * Inform the test harness that we're done loading the page.
-- */
--function loadSucceeded()
--{
--  var event = new CustomEvent("AboutHomeLoadSnippetsSucceeded", {bubbles:true});
--  document.dispatchEvent(event);
--}
--
--/**
-- * Update the local snippets from the remote storage, then show them through
-- * showSnippets.
-- */
--function loadSnippets()
--{
--  if (!gSnippetsMap)
--    throw new Error("Snippets map has not properly been initialized");
--
--  // Allow tests to modify the snippets map before using it.
--  var event = new CustomEvent("AboutHomeLoadSnippets", {bubbles:true});
--  document.dispatchEvent(event);
--
--  // Check cached snippets version.
--  let cachedVersion = gSnippetsMap.get("snippets-cached-version") || 0;
--  let currentVersion = document.documentElement.getAttribute("snippetsVersion");
--  if (cachedVersion < currentVersion) {
--    // The cached snippets are old and unsupported, restart from scratch.
--    gSnippetsMap.clear();
--  }
--
--  // Check last snippets update.
--  let lastUpdate = gSnippetsMap.get("snippets-last-update");
--  let updateURL = document.documentElement.getAttribute("snippetsURL");
--  let shouldUpdate = !lastUpdate ||
--                     Date.now() - lastUpdate > SNIPPETS_UPDATE_INTERVAL_MS;
--  if (updateURL && shouldUpdate) {
--    // Try to update from network.
--    let xhr = new XMLHttpRequest();
--    try {
--      xhr.open("GET", updateURL, true);
--    } catch (ex) {
--      showSnippets();
--      loadSucceeded();
--      return;
--    }
--    // Even if fetching should fail we don't want to spam the server, thus
--    // set the last update time regardless its results.  Will retry tomorrow.
--    gSnippetsMap.set("snippets-last-update", Date.now());
--    xhr.onerror = function (event) {
--      showSnippets();
--    };
--    xhr.onload = function (event)
--    {
--      if (xhr.status == 200) {
--        gSnippetsMap.set("snippets", xhr.responseText);
--        gSnippetsMap.set("snippets-cached-version", currentVersion);
--      }
--      showSnippets();
--      loadSucceeded();
--    };
--    xhr.send(null);
--  } else {
--    showSnippets();
--    loadSucceeded();
--  }
--}
--
--/**
-- * Shows locally cached remote snippets, or default ones when not available.
-- *
-- * @note: snippets should never invoke showSnippets(), or they may cause
-- *        a "too much recursion" exception.
-- */
--let _snippetsShown = false;
--function showSnippets()
--{
--  let snippetsElt = document.getElementById("snippets");
--
--  // Show about:rights notification, if needed.
--  let showRights = document.documentElement.getAttribute("showKnowYourRights");
--  if (showRights) {
--    let rightsElt = document.getElementById("rightsSnippet");
--    let anchor = rightsElt.getElementsByTagName("a")[0];
--    anchor.href = "about:rights";
--    snippetsElt.appendChild(rightsElt);
--    rightsElt.removeAttribute("hidden");
--    return;
--  }
--
--  if (!gSnippetsMap)
--    throw new Error("Snippets map has not properly been initialized");
--  if (_snippetsShown) {
--    // There's something wrong with the remote snippets, just in case fall back
--    // to the default snippets.
--    showDefaultSnippets();
--    throw new Error("showSnippets should never be invoked multiple times");
--  }
--  _snippetsShown = true;
--
--  let snippets = gSnippetsMap.get("snippets");
--  // If there are remotely fetched snippets, try to to show them.
--  if (snippets) {
--    // Injecting snippets can throw if they're invalid XML.
--    try {
--      snippetsElt.innerHTML = snippets;
--      // Scripts injected by innerHTML are inactive, so we have to relocate them
--      // through DOM manipulation to activate their contents.
--      Array.forEach(snippetsElt.getElementsByTagName("script"), function(elt) {
--        let relocatedScript = document.createElement("script");
--        relocatedScript.type = "text/javascript;version=1.8";
--        relocatedScript.text = elt.text;
--        elt.parentNode.replaceChild(relocatedScript, elt);
--      });
--      return;
--    } catch (ex) {
--      // Bad content, continue to show default snippets.
--    }
--  }
--
--  showDefaultSnippets();
--}
--
--/**
-- * Clear snippets element contents and show default snippets.
-- */
--function showDefaultSnippets()
--{
--  // Clear eventual contents...
--  let snippetsElt = document.getElementById("snippets");
--  snippetsElt.innerHTML = "";
--
--  // ...then show default snippets.
--  let defaultSnippetsElt = document.getElementById("defaultSnippets");
--  let entries = defaultSnippetsElt.querySelectorAll("span");
--  // Choose a random snippet.  Assume there is always at least one.
--  let randIndex = Math.floor(Math.random() * entries.length);
--  let entry = entries[randIndex];
--  // Inject url in the eventual link.
--  if (DEFAULT_SNIPPETS_URLS[randIndex]) {
--    let links = entry.getElementsByTagName("a");
--    // Default snippets can have only one link, otherwise something is messed
--    // up in the translation.
--    if (links.length == 1) {
--      links[0].href = DEFAULT_SNIPPETS_URLS[randIndex];
--    }
--  }
--  // Move the default snippet to the snippets element.
--  snippetsElt.appendChild(entry);
- }
- 
- function fitToWidth() {
-diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml
-index 1d03d38..fda3095 100644
---- a/browser/base/content/abouthome/aboutHome.xhtml
-+++ b/browser/base/content/abouthome/aboutHome.xhtml
-@@ -43,30 +43,9 @@
-           <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/>
-         </form>
-       </div>
--
--      <div id="snippetContainer">
--        <div id="defaultSnippets" hidden="true">
--          <span id="defaultSnippet1">&abouthome.defaultSnippet1.v1;</span>
--          <span id="defaultSnippet2">&abouthome.defaultSnippet2.v1;</span>
--        </div>
--        <span id="rightsSnippet" hidden="true">&abouthome.rightsSnippet;</span>
--        <div id="snippets"/>
--      </div>
-     </div>
-     <div class="spacer"/>
- 
--    <div id="launcher">
--      <button class="launchButton" id="downloads">&abouthome.downloadsButton.label;</button>
--      <button class="launchButton" id="bookmarks">&abouthome.bookmarksButton.label;</button>
--      <button class="launchButton" id="history">&abouthome.historyButton.label;</button>
--      <button class="launchButton" id="apps" hidden="true">&abouthome.appsButton.label;</button>
--      <button class="launchButton" id="addons">&abouthome.addonsButton.label;</button>
--      <button class="launchButton" id="sync">&abouthome.syncButton.label;</button>
--      <button class="launchButton" id="settings">&abouthome.settingsButton.label;</button>
--      <div id="restorePreviousSessionSeparator"/>
--      <button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button>
--    </div>
--
--    <a id="aboutMozilla" href="https://www.mozilla.org/about/?utm_source=about-home&amp;utm_medium=Referral"/>
-+    <a id="aboutGNU" href="http://gnu.org"></a>
-   </body>
- </html>
-diff --git a/browser/base/content/content.js b/browser/base/content/content.js
-index 9428613..fc3c00a 100644
---- a/browser/base/content/content.js
-+++ b/browser/base/content/content.js
-@@ -50,216 +50,3 @@ if (Services.prefs.getBoolPref("browser.tabs.remote")) {
-     LoginManagerContent.onUsernameInput(event);
-   });
- }
--
--let AboutHomeListener = {
--  init: function(chromeGlobal) {
--    chromeGlobal.addEventListener('AboutHomeLoad', () => this.onPageLoad(), false, true);
--  },
--
--  handleEvent: function(aEvent) {
--    switch (aEvent.type) {
--      case "AboutHomeLoad":
--        this.onPageLoad();
--        break;
--    }
--  },
--
--  receiveMessage: function(aMessage) {
--    switch (aMessage.name) {
--      case "AboutHome:Update":
--        this.onUpdate(aMessage.data);
--        break;
--    }
--  },
--
--  onUpdate: function(aData) {
--    let doc = content.document;
--    if (doc.documentURI.toLowerCase() != "about:home")
--      return;
--
--    if (aData.showRestoreLastSession && !PrivateBrowsingUtils.isWindowPrivate(content))
--      doc.getElementById("launcher").setAttribute("session", "true");
--
--    // Inject search engine and snippets URL.
--    let docElt = doc.documentElement;
--    // set the following attributes BEFORE searchEngineName, which triggers to
--    // show the snippets when it's set.
--    docElt.setAttribute("snippetsURL", aData.snippetsURL);
--    if (aData.showKnowYourRights)
--      docElt.setAttribute("showKnowYourRights", "true");
--    docElt.setAttribute("snippetsVersion", aData.snippetsVersion);
--    docElt.setAttribute("searchEngineName", Services.search.defaultEngine.name);
--  },
--
--  onPageLoad: function() {
--    let doc = content.document;
--    if (doc.documentURI.toLowerCase() != "about:home" ||
--        doc.documentElement.hasAttribute("hasBrowserHandlers")) {
--      return;
--    }
--
--    doc.documentElement.setAttribute("hasBrowserHandlers", "true");
--    let updateListener = this;
--    addMessageListener("AboutHome:Update", updateListener);
--    addEventListener("click", this.onClick, true);
--    addEventListener("pagehide", function onPageHide(event) {
--      if (event.target.defaultView.frameElement)
--        return;
--      removeMessageListener("AboutHome:Update", updateListener);
--      removeEventListener("click", this.onClick, true);
--      removeEventListener("pagehide", onPageHide, true);
--      if (event.target.documentElement)
--        event.target.documentElement.removeAttribute("hasBrowserHandlers");
--    }, true);
--
--    // XXX bug 738646 - when Marketplace is launched, remove this statement and
--    // the hidden attribute set on the apps button in aboutHome.xhtml
--    if (Services.prefs.getPrefType("browser.aboutHome.apps") == Services.prefs.PREF_BOOL &&
--        Services.prefs.getBoolPref("browser.aboutHome.apps"))
--      doc.getElementById("apps").removeAttribute("hidden");
--
--    sendAsyncMessage("AboutHome:RequestUpdate");
--
--    doc.addEventListener("AboutHomeSearchEvent", function onSearch(e) {
--      sendAsyncMessage("AboutHome:Search", { searchData: e.detail });
--    }, true, true);
--  },
--
--  onClick: function(aEvent) {
--    if (!aEvent.isTrusted || // Don't trust synthetic events
--        aEvent.button == 2 || aEvent.target.localName != "button") {
--      return;
--    }
--
--    let originalTarget = aEvent.originalTarget;
--    let ownerDoc = originalTarget.ownerDocument;
--    let elmId = originalTarget.getAttribute("id");
--
--    switch (elmId) {
--      case "restorePreviousSession":
--        sendAsyncMessage("AboutHome:RestorePreviousSession");
--        ownerDoc.getElementById("launcher").removeAttribute("session");
--        break;
--
--      case "downloads":
--        sendAsyncMessage("AboutHome:Downloads");
--        break;
--
--      case "bookmarks":
--        sendAsyncMessage("AboutHome:Bookmarks");
--        break;
--
--      case "history":
--        sendAsyncMessage("AboutHome:History");
--        break;
--
--      case "apps":
--        sendAsyncMessage("AboutHome:Apps");
--        break;
--
--      case "addons":
--        sendAsyncMessage("AboutHome:Addons");
--        break;
--
--      case "sync":
--        sendAsyncMessage("AboutHome:Sync");
--        break;
--
--      case "settings":
--        sendAsyncMessage("AboutHome:Settings");
--        break;
--    }
--  },
--};
--AboutHomeListener.init(this);
--
--
--var global = this;
--
--let ClickEventHandler = {
--  init: function init() {
--    Cc["@mozilla.org/eventlistenerservice;1"]
--      .getService(Ci.nsIEventListenerService)
--      .addSystemEventListener(global, "click", this, true);
--  },
--
--  handleEvent: function(event) {
--    // Bug 903016: Most of this code is an unfortunate duplication from
--    // contentAreaClick in browser.js.
--    if (!event.isTrusted || event.defaultPrevented || event.button == 2)
--      return;
--
--    let [href, node] = this._hrefAndLinkNodeForClickEvent(event);
--
--    let json = { button: event.button, shiftKey: event.shiftKey,
--                 ctrlKey: event.ctrlKey, metaKey: event.metaKey,
--                 altKey: event.altKey, href: null, title: null,
--                 bookmark: false };
--
--    if (href) {
--      json.href = href;
--      if (node) {
--        json.title = node.getAttribute("title");
--
--        if (event.button == 0 && !event.ctrlKey && !event.shiftKey &&
--            !event.altKey && !event.metaKey) {
--          json.bookmark = node.getAttribute("rel") == "sidebar";
--          if (json.bookmark)
--            event.preventDefault(); // Need to prevent the pageload.
--        }
--      }
--
--      sendAsyncMessage("Content:Click", json);
--      return;
--    }
--
--    // This might be middle mouse navigation.
--    if (event.button == 1)
--      sendAsyncMessage("Content:Click", json);
--  },
--
--  /**
--   * Extracts linkNode and href for the current click target.
--   *
--   * @param event
--   *        The click event.
--   * @return [href, linkNode].
--   *
--   * @note linkNode will be null if the click wasn't on an anchor
--   *       element (or XLink).
--   */
--  _hrefAndLinkNodeForClickEvent: function(event) {
--    function isHTMLLink(aNode) {
--      // Be consistent with what nsContextMenu.js does.
--      return ((aNode instanceof content.HTMLAnchorElement && aNode.href) ||
--              (aNode instanceof content.HTMLAreaElement && aNode.href) ||
--              aNode instanceof content.HTMLLinkElement);
--    }
--
--    let node = event.target;
--    while (node && !isHTMLLink(node)) {
--      node = node.parentNode;
--    }
--
--    if (node)
--      return [node.href, node];
--
--    // If there is no linkNode, try simple XLink.
--    let href, baseURI;
--    node = event.target;
--    while (node && !href) {
--      if (node.nodeType == content.Node.ELEMENT_NODE) {
--        href = node.getAttributeNS("http://www.w3.org/1999/xlink", "href");
--        if (href)
--          baseURI = node.ownerDocument.baseURIObject;
--      }
--      node = node.parentNode;
--    }
--
--    // In case of XLink, we don't return the node we got href from since
--    // callers expect <a>-like elements.
--    // Note: makeURI() will throw if aUri is not a valid URI.
--    return [href ? makeURI(href, null, baseURI).spec : null, null];
--  }
--};
--ClickEventHandler.init();
-diff --git a/browser/base/jar.mn b/browser/base/jar.mn
-index f2a820c..9478039 100644
---- a/browser/base/jar.mn
-+++ b/browser/base/jar.mn
-@@ -33,7 +33,7 @@ browser.jar:
-         content/browser/abouthome/settings.png        (content/abouthome/settings.png)
-         content/browser/abouthome/restore.png         (content/abouthome/restore.png)
-         content/browser/abouthome/restore-large.png   (content/abouthome/restore-large.png)
--        content/browser/abouthome/mozilla.png         (content/abouthome/mozilla.png)
-+        content/browser/abouthome/gnu_headshadow.png  (content/abouthome/gnu_headshadow.png)
-         content/browser/abouthome/snippet1@2x.png      (content/abouthome/snippet1@2x.png)
-         content/browser/abouthome/snippet2@2x.png      (content/abouthome/snippet2@2x.png)
-         content/browser/abouthome/downloads@2x.png     (content/abouthome/downloads@2x.png)
-@@ -45,7 +45,6 @@ browser.jar:
-         content/browser/abouthome/settings@2x.png      (content/abouthome/settings@2x.png)
-         content/browser/abouthome/restore@2x.png       (content/abouthome/restore@2x.png)
-         content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
--        content/browser/abouthome/mozilla@2x.png       (content/abouthome/mozilla@2x.png)
- #ifdef MOZ_SERVICES_HEALTHREPORT
-         content/browser/abouthealthreport/abouthealth.xhtml   (content/abouthealthreport/abouthealth.xhtml)
-         content/browser/abouthealthreport/abouthealth.js      (content/abouthealthreport/abouthealth.js)
-diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd
-index e84341f..5476d32 100644
---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd
-+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd
-@@ -13,17 +13,6 @@
- 
- <!ENTITY abouthome.searchEngineButton.label "Search">
- 
--<!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
--     text in <a/> will be linked to the Firefox features page on mozilla.com
---->
--<!ENTITY abouthome.defaultSnippet1.v1 "Thanks for choosing Firefox! To get the most out of your browser, learn more about the <a>latest features</a>.">
--<!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
--     text in <a/> will be linked to the featured add-ons on addons.mozilla.org
---->
--<!ENTITY abouthome.defaultSnippet2.v1 "It's easy to customize your Firefox exactly the way you want it. <a>Choose from thousands of add-ons</a>.">
--<!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights -->
--<!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>">
--
- <!ENTITY abouthome.bookmarksButton.label "Bookmarks">
- <!ENTITY abouthome.historyButton.label   "History">
- <!ENTITY abouthome.settingsButton.label  "Settings">
-diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
-index 087cc50..5654eb9 100644
---- a/browser/locales/en-US/chrome/browser-region/region.properties
-+++ b/browser/locales/en-US/chrome/browser-region/region.properties
-@@ -3,17 +3,12 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo HTML
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
--browser.search.order.2=Yahoo
--browser.search.order.3=Bing
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=My Yahoo!
--browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%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 
-@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
- # don't make any spelling errors here.
- gecko.handlerService.defaultHandlersVersion=4
- 
--# The default set of protocol handlers for webcal:
--gecko.handlerService.schemes.webcal.0.name=30 Boxes
--gecko.handlerService.schemes.webcal.0.uriTemplate=https://30boxes.com/external/widget?refer=ff&url=%s
--
--# The default set of protocol handlers for mailto:
--gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
--gecko.handlerService.schemes.mailto.0.uriTemplate=https://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 Web IRC
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net
- 
- # 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 Web IRC
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
-diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
-index e925c1e..5101035 100644
---- a/browser/locales/generic/profile/bookmarks.html.in
-+++ b/browser/locales/generic/profile/bookmarks.html.in
-@@ -15,13 +15,20 @@
-     <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
- <DD>@bookmarks_toolbarfolder_description@
-     <DL><p>
--        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
-+        <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A>
-     </DL><p>
--    <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
-+    <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3>
-     <DL><p>
--        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
--        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
--        <DT><A HREF="https://www.mozilla.org/@AB_CD@/contribute/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
--        <DT><A HREF="https://www.mozilla.org/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
-+        <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A>
-+        <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Packages</A>
-+        <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Wiki</A>
-+        <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Labs</A>
-+    </DL><p>
-+    <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3>
-+    <DL><p>
-+        <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A>
-+        <DT><A HREF="http://libreplanet.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC">LibrePlanet</A>
-+        <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A>
-+        <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A>
-     </DL><p>
- </DL><p>
-diff --git a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm
-index 98c443d..0173762 100644
---- a/browser/modules/AboutHome.jsm
-+++ b/browser/modules/AboutHome.jsm
-@@ -8,7 +8,7 @@ let Cc = Components.classes;
- let Ci = Components.interfaces;
- let Cu = Components.utils;
- 
--this.EXPORTED_SYMBOLS = [ "AboutHomeUtils", "AboutHome" ];
-+this.EXPORTED_SYMBOLS = [ "AboutHome" ];
- 
- Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
- Components.utils.import("resource://gre/modules/Services.jsm");
-@@ -16,66 +16,6 @@ Components.utils.import("resource://gre/modules/Services.jsm");
- XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
-   "resource://gre/modules/PrivateBrowsingUtils.jsm");
- 
--// Url to fetch snippets, in the urlFormatter service format.
--const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl";
--
--// Should be bumped up if the snippets content format changes.
--const STARTPAGE_VERSION = 4;
--
--this.AboutHomeUtils = {
--  get snippetsVersion() STARTPAGE_VERSION,
--
--  /*
--   * showKnowYourRights - Determines if the user should be shown the
--   * about:rights notification. The notification should *not* be shown if
--   * we've already shown the current version, or if the override pref says to
--   * never show it. The notification *should* be shown if it's never been seen
--   * before, if a newer version is available, or if the override pref says to
--   * always show it.
--   */
--  get showKnowYourRights() {
--    // Look for an unconditional override pref. If set, do what it says.
--    // (true --> never show, false --> always show)
--    try {
--      return !Services.prefs.getBoolPref("browser.rights.override");
--    } catch (e) { }
--    // Ditto, for the legacy EULA pref.
--    try {
--      return !Services.prefs.getBoolPref("browser.EULA.override");
--    } catch (e) { }
--
--#ifndef MOZILLA_OFFICIAL
--    // Non-official builds shouldn't show the notification.
--    return false;
--#endif
--
--    // Look to see if the user has seen the current version or not.
--    var currentVersion = Services.prefs.getIntPref("browser.rights.version");
--    try {
--      return !Services.prefs.getBoolPref("browser.rights." + currentVersion + ".shown");
--    } catch (e) { }
--
--    // Legacy: If the user accepted a EULA, we won't annoy them with the
--    // equivalent about:rights page until the version changes.
--    try {
--      return !Services.prefs.getBoolPref("browser.EULA." + currentVersion + ".accepted");
--    } catch (e) { }
--
--    // We haven't shown the notification before, so do so now.
--    return true;
--  }
--};
--
--/**
-- * Returns the URL to fetch snippets from, in the urlFormatter service format.
-- */
--XPCOMUtils.defineLazyGetter(AboutHomeUtils, "snippetsURL", function() {
--  let updateURL = Services.prefs
--                          .getCharPref(SNIPPETS_URL_PREF)
--                          .replace("%STARTPAGE_VERSION%", STARTPAGE_VERSION);
--  return Services.urlFormatter.formatURL(updateURL);
--});
--
- /**
-  * This code provides services to the about:home page. Whenever
-  * about:home needs to do something chrome-privileged, it sends a
-@@ -185,17 +125,8 @@ let AboutHome = {
-     ss.promiseInitialized.then(function() {
-       let data = {
-         showRestoreLastSession: ss.canRestoreLastSession,
--        snippetsURL: AboutHomeUtils.snippetsURL,
--        showKnowYourRights: AboutHomeUtils.showKnowYourRights,
--        snippetsVersion: AboutHomeUtils.snippetsVersion
-       };
- 
--      if (AboutHomeUtils.showKnowYourRights) {
--        // Set pref to indicate we've shown the notification.
--        let currentVersion = Services.prefs.getIntPref("browser.rights.version");
--        Services.prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true);
--      }
--
-       if (target) {
-         target.messageManager.sendAsyncMessage("AboutHome:Update", data);
-       } else {
diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed-nonprism/PKGBUILD
deleted file mode 100644
index 08b0b3c13..000000000
--- a/nonprism/sylpheed-nonprism/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 79630 2012-11-09 11:59:02Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Aditya Som <icarious@hacari.org>"
-
-_pkgname=sylpheed
-pkgname=sylpheed-nonprism
-pkgver=3.3.0
-pkgrel=1.1
-pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support"
-arch=('i686' 'x86_64')
-url="http://sylpheed.sraoss.jp/en/"
-license=('GPL')
-depends=('gpgme' 'gtkspell' 'desktop-file-utils' 'compface')
-makedepends=('openssl')
-options=('!libtool')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-install="$_pkgname.install"
-source=("http://sylpheed.sraoss.jp/$_pkgname/v3.3/$_pkgname-$pkgver.tar.bz2"
-        'nonprism.patch')
-md5sums=('20442f81dbb4e7c59462360ad0bb1afb'
-         'e1bddc14962e607cdb899ec082660639')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  # Remove Gmail support
-  patch -Np1 -i "$srcdir/nonprism.patch"
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  ./configure --prefix=/usr \
-              --enable-ldap
-  make
-
-  # Build Attachment-Tool Plug-in
-  cd plugin/attachment_tool && make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-
-  # Install Attachment-Tool Plug-in
-  cd plugin/attachment_tool
-  make DESTDIR="$pkgdir/" install-plugin
-}
diff --git a/pcr/gnome-boxes-libre/PKGBUILD b/pcr/gnome-boxes-libre/PKGBUILD
deleted file mode 100644
index 91a3b41be..000000000
--- a/pcr/gnome-boxes-libre/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Daniel Milewski <niitotantei@gmail.com>
-
-_pkgname='gnome-boxes'
-pkgname="$_pkgname-libre"
-pkgver='3.10.2'
-pkgrel='1'
-pkgdesc='A simple GNOME 3 application to access remote or virtual systems, without nonfree system logos'
-arch=('i686' 'x86_64')
-url='https://wiki.gnome.org/Apps/Boxes'
-license=('LGPL')
-depends=('clutter-gtk' 'desktop-file-utils' 'gtk-vnc' 'libosinfo' 'libsoup' 'libtracker-sparql' 'libvirt-glib'
-         'spice-gtk3')
-makedepends=('gobject-introspection' 'intltool' 'itstool' 'spice-protocol' 'vala')
-optdepends=('qemu-usbredir: virtual machines support')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
-install='gnome-boxes.install'
-source=("http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz" 'logos.patch'
-        'free-distros.patch')
-sha256sums=('9e055627cff5f59323bc95ad65ab361fc26328854d5a421bd09c899c466f2ec4'
-            '63d8a7fb5e0d6260d56bd92e9d11f39e9f37c323a261bc822a589b85f760b254'
-            '025e56fff5ae3659abc867ef1b5739a4632c91fa7f10d54d0853e9905355a15f')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  patch -Np1 -i "$srcdir/logos.patch"
-
-  patch -Np1 -i "$srcdir/free-distros.patch"
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/gnome-boxes-libre/free-distros.patch b/pcr/gnome-boxes-libre/free-distros.patch
deleted file mode 100644
index d83d2ca4b..000000000
--- a/pcr/gnome-boxes-libre/free-distros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml.original	2013-11-23 13:26:20.013010981 +0100
-+++ gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml	2013-11-23 14:29:33.237567173 +0100
-@@ -2,4 +2,8 @@
- 
-   <!-- Please read README.logos for any questions about usage of product logos in Boxes. !-->
- 
-+  <os id="https://parabolagnulinux.org">
-+    <logo>https://projects.parabolagnulinux.org/artwork.git/plain/official-2013/optimized-text/logo.svg</logo>
-+  </os>
-+
- </libosinfo>
diff --git a/pcr/gnome-boxes-libre/gnome-boxes.install b/pcr/gnome-boxes-libre/gnome-boxes.install
deleted file mode 100644
index 2ceb2ac08..000000000
--- a/pcr/gnome-boxes-libre/gnome-boxes.install
+++ /dev/null
@@ -1,17 +0,0 @@
-update() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_install() {
-  update
-}
-
-post_upgrade() {
-  update
-}
-
-post_remove() {
-  update
-}
diff --git a/pcr/gnome-boxes-libre/logos.patch b/pcr/gnome-boxes-libre/logos.patch
deleted file mode 100644
index 6fe80a2eb..000000000
--- a/pcr/gnome-boxes-libre/logos.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml.original	2013-11-16 22:30:08.198540527 +0100
-+++ gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml	2013-11-16 22:30:12.135269885 +0100
-@@ -2,36 +2,4 @@
- 
-   <!-- Please read README.logos for any questions about usage of product logos in Boxes. !-->
- 
--  <os id="http://debian.org/debian/1.0">
--    <logo>http://www.debian.org/logos/openlogo-nd.svg</logo>
--  </os>
--
--  <os id="http://fedoraproject.org/fedora/1">
--    <logo>http://people.gnome.org/~zeeshanak/logos/fedora.svg</logo>
--  </os>
--
--  <os id="http://opensuse.org/opensuse/10.2">
--    <logo>http://people.gnome.org/~zeeshanak/logos/opensuse.svg</logo>
--  </os>
--
--  <os id="http://ubuntu.com/ubuntu/4.10">
--    <logo>http://people.gnome.org/~zeeshanak/logos/ubuntu.svg</logo>
--  </os>
--
--  <os id="http://gnome.org/3.6">
--    <logo>http://people.gnome.org/~zeeshanak/logos/gnome-logo.svg</logo>
--  </os>
--
--  <os id="http://redhat.com/rhel/4.0">
--    <logo>http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
--  </os>
--
--  <os id="http://redhat.com/rhel/5.0">
--    <logo>http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
--  </os>
--
--  <os id="http://redhat.com/rhel/6.0">
--    <logo>http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
--  </os>
--
- </libosinfo>
diff --git a/pcr/libosinfo-libre/PKGBUILD b/pcr/libosinfo-libre/PKGBUILD
deleted file mode 100644
index 8400558c0..000000000
--- a/pcr/libosinfo-libre/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# Contributor: Daniel Milewski <niitotantei@gmail.com>
-
-_pkgname='libosinfo'
-pkgname="$_pkgname-libre"
-pkgver='0.2.8'
-pkgrel='1'
-pkgdesc='A GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support, without support for nonfree systems'
-arch=('i686' 'x86_64')
-url='http://libosinfo.org'
-license=('LGPL')
-depends=('glib2' 'libxslt')
-makedepends=('intltool' 'libsoup')
-checkdepends=('check')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
-source=("https://fedorahosted.org/releases/l/i/$_pkgname/$_pkgname-$pkgver.tar.gz" 'data.patch' 'po.patch' 'test.patch'
-        'free-distros.patch')
-sha256sums=('50cbfcff4548f37b5b7d3328cbc6e96fe6c2a48696e31eec0c819d161e38c643'
-            'fdfb0753a7cf7865ac2ea5b17145f90d27d70e18c69fba0d60dfb43629ea0dac'
-            'aab885d2b3a7f91a79efd7ab6f12fe1d4b264afa0fbc200268838b353600b338'
-            'c4b328f36973931abd71a10a62ec590ef3ba1177486179bc96aa47a22a6d0a42'
-            'f4b79c44ae4a39325480c2b0af4aa7ed086cc1cab7c9ba1119f50967a9a5f4ca')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  rm data/datamaps/windows-lang.xml \
-     data/hypervisors/rhel-xen.xml{,.in} \
-     data/install-scripts/*.xml \
-     data/oses/*.xml{,.in}
-  rm -r test/isodata/*
-
-  patch -Np1 -i "$srcdir/data.patch"
-  patch -Np1 -i "$srcdir/po.patch"
-  patch -Np1 -i "$srcdir/test.patch"
-
-  cd "$srcdir/$_pkgname-$pkgver/po"
-  intltool-update pl
-  intltool-update uk
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  patch -Np1 -i "$srcdir/free-distros.patch"
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/libosinfo-libre/data.patch b/pcr/libosinfo-libre/data.patch
deleted file mode 100644
index d37d30671..000000000
--- a/pcr/libosinfo-libre/data.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -ruN libosinfo-0.2.8/data/datamaps/Makefile.am libosinfo-0.2.8-libre/data/datamaps/Makefile.am
---- libosinfo-0.2.8/data/datamaps/Makefile.am	2013-01-09 00:01:25.000000000 +0100
-+++ libosinfo-0.2.8-libre/data/datamaps/Makefile.am	2013-12-01 12:15:00.261131308 +0100
-@@ -1,7 +1,6 @@
- 
- datamapdir = $(pkgdatadir)/db/datamaps/
- datamap_DATA =     \
--  windows-lang.xml   \
-   x11-keyboard.xml   \
-   $(NULL)
- 
-diff -ruN libosinfo-0.2.8/data/datamaps/Makefile.in libosinfo-0.2.8-libre/data/datamaps/Makefile.in
---- libosinfo-0.2.8/data/datamaps/Makefile.in	2013-09-16 18:45:26.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/datamaps/Makefile.in	2013-12-01 12:15:07.561496625 +0100
-@@ -326,7 +326,6 @@
- top_srcdir = @top_srcdir@
- datamapdir = $(pkgdatadir)/db/datamaps/
- datamap_DATA = \
--  windows-lang.xml   \
-   x11-keyboard.xml   \
-   $(NULL)
- 
-diff -ruN libosinfo-0.2.8/data/hypervisors/Makefile.am libosinfo-0.2.8-libre/data/hypervisors/Makefile.am
---- libosinfo-0.2.8/data/hypervisors/Makefile.am	2013-02-14 02:39:37.000000000 +0100
-+++ libosinfo-0.2.8-libre/data/hypervisors/Makefile.am	2013-12-01 12:18:54.718635301 +0100
-@@ -1,6 +1,6 @@
- 
- databasedir = $(pkgdatadir)/db/hypervisors/
--database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in
-+database_in_files = kvm.xml.in qemu.xml.in xen.xml.in
- 
- database_DATA = $(database_in_files:.xml.in=.xml)
- 
-diff -ruN libosinfo-0.2.8/data/hypervisors/Makefile.in libosinfo-0.2.8-libre/data/hypervisors/Makefile.in
---- libosinfo-0.2.8/data/hypervisors/Makefile.in	2013-09-16 18:45:26.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/hypervisors/Makefile.in	2013-12-01 12:20:01.822560286 +0100
-@@ -325,7 +325,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/hypervisors/
--database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in
-+database_in_files = kvm.xml.in qemu.xml.in xen.xml.in
- database_DATA = $(database_in_files:.xml.in=.xml)
- EXTRA_DIST = $(database_in_files) $(database_DATA)
- all: all-am
-diff -ruN libosinfo-0.2.8/data/install-scripts/Makefile.am libosinfo-0.2.8-libre/data/install-scripts/Makefile.am
---- libosinfo-0.2.8/data/install-scripts/Makefile.am	2013-03-27 23:03:14.000000000 +0100
-+++ libosinfo-0.2.8-libre/data/install-scripts/Makefile.am	2013-12-01 12:24:10.160616083 +0100
-@@ -1,12 +1,6 @@
- 
- databasedir = $(pkgdatadir)/db/install-scripts/
- database_DATA =     \
--  fedora.xml        \
--  rhel.xml          \
--  windows-sif.xml   \
--  windows-cmd.xml   \
--  windows-reg.xml   \
--  windows-unattend.xml \
-   $(NULL)
- 
- EXTRA_DIST = $(database_DATA)
-diff -ruN libosinfo-0.2.8/data/install-scripts/Makefile.in libosinfo-0.2.8-libre/data/install-scripts/Makefile.in
---- libosinfo-0.2.8/data/install-scripts/Makefile.in	2013-09-16 18:45:26.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/install-scripts/Makefile.in	2013-12-01 12:24:20.500882542 +0100
-@@ -326,12 +326,6 @@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/install-scripts/
- database_DATA = \
--  fedora.xml        \
--  rhel.xml          \
--  windows-sif.xml   \
--  windows-cmd.xml   \
--  windows-reg.xml   \
--  windows-unattend.xml \
-   $(NULL)
- 
- EXTRA_DIST = $(database_DATA)
-diff -ruN libosinfo-0.2.8/data/oses/Makefile.am libosinfo-0.2.8-libre/data/oses/Makefile.am
---- libosinfo-0.2.8/data/oses/Makefile.am	2013-09-10 15:22:50.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/oses/Makefile.am	2013-12-01 12:26:24.797757509 +0100
-@@ -1,26 +1,6 @@
- 
- databasedir = $(pkgdatadir)/db/oses/
- database_in_files = 	\
--	altlinux.xml.in \
--	centos.xml.in   \
--	debian.xml.in   \
--	dos.xml.in      \
--	fedora.xml.in   \
--	freebsd.xml.in  \
--	gnome.xml.in	\
--	mandriva.xml.in \
--	mandrake.xml.in \
--	netbsd.xml.in	\
--	netware.xml.in  \
--	macos.xml.in    \
--	openbsd.xml.in  \
--	opensuse.xml.in \
--	rhl.xml.in      \
--	rhel.xml.in     \
--	solaris.xml.in  \
--	suse.xml.in     \
--	ubuntu.xml.in   \
--	windows.xml.in  \
- 	$(NULL)
- 
- database_DATA = $(database_in_files:.xml.in=.xml)
-diff -ruN libosinfo-0.2.8/data/oses/Makefile.in libosinfo-0.2.8-libre/data/oses/Makefile.in
---- libosinfo-0.2.8/data/oses/Makefile.in	2013-09-16 18:45:26.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/oses/Makefile.in	2013-12-01 12:26:32.557686417 +0100
-@@ -326,26 +326,6 @@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/oses/
- database_in_files = \
--	altlinux.xml.in \
--	centos.xml.in   \
--	debian.xml.in   \
--	dos.xml.in      \
--	fedora.xml.in   \
--	freebsd.xml.in  \
--	gnome.xml.in	\
--	mandriva.xml.in \
--	mandrake.xml.in \
--	netbsd.xml.in	\
--	netware.xml.in  \
--	macos.xml.in    \
--	openbsd.xml.in  \
--	opensuse.xml.in \
--	rhl.xml.in      \
--	rhel.xml.in     \
--	solaris.xml.in  \
--	suse.xml.in     \
--	ubuntu.xml.in   \
--	windows.xml.in  \
- 	$(NULL)
- 
- database_DATA = $(database_in_files:.xml.in=.xml)
diff --git a/pcr/libosinfo-libre/free-distros.patch b/pcr/libosinfo-libre/free-distros.patch
deleted file mode 100644
index c69cd3fed..000000000
--- a/pcr/libosinfo-libre/free-distros.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -ruN libosinfo-0.2.8-libre/data/oses/Makefile.am libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.am
---- libosinfo-0.2.8-libre/data/oses/Makefile.am	2013-12-01 13:14:07.267023100 +0100
-+++ libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.am	2013-12-01 13:18:29.183029813 +0100
-@@ -1,6 +1,7 @@
- 
- databasedir = $(pkgdatadir)/db/oses/
- database_in_files = 	\
-+	parabola.xml.in \
- 	$(NULL)
- 
- database_DATA = $(database_in_files:.xml.in=.xml)
-diff -ruN libosinfo-0.2.8-libre/data/oses/Makefile.in libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.in
---- libosinfo-0.2.8-libre/data/oses/Makefile.in	2013-12-01 13:14:07.267023100 +0100
-+++ libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.in	2013-12-01 13:18:48.053708302 +0100
-@@ -326,6 +326,7 @@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/oses/
- database_in_files = \
-+	parabola.xml.in \
- 	$(NULL)
- 
- database_DATA = $(database_in_files:.xml.in=.xml)
-diff -ruN libosinfo-0.2.8-libre/data/oses/parabola.xml libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml
---- libosinfo-0.2.8-libre/data/oses/parabola.xml	1970-01-01 01:00:00.000000000 +0100
-+++ libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml	2013-12-01 13:26:26.128660679 +0100
-@@ -0,0 +1,42 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+  <os id="https://parabolagnulinux.org">
-+    <short-id>parabola</short-id>
-+    <name>Parabola GNU/Linux-libre</name>
-+    <vendor>Parabola Project</vendor>
-+    <family>gnu/linux</family>
-+
-+    <resources arch="all">
-+      <minimum>
-+        <cpu>1000000000</cpu>
-+        <n-cpus>1</n-cpus>
-+        <ram>67108864</ram>
-+        <storage>524288000</storage>
-+      </minimum>
-+      <recommended>
-+        <cpu>1000000000</cpu>
-+        <ram>67108864</ram>
-+        <storage>524288000</storage>
-+      </recommended>
-+    </resources>
-+
-+    <media arch="x86_64">
-+      <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
-+      <iso>
-+        <volume-id>PARA_201309</volume-id>
-+      </iso>
-+      <kernel>parabola/boot/x86_64/vmlinuz</kernel>
-+      <initrd>parabola/boot/x86_64/parabolaiso.img</initrd>
-+    </media>
-+    <media arch="i686">
-+      <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
-+      <iso>
-+        <volume-id>PARA_201309</volume-id>
-+      </iso>
-+      <kernel>parabola/boot/i686/vmlinuz</kernel>
-+      <initrd>parabola/boot/i686/parabolaiso.img</initrd>
-+    </media>
-+  </os>
-+
-+</libosinfo>
-\ No newline at end of file
-diff -ruN libosinfo-0.2.8-libre/data/oses/parabola.xml.in libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml.in
---- libosinfo-0.2.8-libre/data/oses/parabola.xml.in	1970-01-01 01:00:00.000000000 +0100
-+++ libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml.in	2013-12-01 13:17:12.086931332 +0100
-@@ -0,0 +1,42 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+  <os id="https://parabolagnulinux.org">
-+    <short-id>parabola</short-id>
-+    <_name>Parabola GNU/Linux-libre</_name>
-+    <_vendor>Parabola Project</_vendor>
-+    <family>gnu/linux</family>
-+
-+    <resources arch="all">
-+      <minimum>
-+        <cpu>1000000000</cpu>
-+        <n-cpus>1</n-cpus>
-+        <ram>67108864</ram>
-+        <storage>524288000</storage>
-+      </minimum>
-+      <recommended>
-+        <cpu>1000000000</cpu>
-+        <ram>67108864</ram>
-+        <storage>524288000</storage>
-+      </recommended>
-+    </resources>
-+
-+    <media arch="x86_64">
-+      <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
-+      <iso>
-+        <volume-id>PARA_201309</volume-id>
-+      </iso>
-+      <kernel>parabola/boot/x86_64/vmlinuz</kernel>
-+      <initrd>parabola/boot/x86_64/parabolaiso.img</initrd>
-+    </media>
-+    <media arch="i686">
-+      <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
-+      <iso>
-+        <volume-id>PARA_201309</volume-id>
-+      </iso>
-+      <kernel>parabola/boot/i686/vmlinuz</kernel>
-+      <initrd>parabola/boot/i686/parabolaiso.img</initrd>
-+    </media>
-+  </os>
-+
-+</libosinfo>
-diff -ruN libosinfo-0.2.8-libre/po/POTFILES.in libosinfo-0.2.8-libre-free-distros/po/POTFILES.in
---- libosinfo-0.2.8-libre/po/POTFILES.in	2013-12-01 13:14:10.297130169 +0100
-+++ libosinfo-0.2.8-libre-free-distros/po/POTFILES.in	2013-12-01 13:23:01.616209485 +0100
-@@ -1,3 +1,4 @@
-+data/oses/parabola.xml.in
- data/devices/qemu-ps2.xml.in
- data/devices/qemu-pci.xml.in
- data/devices/virtio-pci.xml.in
diff --git a/pcr/libosinfo-libre/po.patch b/pcr/libosinfo-libre/po.patch
deleted file mode 100644
index abd11cb71..000000000
--- a/pcr/libosinfo-libre/po.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ruN libosinfo-0.2.8/po/POTFILES.in libosinfo-0.2.8-libre/po/POTFILES.in
---- libosinfo-0.2.8/po/POTFILES.in	2013-09-10 15:22:50.000000000 +0200
-+++ libosinfo-0.2.8-libre/po/POTFILES.in	2013-12-01 11:54:50.441912252 +0100
-@@ -1,30 +1,9 @@
--data/oses/netware.xml.in
--data/oses/solaris.xml.in
--data/oses/dos.xml.in
--data/oses/mandrake.xml.in
--data/oses/mandriva.xml.in
--data/oses/suse.xml.in
--data/oses/gnome.xml.in
--data/oses/rhel.xml.in
--data/oses/fedora.xml.in
--data/oses/windows.xml.in
--data/oses/opensuse.xml.in
--data/oses/macos.xml.in
--data/oses/debian.xml.in
--data/oses/ubuntu.xml.in
--data/oses/centos.xml.in
--data/oses/openbsd.xml.in
--data/oses/freebsd.xml.in
--data/oses/rhl.xml.in
--data/oses/netbsd.xml.in
--data/oses/altlinux.xml.in
- data/devices/qemu-ps2.xml.in
- data/devices/qemu-pci.xml.in
- data/devices/virtio-pci.xml.in
- data/devices/qemu-usb.xml.in
- data/hypervisors/kvm.xml.in
- data/hypervisors/qemu.xml.in
--data/hypervisors/rhel-xen.xml.in
- data/hypervisors/xen.xml.in
- osinfo/osinfo_avatar_format.c
- osinfo/osinfo_deployment.c
diff --git a/pcr/libosinfo-libre/test.patch b/pcr/libosinfo-libre/test.patch
deleted file mode 100644
index 413deb1c0..000000000
--- a/pcr/libosinfo-libre/test.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -ruN libosinfo-0.2.8/test/test-isodetect.c libosinfo-0.2.8-libre/test/test-isodetect.c
---- libosinfo-0.2.8/test/test-isodetect.c	2013-09-10 15:22:50.000000000 +0200
-+++ libosinfo-0.2.8-libre/test/test-isodetect.c	2013-12-01 11:44:32.830411240 +0100
-@@ -342,66 +342,6 @@
-     g_object_unref(loader);
- }
- 
--START_TEST(test_fedora)
--{
--    test_one("fedora");
--}
--END_TEST
--
--START_TEST(test_rhel)
--{
--    test_one("rhel");
--}
--END_TEST
--
--START_TEST(test_ubuntu)
--{
--    test_one("ubuntu");
--}
--END_TEST
--
--START_TEST(test_debian)
--{
--    test_one("debian");
--}
--END_TEST
--
--START_TEST(test_windows)
--{
--    test_one("windows");
--}
--END_TEST
--
--START_TEST(test_openbsd)
--{
--    test_one("openbsd");
--}
--END_TEST
--
--START_TEST(test_opensuse)
--{
--    test_one("opensuse");
--}
--END_TEST
--
--START_TEST(test_centos)
--{
--    test_one("centos");
--}
--END_TEST
--
--START_TEST(test_gnome)
--{
--    test_one("gnome");
--}
--END_TEST
--
--START_TEST(test_altlinux)
--{
--    test_one("altlinux");
--}
--END_TEST
--
- static Suite *
- list_suite(void)
- {
-@@ -409,16 +349,6 @@
-     TCase *tc = tcase_create("Core");
-     tcase_set_timeout(tc, 20);
- 
--    tcase_add_test(tc, test_fedora);
--    tcase_add_test(tc, test_rhel);
--    tcase_add_test(tc, test_ubuntu);
--    tcase_add_test(tc, test_debian);
--    tcase_add_test(tc, test_windows);
--    tcase_add_test(tc, test_openbsd);
--    tcase_add_test(tc, test_opensuse);
--    tcase_add_test(tc, test_centos);
--    tcase_add_test(tc, test_gnome);
--    tcase_add_test(tc, test_altlinux);
-     suite_add_tcase(s, tc);
-     return s;
- }
diff --git a/pcr/qemu-usbredir/65-kvm.rules b/pcr/qemu-usbredir/65-kvm.rules
deleted file mode 100644
index 569ded9f9..000000000
--- a/pcr/qemu-usbredir/65-kvm.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
-KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net"
diff --git a/pcr/qemu-usbredir/PKGBUILD b/pcr/qemu-usbredir/PKGBUILD
deleted file mode 100644
index 35f945d0e..000000000
--- a/pcr/qemu-usbredir/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer (Arch GNU/Linux): Tobias Powalowski <tpowa@archlinux.org>
-_pkgname=qemu
-pkgname=qemu-usbredir
-pkgver=1.7.0
-pkgrel=1
-pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url="http://wiki.qemu.org/Index.html"
-makedepends=('texi2html' 'perl' 'python2' 'spice-protocol')
-depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
-         'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
-         'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
-         'libiscsi' 'libcacard' 'spice' 'usbredir')
-backup=('etc/qemu/target-x86_64.conf')
-install=qemu.install
-source=(http://wiki.qemu.org/download/${_pkgname}-${pkgver}.tar.bz2
-        65-kvm.rules)
-makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
-             'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
-             'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
-             'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2'
-             'usbredir')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=('qemu-kvm')
-options=(!strip)
-
-build ()
-{
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  # qemu vs. make 4 == bad
-  export ARFLAGS="rv"
-  # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
-  # gtk gui breaks keymappings at the moment
-  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
-              --python=/usr/bin/python2 --smbd=/usr/bin/smbd \
-              --enable-docs --libexecdir=/usr/lib/qemu \
-              --disable-gtk --enable-linux-aio --enable-seccomp \
-              --enable-spice --localstatedir=/var --enable-usb-redir
-  make V=99
-}
-
-package () 
-{
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
-  # provided by seabios package
-  rm "${pkgdir}/usr/share/qemu/bios.bin"
-  rm "${pkgdir}/usr/share/qemu/acpi-dsdt.aml"
-  rm "${pkgdir}/usr/share/qemu/q35-acpi-dsdt.aml"
-  # remove conflicting /var/run directory
-  rm -r "${pkgdir}/var"
-  install -D -m644 "${srcdir}/65-kvm.rules" \
-                   "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
-  # bridge_helper needs suid
-  # https://bugs.archlinux.org/task/32565
-  chmod u+s "${pkgdir}/usr/lib/qemu/qemu-bridge-helper"
-  # add sample config
-  echo "allow br0" > ${pkgdir}/etc/qemu/bridge.conf.sample
-  # strip scripts directory
-    find "${pkgdir}/usr/src/linux-${_kernver}/scripts"  -type f -perm -u+w 2>/dev/null | while read binary ; do
-      case "$(file -bi "$binary")" in
-        *application/x-executable*) # Binaries
-        /usr/bin/strip $STRIP_BINARIES "$binary";;
-      esac
-    done
-  # remove libcacard files
-  rm -rf ${pkgdir}/usr/include/cacard
-  rm -rf ${pkgdir}/usr/lib/libcacard*
-  rm -rf ${pkgdir}/usr/lib/pkgconfig/libcacard.pc
-  rm -rf ${pkgdir}/usr/bin/vscclient
-}
-
-md5sums=('32893941d40d052a5e649efcf06aca06'
-         '33ab286a20242dda7743a900f369d68a')
diff --git a/pcr/qemu-usbredir/qemu.install b/pcr/qemu-usbredir/qemu.install
deleted file mode 100644
index 79ee83536..000000000
--- a/pcr/qemu-usbredir/qemu.install
+++ /dev/null
@@ -1,23 +0,0 @@
-# kvm:  the new package version
-post_install() {
-  #
-  groupadd kvm -f -g 78
-}
-
-post_upgrade() {
-  if [ "$(vercmp $2 0.11)" -lt 0 ]; then
-    echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
-    echo "is no longer supported and will be removed from the repositories. You"
-    echo "can safely uninstall it from your system."
-  fi
-  if [ "$(vercmp $2 1.3.1)" -lt 0 ]; then
-    echo "With the release of qemu 1.3.0, qemu-kvm binary is removed."
-    echo "You need to change the emulator path, if you use libvirt by using:"
-    echo "'virsh edit <vm-name>'"
-  fi
-}
-
-post_remove() {
-  #
-  groupdel kvm
-}
author	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-01-30 03:49:22 +0000
committer	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-01-30 03:49:22 +0000
commit	abecd94e38c95522f241c335c76aa3150e43eedd (patch)
tree	e1aa639a866772861431c2ab8ced2ee79100ae9d
parent	0a521de4508e14363c59922ab2744ab699e30288 (diff)