[arch-commits] Commit in seamonkey/trunk (5 files)

Ionut Biru ibiru at archlinux.org
Fri Apr 27 16:50:49 EDT 2012


    Date: Friday, April 27, 2012 @ 16:50:49
  Author: ibiru
Revision: 157354

update to 2.9

Added:
  seamonkey/trunk/clrf.patch
  seamonkey/trunk/gcc47.patch
Modified:
  seamonkey/trunk/PKGBUILD
  seamonkey/trunk/mozconfig
Deleted:
  seamonkey/trunk/libvpx.patch

--------------+
 PKGBUILD     |   16 ++-
 clrf.patch   |  265 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gcc47.patch  |   39 ++++++++
 libvpx.patch |   12 --
 mozconfig    |    3 
 5 files changed, 316 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-27 20:43:11 UTC (rev 157353)
+++ PKGBUILD	2012-04-27 20:50:49 UTC (rev 157354)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=seamonkey
-pkgver=2.8
+pkgver=2.9
 pkgrel=1
 pkgdesc="SeaMonkey internet suite"
 arch=('i686' 'x86_64')
@@ -14,17 +14,20 @@
         mozconfig
         seamonkey.desktop
         seamonkey-2.0-lang.patch
-        libvpx.patch)
-md5sums=('a7128f6bcd16bebed4a7c3487b69c38f'
-         'd02b5f002a7cdf8d15dccd2548d09256'
+        gcc47.patch
+        clrf.patch)
+md5sums=('4af38acf517a8ab850e6aa7a6b085325'
+         'b8887c39a190e3168a9c7e4355ae3dd4'
          '6119a2254716752c9d08e366f8d4c048'
          '25b6fe16ac24cd5c852213e5c1adb272'
-         '5b2aaff7dfe7f1f94ad965905b20e782')
+         '1e3ad86899c61f0993c429d10913edb4'
+         'abe8f73faa71ea2a1e4c6f5a33f56c27')
 
 build() {
   cd "$srcdir/comm-release"
   patch -Np1 -i "$srcdir/seamonkey-2.0-lang.patch"
-  patch -Np1 -i "$srcdir/libvpx.patch"
+  patch -Np1 -i "$srcdir/gcc47.patch"
+  patch -Np1 -i "$srcdir/clrf.patch"
 
   cp "$srcdir/mozconfig" .mozconfig
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey-$pkgver"
@@ -48,4 +51,5 @@
   install -m644 "$srcdir/seamonkey.desktop" "$pkgdir/usr/share/applications/"
 
   rm -f "$pkgdir/usr/lib/pkgconfig/"seamonkey-ns{s,pr}.pc
+  rm -r "$pkgdir"/usr/{include,lib/seamonkey-devel-$pkgver,share/idl}
 }

Added: clrf.patch
===================================================================
--- clrf.patch	                        (rev 0)
+++ clrf.patch	2012-04-27 20:50:49 UTC (rev 157354)
@@ -0,0 +1,265 @@
+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());
+-    PL_strcat(encoding, "}"CRLF);
++    PL_strcat(encoding, "}" CRLF);
+     PL_strcat(encoding, value);
+     return NS_OK;
+   }
+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 @@
+           }
+         }
+       }
+-#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 @@
+         // 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 -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 = 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 @@
+     {
+       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 @@
+     NS_ENSURE_SUCCESS(rv,rv);
+     return rv;
+ }
+-
+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;
+-          const char *envelope = "From "CRLF;
++          const char *envelope = "From " CRLF;
+           offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
+           fileSize += bytesWritten;
+           do
+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());
+-  commandBuffer.Append(" IDLE"CRLF);
++  commandBuffer.Append(" IDLE" CRLF);
+ 
+   do
+   {
+@@ -3287,7 +3287,7 @@
+     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 @@
+ 
+   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 @@
+   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 @@
+     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 @@
+   nsCString command(GetServerCommandTag());
+   command += " create \"";
+   command += escapedName;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   nsresult rv = SendData(command.get());
+   if(NS_SUCCEEDED(rv))
+@@ -7550,7 +7550,7 @@
+   nsCString command (GetServerCommandTag());
+   command += " lsub \"\" \"";
+   command += escapedPattern;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   PR_Free(boxnameWithOnlineDirectory);
+ 
+@@ -7579,7 +7579,7 @@
+   command += useXLIST ?
+     " xlist \"\" \"" : " list \"\" \"";
+   command += escapedPattern;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   PR_Free(boxnameWithOnlineDirectory);
+ 
+@@ -7600,7 +7600,7 @@
+   nsCString command (GetServerCommandTag());
+   command += " subscribe \"";
+   command += escapedName;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   nsresult rv = SendData(command.get());
+   if (NS_SUCCEEDED(rv))
+@@ -7618,7 +7618,7 @@
+   nsCString command (GetServerCommandTag());
+   command += " unsubscribe \"";
+   command += escapedName;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   nsresult rv = SendData(command.get());
+   if (NS_SUCCEEDED(rv))
+@@ -7632,7 +7632,7 @@
+   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 @@
+   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 @@
+   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 -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 = false;
+ 
+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;
+-    return SendData(m_url, "LIST"CRLF);
++    return SendData(m_url, "LIST" CRLF);
+ }
+ 
+ 
+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, "<PRE>");
+                 PL_strcatn(newbody, newbodylen, body);
+-                PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
++                PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
+                 PR_Free(body);
+                 body = newbody;
+               }
+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);
+-            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 @@
+             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 @@
+                                  "%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;

Added: gcc47.patch
===================================================================
--- gcc47.patch	                        (rev 0)
+++ gcc47.patch	2012-04-27 20:50:49 UTC (rev 157354)
@@ -0,0 +1,39 @@
+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-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"
+ 
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+ 
+ #include <string>
+ #include <vector>
+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-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 <errno.h>
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+ 
+ #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-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 <time.h>
+ #endif
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+ 
+ #include <limits>
+ 

Deleted: libvpx.patch
===================================================================
--- libvpx.patch	2012-04-27 20:43:11 UTC (rev 157353)
+++ libvpx.patch	2012-04-27 20:50:49 UTC (rev 157354)
@@ -1,12 +0,0 @@
-diff -Nur comm-release.orig/mozilla/configure.in comm-release/mozilla/configure.in
---- comm-release.orig/mozilla/configure.in	2012-02-05 18:02:17.376830377 +0000
-+++ comm-release/mozilla/configure.in	2012-02-05 18:03:25.246274275 +0000
-@@ -5629,7 +5629,7 @@
-             dnl v0.9.6 one to check for.
-             AC_TRY_COMPILE([
-                 #include <vpx/vpx_decoder.h>
--                #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
-+                #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
-                     #error "test failed."
-                 #endif
-                 ],

Modified: mozconfig
===================================================================
--- mozconfig	2012-04-27 20:43:11 UTC (rev 157353)
+++ mozconfig	2012-04-27 20:50:49 UTC (rev 157354)
@@ -13,7 +13,8 @@
 ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-cairo
+ac_add_options --enable-system-ffi
+#ac_add_options --enable-system-cairo
 ac_add_options --with-pthreads
 
 # Features



More information about the arch-commits mailing list