public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, mail-client/thunderbird/files/
Date: Sat, 16 Apr 2011 13:00:41 +0000 (UTC)	[thread overview]
Message-ID: <2c8d3620cda670e5fd715332e2ad158b45bd1e62.anarchy@gentoo> (raw)

commit:     2c8d3620cda670e5fd715332e2ad158b45bd1e62
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 13:01:03 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 13:01:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=2c8d3620

roll snapshot, include support for libpng-1.5 in thunderbird

---
 mail-client/thunderbird/Manifest                   |    7 +-
 .../1001-xulrunner_fix_jemalloc_vs_aslr.patch      |   55 -------
 .../2000-thunderbird_gentoo_install_dirs.patch     |   22 ---
 .../thunderbird/files/mozilla-2.0-gcc46.patch      |  165 --------------------
 .../thunderbird-3.3-gconf-config-update.patch      |   50 ------
 .../thunderbird/thunderbird-3.3_alpha3-r1.ebuild   |   17 +-
 6 files changed, 10 insertions(+), 306 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 290a991..1bba889 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,11 +1,8 @@
-AUX 1001-xulrunner_fix_jemalloc_vs_aslr.patch 1936 RMD160 4edd9e5ab5082f86cb66ad1fc158e4c105f861ce SHA1 20df285bac8e0704559c0479f7dfe02f030afa8a SHA256 0beb08f2b3fc504897b1024caabcf2887b55fae31c021341c66d3491dc63e32b
-AUX 2000-thunderbird_gentoo_install_dirs.patch 813 RMD160 802697aab947df43693d7330f5d83700a62a6b50 SHA1 d2621bc80130239d7d65562ce8de8488dcbf60e2 SHA256 f663f3e59ac1752d681ed5d09bd599693009a65f603c89fa6d2e851b3487a8c4
 AUX enigmail-1.1.2-20110124-locale-fixup.diff 125 RMD160 8704469817cd93c99665a35655fa626b74253920 SHA1 708e101ae0576f99d6f10ac778fbc2b76c3ff6ea SHA256 60627ed65b032e33935d14eea4c7224f940641c4a11ab8bdf2c5d6056a76bfda
 AUX icon/thunderbird-unbranded.desktop 277 RMD160 49301b139cddf8c88d7168fa94229581e89f57fa SHA1 d8a6a4b41b7e62cf8b2e69d24f22c30dc80dfa29 SHA256 e31c806e820e33ed56d3ca112443c39b8506140c82bb57dd1a84c03b45fec598
 AUX icon/thunderbird.desktop 267 RMD160 109313e3ae88d0cd991e831cafbb3f4856b84478 SHA1 861c4cd25a936078597b909bd444164fbf38c82c SHA256 d1e91cf5596d3044e6a1089ce7e97b431eb1fb93afd7b353c6587fc8c4fc2a6f
-AUX mozilla-2.0-gcc46.patch 5474 RMD160 6df99f01de7d95351afc2b5dad2ee9471c7ee71f SHA1 14781debf8a99f2ca487b2d6a2facb8ac6d53a44 SHA256 6a554bbb2d1c0bf6b221c1c6f5429fd0d6d8feb0632ef7251724eeb62a506906
-AUX thunderbird-3.3-gconf-config-update.patch 1569 RMD160 e237530c4d95de84aa295927fd1c703d8a54b9a9 SHA1 6f78524f88fd7b3f4fef4eec1666eabe96c89992 SHA256 9da47f2752f7bb353297b93be3aaecf2d6004af3c91717d22e35a347ee6cf2a2
 AUX thunderbird-gentoo-default-prefs-1.js 387 RMD160 5d7362448204c7ea6cf81b06446373097e358d44 SHA1 b3e706e3c24eda4d87e3f13bd4a43dfb45a3dfb3 SHA256 ecf4bafbf81675abb01c3e0f0ab9fdf3c5722868ed0440670e2a530ca85f219c
 DIST enigmail-1.2a1-20110316.tar.bz2 905604 RMD160 57bb867f70f6b37ee11d426a8e155f2ccf5d56d2 SHA1 371e3c8bd7157ed8aee7648a271df591db75f8c2 SHA256 113db06ab1621328635c5394174afe02bef9c154c46b62ea7c605ac0a0b2beba
