libre-testing/icedove-libre

18 files changed, 449 insertions, 0 deletions

diff --git a/libre-testing/icedove-libre/PKGBUILD b/libre-testing/icedove-libre/PKGBUILD
new file mode 100644
index 000000000..f3c186937
--- /dev/null
+++ b/libre-testing/icedove-libre/PKGBUILD
@@ -0,0 +1,130 @@
+# Maintainer : Márcio Silva <coadde@adinet.com.uy>
+# Contributor: André Silva <andre.paulista@adinet.com.uy>
+
+_pgo=false
+
+# 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=icedove
+pkgname=icedove-libre
+pkgver=${_debver}
+pkgrel=1
+
+if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
+if $_pgo; then
+  pkgname+='-pgo'
+fi
+
+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')
+optdepends=('libcanberra: for sound support')
+if $_pgo; then
+  makedepends+=('xorg-server-xvfb')
+  options=(!ccache)
+fi
+
+url="http://packages.debian.org/source/sid/icedove"
+install=icedove.install
+source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc"
+        mozconfig
+        mozconfig.pgo
+        icedove.desktop
+        channel-prefs.js
+        vendor.js)
+#       libvpx.patch)
+md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc'
+         'cb3dba2916bdf2deb72248b0984c4302'
+         '57e21e997a75d85fcc0dcfe30b83f1ee'
+         '3c87a2c89bd778d7cb40fc4fb2ccc52d'
+         'ac29b01c189f20abae2f3eef1618ffc0'
+         'e785e0c267f4435ae1a9aa0b03bcacfb'
+         '476ec205162340fb0679f522c9d31c3b'
+         '5a53179d14ae9631b7afe5e4d0fc0b25')
+#         '5b2aaff7dfe7f1f94ad965905b20e782')
+
+if [ "$_pkgname" != "$pkgname" ]; then
+  provides+=("$_pkgname=$pkgver")
+  conflicts+=("$_pkgname")
+fi
+
+dpkg-source() {
+  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+  export QUILT_PATCHES=debian/patches
+  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
+  export QUILT_DIFF_ARGS='--no-timestamps'
+  mv comm-esr10 "${_debname}-${_debver}"
+  mv debian "${_debname}-${_debver}"
+  cd "${_debname}-${_debver}"
+  quilt push -a
+  find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
+  cd ..
+}
+
+build() {
+# Don't run this if we're using -e
+if [ $NOEXTRACT -eq 0 ]; then
+  msg2 "Applying Debian patches..."
+  cd "${srcdir}"
+  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+
+  msg2 "Starting normal build..."
+  mv "${_debname}-${_debver}" "$srcdir/mozilla-build"
+  cd "$srcdir/mozilla-build"
+
+#  patch -Np1 -i "$srcdir/libvpx.patch"
+
+  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+fi
+
+  if $_pgo; then
+    cat "$srcdir/mozconfig.pgo" >> .mozconfig
+  fi
+
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
+  export PYTHON="/usr/bin/python2"
+
+  if $_pgo; then
+    LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
+    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
+    kill $! || true
+  else
+    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  fi
+}
+
+package() {
+  cd "$srcdir/mozilla-build"
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+  install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref/"
+
+  brandingdir=other-licenses/branding/
+  icondir="$pkgdir/usr/share/icons/hicolor"
+  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
+      install -Dm644 $brandingdir/$_pkgname/mailicon${i/x*/}.png "$icondir/$i/apps/$_pkgname.png"
+  done
+
+  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}
+
+# Recommend free addons
+  cp --remove-destination "${srcdir}/channel-prefs.js" \
+     "${pkgdir}/usr/lib/$_pkgname/defaults/pref/channel-prefs.js"
+}
diff --git a/libre-testing/icedove-libre/channel-prefs.js b/libre-testing/icedove-libre/channel-prefs.js
new file mode 100644
index 000000000..13b1ba388
--- /dev/null
+++ b/libre-testing/icedove-libre/channel-prefs.js
@@ -0,0 +1,9 @@
+//@line 2 "/build/src/comm-release/mail/app/profile/channel-prefs.js"
+pref("app.update.channel", "default");
+
+//Recommend free addons
+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
diff --git a/libre-testing/icedove-libre/gcc46.patch b/libre-testing/icedove-libre/gcc46.patch
new file mode 100644
index 000000000..71a3686ea
--- /dev/null
+++ b/libre-testing/icedove-libre/gcc46.patch
@@ -0,0 +1,12 @@
+diff -Nur comm-1.9.2.orig//mozilla/gfx/ots/src/os2.cc comm-1.9.2/mozilla/gfx/ots/src/os2.cc
+--- comm-1.9.2.orig//mozilla/gfx/ots/src/os2.cc	2011-04-14 11:37:21.000000000 -0700
++++ comm-1.9.2/mozilla/gfx/ots/src/os2.cc	2011-04-29 09:10:23.635807433 -0700
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
++#include <cstddef>
++
+ #include "os2.h"
+ 
+ #include "head.h"
diff --git a/libre-testing/icedove-libre/gnuzilla-addons.patch b/libre-testing/icedove-libre/gnuzilla-addons.patch
new file mode 100644
index 000000000..11949c1f1
--- /dev/null
+++ b/libre-testing/icedove-libre/gnuzilla-addons.patch
@@ -0,0 +1,36 @@
+--- usr/lib/icedove-3.1/defaults/pref/all-icedove.js	2011-03-04 17:28:11.000000000 -0300
++++ all-icedove.js	2011-03-08 11:22:31.437207173 -0300
+@@ -144,9 +144,9 @@
+ pref("extensions.update.interval", 86400);  // Check for updates to Extensions and
+                                             // Themes every day
+ // Non-symmetric (not shared by extensions) extension-specific [update] preferences
+-pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/");
+-pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/");
+-pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/");
++pref("extensions.getMoreExtensionsURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getMorePluginsURL", "http://www.gnu.org/software/gnuzilla/addons.html");
+ pref("extensions.dss.enabled", false);          // Dynamic Skin Switching
+ pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
+
+@@ -155,14 +155,14 @@
+
+ // Preferences for the Get Add-ons pane
+ pref("extensions.getAddons.showPane", true);
+-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/%APP%");
++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html");
+ pref("extensions.getAddons.maxResults", 5);
+-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/recommended");
+-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
+
+-pref("xpinstall.whitelist.add", "addons.mozilla.org");
++pref("xpinstall.whitelist.add", "www.gnu.org");
+ pref("xpinstall.whitelist.add.36", "getpersonas.com");
+
+ pref("mail.shell.checkDefaultClient", true);
diff --git a/libre-testing/icedove-libre/icedove-appversion.patch b/libre-testing/icedove-libre/icedove-appversion.patch
new file mode 100644
index 000000000..3f7a54686
--- /dev/null
+++ b/libre-testing/icedove-libre/icedove-appversion.patch
@@ -0,0 +1,12 @@
+diff -Nru comm-1.9.2.orig/mail/installer/Makefile.in comm-1.9.2/mail/installer/Makefile.in
+--- comm-1.9.2.orig/mail/installer/Makefile.in	2010-04-30 22:41:37.000000000 +0300
++++ comm-1.9.2/mail/installer/Makefile.in	2010-05-05 20:20:29.551660469 +0300
+@@ -42,6 +42,8 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
++MOZ_APP_VERSION="3.1"
++
+ include $(topsrcdir)/config/rules.mk
+ 
+ MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
diff --git a/libre-testing/icedove-libre/icedove-install-dir.patch b/libre-testing/icedove-libre/icedove-install-dir.patch
new file mode 100644
index 000000000..927ebb35d
--- /dev/null
+++ b/libre-testing/icedove-libre/icedove-install-dir.patch
@@ -0,0 +1,42 @@
+diff -Nur comm-esr10.orig/config/autoconf.mk.in comm-esr10/config/autoconf.mk.in
+--- config/autoconf.mk.in	2011-11-06 14:39:51.064983780 +0000
++++ config/autoconf.mk.in	2011-11-06 14:42:57.216735333 +0000
+@@ -66,8 +66,8 @@
+ mandir		= @mandir@
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ MOZDEPTH	= $(DEPTH)/mozilla
+ DIST		= $(MOZDEPTH)/dist
+diff -Nur comm-esr10.orig/mozilla/config/autoconf.mk.in comm-esr10/mozilla/config/autoconf.mk.in
+--- mozilla/config/autoconf.mk.in	2011-11-06 14:39:41.771562967 +0000
++++ mozilla/config/autoconf.mk.in	2011-11-06 14:44:18.404165515 +0000
+@@ -68,8 +68,8 @@
+ mandir		= @mandir@
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
+diff -Nur comm-esr10.orig/mozilla/js/src/config/autoconf.mk.in comm-esr10/mozilla/js/src/config/autoconf.mk.in
+--- mozilla/js/src/config/autoconf.mk.in	2011-11-06 14:39:48.014955070 +0000
++++ mozilla/js/src/config/autoconf.mk.in	2011-11-06 14:44:32.977635875 +0000
+@@ -60,8 +60,8 @@
+ datadir		= @datadir@
+ mandir		= @mandir@
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ TOP_DIST	= @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/libre-testing/icedove-libre/icedove-preferences.patch b/libre-testing/icedove-libre/icedove-preferences.patch
new file mode 100644
index 000000000..b6424a421
--- /dev/null
+++ b/libre-testing/icedove-libre/icedove-preferences.patch
@@ -0,0 +1,30 @@
+diff -Nur comm-1.9.2.orig/mail/app/profile/all-icedove.js comm-1.9.2/mail/app/profile/all-icedove.js
+--- comm-1.9.2.orig/mail/app/profile/all-icedove.js	2010-06-23 20:43:08.000000000 +0300
++++ comm-1.9.2/mail/app/profile/all-icedove.js	2010-06-25 00:37:36.518929684 +0300
+@@ -125,7 +125,7 @@
+ pref("app.update.showInstalledUI", false);
+
+ // Release notes URL
+-pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
++pref("app.releaseNotesURL", "http://www.mozillamessaging.com/%APP%/%VERSION%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
+ // Base URL for web-based support pages.
+ pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/");
+diff -Nur comm-1.9.2.orig/mail/branding/nightly/icedove-branding.js comm-1.9.2/mail/branding/nightly/icedove-branding.js
+--- comm-1.9.2.orig/mail/branding/nightly/icedove-branding.js	2010-06-23 20:43:08.000000000 +0300
++++ comm-1.9.2/mail/branding/nightly/icedove-branding.js	2010-06-25 00:36:10.605569121 +0300
+@@ -1,11 +1,11 @@
+ // Default start page
+-pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
++pref("mailnews.start_page.url","https://www.mozillamessaging.com/%APP%/%VERSION%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
+ // first launch welcome page
+-pref("mailnews.start_page.welcome_url","https://live.mozillamessaging.com/%APP%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
++pref("mailnews.start_page.welcome_url","https://www.mozillamessaging.com/%APP%/%VERSION%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
+ // start page override to load after an update
+-pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
++pref("mailnews.start_page.override_url","https://www.mozillamessaging.com/%APP%/%VERSION%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
+ // Interval: Time between checks for a new version (in seconds)
+ // nightly=8 hours, official=24 hours
diff --git a/libre-testing/icedove-libre/icedove-shared-error.patch b/libre-testing/icedove-libre/icedove-shared-error.patch
new file mode 100644
index 000000000..ae41bbc1e
--- /dev/null
+++ b/libre-testing/icedove-libre/icedove-shared-error.patch
@@ -0,0 +1,15 @@
+diff -up comm-central/mail/installer/Makefile.in.shared-error comm-central/mail/installer/Makefile.in
+--- comm-central/mail/installer/Makefile.in.shared-error	2009-09-16 13:47:43.000000000 +0200
++++ comm-central/mail/installer/Makefile.in	2009-09-16 13:48:25.000000000 +0200
+@@ -95,9 +95,11 @@ endif
+ # mozconfig instead.
+ ifndef MAIL_PKG_SHARED
+ ifndef BUILD_STATIC_LIBS
++ifeq (BUILD_STATIC_LIBS, 1)
+ $(error you need an "--enable-static" build to package a build)
+ endif
+ endif
++endif
+ 
+ # On mozilla-central, packager.mk uses core_abspath to redefine DIST
+ # As the comm-central config.mk doesn't set it, do it ourselves instead
diff --git a/libre-testing/icedove-libre/icedove.desktop b/libre-testing/icedove-libre/icedove.desktop
new file mode 100644
index 000000000..ef2cd76e9
--- /dev/null
+++ b/libre-testing/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-testing/icedove-libre/icedove.install
new file mode 100644
index 000000000..4d4a283db
--- /dev/null
+++ b/libre-testing/icedove-libre/icedove.install
@@ -0,0 +1,12 @@
+post_install() {
+    update-desktop-database -q
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/libre-testing/icedove-libre/libvpx.patch b/libre-testing/icedove-libre/libvpx.patch
new file mode 100644
index 000000000..d0f9a0f4c
--- /dev/null
+++ b/libre-testing/icedove-libre/libvpx.patch
@@ -0,0 +1,12 @@
+diff -Nur comm-release.orig/mozilla/configure.in comm-release/mozilla/configure.in
+--- comm-release.orig/mozilla/configure.in	2012-02-05 18:02:17.376830377 +0000
++++ comm-release/mozilla/configure.in	2012-02-05 18:03:25.246274275 +0000
+@@ -5629,7 +5629,7 @@
+             dnl v0.9.6 one to check for.
+             AC_TRY_COMPILE([
+                 #include <vpx/vpx_decoder.h>
+-                #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
++                #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
+                     #error "test failed."
+                 #endif
+                 ],
diff --git a/libre-testing/icedove-libre/mozconfig b/libre-testing/icedove-libre/mozconfig
new file mode 100644
index 000000000..469047991
--- /dev/null
+++ b/libre-testing/icedove-libre/mozconfig
@@ -0,0 +1,49 @@
+mk_add_options MOZ_CO_PROJECT=mail
+ac_add_options --enable-application=mail
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
+
+# Features
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+# 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
diff --git a/libre-testing/icedove-libre/mozconfig.pgo b/libre-testing/icedove-libre/mozconfig.pgo
new file mode 100644
index 000000000..b0c249ebf
--- /dev/null
+++ b/libre-testing/icedove-libre/mozconfig.pgo
@@ -0,0 +1,4 @@
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
diff --git a/libre-testing/icedove-libre/mozilla-notify.patch b/libre-testing/icedove-libre/mozilla-notify.patch
new file mode 100644
index 000000000..952567b0e
--- /dev/null
+++ b/libre-testing/icedove-libre/mozilla-notify.patch
@@ -0,0 +1,12 @@
+diff -up comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp.libnotify comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp
+--- comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp.libnotify	2010-10-27 09:05:36.000000000 +0200
++++ comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp	2010-11-08 13:28:04.564002379 +0100
+@@ -204,7 +204,7 @@ nsAlertsIconListener::ShowAlert(GdkPixbu
+ {
+   NotifyNotification* notify = notify_notification_new(mAlertTitle.get(),
+                                                        mAlertText.get(),
+-                                                       NULL, NULL);
++                                                       NULL);
+   if (!notify)
+     return NS_ERROR_OUT_OF_MEMORY;
+ 
diff --git a/libre-testing/icedove-libre/python2.7.patch b/libre-testing/icedove-libre/python2.7.patch
new file mode 100644
index 000000000..2d159d479
--- /dev/null
+++ b/libre-testing/icedove-libre/python2.7.patch
@@ -0,0 +1,11 @@
+--- configure.in	2010-10-13 08:37:29.000000000 -0700
++++ configure.in~	2010-10-19 10:32:06.360019362 -0700
+@@ -878,7 +878,7 @@
+     AC_MSG_RESULT([yes])    
+ fi
+ 
+-MOZ_PATH_PROGS(PYTHON, $PYTHON python2.6 python2.5 python2.4 python)
++MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python2.5 python2.4 python)
+ if test -z "$PYTHON"; then
+     AC_MSG_ERROR([python was not found in \$PATH])
+ fi
diff --git a/libre-testing/icedove-libre/rePKGBUILD b/libre-testing/icedove-libre/rePKGBUILD
new file mode 100644
index 000000000..771e93bc8
--- /dev/null
+++ b/libre-testing/icedove-libre/rePKGBUILD
@@ -0,0 +1,30 @@
+# This is an example rePKGBUILD file. Use this as a start to creating your own,
+# and remove these comments. For more information, see 'man PKGBUILD'.
+# NOTE: Please fill out the license field for your package! If it is unknown,
+# then please put 'unknown'.
+
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+# Maintainer: Márcio Silva <coadde@adinet.com.uy>
+source PKGBUILD
+unset build package md5sums source
+_repo=extra
+options=(!strip)
+source=(PKGBUILD
+	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+	# files for pkg modifications
+    channel-prefs.js)
+
+build() {
+  cd "${srcdir}/"
+  rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+
+# Recommend free addons
+  cp --remove-destination "${srcdir}/channel-prefs.js" \
+     "${srcdir}/usr/lib/icedove/defaults/pref/channel-prefs.js"
+}
+
+package() {
+  find ${srcdir} -type l -maxdepth 1 -delete
+  cd ${srcdir}
+  cp -a ./* ${pkgdir}
+}
diff --git a/libre-testing/icedove-libre/vendor.js b/libre-testing/icedove-libre/vendor.js
new file mode 100644
index 000000000..170b505a8
--- /dev/null
+++ b/libre-testing/icedove-libre/vendor.js
@@ -0,0 +1,9 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default mailer checking.
+pref("mail.shell.checkDefaultMail", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
diff --git a/libre-testing/icedove-libre/xulrunner-png14.patch b/libre-testing/icedove-libre/xulrunner-png14.patch
new file mode 100644
index 000000000..1dc0ecda5
--- /dev/null
+++ b/libre-testing/icedove-libre/xulrunner-png14.patch
@@ -0,0 +1,11 @@
+--- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig	2010-01-17 00:15:53.979744638 +0100
++++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-01-17 00:16:07.855993411 +0100
+@@ -135,7 +135,7 @@
+ 
+   // initialize
+   mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                 png_voidp_NULL,
++                                 NULL,
+                                  ErrorCallback,
+                                  ErrorCallback);
+   if (! mPNG)