fixed patches, first 38 build
This commit is contained in:
Jan Horak
parent
df468f3ea8
commit
8995c286a2
2
.gitignore
vendored
2
.gitignore
vendored
@ -111,3 +111,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
|
||||
/thunderbird-langpacks-31.6.0-20150331.tar.xz
|
||||
/thunderbird-31.7.0.source.tar.bz2
|
||||
/thunderbird-langpacks-31.7.0-20150512.tar.xz
|
||||
/thunderbird-38.0.1.source.tar.bz2
|
||||
/thunderbird-langpacks-38.0.1-20150609.tar.xz
|
||||
|
||||
66
build-nspr-prbool.patch
Normal file
66
build-nspr-prbool.patch
Normal file
@ -0,0 +1,66 @@
|
||||
diff -up mozilla-beta/media/webrtc/trunk/webrtc/base/nssidentity.h.prbool-fix mozilla-beta/media/webrtc/trunk/webrtc/base/nssidentity.h
|
||||
--- mozilla-beta/media/webrtc/trunk/webrtc/base/nssidentity.h.prbool-fix 2015-04-07 10:29:51.919137851 +0200
|
||||
+++ mozilla-beta/media/webrtc/trunk/webrtc/base/nssidentity.h 2015-04-07 10:33:06.886532753 +0200
|
||||
@@ -15,6 +15,7 @@
|
||||
|
||||
#include "cert.h"
|
||||
#include "nspr.h"
|
||||
+#include "prtypes.h"
|
||||
#include "hasht.h"
|
||||
#include "keythi.h"
|
||||
|
||||
diff -up mozilla-beta/modules/libmar/sign/nss_secutil.h.prbool-fix mozilla-beta/modules/libmar/sign/nss_secutil.h
|
||||
--- mozilla-beta/modules/libmar/sign/nss_secutil.h.prbool-fix 2015-04-07 10:33:13.079513533 +0200
|
||||
+++ mozilla-beta/modules/libmar/sign/nss_secutil.h 2015-04-07 10:33:16.101504154 +0200
|
||||
@@ -11,6 +11,7 @@
|
||||
#include "nss.h"
|
||||
#include "pk11pub.h"
|
||||
#include "cryptohi.h"
|
||||
+#include "prtypes.h"
|
||||
#include "hasht.h"
|
||||
#include "cert.h"
|
||||
#include "key.h"
|
||||
diff -up mozilla-beta/security/certverifier/ExtendedValidation.cpp.prbool-fix mozilla-beta/security/certverifier/ExtendedValidation.cpp
|
||||
--- mozilla-beta/security/certverifier/ExtendedValidation.cpp.prbool-fix 2015-04-07 10:36:42.693902941 +0200
|
||||
+++ mozilla-beta/security/certverifier/ExtendedValidation.cpp 2015-04-07 10:36:45.925893606 +0200
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "cert.h"
|
||||
#include "certdb.h"
|
||||
#include "base64.h"
|
||||
+#include "prtypes.h"
|
||||
#include "hasht.h"
|
||||
#include "pkix/stdkeywords.h"
|
||||
#include "pkix/pkixtypes.h"
|
||||
diff -up mozilla-beta/security/certverifier/OCSPCache.h.prbool-fix mozilla-beta/security/certverifier/OCSPCache.h
|
||||
--- mozilla-beta/security/certverifier/OCSPCache.h.prbool-fix 2015-04-07 10:36:34.106927741 +0200
|
||||
+++ mozilla-beta/security/certverifier/OCSPCache.h 2015-04-07 10:36:35.940922444 +0200
|
||||
@@ -25,6 +25,7 @@
|
||||
#ifndef mozilla_psm_OCSPCache_h
|
||||
#define mozilla_psm_OCSPCache_h
|
||||
|
||||
+#include "prtypes.h"
|
||||
#include "hasht.h"
|
||||
#include "mozilla/Mutex.h"
|
||||
#include "mozilla/Vector.h"
|
||||
diff -up mozilla-beta/security/manager/ssl/src/nsCryptoHash.h.prbool-fix mozilla-beta/security/manager/ssl/src/nsCryptoHash.h
|
||||
--- mozilla-beta/security/manager/ssl/src/nsCryptoHash.h.prbool-fix 2015-04-07 10:36:15.887980360 +0200
|
||||
+++ mozilla-beta/security/manager/ssl/src/nsCryptoHash.h 2015-04-07 10:36:18.124973899 +0200
|
||||
@@ -10,6 +10,7 @@
|
||||
#include "nsICryptoHash.h"
|
||||
#include "nsICryptoHMAC.h"
|
||||
#include "nsNSSShutDown.h"
|
||||
+#include "prtypes.h"
|
||||
#include "hasht.h"
|
||||
#include "secmodt.h"
|
||||
|
||||
diff -up mozilla-beta/security/manager/ssl/tests/unit/tlsserver/cmd/ClientAuthServer.cpp.prbool-fix mozilla-beta/security/manager/ssl/tests/unit/tlsserver/cmd/ClientAuthServer.cpp
|
||||
--- mozilla-beta/security/manager/ssl/tests/unit/tlsserver/cmd/ClientAuthServer.cpp.prbool-fix 2015-04-07 10:36:25.065953853 +0200
|
||||
+++ mozilla-beta/security/manager/ssl/tests/unit/tlsserver/cmd/ClientAuthServer.cpp 2015-04-07 10:36:27.319947343 +0200
|
||||
@@ -15,6 +15,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
+#include "prtypes.h"
|
||||
#include "hasht.h"
|
||||
#include "ScopedNSSTypes.h"
|
||||
#include "ssl.h"
|
||||
11
build-werror.patch
Normal file
11
build-werror.patch
Normal file
@ -0,0 +1,11 @@
|
||||
diff -up firefox-32.0/mozilla-release/media/libstagefright/moz.build.old firefox-32.0/mozilla-release/media/libstagefright/moz.build
|
||||
--- firefox-32.0/mozilla-release/media/libstagefright/moz.build.old 2014-08-26 05:38:08.000000000 +0200
|
||||
+++ firefox-32.0/mozilla-release/media/libstagefright/moz.build 2014-08-27 15:40:12.030299348 +0200
|
||||
@@ -120,7 +120,6 @@ elif CONFIG['GNU_CXX']:
|
||||
'-Wno-sign-compare'
|
||||
]
|
||||
CXXFLAGS += [
|
||||
- '-Wno-format',
|
||||
'-Wno-multichar',
|
||||
'-Wno-sign-compare',
|
||||
'-Wno-unused',
|
||||
39
firefox-enable-addons.patch
Normal file
39
firefox-enable-addons.patch
Normal file
@ -0,0 +1,39 @@
|
||||
diff -up mozilla-aurora/browser/app/profile/firefox.js.addons mozilla-aurora/browser/app/profile/firefox.js
|
||||
--- mozilla-aurora/browser/app/profile/firefox.js.addons 2015-03-12 13:21:14.000000000 +0100
|
||||
+++ mozilla-aurora/browser/app/profile/firefox.js 2015-03-12 14:25:39.974909169 +0100
|
||||
@@ -65,7 +65,8 @@ pref("extensions.hotfix.certs.1.sha1Fing
|
||||
|
||||
// Disable add-ons that are not installed by the user in all scopes by default.
|
||||
// See the SCOPE constants in AddonManager.jsm for values to use here.
|
||||
-pref("extensions.autoDisableScopes", 15);
|
||||
+pref("extensions.autoDisableScopes", 0);
|
||||
+pref("extensions.showMismatchUI", false);
|
||||
|
||||
// Dictionary download preference
|
||||
pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
|
||||
diff -up mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm
|
||||
--- mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2015-03-12 14:25:39.975909166 +0100
|
||||
+++ mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2015-03-12 15:23:05.879366812 +0100
|
||||
@@ -2102,11 +2102,7 @@ this.XPIProvider = {
|
||||
|
||||
AddonManagerPrivate.markProviderSafe(this);
|
||||
|
||||
- if (aAppChanged === undefined) {
|
||||
- // For new profiles we will never need to show the add-on selection UI
|
||||
- Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
|
||||
- }
|
||||
- else if (aAppChanged && !this.allAppGlobal &&
|
||||
+ if (aAppChanged && !this.allAppGlobal &&
|
||||
Preferences.get(PREF_EM_SHOW_MISMATCH_UI, true)) {
|
||||
if (!Preferences.get(PREF_SHOWN_SELECTION_UI, false)) {
|
||||
// Flip a flag to indicate that we interrupted startup with an interactive prompt
|
||||
@@ -2126,6 +2122,9 @@ this.XPIProvider = {
|
||||
flushCaches = true;
|
||||
}
|
||||
}
|
||||
+ } else {
|
||||
+ // For new profiles we will never need to show the add-on selection UI
|
||||
+ Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
|
||||
}
|
||||
|
||||
if (flushCaches) {
|
||||
@ -1,419 +0,0 @@
|
||||
# HG changeset patch
|
||||
# Parent 58ce6051edf56ce70c1a62e88bd879a6e56d9239
|
||||
# User Jan Horak <jhorak@redhat.com>
|
||||
# Bug 1129859 - Always use '-' as separator between lang-region in dictionary names, fixes problems with system dictionaries which has '_' as separator
|
||||
try: -b do -p all -u all -t none
|
||||
|
||||
diff --git a/editor/composer/nsEditorSpellCheck.cpp b/editor/composer/nsEditorSpellCheck.cpp
|
||||
--- a/editor/composer/nsEditorSpellCheck.cpp
|
||||
+++ b/editor/composer/nsEditorSpellCheck.cpp
|
||||
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/extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.aff b/extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.dic b/extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.sug b/extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.sug
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.sug
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.sug
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.test b/extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.wrong b/extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.wrong
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.wrong
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.wrong
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.aff b/extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.dic b/extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.good b/extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.good
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.good
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.good
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.sug b/extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.sug
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.sug
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.sug
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.test b/extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.wrong b/extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.wrong
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.wrong
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.wrong
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/base_utf.aff b/extensions/spellcheck/hunspell/tests/unit/data/base-utf.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/base_utf.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/base-utf.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/base_utf.dic b/extensions/spellcheck/hunspell/tests/unit/data/base-utf.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/base_utf.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/base-utf.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/base_utf.good b/extensions/spellcheck/hunspell/tests/unit/data/base-utf.good
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/base_utf.good
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/base-utf.good
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/base_utf.sug b/extensions/spellcheck/hunspell/tests/unit/data/base-utf.sug
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/base_utf.sug
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/base-utf.sug
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/base_utf.test b/extensions/spellcheck/hunspell/tests/unit/data/base-utf.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/base_utf.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/base-utf.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/base_utf.wrong b/extensions/spellcheck/hunspell/tests/unit/data/base-utf.wrong
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/base_utf.wrong
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/base-utf.wrong
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/colons_in_words.aff b/extensions/spellcheck/hunspell/tests/unit/data/colons-in-words.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/colons_in_words.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/colons-in-words.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/colons_in_words.dic b/extensions/spellcheck/hunspell/tests/unit/data/colons-in-words.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/colons_in_words.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/colons-in-words.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/colons_in_words.test b/extensions/spellcheck/hunspell/tests/unit/data/colons-in-words.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/colons_in_words.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/colons-in-words.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/condition_utf.aff b/extensions/spellcheck/hunspell/tests/unit/data/condition-utf.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/condition_utf.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/condition-utf.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/condition_utf.dic b/extensions/spellcheck/hunspell/tests/unit/data/condition-utf.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/condition_utf.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/condition-utf.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/condition_utf.good b/extensions/spellcheck/hunspell/tests/unit/data/condition-utf.good
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/condition_utf.good
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/condition-utf.good
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/condition_utf.test b/extensions/spellcheck/hunspell/tests/unit/data/condition-utf.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/condition_utf.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/condition-utf.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/condition_utf.wrong b/extensions/spellcheck/hunspell/tests/unit/data/condition-utf.wrong
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/condition_utf.wrong
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/condition-utf.wrong
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.aff b/extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.dic b/extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.test b/extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.wrong b/extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.wrong
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.wrong
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.wrong
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.aff b/extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.dic b/extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.good b/extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.good
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.good
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.good
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.sug b/extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.sug
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.sug
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.sug
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.test b/extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.wrong b/extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.wrong
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.wrong
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.wrong
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.aff b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.dic b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.good b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.good
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.good
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.good
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.test b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.wrong b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.wrong
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.wrong
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.wrong
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.aff b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.dic b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.good b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.good
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.good
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.good
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.test b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.wrong b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.wrong
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.wrong
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.wrong
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.aff b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.dic b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.good b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.good
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.good
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.good
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.sug b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.sug
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.sug
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.sug
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.test b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.wrong b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.wrong
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.wrong
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.wrong
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.aff b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.dic b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.good b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.good
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.good
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.good
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.sug b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.sug
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.sug
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.sug
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.test b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.wrong b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.wrong
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.wrong
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.wrong
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.aff b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.dic b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.good b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.good
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.good
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.good
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.sug b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.sug
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.sug
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.sug
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.test b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.wrong b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.wrong
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.wrong
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.wrong
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.aff b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.dic b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.good b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.good
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.good
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.good
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.test b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.aff b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.dic b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.good b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.good
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.good
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.good
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.test b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.aff b/extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.aff
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.aff
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.aff
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.dic b/extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.dic
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.dic
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.dic
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.good b/extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.good
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.good
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.good
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.sug b/extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.sug
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.sug
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.sug
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.test b/extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.test
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.test
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.test
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.wrong b/extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.wrong
|
||||
rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.wrong
|
||||
rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.wrong
|
||||
diff --git a/extensions/spellcheck/hunspell/tests/unit/test_hunspell.js b/extensions/spellcheck/hunspell/tests/unit/test_hunspell.js
|
||||
--- a/extensions/spellcheck/hunspell/tests/unit/test_hunspell.js
|
||||
+++ b/extensions/spellcheck/hunspell/tests/unit/test_hunspell.js
|
||||
@@ -3,21 +3,21 @@
|
||||
*/
|
||||
|
||||
const Cc = Components.classes;
|
||||
const Ci = Components.interfaces;
|
||||
|
||||
const tests = [
|
||||
["affixes", "iso-8859-1"],
|
||||
["condition", "iso-8859-1"],
|
||||
- ["condition_utf", "UTF-8"],
|
||||
+ ["condition-utf", "UTF-8"],
|
||||
["base", "iso-8859-1"],
|
||||
- ["base_utf", "UTF-8"],
|
||||
+ ["base-utf", "UTF-8"],
|
||||
["allcaps", "iso-8859-1"],
|
||||
- ["allcaps_utf", "UTF-8"],
|
||||
+ ["allcaps-utf", "UTF-8"],
|
||||
["allcaps2", "iso-8859-1"],
|
||||
["allcaps3", "iso-8859-1"],
|
||||
["keepcase", "iso-8859-1"],
|
||||
["i58202", "iso-8859-1"],
|
||||
["map", "iso-8859-1"],
|
||||
["rep", "iso-8859-1"],
|
||||
["sug", "iso-8859-1"],
|
||||
["sugutf", "UTF-8"],
|
||||
@@ -43,19 +43,19 @@ const tests = [
|
||||
["fogemorpheme", "iso-8859-1"],
|
||||
["onlyincompound", "iso-8859-1"],
|
||||
["complexprefixes", "iso-8859-1"],
|
||||
["complexprefixes2", "iso-8859-1"],
|
||||
["complexprefixesutf", "UTF-8"],
|
||||
["conditionalprefix", "iso-8859-1"],
|
||||
["zeroaffix", "iso-8859-1"],
|
||||
["utf8", "UTF-8"],
|
||||
- ["utf8_bom", "UTF-8", {1: "todo"}],
|
||||
- ["utf8_bom2", "UTF-8", {1: "todo"}],
|
||||
- ["utf8_nonbmp", "UTF-8", {1: "todo", 2: "todo", 3: "todo", 4: "todo"}],
|
||||
+ ["utf8-bom", "UTF-8", {1: "todo"}],
|
||||
+ ["utf8-bom2", "UTF-8", {1: "todo"}],
|
||||
+ ["utf8-nonbmp", "UTF-8", {1: "todo", 2: "todo", 3: "todo", 4: "todo"}],
|
||||
["compoundflag", "iso-8859-1"],
|
||||
["compoundrule", "iso-8859-1"],
|
||||
["compoundrule2", "iso-8859-1"],
|
||||
["compoundrule3", "iso-8859-1"],
|
||||
["compoundrule4", "iso-8859-1"],
|
||||
["compoundrule5", "UTF-8"],
|
||||
["compoundrule6", "iso-8859-1"],
|
||||
["compoundrule7", "iso-8859-1"],
|
||||
@@ -86,43 +86,43 @@ const tests = [
|
||||
["reputf", "UTF-8"],
|
||||
["ignore", "iso-8859-1"],
|
||||
["ignoreutf", "UTF-8",
|
||||
{1: "todo", 2: "todo", 3: "todo", 4: "todo", 5: "todo", 6: "todo",
|
||||
7: "todo", 8: "todo"}],
|
||||
["1592880", "iso-8859-1"],
|
||||
["1695964", "iso-8859-1"],
|
||||
["1463589", "iso-8859-1"],
|
||||
- ["1463589_utf", "UTF-8"],
|
||||
+ ["1463589-utf", "UTF-8"],
|
||||
["IJ", "iso-8859-1"],
|
||||
["i68568", "iso-8859-1"],
|
||||
["i68568utf", "UTF-8"],
|
||||
["1706659", "iso-8859-1"],
|
||||
- ["digits_in_words", "iso-8859-1"],
|
||||
-// ["colons_in_words", "iso-8859-1"], Suggestion test only
|
||||
- ["ngram_utf_fix", "UTF-8"],
|
||||
+ ["digits-in-words", "iso-8859-1"],
|
||||
+// ["colons-in-words", "iso-8859-1"], Suggestion test only
|
||||
+ ["ngram-utf-fix", "UTF-8"],
|
||||
["morph", "us-ascii",
|
||||
{11: "todo", 12: "todo", 13: "todo", 14: "todo", 15: "todo", 16: "todo",
|
||||
17: "todo", 18: "todo", 19: "todo", 20: "todo", 21: "todo", 22: "todo",
|
||||
23: "todo", 24: "todo", 25: "todo", 26: "todo", 27: "todo"}],
|
||||
["1975530", "UTF-8"],
|
||||
["fullstrip", "iso-8859-1"],
|
||||
["iconv", "UTF-8"],
|
||||
["oconv", "UTF-8"],
|
||||
["encoding", "iso-8859-1", {1: "todo", 3: "todo"}],
|
||||
["korean", "UTF-8"],
|
||||
- ["opentaal_forbiddenword1", "UTF-8"],
|
||||
- ["opentaal_forbiddenword2", "UTF-8"],
|
||||
- ["opentaal_keepcase", "UTF-8"],
|
||||
+ ["opentaal-forbiddenword1", "UTF-8"],
|
||||
+ ["opentaal-forbiddenword2", "UTF-8"],
|
||||
+ ["opentaal-keepcase", "UTF-8"],
|
||||
["arabic", "UTF-8"],
|
||||
["2970240", "iso-8859-1"],
|
||||
["2970242", "iso-8859-1"],
|
||||
["breakoff", "iso-8859-1"],
|
||||
- ["opentaal_cpdpat", "iso-8859-1"],
|
||||
- ["opentaal_cpdpat2", "iso-8859-1"],
|
||||
+ ["opentaal-cpdpat", "iso-8859-1"],
|
||||
+ ["opentaal-cpdpat2", "iso-8859-1"],
|
||||
["2999225", "iso-8859-1"],
|
||||
["onlyincompound2", "iso-8859-1"],
|
||||
["forceucase", "iso-8859-1"],
|
||||
["warn", "iso-8859-1"]
|
||||
];
|
||||
|
||||
function do_get_file_by_line(file, charset) {
|
||||
dump("getting file by line for file " + file.path + "\n");
|
||||
diff --git a/extensions/spellcheck/tests/chrome/test_add_remove_dictionaries.xul b/extensions/spellcheck/tests/chrome/test_add_remove_dictionaries.xul
|
||||
--- a/extensions/spellcheck/tests/chrome/test_add_remove_dictionaries.xul
|
||||
+++ b/extensions/spellcheck/tests/chrome/test_add_remove_dictionaries.xul
|
||||
@@ -63,26 +63,26 @@ function RunTest() {
|
||||
ok(map.exists());
|
||||
hunspell.addDirectory(map);
|
||||
|
||||
Components.utils.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm");
|
||||
onSpellCheck(textbox, function () {
|
||||
|
||||
// test that base and map dictionaries are available
|
||||
var dicts = getDictionaryList(editor);
|
||||
- isnot(dicts.indexOf("base_utf"), -1, "base is available");
|
||||
+ isnot(dicts.indexOf("base-utf"), -1, "base is available");
|
||||
isnot(dicts.indexOf("maputf"), -1, "map is available");
|
||||
|
||||
// select base dictionary
|
||||
- setCurrentDictionary(editor, "base_utf");
|
||||
+ setCurrentDictionary(editor, "base-utf");
|
||||
|
||||
onSpellCheck(textbox, function () {
|
||||
// test that base dictionary is in use
|
||||
is(getMisspelledWords(editor), "Frühstück" + "qwertyu", "base misspellings");
|
||||
- is(getCurrentDictionary(editor), "base_utf", "current dictionary");
|
||||
+ is(getCurrentDictionary(editor), "base-utf", "current dictionary");
|
||||
|
||||
// select map dictionary
|
||||
setCurrentDictionary(editor, "maputf");
|
||||
|
||||
onSpellCheck(textbox, function () {
|
||||
// test that map dictionary is in use
|
||||
is(getMisspelledWords(editor), "created" + "imply" + "tomorrow" + "qwertyu", "map misspellings");
|
||||
is(getCurrentDictionary(editor), "maputf", "current dictionary");
|
||||
@@ -92,17 +92,17 @@ function RunTest() {
|
||||
|
||||
onSpellCheck(textbox, function () {
|
||||
// test that map dictionary is not in use
|
||||
isnot(getMisspelledWords(editor), "created" + "imply" + "tomorrow" + "qwertyu", "map misspellings");
|
||||
isnot(getCurrentDictionary(editor), "maputf", "current dictionary");
|
||||
|
||||
// test that base dictionary is available and map dictionary is unavailable
|
||||
var dicts = getDictionaryList(editor);
|
||||
- isnot(dicts.indexOf("base_utf"), -1, "base is available");
|
||||
+ isnot(dicts.indexOf("base-utf"), -1, "base is available");
|
||||
is(dicts.indexOf("maputf"), -1, "map is unavailable");
|
||||
|
||||
// uninstall base dictionary
|
||||
hunspell.removeDirectory(base);
|
||||
|
||||
onSpellCheck(textbox, function () {
|
||||
SimpleTest.finish();
|
||||
});
|
||||
@ -1,272 +0,0 @@
|
||||
# HG changeset patch
|
||||
# Parent b17cad2d1e5e6bcb5a10096d51d07ea8a79b6921
|
||||
# User Martin Stransky <stransky@redhat.com>
|
||||
Bug 858919 - Add support for libnotify calls which was removed for new notification API. r=karlt
|
||||
|
||||
diff --git a/toolkit/system/gnome/moz.build b/toolkit/system/gnome/moz.build
|
||||
--- a/toolkit/system/gnome/moz.build
|
||||
+++ b/toolkit/system/gnome/moz.build
|
||||
@@ -1,15 +1,17 @@
|
||||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
SOURCES += [
|
||||
+ 'nsAlertsIconListener.cpp',
|
||||
+ 'nsAlertsService.cpp',
|
||||
'nsGnomeModule.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_ENABLE_GCONF']:
|
||||
SOURCES += [
|
||||
'nsGConfService.cpp',
|
||||
]
|
||||
|
||||
diff --git a/toolkit/system/gnome/nsAlertsIconListener.h b/toolkit/system/gnome/nsAlertsIconListener.h
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/toolkit/system/gnome/nsAlertsIconListener.h
|
||||
@@ -0,0 +1,89 @@
|
||||
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
+/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
+
|
||||
+#ifndef nsAlertsIconListener_h__
|
||||
+#define nsAlertsIconListener_h__
|
||||
+
|
||||
+#include "nsCOMPtr.h"
|
||||
+#include "imgINotificationObserver.h"
|
||||
+#include "nsStringAPI.h"
|
||||
+#include "nsIObserver.h"
|
||||
+#include "nsWeakReference.h"
|
||||
+
|
||||
+#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
+
|
||||
+class imgIRequest;
|
||||
+
|
||||
+struct NotifyNotification;
|
||||
+
|
||||
+class nsAlertsIconListener : public imgINotificationObserver,
|
||||
+ public nsIObserver,
|
||||
+ public nsSupportsWeakReference
|
||||
+{
|
||||
+public:
|
||||
+ NS_DECL_ISUPPORTS
|
||||
+ NS_DECL_IMGINOTIFICATIONOBSERVER
|
||||
+ NS_DECL_NSIOBSERVER
|
||||
+
|
||||
+ nsAlertsIconListener();
|
||||
+
|
||||
+ nsresult InitAlertAsync(const nsAString & aImageUrl,
|
||||
+ const nsAString & aAlertTitle,
|
||||
+ const nsAString & aAlertText,
|
||||
+ bool aAlertTextClickable,
|
||||
+ const nsAString & aAlertCookie,
|
||||
+ nsIObserver * aAlertListener);
|
||||
+
|
||||
+ void SendCallback();
|
||||
+ void SendClosed();
|
||||
+
|
||||
+protected:
|
||||
+ virtual ~nsAlertsIconListener();
|
||||
+
|
||||
+ nsresult OnStopRequest(imgIRequest* aRequest);
|
||||
+ nsresult OnStopFrame(imgIRequest* aRequest);
|
||||
+
|
||||
+ /**
|
||||
+ * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols
|
||||
+ * is that notify_notification_new takes three arguments in libnotify.so.4 and
|
||||
+ * four in libnotify.so.1.
|
||||
+ * Passing the fourth argument as NULL is binary compatible.
|
||||
+ */
|
||||
+ typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer);
|
||||
+ typedef bool (*notify_is_initted_t)(void);
|
||||
+ typedef bool (*notify_init_t)(const char*);
|
||||
+ typedef GList* (*notify_get_server_caps_t)(void);
|
||||
+ typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*);
|
||||
+ typedef bool (*notify_notification_show_t)(void*, char*);
|
||||
+ typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*);
|
||||
+ typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc);
|
||||
+
|
||||
+ nsCOMPtr<imgIRequest> mIconRequest;
|
||||
+ nsCString mAlertTitle;
|
||||
+ nsCString mAlertText;
|
||||
+
|
||||
+ nsCOMPtr<nsIObserver> mAlertListener;
|
||||
+ nsString mAlertCookie;
|
||||
+
|
||||
+ bool mLoadedFrame;
|
||||
+ bool mAlertHasAction;
|
||||
+
|
||||
+ static void* libNotifyHandle;
|
||||
+ static bool libNotifyNotAvail;
|
||||
+ static notify_is_initted_t notify_is_initted;
|
||||
+ static notify_init_t notify_init;
|
||||
+ static notify_get_server_caps_t notify_get_server_caps;
|
||||
+ static notify_notification_new_t notify_notification_new;
|
||||
+ static notify_notification_show_t notify_notification_show;
|
||||
+ static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf;
|
||||
+ static notify_notification_add_action_t notify_notification_add_action;
|
||||
+ NotifyNotification* mNotification;
|
||||
+ gulong mClosureHandler;
|
||||
+
|
||||
+ nsresult StartRequest(const nsAString & aImageUrl);
|
||||
+ nsresult ShowAlert(GdkPixbuf* aPixbuf);
|
||||
+};
|
||||
+
|
||||
+#endif
|
||||
diff --git a/toolkit/system/gnome/nsAlertsService.cpp b/toolkit/system/gnome/nsAlertsService.cpp
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/toolkit/system/gnome/nsAlertsService.cpp
|
||||
@@ -0,0 +1,53 @@
|
||||
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */
|
||||
+/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
+
|
||||
+#include "nsXULAppAPI.h"
|
||||
+#include "nsAlertsService.h"
|
||||
+#include "nsAlertsIconListener.h"
|
||||
+#include "nsAutoPtr.h"
|
||||
+
|
||||
+NS_IMPL_ADDREF(nsAlertsService)
|
||||
+NS_IMPL_RELEASE(nsAlertsService)
|
||||
+
|
||||
+NS_INTERFACE_MAP_BEGIN(nsAlertsService)
|
||||
+ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService)
|
||||
+ NS_INTERFACE_MAP_ENTRY(nsIAlertsService)
|
||||
+NS_INTERFACE_MAP_END_THREADSAFE
|
||||
+
|
||||
+nsAlertsService::nsAlertsService()
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+nsAlertsService::~nsAlertsService()
|
||||
+{}
|
||||
+
|
||||
+nsresult
|
||||
+nsAlertsService::Init()
|
||||
+{
|
||||
+ return NS_OK;
|
||||
+}
|
||||
+
|
||||
+NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle,
|
||||
+ const nsAString & aAlertText, bool aAlertTextClickable,
|
||||
+ const nsAString & aAlertCookie,
|
||||
+ nsIObserver * aAlertListener,
|
||||
+ const nsAString & aAlertName,
|
||||
+ const nsAString & aBidi,
|
||||
+ const nsAString & aLang,
|
||||
+ nsIPrincipal * aPrincipal)
|
||||
+{
|
||||
+ nsRefPtr<nsAlertsIconListener> alertListener = new nsAlertsIconListener();
|
||||
+ if (!alertListener)
|
||||
+ return NS_ERROR_OUT_OF_MEMORY;
|
||||
+
|
||||
+ return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable,
|
||||
+ aAlertCookie, aAlertListener);
|
||||
+}
|
||||
+
|
||||
+NS_IMETHODIMP nsAlertsService::CloseAlert(const nsAString& aAlertName,
|
||||
+ nsIPrincipal* aPrincipal)
|
||||
+{
|
||||
+ return NS_ERROR_NOT_IMPLEMENTED;
|
||||
+}
|
||||
diff --git a/toolkit/system/gnome/nsAlertsService.h b/toolkit/system/gnome/nsAlertsService.h
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/toolkit/system/gnome/nsAlertsService.h
|
||||
@@ -0,0 +1,27 @@
|
||||
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
+/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
+
|
||||
+#ifndef nsAlertsService_h__
|
||||
+#define nsAlertsService_h__
|
||||
+
|
||||
+#include "nsIAlertsService.h"
|
||||
+#include "nsCOMPtr.h"
|
||||
+
|
||||
+class nsAlertsService : public nsIAlertsService
|
||||
+{
|
||||
+public:
|
||||
+ NS_DECL_NSIALERTSSERVICE
|
||||
+ NS_DECL_ISUPPORTS
|
||||
+
|
||||
+ nsAlertsService();
|
||||
+
|
||||
+ nsresult Init();
|
||||
+
|
||||
+protected:
|
||||
+ virtual ~nsAlertsService();
|
||||
+
|
||||
+};
|
||||
+
|
||||
+#endif /* nsAlertsService_h__ */
|
||||
diff --git a/toolkit/system/gnome/nsGnomeModule.cpp b/toolkit/system/gnome/nsGnomeModule.cpp
|
||||
--- a/toolkit/system/gnome/nsGnomeModule.cpp
|
||||
+++ b/toolkit/system/gnome/nsGnomeModule.cpp
|
||||
@@ -17,53 +17,58 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGC
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init)
|
||||
#endif
|
||||
#ifdef MOZ_ENABLE_GIO
|
||||
#include "nsGIOService.h"
|
||||
#include "nsGSettingsService.h"
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init)
|
||||
#endif
|
||||
+#include "nsAlertsService.h"
|
||||
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAlertsService, Init)
|
||||
|
||||
#ifdef MOZ_ENABLE_GCONF
|
||||
NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID);
|
||||
#endif
|
||||
#ifdef MOZ_ENABLE_GNOMEVFS
|
||||
NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_CID);
|
||||
#endif
|
||||
#ifdef MOZ_ENABLE_GIO
|
||||
NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID);
|
||||
NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID);
|
||||
#endif
|
||||
+NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID);
|
||||
|
||||
static const mozilla::Module::CIDEntry kGnomeCIDs[] = {
|
||||
#ifdef MOZ_ENABLE_GCONF
|
||||
{ &kNS_GCONFSERVICE_CID, false, nullptr, nsGConfServiceConstructor },
|
||||
#endif
|
||||
#ifdef MOZ_ENABLE_GNOMEVFS
|
||||
{ &kNS_GNOMEVFSSERVICE_CID, false, nullptr, nsGnomeVFSServiceConstructor },
|
||||
#endif
|
||||
#ifdef MOZ_ENABLE_GIO
|
||||
{ &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor },
|
||||
{ &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor },
|
||||
#endif
|
||||
+ { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsAlertsServiceConstructor },
|
||||
{ nullptr }
|
||||
};
|
||||
|
||||
static const mozilla::Module::ContractIDEntry kGnomeContracts[] = {
|
||||
#ifdef MOZ_ENABLE_GCONF
|
||||
{ NS_GCONFSERVICE_CONTRACTID, &kNS_GCONFSERVICE_CID },
|
||||
#endif
|
||||
#ifdef MOZ_ENABLE_GNOMEVFS
|
||||
{ NS_GNOMEVFSSERVICE_CONTRACTID, &kNS_GNOMEVFSSERVICE_CID },
|
||||
#endif
|
||||
#ifdef MOZ_ENABLE_GIO
|
||||
{ NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID },
|
||||
{ NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID },
|
||||
#endif
|
||||
+ { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID },
|
||||
{ nullptr }
|
||||
};
|
||||
|
||||
static nsresult
|
||||
InitGType ()
|
||||
{
|
||||
g_type_init();
|
||||
return NS_OK;
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
dcf14a6d4aaba2f695a1ec30c296e356 thunderbird-31.7.0.source.tar.bz2
|
||||
1bb23a44a6e5fe0ce28f97d547daa843 thunderbird-langpacks-31.7.0-20150512.tar.xz
|
||||
0a740cdeee86d3ab49c635c6070c4b06 thunderbird-38.0.1.source.tar.bz2
|
||||
48b95fea043947cd5f644008890d4dc2 thunderbird-langpacks-38.0.1-20150609.tar.xz
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
diff -up comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
|
||||
--- comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern 2015-04-07 14:30:05.525960513 -0400
|
||||
+++ comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-04-07 14:32:22.478199058 -0400
|
||||
@@ -180,7 +180,7 @@ int VP8EncoderImpl::InitEncode(const Vid
|
||||
// Creating a wrapper to the image - setting image data to NULL. Actual
|
||||
// pointer will be set in encode. Setting align to 1, as it is meaningless
|
||||
// (actual memory is not allocated).
|
||||
- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height,
|
||||
+ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height,
|
||||
1, NULL);
|
||||
// populate encoder configuration with default values
|
||||
if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) {
|
||||
@@ -349,9 +349,9 @@ int VP8EncoderImpl::Encode(const I420Vid
|
||||
}
|
||||
// Image in vpx_image_t format.
|
||||
// Input image is const. VP8's raw image is not defined as const.
|
||||
- raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
|
||||
- raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
|
||||
- raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
|
||||
+ raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
|
||||
+ raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
|
||||
+ raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
|
||||
// TODO(mikhal): Stride should be set in initialization.
|
||||
raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane);
|
||||
raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane);
|
||||
@ -13,14 +13,26 @@ diff -up comm-esr31/mail/app/profile/all-thunderbird.js.addons comm-esr31/mail/a
|
||||
diff -up comm-esr31/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons comm-esr31/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm
|
||||
--- comm-esr31/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2014-07-29 15:29:11.951728146 +0200
|
||||
+++ comm-esr31/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2014-07-29 15:30:51.879030210 +0200
|
||||
@@ -1894,8 +1894,8 @@ this.XPIProvider = {
|
||||
this.showUpgradeUI();
|
||||
flushCaches = true;
|
||||
}
|
||||
- else if (aAppChanged === undefined) {
|
||||
@@ -2102,11 +2102,7 @@ this.XPIProvider = {
|
||||
|
||||
AddonManagerPrivate.markProviderSafe(this);
|
||||
|
||||
- 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);
|
||||
- Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
|
||||
- }
|
||||
- else if (aAppChanged && !this.allAppGlobal &&
|
||||
+ if (aAppChanged && !this.allAppGlobal &&
|
||||
Preferences.get(PREF_EM_SHOW_MISMATCH_UI, true)) {
|
||||
if (!Preferences.get(PREF_SHOWN_SELECTION_UI, false)) {
|
||||
// Flip a flag to indicate that we interrupted startup with an interactive prompt
|
||||
@@ -2126,6 +2122,9 @@ this.XPIProvider = {
|
||||
flushCaches = true;
|
||||
}
|
||||
}
|
||||
+ } else {
|
||||
+ // For new profiles we will never need to show the add-on selection UI
|
||||
+ Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
|
||||
}
|
||||
|
||||
if (flushCaches) {
|
||||
|
||||
@ -1,17 +1,6 @@
|
||||
diff -up thunderbird-31.0/comm-esr31/config/baseconfig.mk.dir thunderbird-31.0/comm-esr31/config/baseconfig.mk
|
||||
--- thunderbird-31.0/comm-esr31/config/baseconfig.mk.dir 2014-07-29 13:51:58.204106461 +0200
|
||||
+++ thunderbird-31.0/comm-esr31/config/baseconfig.mk 2014-07-29 13:54:26.868555504 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
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)
|
||||
+installdir = $(libdir)/$(MOZ_APP_NAME)
|
||||
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
|
||||
MOZILLA_SRCDIR = $(topsrcdir)/mozilla
|
||||
MOZDEPTH = $(DEPTH)/mozilla
|
||||
diff -up thunderbird-31.0/comm-esr31/mozilla/config/baseconfig.mk.dir thunderbird-31.0/comm-esr31/mozilla/config/baseconfig.mk
|
||||
--- thunderbird-31.0/comm-esr31/mozilla/config/baseconfig.mk.dir 2014-07-18 02:05:10.000000000 +0200
|
||||
+++ thunderbird-31.0/comm-esr31/mozilla/config/baseconfig.mk 2014-07-29 13:51:58.204106461 +0200
|
||||
diff -up comm-esr38/mozilla/config/baseconfig.mk.dir comm-esr38/mozilla/config/baseconfig.mk
|
||||
--- comm-esr38/mozilla/config/baseconfig.mk.dir 2015-06-08 19:49:23.000000000 +0200
|
||||
+++ comm-esr38/mozilla/config/baseconfig.mk 2015-06-16 14:45:16.048913473 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
# whether a normal build is happening or whether the check is running.
|
||||
includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
#
|
||||
# IMPORTANT: If there is no top level directory, this should be
|
||||
# set to the cwd, ie: '.'
|
||||
%define tarballdir comm-esr31
|
||||
%define tarballdir comm-esr38
|
||||
%define objdir objdir
|
||||
%define mozappdir %{_libdir}/%{name}
|
||||
|
||||
@ -57,14 +57,14 @@
|
||||
|
||||
Summary: Mozilla Thunderbird mail/newsgroup client
|
||||
Name: thunderbird
|
||||
Version: 31.7.0
|
||||
Version: 38.0.1
|
||||
Release: 1%{?dist}
|
||||
URL: http://www.mozilla.org/projects/thunderbird/
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
Group: Applications/Internet
|
||||
Source0: ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.bz2
|
||||
%if %{build_langpacks}
|
||||
Source1: thunderbird-langpacks-%{version}-20150512.tar.xz
|
||||
Source1: thunderbird-langpacks-%{version}-20150609.tar.xz
|
||||
%endif
|
||||
Source10: thunderbird-mozconfig
|
||||
Source11: thunderbird-mozconfig-branded
|
||||
@ -75,10 +75,11 @@ Source21: thunderbird.sh.in
|
||||
# Mozilla (XULRunner) patches
|
||||
Patch0: thunderbird-install-dir.patch
|
||||
Patch9: mozilla-build-arm.patch
|
||||
Patch10: mozilla-1129859-dictfix2.patch
|
||||
|
||||
# Build patches
|
||||
Patch100: thunderbird-objdir.patch
|
||||
Patch101: build-nspr-prbool.patch
|
||||
Patch102: build-werror.patch
|
||||
|
||||
# Linux specific
|
||||
Patch200: thunderbird-enable-addons.patch
|
||||
@ -88,10 +89,8 @@ Patch300: xulrunner-24.0-jemalloc-ppc.patch
|
||||
|
||||
# Fedora specific patches
|
||||
Patch400: rhbz-966424.patch
|
||||
Patch401: mozilla-858919.patch
|
||||
Patch402: rhbz-1014858.patch
|
||||
# libvpx no longer has compat defines, use the current ones
|
||||
Patch403: thunderbird-31.6.0-libvpx-modern.patch
|
||||
|
||||
%if %{official_branding}
|
||||
# Required by Mozilla Corporation
|
||||
@ -173,18 +172,17 @@ debug %{name}, you want to install %{name}-debuginfo instead.
|
||||
%setup -q -c
|
||||
cd %{tarballdir}
|
||||
|
||||
%patch0 -p2 -b .dir
|
||||
%patch0 -p1 -b .dir
|
||||
%patch100 -p2 -b .objdir
|
||||
|
||||
# Mozilla (XULRunner) patches
|
||||
cd mozilla
|
||||
%patch9 -p2 -b .arm
|
||||
%patch10 -p1 -b .dict-fix
|
||||
%patch300 -p2 -b .852698
|
||||
%patch102 -p2 -b .build-werror
|
||||
%patch101 -p1 -b .nspr-prbool
|
||||
%patch400 -p1 -b .966424
|
||||
%patch401 -p1 -b .858919
|
||||
%patch402 -p1 -b .rhbz-1014858
|
||||
%patch403 -p2 -b .modern
|
||||
|
||||
cd ..
|
||||
%patch200 -p1 -b .addons
|
||||
@ -321,6 +319,7 @@ MOZ_SMP_FLAGS=-j1
|
||||
[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
|
||||
[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
|
||||
%endif
|
||||
MOZ_SMP_FLAGS=-j1
|
||||
|
||||
make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
|
||||
|
||||
@ -409,7 +408,7 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
|
||||
# Add debuginfo for crash-stats.mozilla.com
|
||||
%if %{enable_mozilla_crashreporter}
|
||||
%{__mkdir_p} $RPM_BUILD_ROOT/%{moz_debug_dir}
|
||||
%{__cp} %{objdir}/mozilla/dist/%{symbols_file_name} $RPM_BUILD_ROOT/%{moz_debug_dir}
|
||||
%{__cp} %{objdir}/dist/%{symbols_file_name} $RPM_BUILD_ROOT/%{moz_debug_dir}
|
||||
%endif
|
||||
|
||||
# Register as an application to be visible in the software center
|
||||
@ -501,7 +500,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%dir %{mozappdir}/langpacks
|
||||
%{mozappdir}/greprefs
|
||||
%{mozappdir}/isp
|
||||
%{mozappdir}/mozilla-xremote-client
|
||||
%{mozappdir}/run-mozilla.sh
|
||||
%{mozappdir}/thunderbird-bin
|
||||
%{mozappdir}/thunderbird
|
||||
@ -533,6 +531,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#===============================================================================
|
||||
|
||||
%changelog
|
||||
* Tue Jun 9 2015 Jan Horak <jhorak@redhat.com> - 38.0.1-1
|
||||
- Update to 38.0.1
|
||||
|
||||
* Tue May 12 2015 Martin Stransky <stransky@redhat.com> - 31.7.0-1
|
||||
- Update to 31.7.0
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user