Fix bug #330791

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 162 insertions, 2 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/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