[seamonkey/el6] update to ESR 31.5.0
Dmitry Butskoy
buc at fedoraproject.org
Thu Mar 5 23:09:18 UTC 2015
commit 87c2d70416500188954035e4985783fcbb9d9c14
Author: buc <buc at grad.stu.neva.ru>
Date: Fri Mar 6 02:15:03 2015 +0300
update to ESR 31.5.0
.gitignore | 1 +
firefox-31.5.0-dictfix.patch | 28 +++++++++++++
firefox-31.5.0-gcc.patch | 84 +++++++++++++++++++++++++++++++++++++++
firefox-31.5.0-rhbz-1173156.patch | 12 ++++++
seamonkey.spec | 19 ++++++---
sources | 2 +-
6 files changed, 140 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5a36470..b8de46d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,4 @@ seamonkey-2.0.6.source.tar.bz2
/seamonkey-extensions-2.29.tar.xz
/thunderbird-31.3.0.source.tar.bz2
/thunderbird-31.4.0.source.tar.bz2
+/thunderbird-31.5.0.source.tar.bz2
diff --git a/firefox-31.5.0-dictfix.patch b/firefox-31.5.0-dictfix.patch
new file mode 100644
index 0000000..12f6760
--- /dev/null
+++ b/firefox-31.5.0-dictfix.patch
@@ -0,0 +1,28 @@
+# Upstream Bug 1129859 - Always use '-' as separator between lang-region in dictionary names,
+# fixes problems with system dictionaries which has '_' as separator
+# Upstream patch with stripped test stuff
+#
+
+diff --git a/extensions/spellcheck/hunspell/src/mozHunspell.cpp b/extensions/spellcheck/hunspell/src/mozHunspell.cpp
+--- a/extensions/spellcheck/hunspell/src/mozHunspell.cpp
++++ b/extensions/spellcheck/hunspell/src/mozHunspell.cpp
+@@ -485,16 +485,19 @@ mozHunspell::LoadDictionariesFromDir(nsI
+ rv = file->Exists(&check);
+ if (NS_FAILED(rv) || !check)
+ continue;
+
+ #ifdef DEBUG_bsmedberg
+ printf("Adding dictionary: %s\n", NS_ConvertUTF16toUTF8(dict).get());
+ #endif
+
++ // Replace '_' separator with '-'
++ dict.ReplaceChar("_", '-');
++
+ mDictionaries.Put(dict, file);
+ }
+
+ return NS_OK;
+ }
+
+ nsresult mozHunspell::ConvertCharset(const char16_t* aStr, char ** aDst)
+ {
diff --git a/firefox-31.5.0-gcc.patch b/firefox-31.5.0-gcc.patch
new file mode 100644
index 0000000..5d67a1e
--- /dev/null
+++ b/firefox-31.5.0-gcc.patch
@@ -0,0 +1,84 @@
+diff -up firefox-31.5.0/mozilla-esr31/js/src/jsarray.cpp.gcc firefox-31.5.0/mozilla-esr31/js/src/jsarray.cpp
+--- firefox-31.5.0/mozilla-esr31/js/src/jsarray.cpp.gcc 2015-02-17 20:00:36.000000000 +0100
++++ firefox-31.5.0/mozilla-esr31/js/src/jsarray.cpp 2015-02-19 12:09:32.048384534 +0100
+@@ -2646,7 +2646,7 @@ js::array_concat(JSContext *cx, unsigned
+ if (v.isObject()) {
+ RootedObject obj(cx, &v.toObject());
+ // This should be IsConcatSpreadable
+- if (IsArray(obj, cx)) {
++ if (IsArrayInt(obj, cx)) {
+ uint32_t alength;
+ if (!GetLengthProperty(cx, obj, &alength))
+ return false;
+@@ -2874,7 +2874,7 @@ array_isArray(JSContext *cx, unsigned ar
+ bool isArray = false;
+ if (args.get(0).isObject()) {
+ RootedObject obj(cx, &args[0].toObject());
+- isArray = IsArray(obj, cx);
++ isArray = IsArrayInt(obj, cx);
+ }
+ args.rval().setBoolean(isArray);
+ return true;
+diff -up firefox-31.5.0/mozilla-esr31/js/src/jsobjinlines.h.gcc firefox-31.5.0/mozilla-esr31/js/src/jsobjinlines.h
+--- firefox-31.5.0/mozilla-esr31/js/src/jsobjinlines.h.gcc 2015-02-17 20:00:36.000000000 +0100
++++ firefox-31.5.0/mozilla-esr31/js/src/jsobjinlines.h 2015-02-19 12:09:32.049384537 +0100
+@@ -1058,7 +1058,7 @@ IsObjectWithClass(const Value &v, ESClas
+
+ // ES6 7.2.2
+ inline bool
+-IsArray(HandleObject obj, JSContext *cx)
++IsArrayInt(HandleObject obj, JSContext *cx)
+ {
+ if (obj->is<ArrayObject>())
+ return true;
+diff -up firefox-31.5.0/mozilla-esr31/js/src/json.cpp.gcc firefox-31.5.0/mozilla-esr31/js/src/json.cpp
+--- firefox-31.5.0/mozilla-esr31/js/src/json.cpp.gcc 2015-02-17 20:00:36.000000000 +0100
++++ firefox-31.5.0/mozilla-esr31/js/src/json.cpp 2015-02-19 12:11:07.734658973 +0100
+@@ -300,7 +300,7 @@ JO(JSContext *cx, HandleObject obj, Stri
+ Maybe<AutoIdVector> ids;
+ const AutoIdVector *props;
+ if (scx->replacer && !scx->replacer->isCallable()) {
+- JS_ASSERT(IsArray(scx->replacer, cx));
++ JS_ASSERT(IsArrayInt(scx->replacer, cx));
+ props = &scx->propertyList;
+ } else {
+ JS_ASSERT_IF(scx->replacer, scx->propertyList.length() == 0);
+@@ -488,7 +488,7 @@ Str(JSContext *cx, const Value &v, Strin
+
+ scx->depth++;
+ bool ok;
+- if (IsArray(obj, cx))
++ if (IsArrayInt(obj, cx))
+ ok = JA(cx, obj, scx);
+ else
+ ok = JO(cx, obj, scx);
+@@ -510,7 +510,7 @@ js_Stringify(JSContext *cx, MutableHandl
+ if (replacer) {
+ if (replacer->isCallable()) {
+ /* Step 4a(i): use replacer to transform values. */
+- } else if (IsArray(replacer, cx)) {
++ } else if (IsArrayInt(replacer, cx)) {
+ /*
+ * Step 4b: The spec algorithm is unhelpfully vague about the exact
+ * steps taken when the replacer is an array, regarding the exact
+@@ -679,7 +679,7 @@ Walk(JSContext *cx, HandleObject holder,
+ if (val.isObject()) {
+ RootedObject obj(cx, &val.toObject());
+
+- if (IsArray(obj, cx)) {
++ if (IsArrayInt(obj, cx)) {
+ /* Step 2a(ii). */
+ uint32_t length;
+ if (!GetLengthProperty(cx, obj, &length))
+diff -up firefox-31.5.0/mozilla-esr31/js/src/jsproxy.cpp.gcc firefox-31.5.0/mozilla-esr31/js/src/jsproxy.cpp
+--- firefox-31.5.0/mozilla-esr31/js/src/jsproxy.cpp.gcc 2015-02-17 20:00:36.000000000 +0100
++++ firefox-31.5.0/mozilla-esr31/js/src/jsproxy.cpp 2015-02-19 12:11:51.010783093 +0100
+@@ -2383,7 +2383,7 @@ ScriptedDirectProxyHandler::objectClassI
+ if (!target)
+ return false;
+
+- return IsArray(target, cx);
++ return IsArrayInt(target, cx);
+ }
+
+ bool
diff --git a/firefox-31.5.0-rhbz-1173156.patch b/firefox-31.5.0-rhbz-1173156.patch
new file mode 100644
index 0000000..9855710
--- /dev/null
+++ b/firefox-31.5.0-rhbz-1173156.patch
@@ -0,0 +1,12 @@
+diff -up firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp.old firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp
+--- firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp.old 2014-11-25 12:23:22.000000000 +0100
++++ firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp 2014-12-23 15:26:36.606674625 +0100
+@@ -174,7 +174,7 @@ nsAuthSambaNTLM::SpawnNTLMAuthHelper()
+ return NS_ERROR_FAILURE;
+
+ const char* const args[] = {
+- "ntlm_auth",
++ "/usr/bin/ntlm_auth",
+ "--helper-protocol", "ntlmssp-client-1",
+ "--use-cached-creds",
+ "--username", username,
diff --git a/seamonkey.spec b/seamonkey.spec
index c337c68..a0caa04 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -22,12 +22,12 @@
%define seamonkey_app_id \{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a\}
-%define esr_version 31.4.0
+%define esr_version 31.5.0
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
Version: 2.28
-Release: 3.ESR_%{esr_version}%{?dist}
+Release: 4.ESR_%{esr_version}%{?dist}
URL: http://www.seamonkey-project.org
License: MPLv2.0
Group: Applications/Internet
@@ -73,6 +73,9 @@ Patch2: xulrunner-24.0-jemalloc-ppc.patch
Patch3: xulrunner-27.0-build-arm.patch
Patch4: firefox-33-rhbz-966424.patch
Patch5: firefox-31-nullptr.patch
+Patch6: firefox-31.5.0-dictfix.patch
+Patch7: firefox-31.5.0-rhbz-1173156.patch
+Patch8: firefox-31.5.0-gcc.patch
Patch10: seamonkey-2.28-enable-addons.patch
Patch20: seamonkey-2.29-c++0x.patch
Patch22: seamonkey-2.26-installdir.patch
@@ -167,6 +170,9 @@ pushd mozilla
%patch3 -p2 -b .build-arm
%patch4 -p2 -b .966424
%patch5 -p1 -b .nullptr
+%patch6 -p1 -b .dictfix
+%patch7 -p2 -b .1173156
+%patch8 -p2 -b .gcc
popd
%patch10 -p2 -b .addons
@@ -533,11 +539,14 @@ fi
%changelog
+* Fri Mar 6 2015 Dmitry Butskoy <Dmitry at Butskoy.name> 2.28-4.ESR_31.5.0
+- update to Extended Support Release version 31.5.0, derived
+ from the correspond thunderbird source tree.
+- add some patches from firefox-31.5.0 package
+
* Wed Jan 21 2015 Dmitry Butskoy <Dmitry at Butskoy.name> 2.28-3.ESR_31.4.0
-- update to Extended Support Release version 31.3.0, derived
+- update to Extended Support Release version 31.4.0, derived
from the correspond thunderbird source tree.
- (The actual thnderbird-31.4.0 source was taken from the nightly builds,
- since it seems that they have forgotten to release it)
* Thu Dec 4 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.28-2.ESR_31.3.0
- update to Extended Support Release version 31.3.0, derived
diff --git a/sources b/sources
index 34f56a6..0e8c205 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
5eea8462f69ab1369d32f9c4cd6272ab Python-2.7.5.tar.xz
c93faced18d8c9b396bb5f37d24ce2b7 seamonkey-langpacks-2.29-20140920.tar.xz
3050568f1c4932e38fe0b26349377eef seamonkey-extensions-2.29.tar.xz
-da9c86271bb498c5feb02ce9c360669f thunderbird-31.4.0.source.tar.bz2
+d79f8d232f2ad3d501ac5ff5ca4ecbe8 thunderbird-31.5.0.source.tar.bz2
More information about the scm-commits
mailing list