14 files changed, 325 insertions, 0 deletions
diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD
new file mode 100644
index 000000000..7e3f9b587
--- /dev/null
+++ b/libre/thunderbird-libre/PKGBUILD
@@ -0,0 +1,74 @@
+# $Id$
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+# Contributor: Dale Blount <dale@archlinux.org>
+# Contributor: Anders Bostrom <anders.bostrom@home.se>
+pkgname=thunderbird-libre
+pkgver=3.1.10
+pkgrel=3
+pkgdesc="Standalone Mail/News reader, with GNUZilla addons"
+arch=('i686' 'x86_64')
+license=('MPL' 'GPL')
+url="http://www.mozilla.org/projects/thunderbird"
+depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3>=3.7.4' 'desktop-file-utils' 'libnotify')
+makedepends=('zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'autoconf2.13')
+optdepends=('libcanberra: for sound support')
+replaces=('thunderbird')
+conflicts=('thunderbird')
+provides=("thunderbird=$pkgver")
+install=thunderbird.install
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}.source.tar.bz2
+        mozconfig
+        thunderbird.desktop
+        thunderbird-3.0-lang.patch
+        thunderbird-appversion.patch
+        thunderbird-shared-error.patch
+        xulrunner-png14.patch
+        python2.7.patch
+        gcc46.patch
+        gnuzilla-addons.patch)
+
+build() {
+  cd "${srcdir}/comm-1.9.2"
+  patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch"
+  patch -Np1 -i "${srcdir}/thunderbird-appversion.patch"
+  patch -Np1 -i "${srcdir}/thunderbird-shared-error.patch"
+  patch -Np1 -i "${srcdir}/gcc46.patch"
+  patch -Np0 -i "${srcdir}/xulrunner-png14.patch"
+  patch -Np0 -i "${srcdir}/python2.7.patch"
+
+  pushd mail/app/profile >/dev/null
+  patch -Np0 -i "${srcdir}/gnuzilla-addons.patch"
+  popd >/dev/null
+
+  cp "${srcdir}/mozconfig" .mozconfig
+  unset CXXFLAGS
+  unset CFLAGS
+
+  export CXXFLAGS="-fpermissive"
+  export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-3.1"
+
+  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
+}
+
+package() {
+  cd "${srcdir}/comm-1.9.2"
+  make -j1 DESTDIR="${pkgdir}" install
+
+  #Remove included dictionaries, add symlink to system myspell path.
+  #Note: this will cause file conflicts when users have installed dictionaries in the old location
+  rm -rf "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries"
+  ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries"
+
+  rm -rf "${pkgdir}/usr/bin/defaults"
+
+  install -m755 -d "${pkgdir}/usr/share/applications"
+
+  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
+      install -d "$pkgdir/usr/share/icons/hicolor/$i/apps"
+      cp other-licenses/branding/thunderbird/mailicon${i/x*/}.png "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
+  done
+
+  install -m644 "${srcdir}/thunderbird.desktop" "${pkgdir}/usr/share/applications/"
+
+  rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc
+}
diff --git a/libre/thunderbird-libre/gcc46.patch b/libre/thunderbird-libre/gcc46.patch
new file mode 100644
index 000000000..71a3686ea
--- /dev/null
+++ b/libre/thunderbird-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/thunderbird-libre/gnuzilla-addons.patch b/libre/thunderbird-libre/gnuzilla-addons.patch
new file mode 100644
index 000000000..2c0e4a68f
--- /dev/null
+++ b/libre/thunderbird-libre/gnuzilla-addons.patch
@@ -0,0 +1,36 @@
+--- usr/lib/thunderbird-3.1/defaults/pref/all-thunderbird.js	2011-03-04 17:28:11.000000000 -0300
++++ all-thunderbird.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/thunderbird-libre/mozconfig b/libre/thunderbird-libre/mozconfig
new file mode 100644
index 000000000..9cdf366f5
--- /dev/null
+++ b/libre/thunderbird-libre/mozconfig
@@ -0,0 +1,45 @@
+mk_add_options MOZ_CO_PROJECT=mail
+ac_add_options --enable-application=mail
+
+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-png
+ac_add_options --with-system-mng
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --with-pthreads
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-crashreporter
+ac_add_options --disable-official-branding
+ac_add_options --disable-xprint
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-strip
+ac_add_options --enable-pango
+ac_add_options --enable-xft
+ac_add_options --enable-system-cairo
+ac_add_options --enable-svg
+ac_add_options --enable-canvas
+ac_add_options --enable-optimize
+ac_add_options --prefix=/usr
+#ac_add_options --with-branding=mail/branding/unofficial
+ac_add_options --enable-official-branding
+
+ac_add_options --disable-pedantic
+
+ac_add_options --enable-gio
+ac_add_options --disable-gnomevfs
+ac_add_options --enable-gconf
+ac_add_options --enable-libnotify
+
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+export USE_SHORT_LIBNAME=1
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options USE_SHORT_LIBNAME=1
+
diff --git a/libre/thunderbird-libre/mozilla-notify.patch b/libre/thunderbird-libre/mozilla-notify.patch
new file mode 100644
index 000000000..952567b0e
--- /dev/null
+++ b/libre/thunderbird-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/thunderbird-libre/python2.7.patch b/libre/thunderbird-libre/python2.7.patch
new file mode 100644
index 000000000..2d159d479
--- /dev/null
+++ b/libre/thunderbird-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/thunderbird-libre/rePKGBUILD b/libre/thunderbird-libre/rePKGBUILD
new file mode 100644
index 000000000..e71f6ad78
--- /dev/null
+++ b/libre/thunderbird-libre/rePKGBUILD
@@ -0,0 +1,31 @@
+# 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>
+source PKGBUILD
+CARCH=x86_64
+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
+        gnuzilla-addons.patch)
+
+build() {
+  cd "${srcdir}/"
+  rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+
+  pushd usr/lib/${pkgname%-libre}-3.1/defaults/pref/ >/dev/null
+  patch -Np0 -i "${srcdir}/gnuzilla-addons.patch"
+  popd >/dev/null
+  rm "${srcdir}/gnuzilla-addons.patch"
+}
+
+package() {
+  find ${srcdir} -type l -maxdepth 1 -delete
+  cd ${srcdir}
+  cp -a ./* ${pkgdir}
+}
diff --git a/libre/thunderbird-libre/thunderbird-3.0-lang.patch b/libre/thunderbird-libre/thunderbird-3.0-lang.patch
new file mode 100644
index 000000000..b9f4a5cde
--- /dev/null
+++ b/libre/thunderbird-libre/thunderbird-3.0-lang.patch
@@ -0,0 +1,11 @@
+--- comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-10-11 02:12:44.000000000 +0200
++++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-09-16 02:56:45.000000000 +0200
+@@ -890,7 +890,7 @@
+ pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
+ pref("intl.charset.default",                "chrome://global-platform/locale/intl.properties");
+ pref("intl.ellipsis",                       "chrome://global-platform/locale/intl.properties");
+-pref("intl.locale.matchOS",                 false);
++pref("intl.locale.matchOS",                 true);
+ // fallback charset list for Unicode conversion (converting from Unicode)
+ // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
+ // for ISO-8859-1
diff --git a/libre/thunderbird-libre/thunderbird-appversion.patch b/libre/thunderbird-libre/thunderbird-appversion.patch
new file mode 100644
index 000000000..3f7a54686
--- /dev/null
+++ b/libre/thunderbird-libre/thunderbird-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/thunderbird-libre/thunderbird-preferences.patch b/libre/thunderbird-libre/thunderbird-preferences.patch
new file mode 100644
index 000000000..627f02434
--- /dev/null
+++ b/libre/thunderbird-libre/thunderbird-preferences.patch
@@ -0,0 +1,30 @@
+diff -Nur comm-1.9.2.orig/mail/app/profile/all-thunderbird.js comm-1.9.2/mail/app/profile/all-thunderbird.js
+--- comm-1.9.2.orig/mail/app/profile/all-thunderbird.js	2010-06-23 20:43:08.000000000 +0300
++++ comm-1.9.2/mail/app/profile/all-thunderbird.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/thunderbird-branding.js comm-1.9.2/mail/branding/nightly/thunderbird-branding.js
+--- comm-1.9.2.orig/mail/branding/nightly/thunderbird-branding.js	2010-06-23 20:43:08.000000000 +0300
++++ comm-1.9.2/mail/branding/nightly/thunderbird-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/thunderbird-libre/thunderbird-shared-error.patch b/libre/thunderbird-libre/thunderbird-shared-error.patch
new file mode 100644
index 000000000..ae41bbc1e
--- /dev/null
+++ b/libre/thunderbird-libre/thunderbird-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/thunderbird-libre/thunderbird.desktop b/libre/thunderbird-libre/thunderbird.desktop
new file mode 100644
index 000000000..a626e52ba
--- /dev/null
+++ b/libre/thunderbird-libre/thunderbird.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=Thunderbird
+Comment=Mail & News Reader
+GenericName=Mail Client & News Reader
+Exec=thunderbird %u
+TryExec=thunderbird
+Icon=thunderbird
+Terminal=false
+Type=Application
+Categories=Network;Email;
+MimeType=message/rfc822;x-scheme-handler/mailto;
+StartupNotify=true
diff --git a/libre/thunderbird-libre/thunderbird.install b/libre/thunderbird-libre/thunderbird.install
new file mode 100644
index 000000000..4d4a283db
--- /dev/null
+++ b/libre/thunderbird-libre/thunderbird.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/thunderbird-libre/xulrunner-png14.patch b/libre/thunderbird-libre/xulrunner-png14.patch
new file mode 100644
index 000000000..1dc0ecda5
--- /dev/null
+++ b/libre/thunderbird-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)