summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-05-09 17:32:20 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-05-09 17:32:20 +0200
commitb5a445c3812dbacdd87f0251effe4ce835187f46 (patch)
treede04df9e4a5ec79888c6c51cd88962c7e11c4eff
parentf39f7cdcd87eeadace084f3b80f73409a4487ed5 (diff)
parent963d33c3ef2a82f943b307dcc6d24ee51d0f0ff2 (diff)
downloadabslibre-b5a445c3812dbacdd87f0251effe4ce835187f46.tar.gz
abslibre-b5a445c3812dbacdd87f0251effe4ce835187f46.tar.bz2
abslibre-b5a445c3812dbacdd87f0251effe4ce835187f46.zip
Merge branch 'master' of git+ssh://parabola-git/srv/git/abslibre
-rw-r--r--libre-testing/icedove-libre/PKGBUILD87
-rw-r--r--libre-testing/icedove-libre/gcc47.patch44
-rw-r--r--libre-testing/icedove-libre/makefile.patch11
-rw-r--r--libre-testing/icedove-libre/rules.patch16
-rw-r--r--libre/blackbox-libre/PKGBUILD47
-rw-r--r--libre/blackbox-libre/bbdock.patch16
-rw-r--r--libre/blackbox-libre/bsetbg-feh.patch23
-rw-r--r--libre/blackbox-libre/gcc4.3.patch111
-rw-r--r--libre/blackbox-libre/menu108
-rw-r--r--libre/blackbox-libre/textpropertytostring-unconditional.patch28
-rw-r--r--libre/icedove-i18n/PKGBUILD524
-rw-r--r--libre/icedove-libre/PKGBUILD96
-rw-r--r--libre/icedove-libre/channel-prefs.js (renamed from libre-testing/icedove-libre/channel-prefs.js)0
-rw-r--r--libre/icedove-libre/clrf.patch260
-rw-r--r--libre/icedove-libre/gcc47.patch63
-rw-r--r--libre/icedove-libre/icedove.desktop13
-rw-r--r--libre/icedove-libre/icedove.install (renamed from libre-testing/icedove-libre/icedove.install)0
-rw-r--r--libre/icedove-libre/makefile.patch46
-rw-r--r--libre/icedove-libre/mozconfig (renamed from libre-testing/icedove-libre/mozconfig)31
-rw-r--r--libre/icedove-libre/searchplugins-libre.patch (renamed from libre-testing/icedove-libre/searchplugins-libre.patch)33
-rw-r--r--libre/icedove-libre/vendor.js (renamed from libre-testing/icedove-libre/vendor.js)0
21 files changed, 1377 insertions, 180 deletions
diff --git a/libre-testing/icedove-libre/PKGBUILD b/libre-testing/icedove-libre/PKGBUILD
deleted file mode 100644
index 9beba51a8..000000000
--- a/libre-testing/icedove-libre/PKGBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# Maintainer : Márcio Silva <coadde@adinet.com.uy>
-# Maintainer : André Silva <andre.paulista@adinet.com.uy>
-# Contributor: Esteban V. Carnevale <evcarnevale@gmail.com>
-
-# We're getting this from Debian Sid
-_debname=icedove
-_debver=10.0.3
-_debrel=3
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=$_debname
-pkgname=$_debname-libre
-pkgver=$_debver
-pkgrel=1
-pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla thunderbird."
-arch=('i586' 'i686' 'x86_64' 'mips64el')
-license=('GPL2' 'MPL' 'LGPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
-optdepends=('libcanberra: for sound support')
-url="http://packages.debian.org/source/sid/$_pkgname"
-install=$_pkgname.install
-source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
- "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz"
- "$_debrepo/`debfile $_debname`_$_debver-$_debrel.dsc"
- mozconfig
- channel-prefs.js
- vendor.js
- makefile.patch
- gcc47.patch
- rules.patch
- searchplugins-libre.patch)
-md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc'
- 'cb3dba2916bdf2deb72248b0984c4302'
- '57e21e997a75d85fcc0dcfe30b83f1ee'
- '76e01cfd6de4d4289265882774d1ba7d'
- '476ec205162340fb0679f522c9d31c3b'
- '4eecc4fc5aafaf0da651a09eadc90bee'
- '5a6282bb005d596aa4ab1884ac6b0517'
- '66376a8e934013078f0e646e49614937'
- '2e6a57dc04b4a7255f5f1f3642af23ac'
- '8f6d5be227bb68e1558dd6674cbba446')
-
-build() {
- export QUILT_PATCHES=debian/patches
- export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
- export QUILT_DIFF_ARGS='--no-timestamps'
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
- export PYTHON="/usr/bin/python2"
-
- mv comm-esr10 "$srcdir/mozilla-build"
- mv debian "$srcdir/mozilla-build"
-
- cd "$srcdir/mozilla-build"
- quilt push -a
-
- cp "$srcdir/mozconfig" .mozconfig
- patch -Np1 -i "$srcdir/gcc47.patch"
- patch -Np1 -i "$srcdir/makefile.patch"
- patch -Np1 -i "$srcdir/rules.patch"
-
- # Removing non-free search plugins replacing them with duckduckgo and identi.ca
- patch -Np0 -i "$srcdir/searchplugins-libre.patch"
-
- make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
- cd "$srcdir/mozilla-build"
- make -j1 -f client.mk DESTDIR="$pkgdir" install
-
- install -m644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref"
- install -m644 "$srcdir/channel-prefs.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" # Recommend free addons
-
- for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
- install -Dm644 debian/app-icons/$_pkgname${i/x*/}.png \
- "$pkgdir/usr/share/icons/hicolor/$i/apps/$_pkgname.png"
- install -Dm644 debian/app-icons/icedovebig.svg \
- "$pkgdir/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg"
- done
-
- 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 -r "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} # We don't want the development stuff
-}
diff --git a/libre-testing/icedove-libre/gcc47.patch b/libre-testing/icedove-libre/gcc47.patch
deleted file mode 100644
index 9824e6ab2..000000000
--- a/libre-testing/icedove-libre/gcc47.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- mozilla-build.orig/mozilla/ipc/chromium/src/base/file_util.cc 2012-03-06 14:26:03.000000000 -0200
-+++ mozilla-build/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-04 18:50:02.094431651 -0300
-@@ -8,7 +8,7 @@
- #include <io.h>
- #endif
- #include <stdio.h>
--#if defined(ANDROID)
-+#if defined(ANDROID) || defined(OS_POSIX)
- #include <unistd.h>
- #endif
-
---- mozilla-build.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-03-06 14:26:03.000000000 -0200
-+++ mozilla-build/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-04 19:55:24.140455837 -0300
-@@ -6,6 +6,7 @@
-
- #include <errno.h>
- #include <fcntl.h>
-+#include <unistd.h>
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
-
---- mozilla-build.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-03-06 14:26:03.000000000 -0200
-+++ mozilla-build/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-04 20:49:49.756138306 -0300
-@@ -5,6 +5,7 @@
- #include "base/file_util.h"
-
- #include <fcntl.h>
-+#include <unistd.h>
-
- #include <string>
- #include <vector>
-
---- mozilla-build.orig/mozilla/ipc/chromium/src/base/time_posix.cc 2012-03-06 14:26:03.000000000 -0200
-+++ mozilla-build/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-04 20:55:12.678037291 -0300
-@@ -8,6 +8,7 @@
- #include <mach/mach_time.h>
- #endif
- #include <sys/time.h>
-+#include <unistd.h>
- #ifdef ANDROID
- #include <time64.h>
- #else
-
diff --git a/libre-testing/icedove-libre/makefile.patch b/libre-testing/icedove-libre/makefile.patch
deleted file mode 100644
index 284ca68c2..000000000
--- a/libre-testing/icedove-libre/makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-build/debian/icedove-branding/Makefile.in 2012-04-05 06:50:17.708640714 -0300
-+++ mozilla-build/debian/icedove-branding/Makefile.in 2012-04-05 06:50:41.902614597 -0300
-@@ -38,7 +38,7 @@
- # Branding Makefile for Icedove branding
-
- DEPTH = ../../..
--topsrcdir = ../../../
-+topsrcdir = ../../
- srcdir = @srcdir@
- VPATH = @srcdir@
-
diff --git a/libre-testing/icedove-libre/rules.patch b/libre-testing/icedove-libre/rules.patch
deleted file mode 100644
index ce857ebd3..000000000
--- a/libre-testing/icedove-libre/rules.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- mozilla-build/config/rules.mk.orig 2012-03-06 13:44:49.000000000 -0200
-+++ mozilla-build/config/rules.mk 2012-04-05 22:24:29.473430588 -0300
-@@ -48,11 +48,11 @@
- endif
-
- ifndef INCLUDED_CONFIG_MK
--include $(topsrcdir)/config/config.mk
-+include /build/src/mozilla-build/config/config.mk
- endif
-
- ifndef INCLUDED_VERSION_MK
--include $(topsrcdir)/config/version.mk
-+include /build/src/mozilla-build/config/version.mk
- endif
-
- ifdef SDK_XPIDLSRCS
diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD
new file mode 100644
index 000000000..fdddc645c
--- /dev/null
+++ b/libre/blackbox-libre/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: durbatuluk <dvdscripter@gmail.org>
+# Contributor: Steve Ponsford <sp4d@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+
+_pkgname=blackbox
+pkgname=${_pkgname}-libre
+pkgver=0.70.1
+pkgrel=10
+pkgdesc="A window manager for X11 without non-free programs on menu"
+url="http://${_pkgname}wm.sourceforge.net/"
+arch=('i686' 'x86_64')
+depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt')
+replaces=("${_pkgname}")
+conflicts=("${_pkgname}")
+provides=("${_pkgname}=${pkgver}")
+license=('MIT')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/${_pkgname}wm/${_pkgname}-${pkgver}.tar.gz
+ gcc4.3.patch
+ bbdock.patch
+ bsetbg-feh.patch
+ textpropertytostring-unconditional.patch
+ menu)
+md5sums=('2d173b95ca5e64ef478c6a5d2deee9df'
+ 'bc7a1335d77cdeb6f85cba4d01e68e63'
+ '69c5a5e981b087b2d8267cab996b48dd'
+ 'e7fb0d5bfd95820c0194ec73df66dadc'
+ '3b92ad246f07126dd55ae9634d6e875e'
+ 'bdc49afe527880c8c1a3df13775e55b2')
+
+build() {
+ cd ${srcdir}/${_pkgname}-${pkgver}
+
+ patch -Np1 -i ../gcc4.3.patch
+ patch -Np0 -i ../bbdock.patch
+ patch -Np0 -i ../bsetbg-feh.patch
+ patch -Np1 -i ../textpropertytostring-unconditional.patch
+
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+ make DESTDIR=${pkgdir} install
+
+ install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE
+ install -D -m644 ${srcdir}/menu ${pkgdir}/usr/share/${_pkgname}/menu
+}
diff --git a/libre/blackbox-libre/bbdock.patch b/libre/blackbox-libre/bbdock.patch
new file mode 100644
index 000000000..709b6cfe1
--- /dev/null
+++ b/libre/blackbox-libre/bbdock.patch
@@ -0,0 +1,16 @@
+--- src/Slit.cc 2005-01-04 05:58:33.000000000 -0700
++++ /root/tmp/Slit.cc 2007-12-29 11:13:09.000000000 -0700
+@@ -248,6 +248,13 @@
+ bt::PixmapCache::find(screen->screenNumber(), texture,
+ frame.rect.width(), frame.rect.height(),
+ frame.pixmap);
++/*** START: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative **************/
++ if ((texture.texture() & bt::Texture::Gradient) && frame.pixmap)
++ XSetWindowBackgroundPixmap(display, frame.window, frame.pixmap);
++ else if ((texture.texture() & bt::Texture::Solid))
++ XSetWindowBackground(display, frame.window,
++ texture.color1().pixel(screen->screenNumber()));
++/*** STOP: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative ***************/
+ XClearArea(display, frame.window, 0, 0,
+ frame.rect.width(), frame.rect.height(), True);
+
diff --git a/libre/blackbox-libre/bsetbg-feh.patch b/libre/blackbox-libre/bsetbg-feh.patch
new file mode 100644
index 000000000..17a612ff0
--- /dev/null
+++ b/libre/blackbox-libre/bsetbg-feh.patch
@@ -0,0 +1,23 @@
+--- util/bsetbg.orig 2008-03-26 21:17:04.000000000 -0700
++++ util/bsetbg 2008-03-26 21:21:57.000000000 -0700
+@@ -22,7 +22,7 @@
+
+ PATH=$PATH:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+
+-img_apps="display xli xsetbg Esetroot qiv wmsetbg xv"
++img_apps="display xli xsetbg Esetroot qiv wmsetbg xv feh"
+
+ display_full_cmd="display -geometry 800x600 -window root"
+ display_tile_cmd="display -window root"
+@@ -59,6 +59,11 @@
+ xsetbg_center_cmd="xsetbg -center"
+ xsetbg_default_cmd="$xsetbg_center_cmd"
+
++feh_full_cmd="feh --bg-scale"
++feh_tile_cmd="feh --bg-tile"
++feh_center_cmd="feh --bg-center"
++feh_default_cmd="$feh_center_cmd"
++
+ ##################################
+
+ me=`basename $0`
diff --git a/libre/blackbox-libre/gcc4.3.patch b/libre/blackbox-libre/gcc4.3.patch
new file mode 100644
index 000000000..40a9dcdef
--- /dev/null
+++ b/libre/blackbox-libre/gcc4.3.patch
@@ -0,0 +1,111 @@
+diff -Nur blackbox-0.70.1/lib/Image.cc blackbox-0.70.1-new/lib/Image.cc
+--- blackbox-0.70.1/lib/Image.cc 2005-04-08 08:41:09.000000000 -0700
++++ blackbox-0.70.1-new/lib/Image.cc 2008-05-21 20:52:44.000000000 -0700
+@@ -45,6 +45,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+
++#include <cstring>
++
+ // #define COLORTABLE_DEBUG
+ // #define MITSHM_DEBUG
+
+diff -Nur blackbox-0.70.1/lib/Resource.cc blackbox-0.70.1-new/lib/Resource.cc
+--- blackbox-0.70.1/lib/Resource.cc 2005-04-06 14:16:50.000000000 -0700
++++ blackbox-0.70.1-new/lib/Resource.cc 2008-05-21 20:52:44.000000000 -0700
+@@ -30,6 +30,8 @@
+
+ #include <stdio.h>
+
++#include <cstring>
++
+
+ bt::Resource::Resource(void)
+ : db(NULL)
+diff -Nur blackbox-0.70.1/lib/XDG.cc blackbox-0.70.1-new/lib/XDG.cc
+--- blackbox-0.70.1/lib/XDG.cc 2005-04-06 07:04:38.000000000 -0700
++++ blackbox-0.70.1-new/lib/XDG.cc 2008-05-21 20:52:44.000000000 -0700
+@@ -26,7 +26,7 @@
+ #include "XDG.hh"
+
+ #include <stdlib.h>
+-
++#include <algorithm>
+
+ // make sure directory names end with a slash
+ static std::string terminateDir(const std::string &string)
+diff -Nur blackbox-0.70.1/src/BlackboxResource.cc blackbox-0.70.1-new/src/BlackboxResource.cc
+--- blackbox-0.70.1/src/BlackboxResource.cc 2005-10-18 00:34:46.000000000 -0700
++++ blackbox-0.70.1-new/src/BlackboxResource.cc 2008-05-21 20:52:44.000000000 -0700
+@@ -33,6 +33,8 @@
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+
++#include <cstring>
++
+
+ BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
+ screen_resources = 0;
+diff -Nur blackbox-0.70.1/src/Screen.cc blackbox-0.70.1-new/src/Screen.cc
+--- blackbox-0.70.1/src/Screen.cc 2005-10-18 01:07:22.000000000 -0700
++++ blackbox-0.70.1-new/src/Screen.cc 2008-05-21 20:52:44.000000000 -0700
+@@ -48,6 +48,8 @@
+ #include <ctype.h>
+ #include <dirent.h>
+
++#include <cstring>
++
+
+ static bool running = true;
+ static int anotherWMRunning(Display *, XErrorEvent *) {
+diff -Nur blackbox-0.70.1/src/ScreenResource.cc blackbox-0.70.1-new/src/ScreenResource.cc
+--- blackbox-0.70.1/src/ScreenResource.cc 2005-04-12 22:54:08.000000000 -0700
++++ blackbox-0.70.1-new/src/ScreenResource.cc 2008-05-21 20:52:44.000000000 -0700
+@@ -33,6 +33,8 @@
+
+ #include <assert.h>
+
++#include <cstring>
++
+
+ static const int iconify_width = 9;
+ static const int iconify_height = 9;
+diff -Nur blackbox-0.70.1/src/main.cc blackbox-0.70.1-new/src/main.cc
+--- blackbox-0.70.1/src/main.cc 2005-01-03 02:42:57.000000000 -0700
++++ blackbox-0.70.1-new/src/main.cc 2008-05-21 20:52:44.000000000 -0700
+@@ -36,6 +36,8 @@
+
+ #include <stdio.h>
+
++#include <cstring>
++
+
+ static void showHelp(int exitval) {
+ // print version - this should not be localized!
+diff -Nur blackbox-0.70.1/util/bsetbg blackbox-0.70.1-new/util/bsetbg
+--- blackbox-0.70.1/util/bsetbg 2004-12-22 02:40:18.000000000 -0700
++++ blackbox-0.70.1-new/util/bsetbg 2008-05-21 20:52:44.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ # Copyright (c) 2000-2002 Timothy M. King (tmk@lordzork.com)
+ #
+diff -Nur blackbox-0.70.1/util/bsetroot.cc blackbox-0.70.1-new/util/bsetroot.cc
+--- blackbox-0.70.1/util/bsetroot.cc 2005-03-15 00:01:37.000000000 -0700
++++ blackbox-0.70.1-new/util/bsetroot.cc 2008-05-21 20:52:44.000000000 -0700
+@@ -27,11 +27,14 @@
+ #include <Pen.hh>
+ #include <Texture.hh>
+
++#include <cstdlib>
+ #include <cctype>
+
+ #include <X11/Xatom.h>
+ #include <stdio.h>
+
++#include <cstring>
++
+
+ // ignore all X errors
+ static int x11_error(::Display *, XErrorEvent *)
diff --git a/libre/blackbox-libre/menu b/libre/blackbox-libre/menu
new file mode 100644
index 000000000..4ad14cf8b
--- /dev/null
+++ b/libre/blackbox-libre/menu
@@ -0,0 +1,108 @@
+# This is the default menu file for Blackbox 0.33.0 and up
+#
+# Lines beginning with the '#' character are ignored.
+#
+# The new syntax is simpler than the old X resource format...
+# Each menu item consists of 2 or 3 fields:
+#
+# [command] (label) {data}
+#
+# where [command] is one of:
+#
+# [begin] [end] [exec] [exit] [reconfig] [restart] [submenu]
+# [style] [stylesdir] [include] [workspaces] [config]
+#
+# [begin] is used for the top level menu
+# [submenu] is used for submenus
+# [end] must be used with BOTH [begin] and [submenu] to tell the parser to stop
+# reading from the file.
+#
+# [exec] (label) {string}
+# This will insert an item that runs a program.
+#
+# [exit] (label)
+# This will insert an item that exits the window manager.
+#
+# [reconfig] (label) {string}
+# This will insert an item that tells blackbox to re-read it's configuration
+# files. {string} is optional, and if supplied, will execute the string with
+# /bin/sh -c before the reconfiguration is performed. (this is helpful for
+# writing multiple config files and switching between them)
+#
+# [restart] (label) {string}
+# This will insert an item to restart the window manager. {string} is
+# optional, and if omitted, blackbox will restart itself. If {string} is
+# specified, then a different window manager will be started.
+#
+# [style] (filename)
+# This will insert an item to reconfigure blackbox with the new style. This
+# change is saved when blackbox exits or restarts.
+#
+# [include] (filename)
+# This will read more menu items from the file "filename". The file cannot
+# contain a [begin] or [end], except for the [end] needed for submenus.
+#
+# [workspaces] (label)
+# This tells Blackbox to insert a "link" to the workspaces menu directly
+# into your menu.
+#
+# [config] (label)
+# This tells Blackbox to insert the ConfigMenu into your menu. The ConfigMenu
+# allows you to change several options found in your ~/.blackboxrc file on the
+# fly.
+#
+# example:
+
+[begin] (Blackbox)
+ [exec] (xterm) {xterm -ls}
+ [exec] (rxvt) {rxvt}
+
+ [exec] (LibreOffice) {soffice}
+ [exec] (XEmacs) {xemacs}
+ [exec] (XPDF) {xpdf}
+
+ [submenu] (Graphics)
+ [exec] (The GIMP) {gimp}
+ [exec] (Image Magick) {display}
+ [end]
+
+ [submenu] (GNUzilla and Mozilla libre suite)
+ [exec] (Icecat) {icecat}
+ [exec] (Iceweasel libre) {iceweasel}
+ [submenu] (Icedove libre)
+ [exec] (Icedove libre Mail) {icedove -mail}
+ [exec] (Icedove libre News) {icedove -news}
+ [exec] (Icedove libre Composer) {icedove -compose}
+ [end]
+ [end]
+
+ [submenu] (X Utilities)
+ [exec] (Xfontsel) {xfontsel}
+ [exec] (Xman) {xman}
+ [exec] (Xcalc) {xcalc}
+ [exec] (Xload) {xload}
+ [end]
+
+ [submenu] (Styles) {Choose a style...}
+ [stylesdir] (/usr/share/blackbox/styles)
+ [end]
+
+ [workspaces] (Workspace List)
+ [config] (Configuration)
+
+ [reconfig] (Reconfigure)
+ [restart] (Restart)
+ [submenu] (Others) {Other Window Managers}
+ [restart] (Start FVWM) {fvwm}
+ [restart] (Start WindowMaker) {wmaker}
+ [restart] (Start Afterstep) {afterstep}
+ [restart] (Start Enlightenment) {enlightenment}
+ [restart] (Start TWM) {twm}
+ [restart] (Start KWIM) {kwim}
+ [end]
+
+ [exit] (Exit)
+[end]
+
+# End of example menu.
+
diff --git a/libre/blackbox-libre/textpropertytostring-unconditional.patch b/libre/blackbox-libre/textpropertytostring-unconditional.patch
new file mode 100644
index 000000000..ed320388a
--- /dev/null
+++ b/libre/blackbox-libre/textpropertytostring-unconditional.patch
@@ -0,0 +1,28 @@
+Description: Declare bt::textPropertyToString unconditionally.
+Author: Jakub Wilk <jwilk@debian.org>
+Forwarded: no
+Bug-Debian: http://bugs.debian.org/614468
+Last-Update: 2011-03-12
+
+--- a/lib/Util.hh
++++ b/lib/Util.hh
+@@ -25,6 +25,8 @@
+ #ifndef __Util_hh
+ #define __Util_hh
+
++#include <X11/Xutil.h>
++
+ #include <limits.h>
+ #include <string>
+
+@@ -94,10 +96,8 @@
+
+ std::string tolower(const std::string &string);
+
+-#ifdef _XUTIL_H_
+ std::string textPropertyToString(::Display *display,
+ ::XTextProperty& text_prop);
+-#endif
+
+ } // namespace bt
+
diff --git a/libre/icedove-i18n/PKGBUILD b/libre/icedove-i18n/PKGBUILD
new file mode 100644
index 000000000..92e36ae37
--- /dev/null
+++ b/libre/icedove-i18n/PKGBUILD
@@ -0,0 +1,524 @@
+# $Id$
+# Maintainer: Márcio Silva <coadde@adinet.com.uy>
+# Maintainer: André Silva <andre.paulista@adinet.com.uy>
+
+pkgbase=icedove-i18n
+pkgver=11.0
+pkgname=('icedove-i18n-ar'
+ #'icedove-i18n-af'
+ 'icedove-i18n-be'
+ 'icedove-i18n-bn-bd'
+ 'icedove-i18n-bg'
+ 'icedove-i18n-br'
+ 'icedove-i18n-ca'
+ 'icedove-i18n-cs'
+ 'icedove-i18n-da'
+ 'icedove-i18n-de'
+ 'icedove-i18n-el'
+ 'icedove-i18n-en-gb'
+ 'icedove-i18n-es-ar'
+ 'icedove-i18n-es'
+ 'icedove-i18n-et'
+ 'icedove-i18n-eu'
+ 'icedove-i18n-fi'
+ 'icedove-i18n-fr'
+ 'icedove-i18n-fy-nl'
+ 'icedove-i18n-ga'
+ 'icedove-i18n-gd'
+ 'icedove-i18n-gl'
+ 'icedove-i18n-he'
+ 'icedove-i18n-hu'
+ 'icedove-i18n-id'
+ 'icedove-i18n-is'
+ 'icedove-i18n-it'
+ 'icedove-i18n-ja'
+ 'icedove-i18n-ko'
+ 'icedove-i18n-lt'
+ 'icedove-i18n-nb'
+ 'icedove-i18n-nl'
+ 'icedove-i18n-nn'
+ 'icedove-i18n-pa'
+ 'icedove-i18n-pl'
+ 'icedove-i18n-pt-br'
+ 'icedove-i18n-pt'
+ 'icedove-i18n-ro'
+ 'icedove-i18n-rm'
+ 'icedove-i18n-ru'
+ 'icedove-i18n-si'
+ 'icedove-i18n-sk'
+ 'icedove-i18n-sl'
+ 'icedove-i18n-sq'
+ 'icedove-i18n-sv'
+ 'icedove-i18n-ta-lk'
+ 'icedove-i18n-tr'
+ 'icedove-i18n-uk'
+ 'icedove-i18n-vi'
+ 'icedove-i18n-zh-cn'
+ 'icedove-i18n-zh-tw')
+
+pkgrel=2
+pkgdesc="Language pack for Debian Icedove"
+arch=('any')
+url="http://packages.debian.org/source/experimental/icedove"
+license=('MPL' 'GPL')
+depends=("icedove-libre>=$pkgver")
+_url=http://repo.parabolagnulinux.org/other/$pkgbase/releases/$pkgver
+source=(icedove-i18n-$pkgver-ar.xpi::$_url/ar.xpi
+# icedove-i18n-$pkgver-af.xpi::$_url/af.xpi
+ icedove-i18n-$pkgver-be.xpi::$_url/be.xpi
+ icedove-i18n-$pkgver-bn-BD.xpi::$_url/bn-BD.xpi
+ icedove-i18n-$pkgver-bg.xpi::$_url/bg.xpi
+ icedove-i18n-$pkgver-br.xpi::$_url/br.xpi
+ icedove-i18n-$pkgver-ca.xpi::$_url/ca.xpi
+ icedove-i18n-$pkgver-cs.xpi::$_url/cs.xpi
+ icedove-i18n-$pkgver-da.xpi::$_url/da.xpi
+ icedove-i18n-$pkgver-de.xpi::$_url/de.xpi
+ icedove-i18n-$pkgver-el.xpi::$_url/el.xpi
+ icedove-i18n-$pkgver-en-GB.xpi::$_url/en-GB.xpi
+ icedove-i18n-$pkgver-es-AR.xpi::$_url/es-AR.xpi
+ icedove-i18n-$pkgver-es-ES.xpi::$_url/es-ES.xpi
+ icedove-i18n-$pkgver-et.xpi::$_url/et.xpi
+ icedove-i18n-$pkgver-eu.xpi::$_url/eu.xpi
+ icedove-i18n-$pkgver-fi.xpi::$_url/fi.xpi
+ icedove-i18n-$pkgver-fr.xpi::$_url/fr.xpi
+ icedove-i18n-$pkgver-fy-NL.xpi::$_url/fy-NL.xpi
+ icedove-i18n-$pkgver-ga-IE.xpi::$_url/ga-IE.xpi
+ icedove-i18n-$pkgver-gd.xpi::$_url/gd.xpi
+ icedove-i18n-$pkgver-gl.xpi::$_url/gl.xpi
+ icedove-i18n-$pkgver-he.xpi::$_url/he.xpi
+ icedove-i18n-$pkgver-hu.xpi::$_url/hu.xpi
+ icedove-i18n-$pkgver-id.xpi::$_url/id.xpi
+ icedove-i18n-$pkgver-is.xpi::$_url/is.xpi
+ icedove-i18n-$pkgver-it.xpi::$_url/it.xpi
+ icedove-i18n-$pkgver-ja.xpi::$_url/ja.xpi
+ icedove-i18n-$pkgver-ko.xpi::$_url/ko.xpi
+ icedove-i18n-$pkgver-lt.xpi::$_url/lt.xpi
+ icedove-i18n-$pkgver-nb-NO.xpi::$_url/nb-NO.xpi
+ icedove-i18n-$pkgver-nl.xpi::$_url/nl.xpi
+ icedove-i18n-$pkgver-nn-NO.xpi::$_url/nn-NO.xpi
+ icedove-i18n-$pkgver-pa-IN.xpi::$_url/pa-IN.xpi
+ icedove-i18n-$pkgver-pl.xpi::$_url/pl.xpi
+ icedove-i18n-$pkgver-pt-BR.xpi::$_url/pt-BR.xpi
+ icedove-i18n-$pkgver-pt-PT.xpi::$_url/pt-PT.xpi
+ icedove-i18n-$pkgver-rm.xpi::$_url/rm.xpi
+ icedove-i18n-$pkgver-ro.xpi::$_url/ro.xpi
+ icedove-i18n-$pkgver-ru.xpi::$_url/ru.xpi
+ icedove-i18n-$pkgver-si.xpi::$_url/si.xpi
+ icedove-i18n-$pkgver-sk.xpi::$_url/sk.xpi
+ icedove-i18n-$pkgver-sl.xpi::$_url/sl.xpi
+ icedove-i18n-$pkgver-sq.xpi::$_url/sq.xpi
+ icedove-i18n-$pkgver-sv-SE.xpi::$_url/sv-SE.xpi
+ icedove-i18n-$pkgver-ta-LK.xpi::$_url/ta-LK.xpi
+ icedove-i18n-$pkgver-tr.xpi::$_url/tr.xpi
+ icedove-i18n-$pkgver-uk.xpi::$_url/uk.xpi
+ icedove-i18n-$pkgver-vi.xpi::$_url/vi.xpi
+ icedove-i18n-$pkgver-zh-CN.xpi::$_url/zh-CN.xpi
+ icedove-i18n-$pkgver-zh-TW.xpi::$_url/zh-TW.xpi)
+
+# Don't extract anything
+noextract=(${source[@]##*/})
+
+_path="/usr/lib/icedove/extensions/"
+
+package_icedove-i18n-ar() {
+ pkgdesc="Arabic language pack for Debian Icedove"
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-ar.xpi "${pkgdir}/$_path/langpack-ar@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-af() {
+ pkgdesc="Afrikaans (South Africa) language pack for Debian Icedove"
+ replaces=icedove-af
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-af.xpi "${pkgdir}/$_path/langpack-af@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-be() {
+ pkgdesc="Belarusian language pack for Debian Icedove"
+ replaces=icedove-be
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-be.xpi "${pkgdir}/$_path/langpack-be@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-bn-bd() {
+ pkgdesc="Bangladesh language pack for Debian Icedove"
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-bn-BD.xpi "${pkgdir}/$_path/langpack-bn-BE@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-bg() {
+ pkgdesc="Bulgarian language pack for Debian Icedove"
+ replaces=icedove-bg
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-bg.xpi "${pkgdir}/$_path/langpack-bg@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-br() {
+ pkgdesc="Breton language pack for Debian Icedove"
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-br.xpi "${pkgdir}/$_path/langpack-br@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-ca() {
+ pkgdesc="Catalan language pack for Debian Icedove"
+ replaces=icedove-ca
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-ca.xpi "${pkgdir}/$_path/langpack-ca@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-cs() {
+ pkgdesc="Czech language pack for Debian Icedove"
+ replaces=icedove-cs
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-cs.xpi "${pkgdir}/$_path/langpack-cs@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-da() {
+ pkgdesc="Danish language pack for Debian Icedove"
+ replaces=icedove-da
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-da.xpi "${pkgdir}/$_path/langpack-da@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-de() {
+ pkgdesc="German language pack for Debian Icedove"
+ replaces=icedove-de
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-de.xpi "${pkgdir}/$_path/langpack-de@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-el() {
+ pkgdesc="Greek language pack for Debian Icedove"
+ replaces=icedove-el
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-el.xpi "${pkgdir}/$_path/langpack-el@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-en-gb() {
+ pkgdesc="English (GB) language pack for Debian Icedove"
+ replaces=icedove-en-gb
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-en-GB.xpi "${pkgdir}/$_path/langpack-en-GB@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-es-ar() {
+ pkgdesc="Spanish (AR) language pack for Debian Icedove"
+ replaces=icedove-es-ar
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-es-AR.xpi "${pkgdir}/$_path/langpack-es-AR@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-es() {
+ pkgdesc="Spanish language pack for Debian Icedove"
+ replaces=icedove-es
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-es-ES.xpi "${pkgdir}/$_path/langpack-es-ES@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-et() {
+ pkgdesc="Estonian language pack for Debian Icedove"
+ replaces=icedove-et
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-et.xpi "${pkgdir}/$_path/langpack-et@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-eu() {
+ pkgdesc="Basque language pack for Debian Icedove"
+ replaces=icedove-eu
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-eu.xpi "${pkgdir}/$_path/langpack-eu@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-fi() {
+ pkgdesc="Finnish language pack for Debian Icedove"
+ replaces=icedove-fi
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-fi.xpi "${pkgdir}/$_path/langpack-fi@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-fr() {
+ pkgdesc="French language pack for Debian Icedove"
+ replaces=icedove-fr
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-fr.xpi "${pkgdir}/$_path/langpack-fr@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-fy-nl(){
+ pkgdesc="Frysk (fy) language pack for Debian Icedove"
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-fy-NL.xpi "${pkgdir}/$_path/langpack-fy-NL@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-ga() {
+ pkgdesc="Irish language pack for Debian Icedove"
+ replaces=icedove-ga
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-ga-IE.xpi "${pkgdir}/$_path/langpack-ga-IE@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-gd() {
+ pkgdesc="Scottish Gaelic language pack for Debian Icedove"
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-gd.xpi "${pkgdir}/$_path/langpack-gd@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-gl() {
+ pkgdesc="Galician language pack for Debian Icedove"
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-gl.xpi "${pkgdir}/$_path/langpack-gl@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-he() {
+ pkgdesc="Hebrew language pack for Debian Icedove"
+ replaces=icedove-he
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-he.xpi "${pkgdir}/$_path/langpack-he@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-hu() {
+ pkgdesc="Hungarian language pack for Debian Icedove"
+ replaces=icedove-hu
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-hu.xpi "${pkgdir}/$_path/langpack-hu@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-id(){
+ pkgdesc="Indonesian language pack for Debian Icedove"
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-id.xpi "${pkgdir}/$_path/langpack-id@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-is() {
+ pkgdesc="Icelandic Gaelic language pack for Debian Icedove"
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-is.xpi "${pkgdir}/$_path/langpack-is@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-it() {
+ pkgdesc="Italian language pack for Debian Icedove"
+ replaces=icedove-it
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-it.xpi "${pkgdir}/$_path/langpack-it@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-ja() {
+ pkgdesc="Japanese language pack for Debian Icedove"
+ replaces=icedove-ja
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-ja.xpi "${pkgdir}/$_path/langpack-ja@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-ko() {
+ pkgdesc="Korean language pack for Debian Icedove"
+ replaces=icedove-ko
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-ko.xpi "${pkgdir}/$_path/langpack-ko@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-lt() {
+ pkgdesc="Lithuanian language pack for Debian Icedove"
+ replaces=icedove-lt
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-lt.xpi "${pkgdir}/$_path/langpack-lt@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-nb() {
+ pkgdesc="Norwegian (Bokmal) language pack for Debian Icedove"
+ replaces=icedove-nb
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-nb-NO.xpi "${pkgdir}/$_path/langpack-nb-NO@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-mk() {
+ pkgdesc="Macedonian language pack for Debian Icedove"
+ replaces=icedove-mk
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-mk.xpi "${pkgdir}/$_path/langpack-mk@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-nl() {
+ pkgdesc="Dutch language pack for Debian Icedove"
+ replaces=icedove-nl
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-nl.xpi "${pkgdir}/$_path/langpack-nl@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-nn() {
+ pkgdesc="Norwegian (Nynorsk) language pack for Debian Icedove"
+ replaces=icedove-nn
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-nn-NO.xpi "${pkgdir}/$_path/langpack-nn-NO@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-pa() {
+ pkgdesc="Punjabi language pack for Debian Icedove"
+ replaces=icedove-pa
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-pa-IN.xpi "${pkgdir}/$_path/langpack-pa-IN@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-pl() {
+ pkgdesc="Polish language pack for Debian Icedove"
+ replaces=icedove-pl
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-pl.xpi "${pkgdir}/$_path/langpack-pl@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-pt-br() {
+ pkgdesc="Brazilian Portuguese language pack for Debian Icedove"
+ replaces=icedove-pt-br
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-pt-BR.xpi "${pkgdir}/$_path/langpack-pt-BR@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-pt() {
+ pkgdesc="Portuguese language pack for Debian Icedove"
+ replaces=icedove-pt
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-pt-PT.xpi "${pkgdir}/$_path/langpack-pt-PT@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-ro() {
+ pkgdesc="Romanian language pack for Debian Icedove"
+ replaces=icedove-ro
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-ro.xpi "${pkgdir}/$_path/langpack-ro@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-rm() {
+ pkgdesc="Romansh language pack for Debian Icedove"
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-rm.xpi "${pkgdir}/$_path/langpack-rm@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-ru() {
+ pkgdesc="Russian language pack for Debian Icedove"
+ replaces=icedove-ru
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-ru.xpi "${pkgdir}/$_path/langpack-ru@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-si() {
+ pkgdesc="Sinhalese language pack for Debian Icedove"
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-si.xpi "${pkgdir}/$_path/langpack-si@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-sk() {
+ pkgdesc="Slovak language pack for Debian Icedove"
+ replaces=icedove-sk
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-sk.xpi "${pkgdir}/$_path/langpack-sk@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-sl() {
+ pkgdesc="Slovenian language pack for Debian Icedove"
+ replaces=icedove-sl
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-sl.xpi "${pkgdir}/$_path/langpack-sl@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-sq() {
+ pkgdesc="Albanian language pack for Debian Icedove"
+ replaces=icedove-sl
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-sq.xpi "${pkgdir}/$_path/langpack-sq@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-sv() {
+ pkgdesc="Swedish language pack for Debian Icedove"
+ replaces=icedove-sv
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-sv-SE.xpi "${pkgdir}/$_path/langpack-sv-SE@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-ta-lk() {
+ pkgdesc=" Tamil (Sri Lanka) language pack for Debian Icedove"
+ replaces=icedove-sv
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-ta-LK.xpi "${pkgdir}/$_path/langpack-ta-LK@icedove.mozilla.org.xpi"
+}
+
+
+package_icedove-i18n-tr() {
+ pkgdesc="Turkish language pack for Debian Icedove"
+ replaces=icedove-tr
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-tr.xpi "${pkgdir}/$_path/langpack-tr@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-uk() {
+ pkgdesc="Ukrainian language pack for Debian Icedove"
+ replaces=icedove-uk
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-uk.xpi "${pkgdir}/$_path/langpack-uk@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-vi() {
+ pkgdesc="Vietnamese language pack for Debian Icedove"
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-vi.xpi "${pkgdir}/$_path/langpack-vi@icedove.mozilla.org.xpi"
+}
+package_icedove-i18n-zh-cn() {
+ pkgdesc="Chinese (simplified) language pack for Debian Icedove"
+ replaces=icedove-zh-cn
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-zh-CN.xpi "${pkgdir}/$_path/langpack-zh-CN@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-zh-tw() {
+ pkgdesc="Chinese (traditional) language pack for Debian Icedove"
+ replaces=icedove-zh-tw
+ cd ${srcdir}
+ install -Dm644 icedove-i18n-$pkgver-zh-TW.xpi "${pkgdir}/$_path/langpack-zh-TW@icedove.mozilla.org.xpi"
+}
+md5sums=('43ea2aeec780c591af577215a8f928ae'
+ '0dc7a6ca6d308f4135ce135b87b19823'
+ '343f4b73820d9906205606833c48ddd1'
+ '56f7a9e47037c82fda2d97efcac6e2fa'
+ '7da75017f43c073b7f7e413d41794a37'
+ '07c7efe6d9400b17ef572c5769f25ccd'
+ '8dba7a9ff2c2b55908bb32b947fab75e'
+ 'e262a088217fceb213a8890124e85db6'
+ '9c2355ff0ca0b640e50f7a24ec5d9f6e'
+ '628c84299fc7b76a5f084905518b8f73'
+ 'a26276362394dedbbea98356d573f2f1'
+ '06c0ed88ff10c296f2066a7a84cc33d6'
+ '2a03c69e72bbe08e8938177908a3ab17'
+ 'e80febfd74cc81bc9e5cb9752c0b3b95'
+ '4ad12b69da9910e1c0122aa76c3513d5'
+ '5e9c7ab66141389b9300f8db28852a5a'
+ 'c3390ce9a18b979fe148652fc76ae311'
+ '85c17fe5018696d6999e7fed8c447edc'
+ 'a049d7cf3b9c9ef5ece4afced3b56f9d'
+ 'c483f4da184315444d1d094fd75b150a'
+ 'e57eba03836a14e8915a816a7655fb46'
+ 'c4d4caf6baf85ca22ed1ea19a3630d67'
+ 'e16465d4d1234fe7362b5ba2f73682f9'
+ '36fb64f2541e5a7ba0640931e8ee2be1'
+ 'd03b2ddcfc3cf28e1725df4972e2abfe'
+ 'f5fcf08545542a752b7355d1dd692c2d'
+ '842c4ce562c0beba6713424551d5d748'
+ '004c5c6a1a5bb575827fe626e0b804cc'
+ '0d810b4347b21d43d8b38fd077a63f9d'
+ 'e03ac78e858e0d345512bcc24f180838'
+ 'e17ab7b097085b9462d38a7d8aa4d027'
+ 'f58b78d51281acf36c9755abb6bbde14'
+ '086270a5669cb5db0a21bf5ca1c7620c'
+ 'c972a8eaf135cfeb9509603ae1d392d3'
+ 'c4eb654adce293e9ef6fe2cb2b1078bc'
+ 'd120891141f898644a93bb2317def809'
+ '78c32f4f1c814130f9cddce60b17a089'
+ '055d77477e07632dcb06a08d51609514'
+ '9b28657c99b9193cef3dbf959ed1849c'
+ '5c6ca9cd178df6a6fca1f638a0845b0a'
+ '277cf819683b9a9016b322a77a3236fa'
+ '7104f5238b221ea4dc502c14eae12ea1'
+ 'a29ed3f28bab6a970c15378505b352cc'
+ '5774b9adccafa40221e6eb3011de5db0'
+ '5419f4456c65703ebeb9d4befc0c2d2c'
+ '2423b38ceb1022a6064070a3f7f5600f'
+ '5de7fd60a6a74bf23066a6cfe9dee2d6'
+ '47a23af3184ee6999433a9f59da3a67a'
+ 'd3242d7e7c35df585e55918ed6556f16'
+ 'd0f7e27dfdc4aa14398e8422e3135a4a')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
new file mode 100644
index 000000000..8600db7aa
--- /dev/null
+++ b/libre/icedove-libre/PKGBUILD
@@ -0,0 +1,96 @@
+# Maintainer : Márcio Silva <coadde@adinet.com.uy>
+# Maintainer : André Silva <andre.paulista@adinet.com.uy>
+
+# We're getting this from Debian Experimental
+_debname=icedove
+_debver=11.0
+_debrel=1
+_debrepo=http://ftp.debian.org/debian/pool/main/
+debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+
+_pkgname=${_debname}
+pkgname=${_debname}-libre
+pkgver=${_debver}
+pkgrel=2
+pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla thunderbird."
+arch=('i586' 'i686' 'x86_64' 'mips64el')
+license=('GPL2' 'MPL' 'LGPL')
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification')
+makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+optdepends=('libcanberra: for sound support')
+url="http://packages.debian.org/source/experimental/${_pkgname}"
+install=$_pkgname.install
+source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
+ "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+ mozconfig
+ channel-prefs.js
+ vendor.js
+ gcc47.patch
+ clrf.patch
+ makefile.patch
+ searchplugins-libre.patch
+ ${_pkgname}.desktop)
+md5sums=('0d4aaf892cd1cbf9bda38928947025fe'
+ 'd4401c080fe5190e8bb1326f10808231'
+ 'd6d58d3104a44624e0a3d227cdf1c211'
+ '476ec205162340fb0679f522c9d31c3b'
+ '4eecc4fc5aafaf0da651a09eadc90bee'
+ '94d5cd599ccc4438f192d8daabf98b6a'
+ 'c395d443a8c4c16880c7322bcf174743'
+ 'c4ed43e85945e180a89cce03e45ec62c'
+ '6a1d132b0275876678cb0b08c527805a'
+ 'e785e0c267f4435ae1a9aa0b03bcacfb')
+
+build() {
+ export QUILT_PATCHES=debian/patches
+ export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
+ export QUILT_DIFF_ARGS='--no-timestamps'
+ export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}"
+ export PYTHON="/usr/bin/python2"
+ export DEBIAN_BUILD="comm-release"
+ mv debian "${srcdir}/${DEBIAN_BUILD}"
+ cd "${srcdir}/${DEBIAN_BUILD}"
+ mv debian/${_pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}"
+ cp -a debian/app-icons/${_pkgname}big.svg debian/app-icons/${_pkgname}_icon.svg
+ for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
+ install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/mailicon${i/x*/}.png"
+ done
+ for i in 48x48 64x64; do
+ install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png"
+ done
+ quilt push -av
+
+ patch -Np1 -i "$srcdir/gcc47.patch"
+ patch -Np1 -i "$srcdir/clrf.patch"
+ patch -Np1 -i "$srcdir/makefile.patch"
+
+ # Removing non-free search plugins replacing them with duckduckgo and identi.ca
+ patch -Np1 -i "$srcdir/searchplugins-libre.patch"
+
+ cp "${srcdir}/mozconfig" .mozconfig
+ make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
+}
+
+package() {
+ cd "${srcdir}/${DEBIAN_BUILD}"
+
+ make -j1 -f client.mk DESTDIR="${pkgdir}" install
+
+ install -m644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref"
+ # Recommend free addons
+ install -m644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref"
+
+ for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do
+ install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png"
+ done
+ install -Dm644 "debian/app-icons/${_pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
+
+ install -Dm644 "$srcdir/${_pkgname}.desktop" \
+ "$pkgdir/usr/share/applications/${_pkgname}.desktop"
+
+ 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"
+ # We don't want the development stuff
+ rm -r "${pkgdir}"/usr/{include,lib/$_pkgname-devel,share/idl}
+}
diff --git a/libre-testing/icedove-libre/channel-prefs.js b/libre/icedove-libre/channel-prefs.js
index 13b1ba388..13b1ba388 100644
--- a/libre-testing/icedove-libre/channel-prefs.js
+++ b/libre/icedove-libre/channel-prefs.js
diff --git a/libre/icedove-libre/clrf.patch b/libre/icedove-libre/clrf.patch
new file mode 100644
index 000000000..375708ac4
--- /dev/null
+++ b/libre/icedove-libre/clrf.patch
@@ -0,0 +1,260 @@
+diff -Nur comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
+--- comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-03-12 23:37:12.000000000 -0300
++++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-05-07 12:33:58.517612453 -0300
+@@ -688,7 +688,7 @@
+ PL_strcat(encoding, "{");
+ lengthStr.AppendInt((PRInt32) strlen(value));
+ PL_strcat(encoding, lengthStr.get());
+- PL_strcat(encoding, "}"CRLF);
++ PL_strcat(encoding, "}" CRLF);
+ PL_strcat(encoding, value);
+ return NS_OK;
+ }
+diff -Nur comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
+--- comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-03-12 23:37:13.000000000 -0300
++++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-05-07 12:41:08.003264793 -0300
+@@ -753,7 +753,7 @@
+ }
+ }
+ }
+-#define EXTRA_KEYWORD_HDR " "MSG_LINEBREAK
++#define EXTRA_KEYWORD_HDR " " MSG_LINEBREAK
+
+ // if status offset isn't in the first block, this code won't work. There's no good reason
+ // for the status offset not to be at the beginning of the message anyway.
+@@ -1203,7 +1203,7 @@
+ // check if there's an envelope header; if not, write one.
+ if (strncmp(m_dataBuffer, "From ", 5))
+ {
+- m_fileStream->Write("From "CRLF, 7, &bytesWritten);
++ m_fileStream->Write("From " CRLF, 7, &bytesWritten);
+ m_offlineMsgSize += bytesWritten;
+ }
+ }
+diff -Nur comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
+--- comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp 2012-03-12 23:37:13.000000000 -0300
++++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-05-07 12:44:43.127347489 -0300
+@@ -1722,7 +1722,7 @@
+ {
+ m_sendDone = PR_TRUE;
+ nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
+- SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server.
++ SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server.
+ m_nextState = SMTP_RESPONSE;
+ m_nextStateAfterResponse = SMTP_DONE;
+ return(0);
+@@ -1969,7 +1969,7 @@
+ {
+ nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
+ // send a quit command to close the connection with the server.
+- if (SendData(url, "QUIT"CRLF) == NS_OK)
++ if (SendData(url, "QUIT" CRLF) == NS_OK)
+ {
+ m_nextState = SMTP_RESPONSE;
+ m_nextStateAfterResponse = SMTP_ERROR_DONE;
+diff -Nur comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp comm-release/mailnews/imap/src/nsImapMailFolder.cpp
+--- comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp 2012-03-12 23:37:13.000000000 -0300
++++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-05-07 12:48:29.417179064 -0300
+@@ -8298,7 +8298,7 @@
+ bool needMoreData = false;
+ char * newLine = nsnull;
+ PRUint32 numBytesInLine = 0;
+- const char *envelope = "From "CRLF;
++ const char *envelope = "From " CRLF;
+ offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
+ fileSize += bytesWritten;
+ do
+diff -Nur comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp comm-release/mailnews/imap/src/nsImapProtocol.cpp
+--- comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp 2012-03-12 23:37:13.000000000 -0300
++++ comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-05-07 15:45:58.551202719 -0300
+@@ -1410,7 +1410,7 @@
+ {
+ // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
+ nsCAutoString commandBuffer(GetServerCommandTag());
+- commandBuffer.Append(" IDLE"CRLF);
++ commandBuffer.Append(" IDLE" CRLF);
+
+ do
+ {
+@@ -3290,7 +3290,7 @@
+ commandString.Append(messageIds);
+ commandString.Append(" (");
+ commandString.Append(attribute);
+- commandString.Append(")"CRLF);
++ commandString.Append(")" CRLF);
+ nsresult rv = SendData(commandString.get());
+
+ if (NS_SUCCEEDED(rv))
+@@ -5283,7 +5283,7 @@
+
+ IncrementCommandTagNumber();
+ nsCAutoString command(GetServerCommandTag());
+- command.Append(" expunge"CRLF);
++ command.Append(" expunge" CRLF);
+
+ nsresult rv = SendData(command.get());
+ if (NS_SUCCEEDED(rv))
+@@ -5359,7 +5359,7 @@
+ command.Append(gAppName);
+ command.Append("\" \"version\" \"");
+ command.Append(gAppVersion);
+- command.Append("\")"CRLF);
++ command.Append("\")" CRLF);
+
+ nsresult rv = SendData(command.get());
+ if (NS_SUCCEEDED(rv))
+@@ -5816,7 +5816,7 @@
+ nsCAutoString correctedPassword;
+ EscapeUserNamePasswordString(password.get(), &correctedPassword);
+ command.Append(correctedPassword);
+- command.Append("\""CRLF);
++ command.Append("\"" CRLF);
+ rv = SendData(command.get(), PR_TRUE /* suppress logging */);
+ NS_ENSURE_SUCCESS(rv, rv);
+ ParseIMAPandCheckForNewMail();
+@@ -7446,7 +7446,7 @@
+ nsCString command(GetServerCommandTag());
+ command += " create \"";
+ command += escapedName;
+- command += "\""CRLF;
++ command += "\"" CRLF;
+
+ nsresult rv = SendData(command.get());
+ if(NS_SUCCEEDED(rv))
+@@ -7549,7 +7549,7 @@
+ nsCString command (GetServerCommandTag());
+ command += " lsub \"\" \"";
+ command += escapedPattern;
+- command += "\""CRLF;
++ command += "\"" CRLF;
+
+ PR_Free(boxnameWithOnlineDirectory);
+
+@@ -7578,7 +7578,7 @@
+ command += useXLIST ?
+ " xlist \"\" \"" : " list \"\" \"";
+ command += escapedPattern;
+- command += "\""CRLF;
++ command += "\"" CRLF;
+
+ PR_Free(boxnameWithOnlineDirectory);
+
+@@ -7599,7 +7599,7 @@
+ nsCString command (GetServerCommandTag());
+ command += " subscribe \"";
+ command += escapedName;
+- command += "\""CRLF;
++ command += "\"" CRLF;
+
+ nsresult rv = SendData(command.get());
+ if (NS_SUCCEEDED(rv))
+@@ -7617,7 +7617,7 @@
+ nsCString command (GetServerCommandTag());
+ command += " unsubscribe \"";
+ command += escapedName;
+- command += "\""CRLF;
++ command += "\"" CRLF;
+
+ nsresult rv = SendData(command.get());
+ if (NS_SUCCEEDED(rv))
+@@ -7631,7 +7631,7 @@
+ if (m_urlInProgress)
+ return;
+ nsCAutoString command (GetServerCommandTag());
+- command += " IDLE"CRLF;
++ command += " IDLE" CRLF;
+ nsresult rv = SendData(command.get());
+ if (NS_SUCCEEDED(rv))
+ {
+@@ -7658,7 +7658,7 @@
+ nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
+ if (asyncInputStream)
+ asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
+- nsresult rv = SendData("DONE"CRLF);
++ nsresult rv = SendData("DONE" CRLF);
+ // set a short timeout if we don't want to wait for a response
+ if (m_transport && !waitForResponse)
+ m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
+@@ -7727,8 +7727,8 @@
+ PRUint32 msgsHandled = 0;
+ const char *formatString;
+ formatString = (idsAreUid)
+- ? "%s uid store %s %s"CRLF
+- : "%s store %s %s"CRLF;
++ ? "%s uid store %s %s" CRLF
++ : "%s store %s %s" CRLF;
+
+ do
+ {
+diff -Nur comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
+--- comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-03-12 23:37:13.000000000 -0300
++++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-05-07 12:57:22.050615120 -0300
+@@ -185,7 +185,7 @@
+
+ NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' &&
+ *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string");
+- bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
++ bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
+ if (sendingIdleDone)
+ fWaitingForMoreClientInput = PR_FALSE;
+
+diff -Nur comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp comm-release/mailnews/local/src/nsPop3Protocol.cpp
+--- comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp 2012-03-12 23:37:13.000000000 -0300
++++ comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-05-07 12:59:45.857182813 -0300
+@@ -2483,7 +2483,7 @@
+ return(MK_OUT_OF_MEMORY);
+ m_pop3ConData->next_state_after_response = POP3_GET_LIST;
+ m_listpos = 0;
+- return SendData(m_url, "LIST"CRLF);
++ return SendData(m_url, "LIST" CRLF);
+ }
+
+
+diff -Nur comm-release.orig/mailnews/mime/src/mimedrft.cpp comm-release/mailnews/mime/src/mimedrft.cpp
+--- comm-release.orig/mailnews/mime/src/mimedrft.cpp 2012-03-12 23:37:13.000000000 -0300
++++ comm-release/mailnews/mime/src/mimedrft.cpp 2012-05-07 13:01:42.912022177 -0300
+@@ -1473,7 +1473,7 @@
+ *newbody = 0;
+ PL_strcatn(newbody, newbodylen, "<PRE>");
+ PL_strcatn(newbody, newbodylen, body);
+- PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
++ PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
+ PR_Free(body);
+ body = newbody;
+ }
+diff -Nur comm-release.orig/mailnews/mime/src/mimemult.cpp comm-release/mailnews/mime/src/mimemult.cpp
+--- comm-release.orig/mailnews/mime/src/mimemult.cpp 2012-03-12 23:37:13.000000000 -0300
++++ comm-release/mailnews/mime/src/mimemult.cpp 2012-05-07 13:04:41.511265477 -0300
+@@ -280,7 +280,7 @@
+ MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
+ MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
+ MimeWriteAString(obj, fileName);
+- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
++ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
+ MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
+ MimeWriteAString(obj, obj->options->state->detachedFilePath);
+ MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
+@@ -293,10 +293,10 @@
+ status = MimeWriteAString(obj, header);
+ if (status < 0)
+ return status;
+- status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK));
++ status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
+ MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: "));
+ MimeWriteAString(obj, fileName);
+- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
++ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\""));
+ }
+ nsCString result;
+ char timeBuffer[128];
+@@ -306,8 +306,8 @@
+ "%a %b %d %H:%M:%S %Y",
+ &now);
+ MimeWriteAString(obj, nsDependentCString(timeBuffer));
+- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
+- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK));
++ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
++ MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK));
+ MimeHeaders_write_raw_headers(mult->hdrs, obj->options, PR_FALSE);
+ }
+ PRInt32 old_nchildren = container->nchildren;
diff --git a/libre/icedove-libre/gcc47.patch b/libre/icedove-libre/gcc47.patch
new file mode 100644
index 000000000..115d65131
--- /dev/null
+++ b/libre/icedove-libre/gcc47.patch
@@ -0,0 +1,63 @@
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc comm-release/mozilla/ipc/chromium/src/base/file_util.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:38:11.474783536 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:43:29.218995578 +0000
+@@ -8,7 +8,7 @@
+ #include <io.h>
+ #endif
+ #include <stdio.h>
+-#if defined(ANDROID)
++#if defined(ANDROID) || defined(OS_POSIX)
+ #include <unistd.h>
+ #endif
+
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-03 18:38:11.381450924 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-03 18:43:29.218995578 +0000
+@@ -5,6 +5,9 @@
+ #include "base/file_util.h"
+
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include <string>
+ #include <vector>
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-03 18:38:11.438117153 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-03 18:43:29.218995578 +0000
+@@ -6,6 +6,9 @@
+
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-03 18:38:11.418117308 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-03 18:43:29.218995578 +0000
+@@ -14,6 +14,8 @@
+ #include <time.h>
+ #endif
+
++#include <unistd.h>
++
+ #include <limits>
+
+ #include "base/basictypes.h"
+diff -Nur comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in comm-release/mozilla/toolkit/crashreporter/client/Makefile.in
+--- comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:38:56.101105510 +0000
++++ comm-release/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:43:29.218995578 +0000
+@@ -69,6 +69,9 @@
+ $(STDCXX_COMPAT) \
+ $(NULL)
+
++# Needed for moz_free
++LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
++
+ ifeq ($(OS_ARCH),WINNT)
+ CPPSRCS += crashreporter_win.cpp
+ LIBS += \
diff --git a/libre/icedove-libre/icedove.desktop b/libre/icedove-libre/icedove.desktop
new file mode 100644
index 000000000..ef2cd76e9
--- /dev/null
+++ b/libre/icedove-libre/icedove.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=Icedove
+Comment=Mail & News Reader
+GenericName=Mail Client & News Reader
+Exec=icedove %u
+TryExec=icedove
+Icon=icedove
+Terminal=false
+Type=Application
+Categories=Network;Email;
+MimeType=message/rfc822;x-scheme-handler/mailto;
+StartupNotify=true
diff --git a/libre-testing/icedove-libre/icedove.install b/libre/icedove-libre/icedove.install
index 4d4a283db..4d4a283db 100644
--- a/libre-testing/icedove-libre/icedove.install
+++ b/libre/icedove-libre/icedove.install
diff --git a/libre/icedove-libre/makefile.patch b/libre/icedove-libre/makefile.patch
new file mode 100644
index 000000000..8f8137bec
--- /dev/null
+++ b/libre/icedove-libre/makefile.patch
@@ -0,0 +1,46 @@
+diff -Nur comm-release.orig/mail/branding/icedove/Makefile.in comm-release/mail/branding/icedove/Makefile.in
+--- comm-release.orig/mail/branding/icedove/Makefile.in 2012-04-18 15:42:15.000000000 -0300
++++ comm-release/mail/branding/icedove/Makefile.in 2012-05-08 04:03:25.680643202 -0300
+@@ -38,11 +38,11 @@
+ # Branding Makefile for Icedove branding
+
+ DEPTH = ../../..
+-topsrcdir = ../../../
++topsrcdir = @top_srcdir@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+
+-include $(topsrcdir)/config/autoconf.mk
++include $(DEPTH)/config/autoconf.mk
+
+ DIRS = \
+ locales \
+@@ -50,7 +50,7 @@
+
+ PREF_JS_EXPORTS += $(srcdir)/thunderbird-branding.js
+
+-include $(DEPTH)/config/rules.mk
++include $(topsrcdir)/config/rules.mk
+
+ export::
+ $(NSINSTALL) -D $(DIST)/branding
+diff -Nur comm-release.orig/mail/branding/icedove/locales/Makefile.in comm-release/mail/branding/icedove/locales/Makefile.in
+--- comm-release.orig/mail/branding/icedove/locales/Makefile.in 2012-04-18 15:42:15.000000000 -0300
++++ comm-release/mail/branding/icedove/locales/Makefile.in 2012-05-08 05:32:57.481620942 -0300
+@@ -36,13 +36,13 @@
+ # ***** END LICENSE BLOCK *****
+
+ DEPTH = ../../../..
+-topsrcdir = ../../../..
++topsrcdir = @top_srcdir@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ relativesrcdir = mail/branding/icedove/locales
+
+-include $(topsrcdir)/config/autoconf.mk
++include $(DEPTH)/config/autoconf.mk
+
+ DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
+
+-include $(DEPTH)/config/rules.mk
++include $(topsrcdir)/config/rules.mk
diff --git a/libre-testing/icedove-libre/mozconfig b/libre/icedove-libre/mozconfig
index 4ad7c655c..58f8ce24f 100644
--- a/libre-testing/icedove-libre/mozconfig
+++ b/libre/icedove-libre/mozconfig
@@ -1,3 +1,6 @@
+mk_add_options MOZ_CO_PROJECT=mail
+ac_add_options --enable-application=mail
+
ac_add_options --prefix=/usr
ac_add_options --libdir=/usr/lib
@@ -33,15 +36,29 @@ ac_add_options --enable-optimize
export MOZILLA_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
-
-# Icedove
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=debian/icedove-branding
# Parabola
-ac_add_options --disable-safe-browsing
export BUILD_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
-# Build-generated
+# Debian
+export MAIL_PKG_SHARED=1
+mk_add_options MAIL_PKG_SHARED=1
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=mail/branding/icedove
+ac_add_options --enable-extensions=default
+ac_add_options --with-default-mozilla-five-home=/usr/lib/icedove
+ac_add_options --disable-javaxpcom
+ac_add_options --disable-elf-dynstr-gc
+ac_add_options --disable-strip
+ac_add_options --disable-strip-libs
+ac_add_options --disable-install-strip
+ac_add_options --enable-pango
+ac_add_options --enable-xft
+ac_add_options --enable-xinerama
+ac_add_options --enable-svg
+ac_add_options --enable-svg-renderer=cairo
+ac_add_options --enable-canvas
+ac_add_options --enable-crypto
+ac_add_options --enable-shared-js
+ac_add_options --enable-readline
diff --git a/libre-testing/icedove-libre/searchplugins-libre.patch b/libre/icedove-libre/searchplugins-libre.patch
index 19c1ea5ab..e466a9eb3 100644
--- a/libre-testing/icedove-libre/searchplugins-libre.patch
+++ b/libre/icedove-libre/searchplugins-libre.patch
@@ -1,18 +1,17 @@
---- mail.orig/locales/en-US/searchplugins/list.txt 2012-03-27 15:56:00.000000000 -0300
-+++ mail/locales/en-US/searchplugins/list.txt 2012-04-13 05:43:25.227475353 -0300
-@@ -1,8 +1,5 @@
+--- comm-release.orig/mail/locales/en-US/searchplugins/list.txt 2012-03-27 15:56:00.000000000 -0300
++++ comm-release/mail/locales/en-US/searchplugins/list.txt 2012-04-13 05:43:25.227475353 -0300
+@@ -1,7 +1,5 @@
-amazondotcom
-aol-web-search
-bing
+duckduckgo-ssl
eBay
--google
-twitter
+identica-notice-search
+identica-people-search
wikipedia
-yahoo
---- mail/locales/en-US/searchplugins/amazondotcom.xml 2012-03-27 15:56:00.000000000 -0300
+--- comm-release.orig/mail/locales/en-US/searchplugins/amazondotcom.xml 2012-03-27 15:56:00.000000000 -0300
+++ /dev/null 2012-04-12 23:52:53.981159155 -0300
@@ -1,11 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
@@ -26,7 +25,7 @@
-</Url>
-<SearchForm>http://www.amazon.com/</SearchForm>
-</SearchPlugin>
---- mail/locales/en-US/searchplugins/aol-web-search.xml 2012-03-27 15:56:00.000000000 -0300
+--- comm-release.orig/mail/locales/en-US/searchplugins/aol-web-search.xml 2012-03-27 15:56:00.000000000 -0300
+++ /dev/null 2012-04-12 23:52:53.981159155 -0300
@@ -1,10 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
@@ -39,9 +38,9 @@
- <os:Param name="query" value="{searchTerms}"/>
-</os:Url>
-</SearchPlugin>
---- mail/locales/en-US/searchplugins/bing.xml 2012-03-06 13:44:50.000000000 -0200
-+++ /dev/null 2012-04-25 14:16:16.847855589 -0300
-@@ -1,17 +0,0 @@
+--- comm-release.orig/mail/locales/en-US/searchplugins/bing.xml 2012-03-27 15:56:00.000000000 -0300
++++ /dev/null 2012-04-12 23:52:53.981159155 -0300
+@@ -1,21 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
- <ShortName>Bing</ShortName>
- <Description>Bing. Search by Microsoft.</Description>
@@ -53,13 +52,17 @@
- </Url>
- <Url type="text/html" method="GET" template="http://www.bing.com/search">
- <Param name="q" value="{searchTerms}"/>
+- <Param name="form" value="MOZESB"/>
+- <MozParam name="pc" condition="pref" pref="ms-pc"/>
- </Url>
- <Url type="application/x-moz-keywordsearch" method="GET" template="http://www.bing.com/search">
- <Param name="q" value="{searchTerms}"/>
+- <Param name="form" value="MOZESB"/>
+- <MozParam name="pc" condition="pref" pref="ms-pc"/>
- </Url>
- <SearchForm>http://www.bing.com/search</SearchForm>
-</SearchPlugin>
---- mail/locales/en-US/searchplugins/google.xml 2012-03-27 15:56:00.000000000 -0300
+--- comm-release.orig/mail/locales/en-US/searchplugins/google.xml 2012-03-27 15:56:00.000000000 -0300
+++ /dev/null 2012-04-12 23:52:53.981159155 -0300
@@ -1,14 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
@@ -76,7 +79,7 @@
-</Url>
-<SearchForm>http://www.google.com</SearchForm>
-</SearchPlugin>
---- mail/locales/en-US/searchplugins/twitter.xml 2012-03-27 15:56:00.000000000 -0300
+--- comm-release.orig/mail/locales/en-US/searchplugins/twitter.xml 2012-03-27 15:56:00.000000000 -0300
+++ /dev/null 2012-04-12 23:52:53.981159155 -0300
@@ -1,10 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
@@ -89,7 +92,7 @@
-<SearchForm>http://search.twitter.com/</SearchForm>
-</SearchPlugin>
-
---- mail/locales/en-US/searchplugins/yahoo.xml 2012-03-27 15:56:00.000000000 -0300
+--- comm-release.orig/mail/locales/en-US/searchplugins/yahoo.xml 2012-03-27 15:56:00.000000000 -0300
+++ /dev/null 2012-04-12 23:52:53.981159155 -0300
@@ -1,13 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
@@ -106,7 +109,7 @@
-<SearchForm>http://search.yahoo.com/</SearchForm>
-</SearchPlugin>
--- /dev/null 2012-04-12 23:52:53.981159155 -0300
-+++ mail/locales/en-US/searchplugins/duckduckgo-ssl.xml 2012-04-09 14:43:56.000000000 -0300
++++ comm-release/mail/locales/en-US/searchplugins/duckduckgo-ssl.xml 2012-04-09 14:43:56.000000000 -0300
@@ -0,0 +1,11 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<os:ShortName>DuckDuckGo RU SSL</os:ShortName>
@@ -120,7 +123,7 @@
+</os:Url>
+</SearchPlugin>
--- /dev/null 2012-04-12 23:52:53.981159155 -0300
-+++ mail/locales/en-US/searchplugins/identica-notice-search.xml 2012-04-13 05:15:55.000000000 -0300
++++ comm-release/mail/locales/en-US/searchplugins/identica-notice-search.xml 2012-04-13 05:15:55.000000000 -0300
@@ -0,0 +1,7 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<os:ShortName>Identi.ca Notice Search</os:ShortName>
@@ -130,7 +133,7 @@
+</os:Url>
+</SearchPlugin>
--- /dev/null 2012-04-12 23:52:53.981159155 -0300
-+++ mail/locales/en-US/searchplugins/identica-people-search.xml 2012-04-13 05:15:53.000000000 -0300
++++ comm-release/mail/locales/en-US/searchplugins/identica-people-search.xml 2012-04-13 05:15:53.000000000 -0300
@@ -0,0 +1,7 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<os:ShortName>Identi.ca People Search</os:ShortName>
diff --git a/libre-testing/icedove-libre/vendor.js b/libre/icedove-libre/vendor.js
index 279bdc158..279bdc158 100644
--- a/libre-testing/icedove-libre/vendor.js
+++ b/libre/icedove-libre/vendor.js