Attachment 590528 Details for Bug 829983 – diff of 2.9.1-4 and 2.10-1 SRPM less langpacks and seamonkey sourceball

[patch] diff of 2.9.1-4 and 2.10-1 SRPM less langpacks and seamonkey sourceball

seamonkey-2.10-srpm.diff (text/plain), 22.43 KB, created by Allen Hewes on 2012-06-09 00:47:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Allen Hewes

Created: 2012-06-09 00:47:42 UTC

Size: 22.43 KB

patch

obsolete

>diff -Nuar '--exclude=*xz' '--exclude=*bz2' seamonkey-2.9.1-4.fc16/mozilla-733867-x.patch seamonkey-2.10-1.fc16/mozilla-733867-x.patch
>--- seamonkey-2.9.1-4.fc16/mozilla-733867-x.patch	2012-06-08 20:39:29.876981471 -0400
>+++ seamonkey-2.10-1.fc16/mozilla-733867-x.patch	1969-12-31 19:00:00.000000000 -0500
>@@ -1,265 +0,0 @@
>-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));
>-     PL_strcat(encoding, lengthStr.get());
>--    PL_strcat(encoding, "}"CRLF);
>-+    PL_strcat(encoding, "}" CRLF);
>-     PL_strcat(encoding, value);
>-     return NS_OK;
>-   }
>-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
>-           }
>-         }
>-       }
>--#define EXTRA_KEYWORD_HDR "                                                                                 "MSG_LINEBREAK
>-+#define EXTRA_KEYWORD_HDR "                                                                                 " MSG_LINEBREAK
>- 
>-        // 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.
>-@@ -1216,7 +1216,7 @@ nsOfflineStoreCompactState::OnDataAvaila
>-         // check if there's an envelope header; if not, write one.
>-         if (strncmp(m_dataBuffer, "From ", 5))
>-         {
>--          m_fileStream->Write("From "CRLF, 7, &bytesWritten);
>-+          m_fileStream->Write("From " CRLF, 7, &bytesWritten);
>-           m_offlineMsgSize += bytesWritten;
>-         }
>-       }
>-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 = 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
>-     {
>-       nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
>-       // send a quit command to close the connection with the server.
>--      if (SendData(url, "QUIT"CRLF) == NS_OK)
>-+      if (SendData(url, "QUIT" CRLF) == NS_OK)
>-       {
>-         m_nextState = SMTP_RESPONSE;
>-         m_nextStateAfterResponse = SMTP_ERROR_DONE;
>-@@ -2118,4 +2118,3 @@ nsSmtpProtocol::GetUsernamePassword(nsAC
>-     NS_ENSURE_SUCCESS(rv,rv);
>-     return rv;
>- }
>--
>-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;
>--          const char *envelope = "From "CRLF;
>-+          const char *envelope = "From " CRLF;
>-           offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
>-           fileSize += bytesWritten;
>-           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-25 10:51:33.370535858 +0200
>-@@ -1409,7 +1409,7 @@ void nsImapProtocol::HandleIdleResponses
>- {
>-   // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
>-   nsCAutoString commandBuffer(GetServerCommandTag());
>--  commandBuffer.Append(" IDLE"CRLF);
>-+  commandBuffer.Append(" IDLE" CRLF);
>- 
>-   do
>-   {
>-@@ -3287,7 +3287,7 @@ void nsImapProtocol::FetchMsgAttribute(c
>-     commandString.Append(messageIds);
>-     commandString.Append(" (");
>-     commandString.Append(attribute);
>--    commandString.Append(")"CRLF);
>-+    commandString.Append(")" CRLF);
>-     nsresult rv = SendData(commandString.get());
>- 
>-     if (NS_SUCCEEDED(rv))
>-@@ -5283,7 +5283,7 @@ nsImapProtocol::Expunge()
>- 
>-   IncrementCommandTagNumber();
>-   nsCAutoString command(GetServerCommandTag());
>--  command.Append(" expunge"CRLF);
>-+  command.Append(" expunge" CRLF);
>- 
>-   nsresult rv = SendData(command.get());
>-   if (NS_SUCCEEDED(rv))
>-@@ -5359,7 +5359,7 @@ void nsImapProtocol::ID()
>-   command.Append(gAppName);
>-   command.Append("\" \"version\" \"");
>-   command.Append(gAppVersion);
>--  command.Append("\")"CRLF);
>-+  command.Append("\")" CRLF);
>- 
>-   nsresult rv = SendData(command.get());
>-   if (NS_SUCCEEDED(rv))
>-@@ -5816,7 +5816,7 @@ nsresult nsImapProtocol::AuthLogin(const
>-     nsCAutoString correctedPassword;
>-     EscapeUserNamePasswordString(password.get(), &correctedPassword);
>-     command.Append(correctedPassword);
>--    command.Append("\""CRLF);
>-+    command.Append("\"" CRLF);
>-     rv = SendData(command.get(), true /* suppress logging */);
>-     NS_ENSURE_SUCCESS(rv, rv);
>-     ParseIMAPandCheckForNewMail();
>-@@ -7447,7 +7447,7 @@ void nsImapProtocol::CreateMailbox(const
>-   nsCString command(GetServerCommandTag());
>-   command += " create \"";
>-   command += escapedName;
>--  command += "\""CRLF;
>-+  command += "\"" CRLF;
>- 
>-   nsresult rv = SendData(command.get());
>-   if(NS_SUCCEEDED(rv))
>-@@ -7550,7 +7550,7 @@ void nsImapProtocol::Lsub(const char *ma
>-   nsCString command (GetServerCommandTag());
>-   command += " lsub \"\" \"";
>-   command += escapedPattern;
>--  command += "\""CRLF;
>-+  command += "\"" CRLF;
>- 
>-   PR_Free(boxnameWithOnlineDirectory);
>- 
>-@@ -7579,7 +7579,7 @@ void nsImapProtocol::List(const char *ma
>-   command += useXLIST ?
>-     " xlist \"\" \"" : " list \"\" \"";
>-   command += escapedPattern;
>--  command += "\""CRLF;
>-+  command += "\"" CRLF;
>- 
>-   PR_Free(boxnameWithOnlineDirectory);
>- 
>-@@ -7600,7 +7600,7 @@ void nsImapProtocol::Subscribe(const cha
>-   nsCString command (GetServerCommandTag());
>-   command += " subscribe \"";
>-   command += escapedName;
>--  command += "\""CRLF;
>-+  command += "\"" CRLF;
>- 
>-   nsresult rv = SendData(command.get());
>-   if (NS_SUCCEEDED(rv))
>-@@ -7618,7 +7618,7 @@ void nsImapProtocol::Unsubscribe(const c
>-   nsCString command (GetServerCommandTag());
>-   command += " unsubscribe \"";
>-   command += escapedName;
>--  command += "\""CRLF;
>-+  command += "\"" CRLF;
>- 
>-   nsresult rv = SendData(command.get());
>-   if (NS_SUCCEEDED(rv))
>-@@ -7632,7 +7632,7 @@ void nsImapProtocol::Idle()
>-   if (m_urlInProgress)
>-     return;
>-   nsCAutoString command (GetServerCommandTag());
>--  command += " IDLE"CRLF;
>-+  command += " IDLE" CRLF;
>-   nsresult rv = SendData(command.get());
>-   if (NS_SUCCEEDED(rv))
>-   {
>-@@ -7659,7 +7659,7 @@ void nsImapProtocol::EndIdle(bool waitFo
>-   nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
>-   if (asyncInputStream)
>-     asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
>--  nsresult rv = SendData("DONE"CRLF);
>-+  nsresult rv = SendData("DONE" CRLF);
>-   // 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);
>-@@ -7728,8 +7728,8 @@ void nsImapProtocol::Copy(const char * m
>-   PRUint32 msgsHandled = 0;
>-   const char *formatString;
>-   formatString = (idsAreUid)
>--      ? "%s uid store %s %s"CRLF
>--      : "%s store %s %s"CRLF;
>-+      ? "%s uid store %s %s" CRLF
>-+      : "%s store %s %s" CRLF;
>- 
>-   do
>-   {
>-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' && 
>-     *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string");
>--  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
>-+  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
>-   if (sendingIdleDone)
>-     fWaitingForMoreClientInput = false;
>- 
>-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;
>-     m_listpos = 0;
>--    return SendData(m_url, "LIST"CRLF);
>-+    return SendData(m_url, "LIST" CRLF);
>- }
>- 
>- 
>-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>");
>-                 PL_strcatn(newbody, newbodylen, body);
>--                PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
>-+                PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
>-                 PR_Free(body);
>-                 body = newbody;
>-               }
>-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=\""));
>-             MimeWriteAString(obj, fileName);
>--            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
>-+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
>-             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
>-             status = MimeWriteAString(obj, header);
>-             if (status < 0) 
>-               return status;
>--            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK));
>-+            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
>-             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: "));
>-             MimeWriteAString(obj, fileName);
>--            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
>-+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\""));
>-           }
>-           nsCString result;
>-           char timeBuffer[128];
>-@@ -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"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 -Nuar '--exclude=*xz' '--exclude=*bz2' seamonkey-2.9.1-4.fc16/mozilla-file.patch seamonkey-2.10-1.fc16/mozilla-file.patch
>--- seamonkey-2.9.1-4.fc16/mozilla-file.patch	2012-06-08 20:39:29.876981471 -0400
>+++ seamonkey-2.10-1.fc16/mozilla-file.patch	1969-12-31 19:00:00.000000000 -0500
>@@ -1,26 +0,0 @@
>-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 -Nuar '--exclude=*xz' '--exclude=*bz2' seamonkey-2.9.1-4.fc16/seamonkey-idl-parser-cachepath.patch seamonkey-2.10-1.fc16/seamonkey-idl-parser-cachepath.patch
>--- seamonkey-2.9.1-4.fc16/seamonkey-idl-parser-cachepath.patch	1969-12-31 19:00:00.000000000 -0500
>+++ seamonkey-2.10-1.fc16/seamonkey-idl-parser-cachepath.patch	2012-06-08 20:40:31.603981827 -0400
>@@ -0,0 +1,25 @@
>+--- mozilla/xpcom/idl-parser/Makefile.in.orig	2012-06-07 15:08:55.192504035 -0400
>++++ mozilla/xpcom/idl-parser/Makefile.in	2012-06-07 15:09:03.105850394 -0400
>+@@ -61,7 +61,7 @@
>+ 	$(PYTHON_PATH) \
>+ 	  -I$(topsrcdir)/other-licenses/ply \
>+ 	  -I$(topsrcdir)/xpcom/idl-parser \
>+-	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen
>++	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=cache --regen
>+ 
>+ check::
>+ 	$(PYTHON_PATH) \
>+--- mozilla/xpcom/typelib/xpidl/Makefile.in.orig	2012-06-07 17:05:20.594538497 -0400
>++++ mozilla/xpcom/typelib/xpidl/Makefile.in	2012-06-07 17:05:35.930599502 -0400
>+@@ -48,8 +48,8 @@
>+   $(topsrcdir)/xpcom/idl-parser/xpidl.py \
>+   $(topsrcdir)/xpcom/idl-parser/header.py \
>+   $(topsrcdir)/xpcom/idl-parser/typelib.py \
>+-  $(DEPTH)/xpcom/idl-parser/xpidllex.py \
>+-  $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \
>++  $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \
>++  $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \
>+   $(NULL)
>+ 
>+ ifndef MOZ_SYSTEM_PLY
>+
>diff -Nuar '--exclude=*xz' '--exclude=*bz2' seamonkey-2.9.1-4.fc16/seamonkey-nspr-prtime-header-path.patch seamonkey-2.10-1.fc16/seamonkey-nspr-prtime-header-path.patch
>--- seamonkey-2.9.1-4.fc16/seamonkey-nspr-prtime-header-path.patch	1969-12-31 19:00:00.000000000 -0500
>+++ seamonkey-2.10-1.fc16/seamonkey-nspr-prtime-header-path.patch	2012-06-08 20:40:31.648981827 -0400
>@@ -0,0 +1,11 @@
>+--- mozilla/hal/sandbox/PHal.ipdl.orig	2012-06-07 17:18:15.219021395 -0400
>++++ mozilla/hal/sandbox/PHal.ipdl	2012-06-07 17:18:03.958964097 -0400
>+@@ -39,7 +39,7 @@
>+ 
>+ include protocol PContent;
>+ include protocol PBrowser;
>+-include "nspr/prtime.h";
>++include "prtime.h";
>+ include "mozilla/HalSensor.h";
>+ include "mozilla/HalTypes.h";
>+ 
>diff -Nuar '--exclude=*xz' '--exclude=*bz2' seamonkey-2.9.1-4.fc16/seamonkey-package-manifest-file-removals.patch seamonkey-2.10-1.fc16/seamonkey-package-manifest-file-removals.patch
>--- seamonkey-2.9.1-4.fc16/seamonkey-package-manifest-file-removals.patch	1969-12-31 19:00:00.000000000 -0500
>+++ seamonkey-2.10-1.fc16/seamonkey-package-manifest-file-removals.patch	2012-06-08 20:40:31.648981827 -0400
>@@ -0,0 +1,45 @@
>+--- suite/installer/package-manifest.in.orig	2012-06-07 17:52:41.640238133 -0400
>++++ suite/installer/package-manifest.in	2012-06-07 17:54:32.007774715 -0400
>+@@ -61,9 +61,6 @@
>+ #ifndef MOZ_STATIC_JS
>+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
>+ #endif
>+-@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
>+-@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
>+-@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
>+ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
>+ #ifdef XP_MACOSX
>+ @BINPATH@/XUL
>+@@ -245,7 +242,6 @@
>+ @BINPATH@/components/necko_strconv.xpt
>+ @BINPATH@/components/necko_viewsource.xpt
>+ @BINPATH@/components/necko_websocket.xpt
>+-@BINPATH@/components/necko_wifi.xpt
>+ @BINPATH@/components/necko_wyciwyg.xpt
>+ #ifdef MOZ_ENABLE_GNOMEVFS
>+ @BINPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
>+@@ -481,7 +477,6 @@
>+ @BINPATH@/chrome/icons/default/main-window16.png
>+ @BINPATH@/chrome/icons/default/main-window48.png
>+ @BINPATH@/chrome/icons/default/seamonkey.png
>+-@BINPATH@/icons/updater.png
>+ #elifdef WIN_OR_OS2
>+ @BINPATH@/chrome/icons/default/bmPropsWindow.ico
>+ @BINPATH@/chrome/icons/default/bookmark-window.ico
>+@@ -575,16 +570,6 @@
>+ ; NSS libraries are signed in the staging directory,
>+ ; meaning their .chk files are created there directly.
>+ ;
>+-@BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
>+-@BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
>+-@BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
>+-#ifndef NSS_DISABLE_DBM
>+-@BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
>+-#endif
>+-@BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
>+-@BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
>+-@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
>+-@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
>+ @BINPATH@/chrome/pippki@JAREXT@
>+ @BINPATH@/chrome/pippki.manifest
>+ @BINPATH@/components/pipboot.xpt
>diff -Nuar '--exclude=*xz' '--exclude=*bz2' seamonkey-2.9.1-4.fc16/seamonkey.spec seamonkey-2.10-1.fc16/seamonkey.spec
>--- seamonkey-2.9.1-4.fc16/seamonkey.spec	2012-06-08 20:39:30.279981474 -0400
>+++ seamonkey-2.10-1.fc16/seamonkey.spec	2012-06-08 20:40:31.648981827 -0400
>@@ -15,14 +15,14 @@
> 
> Name:           seamonkey
> Summary:        Web browser, e-mail, news, IRC client, HTML editor
>-Version:        2.9.1
>-Release:        4%{?dist}
>+Version:        2.10
>+Release:        1%{?dist}
> URL:            http://www.mozilla.org/projects/seamonkey/
> License:        MPLv1.1
> Group:          Applications/Internet
> 
> Source0:        seamonkey-%{version}%{?prerelease_tag}.source.tar.bz2
>-Source1:        seamonkey-langpacks-%{version}-20120502.tar.xz
>+Source1:        seamonkey-langpacks-%{version}-20120607.tar.xz
> Source3:        seamonkey.sh.in
> Source4:        seamonkey.desktop
> Source7:        seamonkey-make-package.pl
>@@ -36,8 +36,9 @@
> 
> Patch1:         xulrunner-10.0-gcc47.patch
> Patch5:         seamonkey-8.0-enable-addons.patch
>-Patch8:         mozilla-733867-x.patch
>-Patch9:         mozilla-file.patch
>+Patch10:        seamonkey-idl-parser-cachepath.patch
>+Patch11:        seamonkey-nspr-prtime-header-path.patch
>+Patch12:        seamonkey-package-manifest-file-removals.patch
> 
> Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires:  nspr-devel >= %{minimum_build_nspr_version}
>@@ -107,9 +108,12 @@
> 
> %patch5 -p2 -b .addons
> pushd mozilla
>-%patch9 -p1 -b .file
>+%patch10 -p1 -b .idl-parser-cachepath
>+%patch11 -p1 -b .nspr-prtime-header-path
>+popd
>+pushd suite
>+%patch12 -p1 -b .package-manifest-file-removals
> popd
>-%patch8 -p1 -b .733867
> 
> %{__rm} -f .mozconfig
> %{__cp} %{SOURCE10} .mozconfig
>@@ -226,7 +230,7 @@
> %{__mkdir_p} $RPM_BUILD_ROOT/%{mozdir}/extensions
> %{__tar} xf %{SOURCE1}
> for langpack in `ls seamonkey-langpacks/*.xpi`; do
>-  language=$(basename $langpack .xpi | sed 's/^seamonkey-//' | sed 's/\.langpack$//' | sed 's/$[0-9]\.$*//')
>+  language=$(basename $langpack .xpi | sed 's/^seamonkey-//' | sed 's/\.langpack$//' | sed 's/$[0-9]\{1,2\}\.$*//')
>   extensiondir=$RPM_BUILD_ROOT/%{mozdir}/extensions/langpack-$language@seamonkey.mozilla.org
>   %{__mkdir_p} $extensiondir
>   unzip $langpack -d $extensiondir
>@@ -410,6 +414,13 @@
> 
> 
> %changelog
>+* Thu Jun 7 2012 Allen Hewes <allen@decisiv.net> 2.10-1
>+- Update to 2.10
>+- change sed string for version number to support 2 digits
>+- remove specific .so's from installer manifest
>+- fix the cache path for header.py and associated files when building
>+  in srcdir (vs using seperate objdir)
>+
> * Mon May 7 2012 Martin Stransky <stransky@redhat.com> 2.9.1-4
> - Fixed #717242 - does not adhere to Static Library Packaging Guidelines
> 
>diff -Nuar '--exclude=*xz' '--exclude=*bz2' seamonkey-2.9.1-4.fc16/xulrunner-10.0-gcc47.patch seamonkey-2.10-1.fc16/xulrunner-10.0-gcc47.patch
>--- seamonkey-2.9.1-4.fc16/xulrunner-10.0-gcc47.patch	2012-06-08 20:39:30.279981474 -0400
>+++ seamonkey-2.10-1.fc16/xulrunner-10.0-gcc47.patch	2012-06-08 20:40:31.648981827 -0400
>@@ -1,15 +1,3 @@
>-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

Actions: View | Diff

Attachments on bug 829983: 590528 | 590529