[seamonkey/el6] update to 2.19
Dmitry Butskoy
buc at fedoraproject.org
Mon Jul 8 16:40:07 UTC 2013
commit b44483253a4dc13e735b00f635deaa7afbcb078b
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Mon Jul 8 20:39:20 2013 +0400
update to 2.19
.gitignore | 2 +
seamonkey-2.14-elfhack.patch | 21 -------
seamonkey-2.17-nspr_4_9_2.patch | 65 ----------------------
seamonkey-2.17-nss_3_14_0.patch | 54 ------------------
seamonkey-2.17-rhbz_304121.patch | 12 ----
seamonkey-2.19-elfhack.patch | 12 ++++
seamonkey-2.19-nspr_4_9_2.patch | 113 ++++++++++++++++++++++++++++++++++++++
seamonkey-2.19-nss_3_14_0.patch | 24 ++++++++
seamonkey.spec | 58 +++++++++++--------
sources | 5 +-
10 files changed, 188 insertions(+), 178 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c91204..8d5c535 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,5 @@ seamonkey-2.0.6.source.tar.bz2
/seamonkey-langpacks-2.17-20130403.tar.xz
/seamonkey-2.17.1.source.tar.bz2
/seamonkey-langpacks-2.17.1-20130415.tar.xz
+/seamonkey-2.19.source.tar.bz2
+/seamonkey-langpacks-2.19-20130705.tar.xz
diff --git a/seamonkey-2.19-elfhack.patch b/seamonkey-2.19-elfhack.patch
new file mode 100644
index 0000000..d499199
--- /dev/null
+++ b/seamonkey-2.19-elfhack.patch
@@ -0,0 +1,12 @@
+diff -Nrbu seamonkey-2.19/comm-release/mozilla/build/unix/elfhack/Makefile.in seamonkey-2.19-OK/comm-release/mozilla/build/unix/elfhack/Makefile.in
+--- seamonkey-2.19/comm-release/mozilla/build/unix/elfhack/Makefile.in 2013-06-29 09:00:27.000000000 +0400
++++ seamonkey-2.19-OK/comm-release/mozilla/build/unix/elfhack/Makefile.in 2013-07-05 16:47:52.857916823 +0400
+@@ -23,7 +23,7 @@
+ elfhack.cpp \
+ $(NULL)
+
+-OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
++HOST_CXXFLAGS := $(filter-out -fno-exceptions,$(HOST_CXXFLAGS)) -fexceptions
+
+ ifneq (,$(filter %86,$(TARGET_CPU)))
+ CPU := x86
diff --git a/seamonkey-2.19-nspr_4_9_2.patch b/seamonkey-2.19-nspr_4_9_2.patch
new file mode 100644
index 0000000..129f3ed
--- /dev/null
+++ b/seamonkey-2.19-nspr_4_9_2.patch
@@ -0,0 +1,113 @@
+diff -Nrbu seamonkey-2.19/comm-release/configure seamonkey-2.19-OK/comm-release/configure
+--- seamonkey-2.19/comm-release/configure 2013-06-29 09:01:16.000000000 +0400
++++ seamonkey-2.19-OK/comm-release/configure 2013-07-05 20:55:48.398948429 +0400
+@@ -13042,13 +13042,13 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+- min_nspr_version=4.9.3
++ min_nspr_version=4.9.2
+ echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6
+ echo "configure:13048: checking for NSPR - version >= $min_nspr_version" >&5
+
+ no_nspr=""
+ if test "$NSPR_CONFIG" != "no"; then
+- NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags`
++ NSPR_CFLAGS="-I$topsrcdir/nspr492 `$NSPR_CONFIG $nspr_config_args --cflags`"
+ NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
+ NSPR_VERSION_STRING=`$NSPR_CONFIG $nspr_config_args --version`
+ elif test -n "${NO_NSPR_CONFIG_SYSTEM_VERSION}"; then
+diff -Nrbu seamonkey-2.19/comm-release/mozilla/configure seamonkey-2.19-OK/comm-release/mozilla/configure
+--- seamonkey-2.19/comm-release/mozilla/configure 2013-06-29 09:01:16.000000000 +0400
++++ seamonkey-2.19-OK/comm-release/mozilla/configure 2013-07-05 20:55:48.600947214 +0400
+@@ -14846,13 +14846,13 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+- min_nspr_version=4.9.6
++ min_nspr_version=4.9.2
+ echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6
+ echo "configure:14852: checking for NSPR - version >= $min_nspr_version" >&5
+
+ no_nspr=""
+ if test "$NSPR_CONFIG" != "no"; then
+- NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags`
++ NSPR_CFLAGS="-I$topsrcdir/../nspr492 `$NSPR_CONFIG $nspr_config_args --cflags`"
+ NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
+ NSPR_VERSION_STRING=`$NSPR_CONFIG $nspr_config_args --version`
+ elif test -n "${NO_NSPR_CONFIG_SYSTEM_VERSION}"; then
+diff -Nrbu seamonkey-2.19/comm-release/nspr492/plarena.h seamonkey-2.19-OK/comm-release/nspr492/plarena.h
+--- seamonkey-2.19/comm-release/nspr492/plarena.h 1970-01-01 03:00:00.000000000 +0300
++++ seamonkey-2.19-OK/comm-release/nspr492/plarena.h 2013-07-05 20:52:45.000000000 +0400
+@@ -0,0 +1,41 @@
++#ifndef nspr492_plarena_h___
++#define nspr492_plarena_h___
++
++#include_next "plarena.h"
++
++
++PR_BEGIN_EXTERN_C
++
++/* Backport from nspr-4.9.6 */
++
++/*
++** A function like malloc_size() or malloc_usable_size() that measures the
++** size of a heap block.
++*/
++typedef size_t (*PLMallocSizeFn)(const void *ptr);
++
++/*
++** Measure all memory used by a PLArenaPool, excluding the PLArenaPool
++** structure.
++*/
++
++static size_t PL_SizeOfArenaPoolExcludingPool(
++ const PLArenaPool *pool, PLMallocSizeFn mallocSizeOf)
++{
++ /*
++ * The first PLArena is within |pool|, so don't measure it. Subsequent
++ * PLArenas are separate and must be measured.
++ */
++ size_t size = 0;
++ const PLArena *arena = pool->first.next;
++ while (arena) {
++ size += mallocSizeOf(arena);
++ arena = arena->next;
++ }
++ return size;
++}
++
++PR_END_EXTERN_C
++
++
++#endif /* nspr492_plarena_h___ */
+diff -Nrbu seamonkey-2.19/comm-release/nspr492/prtime.h seamonkey-2.19-OK/comm-release/nspr492/prtime.h
+--- seamonkey-2.19/comm-release/nspr492/prtime.h 1970-01-01 03:00:00.000000000 +0300
++++ seamonkey-2.19-OK/comm-release/nspr492/prtime.h 2013-07-05 20:48:36.000000000 +0400
+@@ -0,0 +1,26 @@
++#ifndef nspr492_prtime_h___
++#define nspr492_prtime_h___
++
++#include_next "prtime.h"
++
++
++PR_BEGIN_EXTERN_C
++
++
++/* These two are actually implemented in nspr-4.9.2, but was omitted in headers */
++
++/* Format a time value into a buffer. Same semantics as strftime() */
++NSPR_API(PRUint32) PR_FormatTime(char *buf, int buflen, const char *fmt,
++ const PRExplodedTime *tm);
++
++/* Format a time value into a buffer. Time is always in US English format, regardless
++ * of locale setting.
++ */
++NSPR_API(PRUint32)
++PR_FormatTimeUSEnglish( char* buf, PRUint32 bufSize,
++ const char* format, const PRExplodedTime* tm );
++
++PR_END_EXTERN_C
++
++
++#endif /* nspr492_prtime_h___ */
diff --git a/seamonkey-2.19-nss_3_14_0.patch b/seamonkey-2.19-nss_3_14_0.patch
new file mode 100644
index 0000000..5b5f32e
--- /dev/null
+++ b/seamonkey-2.19-nss_3_14_0.patch
@@ -0,0 +1,24 @@
+diff -Nrbu seamonkey-2.19/comm-release/mozilla/configure seamonkey-2.19-OK/comm-release/mozilla/configure
+--- seamonkey-2.19/comm-release/mozilla/configure 2013-07-05 17:29:53.090119022 +0400
++++ seamonkey-2.19-OK/comm-release/mozilla/configure 2013-07-05 17:31:24.139566742 +0400
+@@ -15249,7 +15249,7 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+- min_nss_version=3.14.3
++ min_nss_version=3.14.0
+ echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
+ echo "configure:15255: checking for NSS - version >= $min_nss_version" >&5
+
+diff -Nrbu seamonkey-2.19/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h seamonkey-2.19-OK/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h
+--- seamonkey-2.19/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h 2013-06-29 09:00:52.000000000 +0400
++++ seamonkey-2.19-OK/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h 2013-07-05 17:41:58.021830219 +0400
+@@ -164,7 +164,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 cae8fab..272e080 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -1,3 +1,5 @@
+%define bundled_python 1
+
%bcond_with system_libvpx
%define homepage file:///usr/share/doc/HTML/index.html
@@ -20,7 +22,7 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
-Version: 2.17.1
+Version: 2.19
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPLv2.0
@@ -34,7 +36,7 @@ Source0: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%
#
# Run script as ./moz-grab-langpacks --app seamonkey %{version}
#
-Source1: seamonkey-langpacks-%{version}-20130415.tar.xz
+Source1: seamonkey-langpacks-%{version}-20130705.tar.xz
Source3: seamonkey.sh.in
Source4: seamonkey.desktop
@@ -46,16 +48,16 @@ Source17: mozilla-psm-exclude-list
Source18: mozilla-xpcom-exclude-list
Source20: seamonkey-epel-default-prefs.js
Source100: find-external-requires
+%{?bundled_python:Source200: http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tar.xz}
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.17-rhbz_304121.patch
Patch22: seamonkey-2.14-installdir.patch
-Patch23: seamonkey-2.14-elfhack.patch
-Patch24: seamonkey-2.17-nspr_4_9_2.patch
-Patch26: seamonkey-2.17-nss_3_14_0.patch
+Patch23: seamonkey-2.19-elfhack.patch
+Patch24: seamonkey-2.19-nspr_4_9_2.patch
+Patch26: seamonkey-2.19-nss_3_14_0.patch
Patch27: seamonkey-2.17-nss_hasht_h.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -92,6 +94,8 @@ BuildRequires: libvpx-devel >= %{minimum_build_vpx_version}
BuildRequires: yasm >= 1.1
%endif
BuildRequires: mesa-libGL-devel
+#BuildRequires: python >= 2.7
+
Requires: system-bookmarks
Requires: redhat-indexhtml
Requires: mozilla-filesystem
@@ -126,7 +130,7 @@ application formerly known as Mozilla Application Suite.
%prep
-%setup -q -c
+%setup -q -c %{?bundled_python:-a 200}
cd %{sources_subdir}
pushd mozilla
@@ -137,7 +141,6 @@ popd
%patch10 -p2 -b .idl-parser-cachepath
%patch20 -p1 -b .jemalloc
-%patch21 -p2 -b .rhbz304121
%patch22 -p2 -b .installdir
%patch23 -p2 -b .elfhack
@@ -166,6 +169,20 @@ echo "ac_add_options --disable-webrtc" >> .mozconfig
%build
+%if 0%{?bundled_python:1}
+
+# install the bundled python here (ie. somewhere in the build tree)
+PYTHON_DIR=$PWD/python
+
+pushd Python-2.7.5
+# just use upstream defaults for this temporary build-time-only bundled one...
+./configure --prefix=$PYTHON_DIR
+
+make %{?_smp_mflags}
+
+make install
+popd
+%endif # bundled_python
cd %{sources_subdir}
# Mozilla builds with -Wall with exception of a few warnings which show up
@@ -186,6 +203,9 @@ MOZ_SMP_FLAGS=-j1
MOZ_SMP_FLAGS=%{?_smp_mflags}
%endif
+%if 0%{?bundled_python:1}
+export PATH=$PYTHON_DIR/bin:$PATH
+%endif # bundled_python
make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
@@ -196,17 +216,6 @@ cd %{sources_subdir}
DESTDIR=$RPM_BUILD_ROOT make -C objdir install
-# fix omni.jar to actually work
-pushd objdir/mozilla/dist/bin
-zip -d $RPM_BUILD_ROOT/%{mozdir}/omni.ja components/browser.xpt components/mail.xpt components/components.manifest chrome/localized.manifest chrome/nonlocalized.manifest
-
-# this contains only binary componetes which will be not present in the jar
-%{__rm} -f components/components.manifest
-sed -i -e '/ components\/components.manifest/ d' chrome.manifest
-
-zip -9r $RPM_BUILD_ROOT/%{mozdir}/omni.ja chrome.manifest components/*.xpt chrome/*.manifest components/*.manifest components/*.js
-popd
-
# create a list of all of the different package and the files that
# will hold them
@@ -224,10 +233,6 @@ echo %defattr\(-,root,root\) > %{builddir}/seamonkey.list
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/mozilla.gif
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/mozilla.src
-## Copy over missing components
-#install -c -m 644 mozilla/dist/bin/components/*.xpt \
-# $RPM_BUILD_ROOT/%{mozdir}/components
-
# build all of the default browser components
# base Seamonkey package (seamonkey.list)
%{SOURCE7} --package xpcom --output-file %{builddir}/seamonkey.list \
@@ -433,7 +438,7 @@ fi
# some rest
%{mozdir}/omni.ja
%{mozdir}/chrome.manifest
-%{mozdir}/components/binary.manifest
+%{mozdir}/components/*.manifest
#%{mozdir}/components/*.xpt
%{mozdir}/components/*.so
%{mozdir}/defaults/messenger/mailViews.dat
@@ -476,6 +481,11 @@ fi
%changelog
+* Sat Jul 6 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.19-1
+- update to 2.19
+- use bundled python-2.7 for build
+- no more touch omni.ja
+
* Mon Apr 15 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.17.1-1
- update to 2.17.1
diff --git a/sources b/sources
index e8036b5..ad5fe2b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-a95013068da38fe3f8db30e0ebe6f2f5 seamonkey-2.17.1.source.tar.bz2
-a85491e9c6446d4058556554fe0ecbf4 seamonkey-langpacks-2.17.1-20130415.tar.xz
+233587b605261349405330005c91b2fe seamonkey-2.19.source.tar.bz2
+2afc3e509604a49d3ef9dbf597f30cf2 seamonkey-langpacks-2.19-20130705.tar.xz
+5eea8462f69ab1369d32f9c4cd6272ab Python-2.7.5.tar.xz
More information about the scm-commits
mailing list