From b6a456b822136c9b194a22e0995eeff294bfbe27 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 25 Apr 2012 15:03:40 -0300 Subject: thunderbird-libre-12.0-1: updating version --- libre/thunderbird-libre/PKGBUILD | 19 +++--- libre/thunderbird-libre/clrf.patch | 114 ++++++++++++++++++------------------ libre/thunderbird-libre/gcc47.patch | 46 ++++----------- 3 files changed, 76 insertions(+), 103 deletions(-) (limited to 'libre') diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD index f7f89462d..ede2237fc 100644 --- a/libre/thunderbird-libre/PKGBUILD +++ b/libre/thunderbird-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155759 2012-04-06 07:48:34Z ibiru $ +# $Id: PKGBUILD 157168 2012-04-25 08:44:38Z ibiru $ # Maintainer : Ionut Biru # Contributor: Alexander Baldeck # Contributor: Dale Blount @@ -6,13 +6,13 @@ # Maintainer (Parabola): André Silva pkgname=thunderbird-libre -pkgver=11.0.1 -pkgrel=2.1 +pkgver=12.0 +pkgrel=1 pkgdesc="Standalone Mail/News reader" arch=('i686' 'x86_64') license=('MPL' 'GPL') url="http://www.mozilla.org/thunderbird/" -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification') +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') optdepends=('libcanberra: for sound support') replaces=('thunderbird') @@ -25,27 +25,24 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sourc thunderbird-install-dir.patch channel-prefs.js vendor.js - libvpx.patch gcc47.patch clrf.patch searchplugins-libre.patch) -md5sums=('b500560a006cb10194281263c78841f2' +md5sums=('7b30b72472a65bce74ba0ae60e4d4e6c' '41511a6bcdd04cf56706218e4670e631' 'af3e5b344d2edf1c7d61bb0a5a96de9a' 'aea906acf72c43dd82ead2fabcc1c6db' '476ec205162340fb0679f522c9d31c3b' '5a53179d14ae9631b7afe5e4d0fc0b25' - '5b2aaff7dfe7f1f94ad965905b20e782' - '07b255039a2ffbcab5b5be7986245e36' - '5c8d79a9f1ecadffa818205ce1c23f2f' + '1e3ad86899c61f0993c429d10913edb4' + 'abe8f73faa71ea2a1e4c6f5a33f56c27' '6a1d132b0275876678cb0b08c527805a') build() { cd "$srcdir/comm-release" patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" - patch -Np1 -i "$srcdir/libvpx.patch" patch -Np1 -i "$srcdir/gcc47.patch" - patch -Np2 -i "$srcdir/clrf.patch" + patch -Np1 -i "$srcdir/clrf.patch" # Removing non-free search plugins replacing them with duckduckgo and identi.ca patch -Np1 -i "$srcdir/searchplugins-libre.patch" diff --git a/libre/thunderbird-libre/clrf.patch b/libre/thunderbird-libre/clrf.patch index 9b6fcb8fb..5a77f2b01 100644 --- a/libre/thunderbird-libre/clrf.patch +++ b/libre/thunderbird-libre/clrf.patch @@ -1,7 +1,7 @@ -diff -up thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp ---- thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 2012-03-13 03:37:12.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-03-16 07:20:29.299342799 +0100 -@@ -688,7 +688,7 @@ nsresult nsMsgSearchAdapter::EncodeImapV +diff -Nur comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp +--- comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-04-25 01:09:10.468804374 +0000 ++++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-04-25 01:09:45.928528202 +0000 +@@ -688,7 +688,7 @@ PL_strcat(encoding, "{"); lengthStr.AppendInt((PRInt32) strlen(value)); PL_strcat(encoding, lengthStr.get()); @@ -10,10 +10,10 @@ diff -up thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapt PL_strcat(encoding, value); return NS_OK; } -diff -up thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp ---- thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-03-16 07:20:29.300342735 +0100 -@@ -753,7 +753,7 @@ nsFolderCompactState::OnDataAvailable(ns +diff -Nur comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp +--- comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-04-25 01:09:10.475470988 +0000 ++++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-04-25 01:09:45.928528202 +0000 +@@ -758,7 +758,7 @@ } } } @@ -22,7 +22,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cp // if status offset isn't in the first block, this code won't work. There's no good reason // for the status offset not to be at the beginning of the message anyway. -@@ -1203,7 +1203,7 @@ nsOfflineStoreCompactState::OnDataAvaila +@@ -1216,7 +1216,7 @@ // check if there's an envelope header; if not, write one. if (strncmp(m_dataBuffer, "From ", 5)) { @@ -31,19 +31,19 @@ diff -up thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cp m_offlineMsgSize += bytesWritten; } } -diff -up thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp ---- thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-03-16 07:23:01.225877457 +0100 -@@ -1722,7 +1722,7 @@ PRInt32 nsSmtpProtocol::SendQuit() +diff -Nur comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp comm-release/mailnews/compose/src/nsSmtpProtocol.cpp +--- comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp 2012-04-25 01:09:10.542137136 +0000 ++++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-04-25 01:09:45.928528202 +0000 +@@ -1722,7 +1722,7 @@ { - m_sendDone = PR_TRUE; + m_sendDone = true; nsCOMPtr url = do_QueryInterface(m_runningURL); - SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server. + SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server. m_nextState = SMTP_RESPONSE; m_nextStateAfterResponse = SMTP_DONE; return(0); -@@ -1969,7 +1969,7 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI +@@ -1969,7 +1969,7 @@ { nsCOMPtr url = do_QueryInterface(m_runningURL); // send a quit command to close the connection with the server. @@ -52,15 +52,15 @@ diff -up thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.7 { m_nextState = SMTP_RESPONSE; m_nextStateAfterResponse = SMTP_ERROR_DONE; -@@ -2118,4 +2118,3 @@ nsSmtpProtocol::GetUsernamePassword(nsAC +@@ -2118,4 +2118,3 @@ NS_ENSURE_SUCCESS(rv,rv); return rv; } - -diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp ---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-03-16 07:20:29.309342162 +0100 -@@ -8298,7 +8298,7 @@ nsImapMailFolder::CopyFileToOfflineStore +diff -Nur comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp comm-release/mailnews/imap/src/nsImapMailFolder.cpp +--- comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp 2012-04-25 01:09:10.605469976 +0000 ++++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-04-25 01:09:45.928528202 +0000 +@@ -8309,7 +8309,7 @@ bool needMoreData = false; char * newLine = nsnull; PRUint32 numBytesInLine = 0; @@ -69,10 +69,10 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.73 offlineStore->Write(envelope, strlen(envelope), &bytesWritten); fileSize += bytesWritten; do -diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp ---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-03-16 07:20:29.314341844 +0100 -@@ -1410,7 +1410,7 @@ void nsImapProtocol::HandleIdleResponses +diff -Nur comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp comm-release/mailnews/imap/src/nsImapProtocol.cpp +--- comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp 2012-04-25 01:09:10.605469976 +0000 ++++ comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-04-25 01:09:45.931861509 +0000 +@@ -1409,7 +1409,7 @@ { // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages(); nsCAutoString commandBuffer(GetServerCommandTag()); @@ -81,7 +81,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 do { -@@ -3290,7 +3290,7 @@ void nsImapProtocol::FetchMsgAttribute(c +@@ -3287,7 +3287,7 @@ commandString.Append(messageIds); commandString.Append(" ("); commandString.Append(attribute); @@ -90,7 +90,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 nsresult rv = SendData(commandString.get()); if (NS_SUCCEEDED(rv)) -@@ -5283,7 +5283,7 @@ nsImapProtocol::Expunge() +@@ -5283,7 +5283,7 @@ IncrementCommandTagNumber(); nsCAutoString command(GetServerCommandTag()); @@ -99,7 +99,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) -@@ -5359,7 +5359,7 @@ void nsImapProtocol::ID() +@@ -5359,7 +5359,7 @@ command.Append(gAppName); command.Append("\" \"version\" \""); command.Append(gAppVersion); @@ -108,16 +108,16 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) -@@ -5816,7 +5816,7 @@ nsresult nsImapProtocol::AuthLogin(const +@@ -5816,7 +5816,7 @@ nsCAutoString correctedPassword; EscapeUserNamePasswordString(password.get(), &correctedPassword); command.Append(correctedPassword); - command.Append("\""CRLF); + command.Append("\"" CRLF); - rv = SendData(command.get(), PR_TRUE /* suppress logging */); + rv = SendData(command.get(), true /* suppress logging */); NS_ENSURE_SUCCESS(rv, rv); ParseIMAPandCheckForNewMail(); -@@ -7446,7 +7446,7 @@ void nsImapProtocol::CreateMailbox(const +@@ -7447,7 +7447,7 @@ nsCString command(GetServerCommandTag()); command += " create \""; command += escapedName; @@ -126,7 +126,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 nsresult rv = SendData(command.get()); if(NS_SUCCEEDED(rv)) -@@ -7549,7 +7549,7 @@ void nsImapProtocol::Lsub(const char *ma +@@ -7550,7 +7550,7 @@ nsCString command (GetServerCommandTag()); command += " lsub \"\" \""; command += escapedPattern; @@ -135,7 +135,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 PR_Free(boxnameWithOnlineDirectory); -@@ -7578,7 +7578,7 @@ void nsImapProtocol::List(const char *ma +@@ -7579,7 +7579,7 @@ command += useXLIST ? " xlist \"\" \"" : " list \"\" \""; command += escapedPattern; @@ -144,7 +144,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 PR_Free(boxnameWithOnlineDirectory); -@@ -7599,7 +7599,7 @@ void nsImapProtocol::Subscribe(const cha +@@ -7600,7 +7600,7 @@ nsCString command (GetServerCommandTag()); command += " subscribe \""; command += escapedName; @@ -153,7 +153,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) -@@ -7617,7 +7617,7 @@ void nsImapProtocol::Unsubscribe(const c +@@ -7618,7 +7618,7 @@ nsCString command (GetServerCommandTag()); command += " unsubscribe \""; command += escapedName; @@ -162,7 +162,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) -@@ -7631,7 +7631,7 @@ void nsImapProtocol::Idle() +@@ -7632,7 +7632,7 @@ if (m_urlInProgress) return; nsCAutoString command (GetServerCommandTag()); @@ -171,7 +171,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) { -@@ -7658,7 +7658,7 @@ void nsImapProtocol::EndIdle(bool waitFo +@@ -7659,7 +7659,7 @@ nsCOMPtr asyncInputStream = do_QueryInterface(m_inputStream); if (asyncInputStream) asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull); @@ -180,7 +180,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 // set a short timeout if we don't want to wait for a response if (m_transport && !waitForResponse) m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5); -@@ -7727,8 +7727,8 @@ void nsImapProtocol::Copy(const char * m +@@ -7728,8 +7728,8 @@ PRUint32 msgsHandled = 0; const char *formatString; formatString = (idsAreUid) @@ -191,22 +191,22 @@ diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.7338 do { -diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp ---- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-03-16 07:20:29.316341717 +0100 -@@ -185,7 +185,7 @@ void nsImapServerResponseParser::ParseIM +diff -Nur comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp +--- comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-04-25 01:09:10.605469976 +0000 ++++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-04-25 01:09:45.931861509 +0000 +@@ -185,7 +185,7 @@ NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string"); - bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF); + bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF); if (sendingIdleDone) - fWaitingForMoreClientInput = PR_FALSE; + fWaitingForMoreClientInput = false; -diff -up thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp ---- thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-03-16 07:23:38.980300990 +0100 -@@ -2483,7 +2483,7 @@ PRInt32 nsPop3Protocol::SendList() +diff -Nur comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp comm-release/mailnews/local/src/nsPop3Protocol.cpp +--- comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp 2012-04-25 01:09:10.492137526 +0000 ++++ comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-04-25 01:09:45.931861509 +0000 +@@ -2483,7 +2483,7 @@ return(MK_OUT_OF_MEMORY); m_pop3ConData->next_state_after_response = POP3_GET_LIST; m_listpos = 0; @@ -215,10 +215,10 @@ diff -up thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733 } -diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp ---- thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 2012-03-13 03:37:13.000000000 +0100 -+++ thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp 2012-03-16 07:20:29.320341461 +0100 -@@ -1473,7 +1473,7 @@ mime_parse_stream_complete (nsMIMESessio +diff -Nur comm-release.orig/mailnews/mime/src/mimedrft.cpp comm-release/mailnews/mime/src/mimedrft.cpp +--- comm-release.orig/mailnews/mime/src/mimedrft.cpp 2012-04-25 01:09:10.488804218 +0000 ++++ comm-release/mailnews/mime/src/mimedrft.cpp 2012-04-25 01:09:45.931861509 +0000 +@@ -1473,7 +1473,7 @@ *newbody = 0; PL_strcatn(newbody, newbodylen, "
");
                  PL_strcatn(newbody, newbodylen, body);
