[seamonkey/el6] update to 2.15
Dmitry Butskoy
buc at fedoraproject.org
Wed Jan 9 23:23:54 UTC 2013
commit 3168dabdb03f5b1bf45610243948c0c7e80dc7ce
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Thu Jan 10 03:23:15 2013 +0400
update to 2.15
.gitignore | 2 +
seamonkey-2.12.1-nodecommit.patch | 19 --
seamonkey-2.14-nspr_4_9_1.patch | 319 ---------------------------------
seamonkey-2.15-nspr_4_9_1.patch | 352 +++++++++++++++++++++++++++++++++++++
seamonkey-2.15-nss_3_13_5.patch | 54 ++++++
seamonkey.spec | 18 ++-
sources | 4 +-
7 files changed, 423 insertions(+), 345 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06cf4e9..8d2034f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,5 @@ seamonkey-2.0.6.source.tar.bz2
/seamonkey-langpacks-2.14-20121121.tar.xz
/seamonkey-2.14.1.source.tar.bz2
/seamonkey-langpacks-2.14.1-20121203.tar.xz
+/seamonkey-2.15.source.tar.bz2
+/seamonkey-langpacks-2.15-20130109.tar.xz
diff --git a/seamonkey-2.15-nspr_4_9_1.patch b/seamonkey-2.15-nspr_4_9_1.patch
new file mode 100644
index 0000000..2c9a315
--- /dev/null
+++ b/seamonkey-2.15-nspr_4_9_1.patch
@@ -0,0 +1,352 @@
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/configure seamonkey-2.15-OK/comm-release/mozilla/configure
+--- seamonkey-2.15/comm-release/mozilla/configure 2013-01-06 10:26:49.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/configure 2013-01-09 21:16:47.729226835 +0400
+@@ -14883,7 +14883,7 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+- min_nspr_version=4.9.3
++ min_nspr_version=4.9.1
+ echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6
+ echo "configure:14889: checking for NSPR - version >= $min_nspr_version" >&5
+
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/dom/plugins/base/android/ANPAudio.cpp seamonkey-2.15-OK/comm-release/mozilla/dom/plugins/base/android/ANPAudio.cpp
+--- seamonkey-2.15/comm-release/mozilla/dom/plugins/base/android/ANPAudio.cpp 2013-01-06 10:26:12.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/dom/plugins/base/android/ANPAudio.cpp 2013-01-09 21:14:49.183251562 +0400
+@@ -117,8 +117,6 @@
+ NS_IMETHODIMP
+ AudioRunnable::Run()
+ {
+- PR_SetCurrentThreadName("Android Audio");
+-
+ JNIEnv* jenv = GetJNIForThread();
+ if (!jenv)
+ return NS_ERROR_FAILURE;
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/image/src/RasterImage.cpp seamonkey-2.15-OK/comm-release/mozilla/image/src/RasterImage.cpp
+--- seamonkey-2.15/comm-release/mozilla/image/src/RasterImage.cpp 2013-01-06 10:26:16.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/image/src/RasterImage.cpp 2013-01-09 21:19:36.077619727 +0400
+@@ -2687,7 +2687,6 @@
+ RasterImage::ScaleWorker::Run()
+ {
+ if (!mInitialized) {
+- PR_SetCurrentThreadName("Image Scaler");
+ mInitialized = true;
+ }
+
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/js/src/configure seamonkey-2.15-OK/comm-release/mozilla/js/src/configure
+--- seamonkey-2.15/comm-release/mozilla/js/src/configure 2013-01-06 10:26:49.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/js/src/configure 2013-01-09 21:14:49.453164375 +0400
+@@ -12673,7 +12673,7 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+- min_nspr_version=4.9.2
++ min_nspr_version=4.9.1
+ echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6
+ echo "configure:12679: checking for NSPR - version >= $min_nspr_version" >&5
+
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/js/src/jsgc.cpp seamonkey-2.15-OK/comm-release/mozilla/js/src/jsgc.cpp
+--- seamonkey-2.15/comm-release/mozilla/js/src/jsgc.cpp 2013-01-06 10:26:18.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/js/src/jsgc.cpp 2013-01-09 21:14:49.454105094 +0400
+@@ -2974,7 +2974,6 @@
+ void
+ GCHelperThread::threadMain(void *arg)
+ {
+- PR_SetCurrentThreadName("JS GC Helper");
+ static_cast<GCHelperThread *>(arg)->threadLoop();
+ }
+
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/js/src/jsscript.cpp seamonkey-2.15-OK/comm-release/mozilla/js/src/jsscript.cpp
+--- seamonkey-2.15/comm-release/mozilla/js/src/jsscript.cpp 2013-01-06 10:26:18.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/js/src/jsscript.cpp 2013-01-09 21:14:49.454105094 +0400
+@@ -880,7 +880,6 @@
+ void
+ SourceCompressorThread::compressorThread(void *arg)
+ {
+- PR_SetCurrentThreadName("JS Source Compressing Thread");
+ static_cast<SourceCompressorThread *>(arg)->threadLoop();
+ }
+
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/js/src/jsworkers.cpp seamonkey-2.15-OK/comm-release/mozilla/js/src/jsworkers.cpp
+--- seamonkey-2.15/comm-release/mozilla/js/src/jsworkers.cpp 2013-01-06 10:26:18.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/js/src/jsworkers.cpp 2013-01-09 21:19:22.169295125 +0400
+@@ -239,7 +239,6 @@
+ void
+ WorkerThread::ThreadMain(void *arg)
+ {
+- PR_SetCurrentThreadName("Analysis Helper");
+ static_cast<WorkerThread *>(arg)->threadLoop();
+ }
+
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/js/src/shell/js.cpp seamonkey-2.15-OK/comm-release/mozilla/js/src/shell/js.cpp
+--- seamonkey-2.15/comm-release/mozilla/js/src/shell/js.cpp 2013-01-06 10:26:18.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/js/src/shell/js.cpp 2013-01-09 21:14:49.455164100 +0400
+@@ -2760,8 +2760,6 @@
+ static void
+ WatchdogMain(void *arg)
+ {
+- PR_SetCurrentThreadName("JS Watchdog");
+-
+ JSRuntime *rt = (JSRuntime *) arg;
+
+ PR_Lock(gWatchdogLock);
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/js/xpconnect/src/XPCJSRuntime.cpp seamonkey-2.15-OK/comm-release/mozilla/js/xpconnect/src/XPCJSRuntime.cpp
+--- seamonkey-2.15/comm-release/mozilla/js/xpconnect/src/XPCJSRuntime.cpp 2013-01-06 10:26:20.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/js/xpconnect/src/XPCJSRuntime.cpp 2013-01-09 21:14:49.455164100 +0400
+@@ -993,8 +993,6 @@
+ void
+ XPCJSRuntime::WatchdogMain(void *arg)
+ {
+- PR_SetCurrentThreadName("JS Watchdog");
+-
+ XPCJSRuntime* self = static_cast<XPCJSRuntime*>(arg);
+
+ // Lock lasts until we return
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/netwerk/base/src/nsPACMan.cpp seamonkey-2.15-OK/comm-release/mozilla/netwerk/base/src/nsPACMan.cpp
+--- seamonkey-2.15/comm-release/mozilla/netwerk/base/src/nsPACMan.cpp 2013-01-06 10:26:28.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/netwerk/base/src/nsPACMan.cpp 2013-01-09 21:19:12.370403371 +0400
+@@ -678,7 +678,6 @@
+ nsPACMan::NamePACThread()
+ {
+ NS_ABORT_IF_FALSE(!NS_IsMainThread(), "wrong thread");
+- PR_SetCurrentThreadName("Proxy Resolution");
+ }
+
+ nsresult
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/netwerk/base/src/nsSocketTransportService2.cpp seamonkey-2.15-OK/comm-release/mozilla/netwerk/base/src/nsSocketTransportService2.cpp
+--- seamonkey-2.15/comm-release/mozilla/netwerk/base/src/nsSocketTransportService2.cpp 2013-01-06 10:26:28.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/netwerk/base/src/nsSocketTransportService2.cpp 2013-01-09 21:14:49.455164100 +0400
+@@ -613,8 +613,6 @@
+ NS_IMETHODIMP
+ nsSocketTransportService::Run()
+ {
+- PR_SetCurrentThreadName("Socket Thread");
+-
+ SOCKET_LOG(("STS thread init\n"));
+
+ psm::InitializeSSLServerCertVerificationThreads();
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/netwerk/system/win32/nsNotifyAddrListener.cpp seamonkey-2.15-OK/comm-release/mozilla/netwerk/system/win32/nsNotifyAddrListener.cpp
+--- seamonkey-2.15/comm-release/mozilla/netwerk/system/win32/nsNotifyAddrListener.cpp 2013-01-06 10:26:28.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/netwerk/system/win32/nsNotifyAddrListener.cpp 2013-01-09 21:14:49.455164100 +0400
+@@ -103,8 +103,6 @@
+ NS_IMETHODIMP
+ nsNotifyAddrListener::Run()
+ {
+- PR_SetCurrentThreadName("Link Monitor");
+-
+ HANDLE ev = CreateEvent(nullptr, FALSE, FALSE, nullptr);
+ NS_ENSURE_TRUE(ev, NS_ERROR_OUT_OF_MEMORY);
+
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/netwerk/wifi/nsWifiMonitor.cpp seamonkey-2.15-OK/comm-release/mozilla/netwerk/wifi/nsWifiMonitor.cpp
+--- seamonkey-2.15/comm-release/mozilla/netwerk/wifi/nsWifiMonitor.cpp 2013-01-06 10:26:28.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/netwerk/wifi/nsWifiMonitor.cpp 2013-01-09 21:14:49.738613066 +0400
+@@ -144,8 +144,6 @@
+ {
+ LOG(("@@@@@ wifi monitor run called\n"));
+
+- PR_SetCurrentThreadName("Wifi Monitor");
+-
+ nsresult rv = DoScan();
+
+ if (mKeepGoing && NS_FAILED(rv)) {
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/security/manager/ssl/src/nsKeygenThread.cpp seamonkey-2.15-OK/comm-release/mozilla/security/manager/ssl/src/nsKeygenThread.cpp
+--- seamonkey-2.15/comm-release/mozilla/security/manager/ssl/src/nsKeygenThread.cpp 2013-01-06 10:26:29.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/security/manager/ssl/src/nsKeygenThread.cpp 2013-01-09 21:14:49.739226839 +0400
+@@ -113,7 +113,6 @@
+
+ static void nsKeygenThreadRunner(void *arg)
+ {
+- PR_SetCurrentThreadName("Keygen");
+ nsKeygenThread *self = static_cast<nsKeygenThread *>(arg);
+ self->Run();
+ }
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/security/manager/ssl/src/nsPSMBackgroundThread.cpp seamonkey-2.15-OK/comm-release/mozilla/security/manager/ssl/src/nsPSMBackgroundThread.cpp
+--- seamonkey-2.15/comm-release/mozilla/security/manager/ssl/src/nsPSMBackgroundThread.cpp 2013-01-06 10:26:29.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/security/manager/ssl/src/nsPSMBackgroundThread.cpp 2013-01-09 21:14:49.739226839 +0400
+@@ -10,7 +10,6 @@
+ void nsPSMBackgroundThread::nsThreadRunner(void *arg)
+ {
+ nsPSMBackgroundThread *self = static_cast<nsPSMBackgroundThread *>(arg);
+- PR_SetCurrentThreadName(self->mName.BeginReading());
+ self->Run();
+ }
+
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/security/manager/ssl/src/nsProtectedAuthThread.cpp seamonkey-2.15-OK/comm-release/mozilla/security/manager/ssl/src/nsProtectedAuthThread.cpp
+--- seamonkey-2.15/comm-release/mozilla/security/manager/ssl/src/nsProtectedAuthThread.cpp 2013-01-06 10:26:29.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/security/manager/ssl/src/nsProtectedAuthThread.cpp 2013-01-09 21:14:49.739226839 +0400
+@@ -18,8 +18,6 @@
+
+ static void nsProtectedAuthThreadRunner(void *arg)
+ {
+- PR_SetCurrentThreadName("Protected Auth");
+-
+ nsProtectedAuthThread *self = static_cast<nsProtectedAuthThread *>(arg);
+ self->Run();
+ }
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/security/manager/ssl/src/nsSmartCardMonitor.cpp seamonkey-2.15-OK/comm-release/mozilla/security/manager/ssl/src/nsSmartCardMonitor.cpp
+--- seamonkey-2.15/comm-release/mozilla/security/manager/ssl/src/nsSmartCardMonitor.cpp 2013-01-06 10:26:29.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/security/manager/ssl/src/nsSmartCardMonitor.cpp 2013-01-09 21:14:49.739226839 +0400
+@@ -325,8 +325,6 @@
+ // C-like calling sequence to glue into PR_CreateThread.
+ void SmartCardMonitoringThread::LaunchExecute(void *arg)
+ {
+- PR_SetCurrentThreadName("SmartCard");
+-
+ ((SmartCardMonitoringThread*)arg)->Execute();
+ }
+
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/startupcache/StartupCache.cpp seamonkey-2.15-OK/comm-release/mozilla/startupcache/StartupCache.cpp
+--- seamonkey-2.15/comm-release/mozilla/startupcache/StartupCache.cpp 2013-01-06 10:26:30.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/startupcache/StartupCache.cpp 2013-01-09 21:14:49.739226839 +0400
+@@ -493,7 +493,6 @@
+ void
+ StartupCache::ThreadedWrite(void *aClosure)
+ {
+- PR_SetCurrentThreadName("StartupCache");
+ gStartupCache->WriteToDisk();
+ }
+
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/toolkit/components/startup/nsAppStartup.cpp seamonkey-2.15-OK/comm-release/mozilla/toolkit/components/startup/nsAppStartup.cpp
+--- seamonkey-2.15/comm-release/mozilla/toolkit/components/startup/nsAppStartup.cpp 2013-01-06 10:26:31.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/toolkit/components/startup/nsAppStartup.cpp 2013-01-09 21:14:49.740226730 +0400
+@@ -801,8 +801,6 @@
+ static void
+ ThreadedCalculateProcessCreationTimestamp(void *aClosure)
+ {
+- PR_SetCurrentThreadName("Startup Timer");
+-
+ PRTime now = PR_Now();
+ long hz = sysconf(_SC_CLK_TCK);
+ if (!hz)
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/toolkit/xre/EventTracer.cpp seamonkey-2.15-OK/comm-release/mozilla/toolkit/xre/EventTracer.cpp
+--- seamonkey-2.15/comm-release/mozilla/toolkit/xre/EventTracer.cpp 2013-01-06 10:26:32.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/toolkit/xre/EventTracer.cpp 2013-01-09 21:14:49.740226730 +0400
+@@ -83,8 +83,6 @@
+ */
+ void TracerThread(void *arg)
+ {
+- PR_SetCurrentThreadName("Event Tracer");
+-
+ // These are the defaults. They can be overridden by environment vars.
+ // This should be set to the maximum latency we'd like to allow
+ // for responsiveness.
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/widget/windows/LSPAnnotator.cpp seamonkey-2.15-OK/comm-release/mozilla/widget/windows/LSPAnnotator.cpp
+--- seamonkey-2.15/comm-release/mozilla/widget/windows/LSPAnnotator.cpp 2013-01-06 10:26:33.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/widget/windows/LSPAnnotator.cpp 2013-01-09 21:14:49.740226730 +0400
+@@ -49,8 +49,6 @@
+ NS_IMETHODIMP
+ LSPAnnotationGatherer::Run()
+ {
+- PR_SetCurrentThreadName("LSP Annotator");
+-
+ mThread = NS_GetCurrentThread();
+
+ DWORD size = 0;
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/widget/windows/nsSound.cpp seamonkey-2.15-OK/comm-release/mozilla/widget/windows/nsSound.cpp
+--- seamonkey-2.15/comm-release/mozilla/widget/windows/nsSound.cpp 2013-01-06 10:26:33.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/widget/windows/nsSound.cpp 2013-01-09 21:14:49.740226730 +0400
+@@ -74,8 +74,6 @@
+ NS_IMETHODIMP
+ nsSoundPlayer::Run()
+ {
+- PR_SetCurrentThreadName("Play Sound");
+-
+ NS_PRECONDITION(!mSoundName.IsEmpty(), "Sound name should not be empty");
+ ::PlaySoundW(mSoundName.get(), NULL, SND_NODEFAULT | SND_ALIAS | SND_ASYNC);
+ nsCOMPtr<nsIRunnable> releaser = new SoundReleaser(mSound);
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/xpcom/base/VisualEventTracer.cpp seamonkey-2.15-OK/comm-release/mozilla/xpcom/base/VisualEventTracer.cpp
+--- seamonkey-2.15/comm-release/mozilla/xpcom/base/VisualEventTracer.cpp 2013-01-06 10:26:33.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/xpcom/base/VisualEventTracer.cpp 2013-01-09 21:14:49.799372056 +0400
+@@ -61,9 +61,6 @@
+ return PL_strdup("Main Thread");
+
+ PRThread * currentThread = PR_GetCurrentThread();
+- const char * name = PR_GetThreadName(currentThread);
+- if (name)
+- return PL_strdup(name);
+
+ char buffer[128];
+ PR_snprintf(buffer, 127, "Nameless %p", currentThread);
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/xpcom/base/nsCycleCollector.cpp seamonkey-2.15-OK/comm-release/mozilla/xpcom/base/nsCycleCollector.cpp
+--- seamonkey-2.15/comm-release/mozilla/xpcom/base/nsCycleCollector.cpp 2013-01-06 10:26:33.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/xpcom/base/nsCycleCollector.cpp 2013-01-09 21:14:49.799372056 +0400
+@@ -3051,8 +3051,6 @@
+ public:
+ NS_IMETHOD Run()
+ {
+- PR_SetCurrentThreadName("XPCOM CC");
+-
+ #ifdef XP_WIN
+ TlsSetValue(gTLSThreadIDIndex,
+ (void*) mozilla::threads::CycleCollector);
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/xpcom/glue/nsThreadUtils.cpp seamonkey-2.15-OK/comm-release/mozilla/xpcom/glue/nsThreadUtils.cpp
+--- seamonkey-2.15/comm-release/mozilla/xpcom/glue/nsThreadUtils.cpp 2013-01-06 10:26:33.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/xpcom/glue/nsThreadUtils.cpp 2013-01-09 21:14:49.800227018 +0400
+@@ -241,7 +241,6 @@
+ NS_IMETHODIMP
+ nsNameThreadRunnable::Run()
+ {
+- PR_SetCurrentThreadName(mName.BeginReading());
+ return NS_OK;
+ }
+
+@@ -287,10 +286,6 @@
+ // Set on the target thread
+ NS_SetThreadName(aThread, name);
+ }
+- else {
+- // Set on the current thread
+- PR_SetCurrentThreadName(name.BeginReading());
+- }
+ }
+
+ // nsAutoLowPriorityIO
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/xpcom/threads/HangMonitor.cpp seamonkey-2.15-OK/comm-release/mozilla/xpcom/threads/HangMonitor.cpp
+--- seamonkey-2.15/comm-release/mozilla/xpcom/threads/HangMonitor.cpp 2013-01-06 10:26:34.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/xpcom/threads/HangMonitor.cpp 2013-01-09 21:14:49.800227018 +0400
+@@ -145,8 +145,6 @@
+ void
+ ThreadMain(void*)
+ {
+- PR_SetCurrentThreadName("Hang Monitor");
+-
+ MonitorAutoLock lock(*gMonitor);
+
+ // In order to avoid issues with the hang monitor incorrectly triggering
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/xpcom/threads/LazyIdleThread.cpp seamonkey-2.15-OK/comm-release/mozilla/xpcom/threads/LazyIdleThread.cpp
+--- seamonkey-2.15/comm-release/mozilla/xpcom/threads/LazyIdleThread.cpp 2013-01-06 10:26:34.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/xpcom/threads/LazyIdleThread.cpp 2013-01-09 21:14:49.800227018 +0400
+@@ -168,8 +168,6 @@
+ void
+ LazyIdleThread::InitThread()
+ {
+- PR_SetCurrentThreadName(mName.BeginReading());
+-
+ // Happens on mThread but mThread may not be set yet...
+
+ nsCOMPtr<nsIThreadInternal> thread(do_QueryInterface(NS_GetCurrentThread()));
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/xpcom/threads/TimerThread.cpp seamonkey-2.15-OK/comm-release/mozilla/xpcom/threads/TimerThread.cpp
+--- seamonkey-2.15/comm-release/mozilla/xpcom/threads/TimerThread.cpp 2013-01-06 10:26:34.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/xpcom/threads/TimerThread.cpp 2013-01-09 21:14:49.800227018 +0400
+@@ -216,8 +216,6 @@
+ /* void Run(); */
+ NS_IMETHODIMP TimerThread::Run()
+ {
+- PR_SetCurrentThreadName("Timer");
+-
+ MonitorAutoLock lock(mMonitor);
+
+ // We need to know how many microseconds give a positive PRIntervalTime. This
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/xpcom/threads/nsProcessCommon.cpp seamonkey-2.15-OK/comm-release/mozilla/xpcom/threads/nsProcessCommon.cpp
+--- seamonkey-2.15/comm-release/mozilla/xpcom/threads/nsProcessCommon.cpp 2013-01-06 10:26:34.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/xpcom/threads/nsProcessCommon.cpp 2013-01-09 21:14:49.800227018 +0400
+@@ -225,9 +225,6 @@
+ {
+ nsRefPtr<nsProcess> process = dont_AddRef(static_cast<nsProcess*>(arg));
+
+- if (!process->mBlocking)
+- PR_SetCurrentThreadName("RunProcess");
+-
+ #if defined(PROCESSMODEL_WINAPI)
+ DWORD dwRetVal;
+ unsigned long exitCode = -1;
diff --git a/seamonkey-2.15-nss_3_13_5.patch b/seamonkey-2.15-nss_3_13_5.patch
new file mode 100644
index 0000000..9db31d2
--- /dev/null
+++ b/seamonkey-2.15-nss_3_13_5.patch
@@ -0,0 +1,54 @@
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/configure seamonkey-2.15-OK/comm-release/mozilla/configure
+--- seamonkey-2.15/comm-release/mozilla/configure 2013-01-10 02:43:33.770226655 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/configure 2013-01-10 01:42:40.287539210 +0400
+@@ -15279,7 +15279,7 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+- min_nss_version=3.14.1
++ min_nss_version=3.13.5
+ echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
+ echo "configure:15285: checking for NSS - version >= $min_nss_version" >&5
+
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp seamonkey-2.15-OK/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp
+--- seamonkey-2.15/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp 2013-01-06 10:26:29.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp 2013-01-10 02:29:25.637414389 +0400
+@@ -355,7 +355,7 @@
+ }
+
+ if (attrName.LowerCaseEqualsLiteral("sha1-digest-manifest")) {
+- rv = MapSECStatus(ATOB_ConvertAsciiToItem(&mfDigest, attrValue.get()));
++ rv = MapSECStatus(ATOB_ConvertAsciiToItem(&mfDigest, (char *) attrValue.get()));
+ if (NS_FAILED(rv)) {
+ return rv;
+ }
+@@ -472,7 +472,7 @@
+ if (digest.len > 0) // multiple SHA1 digests in section
+ return NS_ERROR_SIGNED_JAR_MANIFEST_INVALID;
+
+- rv = MapSECStatus(ATOB_ConvertAsciiToItem(&digest, attrValue.get()));
++ rv = MapSECStatus(ATOB_ConvertAsciiToItem(&digest, (char *) attrValue.get()));
+ if (NS_FAILED(rv))
+ return NS_ERROR_SIGNED_JAR_MANIFEST_INVALID;
+
+@@ -587,7 +587,7 @@
+
+ // Verify that the signature file is a valid signature of the SF file
+ if (!SEC_PKCS7VerifyDetachedSignature(p7_info, certUsageObjectSigner,
+- &sfCalculatedDigest.get(), HASH_AlgSHA1,
++ (SECItem *) &sfCalculatedDigest.get(), HASH_AlgSHA1,
+ false)) {
+ PRErrorCode error = PR_GetError();
+ const char * errorName = PR_ErrorToName(error);
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h seamonkey-2.15-OK/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h
+--- seamonkey-2.15/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h 2013-01-06 10:26:29.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h 2013-01-10 02:24:19.886414387 +0400
+@@ -160,7 +160,7 @@
+ {
+ nsresult rv = SetLength(hashAlg);
+ NS_ENSURE_SUCCESS(rv, rv);
+- return MapSECStatus(PK11_HashBuf(hashAlg, item.data, buf, len));
++ return MapSECStatus(PK11_HashBuf(hashAlg, item.data, (unsigned char *) buf, len));
+ }
+
+ nsresult End(SECOidTag hashAlg, ScopedPK11Context & context)
diff --git a/seamonkey.spec b/seamonkey.spec
index 4dedf6b..5e884a1 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -20,7 +20,7 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
-Version: 2.14.1
+Version: 2.15
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPLv2.0
@@ -34,7 +34,7 @@ Source0: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%
#
# Run script as ./moz-grab-langpacks --app seamonkey %{version}
#
-Source1: seamonkey-langpacks-%{version}-20121203.tar.xz
+Source1: seamonkey-langpacks-%{version}-20130109.tar.xz
Source3: seamonkey.sh.in
Source4: seamonkey.desktop
@@ -51,11 +51,11 @@ Patch1: xulrunner-15.0-gcc47.patch
Patch5: seamonkey-8.0-enable-addons.patch
Patch10: seamonkey-idl-parser-cachepath.patch
Patch20: seamonkey-2.13-jemalloc.patch
-Patch21: seamonkey-2.12.1-nodecommit.patch
Patch22: seamonkey-2.14-installdir.patch
Patch23: seamonkey-2.14-elfhack.patch
-Patch24: seamonkey-2.14-nspr_4_9_1.patch
+Patch24: seamonkey-2.15-nspr_4_9_1.patch
Patch25: seamonkey-2.13.2-sidebar.patch
+Patch26: seamonkey-2.15-nss_3_13_5.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{minimum_build_nspr_version}
@@ -136,7 +136,6 @@ popd
%patch5 -p2 -b .addons
%patch10 -p2 -b .idl-parser-cachepath
%patch20 -p1 -b .jemalloc
-%patch21 -p1 -b .nodecommit
%patch22 -p2 -b .installdir
%patch23 -p2 -b .elfhack
@@ -145,6 +144,8 @@ popd
%patch25 -p1 -b .sidebar
+%patch26 -p2 -b .nss3135
+
# fix obsoleted modifier in inspector
sed -i -e 's/ *xpcnativewrappers=no//' mozilla/extensions/inspector/jar.mn
@@ -160,6 +161,9 @@ echo "ac_add_options --disable-elf-hack" >> .mozconfig
sed -i -e '/with-system-libvpx/ d' .mozconfig
%endif
+# WebRTC support requires nss >= 3.14, which is not provided by RHEL6 for a while...
+echo "ac_add_options --disable-webrtc" >> .mozconfig
+
%build
cd %{sources_subdir}
@@ -478,6 +482,10 @@ fi
%changelog
+* Wed Jan 9 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.15-1
+- update to 2.15
+- disable WebRTC support until nss >= 3.14 appear in RHEL6
+
* Mon Dec 3 2012 Dmitry Butskoy <Dmitry at Butskoy.name> 2.14.1-1
- update to 2.14.1
diff --git a/sources b/sources
index 63c31f4..e5569dc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-19463b718446552d04130d01d25d7330 seamonkey-2.14.1.source.tar.bz2
-fbf4cb0e2c63a0b5ba10fe9d2a7c3e4e seamonkey-langpacks-2.14.1-20121203.tar.xz
+99541df8d01d9e988f4bccc59cbddbfa seamonkey-2.15.source.tar.bz2
+de03a1eafb52fbf52f2345b52ea3cd80 seamonkey-langpacks-2.15-20130109.tar.xz
More information about the scm-commits
mailing list