diff options
author | Jory Pratt <anarchy@gentoo.org> | 2010-08-03 03:19:19 +0000 |
---|---|---|
committer | Jory Pratt <anarchy@gentoo.org> | 2010-08-03 03:19:19 +0000 |
commit | ce8ded9fe950cc1f2b7f811dd565f93dcbca1d91 (patch) | |
tree | 1d4721d85b9a03238d1a04d1b9e2b9b22b9026d4 /mail-client | |
parent | Initial package for the GStreamer plugin to transfer audio data with JACK por... (diff) | |
download | historical-ce8ded9fe950cc1f2b7f811dd565f93dcbca1d91.tar.gz historical-ce8ded9fe950cc1f2b7f811dd565f93dcbca1d91.tar.bz2 historical-ce8ded9fe950cc1f2b7f811dd565f93dcbca1d91.zip |
Fix bug #330791
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'mail-client')
-rw-r--r-- | mail-client/thunderbird/ChangeLog | 6 | ||||
-rw-r--r-- | mail-client/thunderbird/Manifest | 5 | ||||
-rw-r--r-- | mail-client/thunderbird/files/comm-1.9.2-disable-printing.patch | 154 | ||||
-rw-r--r-- | mail-client/thunderbird/thunderbird-3.1.1-r2.ebuild | 4 |
4 files changed, 165 insertions, 4 deletions
diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog index 7b379209abaa..8984d8a36717 100644 --- a/mail-client/thunderbird/ChangeLog +++ b/mail-client/thunderbird/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-client/thunderbird # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.24 2010/08/02 16:22:10 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.25 2010/08/03 03:19:18 anarchy Exp $ + + 03 Aug 2010; Jory A. Pratt <anarchy@gentoo.org> + +files/comm-1.9.2-disable-printing.patch, thunderbird-3.1.1-r2.ebuild: + Fix bug #330791, use -cups 02 Aug 2010; Jory A. Pratt <anarchy@gentoo.org> thunderbird-3.1.1-r2.ebuild: diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest index 1123850c7a66..4979af601580 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -1,4 +1,5 @@ AUX 1002_fix-system-hunspell-dict-detections.patch 3466 RMD160 f8fa846e5d7c80a15d0abf0c6aedb7302ead1f83 SHA1 091febd913c09c86c9242b1be8960fb012ee7c8d SHA256 7ce51cae6bbd6655c8bc543365370627e37d2fc5aa7f7e1270671f7482df344a +AUX comm-1.9.2-disable-printing.patch 4928 RMD160 4f3d51f8aae7d22167d3768c8fe9a2d8c0f2c2b6 SHA1 cb3392b5b8fa6ac9ebaa49e8efd36aca7dffbaf4 SHA256 5aea938b71117028bd3c8c4de0ffced579e12247edda481eac78aad0ba08bdac AUX icon/thunderbird-icon-unbranded.png 13280 RMD160 1654b2cfa39631e2084da982001113972eb41c09 SHA1 2fdca79e57c79d2485eb56d31de7afb05337898e SHA256 28b605529bee4d8245afdbb2cab5a705d8fa8977a11635b54c7bc5a7d6a9619c AUX icon/thunderbird-icon.png 6499 RMD160 1aeece7719c1c1629b98fc11870641769681a048 SHA1 651d244e96fa0edf13f68f5ef9047432eb6ed3bf SHA256 ff9749e42b82b80425bb52883d63baa53298af7be98870ee6b73f0a6cf0ab22d AUX icon/thunderbird-unbranded.desktop 183 RMD160 2aeecc5f6127adee0c9ab1e1c83a29bafb82f41e SHA1 3c7533d73abf8208e2117de1601ac31935994021 SHA256 b42bda8d82722d069049889f14887aabc9f3e139a023186780ffff222ca5722d @@ -109,7 +110,7 @@ DIST thunderbird-3.1.1-zh-CN.xpi 219674 RMD160 e05a4709ebf7225e0d70b65390c61888c DIST thunderbird-3.1.1-zh-TW.xpi 220541 RMD160 963b3d635e729e441db866a09ad8521b49d50b8f SHA1 b0360bcb6ba3d290bc2c88f00d68580f3c28122a SHA256 19692871424be9cc6f6ef4ed2f61dd684267db130cf15923a5437685786742c1 DIST thunderbird-3.1.1.source.tar.bz2 65820406 RMD160 f7c635610eace54a29601a796f8f5e34bc7d198e SHA1 8e25fd786fbe094c3f4d9bc4e18285701bd42279 SHA256 206a0fb7d9464b5e3b46c8ad5f1b76fd3de88858236dd5f9b7082f5b893e955d EBUILD thunderbird-3.0.5.ebuild 7130 RMD160 e11f8ebb4e0772568f8e007e8e58e8ad35d9307d SHA1 3e04a0b53efafe0f8b5eb1ddd4f109e60c32b0bc SHA256 57e047f39eba42f92ddfd69457792319388aabd4984252588bef564161889b66 -EBUILD thunderbird-3.1.1-r2.ebuild 7472 RMD160 b7ffde9cf471553235c24dd322c1085898295f25 SHA1 b9e4bd634bd892ea2122f28859aca48126381960 SHA256 452d091e945e38d02e4f5a3751cd828afb641de04b7af904573215d91e28e219 +EBUILD thunderbird-3.1.1-r2.ebuild 7529 RMD160 fda088350b4f3ea3dffcf0708aeb8c89bac663d8 SHA1 27e5a6750f27494577bd45352ebe68bdf940e22b SHA256 a66f747b76e283baa56024e4f24f9c34e4cf680f482d3479dd7b8b50dff51c04 EBUILD thunderbird-3.1.1.ebuild 7527 RMD160 5523d10d81cd91ec455c5eccf7d07bc0613e9e12 SHA1 30c560b9012aa2a0f061e127d3b8e62c357ae8c6 SHA256 734368409156dbb0e60c73a509424b4b306f9aba77d1bc5fdfdd3e0c4ebe27a7 -MISC ChangeLog 54210 RMD160 0d9e071b94e2c966661cabd16bd88351384a4ae7 SHA1 79175311d09270c16e841e9679f91459bc34f2dd SHA256 d78c356a10b91eee057a142cdc8ea3eff3f39a1542827b3d60ff2d64443d14c2 +MISC ChangeLog 54363 RMD160 03675713a32967e9b79cfc6e6f351cac2311c927 SHA1 ea05005ae57c174c8162d452094da63ffd5c5f94 SHA256 ab11d96584365322b5327d2c52cd0a879bd92a835ca850aeed43ed43d89857de MISC metadata.xml 471 RMD160 dd596368f27518e6d32d724e878d8dfb0303fb68 SHA1 147c70ac08b477679be27a428679c4c06ce0c1f0 SHA256 8f3f2c2b7c204fa12ce8ab51e655985374ea469d3870680b6925d541dbf56ef3 diff --git a/mail-client/thunderbird/files/comm-1.9.2-disable-printing.patch b/mail-client/thunderbird/files/comm-1.9.2-disable-printing.patch new file mode 100644 index 000000000000..834ac867976e --- /dev/null +++ b/mail-client/thunderbird/files/comm-1.9.2-disable-printing.patch @@ -0,0 +1,154 @@ +diff --git a/mailnews/base/src/Makefile.in b/mailnews/base/src/Makefile.in +--- a/mailnews/base/src/Makefile.in ++++ b/mailnews/base/src/Makefile.in +@@ -110,17 +110,16 @@ CPPSRCS = \ + nsMsgFolderCache.cpp \ + nsMsgFolderCacheElement.cpp \ + nsMsgFolderCompactor.cpp \ + nsMsgStatusFeedback.cpp \ + nsMsgWindow.cpp \ + nsMsgServiceProvider.cpp \ + nsSubscribeDataSource.cpp \ + nsSubscribableServer.cpp \ +- nsMsgPrintEngine.cpp \ + nsStatusBarBiffManager.cpp \ + nsMsgDBView.cpp \ + nsMsgThreadedDBView.cpp \ + nsMsgSpecialViews.cpp \ + nsMsgQuickSearchDBView.cpp \ + nsMsgSearchDBView.cpp \ + nsMsgXFVirtualFolderDBView.cpp \ + nsMsgXFViewThread.cpp \ +@@ -132,16 +131,22 @@ CPPSRCS = \ + nsSpamSettings.cpp \ + nsCidProtocolHandler.cpp \ + nsMsgContentPolicy.cpp \ + nsMsgTagService.cpp\ + nsMsgFolderNotificationService.cpp\ + nsMailDirProvider.cpp\ + $(NULL) + ++ifdef NS_PRINTING ++CPPSRCS += \ ++ nsMsgPrintEngine.cpp \ ++ $(NULL) ++endif ++ + ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) + CMMSRCS = nsMessengerOSXIntegration.mm + endif + + ifeq ($(OS_ARCH),WINNT) + REQUIRES += appcomps \ + profile \ + $(NULL) +diff --git a/mailnews/base/src/nsMessenger.cpp b/mailnews/base/src/nsMessenger.cpp +--- a/mailnews/base/src/nsMessenger.cpp ++++ b/mailnews/base/src/nsMessenger.cpp +@@ -74,17 +74,20 @@ + #include "nsRDFCID.h" + + // gecko + #include "nsLayoutCID.h" + #include "nsIMarkupDocumentViewer.h" + #include "nsIContentViewer.h" + + // embedding ++#ifdef NS_PRINTING + #include "nsIWebBrowserPrint.h" ++#include "nsMsgPrintEngine.h" ++#endif + + /* for access to docshell */ + #include "nsPIDOMWindow.h" + #include "nsIDocShell.h" + #include "nsIDocShellLoadInfo.h" + #include "nsIDocShellTreeItem.h" + #include "nsIDocShellTreeNode.h" + #include "nsIWebNavigation.h" +@@ -119,19 +122,16 @@ + // undo + #include "nsITransaction.h" + #include "nsMsgTxn.h" + + // charset conversions + #include "nsMsgMimeCID.h" + #include "nsIMimeConverter.h" + +-// Printing +-#include "nsMsgPrintEngine.h" +- + // Save As + #include "nsIFilePicker.h" + #include "nsIStringBundle.h" + #include "nsIPrefService.h" + #include "nsIPrefBranch.h" + #include "nsIPrefBranch2.h" + #include "nsCExternalHandlerService.h" + #include "nsIExternalProtocolService.h" +diff --git a/mailnews/build/nsMailModule.cpp b/mailnews/build/nsMailModule.cpp +--- a/mailnews/build/nsMailModule.cpp ++++ b/mailnews/build/nsMailModule.cpp +@@ -104,17 +104,19 @@ + #include "nsMsgCopyService.h" + #include "nsMsgFolderCache.h" + #include "nsMsgStatusFeedback.h" + #include "nsMsgFilterService.h" + #include "nsMsgWindow.h" + #include "nsMsgServiceProvider.h" + #include "nsSubscribeDataSource.h" + #include "nsSubscribableServer.h" ++#ifdef NS_PRINTING + #include "nsMsgPrintEngine.h" ++#endif + #include "nsMsgSearchSession.h" + #include "nsMsgSearchTerm.h" + #include "nsMsgSearchAdapter.h" + #include "nsMsgFolderCompactor.h" + #include "nsMsgThreadedDBView.h" + #include "nsMsgSpecialViews.h" + #include "nsMsgXFVirtualFolderDBView.h" + #include "nsMsgQuickSearchDBView.h" +@@ -346,17 +348,19 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSt + NS_GENERIC_FACTORY_CONSTRUCTOR(nsCopyMessageStreamListener) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgCopyService) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgFolderCache) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgStatusFeedback) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgWindow,Init) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgServiceProviderService, Init) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSubscribeDataSource, Init) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSubscribableServer, Init) ++#ifdef NS_PRINTING + NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgPrintEngine) ++#endif + NS_GENERIC_FACTORY_CONSTRUCTOR(nsFolderCompactState) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsOfflineStoreCompactState) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgThreadedDBView) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgThreadsWithUnreadDBView) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgWatchedThreadsWithUnreadDBView) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgSearchDBView) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgXFVirtualFolderDBView) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgQuickSearchDBView) +@@ -800,20 +804,22 @@ static const nsModuleComponentInfo gComp + { "Mail/News Status Feedback", NS_MSGSTATUSFEEDBACK_CID, + NS_MSGSTATUSFEEDBACK_CONTRACTID, + nsMsgStatusFeedbackConstructor, + }, + { "Mail/News MsgWindow", NS_MSGWINDOW_CID, + NS_MSGWINDOW_CONTRACTID, + nsMsgWindowConstructor, + }, ++#ifdef NS_PRINTING + { "Mail/News Print Engine", NS_MSG_PRINTENGINE_CID, + NS_MSGPRINTENGINE_CONTRACTID, + nsMsgPrintEngineConstructor, + }, ++#endif + { "Mail/News Service Provider Service", NS_MSGSERVICEPROVIDERSERVICE_CID, + NS_MSGSERVICEPROVIDERSERVICE_CONTRACTID, + nsMsgServiceProviderServiceConstructor, + }, + { "Mail/News Subscribe Data Source", NS_SUBSCRIBEDATASOURCE_CID, + NS_SUBSCRIBEDATASOURCE_CONTRACTID, + nsSubscribeDataSourceConstructor, + }, diff --git a/mail-client/thunderbird/thunderbird-3.1.1-r2.ebuild b/mail-client/thunderbird/thunderbird-3.1.1-r2.ebuild index 25e199c23853..5e083ac8b494 100644 --- a/mail-client/thunderbird/thunderbird-3.1.1-r2.ebuild +++ b/mail-client/thunderbird/thunderbird-3.1.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.1-r2.ebuild,v 1.3 2010/08/02 16:22:10 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.1-r2.ebuild,v 1.4 2010/08/03 03:19:18 anarchy Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -115,6 +115,8 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}" + epatch "${FILESDIR}/comm-1.9.2-disable-printing.patch" + eautoreconf cd mozilla |