[seamonkey] actually add patches, mentioned above.
Dmitry Butskoy
buc at fedoraproject.org
Wed Oct 31 16:41:21 UTC 2012
commit 1388e16f51148ef54d78c78048e64244cedb2052
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Wed Oct 31 20:40:57 2012 +0400
actually add patches, mentioned above.
seamonkey-2.12.1-nodecommit.patch | 19 +++++++++++++
seamonkey-2.13-installdir.patch | 52 +++++++++++++++++++++++++++++++++++++
seamonkey-2.13-jemalloc.patch | 14 ++++++++++
seamonkey.spec | 4 +-
4 files changed, 87 insertions(+), 2 deletions(-)
---
diff --git a/seamonkey-2.12.1-nodecommit.patch b/seamonkey-2.12.1-nodecommit.patch
new file mode 100644
index 0000000..c6282b0
--- /dev/null
+++ b/seamonkey-2.12.1-nodecommit.patch
@@ -0,0 +1,19 @@
+Index: comm-release/mozilla/js/src/gc/Memory.cpp
+===================================================================
+--- comm-release.orig/mozilla/js/src/gc/Memory.cpp
++++ comm-release/mozilla/js/src/gc/Memory.cpp
+@@ -348,9 +348,14 @@ UnmapPages(void *p, size_t size)
+ bool
+ MarkPagesUnused(void *p, size_t size)
+ {
++// A workaround for Bug 746112 - endless loop on ppc64
++#if !(defined(__powerpc__))
+ JS_ASSERT(uintptr_t(p) % PageSize == 0);
+ int result = madvise(p, size, MADV_DONTNEED);
+ return result != -1;
++#else
++ return true;
++#endif
+ }
+
+ bool
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.13-jemalloc.patch b/seamonkey-2.13-jemalloc.patch
new file mode 100644
index 0000000..20d9cbd
--- /dev/null
+++ b/seamonkey-2.13-jemalloc.patch
@@ -0,0 +1,14 @@
+Index: 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.
+ */
++#if !(defined(__powerpc__))
+ #define MALLOC_STATIC_SIZES 1
++#endif
+
+ #ifdef MALLOC_STATIC_SIZES
+
diff --git a/seamonkey.spec b/seamonkey.spec
index d44aafe..04a4f2e 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -25,7 +25,7 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
Version: 2.13.2
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPLv2.0
Group: Applications/Internet
@@ -475,7 +475,7 @@ fi
%changelog
-* Wed Oct 31 2012 Dmitry Butskoy <Dmitry at Butskoy.name>
+* Wed Oct 31 2012 Dmitry Butskoy <Dmitry at Butskoy.name> 2.13.2-2
- exclude ppc64 arch (hoping it is temporary, #866589)
- fix startup warnings (error console) for omni and inspector
- fix build langpacks
More information about the scm-commits
mailing list