rpms/thunderbird-enigmail/devel mozilla-724615.patch, NONE, 1.1 mozilla-file.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 mozilla-733867-x.patch, 1.1, 1.2 sources, 1.17, 1.18 thunderbird-enigmail.spec, 1.20, 1.21 thunderbird-mozconfig, 1.7, 1.8 xulrunner-10.0-gcc47.patch, 1.1, 1.2 mozilla-722127.patch, 1.1, NONE

Author: remi Update of /cvs/free/rpms/thunderbird-enigmail/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8843 Modified Files: .cvsignore mozilla-733867-x.patch sources thunderbird-enigmail.spec thunderbird-mozconfig xulrunner-10.0-gcc47.patch Added Files: mozilla-724615.patch mozilla-file.patch Removed Files: mozilla-722127.patch Log Message: Enigmail 1.4.1 for Thunderbird 12.0 mozilla-724615.patch: objs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE mozilla-724615.patch --- # HG changeset patch # Parent 6292e55419d1730a2e88a56fd30b2440ce0b393a # User Raúl Porcel <armin76(a)gentoo.org&gt; Bug XXXXXX - Fix TARGET_CPU usage on ARM diff --git a/xpcom/glue/objs.mk b/xpcom/glue/objs.mk --- a/mozilla/xpcom/glue/objs.mk +++ b/mozilla/xpcom/glue/objs.mk @@ -71,13 +71,13 @@ XPCOM_GLUENS_SRC_LCPPSRCS = \ SSE.cpp \ unused.cpp \ nsProxyRelease.cpp \ nsTextFormatter.cpp \ GenericFactory.cpp \ FileUtils.cpp \ $(NULL) -ifeq (arm,$(TARGET_CPU)) +ifneq (,$(filter arm%,$(TARGET_CPU))) XPCOM_GLUENS_SRC_LCPPSRCS += arm.cpp endif XPCOM_GLUENS_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/,$(XPCOM_GLUENS_SRC_LCPPSRCS)) mozilla-file.patch: file_util_linux.cc | 3 +++ message_pump_libevent.cc | 3 +++ 2 files changed, 6 insertions(+) --- NEW FILE mozilla-file.patch --- diff -up mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file mozilla-beta/ipc/chromium/src/base/file_util_linux.cc --- mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file 2012-01-24 09:00:00.000000000 +0100 +++ mozilla-beta/ipc/chromium/src/base/file_util_linux.cc 2012-01-25 15:30:43.707796295 +0100 @@ -5,6 +5,9 @@ #include "base/file_util.h" #include <fcntl.h> +#if defined(ANDROID) || defined(OS_POSIX) +#include <unistd.h> +#endif #include <string> #include <vector> diff -up mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc --- mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file 2012-01-24 09:00:00.000000000 +0100 +++ mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc 2012-01-25 15:13:11.947771212 +0100 @@ -6,6 +6,9 @@ #include <errno.h> #include <fcntl.h> +#if defined(ANDROID) || defined(OS_POSIX) +#include <unistd.h> +#endif #include "eintr_wrapper.h" #include "base/logging.h" Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 15 Mar 2012 19:53:23 -0000 1.16 +++ .cvsignore 28 Apr 2012 15:30:34 -0000 1.17 @@ -1,2 +1,2 @@ -enigmail-1.4.tar.gz -thunderbird-11.0.source.tar.bz2 +thunderbird-12.0.source.tar.bz2 +enigmail-1.4.1.tar.gz mozilla-733867-x.patch: base/search/src/nsMsgSearchAdapter.cpp | 2 +- base/src/nsMsgFolderCompactor.cpp | 4 ++-- compose/src/nsSmtpProtocol.cpp | 5 ++--- imap/src/nsImapMailFolder.cpp | 2 +- imap/src/nsImapProtocol.cpp | 28 ++++++++++++++-------------- imap/src/nsImapServerResponseParser.cpp | 2 +- local/src/nsPop3Protocol.cpp | 2 +- mime/src/mimedrft.cpp | 2 +- mime/src/mimemult.cpp | 10 +++++----- 9 files changed, 28 insertions(+), 29 deletions(-) Index: mozilla-733867-x.patch =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/mozilla-733867-x.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mozilla-733867-x.patch 16 Mar 2012 17:43:35 -0000 1.1 +++ mozilla-733867-x.patch 28 Apr 2012 15:30:34 -0000 1.2 @@ -1,6 +1,6 @@ -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 +diff -up comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp +--- comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 2012-04-21 00:32:39.000000000 +0200 ++++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-04-25 10:51:32.343536178 +0200 @@ -688,7 +688,7 @@ nsresult nsMsgSearchAdapter::EncodeImapV PL_strcat(encoding, "{"); lengthStr.AppendInt((PRInt32) strlen(value)); @@ -10,10 +10,10 @@ 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 -up comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp +--- comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 2012-04-21 00:32:39.000000000 +0200 ++++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-04-25 10:51:33.208535909 +0200 +@@ -758,7 +758,7 @@ nsFolderCompactState::OnDataAvailable(ns } } } @@ -22,7 +22,7 @@ // 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 @@ nsOfflineStoreCompactState::OnDataAvaila // check if there's an envelope header; if not, write one. if (strncmp(m_dataBuffer, "From ", 5)) { @@ -31,19 +31,19 @@ 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 +diff -up comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 comm-release/mailnews/compose/src/nsSmtpProtocol.cpp +--- comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 2012-04-21 00:32:39.000000000 +0200 ++++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-04-25 10:51:33.365535861 +0200 @@ -1722,7 +1722,7 @@ PRInt32 nsSmtpProtocol::SendQuit() { - m_sendDone = PR_TRUE; + m_sendDone = true; nsCOMPtr<nsIURI> 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 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI { nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL); // send a quit command to close the connection with the server. @@ -57,10 +57,10 @@ 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 -up comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 comm-release/mailnews/imap/src/nsImapMailFolder.cpp +--- comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 2012-04-21 00:32:39.000000000 +0200 ++++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-04-25 10:51:33.367535861 +0200 +@@ -8309,7 +8309,7 @@ nsImapMailFolder::CopyFileToOfflineStore bool needMoreData = false; char * newLine = nsnull; PRUint32 numBytesInLine = 0; @@ -69,10 +69,10 @@ 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 -up comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 comm-release/mailnews/imap/src/nsImapProtocol.cpp +--- comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 2012-04-21 00:32:39.000000000 +0200 ++++ comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-04-25 10:51:33.370535858 +0200 +@@ -1409,7 +1409,7 @@ void nsImapProtocol::HandleIdleResponses { // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages(); nsCAutoString commandBuffer(GetServerCommandTag()); @@ -81,7 +81,7 @@ do { -@@ -3290,7 +3290,7 @@ void nsImapProtocol::FetchMsgAttribute(c +@@ -3287,7 +3287,7 @@ void nsImapProtocol::FetchMsgAttribute(c commandString.Append(messageIds); commandString.Append(" ("); commandString.Append(attribute); @@ -114,10 +114,10 @@ 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 @@ void nsImapProtocol::CreateMailbox(const nsCString command(GetServerCommandTag()); command += " create \""; command += escapedName; @@ -126,7 +126,7 @@ nsresult rv = SendData(command.get()); if(NS_SUCCEEDED(rv)) -@@ -7549,7 +7549,7 @@ void nsImapProtocol::Lsub(const char *ma +@@ -7550,7 +7550,7 @@ void nsImapProtocol::Lsub(const char *ma nsCString command (GetServerCommandTag()); command += " lsub \"\" \""; command += escapedPattern; @@ -135,7 +135,7 @@ PR_Free(boxnameWithOnlineDirectory); -@@ -7578,7 +7578,7 @@ void nsImapProtocol::List(const char *ma +@@ -7579,7 +7579,7 @@ void nsImapProtocol::List(const char *ma command += useXLIST ? " xlist \"\" \"" : " list \"\" \""; command += escapedPattern; @@ -144,7 +144,7 @@ PR_Free(boxnameWithOnlineDirectory); -@@ -7599,7 +7599,7 @@ void nsImapProtocol::Subscribe(const cha +@@ -7600,7 +7600,7 @@ void nsImapProtocol::Subscribe(const cha nsCString command (GetServerCommandTag()); command += " subscribe \""; command += escapedName; @@ -153,7 +153,7 @@ nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) -@@ -7617,7 +7617,7 @@ void nsImapProtocol::Unsubscribe(const c +@@ -7618,7 +7618,7 @@ void nsImapProtocol::Unsubscribe(const c nsCString command (GetServerCommandTag()); command += " unsubscribe \""; command += escapedName; @@ -162,7 +162,7 @@ nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) -@@ -7631,7 +7631,7 @@ void nsImapProtocol::Idle() +@@ -7632,7 +7632,7 @@ void nsImapProtocol::Idle() if (m_urlInProgress) return; nsCAutoString command (GetServerCommandTag()); @@ -171,7 +171,7 @@ nsresult rv = SendData(command.get()); if (NS_SUCCEEDED(rv)) { -@@ -7658,7 +7658,7 @@ void nsImapProtocol::EndIdle(bool waitFo +@@ -7659,7 +7659,7 @@ void nsImapProtocol::EndIdle(bool waitFo nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream); if (asyncInputStream) asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull); @@ -180,7 +180,7 @@ // 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 @@ void nsImapProtocol::Copy(const char * m PRUint32 msgsHandled = 0; const char *formatString; formatString = (idsAreUid) @@ -191,9 +191,9 @@ 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 +diff -up comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp +--- comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 2012-04-21 00:32:39.000000000 +0200 ++++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-04-25 10:51:33.374535858 +0200 @@ -185,7 +185,7 @@ void nsImapServerResponseParser::ParseIM NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && @@ -201,11 +201,11 @@ - 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 +diff -up comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 comm-release/mailnews/local/src/nsPop3Protocol.cpp +--- comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 2012-04-21 00:32:40.000000000 +0200 ++++ comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-04-25 10:51:33.375535858 +0200 @@ -2483,7 +2483,7 @@ PRInt32 nsPop3Protocol::SendList() return(MK_OUT_OF_MEMORY); m_pop3ConData->next_state_after_response = POP3_GET_LIST; @@ -215,9 +215,9 @@ } -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 +diff -up comm-release/mailnews/mime/src/mimedrft.cpp.733867 comm-release/mailnews/mime/src/mimedrft.cpp +--- comm-release/mailnews/mime/src/mimedrft.cpp.733867 2012-04-21 00:32:40.000000000 +0200 ++++ comm-release/mailnews/mime/src/mimedrft.cpp 2012-04-25 10:51:33.376535858 +0200 @@ -1473,7 +1473,7 @@ mime_parse_stream_complete (nsMIMESessio *newbody = 0; PL_strcatn(newbody, newbodylen, "<PRE>"); @@ -227,9 +227,9 @@ 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 +diff -up comm-release/mailnews/mime/src/mimemult.cpp.733867 comm-release/mailnews/mime/src/mimemult.cpp +--- comm-release/mailnews/mime/src/mimemult.cpp.733867 2012-04-21 00:32:40.000000000 +0200 ++++ comm-release/mailnews/mime/src/mimemult.cpp 2012-04-25 10:52:45.835512632 +0200 @@ -280,7 +280,7 @@ MimeMultipart_parse_line (const char *li MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK)); MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\"")); @@ -260,6 +260,6 @@ - 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; Index: sources =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 15 Mar 2012 19:53:23 -0000 1.17 +++ sources 28 Apr 2012 15:30:34 -0000 1.18 @@ -1,2 +1,2 @@ -5cf3d9720ed1cda1b22eabe5457772c2 enigmail-1.4.tar.gz -1d7127a3282e62d95eb9b59d47291b70 thunderbird-11.0.source.tar.bz2 +7b30b72472a65bce74ba0ae60e4d4e6c thunderbird-12.0.source.tar.bz2 +0eba75fbcf8f0bb32d538df102fbb8e9 enigmail-1.4.1.tar.gz Index: thunderbird-enigmail.spec =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- thunderbird-enigmail.spec 16 Mar 2012 17:43:35 -0000 1.20 +++ thunderbird-enigmail.spec 28 Apr 2012 15:30:34 -0000 1.21 @@ -1,7 +1,7 @@ %define debug_build 0 # Use system Librairies ? -%if 0%{?fedora} <= 15 +%if 0%{?fedora} <= 17 %define system_sqlite 0 %else %define system_sqlite 1 @@ -13,14 +13,14 @@ %define nss_version 3.13.3 %define cairo_version 1.10.0 %define freetype_version 2.1.9 -%define sqlite_version 3.7.7.1 +%define sqlite_version 3.7.10 %define libnotify_version 0.4 %global libvpx_version 1.0.0 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} -%global thunver 11.0 -%global thunmax 12.0 +%global thunver 12.0 +%global thunmax 13.0 # The tarball is pretty inconsistent with directory structure. # Sometimes there is a top level directory. That goes here. @@ -38,11 +38,11 @@ Summary: Authentication and encryption extension for Mozilla Thunderbird Name: thunderbird-enigmail -Version: 1.4 +Version: 1.4.1 %if 0%{?prever:1} Release: 0.1.%{prever}%{?dist} %else -Release: 3%{?dist} +Release: 1%{?dist} %endif URL: http://enigmail.mozdev.org/ License: MPLv1.1 or GPLv2+ @@ -70,13 +70,15 @@ Patch8: xulrunner-10.0-secondary-ipc.patch # Build patches -Patch100: xulrunner-10.0-gcc47.patch -Patch101: mozilla-722127.patch Patch102: mozilla-733867-x.patch - +Patch103: mozilla-file.patch +Patch104: xulrunner-10.0-gcc47.patch # Linux specific Patch200: thunderbird-8.0-enable-addons.patch +# ARM Specific +Patch210: mozilla-724615.patch + %if %{official_branding} # Required by Mozilla Corporation @@ -153,14 +155,13 @@ cd mozilla %patch7 -p2 -b .static %patch8 -p3 -b .secondary-ipc -%if 0%{?fedora} >= 17 -%patch100 -p1 -b .gcc47 -%endif -%patch101 -p2 -b .722127 +%patch103 -p1 -b .mozilla-file +%patch104 -p1 -b .gcc47 cd .. -%patch102 -p2 -b .733867 +%patch102 -p1 -b .733867 %patch200 -p1 -b .addons +%patch210 -p1 -b .724615 %if %{official_branding} # Required by Mozilla Corporation @@ -213,7 +214,7 @@ # All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever # the next major version would be). This is because I create builds from trunk # and simply label the result as 1.3.x. -# sed -i -e '/em:version/s/1.4a1pre/%{version}/' package/install.rdf +sed -i -e '/em:version/s/1.5pre/%{version}/' package/install.rdf grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1 # Apply Enigmail patch here popd @@ -279,7 +280,6 @@ mkdir -p $RPM_BUILD_ROOT%{enigmail_extname} unzip -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname} -chmod +x $RPM_BUILD_ROOT%{enigmail_extname}/wrappers/*.sh %clean @@ -294,6 +294,9 @@ #=============================================================================== %changelog +* Sat Apr 28 2012 Remi Collet <remi(a)fedoraproject.org&gt; 1.4.1-1 +- Enigmail 1.4.1 for Thunderbird 12.0 + * Fri Mar 16 2012 Remi Collet <remi(a)fedoraproject.org&gt; 1.4-3 - Latest Thunderbird patch from rahwide Index: thunderbird-mozconfig =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-mozconfig,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- thunderbird-mozconfig 15 Mar 2012 19:53:23 -0000 1.7 +++ thunderbird-mozconfig 28 Apr 2012 15:30:34 -0000 1.8 @@ -21,7 +21,8 @@ ac_add_options --disable-strip ac_add_options --disable-install-strip ac_add_options --enable-pango -ac_add_options --enable-system-cairo +# temporary disable system cairo, because compilation fails +#ac_add_options --enable-system-cairo ac_add_options --enable-svg ac_add_options --enable-canvas ac_add_options --enable-system-hunspell xulrunner-10.0-gcc47.patch: ipc/chromium/src/base/time_posix.cc | 2 ++ toolkit/crashreporter/client/Makefile.in | 3 +++ 2 files changed, 5 insertions(+) Index: xulrunner-10.0-gcc47.patch =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/xulrunner-10.0-gcc47.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xulrunner-10.0-gcc47.patch 3 Mar 2012 17:25:45 -0000 1.1 +++ xulrunner-10.0-gcc47.patch 28 Apr 2012 15:30:34 -0000 1.2 @@ -23,41 +23,3 @@ ifeq ($(OS_ARCH),WINNT) CPPSRCS += crashreporter_win.cpp LIBS += \ -diff -up mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file mozilla-beta/ipc/chromium/src/base/file_util_linux.cc ---- mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file 2012-01-24 09:00:00.000000000 +0100 -+++ mozilla-beta/ipc/chromium/src/base/file_util_linux.cc 2012-01-25 15:30:43.707796295 +0100 -@@ -5,6 +5,9 @@ - #include "base/file_util.h" - - #include <fcntl.h> -+#if defined(ANDROID) || defined(OS_POSIX) -+#include <unistd.h> -+#endif - - #include <string> - #include <vector> -diff -up mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc ---- mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file 2012-01-24 09:00:00.000000000 +0100 -+++ mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc 2012-01-25 15:13:11.947771212 +0100 -@@ -6,6 +6,9 @@ - - #include <errno.h> - #include <fcntl.h> -+#if defined(ANDROID) || defined(OS_POSIX) -+#include <unistd.h> -+#endif - - #include "eintr_wrapper.h" - #include "base/logging.h" -diff -up mozilla-beta/ipc/chromium/src/base/file_util.cc.old mozilla-beta/ipc/chromium/src/base/file_util.cc ---- mozilla-beta/ipc/chromium/src/base/file_util.cc.old 2012-01-25 13:48:11.000000000 +0100 -+++ mozilla-beta/ipc/chromium/src/base/file_util.cc 2012-01-25 13:52:25.096659244 +0100 -@@ -8,7 +8,7 @@ - #include <io.h> - #endif - #include <stdio.h> --#if defined(ANDROID) -+#if defined(ANDROID) || defined(OS_POSIX) - #include <unistd.h> - #endif - --- mozilla-722127.patch DELETED ---