[seamonkey/el6] update to ESR 31.2.0
Dmitry Butskoy
buc at fedoraproject.org
Sun Oct 26 19:45:52 UTC 2014
commit f0a342633c3f1e919d6ce944144ed1630d56de6f
Author: buc <buc at grad.stu.neva.ru>
Date: Sun Oct 26 22:45:26 2014 +0300
update to ESR 31.2.0
.gitignore | 2 +
firefox-31-nullptr.patch | 11 +
firefox-33-rhbz-966424.patch | 14 +
seamonkey-2.14-installdir.patch | 47 -
seamonkey-2.19-elfhack.patch | 12 -
seamonkey-2.21-ESR_24.8.0-nss_3_16_1.patch | 12 -
seamonkey-2.21-esr1.0-1.1.patch |11754 ---------
seamonkey-2.21-esr1.0.patch |19231 ---------------
seamonkey-2.21-esr1.1-2.0.patch | 3495 ---
seamonkey-2.21-esr2.0-3.0.patch |35448 ----------------------------
seamonkey-2.21-esr3.0-4.0.patch | 3933 ---
seamonkey-2.21-esr4.0-5.0.patch | 1908 --
seamonkey-2.21-esr5.0-6.0.patch | 2980 ---
seamonkey-2.21-esr6.0-7.0.patch |27145 ---------------------
seamonkey-2.21-esr7.0-8.0.patch | 1644 --
seamonkey-2.28-ESR_31.2.0-nss_3_16_1.patch | 12 +
seamonkey-2.28-enable-addons.patch | 26 +
seamonkey-8.0-enable-addons.patch | 26 -
seamonkey.spec | 140 +-
sources | 4 +-
xulrunner-24.0-gcc47.patch | 13 -
21 files changed, 144 insertions(+), 107713 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f5c5ba..a6f9a70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,5 @@ seamonkey-2.0.6.source.tar.bz2
/seamonkey-langpacks-2.21-20130918.tar.xz
/seamonkey-2.22.source.tar.bz2
/seamonkey-langpacks-2.22-20131101.tar.xz
+/thunderbird-31.2.0.source.tar.bz2
+/seamonkey-langpacks-2.29-20140920.tar.xz
diff --git a/firefox-31-nullptr.patch b/firefox-31-nullptr.patch
new file mode 100644
index 0000000..6b8c515
--- /dev/null
+++ b/firefox-31-nullptr.patch
@@ -0,0 +1,11 @@
+diff -up mozilla-aurora/content/media/fmp4/demuxer/bit_reader.cc.nullptr mozilla-aurora/content/media/fmp4/demuxer/bit_reader.cc
+--- mozilla-aurora/content/media/fmp4/demuxer/bit_reader.cc.nullptr 2014-06-04 09:29:19.736999987 +0200
++++ mozilla-aurora/content/media/fmp4/demuxer/bit_reader.cc 2014-06-04 09:29:32.774000025 +0200
+@@ -5,6 +5,7 @@
+ #include "mp4_demuxer/bit_reader.h"
+ #include <algorithm>
+
++#define nullptr NULL
+ namespace mp4_demuxer {
+
+ BitReader::BitReader(const uint8_t* data, off_t size)
diff --git a/firefox-33-rhbz-966424.patch b/firefox-33-rhbz-966424.patch
new file mode 100644
index 0000000..7579d09
--- /dev/null
+++ b/firefox-33-rhbz-966424.patch
@@ -0,0 +1,14 @@
+diff -up firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm.966424 firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm
+--- firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm.966424 2014-10-14 08:12:14.358697255 +0200
++++ firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm 2014-10-14 08:17:59.962181908 +0200
+@@ -174,7 +174,9 @@ this.checkCert =
+ }
+
+ function isBuiltinToken(tokenName) {
+- return tokenName == "Builtin Object Token";
++ return tokenName == "Builtin Object Token" ||
++ tokenName == "Default Trust" ||
++ tokenName == "System Trust";
+ }
+
+ /**
diff --git a/seamonkey-2.28-ESR_31.2.0-nss_3_16_1.patch b/seamonkey-2.28-ESR_31.2.0-nss_3_16_1.patch
new file mode 100644
index 0000000..19bb405
--- /dev/null
+++ b/seamonkey-2.28-ESR_31.2.0-nss_3_16_1.patch
@@ -0,0 +1,12 @@
+diff -Nrbu seamonkey-2.28/comm-release/mozilla/configure seamonkey-2.28-OK/comm-release/mozilla/configure
+--- seamonkey-2.28/comm-release/mozilla/configure 2014-10-12 23:31:30.000000000 +0400
++++ seamonkey-2.28-OK/comm-release/mozilla/configure 2014-10-26 00:16:02.066428196 +0400
+@@ -15220,7 +15220,7 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+- min_nss_version=3.16.2.2
++ min_nss_version=3.16.1
+ echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
+ echo "configure:15226: checking for NSS - version >= $min_nss_version" >&5
+
diff --git a/seamonkey-2.28-enable-addons.patch b/seamonkey-2.28-enable-addons.patch
new file mode 100644
index 0000000..f5e8bbb
--- /dev/null
+++ b/seamonkey-2.28-enable-addons.patch
@@ -0,0 +1,26 @@
+diff -Nrbu seamonkey-2.28/comm-release/mail/app/profile/all-thunderbird.js seamonkey-2.28-OK/comm-release/mail/app/profile/all-thunderbird.js
+--- seamonkey-2.28/comm-release/mail/app/profile/all-thunderbird.js 2014-10-12 23:23:02.000000000 +0400
++++ seamonkey-2.28-OK/comm-release/mail/app/profile/all-thunderbird.js 2014-10-25 23:57:42.463429374 +0400
+@@ -174,7 +174,7 @@
+ // Disable add-ons installed into the shared user and shared system areas by
+ // default. This does not include the application directory. See the SCOPE
+ // constants in AddonManager.jsm for values to use here
+-pref("extensions.autoDisableScopes", 15);
++pref("extensions.autoDisableScopes", 0);
+
+ // Preferences for AMO integration
+ pref("extensions.getAddons.cache.enabled", true);
+diff -Nrbu seamonkey-2.28/comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm seamonkey-2.28-OK/comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+--- seamonkey-2.28/comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2014-10-12 23:31:13.000000000 +0400
++++ seamonkey-2.28-OK/comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2014-10-25 23:57:42.525429374 +0400
+@@ -1894,8 +1894,8 @@
+ this.showUpgradeUI();
+ flushCaches = true;
+ }
+- else if (aAppChanged === undefined) {
+- // For new profiles we will never need to show the add-on selection UI
++ else {
++ // For all profiles we will never need to show the add-on selection UI
+ Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
+ }
+
diff --git a/seamonkey.spec b/seamonkey.spec
index 25144ad..bbb970a 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -8,9 +8,9 @@
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%define cairo_version 0.5
-%global minimum_build_nspr_version 4.10.2
+%global minimum_build_nspr_version 4.10.6
%global minimum_build_nss_version 3.16.1
-%global minimum_build_vpx_version 1.0.0
+%global minimum_build_vpx_version 1.3.0
%define build_langpacks 1
@@ -22,15 +22,31 @@
%define seamonkey_app_id \{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a\}
+%define esr_version 31.2.0
+
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
-Version: 2.21
-Release: 8.ESR_24.8.0%{?dist}
-URL: http://www.mozilla.org/projects/seamonkey/
+Version: 2.28
+Release: 1.ESR_%{esr_version}%{?dist}
+URL: http://www.seamonkey-project.org
License: MPLv2.0
Group: Applications/Internet
-Source0: ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/seamonkey-%{version}%{?prerelease_tag}.source.tar.bz2
+#
+# There is no official ESR branch for seamonkey.
+#
+# Fortunately, the thunderbird version X source actually is the same
+# as seamonkey version 2.(X-3) source. Just inspector, irc and venkman
+# extensions are missing.
+#
+# Hence we emulate a seamonkey-2.28 ESR tree by the thunderbird-31esr releases
+# plus the three missing extensions.
+#
+# Since seamonkey-2.28 was not released for technical reasons, we obtain those
+# extensions, as well as langpacks, from the released 2.29 tree.
+#
+Source0: ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{esr_version}/source/thunderbird-%{esr_version}.source.tar.bz2
+Source2: seamonkey-extensions-2.29.tar.xz
# Generate it by moz-grab-langpacks script, which can be obtained from
# http://fedorapeople.org/cgit/caillon/public_git/gecko-maint.git/
@@ -38,7 +54,7 @@ Source0: ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{versi
#
# Run script as ./moz-grab-langpacks --app seamonkey %{version}
#
-Source1: seamonkey-langpacks-%{version}-20130918.tar.xz
+Source1: seamonkey-langpacks-2.29-20140920.tar.xz
Source3: seamonkey.sh.in
Source4: seamonkey.desktop
@@ -52,25 +68,16 @@ 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-24.0-gcc47.patch
+Patch1: xulrunner-26.0-gcc47.patch
Patch2: xulrunner-24.0-jemalloc-ppc.patch
-Patch5: seamonkey-8.0-enable-addons.patch
-Patch10: seamonkey-idl-parser-cachepath.patch
-Patch22: seamonkey-2.14-installdir.patch
-Patch23: seamonkey-2.19-elfhack.patch
-Patch24: seamonkey-2.21-ESR_24.8.0-nss_3_16_1.patch
-
-# ESR patches. Derived from the thunderbird ESR sources
-# from ftp://ftp.mozilla.org/pub/mozilla.org/thunderburd/releases/24.*/
-Patch2410: seamonkey-2.21-esr1.0.patch
-Patch2411: seamonkey-2.21-esr1.0-1.1.patch
-Patch2420: seamonkey-2.21-esr1.1-2.0.patch
-Patch2430: seamonkey-2.21-esr2.0-3.0.patch
-Patch2440: seamonkey-2.21-esr3.0-4.0.patch
-Patch2450: seamonkey-2.21-esr4.0-5.0.patch
-Patch2460: seamonkey-2.21-esr5.0-6.0.patch
-Patch2470: seamonkey-2.21-esr6.0-7.0.patch
-Patch2480: seamonkey-2.21-esr7.0-8.0.patch
+Patch3: xulrunner-27.0-build-arm.patch
+Patch4: firefox-33-rhbz-966424.patch
+Patch5: firefox-31-nullptr.patch
+Patch10: seamonkey-2.28-enable-addons.patch
+Patch20: seamonkey-2.29-c++0x.patch
+Patch22: seamonkey-2.26-installdir.patch
+Patch23: seamonkey-2.25-elfhack.patch
+Patch24: seamonkey-2.28-ESR_31.2.0-nss_3_16_1.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{with system_nspr}
@@ -110,6 +117,7 @@ BuildRequires: libvpx-devel >= %{minimum_build_vpx_version}
BuildRequires: yasm >= 1.1
%endif
BuildRequires: mesa-libGL-devel
+BuildRequires: pulseaudio-libs-devel
#BuildRequires: python >= 2.7
Requires: system-bookmarks
@@ -130,8 +138,9 @@ Obsoletes: seamonkey-dom-inspector
Obsoletes: seamonkey-js-debugger
Obsoletes: seamonkey-mail
-# see http://bugzilla.redhat.com/bugzilla/866589
-ExcludeArch: ppc64
+# ppc64: http://bugzilla.redhat.com/bugzilla/866589
+# armv7hl: http://bugzilla.redhat.com/bugzilla/1035485
+ExcludeArch: ppc64, armv7hl
AutoProv: 0
%define _use_internal_dependency_generator 0
@@ -148,27 +157,22 @@ application formerly known as Mozilla Application Suite.
%prep
%setup -q -c %{?bundled_python:-a 200}
-cd %{sources_subdir}
+mv comm-esr* comm-release
+%{__tar} -C comm-release/mozilla/extensions -xf %{SOURCE2}
-# estended support release patches
-%patch2410 -p2
-%patch2411 -p2
-%patch2420 -p2
-%patch2430 -p2
-%patch2440 -p2
-%patch2450 -p2
-%patch2460 -p2
-%patch2470 -p2
-%patch2480 -p2
+cd %{sources_subdir}
pushd mozilla
%patch1 -p2 -b .gcc47
%patch2 -p2 -b .jemalloc-ppc
+%patch3 -p2 -b .build-arm
+%patch4 -p2 -b .966424
+%patch5 -p1 -b .nullptr
popd
-%patch5 -p2 -b .addons
-%patch10 -p2 -b .idl-parser-cachepath
+%patch10 -p2 -b .addons
+%patch20 -p2 -b .c++0x
%patch22 -p2 -b .installdir
%patch23 -p2 -b .elfhack
@@ -198,6 +202,9 @@ echo "ac_add_options --disable-webrtc" >> .mozconfig
# enabled by default since 2.21
echo "ac_add_options --disable-gstreamer" >> .mozconfig
+# needed to compile with the current gcc-4.4
+echo "ac_add_options --enable-cpp-rtti" >>.mozconfig
+
%build
%if %{?bundled_python}
@@ -241,6 +248,9 @@ MOZ_SMP_FLAGS=-j1
MOZ_SMP_FLAGS=%{?_smp_mflags}
%endif
+# a kludge since 2.26 ...
+ln -s ../objdir mozilla/objdir
+
%if %{?bundled_python}
export PATH=$PYTHON_DIR/bin:$PATH
%endif # bundled_python
@@ -337,6 +347,11 @@ for langpack in `ls seamonkey-langpacks/*.xpi`; do
sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage = %{homepage}|g" \
$extensiondir/chrome/$language/locale/$language/navigator-region/region.properties
+ # XXX: following two are needed because there is no official 2.28 release...
+ sed -i -e "s|startup.homepage_override_url.*$|startup.homepage_override_url = %{url}|g" \
+ $extensiondir/chrome/$language/locale/$language/navigator-region/region.properties
+ sed -i -e "s|2\.29|2.28|g" $extensiondir/install.rdf
+
jarfile=$extensiondir/chrome/$language.jar
pushd $extensiondir/chrome/$language
zip -r -D $jarfile locale
@@ -523,37 +538,36 @@ fi
%changelog
-* Sun Sep 21 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.21-8.ESR_24.8.0
-- apply Extended Support Release patches, derived from the thunderbird
- esr24.7.0 and esr24.8.0 trees
+* Sun Oct 26 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.28-1.ESR_31.2.0
+- update to Extended Support Release version 31.2.0, derived
+ from the correspond thunderbird source tree.
- build with system libvpx now
-* Tue Jun 24 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.21-7.ESR_24.6.0
-- apply Extended Support Release patches, derived from the thunderbird
- esr24.6.0 tree
+* Tue Jun 24 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.26.1-1
+- update to 2.26.1
+
+* Thu May 8 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.26-1
+- update to 2.26
+- build with native nss and nspr for now
-* Fri May 9 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.21-6.ESR_24.5.0
-- apply Extended Support Release patches, derived from the thunderbird
- esr24.5.0 tree
+* Sat Mar 22 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.25-1
+- update to 2.25
-* Mon Mar 24 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.21-5.ESR_24.4.0
-- apply Extended Support Release patches, derived from the thunderbird
- esr24.4.0 tree
+* Mon Feb 10 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.24-1
+- update to 2.24
-* Mon Feb 10 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.21-4.ESR_24.3.0
-- apply Extended Support Release patches, derived from the thunderbird
- esr24.3.0 tree
-- use exact ESR version in the release field
-- relax requirement of system nss to 3.15.3
+* Wed Dec 18 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.23-1
+- update to 2.23
+- drop no more needed patches
-* Wed Dec 18 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.21-3.esr2
-- apply Extended Support Release patches, derived from the thunderbird
- esr24.2.0 tree
+* Thu Nov 21 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.22.1-1
+- update to 2.22.1
-* Fri Nov 29 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.21-2.esr1
-- apply Extended Support Release patch, derived from the thunderbird
- esr24.1.0 tree
+* Fri Nov 1 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.22-1
+- update to 2.22
- fix for BEAST issue in startup script (as in #1005611 for Firefox)
+- now need to enable rtti for C++ compiling by gcc-4.4
+ (ie. drop -fno-rtti flag)
* Wed Sep 18 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.21-1
- update to 2.21
diff --git a/sources b/sources
index e7da37f..1f8db75 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-f2ddfea12f80aab48cc3cfca9f15f2a2 seamonkey-2.21.source.tar.bz2
-2add02f1213d2bfba25e8264aa74690f seamonkey-langpacks-2.21-20130918.tar.xz
+6bb66f5cb67d573939d4e2ead6f7c7ca thunderbird-31.2.0.source.tar.bz2
+c93faced18d8c9b396bb5f37d24ce2b7 seamonkey-langpacks-2.29-20140920.tar.xz
5eea8462f69ab1369d32f9c4cd6272ab Python-2.7.5.tar.xz
More information about the scm-commits
mailing list