@@ -227,10 +227,10 @@ diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 thu
                  PR_Free(body);
                  body = newbody;
                }
-diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp
---- thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867	2012-03-13 03:37:13.000000000 +0100
-+++ thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp	2012-03-16 07:20:29.321341397 +0100
-@@ -280,7 +280,7 @@ MimeMultipart_parse_line (const char *li
+diff -Nur comm-release.orig/mailnews/mime/src/mimemult.cpp comm-release/mailnews/mime/src/mimemult.cpp
+--- comm-release.orig/mailnews/mime/src/mimemult.cpp	2012-04-25 01:09:10.488804218 +0000
++++ comm-release/mailnews/mime/src/mimemult.cpp	2012-04-25 01:12:53.383735715 +0000
+@@ -280,7 +280,7 @@
              MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
              MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
              MimeWriteAString(obj, fileName);
@@ -239,7 +239,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thu
              MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
              MimeWriteAString(obj, obj->options->state->detachedFilePath);
              MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-@@ -293,10 +293,10 @@ MimeMultipart_parse_line (const char *li
+@@ -293,10 +293,10 @@
              status = MimeWriteAString(obj, header);
              if (status < 0) 
                return status;
@@ -252,7 +252,7 @@ diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thu
            }
            nsCString result;
            char timeBuffer[128];
-@@ -306,8 +306,8 @@ MimeMultipart_parse_line (const char *li
+@@ -306,8 +306,8 @@
                                   "%a %b %d %H:%M:%S %Y",
                                   &now);
            MimeWriteAString(obj, nsDependentCString(timeBuffer));
@@ -260,6 +260,6 @@ diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thu
 -          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK));
 +          MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
 +          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK));
-           MimeHeaders_write_raw_headers(mult->hdrs, obj->options, PR_FALSE);
+           MimeHeaders_write_raw_headers(mult->hdrs, obj->options, false);
          }
          PRInt32 old_nchildren = container->nchildren;
diff --git a/libre/thunderbird-libre/gcc47.patch b/libre/thunderbird-libre/gcc47.patch
index 3e1e9b98a..080502c23 100644
--- a/libre/thunderbird-libre/gcc47.patch
+++ b/libre/thunderbird-libre/gcc47.patch
@@ -1,18 +1,6 @@
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc comm-release/mozilla/ipc/chromium/src/base/file_util.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc	2012-04-03 18:38:11.474783536 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util.cc	2012-04-03 18:43:29.218995578 +0000
-@@ -8,7 +8,7 @@
- #include 
- #endif
- #include 
--#if defined(ANDROID)
-+#if defined(ANDROID) || defined(OS_POSIX)
- #include 
- #endif
- 
 diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-03 18:38:11.381450924 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-03 18:43:29.218995578 +0000
+--- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-24 23:15:57.347221336 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-24 23:18:34.116046872 +0000
 @@ -5,6 +5,9 @@
  #include "base/file_util.h"
  
@@ -24,8 +12,8 @@ diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc com
  #include 
  #include 
 diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-03 18:38:11.438117153 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-03 18:43:29.218995578 +0000
+--- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-24 23:15:57.353887955 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-24 23:18:34.116046872 +0000
 @@ -6,6 +6,9 @@
  
  #include 
@@ -37,27 +25,15 @@ diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.
  #include "eintr_wrapper.h"
  #include "base/logging.h"
 diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-03 18:38:11.418117308 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-03 18:43:29.218995578 +0000
-@@ -14,6 +14,8 @@
+--- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-24 23:15:57.350554645 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-24 23:18:34.116046872 +0000
+@@ -13,6 +13,9 @@
+ #else
  #include 
  #endif
- 
++#if defined(ANDROID) || defined(OS_POSIX)
 +#include 
-+
- #include 
++#endif
  
- #include "base/basictypes.h"
-diff -Nur comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in comm-release/mozilla/toolkit/crashreporter/client/Makefile.in
---- comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in	2012-04-03 18:38:56.101105510 +0000
-+++ comm-release/mozilla/toolkit/crashreporter/client/Makefile.in	2012-04-03 18:43:29.218995578 +0000
-@@ -69,6 +69,9 @@
-   $(STDCXX_COMPAT) \
-   $(NULL)
+ #include 
  
-+# Needed for moz_free
-+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
-+
- ifeq ($(OS_ARCH),WINNT)
- CPPSRCS += crashreporter_win.cpp
- LIBS += \
-- 
cgit v1.2.3-54-g00ecf