+DIST thunderbird-3.3-patches-0.2.tar.bz2 4404 RMD160 2bc1a86867f01cb5bf8f29b4e3d65bf662279bf7 SHA1 11f37a4b53bc59e767768d793f126129e8666abf SHA256 3ddd4a086f19b4871160fe72dc920eaed8ef6ed872ac22f8d6759e84a8e4d1f8
 DIST thunderbird-3.3a3.source.tar.bz2 83692340 RMD160 79ec91e73d6f1e64f16efae9c6ec333a2e54b220 SHA1 416c085e92a04c12c49b7f1ad41effb7ef24ece9 SHA256 7f5487449023a68784d800fdd38c25d30356972b27b0a23c2ba162c149161618
-EBUILD thunderbird-3.3_alpha3-r1.ebuild 7891 RMD160 92b854a63330f7884c9e018cbb18049ac6db4f8e SHA1 9f12d09a0c8b9e45f36cb0ebd4e928464ec3d633 SHA256 70e416d868f5a8010296d592853e311b910ac4712f11d532c01b5a7126aa6a70
+EBUILD thunderbird-3.3_alpha3-r1.ebuild 7725 RMD160 1835619c58fe682ec54f79bedacb9feb146d6e08 SHA1 aadc1d06125fc2d94c799f9f4a4395342f0d7aa0 SHA256 a7d2341447746f50a0890b1727cde92f688da02dc856ee7173fc8314dce8bf96

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 7511ac7..0000000
--- 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/2000-thunderbird_gentoo_install_dirs.patch b/mail-client/thunderbird/files/2000-thunderbird_gentoo_install_dirs.patch
deleted file mode 100644
index b3af6f3..0000000
--- 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/mozilla-2.0-gcc46.patch b/mail-client/thunderbird/files/mozilla-2.0-gcc46.patch
deleted file mode 100644
index 3c3e8e9..0000000
--- a/mail-client/thunderbird/files/mozilla-2.0-gcc46.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-# HG changeset patch
-# User Rafael Ávila de Espíndola <respindola@mozilla.com>
-# Date 1301009215 14400
-# Node ID ca41c566399956643d79ac88bfac1d63ea3b2bcc
-# Parent  92b43aa07b7d8ca9833c98ddb3d4da30d0693ed8
-Bug 623126 - Add constructor for nsDebugImpl, nsTraceRefcntImpl, EmptyEnumeratorImpl, and nsSimpleUnicharStreamFactory to placate CLang; r=bsmedberg
-
-diff --git a/mozilla/xpcom/base/nsDebugImpl.h b/mozilla/xpcom/base/nsDebugImpl.h
---- a/mozilla/xpcom/base/nsDebugImpl.h
-+++ b/mozilla/xpcom/base/nsDebugImpl.h
-@@ -35,16 +35,17 @@
-  * ***** END LICENSE BLOCK ***** */
- 
- #include "nsIDebug.h"
- #include "nsIDebug2.h"
- 
- class nsDebugImpl : public nsIDebug2
- {
- public:
-+    nsDebugImpl() {}
-     NS_DECL_ISUPPORTS
-     NS_DECL_NSIDEBUG
-     NS_DECL_NSIDEBUG2
-     
-     static nsresult Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr);
- };
- 
- 
-diff --git a/mozilla/xpcom/base/nsTraceRefcntImpl.h b/mozilla/xpcom/base/nsTraceRefcntImpl.h
---- a/mozilla/xpcom/base/nsTraceRefcntImpl.h
-+++ b/mozilla/xpcom/base/nsTraceRefcntImpl.h
-@@ -39,16 +39,17 @@
- #define nsTraceRefcntImpl_h___
- 
- #include <stdio.h> // for FILE
- #include "nsITraceRefcnt.h"
- 
- class nsTraceRefcntImpl : public nsITraceRefcnt
- {
- public:
-+  nsTraceRefcntImpl() {}
-   NS_DECL_ISUPPORTS
-   NS_DECL_NSITRACEREFCNT
- 
-   static NS_COM void Startup();
-   static NS_COM void Shutdown();
- 
-   enum StatisticsType {
-     ALL_STATS,
-diff --git a/mozilla/xpcom/glue/nsEnumeratorUtils.cpp b/mozilla/xpcom/glue/nsEnumeratorUtils.cpp
---- a/mozilla/xpcom/glue/nsEnumeratorUtils.cpp
-+++ b/mozilla/xpcom/glue/nsEnumeratorUtils.cpp
-@@ -47,16 +47,17 @@
- 
- #include "nsCOMPtr.h"
- 
- class EmptyEnumeratorImpl : public nsISimpleEnumerator,
-                             public nsIUTF8StringEnumerator,
-                             public nsIStringEnumerator
- {
- public:
-+    EmptyEnumeratorImpl() {}
-     // nsISupports interface
-     NS_DECL_ISUPPORTS_INHERITED  // not really inherited, but no mRefCnt
- 
-     // nsISimpleEnumerator
-     NS_DECL_NSISIMPLEENUMERATOR
-     NS_DECL_NSIUTF8STRINGENUMERATOR
-     // can't use NS_DECL_NSISTRINGENUMERATOR because they share the
-     // HasMore() signature
-diff --git a/mozilla/xpcom/io/nsUnicharInputStream.h b/mozilla/xpcom/io/nsUnicharInputStream.h
---- a/mozilla/xpcom/io/nsUnicharInputStream.h
-+++ b/mozilla/xpcom/io/nsUnicharInputStream.h
-@@ -46,16 +46,17 @@
- #define NS_SIMPLE_UNICHAR_STREAM_FACTORY_CID \
- { 0x428dca6f, 0x1a0f, 0x4cda, { 0xb5, 0x16, 0xd, 0x52, 0x44, 0x74, 0x5a, 0x6a } }
- 
- class nsSimpleUnicharStreamFactory :
-   public nsIFactory, 
-   private nsISimpleUnicharStreamFactory
- {
- public:
-+  nsSimpleUnicharStreamFactory() {}
-   NS_DECL_ISUPPORTS_INHERITED
-   NS_DECL_NSIFACTORY
-   NS_DECL_NSISIMPLEUNICHARSTREAMFACTORY
- 
-   static NS_COM nsSimpleUnicharStreamFactory* GetInstance();
- 
- private:
-   static const nsSimpleUnicharStreamFactory kInstance;
-
-
-diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
-index 57fd9b1..0052ca7 100644
---- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
-+++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
-@@ -99,6 +99,7 @@ nsIDirectoryServiceProvider *EmbedPrivate::sAppFileLocProvider = nsnull;
- class GTKEmbedDirectoryProvider : public nsIDirectoryServiceProvider2
- {
- public:
-+  GTKEmbedDirectoryProvider() {}
-   NS_DECL_ISUPPORTS_INHERITED
-   NS_DECL_NSIDIRECTORYSERVICEPROVIDER
-   NS_DECL_NSIDIRECTORYSERVICEPROVIDER2
-
-# HG changeset patch
-# User Rafael Ávila de Espíndola <respindola@mozilla.com>
-# Date 1301009369 14400
-# Node ID 570781a55419e42e0ddd43d5d9da070dd022772d
-# Parent  b26e0f9e43e8f44b6663fdb29e9ee8a14c955e22
-Bug 623123 - Add constructor for nsXULAppInfo (which inherits from nsIXULAppInfo) to placate CLang; r=bsmedberg
-
-diff --git a/mozilla/toolkit/xre/nsAppRunner.cpp b/mozilla/toolkit/xre/nsAppRunner.cpp
---- a/mozilla/toolkit/xre/nsAppRunner.cpp
-+++ b/mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -608,16 +608,17 @@ class nsXULAppInfo : public nsIXULAppInf
- #endif
- #ifdef MOZ_CRASHREPORTER
-                      public nsICrashReporter,
- #endif
-                      public nsIXULRuntime
- 
- {
- public:
-+  nsXULAppInfo() {}
-   NS_DECL_ISUPPORTS_INHERITED
-   NS_DECL_NSIXULAPPINFO
-   NS_DECL_NSIXULRUNTIME
- #ifdef MOZ_CRASHREPORTER
-   NS_DECL_NSICRASHREPORTER
- #endif
- #ifdef XP_WIN
-   NS_DECL_NSIWINAPPHELPER
-
-# HG changeset patch
-# User Rafael Ávila de Espíndola <respindola@mozilla.com>
-# Date 1301011307 14400
-# Node ID 067fdfe97f0d9b0400e665d38578c0b3a0f670db
-# Parent  17015e66511231d618d2915aecfc146c18a873a5
-Bug 623116 - Add constructor for nsASCIICaseInsensitiveStringComparator (which inherits from nsStringComparator) to placate CLang; r=smontagu
-
-diff --git a/mozilla/intl/unicharutil/util/nsUnicharUtils.h b/mozilla/intl/unicharutil/util/nsUnicharUtils.h
---- a/mozilla/intl/unicharutil/util/nsUnicharUtils.h
-+++ b/mozilla/intl/unicharutil/util/nsUnicharUtils.h
-@@ -98,16 +98,17 @@ public:
-   PRBool Equals(const A& a, const B& b) const {
-     return a.Equals(b, nsCaseInsensitiveStringComparator());
-   }
- };
- 
- class nsASCIICaseInsensitiveStringComparator : public nsStringComparator
- {
- public:
-+  nsASCIICaseInsensitiveStringComparator() {}
-   virtual int operator() (const PRUnichar*,
-                           const PRUnichar*,
-                           PRUint32,
-                           PRUint32) const;
- };
- 
- inline PRBool
- CaseInsensitiveFindInReadable(const nsAString& aPattern,
-
-

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 8bb7237..0000000
--- 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/thunderbird-3.3_alpha3-r1.ebuild b/mail-client/thunderbird/thunderbird-3.3_alpha3-r1.ebuild
index 6cdd98f..a07e4e5 100644
--- a/mail-client/thunderbird/thunderbird-3.3_alpha3-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.3_alpha3-r1.ebuild
@@ -24,12 +24,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linu
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom"
-#PATCH="${PN}-3.1-patches-1.2"
+PATCH="${PN}-3.3-patches-0.2"
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases"
 SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2
-	crypt? ( http://dev.gentoo.org/~anarchy/mozilla/firefox/enigmail-${EMVER}-20110316.tar.bz2 )"
-#	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
+	crypt? ( http://dev.gentoo.org/~anarchy/mozilla/firefox/enigmail-${EMVER}-20110316.tar.bz2 )
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
 
 #for X in ${LANGS} ; do
 #	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
@@ -115,17 +115,16 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/1001-xulrunner_fix_jemalloc_vs_aslr.patch"
-	epatch "${FILESDIR}/2000-thunderbird_gentoo_install_dirs.patch"
-	epatch "${FILESDIR}/thunderbird-3.3-gconf-config-update.patch"
-	epatch "${FILESDIR}/mozilla-2.0-gcc46.patch"
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
 
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
 		cd "${S}"/mailnews/extensions/enigmail || die
 		epatch "${FILESDIR}"/enigmail-1.1.2-20110124-locale-fixup.diff
-		cd enigmail
-		./makemake -r 2> /dev/null
+		./makemake -r 2&> /dev/null
 		sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in
 		cd "${S}"
 	fi



             reply	other threads:[~2011-04-16 13:00 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-16 13:00 Jory Pratt [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-08-30 14:14 [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, mail-client/thunderbird/files/ Jory Pratt
2018-11-30 20:09 Ian Stakenvicius
2018-10-22 20:15 Ian Stakenvicius
2018-08-15 21:11 Ian Stakenvicius
2017-01-08 21:19 Jory Pratt
2016-10-06 16:31 Ian Stakenvicius
2015-06-10  1:31 Jory Pratt
2013-12-14  0:48 Jory Pratt
2013-09-23 21:14 Jory Pratt
2012-02-01  2:33 Jory Pratt
2011-12-11 22:50 Jory Pratt
2011-11-11 13:44 Jory Pratt
2011-10-02 23:48 Jory Pratt
2011-06-06 14:16 Jory Pratt
2011-04-10 20:01 Jory Pratt
2011-04-04  2:41 Jory Pratt
2011-03-28 20:12 Jory Pratt
2011-03-17  2:53 Jory Pratt
2011-03-06  2:42 Jory Pratt
2011-02-04  5:57 anarchy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2c8d3620cda670e5fd715332e2ad158b45bd1e62.anarchy@gentoo \
    --to=anarchy@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox