Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Jun 2012 05:41:11 GMT
From:      svn-freebsd-gecko@chruetertee.ch
To:        freebsd-gecko@freebsd.org
Subject:   [SVN-Commit] r797 - in branches/experimental: mail/thunderbird-beta mail/thunderbird-beta/files mail/thunderbird-esr/files www/seamonkey-beta www/seamonkey-beta/files
Message-ID:  <201206240541.q5O5fBeX032522@trillian.chruetertee.ch>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Jun 24 05:41:11 2012
New Revision: 797

Log:
more missing clang/libc++ patches for old releases

Modified:
   branches/experimental/mail/thunderbird-beta/Makefile
   branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc
   branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
   branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc
   branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
   branches/experimental/www/seamonkey-beta/Makefile
   branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc
   branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc

Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile	Sat Jun 23 14:04:19 2012	(r796)
+++ branches/experimental/mail/thunderbird-beta/Makefile	Sun Jun 24 05:41:11 2012	(r797)
@@ -121,6 +121,9 @@
 		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
 post-patch:
+	@${GREP} -Flr -e MSG_LINEBREAK -e CRLF ${WRKSRC}/mailnews \
+		| ${XARGS} ${REINPLACE_CMD} -Ee 's/"(MSG_|CRLF)/" \1/g' \
+		-e 's/(BREAK|CRLF)"/\1 "/g'
 	@${GREP} -Flr \"/proc ${MOZSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|/proc/self/fd|/dev/fd|' \
 		-e 's|/proc["/]|/compat/linux&|'

Modified: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc	Sat Jun 23 14:04:19 2012	(r796)
+++ branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc	Sun Jun 24 05:41:11 2012	(r797)
@@ -1,5 +1,13 @@
 --- mozilla/ipc/chromium/src/base/file_util_linux.cc~
 +++ mozilla/ipc/chromium/src/base/file_util_linux.cc
+@@ -5,6 +5,7 @@
+ #include "base/file_util.h"
+ 
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include <string>
+ #include <vector>
 @@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) {
  #ifdef ANDROID
    return GetTempDir(path);

Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc	Sat Jun 23 14:04:19 2012	(r796)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc	Sun Jun 24 05:41:11 2012	(r797)
@@ -1,5 +1,13 @@
 --- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
 +++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
 @@ -15,7 +15,7 @@
  #include "base/scoped_nsautorelease_pool.h"
  #include "base/scoped_ptr.h"

Modified: branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc	Sat Jun 23 14:04:19 2012	(r796)
+++ branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc	Sun Jun 24 05:41:11 2012	(r797)
@@ -1,5 +1,13 @@
 --- mozilla/ipc/chromium/src/base/file_util_linux.cc~
 +++ mozilla/ipc/chromium/src/base/file_util_linux.cc
+@@ -5,6 +5,7 @@
+ #include "base/file_util.h"
+ 
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include <string>
+ #include <vector>
 @@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) {
  #ifdef ANDROID
    return GetTempDir(path);

Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc	Sat Jun 23 14:04:19 2012	(r796)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc	Sun Jun 24 05:41:11 2012	(r797)
@@ -1,5 +1,13 @@
 --- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
 +++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
 @@ -15,7 +15,7 @@
  #include "base/scoped_nsautorelease_pool.h"
  #include "base/scoped_ptr.h"

Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile	Sat Jun 23 14:04:19 2012	(r796)
+++ branches/experimental/www/seamonkey-beta/Makefile	Sun Jun 24 05:41:11 2012	(r797)
@@ -129,6 +129,9 @@
 .endif
 
 post-patch:
+	@${GREP} -Flr -e MSG_LINEBREAK -e CRLF ${WRKSRC}/mailnews \
+		| ${XARGS} ${REINPLACE_CMD} -Ee 's/"(MSG_|CRLF)/" \1/g' \
+		-e 's/(BREAK|CRLF)"/\1 "/g'
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \
 		${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in

Modified: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc	Sat Jun 23 14:04:19 2012	(r796)
+++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc	Sun Jun 24 05:41:11 2012	(r797)
@@ -1,5 +1,13 @@
 --- mozilla/ipc/chromium/src/base/file_util_linux.cc~
 +++ mozilla/ipc/chromium/src/base/file_util_linux.cc
+@@ -5,6 +5,7 @@
+ #include "base/file_util.h"
+ 
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include <string>
+ #include <vector>
 @@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) {
  #ifdef ANDROID
    return GetTempDir(path);

Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc	Sat Jun 23 14:04:19 2012	(r796)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc	Sun Jun 24 05:41:11 2012	(r797)
@@ -1,5 +1,13 @@
 --- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
 +++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
 @@ -15,7 +15,7 @@
  #include "base/scoped_nsautorelease_pool.h"
  #include "base/scoped_ptr.h"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206240541.q5O5fBeX032522>