Date: Thursday, April 26, 2012 @ 17:35:10 Author: allan Revision: 157312
db-move: moved thunderbird from [staging] to [testing] (x86_64) Added: thunderbird/repos/testing-x86_64/ thunderbird/repos/testing-x86_64/PKGBUILD (from rev 157266, thunderbird/repos/staging-x86_64/PKGBUILD) thunderbird/repos/testing-x86_64/clrf.patch (from rev 157266, thunderbird/repos/staging-x86_64/clrf.patch) thunderbird/repos/testing-x86_64/gcc47.patch (from rev 157266, thunderbird/repos/staging-x86_64/gcc47.patch) thunderbird/repos/testing-x86_64/mozconfig (from rev 157266, thunderbird/repos/staging-x86_64/mozconfig) thunderbird/repos/testing-x86_64/thunderbird-install-dir.patch (from rev 157266, thunderbird/repos/staging-x86_64/thunderbird-install-dir.patch) thunderbird/repos/testing-x86_64/thunderbird.desktop (from rev 157266, thunderbird/repos/staging-x86_64/thunderbird.desktop) thunderbird/repos/testing-x86_64/thunderbird.install (from rev 157266, thunderbird/repos/staging-x86_64/thunderbird.install) thunderbird/repos/testing-x86_64/vendor.js (from rev 157266, thunderbird/repos/staging-x86_64/vendor.js) Deleted: thunderbird/repos/staging-x86_64/ -------------------------------+ PKGBUILD | 67 ++++++++++ clrf.patch | 265 ++++++++++++++++++++++++++++++++++++++++ gcc47.patch | 39 +++++ mozconfig | 40 ++++++ thunderbird-install-dir.patch | 42 ++++++ thunderbird.desktop | 13 + thunderbird.install | 12 + vendor.js | 9 + 8 files changed, 487 insertions(+) Copied: thunderbird/repos/testing-x86_64/PKGBUILD (from rev 157266, thunderbird/repos/staging-x86_64/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2012-04-26 21:35:10 UTC (rev 157312) @@ -0,0 +1,67 @@ +# $Id$ +# Maintainer : Ionut Biru <ib...@archlinux.org> +# Contributor: Alexander Baldeck <alexan...@archlinux.org> +# Contributor: Dale Blount <d...@archlinux.org> +# Contributor: Anders Bostrom <anders.bost...@home.se> + +pkgname=thunderbird +pkgver=12.0 +pkgrel=2 +pkgdesc="Standalone Mail/News reader" +arch=('i686' 'x86_64') +license=('MPL' 'GPL') +url="http://www.mozilla.org/thunderbird/" +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') +optdepends=('libcanberra: for sound support') +install=thunderbird.install +source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2 + mozconfig + thunderbird.desktop + thunderbird-install-dir.patch + vendor.js + gcc47.patch + clrf.patch) +md5sums=('7b30b72472a65bce74ba0ae60e4d4e6c' + '41511a6bcdd04cf56706218e4670e631' + 'af3e5b344d2edf1c7d61bb0a5a96de9a' + 'aea906acf72c43dd82ead2fabcc1c6db' + '5a53179d14ae9631b7afe5e4d0fc0b25' + '1e3ad86899c61f0993c429d10913edb4' + 'abe8f73faa71ea2a1e4c6f5a33f56c27') + +build() { + cd "$srcdir/comm-release" + patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" + patch -Np1 -i "$srcdir/gcc47.patch" + patch -Np1 -i "$srcdir/clrf.patch" + + cp "$srcdir/mozconfig" .mozconfig + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd "$srcdir/comm-release" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/pref/" + + for i in 16x16 22x22 24x24 32x32 48x48 256x256; do + install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \ + "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png" + done + + install -Dm644 "$srcdir/thunderbird.desktop" \ + "$pkgdir/usr/share/applications/thunderbird.desktop" + + rm -rf "$pkgdir"/usr/lib/thunderbird/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation" + + # We don't want the development stuff + rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl} +} Copied: thunderbird/repos/testing-x86_64/clrf.patch (from rev 157266, thunderbird/repos/staging-x86_64/clrf.patch) =================================================================== --- testing-x86_64/clrf.patch (rev 0) +++ testing-x86_64/clrf.patch 2012-04-26 21:35:10 UTC (rev 157312) @@ -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; Copied: thunderbird/repos/testing-x86_64/gcc47.patch (from rev 157266, thunderbird/repos/staging-x86_64/gcc47.patch) =================================================================== --- testing-x86_64/gcc47.patch (rev 0) +++ testing-x86_64/gcc47.patch 2012-04-26 21:35:10 UTC (rev 157312) @@ -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> + Copied: thunderbird/repos/testing-x86_64/mozconfig (from rev 157266, thunderbird/repos/staging-x86_64/mozconfig) =================================================================== --- testing-x86_64/mozconfig (rev 0) +++ testing-x86_64/mozconfig 2012-04-26 21:35:10 UTC (rev 157312) @@ -0,0 +1,40 @@ +mk_add_options MOZ_CO_PROJECT=mail +ac_add_options --enable-application=mail + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +#ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-official-branding +ac_add_options --enable-safe-browsing +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 Copied: thunderbird/repos/testing-x86_64/thunderbird-install-dir.patch (from rev 157266, thunderbird/repos/staging-x86_64/thunderbird-install-dir.patch) =================================================================== --- testing-x86_64/thunderbird-install-dir.patch (rev 0) +++ testing-x86_64/thunderbird-install-dir.patch 2012-04-26 21:35:10 UTC (rev 157312) @@ -0,0 +1,42 @@ +diff -Nur comm-beta.orig/config/autoconf.mk.in comm-beta/config/autoconf.mk.in +--- comm-beta.orig/config/autoconf.mk.in 2011-11-06 14:39:51.064983780 +0000 ++++ comm-beta/config/autoconf.mk.in 2011-11-06 14:42:57.216735333 +0000 +@@ -65,8 +65,8 @@ + mandir = @mandir@ + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + MOZDEPTH = $(DEPTH)/mozilla + DIST = $(MOZDEPTH)/dist +diff -Nur comm-beta.orig/mozilla/config/autoconf.mk.in comm-beta/mozilla/config/autoconf.mk.in +--- comm-beta.orig/mozilla/config/autoconf.mk.in 2011-11-06 14:39:41.771562967 +0000 ++++ comm-beta/mozilla/config/autoconf.mk.in 2011-11-06 14:44:18.404165515 +0000 +@@ -68,8 +68,8 @@ + mandir = @mandir@ + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + DIST = $(DEPTH)/dist + LIBXUL_SDK = @LIBXUL_SDK@ +diff -Nur comm-beta.orig/mozilla/js/src/config/autoconf.mk.in comm-beta/mozilla/js/src/config/autoconf.mk.in +--- comm-beta.orig/mozilla/js/src/config/autoconf.mk.in 2011-11-06 14:39:48.014955070 +0000 ++++ comm-beta/mozilla/js/src/config/autoconf.mk.in 2011-11-06 14:44:32.977635875 +0000 +@@ -61,8 +61,8 @@ + datadir = @datadir@ + mandir = @mandir@ + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + TOP_DIST = @TOP_DIST@ + ifneq (,$(filter /%,$(TOP_DIST))) Copied: thunderbird/repos/testing-x86_64/thunderbird.desktop (from rev 157266, thunderbird/repos/staging-x86_64/thunderbird.desktop) =================================================================== --- testing-x86_64/thunderbird.desktop (rev 0) +++ testing-x86_64/thunderbird.desktop 2012-04-26 21:35:10 UTC (rev 157312) @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=Thunderbird +Comment=Mail & News Reader +GenericName=Mail Client & News Reader +Exec=thunderbird %u +TryExec=thunderbird +Icon=thunderbird +Terminal=false +Type=Application +Categories=Network;Email; +MimeType=message/rfc822;x-scheme-handler/mailto; +StartupNotify=true Copied: thunderbird/repos/testing-x86_64/thunderbird.install (from rev 157266, thunderbird/repos/staging-x86_64/thunderbird.install) =================================================================== --- testing-x86_64/thunderbird.install (rev 0) +++ testing-x86_64/thunderbird.install 2012-04-26 21:35:10 UTC (rev 157312) @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: thunderbird/repos/testing-x86_64/vendor.js (from rev 157266, thunderbird/repos/staging-x86_64/vendor.js) =================================================================== --- testing-x86_64/vendor.js (rev 0) +++ testing-x86_64/vendor.js 2012-04-26 21:35:10 UTC (rev 157312) @@ -0,0 +1,9 @@ +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default mailer checking. +pref("mail.shell.checkDefaultMail", false); + +// Don't disable our bundled extensions in the application directory +pref("extensions.autoDisableScopes", 11); +pref("extensions.shownSelectionUI", true);