Date: Wed, 12 Sep 2012 07:21:23 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1009 - in trunk: Mk mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/firefox36/files www/libxul/files www/libxul19/files www/seamonkey/files Message-ID: <201209120721.q8C7LNxF049472@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Sep 12 07:21:23 2012 New Revision: 1009 Log: use system dictionaries, too PR: ports/171534 Added: trunk/mail/thunderbird-esr/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/mail/thunderbird/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/mail/thunderbird3/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/www/firefox-esr/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/www/firefox-nightly/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/www/firefox/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/www/firefox36/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/www/libxul/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/www/libxul19/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/www/seamonkey/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Mon Sep 10 11:57:55 2012 (r1008) +++ trunk/Mk/bsd.gecko.mk Wed Sep 12 07:21:23 2012 (r1009) @@ -866,6 +866,10 @@ ${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp @${GREP} -lr 'PR_LoadLibrary.*\.so\.[0-9]' ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -Ee '/PR_LoadLibrary/s/(\.so)\.[0-9]+/\1/' +.if ${MOZILLA} != "kompozer" + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${MOZSRC}/extensions/spellcheck/hunspell/src/mozHunspell.cpp +.endif # handles mozilla pis scripts. gecko-moz-pis-patch: Added: trunk/mail/thunderbird-esr/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird-esr/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, (nsILocalFile**)&hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr<nsISimpleEnumerator> dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, Added: trunk/mail/thunderbird/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, &hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr<nsISimpleEnumerator> dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, Added: trunk/mail/thunderbird3/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird3/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -344,6 +344,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, (nsILocalFile**)&hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + nsCOMPtr<nsISimpleEnumerator> dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, + NS_GET_IID(nsISimpleEnumerator), getter_AddRefs(dictDirs)); Added: trunk/www/firefox-esr/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, (nsILocalFile**)&hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr<nsISimpleEnumerator> dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, Added: trunk/www/firefox-nightly/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, &hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr<nsISimpleEnumerator> dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, Added: trunk/www/firefox/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, &hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr<nsISimpleEnumerator> dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, Added: trunk/www/firefox36/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox36/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -344,6 +344,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, (nsILocalFile**)&hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + nsCOMPtr<nsISimpleEnumerator> dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, + NS_GET_IID(nsISimpleEnumerator), getter_AddRefs(dictDirs)); Added: trunk/www/libxul/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, (nsILocalFile**)&hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr<nsISimpleEnumerator> dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, Added: trunk/www/libxul19/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul19/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -344,6 +344,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, (nsILocalFile**)&hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + nsCOMPtr<nsISimpleEnumerator> dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, + NS_GET_IID(nsISimpleEnumerator), getter_AddRefs(dictDirs)); Added: trunk/www/seamonkey/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, &hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr<nsISimpleEnumerator> dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209120721.q8C7LNxF049472>