[thunderbird-lightning] Added build patches from thunderbird
Jan Horak
xhorak at fedoraproject.org
Wed Apr 25 10:52:05 UTC 2012
commit 2441f7ea7431fdbf06e2fccb397577d4883cd1ed
Author: Jan Horak <jhorak at redhat.com>
Date: Wed Apr 25 12:51:59 2012 +0200
Added build patches from thunderbird
mozilla-733867-x.patch | 26 ++++++++++++++------------
mozilla-file.patch | 26 ++++++++++++++++++++++++++
thunderbird-lightning.spec | 4 ++++
xulrunner-10.0-gcc47.patch | 25 +++++++++++++++++++++++++
4 files changed, 69 insertions(+), 12 deletions(-)
---
diff --git a/mozilla-733867-x.patch b/mozilla-733867-x.patch
index 61519a9..92116dc 100644
--- a/mozilla-733867-x.patch
+++ b/mozilla-733867-x.patch
@@ -1,6 +1,6 @@
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-24 09:02:03.295311592 +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));
@@ -12,7 +12,7 @@ diff -up comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 com
}
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-24 09:02:03.295311592 +0200
++++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-04-25 10:51:33.208535909 +0200
@@ -758,7 +758,7 @@ nsFolderCompactState::OnDataAvailable(ns
}
}
@@ -33,7 +33,7 @@ diff -up comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 comm-rel
}
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-24 09:02:03.873310511 +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 = true;
@@ -59,7 +59,7 @@ diff -up comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 comm-releas
-
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-24 09:02:03.878310501 +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;
@@ -71,7 +71,7 @@ diff -up comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 comm-release
do
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-24 09:07:04.801246261 +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();
@@ -193,7 +193,7 @@ diff -up comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 comm-release/m
{
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-24 09:02:03.884310490 +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' &&
@@ -205,7 +205,7 @@ diff -up comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 co
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-24 09:02:03.885310488 +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;
@@ -217,7 +217,7 @@ diff -up comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 comm-release/
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-24 09:02:03.886310486 +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>");
@@ -229,7 +229,7 @@ diff -up comm-release/mailnews/mime/src/mimedrft.cpp.733867 comm-release/mailnew
}
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-24 09:05:56.522197836 +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=\""));
@@ -252,12 +252,14 @@ diff -up comm-release/mailnews/mime/src/mimemult.cpp.733867 comm-release/mailnew
}
nsCString result;
char timeBuffer[128];
-@@ -307,7 +307,7 @@ MimeMultipart_parse_line (const char *li
+@@ -306,8 +306,8 @@ MimeMultipart_parse_line (const char *li
+ "%a %b %d %H:%M:%S %Y",
&now);
MimeWriteAString(obj, nsDependentCString(timeBuffer));
- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""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));
-+ 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, false);
}
PRInt32 old_nchildren = container->nchildren;
diff --git a/mozilla-file.patch b/mozilla-file.patch
new file mode 100644
index 0000000..14b0182
--- /dev/null
+++ b/mozilla-file.patch
@@ -0,0 +1,26 @@
+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 --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 6f3da3e..ee8321a 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -47,6 +47,8 @@ Patch0: thunderbird-version.patch
# Fix build on secondary arches (patches copied from xulrunner)
Patch2: xulrunner-10.0-secondary-ipc.patch
Patch3: mozilla-733867-x.patch
+Patch4: mozilla-file.patch
+Patch5: xulrunner-10.0-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{nspr_version}
@@ -107,6 +109,8 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
cd mozilla
%patch2 -p3 -b .secondary-ipc
+%patch4 -p1 -b .mozilla-file
+%patch5 -p1 -b .gcc47
cd ..
%patch3 -p1 -b .733867
diff --git a/xulrunner-10.0-gcc47.patch b/xulrunner-10.0-gcc47.patch
new file mode 100644
index 0000000..91a948a
--- /dev/null
+++ b/xulrunner-10.0-gcc47.patch
@@ -0,0 +1,25 @@
+diff -up mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 mozilla-beta/ipc/chromium/src/base/time_posix.cc
+--- mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 2012-01-24 03:00:00.000000000 -0500
++++ mozilla-beta/ipc/chromium/src/base/time_posix.cc 2012-01-30 14:12:49.198472212 -0500
+@@ -14,6 +14,8 @@
+ #include <time.h>
+ #endif
+
++#include <unistd.h>
++
+ #include <limits>
+
+ #include "base/basictypes.h"
+diff -up mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 mozilla-beta/toolkit/crashreporter/client/Makefile.in
+--- mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 2012-01-30 14:41:14.475441039 -0500
++++ mozilla-beta/toolkit/crashreporter/client/Makefile.in 2012-01-30 14:43:03.587646656 -0500
+@@ -69,6 +69,9 @@ CPPSRCS = \
+ $(STDCXX_COMPAT) \
+ $(NULL)
+
++# Needed for moz_free
++LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
++
+ ifeq ($(OS_ARCH),WINNT)
+ CPPSRCS += crashreporter_win.cpp
+ LIBS += \
More information about the scm-commits
mailing list