diff options
21 files changed, 19 insertions, 1233 deletions
diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog index fc15243b6f9c..43c88e31dc72 100644 --- a/mail-client/thunderbird/ChangeLog +++ b/mail-client/thunderbird/ChangeLog @@ -1,6 +1,24 @@ # ChangeLog for mail-client/thunderbird # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.155 2012/07/04 19:14:42 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.156 2012/07/06 07:37:05 ssuominen Exp $ + + 06 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> + -files/1001-xulrunner_fix_jemalloc_vs_aslr.patch, -files/libnotify-0.7.patch, + -files/enigmail-1.1.2-20110124-locale-fixup.diff, + -files/enigmail-1.3.3-bug373733.patch, + -files/thunderbird-xul-1.9.2-arm-fixes.patch, + -files/1002_fix-system-hunspell-dict-detections.patch, + -files/cups-1.4.4-fixup.patch, -files/xulrunner-1.9.2-gtk+-2.21.patch, + -files/thunderbird-gentoo-default-prefs-1.js, + -files/thunderbird-3.1-gcc45.patch, + -files/2000-thunderbird_gentoo_install_dirs.patch, + -thunderbird-3.1.12.ebuild, -thunderbird-3.1.14.ebuild, + -files/thunderbird-3.1-noalsa-fixup.patch, + -files/thunderbird-3.3-gconf-config-update.patch, -files/bug-606109.patch, + -files/icon/thunderbird-icon.png, -files/icon/thunderbird-icon-unbranded.png, + -files/thunderbird-gentoo-default-prefs.js, + -files/thunderbird-respect-ldflags.patch: + old 04 Jul 2012; Jory A. Pratt <anarchy@gentoo.org> thunderbird-10.0.4.ebuild, thunderbird-10.0.5.ebuild, thunderbird-13.0.ebuild: diff --git a/mail-client/thunderbird/files/1001-xulrunner_fix_jemalloc_vs_aslr.patch b/mail-client/thunderbird/files/1001-xulrunner_fix_jemalloc_vs_aslr.patch deleted file mode 100644 index 7511ac7c3c2a..000000000000 --- a/mail-client/thunderbird/files/1001-xulrunner_fix_jemalloc_vs_aslr.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -urpx 'cscope*' -x '.*.swp' mozilla-1.9.1-orig/memory/jemalloc/jemalloc.c mozilla-1.9.1/memory/jemalloc/jemalloc.c ---- mozilla-orig/memory/jemalloc/jemalloc.c 2009-07-30 17:30:25.000000000 +0200 -+++ mozilla/memory/jemalloc/jemalloc.c 2009-08-10 14:28:59.000000000 +0200 -@@ -392,7 +392,7 @@ __FBSDID("$FreeBSD: head/lib/libc/stdlib - static const bool __isthreaded = true; - #endif - --#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN) -+#if defined(MOZ_MEMORY_SOLARIS) || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) - #define JEMALLOC_USES_MAP_ALIGN /* Required on Solaris 10. Might improve performance elsewhere. */ - #endif - -@@ -2305,20 +2305,31 @@ pages_map_align(size_t size, int pfd, si - * We don't use MAP_FIXED here, because it can cause the *replacement* - * of existing mappings, and we only want to create new mappings. - */ --#ifdef MALLOC_PAGEFILE -- if (pfd != -1) { -- ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | -- MAP_NOSYNC | MAP_ALIGN, pfd, 0); -- } else --#endif -- { -- ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | -- MAP_NOSYNC | MAP_ALIGN | MAP_ANON, -1, 0); -- } -+ ret = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE, MAP_PRIVATE | -+ MAP_NOSYNC| MAP_ANON, -1, 0); - assert(ret != NULL); - - if (ret == MAP_FAILED) - ret = NULL; -+ else { -+ uintptr_t aligned_ret; -+ size_t extra_size; -+ -+ aligned_ret = (uintptr_t)ret + alignment - 1; -+ aligned_ret &= ~(alignment - 1); -+ extra_size = aligned_ret - (uintptr_t)ret; -+ munmap(ret, extra_size); -+ munmap(ret + extra_size + size, alignment - extra_size); -+ ret = (void *)aligned_ret; -+#ifdef MALLOC_PAGEFILE -+ if (pfd != -1) { -+ ret = mmap(ret, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | -+ MAP_NOSYNC | MAP_FIXED, pfd, 0); -+ } -+ if (ret == MAP_FAILED) -+ ret = NULL; -+#endif -+ } - return (ret); - } - #endif - diff --git a/mail-client/thunderbird/files/1002_fix-system-hunspell-dict-detections.patch b/mail-client/thunderbird/files/1002_fix-system-hunspell-dict-detections.patch deleted file mode 100644 index 5a905aaf4ac0..000000000000 --- a/mail-client/thunderbird/files/1002_fix-system-hunspell-dict-detections.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff -r e06632956519 mozilla/extensions/spellcheck/Makefile.in ---- a/mozilla/extensions/spellcheck/Makefile.in Sun Apr 04 07:02:14 2010 +0300 -+++ b/mozilla/extensions/spellcheck/Makefile.in Tue Apr 06 23:07:03 2010 -0500 -@@ -42,13 +42,19 @@ - include $(DEPTH)/config/autoconf.mk - - MODULE = spellchecker -+ifndef MOZ_NATIVE_HUNSPELL - DIRS = idl locales -+else -+DIRS = idl -+endif - - ifeq (camino,$(MOZ_BUILD_APP)) - DIRS += osxspell - else -+ifndef MOZ_NATIVE_HUNSPELL - DIRS += hunspell - endif -+endif - - DIRS += src - -diff -r e06632956519 mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp ---- a/mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp Sun Apr 04 07:02:14 2010 +0300 -+++ b/mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp Tue Apr 06 23:07:03 2010 -0500 -@@ -63,6 +63,9 @@ - #include "nsISimpleEnumerator.h" - #include "nsIDirectoryEnumerator.h" - #include "nsIFile.h" -+#ifdef MOZ_NATIVE_HUNSPELL -+#include "nsILocalFile.h" -+#endif - #include "nsDirectoryServiceUtils.h" - #include "nsDirectoryServiceDefs.h" - #include "mozISpellI18NManager.h" -@@ -307,7 +310,16 @@ - return; - - nsCOMPtr<nsIFile> dictDir; -- rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY, -+ #ifdef MOZ_NATIVE_HUNSPELL -+ nsCOMPtr<nsILocalFile> localFile; -+ rv = NS_NewNativeLocalFile(nsDependentCString("/usr/share/myspell"),PR_TRUE, getter_AddRefs(localFile)); -+ if (localFile && NS_SUCCEEDED(rv)) { -+ localFile->QueryInterface(NS_GET_IID(nsIFile), getter_AddRefs(dictDir)); -+ LoadDictionariesFromDir(dictDir); -+ } -+ else { -+ #endif -+ rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY, - NS_GET_IID(nsIFile), getter_AddRefs(dictDir)); - if (NS_SUCCEEDED(rv)) { - LoadDictionariesFromDir(dictDir); -@@ -332,6 +344,9 @@ - LoadDictionariesFromDir(appDir); - } - } -+#ifdef MOZ_NATIVE_HUNSPELL -+ } -+#endif - - nsCOMPtr<nsISimpleEnumerator> dictDirs; - rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, -diff -r e06632956519 mozilla/extensions/spellcheck/src/Makefile.in ---- a/mozilla/extensions/spellcheck/src/Makefile.in Sun Apr 04 07:02:14 2010 +0300 -+++ b/mozilla/extensions/spellcheck/src/Makefile.in Tue Apr 06 23:07:03 2010 -0500 -@@ -63,9 +63,15 @@ - txtsvc \ - uconv \ - unicharutil \ -+ xulapp \ - $(NULL) - --CPPSRCS = \ -+ifdef MOZ_NATIVE_HUNSPELL -+CPPSRCS += mozHunspell.cpp \ -+ mozHunspellDirProvider.cpp -+endif -+ -+CPPSRCS += \ - mozSpellCheckerFactory.cpp \ - mozSpellChecker.cpp \ - mozPersonalDictionary.cpp \ -@@ -80,8 +86,15 @@ - SHARED_LIBRARY_LIBS += ../osxspell/src/$(LIB_PREFIX)osxspell_s.$(LIB_SUFFIX) - LOCAL_INCLUDES += -I$(srcdir)/../osxspell/src - else -+ifndef MOZ_NATIVE_HUNSPELL - SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX) - LOCAL_INCLUDES += -I$(srcdir)/../hunspell/src -+else -+LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS) \ -+ -I$(srcdir)/../hunspell/src \ -+ -DMOZ_NATIVE_HUNSPELL \ -+ $(NULL) -+endif - endif - - EXTRA_DSO_LDOPTS = \ -@@ -96,3 +109,11 @@ - LOCAL_INCLUDES += \ - -I$(topsrcdir)/xpcom/io \ - $(NULL) -+ -+ifdef MOZ_NATIVE_HUNSPELL -+export:: $(srcdir)/../hunspell/src/mozHunspell.cpp $(srcdir)/../hunspell/src/mozHunspellDirProvider.cpp -+ $(INSTALL) $(srcdir)/../hunspell/src/mozHunspell.* $(srcdir)/../hunspell/src/mozHunspellDirProvider.* . -+GARBAGE += mozHunspell.$(OBJ_SUFFIX) mozHunspell.cpp mozHunspellDirProvider.$(OBJ_SUFFIX) mozHunspellDirProvider.cpp -+clean:: -+ rm -f mozHunspell.* mozHunspellDirProvider.* -+endif diff --git a/mail-client/thunderbird/files/2000-thunderbird_gentoo_install_dirs.patch b/mail-client/thunderbird/files/2000-thunderbird_gentoo_install_dirs.patch deleted file mode 100644 index b3af6f35fa88..000000000000 --- a/mail-client/thunderbird/files/2000-thunderbird_gentoo_install_dirs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ur work.orig/config/autoconf.mk.in work/config/autoconf.mk.in ---- work.orig/config/autoconf.mk.in 2009-04-28 16:55:24.000000000 +0000 -+++ work/config/autoconf.mk.in 2009-04-28 16:57:12.000000000 +0000 -@@ -60,14 +60,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/thunderbird - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(datadir)/idl/thunderbird - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/thunderbird -+sdkdir = $(libdir)/thunderbird-devel - - MOZDEPTH = $(DEPTH)/mozilla - DIST = $(MOZDEPTH)/dist diff --git a/mail-client/thunderbird/files/bug-606109.patch b/mail-client/thunderbird/files/bug-606109.patch deleted file mode 100644 index 57d9cd98cf61..000000000000 --- a/mail-client/thunderbird/files/bug-606109.patch +++ /dev/null @@ -1,48 +0,0 @@ -# HG changeset patch -# User Jory A. Pratt <anarchy@gentoo.org> -# Parent 74e4421e0a30c6e21b594675e32a8d9d663c309c -Add missing ifde MOZ_MEDIA - -diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp ---- a/mozilla/content/base/src/nsContentSink.cpp -+++ b/mozilla/content/base/src/nsContentSink.cpp -@@ -1860,17 +1860,19 @@ nsIAtom** const kDefaultAllowedTags [] = - &nsGkAtoms::nobr, - &nsGkAtoms::noscript, - &nsGkAtoms::ol, - &nsGkAtoms::optgroup, - &nsGkAtoms::option, - &nsGkAtoms::output, - &nsGkAtoms::p, - &nsGkAtoms::pre, -+#ifdef MOZ_MEDIA - &nsGkAtoms::progress, -+#endif - &nsGkAtoms::q, - &nsGkAtoms::rp, - &nsGkAtoms::rt, - &nsGkAtoms::ruby, - &nsGkAtoms::s, - &nsGkAtoms::samp, - &nsGkAtoms::section, - &nsGkAtoms::select, -@@ -1952,17 +1954,19 @@ nsIAtom** const kDefaultAllowedAttribute - &nsGkAtoms::itemref, - &nsGkAtoms::itemscope, - &nsGkAtoms::itemtype, - &nsGkAtoms::kind, - &nsGkAtoms::label, - &nsGkAtoms::lang, - &nsGkAtoms::list, - &nsGkAtoms::longdesc, -+#ifdef MOZ_MEDIA - &nsGkAtoms::loop, -+#endif - &nsGkAtoms::low, - &nsGkAtoms::max, - &nsGkAtoms::maxlength, - &nsGkAtoms::media, - &nsGkAtoms::min, - &nsGkAtoms::mozdonotsend, - &nsGkAtoms::method, - &nsGkAtoms::multiple, diff --git a/mail-client/thunderbird/files/cups-1.4.4-fixup.patch b/mail-client/thunderbird/files/cups-1.4.4-fixup.patch deleted file mode 100644 index a0923e8906e9..000000000000 --- a/mail-client/thunderbird/files/cups-1.4.4-fixup.patch +++ /dev/null @@ -1,161 +0,0 @@ -# HG changeset patch -# User Matthew Gregan <kinetik@flim.org> -# Date 1293624205 -3600 -# Node ID ffa1ef8ab52b4081e27aa2b24d14a550386f90db -# Parent 9e561d402701f46eb56dbadb96b6963f4518cdd0 -Bug 573039 - Construct nsCUPSShim statically and avoid calling PR_UnloadLibrary on libcups after it has been initialized. r=karlt a=clegnitto - -diff --git a/mozilla/gfx/src/psshared/nsCUPSShim.cpp b/mozilla/gfx/src/psshared/nsCUPSShim.cpp ---- a/mozilla/gfx/src/psshared/nsCUPSShim.cpp -+++ b/mozilla/gfx/src/psshared/nsCUPSShim.cpp -@@ -83,14 +83,8 @@ nsCUPSShim::Init() - #endif - PR_UnloadLibrary(mCupsLib); - mCupsLib = nsnull; - return PR_FALSE; - } - } - return PR_TRUE; - } -- --nsCUPSShim::~nsCUPSShim() --{ -- if (mCupsLib) -- PR_UnloadLibrary(mCupsLib); --} -diff --git a/mozilla/gfx/src/psshared/nsCUPSShim.h b/mozilla/gfx/src/psshared/nsCUPSShim.h ---- a/mozilla/gfx/src/psshared/nsCUPSShim.h -+++ b/mozilla/gfx/src/psshared/nsCUPSShim.h -@@ -81,17 +81,16 @@ typedef int (PR_CALLBACK *CupsAddOptionT - int num_options, - cups_option_t **options); - - struct PRLibrary; - - class NS_PSSHARED nsCUPSShim { - public: - nsCUPSShim() : mCupsLib(nsnull) { } -- ~nsCUPSShim(); - - /** - * Initialize this object. Attempt to load the CUPS shared - * library and find function pointers for the supported - * functions (see below). - * @return PR_FALSE if the shared library could not be loaded, or if - * any of the functions could not be found. - * PR_TRUE for successful initialization. -diff --git a/mozilla/gfx/src/psshared/nsPSPrinters.cpp b/mozilla/gfx/src/psshared/nsPSPrinters.cpp ---- a/mozilla/gfx/src/psshared/nsPSPrinters.cpp -+++ b/mozilla/gfx/src/psshared/nsPSPrinters.cpp -@@ -51,32 +51,34 @@ - #include "plstr.h" - - #define NS_CUPS_PRINTER "CUPS/" - #define NS_CUPS_PRINTER_LEN (sizeof(NS_CUPS_PRINTER) - 1) - - /* dummy printer name for the gfx/src/ps driver */ - #define NS_POSTSCRIPT_DRIVER_NAME "PostScript/" - -+nsCUPSShim gCupsShim; -+ - /* Initialize the printer manager object */ - nsresult - nsPSPrinterList::Init() - { - nsresult rv; - - mPrefSvc = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); - if (NS_SUCCEEDED(rv)) - rv = mPrefSvc->GetBranch("print.", getter_AddRefs(mPref)); - NS_ENSURE_SUCCESS(rv, NS_ERROR_NOT_INITIALIZED); - - // Should we try cups? - PRBool useCups = PR_TRUE; - rv = mPref->GetBoolPref("postscript.cups.enabled", &useCups); -- if (useCups) -- mCups.Init(); -+ if (useCups && !gCupsShim.IsInitialized()) -+ gCupsShim.Init(); - return NS_OK; - } - - - /* Check whether the PostScript module has been disabled at runtime */ - PRBool - nsPSPrinterList::Enabled() - { -@@ -94,35 +96,35 @@ nsPSPrinterList::Enabled() - /* Fetch a list of printers handled by the PostsScript module */ - void - nsPSPrinterList::GetPrinterList(nsTArray<nsCString>& aList) - { - aList.Clear(); - - // Query CUPS for a printer list. The default printer goes to the - // head of the output list; others are appended. -- if (mCups.IsInitialized()) { -+ if (gCupsShim.IsInitialized()) { - cups_dest_t *dests; - -- int num_dests = (mCups.mCupsGetDests)(&dests); -+ int num_dests = (gCupsShim.mCupsGetDests)(&dests); - if (num_dests) { - for (int i = 0; i < num_dests; i++) { - nsCAutoString fullName(NS_CUPS_PRINTER); - fullName.Append(dests[i].name); - if (dests[i].instance != NULL) { - fullName.Append("/"); - fullName.Append(dests[i].instance); - } - if (dests[i].is_default) - aList.InsertElementAt(0, fullName); - else - aList.AppendElement(fullName); - } - } -- (mCups.mCupsFreeDests)(num_dests, dests); -+ (gCupsShim.mCupsFreeDests)(num_dests, dests); - } - - // Build the "classic" list of printers -- those accessed by running - // an opaque command. This list always contains a printer named "default". - // In addition, we look for either an environment variable - // MOZILLA_POSTSCRIPT_PRINTER_LIST or a preference setting - // print.printer_list, which contains a space-separated list of printer - // names. -diff --git a/mozilla/gfx/src/psshared/nsPSPrinters.h b/mozilla/gfx/src/psshared/nsPSPrinters.h ---- a/mozilla/gfx/src/psshared/nsPSPrinters.h -+++ b/mozilla/gfx/src/psshared/nsPSPrinters.h -@@ -37,17 +37,16 @@ - * ***** END LICENSE BLOCK ***** */ - - #ifndef nsPSPrinters_h___ - #define nsPSPrinters_h___ - - #include "nsString.h" - #include "nsTArray.h" - #include "prtypes.h" --#include "nsCUPSShim.h" - #include "psSharedCore.h" - - class nsIPrefService; - class nsIPrefBranch; - class nsCUPSShim; - - class NS_PSSHARED nsPSPrinterList { - public: -@@ -91,12 +90,11 @@ class NS_PSSHARED nsPSPrinterList { - * the <type> portion as described for GetPrinterList(). - * @return The PrinterType value for this name. - */ - static PrinterType GetPrinterType(const nsACString& aName); - - private: - nsCOMPtr<nsIPrefService> mPrefSvc; - nsCOMPtr<nsIPrefBranch> mPref; -- nsCUPSShim mCups; - }; - - #endif /* nsPSPrinters_h___ */ - - diff --git a/mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.diff b/mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.diff deleted file mode 100644 index e5e52f1979c8..000000000000 --- a/mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- enigmail/lang/current-languages.txt -+++ enigmail/lang/current-languages.txt -@@ -1,5 +1,4 @@ - ar --bg-BG - ca - cs-CZ - de-AT diff --git a/mail-client/thunderbird/files/enigmail-1.3.3-bug373733.patch b/mail-client/thunderbird/files/enigmail-1.3.3-bug373733.patch deleted file mode 100644 index 2b8d6d91b693..000000000000 --- a/mail-client/thunderbird/files/enigmail-1.3.3-bug373733.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/mailnews/extensions/enigmail/package/enigmail.js 2011-09-19 10:46:49.000000000 -0500 -+++ b/mailnews/extensions/enigmail/package/enigmail.js 2011-11-11 06:30:21.000000000 -0600 -@@ -924,7 +924,7 @@ - Components.classes["@mozilla.org/file/directory_service;1"]. - getService(Components.interfaces.nsIProperties); - -- var extensionLoc = directoryService.get("ProfD", Components.interfaces.nsIFile); -+ var extensionLoc = directoryService.get("CurProcD", Components.interfaces.nsIFile); - extensionLoc.append("extensions"); - extensionLoc.append(ENIGMAIL_EXTENSION_ID); - extensionLoc.append("wrappers"); -@@ -1460,7 +1460,7 @@ - Components.classes["@mozilla.org/file/directory_service;1"]. - getService(Components.interfaces.nsIProperties); - var extensionLoc = -- directoryService.get("ProfD", Components.interfaces.nsIFile); -+ directoryService.get("CurProcD", Components.interfaces.nsIFile); - extensionLoc.append("extensions"); - extensionLoc.append(ENIGMAIL_EXTENSION_ID); - extensionLoc.append("wrappers"); diff --git a/mail-client/thunderbird/files/icon/thunderbird-icon-unbranded.png b/mail-client/thunderbird/files/icon/thunderbird-icon-unbranded.png Binary files differdeleted file mode 100644 index 27265e08a7ca..000000000000 --- a/mail-client/thunderbird/files/icon/thunderbird-icon-unbranded.png +++ /dev/null diff --git a/mail-client/thunderbird/files/icon/thunderbird-icon.png b/mail-client/thunderbird/files/icon/thunderbird-icon.png Binary files differdeleted file mode 100644 index 90ff395ff5bc..000000000000 --- a/mail-client/thunderbird/files/icon/thunderbird-icon.png +++ /dev/null diff --git a/mail-client/thunderbird/files/libnotify-0.7.patch b/mail-client/thunderbird/files/libnotify-0.7.patch deleted file mode 100644 index ab363a2df070..000000000000 --- a/mail-client/thunderbird/files/libnotify-0.7.patch +++ /dev/null @@ -1,56 +0,0 @@ -# HG changeset patch -# User Priit Laes <plaes@plaes.org> -# Parent 194dd9a57615185c998a87148fac65df51600758 -Bug 628222 - Add support for libnotify-0.7+. r=karlt - -diff --git a/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp b/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp ---- a/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp -+++ b/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp -@@ -42,16 +42,21 @@ - #include "nsNetUtil.h" - #include "nsIImageToPixbuf.h" - #include "nsIStringBundle.h" - - #include <gdk-pixbuf/gdk-pixbuf.h> - #include <libnotify/notify.h> - #include <gdk/gdk.h> - -+// Compatibility macro for <libnotify-0.7 -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif -+ - static PRBool gHasActions = PR_FALSE; - - static void notify_action_cb(NotifyNotification *notification, - gchar *action, gpointer user_data) - { - nsAlertsIconListener* alert = static_cast<nsAlertsIconListener*> (user_data); - alert->SendCallback(); - } -@@ -199,17 +204,23 @@ nsAlertsIconListener::OnStopFrame(imgIRe - return NS_OK; - } - - nsresult - nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf) - { - NotifyNotification* notify = notify_notification_new(mAlertTitle.get(), - mAlertText.get(), -- NULL, NULL); -+ NULL -+// >=libnotify-0.7.0 has no support for attaching to widgets -+#if !NOTIFY_CHECK_VERSION(0,7,0) -+ , NULL -+#endif -+ ); -+ - if (!notify) - return NS_ERROR_OUT_OF_MEMORY; - - if (aPixbuf) - notify_notification_set_icon_from_pixbuf(notify, aPixbuf); - - NS_ADDREF(this); - if (mAlertHasAction) { - diff --git a/mail-client/thunderbird/files/thunderbird-3.1-gcc45.patch b/mail-client/thunderbird/files/thunderbird-3.1-gcc45.patch deleted file mode 100644 index 0757854c04a9..000000000000 --- a/mail-client/thunderbird/files/thunderbird-3.1-gcc45.patch +++ /dev/null @@ -1,37 +0,0 @@ -http://bugs.gentoo.org/324863 - -Fix buffer overflow with GCC 4.5 and -U_FORTIFY_SOURCE=2 - -Patch by Harald van Dijk - ---- comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/hashmgr.cpp -+++ comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/hashmgr.cpp -@@ -187,7 +187,7 @@ - struct hentry* hp = - (struct hentry *) malloc (sizeof(struct hentry) + wbl + descl); - if (!hp) return 1; -- char * hpw = &(hp->word); -+ char * hpw = HENTRY_WORD(hp); - strcpy(hpw, word); - if (ignorechars != NULL) { - if (utf8) { ---- comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/htypes.hxx -+++ comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/htypes.hxx -@@ -57,6 +57,8 @@ - #ifndef _HTYPES_HXX_ - #define _HTYPES_HXX_ - -+#include <cstddef> -+ - #define ROTATE_LEN 5 - - #define ROTATE(v,q) \ -@@ -68,7 +70,7 @@ - #define H_OPT_PHON (1 << 2) - - // see also csutil.hxx --#define HENTRY_WORD(h) &(h->word) -+#define HENTRY_WORD(h) ((char *) h + offsetof(struct hentry, word)) - - // approx. number of user defined words - #define USERWORD 1000 diff --git a/mail-client/thunderbird/files/thunderbird-3.1-noalsa-fixup.patch b/mail-client/thunderbird/files/thunderbird-3.1-noalsa-fixup.patch deleted file mode 100644 index 5d60b7bc787a..000000000000 --- a/mail-client/thunderbird/files/thunderbird-3.1-noalsa-fixup.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -urN comm-central-orig/mozilla/content/base/src/nsDocument.cpp comm-central/mozilla/content/base/src/nsDocument.cpp ---- comm-central-orig/mozilla/content/base/src/nsDocument.cpp 2010-01-28 22:16:08.683135912 -0600 -+++ comm-central/mozilla/content/base/src/nsDocument.cpp 2010-01-28 22:17:57.605126833 -0600 -@@ -169,7 +169,9 @@ - #include "nsIPropertyBag2.h" - #include "nsIDOMPageTransitionEvent.h" - #include "nsFrameLoader.h" -+#ifdef MOZ_MEDIA - #include "nsHTMLMediaElement.h" -+#endif - - #include "mozAutoDocUpdate.h" - -diff -urN comm-central-orig/mozilla/content/base/src/nsNodeUtils.cpp comm-central/mozilla/content/base/src/nsNodeUtils.cpp ---- comm-central-orig/mozilla/content/base/src/nsNodeUtils.cpp 2010-01-28 22:16:08.686138846 -0600 -+++ comm-central/mozilla/content/base/src/nsNodeUtils.cpp 2010-01-28 22:17:14.618150370 -0600 -@@ -55,7 +55,9 @@ - #endif - #include "nsBindingManager.h" - #include "nsGenericHTMLElement.h" -+#ifdef MOZ_MEDIA - #include "nsHTMLMediaElement.h" -+#endif - - // This macro expects the ownerDocument of content_ to be in scope as - // |nsIDocument* doc| diff --git a/mail-client/thunderbird/files/thunderbird-3.3-gconf-config-update.patch b/mail-client/thunderbird/files/thunderbird-3.3-gconf-config-update.patch deleted file mode 100644 index 8bb723771f4f..000000000000 --- a/mail-client/thunderbird/files/thunderbird-3.3-gconf-config-update.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in -@@ -5031,16 +5031,21 @@ then - fi - MOZ_ENABLE_GIO= - ]) - fi - - dnl ======================================================== - dnl = GConf support module - dnl ======================================================== -+ MOZ_ARG_DISABLE_BOOL(gconf, -+ [ --disable-gconf Disable Gconf support ], -+ MOZ_ENABLE_GCONF=, -+ MOZ_ENABLE_GCONF=force) -+ - if test "$MOZ_ENABLE_GCONF" - then - PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[ - MOZ_ENABLE_GCONF=1 - ],[ - MOZ_ENABLE_GCONF= - ]) - fi -diff --git a/mozilla/configure.in b/mozilla/configure.in ---- a/mozilla/configure.in -+++ b/mozilla/configure.in -@@ -5701,16 +5701,21 @@ then - - AC_SUBST(MOZ_ENABLE_GIO) - AC_SUBST(MOZ_GIO_CFLAGS) - AC_SUBST(MOZ_GIO_LIBS) - - dnl ======================================================== - dnl = GConf support module - dnl ======================================================== -+ MOZ_ARG_DISABLE_BOOL(gconf, -+ [ --disable-gconf Disable Gconf support ], -+ MOZ_ENABLE_GCONF=, -+ MOZ_ENABLE_GCONF=force) -+ - if test "$MOZ_ENABLE_GCONF" - then - PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[ - MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'` - MOZ_ENABLE_GCONF=1 - ],[ - if test "$MOZ_ENABLE_GCONF" = "force" - then diff --git a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js deleted file mode 100644 index 7323bd736d25..000000000000 --- a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js +++ /dev/null @@ -1,9 +0,0 @@ -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("browser.display.use_system_colors", true); -pref("intl.locale.matchOS", true); -pref("mail.shell.checkDefaultClient", false); - -# Do not switch to Smart Folders after upgrade to 3.0b4 -pref("mail.folder.views.version", "1"); - diff --git a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js deleted file mode 100644 index 38bb11c6ee3d..000000000000 --- a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js +++ /dev/null @@ -1,14 +0,0 @@ -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("browser.display.use_system_colors", true); -pref("intl.locale.matchOS", true); -pref("mail.shell.checkDefaultClient", false); - -# Disable global indexing by default -pref("mailnews.database.global.indexer.enabled", false); - -# Do not switch to Smart Folders after upgrade to 3.0b4 -pref("mail.folder.views.version", "1"); - -# Ensure we work with imap as expected -pref("mail.server.default.use_condstore", false) diff --git a/mail-client/thunderbird/files/thunderbird-respect-ldflags.patch b/mail-client/thunderbird/files/thunderbird-respect-ldflags.patch deleted file mode 100644 index c35ec6430fbf..000000000000 --- a/mail-client/thunderbird/files/thunderbird-respect-ldflags.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/directory/c-sdk/build.mk 2010-12-11 08:46:14.137000000 -0600 -+++ b/directory/c-sdk/build.mk 2010-12-11 08:46:17.443000000 -0600 -@@ -488,21 +488,21 @@ - LINK_LIB2 = $(RM) $@; $(AR) $@ $(OBJS2); $(RANLIB) $@ - ifneq ($(LD),$(CC)) - ifdef SONAMEFLAG_PREFIX --LINK_DLL = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \ -+LINK_DLL = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS)\ - $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \ - -o $@ $(SONAMEFLAG_PREFIX)$(notdir $@) $(OBJS) - else # SONAMEFLAG_PREFIX --LINK_DLL = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \ -+LINK_DLL = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS)\ - $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \ - -o $@ $(OBJS) - endif # SONAMEFLAG_PREFIX - else # $(CC) is used to link libs - ifdef SONAMEFLAG_PREFIX --LINK_DLL = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \ -+LINK_DLL = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS)\ - $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \ - -o $@ $(SONAMEFLAG_PREFIX)$(notdir $@) $(OBJS) - else # SONAMEFLAG_PREFIX --LINK_DLL = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \ -+LINK_DLL = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS)\ - $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \ - -o $@ $(OBJS) - endif # SONAMEFLAG_PREFIX diff --git a/mail-client/thunderbird/files/thunderbird-xul-1.9.2-arm-fixes.patch b/mail-client/thunderbird/files/thunderbird-xul-1.9.2-arm-fixes.patch deleted file mode 100644 index c7d7a65bf43d..000000000000 --- a/mail-client/thunderbird/files/thunderbird-xul-1.9.2-arm-fixes.patch +++ /dev/null @@ -1,35 +0,0 @@ -Fix arm OS detection - -https://bugs.gentoo.org/327783 -https://bugzilla.mozilla.org/show_bug.cgi?id=577319 ---- ---- configure.in -+++ configure.in -@@ -1424,9 +1424,11 @@ - CPU_ARCH="$OS_TEST" - ;; - --arm) -+arm*) - if test "$OS_TARGET" = "WINCE"; then - CPU_ARCH="$OS_TEST" -+ else -+ CPU_ARCH="arm" - fi - ;; - esac ---- mozilla/js/src/configure.in -+++ mozilla/js/src/configure.in -@@ -1162,9 +1162,11 @@ - CPU_ARCH="$OS_TEST" - ;; - --arm) -+arm*) - if test "$OS_TARGET" = "WINCE"; then - CPU_ARCH="$OS_TEST" -+ else -+ CPU_ARCH="arm" - fi - ;; - esac diff --git a/mail-client/thunderbird/files/xulrunner-1.9.2-gtk+-2.21.patch b/mail-client/thunderbird/files/xulrunner-1.9.2-gtk+-2.21.patch deleted file mode 100644 index fb414e6c118c..000000000000 --- a/mail-client/thunderbird/files/xulrunner-1.9.2-gtk+-2.21.patch +++ /dev/null @@ -1,23 +0,0 @@ -# HG changeset patch -# User Jonathan Callen <abcd@gentoo.org> -# Parent 2599ed882191d88a8e8f0cb68492a156163c5ca7 -pass MOZ_GTK_CFLAGS to ensure proper includes are avaliable. - -diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in ---- a/mozilla/toolkit/system/gnome/Makefile.in -+++ b/mozilla/toolkit/system/gnome/Makefile.in -@@ -84,13 +84,14 @@ EXTRA_DSO_LDOPTS += \ - $(MOZ_LIBNOTIFY_LIBS) \ - $(NULL) - - LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/ - - include $(topsrcdir)/config/rules.mk - - CXXFLAGS += \ -+ $(MOZ_GTK2_CFLAGS) \ - $(MOZ_GCONF_CFLAGS) \ - $(MOZ_GNOMEVFS_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(MOZ_LIBNOTIFY_CFLAGS) \ - $(NULL) diff --git a/mail-client/thunderbird/thunderbird-3.1.12.ebuild b/mail-client/thunderbird/thunderbird-3.1.12.ebuild deleted file mode 100644 index 5c49874e9557..000000000000 --- a/mail-client/thunderbird/thunderbird-3.1.12.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.12.ebuild,v 1.6 2011/11/14 15:58:24 nirbheek Exp $ - -EAPI="3" -WANT_AUTOCONF="2.1" - -inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools python pax-utils - -# This list can be updated using get_langs.sh from the mozilla overlay -LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \ -fy-NL ga-IE he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru si \ -sk sl sq sv-SE tr uk zh-CN zh-TW" -NOSHORTLANGS="en-GB es-AR pt-BR zh-TW" - -MY_PV="${PV/_rc/rc}" -MY_P="${P/_rc/rc}" - -DESCRIPTION="Thunderbird Mail Client" -HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/" - -KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE="+alsa ldap +crypt bindist gnome libnotify +lightning mozdom system-sqlite wifi" -PATCH="${PN}-3.1-patches-1.2" - -REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases" -SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2 - http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" - -for X in ${LANGS} ; do - if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then - SRC_URI="${SRC_URI} - linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" - fi - IUSE="${IUSE} linguas_${X/-/_}" - # english is handled internally - if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then - if [ "${X}" != "en-US" ]; then - SRC_URI="${SRC_URI} - linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" - fi - IUSE="${IUSE} linguas_${X%%-*}" - fi -done - -RDEPEND=">=sys-devel/binutils-2.16.1 - >=dev-libs/nss-3.12.8 - >=dev-libs/nspr-4.8.6 - >=app-text/hunspell-1.2 - x11-libs/cairo[X] - alsa? ( media-libs/alsa-lib ) - gnome? ( >=gnome-base/gnome-vfs-2.16.3 - >=gnome-base/libgnomeui-2.16.1 - >=gnome-base/gconf-2.16.0 - >=gnome-base/libgnome-2.16.0 ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) - wifi? ( net-wireless/wireless-tools )" - -DEPEND="${RDEPEND} - =dev-lang/python-2*[threads]" - -PDEPEND="crypt? ( >=x11-plugins/enigmail-1.1 )" - -S="${WORKDIR}"/comm-1.9.2 - -linguas() { - local LANG SLANG - for LANG in ${LINGUAS}; do - if has ${LANG} en en_US; then - has en ${linguas} || linguas="${linguas:+"${linguas} "}en" - continue - elif has ${LANG} ${LANGS//-/_}; then - has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" - continue - elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then - for X in ${LANGS}; do - if [[ "${X}" == "${LANG}-"* ]] && \ - [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then - has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" - continue 2 - fi - done - fi - ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" - done -} - -pkg_setup() { - export BUILD_OFFICIAL=1 - export MOZILLA_OFFICIAL=1 - export ALDFLAGS=${LDFLAGS} - - if ! use bindist; then - elog "You are enabling official branding. You may not redistribute this build" - elog "to any users on your network or the internet. Doing so puts yourself into" - elog "a legal problem with Mozilla Foundation" - elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" - fi - - python_set_active_version 2 -} - -src_unpack() { - unpack ${A} - - linguas - for X in ${linguas}; do - # FIXME: Add support for unpacking xpis to portage - [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" - done - if [[ ${linguas} != "" && ${linguas} != "en" ]]; then - einfo "Selected language packs (first will be default): ${linguas}" - fi -} - -src_prepare() { - # Apply our patches - EPATCH_EXCLUDE="1002-fix_hunspell_double_buffer.patch" \ - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}" - - epatch "${FILESDIR}/bug-606109.patch" - - # Allow user to apply any additional patches without modifing ebuild - epatch_user - - eautoreconf - - cd mozilla - eautoreconf - cd js/src - eautoreconf -} - -src_configure() { - declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - MEXTENSIONS="default" - - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - touch mail/config/mozconfig - mozconfig_init - mozconfig_config - - # It doesn't compile on alpha without this LDFLAGS - use alpha && append-ldflags "-Wl,--no-relax" - - mozconfig_annotate '' --enable-crypto - mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" - mozconfig_annotate '' --enable-application=mail - mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}" - mozconfig_annotate '' --with-user-appdir=.thunderbird - mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr - mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr - mozconfig_annotate '' --with-sqlite-prefix="${EPREFIX}"/usr - mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate 'broken' --disable-crashreporter - mozconfig_annotate '' --enable-system-hunspell - - # Use enable features - mozconfig_use_enable ldap - mozconfig_use_enable ldap ldap-experimental - mozconfig_use_enable gnome gnomevfs - mozconfig_use_enable gnome gnomeui - mozconfig_use_enable libnotify - mozconfig_use_enable lightning calendar - mozconfig_use_enable wifi necko-wifi - mozconfig_use_enable system-sqlite - mozconfig_use_enable !bindist official-branding - mozconfig_use_enable alsa ogg - mozconfig_use_enable alsa wave - - # Bug #72667 - if use mozdom; then - MEXTENSIONS="${MEXTENSIONS},inspector" - fi - - # Finalize and report settings - mozconfig_final - - #################################### - # - # Configure and build - # - #################################### - - # Disable no-print-directory - MAKEOPTS=${MAKEOPTS/--no-print-directory/} - - if [[ $(gcc-major-version) -lt 4 ]]; then - append-cxxflags -fno-stack-protector - fi - - CPPFLAGS="${CPPFLAGS}" \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - econf || die -} - -src_compile() { - # Should the build use multiprocessing? Not enabled by default, as it tends to break - [ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1" - emake ${jobs} || die -} - -src_install() { - declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - - emake DESTDIR="${D}" install || die "emake install failed" - - if use lightning ; then - declare emid emd1 emid2 - - emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}" - dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} - cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} - unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi - - emid1="calendar-timezones@mozilla.org" - dodir ${MOZILLA_FIVE_HOME}/extensions/${emid1} - cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid1} - unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi - - emid2="{e2fda1a4-762b-4020-b5ad-a41df1933103}" - dodir ${MOZILLA_FIVE_HOME}/extensions/${emid2} - cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid2} - unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi - fi - - linguas - for X in ${linguas}; do - [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" - done - - if ! use bindist; then - newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png - domenu "${FILESDIR}"/icon/${PN}.desktop - else - newicon "${S}"/mail/branding/unofficial/content/icon48.png thunderbird-icon-unbranded.png - newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \ - ${PN}.desktop - - sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \ - "${D}"/usr/share/applications/${PN}.desktop - - fi - - # Warn user that remerging enigmail is neccessary on USE=crypt - use crypt && ewarn "Please remerge x11-plugins/enigmail after updating ${PN}." - - # Enable very specific settings for thunderbird-3 - cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js \ - "${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \ - die "failed to cp thunderbird-gentoo-default-prefs.js" - - pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin -} diff --git a/mail-client/thunderbird/thunderbird-3.1.14.ebuild b/mail-client/thunderbird/thunderbird-3.1.14.ebuild deleted file mode 100644 index bbd204645799..000000000000 --- a/mail-client/thunderbird/thunderbird-3.1.14.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.14.ebuild,v 1.2 2011/11/14 15:58:24 nirbheek Exp $ - -EAPI="3" -WANT_AUTOCONF="2.1" - -inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools python pax-utils - -# This list can be updated using get_langs.sh from the mozilla overlay -LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \ -fy-NL ga-IE he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru si \ -sk sl sq sv-SE tr uk zh-CN zh-TW" -NOSHORTLANGS="en-GB es-AR pt-BR zh-TW" - -MY_PV="${PV/_rc/rc}" -MY_P="${P/_rc/rc}" - -DESCRIPTION="Thunderbird Mail Client" -HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE="+alsa ldap +crypt bindist gnome libnotify +lightning mozdom system-sqlite wifi" -PATCH="${PN}-3.1-patches-1.2" - -REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases" -SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2 - http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" - -for X in ${LANGS} ; do - if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then - SRC_URI="${SRC_URI} - linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" - fi - IUSE="${IUSE} linguas_${X/-/_}" - # english is handled internally - if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then - if [ "${X}" != "en-US" ]; then - SRC_URI="${SRC_URI} - linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" - fi - IUSE="${IUSE} linguas_${X%%-*}" - fi -done - -RDEPEND=">=sys-devel/binutils-2.16.1 - >=dev-libs/nss-3.12.8 - >=dev-libs/nspr-4.8.6 - >=app-text/hunspell-1.2 - x11-libs/cairo[X] - alsa? ( media-libs/alsa-lib ) - gnome? ( >=gnome-base/gnome-vfs-2.16.3 - >=gnome-base/libgnomeui-2.16.1 - >=gnome-base/gconf-2.16.0 - >=gnome-base/libgnome-2.16.0 ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) - wifi? ( net-wireless/wireless-tools )" - -DEPEND="${RDEPEND} - =dev-lang/python-2*[threads]" - -PDEPEND="crypt? ( >=x11-plugins/enigmail-1.1 )" - -S="${WORKDIR}"/comm-1.9.2 - -linguas() { - local LANG SLANG - for LANG in ${LINGUAS}; do - if has ${LANG} en en_US; then - has en ${linguas} || linguas="${linguas:+"${linguas} "}en" - continue - elif has ${LANG} ${LANGS//-/_}; then - has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" - continue - elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then - for X in ${LANGS}; do - if [[ "${X}" == "${LANG}-"* ]] && \ - [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then - has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" - continue 2 - fi - done - fi - ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" - done -} - -pkg_setup() { - export BUILD_OFFICIAL=1 - export MOZILLA_OFFICIAL=1 - export ALDFLAGS=${LDFLAGS} - - if ! use bindist; then - elog "You are enabling official branding. You may not redistribute this build" - elog "to any users on your network or the internet. Doing so puts yourself into" - elog "a legal problem with Mozilla Foundation" - elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" - fi - - python_set_active_version 2 -} - -src_unpack() { - unpack ${A} - - linguas - for X in ${linguas}; do - # FIXME: Add support for unpacking xpis to portage - [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" - done - if [[ ${linguas} != "" && ${linguas} != "en" ]]; then - einfo "Selected language packs (first will be default): ${linguas}" - fi -} - -src_prepare() { - # Apply our patches - EPATCH_EXCLUDE="1002-fix_hunspell_double_buffer.patch" \ - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}" - - epatch "${FILESDIR}/bug-606109.patch" - - # Allow user to apply any additional patches without modifing ebuild - epatch_user - - eautoreconf - - cd mozilla - eautoreconf - cd js/src - eautoreconf -} - -src_configure() { - declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - MEXTENSIONS="default" - - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - touch mail/config/mozconfig - mozconfig_init - mozconfig_config - - # It doesn't compile on alpha without this LDFLAGS - use alpha && append-ldflags "-Wl,--no-relax" - - mozconfig_annotate '' --enable-crypto - mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" - mozconfig_annotate '' --enable-application=mail - mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}" - mozconfig_annotate '' --with-user-appdir=.thunderbird - mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr - mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr - mozconfig_annotate '' --with-sqlite-prefix="${EPREFIX}"/usr - mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate 'broken' --disable-crashreporter - mozconfig_annotate '' --enable-system-hunspell - - # Use enable features - mozconfig_use_enable ldap - mozconfig_use_enable ldap ldap-experimental - mozconfig_use_enable gnome gnomevfs - mozconfig_use_enable gnome gnomeui - mozconfig_use_enable libnotify - mozconfig_use_enable lightning calendar - mozconfig_use_enable wifi necko-wifi - mozconfig_use_enable system-sqlite - mozconfig_use_enable !bindist official-branding - mozconfig_use_enable alsa ogg - mozconfig_use_enable alsa wave - - # Bug #72667 - if use mozdom; then - MEXTENSIONS="${MEXTENSIONS},inspector" - fi - - # Finalize and report settings - mozconfig_final - - #################################### - # - # Configure and build - # - #################################### - - # Disable no-print-directory - MAKEOPTS=${MAKEOPTS/--no-print-directory/} - - if [[ $(gcc-major-version) -lt 4 ]]; then - append-cxxflags -fno-stack-protector - fi - - CPPFLAGS="${CPPFLAGS}" \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - econf || die -} - -src_compile() { - # Should the build use multiprocessing? Not enabled by default, as it tends to break - [ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1" - emake ${jobs} || die -} - -src_install() { - declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - - emake DESTDIR="${D}" install || die "emake install failed" - - if use lightning ; then - declare emid emd1 emid2 - - emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}" - dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} - cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} - unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi - - emid1="calendar-timezones@mozilla.org" - dodir ${MOZILLA_FIVE_HOME}/extensions/${emid1} - cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid1} - unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi - - emid2="{e2fda1a4-762b-4020-b5ad-a41df1933103}" - dodir ${MOZILLA_FIVE_HOME}/extensions/${emid2} - cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid2} - unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi - fi - - linguas - for X in ${linguas}; do - [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" - done - - if ! use bindist; then - newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png - domenu "${FILESDIR}"/icon/${PN}.desktop - else - newicon "${S}"/mail/branding/unofficial/content/icon48.png thunderbird-icon-unbranded.png - newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \ - ${PN}.desktop - - sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \ - "${D}"/usr/share/applications/${PN}.desktop - - fi - - # Warn user that remerging enigmail is neccessary on USE=crypt - use crypt && ewarn "Please remerge x11-plugins/enigmail after updating ${PN}." - - # Enable very specific settings for thunderbird-3 - cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js \ - "${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \ - die "failed to cp thunderbird-gentoo-default-prefs.js" - - pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin -} |
