- make it check LOCALBASE/share/mozilla-dicts, the global dictionaries

location for all mozilla ports;
- regen patches (due to the current changes);
- bump pkgname;
discussed with naddy@, kurt@, ajacoutot@
ok naddy@
This commit is contained in:
martynas 2007-04-06 14:39:33 +00:00
parent 2aab7d2ee3
commit dac852cf9d
10 changed files with 70 additions and 31 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2007/03/26 20:41:37 martynas Exp $
# $OpenBSD: Makefile,v 1.8 2007/04/06 14:39:33 martynas Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64
@ -9,7 +9,7 @@ COMMENT-devel= "devel files for Gecko"
VER= 1.1.1
DISTNAME= seamonkey-${VER}.source
PKGNAME= seamonkey-${VER}
PKGNAME-main= seamonkey-${VER}
PKGNAME-main= seamonkey-${VER}p0
PKGNAME-devel= seamonkey-devel-${VER}
SO_VERSION= 10.0

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-content_xul_templates_src_nsTemplateMatchSet_h,v 1.1 2007/02/22 00:40:59 naddy Exp $
$OpenBSD: patch-content_xul_templates_src_nsTemplateMatchSet_h,v 1.2 2007/04/06 14:39:34 martynas Exp $
--- content/xul/templates/src/nsTemplateMatchSet.h.orig Sun Apr 18 00:52:30 2004
+++ content/xul/templates/src/nsTemplateMatchSet.h Mon Feb 19 23:54:24 2007
@@ -207,7 +207,11 @@ protected:
+++ content/xul/templates/src/nsTemplateMatchSet.h Fri Apr 6 17:27:27 2007
@@ -207,7 +207,11 @@ class nsTemplateMatchRefSet (protected)
* If the set is currently
*/
struct InlineMatches {

View File

@ -0,0 +1,10 @@
$OpenBSD: patch-extensions_spellcheck_myspell_src_Makefile_in,v 1.1 2007/04/06 14:39:34 martynas Exp $
--- extensions/spellcheck/myspell/src/Makefile.in.orig Mon Mar 12 19:27:15 2007
+++ extensions/spellcheck/myspell/src/Makefile.in Mon Mar 12 19:43:59 2007
@@ -81,4 +81,6 @@ EXTRA_DSO_LDOPTS = \
$(MOZ_UNICHARUTIL_LIBS) \
$(NULL)
+DEFINES += -DLOCALBASE=\"$(prefix)\"
+
include $(topsrcdir)/config/rules.mk

View File

@ -0,0 +1,29 @@
$OpenBSD: patch-extensions_spellcheck_myspell_src_mozMySpell_cpp,v 1.1 2007/04/06 14:39:34 martynas Exp $
--- extensions/spellcheck/myspell/src/mozMySpell.cpp.orig Fri Jun 30 01:16:17 2006
+++ extensions/spellcheck/myspell/src/mozMySpell.cpp Mon Mar 12 19:16:59 2007
@@ -64,6 +64,9 @@
#include "nsISimpleEnumerator.h"
#include "nsIDirectoryEnumerator.h"
#include "nsIFile.h"
+#include "nsID.h"
+#include "nsEmbedString.h"
+#include "nsILocalFile.h"
#include "nsDirectoryServiceUtils.h"
#include "nsDirectoryServiceDefs.h"
#include "mozISpellI18NManager.h"
@@ -321,6 +324,15 @@ mozMySpell::LoadDictionaryList()
}
LoadDictionariesFromDir(dictDir);
+
+ // provide common LOCALBASE/share/mozilla-dicts for all mozilla apps
+ nsCOMPtr<nsILocalFile> file;
+ rv = NS_NewNativeLocalFile(nsEmbedCString(LOCALBASE"/share/mozilla-dicts"), PR_TRUE,
+ getter_AddRefs(file));
+ if (NS_SUCCEEDED(rv)) {
+ file->QueryInterface(NS_GET_IID(nsIFile), (void**)&dictDir);
+ LoadDictionariesFromDir(dictDir);
+ }
nsCOMPtr<nsISimpleEnumerator> dictDirs;
rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST,

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.3 2007/03/26 20:41:37 martynas Exp $
--- gfx/src/ps/nsFontMetricsPS.cpp.orig Thu Nov 30 04:17:21 2006
+++ gfx/src/ps/nsFontMetricsPS.cpp Mon Dec 11 15:49:56 2006
@@ -995,7 +995,7 @@ nsFontPSXft::FindFont(PRUnichar aChar, c
$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.4 2007/04/06 14:39:34 martynas Exp $
--- gfx/src/ps/nsFontMetricsPS.cpp.orig Fri Dec 22 15:51:16 2006
+++ gfx/src/ps/nsFontMetricsPS.cpp Fri Apr 6 17:27:27 2007
@@ -995,7 +995,7 @@ nsFontPSXft::FindFont(PRUnichar aChar, const nsFont& a
fontps *fps = new fontps;
fps->entry = xftEntry;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gfx_src_psshared_nsCUPSShim_cpp,v 1.1 2007/02/14 17:13:38 kurt Exp $
--- gfx/src/psshared/nsCUPSShim.cpp.orig Sun May 8 11:01:20 2005
+++ gfx/src/psshared/nsCUPSShim.cpp Tue Feb 13 11:31:21 2007
@@ -59,7 +59,7 @@ static const int gSymNameCt = sizeof(gSy
$OpenBSD: patch-gfx_src_psshared_nsCUPSShim_cpp,v 1.2 2007/04/06 14:39:34 martynas Exp $
--- gfx/src/psshared/nsCUPSShim.cpp.orig Sun May 8 18:01:20 2005
+++ gfx/src/psshared/nsCUPSShim.cpp Fri Apr 6 17:27:27 2007
@@ -59,7 +59,7 @@ static const int gSymNameCt = sizeof(gSymName) / sizeo
PRBool
nsCUPSShim::Init()
{

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mailnews_mime_src_mimemsg_cpp,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- mailnews/mime/src/mimemsg.cpp.orig Wed Dec 13 17:59:47 2006
+++ mailnews/mime/src/mimemsg.cpp Wed Dec 13 17:59:59 2006
@@ -522,7 +522,7 @@ MimeMessage_close_headers (MimeObject *o
$OpenBSD: patch-mailnews_mime_src_mimemsg_cpp,v 1.2 2007/04/06 14:39:34 martynas Exp $
--- mailnews/mime/src/mimemsg.cpp.orig Thu Jun 10 18:58:10 2004
+++ mailnews/mime/src/mimemsg.cpp Fri Apr 6 17:27:27 2007
@@ -522,7 +522,7 @@ MimeMessage_close_headers (MimeObject *obj)
{
PRUint32 flags = 0;
char dummy = 0;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.2 2007/03/26 20:41:37 martynas Exp $
--- modules/libpref/src/init/all.js.orig Fri Jan 5 03:04:33 2007
+++ modules/libpref/src/init/all.js Fri Feb 23 21:41:00 2007
@@ -1932,33 +1932,33 @@ pref("font.name.monospace.ko", "monospac
$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.3 2007/04/06 14:39:34 martynas Exp $
--- modules/libpref/src/init/all.js.orig Mon Jan 8 03:45:40 2007
+++ modules/libpref/src/init/all.js Fri Apr 6 17:27:27 2007
@@ -1932,33 +1932,33 @@ pref("font.name.monospace.ko", "monospace");
// th

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-xpcom_components_nsNativeComponentLoader_cpp,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- xpcom/components/nsNativeComponentLoader.cpp.orig Thu Jul 14 20:42:57 2005
+++ xpcom/components/nsNativeComponentLoader.cpp Sat Sep 10 19:45:17 2005
@@ -668,7 +668,7 @@ nsNativeComponentLoader::AutoRegisterCom
$OpenBSD: patch-xpcom_components_nsNativeComponentLoader_cpp,v 1.2 2007/04/06 14:39:34 martynas Exp $
--- xpcom/components/nsNativeComponentLoader.cpp.orig Fri Dec 22 15:51:03 2006
+++ xpcom/components/nsNativeComponentLoader.cpp Fri Apr 6 17:27:27 2007
@@ -668,7 +668,7 @@ nsNativeComponentLoader::AutoRegisterComponent(PRInt32
".shlb", /* Mac ? */
".dso", /* Unix ? */
".dylib", /* Unix: Mach */

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Sun Dec 3 22:24:17 2006
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Thu Dec 21 23:21:55 2006
@@ -68,6 +68,12 @@ CPPSRCS := xptcinvoke_unixish_x86.cpp x
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.2 2007/04/06 14:39:34 martynas Exp $
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Fri Dec 22 15:51:03 2006
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Fri Apr 6 17:28:01 2007
@@ -68,6 +68,12 @@ CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixi
endif
endif
#
@ -14,7 +14,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.1.1.1 2006/12/
# New code for Linux, et. al., with gcc
# Migrate other platforms here after testing
#
@@ -129,6 +135,12 @@ CPPSRCS := xptcinvoke_osf1_alpha.cpp xp
@@ -129,6 +135,12 @@ CPPSRCS := xptcinvoke_osf1_alpha.cpp xptcstubs_osf1_a
ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
endif
#
@ -27,7 +27,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.1.1.1 2006/12/
# Linux/Alpha
#
ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))
@@ -278,6 +290,14 @@ ASFILES := xptcinvoke_asm_ppc_netbsd.s
@@ -278,6 +290,14 @@ ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_
endif
#