[seamonkey/el6] update to 2.13
Dmitry Butskoy
buc at fedoraproject.org
Thu Oct 11 17:56:29 UTC 2012
commit e034449584db403e19149e42455ab745949dfaf6
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Thu Oct 11 21:55:32 2012 +0400
update to 2.13
seamonkey-2.12.1-installdir.patch | 58 ----
seamonkey-2.13-installdir.patch | 52 ++++
...jemalloc.patch => seamonkey-2.13-jemalloc.patch | 4 +-
seamonkey-2.13-nspr_4_9_1.patch | 306 ++++++++++++++++++++
seamonkey.spec | 28 ++-
sources | 4 +-
6 files changed, 385 insertions(+), 67 deletions(-)
---
diff --git a/seamonkey-2.13-installdir.patch b/seamonkey-2.13-installdir.patch
new file mode 100644
index 0000000..5bd2e17
--- /dev/null
+++ b/seamonkey-2.13-installdir.patch
@@ -0,0 +1,52 @@
+diff -Nrbu seamonkey-2.13/comm-release/config/autoconf.mk.in seamonkey-2.13-OK/comm-release/config/autoconf.mk.in
+--- seamonkey-2.13/comm-release/config/autoconf.mk.in 2012-10-08 07:24:31.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/config/autoconf.mk.in 2012-10-11 20:03:36.741362819 +0400
+@@ -30,14 +30,14 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir = @includedir@/$(MOZ_APP_NAME)
+ libdir = @libdir@
+ datadir = @datadir@
+ mandir = @mandir@
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
+
+-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 -Nrbu seamonkey-2.13/comm-release/mozilla/config/baseconfig.mk seamonkey-2.13-OK/comm-release/mozilla/config/baseconfig.mk
+--- seamonkey-2.13/comm-release/mozilla/config/baseconfig.mk 2012-10-08 07:29:07.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/config/baseconfig.mk 2012-10-11 20:03:48.557361959 +0400
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-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)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
+
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/js/src/config/baseconfig.mk seamonkey-2.13-OK/comm-release/mozilla/js/src/config/baseconfig.mk
+--- seamonkey-2.13/comm-release/mozilla/js/src/config/baseconfig.mk 2012-10-08 07:29:15.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/js/src/config/baseconfig.mk 2012-10-11 20:03:56.665505979 +0400
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-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
+
+ ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
diff --git a/seamonkey-2.12.1-jemalloc.patch b/seamonkey-2.13-jemalloc.patch
similarity index 77%
rename from seamonkey-2.12.1-jemalloc.patch
rename to seamonkey-2.13-jemalloc.patch
index 34aa147..20d9cbd 100644
--- a/seamonkey-2.12.1-jemalloc.patch
+++ b/seamonkey-2.13-jemalloc.patch
@@ -1,7 +1,7 @@
Index: comm-release/mozilla/memory/jemalloc/jemalloc.c
===================================================================
---- comm-release.orig/mozilla/memory/jemalloc/jemalloc.c
-+++ comm-release/mozilla/memory/jemalloc/jemalloc.c
+--- comm-release.orig/mozilla/memory/mozjemalloc/jemalloc.c
++++ comm-release/mozilla/memory/mozjemalloc/jemalloc.c
@@ -1091,7 +1091,9 @@ static unsigned ncpus;
* controlling the malloc behavior are defined as compile-time constants
* for best performance and cannot be altered at runtime.
diff --git a/seamonkey-2.13-nspr_4_9_1.patch b/seamonkey-2.13-nspr_4_9_1.patch
new file mode 100644
index 0000000..dd5310e
--- /dev/null
+++ b/seamonkey-2.13-nspr_4_9_1.patch
@@ -0,0 +1,306 @@
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/configure seamonkey-2.13-OK/comm-release/mozilla/configure
+--- seamonkey-2.13/comm-release/mozilla/configure 2012-10-08 07:29:50.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/configure 2012-10-11 20:41:55.108756308 +0400
+@@ -13728,7 +13728,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:13734: checking for NSPR - version >= $min_nspr_version" >&5
+
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/dom/plugins/base/android/ANPAudio.cpp seamonkey-2.13-OK/comm-release/mozilla/dom/plugins/base/android/ANPAudio.cpp
+--- seamonkey-2.13/comm-release/mozilla/dom/plugins/base/android/ANPAudio.cpp 2012-10-08 07:29:10.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/dom/plugins/base/android/ANPAudio.cpp 2012-10-11 20:38:15.262601586 +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.13/comm-release/mozilla/js/src/configure seamonkey-2.13-OK/comm-release/mozilla/js/src/configure
+--- seamonkey-2.13/comm-release/mozilla/js/src/configure 2012-10-08 07:29:50.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/js/src/configure 2012-10-11 20:42:03.183756644 +0400
+@@ -12025,7 +12025,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:12031: checking for NSPR - version >= $min_nspr_version" >&5
+
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/js/src/jsgc.cpp seamonkey-2.13-OK/comm-release/mozilla/js/src/jsgc.cpp
+--- seamonkey-2.13/comm-release/mozilla/js/src/jsgc.cpp 2012-10-08 07:29:16.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/js/src/jsgc.cpp 2012-10-11 20:37:44.705320500 +0400
+@@ -2799,7 +2799,6 @@
+ void
+ GCHelperThread::threadMain(void *arg)
+ {
+- PR_SetCurrentThreadName("JS GC Helper");
+ static_cast<GCHelperThread *>(arg)->threadLoop();
+ }
+
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/js/src/shell/js.cpp seamonkey-2.13-OK/comm-release/mozilla/js/src/shell/js.cpp
+--- seamonkey-2.13/comm-release/mozilla/js/src/shell/js.cpp 2012-10-08 07:29:17.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/js/src/shell/js.cpp 2012-10-11 20:37:51.224694089 +0400
+@@ -2883,8 +2883,6 @@
+ static void
+ WatchdogMain(void *arg)
+ {
+- PR_SetCurrentThreadName("JS Watchdog");
+-
+ JSRuntime *rt = (JSRuntime *) arg;
+
+ PR_Lock(gWatchdogLock);
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/js/xpconnect/src/XPCJSRuntime.cpp seamonkey-2.13-OK/comm-release/mozilla/js/xpconnect/src/XPCJSRuntime.cpp
+--- seamonkey-2.13/comm-release/mozilla/js/xpconnect/src/XPCJSRuntime.cpp 2012-10-08 07:29:18.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/js/xpconnect/src/XPCJSRuntime.cpp 2012-10-11 20:37:38.576641549 +0400
+@@ -885,8 +885,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.13/comm-release/mozilla/netwerk/base/src/nsSocketTransportService2.cpp seamonkey-2.13-OK/comm-release/mozilla/netwerk/base/src/nsSocketTransportService2.cpp
+--- seamonkey-2.13/comm-release/mozilla/netwerk/base/src/nsSocketTransportService2.cpp 2012-10-08 07:29:28.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/netwerk/base/src/nsSocketTransportService2.cpp 2012-10-11 20:37:20.686614069 +0400
+@@ -582,8 +582,6 @@
+ NS_IMETHODIMP
+ nsSocketTransportService::Run()
+ {
+- PR_SetCurrentThreadName("Socket Thread");
+-
+ SOCKET_LOG(("STS thread init\n"));
+
+ psm::InitializeSSLServerCertVerificationThreads();
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/netwerk/system/win32/nsNotifyAddrListener.cpp seamonkey-2.13-OK/comm-release/mozilla/netwerk/system/win32/nsNotifyAddrListener.cpp
+--- seamonkey-2.13/comm-release/mozilla/netwerk/system/win32/nsNotifyAddrListener.cpp 2012-10-08 07:29:29.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/netwerk/system/win32/nsNotifyAddrListener.cpp 2012-10-11 20:37:26.703290682 +0400
+@@ -103,8 +103,6 @@
+ NS_IMETHODIMP
+ nsNotifyAddrListener::Run()
+ {
+- PR_SetCurrentThreadName("Link Monitor");
+-
+ HANDLE ev = CreateEvent(nsnull, FALSE, FALSE, nsnull);
+ NS_ENSURE_TRUE(ev, NS_ERROR_OUT_OF_MEMORY);
+
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/netwerk/wifi/nsWifiMonitor.cpp seamonkey-2.13-OK/comm-release/mozilla/netwerk/wifi/nsWifiMonitor.cpp
+--- seamonkey-2.13/comm-release/mozilla/netwerk/wifi/nsWifiMonitor.cpp 2012-10-08 07:29:29.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/netwerk/wifi/nsWifiMonitor.cpp 2012-10-11 20:37:32.656091400 +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.13/comm-release/mozilla/security/manager/ssl/src/nsKeygenThread.cpp seamonkey-2.13-OK/comm-release/mozilla/security/manager/ssl/src/nsKeygenThread.cpp
+--- seamonkey-2.13/comm-release/mozilla/security/manager/ssl/src/nsKeygenThread.cpp 2012-10-08 07:29:30.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/security/manager/ssl/src/nsKeygenThread.cpp 2012-10-11 20:37:00.727932189 +0400
+@@ -113,7 +113,6 @@
+
+ static void PR_CALLBACK nsKeygenThreadRunner(void *arg)
+ {
+- PR_SetCurrentThreadName("Keygen");
+ nsKeygenThread *self = static_cast<nsKeygenThread *>(arg);
+ self->Run();
+ }
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/security/manager/ssl/src/nsPSMBackgroundThread.cpp seamonkey-2.13-OK/comm-release/mozilla/security/manager/ssl/src/nsPSMBackgroundThread.cpp
+--- seamonkey-2.13/comm-release/mozilla/security/manager/ssl/src/nsPSMBackgroundThread.cpp 2012-10-08 07:29:30.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/security/manager/ssl/src/nsPSMBackgroundThread.cpp 2012-10-11 20:37:07.328502492 +0400
+@@ -10,7 +10,6 @@
+ void PR_CALLBACK nsPSMBackgroundThread::nsThreadRunner(void *arg)
+ {
+ nsPSMBackgroundThread *self = static_cast<nsPSMBackgroundThread *>(arg);
+- PR_SetCurrentThreadName(self->mName.BeginReading());
+ self->Run();
+ }
+
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/security/manager/ssl/src/nsProtectedAuthThread.cpp seamonkey-2.13-OK/comm-release/mozilla/security/manager/ssl/src/nsProtectedAuthThread.cpp
+--- seamonkey-2.13/comm-release/mozilla/security/manager/ssl/src/nsProtectedAuthThread.cpp 2012-10-08 07:29:30.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/security/manager/ssl/src/nsProtectedAuthThread.cpp 2012-10-11 20:37:12.465964070 +0400
+@@ -18,8 +18,6 @@
+
+ static void PR_CALLBACK nsProtectedAuthThreadRunner(void *arg)
+ {
+- PR_SetCurrentThreadName("Protected Auth");
+-
+ nsProtectedAuthThread *self = static_cast<nsProtectedAuthThread *>(arg);
+ self->Run();
+ }
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/security/manager/ssl/src/nsSmartCardMonitor.cpp seamonkey-2.13-OK/comm-release/mozilla/security/manager/ssl/src/nsSmartCardMonitor.cpp
+--- seamonkey-2.13/comm-release/mozilla/security/manager/ssl/src/nsSmartCardMonitor.cpp 2012-10-08 07:29:30.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/security/manager/ssl/src/nsSmartCardMonitor.cpp 2012-10-11 20:36:53.321157089 +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.13/comm-release/mozilla/startupcache/StartupCache.cpp seamonkey-2.13-OK/comm-release/mozilla/startupcache/StartupCache.cpp
+--- seamonkey-2.13/comm-release/mozilla/startupcache/StartupCache.cpp 2012-10-08 07:29:32.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/startupcache/StartupCache.cpp 2012-10-11 20:37:56.364359101 +0400
+@@ -493,7 +493,6 @@
+ void
+ StartupCache::ThreadedWrite(void *aClosure)
+ {
+- PR_SetCurrentThreadName("StartupCache");
+ gStartupCache->WriteToDisk();
+ }
+
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/toolkit/components/startup/nsAppStartup.cpp seamonkey-2.13-OK/comm-release/mozilla/toolkit/components/startup/nsAppStartup.cpp
+--- seamonkey-2.13/comm-release/mozilla/toolkit/components/startup/nsAppStartup.cpp 2012-10-08 07:29:33.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/toolkit/components/startup/nsAppStartup.cpp 2012-10-11 20:38:22.105282622 +0400
+@@ -706,8 +706,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.13/comm-release/mozilla/toolkit/xre/EventTracer.cpp seamonkey-2.13-OK/comm-release/mozilla/toolkit/xre/EventTracer.cpp
+--- seamonkey-2.13/comm-release/mozilla/toolkit/xre/EventTracer.cpp 2012-10-08 07:29:34.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/toolkit/xre/EventTracer.cpp 2012-10-11 20:38:28.212283532 +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.13/comm-release/mozilla/widget/windows/LSPAnnotator.cpp seamonkey-2.13-OK/comm-release/mozilla/widget/windows/LSPAnnotator.cpp
+--- seamonkey-2.13/comm-release/mozilla/widget/windows/LSPAnnotator.cpp 2012-10-08 07:29:35.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/widget/windows/LSPAnnotator.cpp 2012-10-11 20:38:07.113800211 +0400
+@@ -49,8 +49,6 @@
+ NS_IMETHODIMP
+ LSPAnnotationGatherer::Run()
+ {
+- PR_SetCurrentThreadName("LSP Annotator");
+-
+ mThread = NS_GetCurrentThread();
+
+ DWORD size = 0;
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/widget/windows/nsSound.cpp seamonkey-2.13-OK/comm-release/mozilla/widget/windows/nsSound.cpp
+--- seamonkey-2.13/comm-release/mozilla/widget/windows/nsSound.cpp 2012-10-08 07:29:35.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/widget/windows/nsSound.cpp 2012-10-11 20:38:01.665674488 +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.13/comm-release/mozilla/xpcom/base/VisualEventTracer.cpp seamonkey-2.13-OK/comm-release/mozilla/xpcom/base/VisualEventTracer.cpp
+--- seamonkey-2.13/comm-release/mozilla/xpcom/base/VisualEventTracer.cpp 2012-10-08 07:29:35.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/xpcom/base/VisualEventTracer.cpp 2012-10-11 20:39:57.740906321 +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.13/comm-release/mozilla/xpcom/base/nsCycleCollector.cpp seamonkey-2.13-OK/comm-release/mozilla/xpcom/base/nsCycleCollector.cpp
+--- seamonkey-2.13/comm-release/mozilla/xpcom/base/nsCycleCollector.cpp 2012-10-08 07:29:35.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/xpcom/base/nsCycleCollector.cpp 2012-10-11 20:35:57.106345573 +0400
+@@ -3050,8 +3050,6 @@
+ public:
+ NS_IMETHOD Run()
+ {
+- PR_SetCurrentThreadName("XPCOM CC");
+-
+ #ifdef XP_WIN
+ TlsSetValue(gTLSThreadIDIndex,
+ (void*) mozilla::threads::CycleCollector);
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/xpcom/glue/nsThreadUtils.cpp seamonkey-2.13-OK/comm-release/mozilla/xpcom/glue/nsThreadUtils.cpp
+--- seamonkey-2.13/comm-release/mozilla/xpcom/glue/nsThreadUtils.cpp 2012-10-08 07:29:35.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/xpcom/glue/nsThreadUtils.cpp 2012-10-11 20:36:44.439829782 +0400
+@@ -238,7 +238,6 @@
+ NS_IMETHODIMP
+ nsNameThreadRunnable::Run()
+ {
+- PR_SetCurrentThreadName(mName.BeginReading());
+ return NS_OK;
+ }
+
+@@ -284,8 +283,4 @@
+ // Set on the target thread
+ NS_SetThreadName(aThread, name);
+ }
+- else {
+- // Set on the current thread
+- PR_SetCurrentThreadName(name.BeginReading());
+- }
+ }
+diff -Nrbu seamonkey-2.13/comm-release/mozilla/xpcom/threads/HangMonitor.cpp seamonkey-2.13-OK/comm-release/mozilla/xpcom/threads/HangMonitor.cpp
+--- seamonkey-2.13/comm-release/mozilla/xpcom/threads/HangMonitor.cpp 2012-10-08 07:29:36.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/xpcom/threads/HangMonitor.cpp 2012-10-11 20:35:29.541444424 +0400
+@@ -187,8 +187,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.13/comm-release/mozilla/xpcom/threads/LazyIdleThread.cpp seamonkey-2.13-OK/comm-release/mozilla/xpcom/threads/LazyIdleThread.cpp
+--- seamonkey-2.13/comm-release/mozilla/xpcom/threads/LazyIdleThread.cpp 2012-10-08 07:29:36.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/xpcom/threads/LazyIdleThread.cpp 2012-10-11 20:35:50.992694965 +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.13/comm-release/mozilla/xpcom/threads/TimerThread.cpp seamonkey-2.13-OK/comm-release/mozilla/xpcom/threads/TimerThread.cpp
+--- seamonkey-2.13/comm-release/mozilla/xpcom/threads/TimerThread.cpp 2012-10-08 07:29:36.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/xpcom/threads/TimerThread.cpp 2012-10-11 20:35:45.141692047 +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.13/comm-release/mozilla/xpcom/threads/nsProcessCommon.cpp seamonkey-2.13-OK/comm-release/mozilla/xpcom/threads/nsProcessCommon.cpp
+--- seamonkey-2.13/comm-release/mozilla/xpcom/threads/nsProcessCommon.cpp 2012-10-08 07:29:36.000000000 +0400
++++ seamonkey-2.13-OK/comm-release/mozilla/xpcom/threads/nsProcessCommon.cpp 2012-10-11 20:35:39.377935045 +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.spec b/seamonkey.spec
index 722cf06..d0c813f 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -15,17 +15,19 @@
%define mozdir %{_libdir}/seamonkey
%define sources_subdir comm-release
+%define seamonkey_app_id \{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a\}
+
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
-Version: 2.12.1
-Release: 2%{?dist}
+Version: 2.13
+Release: 1%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPLv2.0
Group: Applications/Internet
Source0: seamonkey-%{version}%{?prerelease_tag}.source.tar.bz2
-Source1: seamonkey-langpacks-%{version}-20120912.tar.xz
+Source1: seamonkey-langpacks-%{version}-20121009.tar.xz
Source3: seamonkey.sh.in
Source4: seamonkey.desktop
Source7: seamonkey-make-package.pl
@@ -40,8 +42,9 @@ Source100: find-external-requires
Patch1: xulrunner-15.0-gcc47.patch
Patch5: seamonkey-8.0-enable-addons.patch
Patch10: seamonkey-idl-parser-cachepath.patch
-Patch20: seamonkey-2.12.1-jemalloc.patch
-Patch21: seamonkey-2.12.1-installdir.patch
+Patch20: seamonkey-2.13-jemalloc.patch
+Patch21: seamonkey-2.13-installdir.patch
+Patch22: seamonkey-2.13-nspr_4_9_1.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{minimum_build_nspr_version}
@@ -122,6 +125,8 @@ popd
%patch21 -p2 -b .installdir
+%patch22 -p2 -b .nspr491
+
# fix obsoleted modifier in inspector
sed -i -e 's/ *xpcnativewrappers=no//' mozilla/extensions/inspector/jar.mn
@@ -362,6 +367,10 @@ chmod 755 $RPM_BUILD_ROOT/usr/bin/seamonkey
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/defaults/profile/bookmarks.html
ln -s %{default_bookmarks_file} $RPM_BUILD_ROOT/%{mozdir}/defaults/profile/bookmarks.html
+# System extensions
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{seamonkey_app_id}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{seamonkey_app_id}
+
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -444,10 +453,19 @@ fi
%{_datadir}/applications/mozilla-%{name}.desktop
%{_datadir}/applications/mozilla-%{name}-mail.desktop
+%dir %{_datadir}/mozilla/extensions/%{seamonkey_app_id}
+%dir %{_libdir}/mozilla/extensions/%{seamonkey_app_id}
+
%ghost %{mozdir}/removed-files
%changelog
+* Thu Oct 11 2012 Dmitry Butskoy <Dmitry at Butskoy.name> 2.13-1
+- update to 2.13
+- add seamonkey-related directories in mozilla-filesystem (#865054)
+- fix build with RHEL6 system nspr-4.9.1 (drop setting nspr thread names,
+ as it requires nspr >= 4.9.2, but just can be safely removed from the code)
+
* Mon Oct 8 2012 Dmitry Butskoy <Dmitry at Butskoy.name> 2.12.1-2
- drop version from install directories (follow the current
firefox and thunderbird way)
diff --git a/sources b/sources
index 65d3fe6..0699c99 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-89bc1360aa1eb59c5b4177373bb16502 seamonkey-2.12.1.source.tar.bz2
-a269491c16f403d242b34ff417805ac7 seamonkey-langpacks-2.12.1-20120912.tar.xz
+fe4c432cf1e88536c06448131739cb1a seamonkey-2.13.source.tar.bz2
+9252004fc6adfdd808922ace82979229 seamonkey-langpacks-2.13-20121009.tar.xz
More information about the scm-commits
mailing list