# This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # mozilla/ # mozilla/files # mozilla/files/patch-xptcall-ia64 # mozilla/files/patch-xptcall-amd64 # mozilla/files/patch-xptcall-alpha # mozilla/files/patch-xpfe_bootstrap_mozilla.in # mozilla/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc # mozilla/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp # mozilla/files/patch-security::coreconf::FreeBSD.mk # mozilla/files/patch-qt # mozilla/files/mozconfig.in # mozilla/files/patch-sysnss # mozilla/files/patch-xptcall-sparc64 # mozilla/files/patch-libm # mozilla/files/patch-gfx-src-gtk-Makefile.in # mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in # mozilla/files/patch-extensions_negotiateauth_Makefile.in # mozilla/files/patch-config_autoconf.mk.in # mozilla/files/patch-config::rules.mk # mozilla/files/patch-config::mkdepend::Makefile.in # mozilla/files/patch-config-mkdepend-imakemdep.h # mozilla/files/patch-build_unix_run-mozilla.sh # mozilla/files/patch-bugzilla149334 # mozilla/files/patch-Makefile.in # mozilla/files/patch-Double.cpp # mozilla/files/mozilla.desktop.in # mozilla/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c # mozilla/files/mozconfig-generic.in # mozilla/pkg-deinstall.in # mozilla/pkg-descr # mozilla/distinfo # mozilla/Makefile # mozilla/pkg-install.in # mozilla/Makefile.common # echo c - mozilla/ mkdir -p mozilla/ > /dev/null 2>&1 echo c - mozilla/files mkdir -p mozilla/files > /dev/null 2>&1 echo x - mozilla/files/patch-xptcall-ia64 sed 's/^X//' >mozilla/files/patch-xptcall-ia64 << 'END-of-mozilla/files/patch-xptcall-ia64' X--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 X+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 X@@ -8,6 +8,7 @@ X // Section has executable code X .section .text, "ax","progbits" X // procedure named 'XPTC_InvokeByIndex' X+ .global XPTC_InvokeByIndex X .proc XPTC_InvokeByIndex X // manual bundling X .explicit X@@ -24,7 +25,7 @@ X X // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, X // PRUint32 paramCount, nsXPTCVariant* params); X-XPTC_InvokeByIndex:: X+XPTC_InvokeByIndex: X .prologue X .save ar.pfs, r37 X // allocate 4 input args, 6 local args, and 8 output args X--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003 X+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003 X@@ -6,6 +6,7 @@ X // Section has executable code X .section .text, "ax","progbits" X // procedure named 'SharedStub' X+ .global SharedStub X .proc SharedStub X // manual bundling X .explicit X@@ -14,7 +15,7 @@ X // .exclass PrepareAndDispatch, @fullyvisible X .type PrepareAndDispatch,@function X X-SharedStub:: X+SharedStub: X // 9 arguments, first 8 are the input arguments of previous X // function call. The last one is methodIndex, and is passed in memory X .prologue END-of-mozilla/files/patch-xptcall-ia64 echo x - mozilla/files/patch-xptcall-amd64 sed 's/^X//' >mozilla/files/patch-xptcall-amd64 << 'END-of-mozilla/files/patch-xptcall-amd64' X--- /dev/null Wed Dec 31 16:00:00 1969 X+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003 X@@ -0,0 +1,174 @@ X+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ X+// Platform specific code to invoke XPCOM methods on native objects X+ X+#include "xptcprivate.h" X+ X+// 6 integral parameters are passed in registers X+const PRUint32 GPR_COUNT = 6; X+ X+// 8 floating point parameters are passed in SSE registers X+const PRUint32 FPR_COUNT = 8; X+ X+// Remember that these 'words' are 64-bit long X+static inline void X+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s, X+ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack) X+{ X+ nr_gpr = 1; // skip one GP register for 'that' X+ nr_fpr = 0; X+ nr_stack = 0; X+ X+ /* Compute number of eightbytes of class MEMORY. */ X+ for (uint32 i = 0; i < paramCount; i++, s++) { X+ if (!s->IsPtrData() X+ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) { X+ if (nr_fpr < FPR_COUNT) X+ nr_fpr++; X+ else X+ nr_stack++; X+ } X+ else { X+ if (nr_gpr < GPR_COUNT) X+ nr_gpr++; X+ else X+ nr_stack++; X+ } X+ } X+} X+ X+static void X+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s, X+ PRUint64 * gpregs, double * fpregs) X+{ X+ PRUint32 nr_gpr = 1; // skip one GP register for 'that' X+ PRUint32 nr_fpr = 0; X+ PRUint64 value; X+ X+ for (uint32 i = 0; i < paramCount; i++, s++) { X+ if (s->IsPtrData()) X+ value = (PRUint64) s->ptr; X+ else { X+ switch (s->type) { X+ case nsXPTType::T_FLOAT: break; X+ case nsXPTType::T_DOUBLE: break; X+ case nsXPTType::T_I8: value = s->val.i8; break; X+ case nsXPTType::T_I16: value = s->val.i16; break; X+ case nsXPTType::T_I32: value = s->val.i32; break; X+ case nsXPTType::T_I64: value = s->val.i64; break; X+ case nsXPTType::T_U8: value = s->val.u8; break; X+ case nsXPTType::T_U16: value = s->val.u16; break; X+ case nsXPTType::T_U32: value = s->val.u32; break; X+ case nsXPTType::T_U64: value = s->val.u64; break; X+ case nsXPTType::T_BOOL: value = s->val.b; break; X+ case nsXPTType::T_CHAR: value = s->val.c; break; X+ case nsXPTType::T_WCHAR: value = s->val.wc; break; X+ default: value = (PRUint64) s->val.p; break; X+ } X+ } X+ X+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { X+ if (nr_fpr < FPR_COUNT) X+ fpregs[nr_fpr++] = s->val.d; X+ else { X+ *((double *)d) = s->val.d; X+ d++; X+ } X+ } X+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { X+ if (nr_fpr < FPR_COUNT) X+ // The value in %xmm register is already prepared to X+ // be retrieved as a float. Therefore, we pass the X+ // value verbatim, as a double without conversion. X+ fpregs[nr_fpr++] = s->val.d; X+ else { X+ *((float *)d) = s->val.f; X+ d++; X+ } X+ } X+ else { X+ if (nr_gpr < GPR_COUNT) X+ gpregs[nr_gpr++] = value; X+ else X+ *d++ = value; X+ } X+ } X+} X+ X+extern "C" X+XPTC_PUBLIC_API(nsresult) X+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex, X+ PRUint32 paramCount, nsXPTCVariant * params) X+{ X+ PRUint32 nr_gpr, nr_fpr, nr_stack; X+ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack); X+ X+ // Stack, if used, must be 16-bytes aligned X+ if (nr_stack) X+ nr_stack = (nr_stack + 1) & ~1; X+ X+ // Load parameters to stack, if necessary X+ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8); X+ PRUint64 gpregs[GPR_COUNT]; X+ double fpregs[FPR_COUNT]; X+ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs); X+ X+ // Load FPR registers from fpregs[] X+ register double d0 asm("xmm0"); X+ register double d1 asm("xmm1"); X+ register double d2 asm("xmm2"); X+ register double d3 asm("xmm3"); X+ register double d4 asm("xmm4"); X+ register double d5 asm("xmm5"); X+ register double d6 asm("xmm6"); X+ register double d7 asm("xmm7"); X+ X+ switch (nr_fpr) { X+#define ARG_FPR(N) \ X+ case N+1: d##N = fpregs[N]; X+ ARG_FPR(7); X+ ARG_FPR(6); X+ ARG_FPR(5); X+ ARG_FPR(4); X+ ARG_FPR(3); X+ ARG_FPR(2); X+ ARG_FPR(1); X+ ARG_FPR(0); X+ case 0:; X+#undef ARG_FPR X+ } X+ X+ // Load GPR registers from gpregs[] X+ register PRUint64 a0 asm("rdi"); X+ register PRUint64 a1 asm("rsi"); X+ register PRUint64 a2 asm("rdx"); X+ register PRUint64 a3 asm("rcx"); X+ register PRUint64 a4 asm("r8"); X+ register PRUint64 a5 asm("r9"); X+ X+ switch (nr_gpr) { X+#define ARG_GPR(N) \ X+ case N+1: a##N = gpregs[N]; X+ ARG_GPR(5); X+ ARG_GPR(4); X+ ARG_GPR(3); X+ ARG_GPR(2); X+ ARG_GPR(1); X+ case 1: a0 = (PRUint64) that; X+ case 0:; X+#undef ARG_GPR X+ } X+ X+ // Ensure that assignments to SSE registers won't be optimized away X+ asm("" :: X+ "x" (d0), "x" (d1), "x" (d2), "x" (d3), X+ "x" (d4), "x" (d5), "x" (d6), "x" (d7)); X+ X+ // Get pointer to method X+ PRUint64 methodAddress = *((PRUint64 *)that); X+ methodAddress += 8 * methodIndex; X+ methodAddress = *((PRUint64 *)methodAddress); X+ X+ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64); X+ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5); X+ return result; X+} X--- /dev/null Wed Dec 31 16:00:00 1969 X+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003 X@@ -0,0 +1,206 @@ X+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ X+ X+// Implement shared vtbl methods. X+ X+#include "xptcprivate.h" X+ X+// The Linux/x86-64 ABI passes the first 6 integral parameters and the X+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx, X+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the X+// caller. The rest of the parameters are passed in the callers stack X+// area. X+ X+const PRUint32 PARAM_BUFFER_COUNT = 16; X+const PRUint32 GPR_COUNT = 6; X+const PRUint32 FPR_COUNT = 8; X+ X+// PrepareAndDispatch() is called by SharedStub() and calls the actual method. X+// X+// - 'args[]' contains the arguments passed on stack X+// - 'gpregs[]' contains the arguments passed in integer registers X+// - 'fpregs[]' contains the arguments passed in floating point registers X+// X+// The parameters are mapped into an array of type 'nsXPTCMiniVariant' X+// and then the method gets called. X+ X+extern "C" nsresult X+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex, X+ PRUint64 * args, PRUint64 * gpregs, double *fpregs) X+{ X+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; X+ nsXPTCMiniVariant* dispatchParams = NULL; X+ nsIInterfaceInfo* iface_info = NULL; X+ const nsXPTMethodInfo* info; X+ PRUint32 paramCount; X+ PRUint32 i; X+ nsresult result = NS_ERROR_FAILURE; X+ X+ NS_ASSERTION(self,"no self"); X+ X+ self->GetInterfaceInfo(&iface_info); X+ NS_ASSERTION(iface_info,"no interface info"); X+ if (! iface_info) X+ return NS_ERROR_UNEXPECTED; X+ X+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); X+ NS_ASSERTION(info,"no method info"); X+ if (! info) X+ return NS_ERROR_UNEXPECTED; X+ X+ paramCount = info->GetParamCount(); X+ X+ // setup variant array pointer X+ if(paramCount > PARAM_BUFFER_COUNT) X+ dispatchParams = new nsXPTCMiniVariant[paramCount]; X+ else X+ dispatchParams = paramBuffer; X+ X+ NS_ASSERTION(dispatchParams,"no place for params"); X+ if (! dispatchParams) X+ return NS_ERROR_OUT_OF_MEMORY; X+ X+ PRUint64* ap = args; X+ PRUint32 nr_gpr = 1; // skip one GPR register for 'that' X+ PRUint32 nr_fpr = 0; X+ PRUint64 value; X+ X+ for(i = 0; i < paramCount; i++) { X+ const nsXPTParamInfo& param = info->GetParam(i); X+ const nsXPTType& type = param.GetType(); X+ nsXPTCMiniVariant* dp = &dispatchParams[i]; X+ X+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) { X+ if (nr_fpr < FPR_COUNT) X+ dp->val.d = fpregs[nr_fpr++]; X+ else X+ dp->val.d = *(double*) ap++; X+ continue; X+ } X+ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) { X+ if (nr_fpr < FPR_COUNT) X+ // The value in %xmm register is already prepared to X+ // be retrieved as a float. Therefore, we pass the X+ // value verbatim, as a double without conversion. X+ dp->val.d = *(double*) ap++; X+ else X+ dp->val.f = *(float*) ap++; X+ continue; X+ } X+ else { X+ if (nr_gpr < GPR_COUNT) X+ value = gpregs[nr_gpr++]; X+ else X+ value = *ap++; X+ } X+ X+ if (param.IsOut() || !type.IsArithmetic()) { X+ dp->val.p = (void*) value; X+ continue; X+ } X+ X+ switch (type) { X+ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break; X+ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break; X+ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break; X+ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break; X+ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break; X+ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break; X+ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break; X+ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break; X+ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break; X+ case nsXPTType::T_CHAR: dp->val.c = (char) value; break; X+ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break; X+ X+ default: X+ NS_ASSERTION(0, "bad type"); X+ break; X+ } X+ } X+ X+ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams); X+ X+ NS_RELEASE(iface_info); X+ X+ if (dispatchParams != paramBuffer) X+ delete [] dispatchParams; X+ X+ return result; X+} X+ X+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ X+// Linux/x86-64 uses gcc >= 3.1 X+#define STUB_ENTRY(n) \ X+asm(".section \".text\"\n\t" \ X+ ".align 2\n\t" \ X+ ".if " #n " < 10\n\t" \ X+ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ X+ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \ X+ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \ X+ ".elseif " #n " < 100\n\t" \ X+ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ X+ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \ X+ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \ X+ ".elseif " #n " < 1000\n\t" \ X+ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ X+ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \ X+ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \ X+ ".else\n\t" \ X+ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \ X+ ".endif\n\t" \ X+ "movl $" #n ", %eax\n\t" \ X+ "jmp SharedStub\n\t" \ X+ ".if " #n " < 10\n\t" \ X+ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ X+ ".elseif " #n " < 100\n\t" \ X+ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ X+ ".else\n\t" \ X+ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ X+ ".endif"); X+ X+// static nsresult SharedStub(PRUint32 methodIndex) X+asm(".section \".text\"\n\t" X+ ".align 2\n\t" X+ ".type SharedStub,@function\n\t" X+ "SharedStub:\n\t" X+ // make room for gpregs (48), fpregs (64) X+ "pushq %rbp\n\t" X+ "movq %rsp,%rbp\n\t" X+ "subq $112,%rsp\n\t" X+ // save GP registers X+ "movq %rdi,-112(%rbp)\n\t" X+ "movq %rsi,-104(%rbp)\n\t" X+ "movq %rdx, -96(%rbp)\n\t" X+ "movq %rcx, -88(%rbp)\n\t" X+ "movq %r8 , -80(%rbp)\n\t" X+ "movq %r9 , -72(%rbp)\n\t" X+ "leaq -112(%rbp),%rcx\n\t" X+ // save FP registers X+ "movsd %xmm0,-64(%rbp)\n\t" X+ "movsd %xmm1,-56(%rbp)\n\t" X+ "movsd %xmm2,-48(%rbp)\n\t" X+ "movsd %xmm3,-40(%rbp)\n\t" X+ "movsd %xmm4,-32(%rbp)\n\t" X+ "movsd %xmm5,-24(%rbp)\n\t" X+ "movsd %xmm6,-16(%rbp)\n\t" X+ "movsd %xmm7, -8(%rbp)\n\t" X+ "leaq -64(%rbp),%r8\n\t" X+ // rdi has the 'self' pointer already X+ "movl %eax,%esi\n\t" X+ "leaq 16(%rbp),%rdx\n\t" X+ "call PrepareAndDispatch\n\t" X+ "leave\n\t" X+ "ret\n\t" X+ ".size SharedStub,.-SharedStub"); X+ X+#define SENTINEL_ENTRY(n) \ X+nsresult nsXPTCStubBase::Sentinel##n() \ X+{ \ X+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ X+ return NS_ERROR_NOT_IMPLEMENTED; \ X+} X+ X+#include "xptcstubsdef.inc" X+ X+#else X+#error "can't find a compiler to use" X+#endif /* __GNUC__ */ END-of-mozilla/files/patch-xptcall-amd64 echo x - mozilla/files/patch-xptcall-alpha sed 's/^X//' >mozilla/files/patch-xptcall-alpha << 'END-of-mozilla/files/patch-xptcall-alpha' X--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 X+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 X@@ -0,0 +1,184 @@ X+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ X+/* ***** BEGIN LICENSE BLOCK ***** X+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 X+ * X+ * The contents of this file are subject to the Netscape Public License X+ * Version 1.1 (the "License"); you may not use this file except in X+ * compliance with the License. You may obtain a copy of the License at X+ * http://www.mozilla.org/NPL/ X+ * X+ * Software distributed under the License is distributed on an "AS IS" basis, X+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License X+ * for the specific language governing rights and limitations under the X+ * License. X+ * X+ * The Original Code is mozilla.org code. X+ * X+ * The Initial Developer of the Original Code is X+ * Netscape Communications Corporation. X+ * Portions created by the Initial Developer are Copyright (C) 1998 X+ * the Initial Developer. All Rights Reserved. X+ * X+ * Contributor(s): X+ * X+ * Alternatively, the contents of this file may be used under the terms of X+ * either the GNU General Public License Version 2 or later (the "GPL"), or X+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), X+ * in which case the provisions of the GPL or the LGPL are applicable instead X+ * of those above. If you wish to allow use of your version of this file only X+ * under the terms of either the GPL or the LGPL, and not to allow others to X+ * use your version of this file under the terms of the NPL, indicate your X+ * decision by deleting the provisions above and replace them with the notice X+ * and other provisions required by the GPL or the LGPL. If you do not delete X+ * the provisions above, a recipient may use your version of this file under X+ * the terms of any one of the NPL, the GPL or the LGPL. X+ * X+ * ***** END LICENSE BLOCK ***** */ X+ X+/* Platform specific code to invoke XPCOM methods on native objects */ X+ X+/* contributed by Glen Nakamura */ X+ X+#include "xptcprivate.h" X+ X+/* Prototype specifies unmangled function name and disables unused warning */ X+static void X+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) X+__asm__("invoke_copy_to_stack") __attribute__((unused)); X+ X+static void X+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) X+{ X+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer X+ X+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) X+ { X+ if(s->IsPtrData()) X+ { X+ *d = (PRUint64)s->ptr; X+ continue; X+ } X+ switch(s->type) X+ { X+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; X+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; X+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; X+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; X+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; X+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; X+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; X+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; X+ case nsXPTType::T_FLOAT : X+ if(i < NUM_ARG_REGS) X+ { X+ // convert floats to doubles if they are to be passed X+ // via registers so we can just deal with doubles later X+ union { PRUint64 u64; double d; } t; X+ t.d = (double)s->val.f; X+ *d = t.u64; X+ } X+ else X+ // otherwise copy to stack normally X+ *d = (PRUint64)s->val.u32; X+ break; X+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; X+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; X+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; X+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; X+ default: X+ // all the others are plain pointer types X+ *d = (PRUint64)s->val.p; X+ break; X+ } X+ } X+} X+ X+/* X+ * XPTC_PUBLIC_API(nsresult) X+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, X+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) X+ */ X+__asm__( X+ "#### XPTC_InvokeByIndex ####\n" X+".text\n\t" X+ ".align 5\n\t" X+ ".globl XPTC_InvokeByIndex\n\t" X+ ".ent XPTC_InvokeByIndex\n" X+"XPTC_InvokeByIndex:\n\t" X+ ".frame $15,32,$26,0\n\t" X+ ".mask 0x4008000,-32\n\t" X+ "ldgp $29,0($27)\n" X+"$XPTC_InvokeByIndex..ng:\n\t" X+ "subq $30,32,$30\n\t" X+ "stq $26,0($30)\n\t" X+ "stq $15,8($30)\n\t" X+ "bis $30,$30,$15\n\t" X+ ".prologue 1\n\t" X+ X+ /* X+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 X+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters X+ * is required for storage of those passed via registers. X+ */ X+ X+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ X+ "cmplt $2,$18,$1\n\t" X+ "cmovne $1,$18,$2\n\t" X+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ X+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ X+ "subq $30,$1,$30\n\t" X+ X+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ X+ "stq $17,16($15)\n\t" /* save "methodIndex" */ X+ X+ "addq $30,8,$16\n\t" /* pass stack pointer */ X+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ X+ "bis $19,$19,$18\n\t" /* pass "params" */ X+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ X+ X+ /* X+ * Copy the first 6 parameters to registers and remove from stack frame. X+ * Both the integer and floating point registers are set for each parameter X+ * except the first which is the "this" pointer. (integer only) X+ * The floating point registers are all set as doubles since the X+ * invoke_copy_to_stack function should have converted the floats. X+ */ X+ "ldq $16,0($30)\n\t" /* integer registers */ X+ "ldq $17,8($30)\n\t" X+ "ldq $18,16($30)\n\t" X+ "ldq $19,24($30)\n\t" X+ "ldq $20,32($30)\n\t" X+ "ldq $21,40($30)\n\t" X+ "ldt $f17,8($30)\n\t" /* floating point registers */ X+ "ldt $f18,16($30)\n\t" X+ "ldt $f19,24($30)\n\t" X+ "ldt $f20,32($30)\n\t" X+ "ldt $f21,40($30)\n\t" X+ X+ "addq $30,48,$30\n\t" /* remove params from stack */ X+ X+ /* X+ * Call the virtual function with the constructed stack frame. X+ */ X+ "bis $16,$16,$1\n\t" /* load "this" */ X+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ X+ "ldq $1,0($1)\n\t" /* load vtable */ X+#if 0 X+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ X+#else X+ "mulq $2, 8, $2\n\t" X+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ X+#endif X+ "addq $1,$2,$1\n\t" X+ "ldq $27,0($1)\n\t" /* load address of function */ X+ "jsr $26,($27),0\n\t" /* call virtual function */ X+ "ldgp $29,0($26)\n\t" X+ X+ "bis $15,$15,$30\n\t" X+ "ldq $26,0($30)\n\t" X+ "ldq $15,8($30)\n\t" X+ "addq $30,32,$30\n\t" X+ "ret $31,($26),1\n\t" X+ ".end XPTC_InvokeByIndex" X+ ); X+ X--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 X+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 X@@ -0,0 +1,269 @@ X+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ X+/* ***** BEGIN LICENSE BLOCK ***** X+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 X+ * X+ * The contents of this file are subject to the Netscape Public License X+ * Version 1.1 (the "License"); you may not use this file except in X+ * compliance with the License. You may obtain a copy of the License at X+ * http://www.mozilla.org/NPL/ X+ * X+ * Software distributed under the License is distributed on an "AS IS" basis, X+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License X+ * for the specific language governing rights and limitations under the X+ * License. X+ * X+ * The Original Code is mozilla.org code. X+ * X+ * The Initial Developer of the Original Code is X+ * Netscape Communications Corporation. X+ * Portions created by the Initial Developer are Copyright (C) 1999 X+ * the Initial Developer. All Rights Reserved. X+ * X+ * Contributor(s): X+ * X+ * Alternatively, the contents of this file may be used under the terms of X+ * either the GNU General Public License Version 2 or later (the "GPL"), or X+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), X+ * in which case the provisions of the GPL or the LGPL are applicable instead X+ * of those above. If you wish to allow use of your version of this file only X+ * under the terms of either the GPL or the LGPL, and not to allow others to X+ * use your version of this file under the terms of the NPL, indicate your X+ * decision by deleting the provisions above and replace them with the notice X+ * and other provisions required by the GPL or the LGPL. If you do not delete X+ * the provisions above, a recipient may use your version of this file under X+ * the terms of any one of the NPL, the GPL or the LGPL. X+ * X+ * ***** END LICENSE BLOCK ***** */ X+ X+/* Implement shared vtbl methods. */ X+ X+/* contributed by Glen Nakamura */ X+ X+#include X+#include X+#include "xptcprivate.h" X+ X+/* Prototype specifies unmangled function name and disables unused warning */ X+static nsresult X+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) X+__asm__("PrepareAndDispatch") __attribute__((unused)); X+ X+static nsresult X+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) X+{ X+ const PRUint8 PARAM_BUFFER_COUNT = 16; X+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer X+ X+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; X+ nsXPTCMiniVariant* dispatchParams = NULL; X+ nsIInterfaceInfo* iface_info = NULL; X+ const nsXPTMethodInfo* info; X+ PRUint8 paramCount; X+ PRUint8 i; X+ nsresult result = NS_ERROR_FAILURE; X+ X+ NS_ASSERTION(self,"no self"); X+ X+ self->GetInterfaceInfo(&iface_info); X+ NS_ASSERTION(iface_info,"no interface info"); X+ X+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); X+ NS_ASSERTION(info,"no interface info"); X+ X+ paramCount = info->GetParamCount(); X+ X+ // setup variant array pointer X+ if(paramCount > PARAM_BUFFER_COUNT) X+ dispatchParams = new nsXPTCMiniVariant[paramCount]; X+ else X+ dispatchParams = paramBuffer; X+ NS_ASSERTION(dispatchParams,"no place for params"); X+ X+ // args[0] to args[NUM_ARG_REGS] hold floating point register values X+ PRUint64* ap = args + NUM_ARG_REGS; X+ for(i = 0; i < paramCount; i++, ap++) X+ { X+ const nsXPTParamInfo& param = info->GetParam(i); X+ const nsXPTType& type = param.GetType(); X+ nsXPTCMiniVariant* dp = &dispatchParams[i]; X+ X+ if(param.IsOut() || !type.IsArithmetic()) X+ { X+ dp->val.p = (void*) *ap; X+ continue; X+ } X+ // else X+ switch(type) X+ { X+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; X+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; X+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; X+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; X+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; X+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; X+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; X+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; X+ case nsXPTType::T_FLOAT : X+ if(i < NUM_ARG_REGS) X+ { X+ // floats passed via registers are stored as doubles X+ // in the first NUM_ARG_REGS entries in args X+ dp->val.u64 = (PRUint64) args[i]; X+ dp->val.f = (float) dp->val.d; // convert double to float X+ } X+ else X+ dp->val.u32 = (PRUint32) *ap; X+ break; X+ case nsXPTType::T_DOUBLE : X+ // doubles passed via registers are also stored X+ // in the first NUM_ARG_REGS entries in args X+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; X+ break; X+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; X+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; X+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; X+ default: X+ NS_ASSERTION(0, "bad type"); X+ break; X+ } X+ } X+ X+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); X+ X+ NS_RELEASE(iface_info); X+ X+ if(dispatchParams != paramBuffer) X+ delete [] dispatchParams; X+ X+ return result; X+} X+ X+/* X+ * SharedStub() X+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is X+ * passed to this function via $1 to preserve the argument registers. X+ */ X+__asm__( X+ "#### SharedStub ####\n" X+".text\n\t" X+ ".align 5\n\t" X+ ".ent SharedStub\n" X+"SharedStub:\n\t" X+ ".frame $30,96,$26,0\n\t" X+ ".mask 0x4000000,-96\n\t" X+ "ldgp $29,0($27)\n" X+"$SharedStub..ng:\n\t" X+ "subq $30,96,$30\n\t" X+ "stq $26,0($30)\n\t" X+ ".prologue 1\n\t" X+ X+ /* X+ * Store arguments passed via registers to the stack. X+ * Floating point registers are stored as doubles and converted X+ * to floats in PrepareAndDispatch if necessary. X+ */ X+ "stt $f17,16($30)\n\t" /* floating point registers */ X+ "stt $f18,24($30)\n\t" X+ "stt $f19,32($30)\n\t" X+ "stt $f20,40($30)\n\t" X+ "stt $f21,48($30)\n\t" X+ "stq $17,56($30)\n\t" /* integer registers */ X+ "stq $18,64($30)\n\t" X+ "stq $19,72($30)\n\t" X+ "stq $20,80($30)\n\t" X+ "stq $21,88($30)\n\t" X+ X+ /* X+ * Call PrepareAndDispatch function. X+ */ X+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ X+ "addq $30,16,$18\n\t" /* pass "args" */ X+ "bsr $26,$PrepareAndDispatch..ng\n\t" X+ X+ "ldq $26,0($30)\n\t" X+ "addq $30,96,$30\n\t" X+ "ret $31,($26),1\n\t" X+ ".end SharedStub" X+ ); X+ X+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ X+/* X+ * nsresult nsXPTCStubBase::Stub##n() X+ * Sets register $1 to "methodIndex" and jumps to SharedStub. X+ */ X+#define STUB_ENTRY(n) \ X+__asm__( \ X+ "#### Stub"#n" ####\n" \ X+".text\n\t" \ X+ ".align 5\n\t" \ X+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ X+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ X+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ X+ ".frame $30,0,$26,0\n\t" \ X+ "ldgp $29,0($27)\n" \ X+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ X+ ".prologue 1\n\t" \ X+ "lda $1,"#n"\n\t" \ X+ "br $31,$SharedStub..ng\n\t" \ X+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ X+ ); \ X+__asm__( \ X+ "#### Stub"#n" ####\n" \ X+".text\n\t" \ X+ ".align 5\n\t" \ X+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ X+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ X+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ X+ ".frame $30,0,$26,0\n\t" \ X+ "ldgp $29,0($27)\n" \ X+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ X+ ".prologue 1\n\t" \ X+ "lda $1,"#n"\n\t" \ X+ "br $31,$SharedStub..ng\n\t" \ X+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ X+ ); \ X+__asm__( \ X+ "#### Stub"#n" ####\n" \ X+".text\n\t" \ X+ ".align 5\n\t" \ X+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ X+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ X+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ X+ ".frame $30,0,$26,0\n\t" \ X+ "ldgp $29,0($27)\n" \ X+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ X+ ".prologue 1\n\t" \ X+ "lda $1,"#n"\n\t" \ X+ "br $31,$SharedStub..ng\n\t" \ X+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ X+ ); X+#else X+/* X+ * nsresult nsXPTCStubBase::Stub##n() X+ * Sets register $1 to "methodIndex" and jumps to SharedStub. X+ */ X+#define STUB_ENTRY(n) \ X+nsresult nsXPTCStubBase::Stub##n() \ X+{ \ X+ nsresult result; \ X+__asm__ __volatile__( \ X+ "ldah $29,0($27)\n\t" \ X+ "lda $29,0($29)\n\t" \ X+ "lda $1, "#n"\n\t" \ X+ "br $31, $SharedStub..ng\n\t" \ X+ "mov $0, %0\n\t" \ X+ : "=r" (result) \ X+ ); \ X+ return result; \ X+} X+#endif X+ X+#define SENTINEL_ENTRY(n) \ X+nsresult nsXPTCStubBase::Sentinel##n() \ X+{ \ X+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ X+ return NS_ERROR_NOT_IMPLEMENTED; \ X+} X+ X+#include "xptcstubsdef.inc" X+ END-of-mozilla/files/patch-xptcall-alpha echo x - mozilla/files/patch-xpfe_bootstrap_mozilla.in sed 's/^X//' >mozilla/files/patch-xpfe_bootstrap_mozilla.in << 'END-of-mozilla/files/patch-xpfe_bootstrap_mozilla.in' X--- xpfe/bootstrap/mozilla.in.orig Fri Feb 20 19:13:46 2004 X+++ xpfe/bootstrap/mozilla.in Tue Mar 22 22:40:43 2005 X@@ -29,141 +29,324 @@ X ## the mozilla-bin binary to work. X ## X X+# X+# MOZ_PIS, "Mozilla Plugable Init Scripts" X+# MOZ_PIS_ is the name space used X+# These variables and there meaning are specified in X+# mozilla/xpfe/bootstrap/init.d/README X moz_pis_startstop_scripts() X { X- MOZ_USER_DIR="%MOZ_USER_DIR%" X- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" X- # These variables and there meaning are specified in X- # mozilla/xpfe/bootstrap/init.d/README X- MOZ_PIS_API=2 X- MOZ_PIS_MOZBINDIR="${dist_bin}" X- MOZ_PIS_SESSION_PID="$$" X- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" X- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR X- X- case "${1}" in X- "start") X- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do X- if [ -x "${curr_pis}" ] ; then X- case "${curr_pis}" in X- *.sh) . "${curr_pis}" ;; X- *) "${curr_pis}" "start" ;; X- esac X- fi X- done X- ;; X- "stop") X- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do X- if [ -x "${curr_pis}" ] ; then X- case "${curr_pis}" in X- *.sh) . "${curr_pis}" ;; X- *) "${curr_pis}" "stop" ;; X- esac X- fi X- done X- ;; X- *) X- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." X- exit 1 X- ;; X- esac X+ MOZ_PIS_API=2 X+ MOZ_PIS_MOZBINDIR="${dist_bin}" X+ MOZ_PIS_SESSION_PID="$$" X+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" X+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR X+ X+ case "${1}" in X+ "start") X+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \ X+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do X+ if [ -x "${curr_pis}" ]; then X+ case "${curr_pis}" in X+ *.sh) X+ . "${curr_pis}" X+ ;; X+ *) X+ ${curr_pis} "start" X+ ;; X+ esac X+ fi X+ done X+ ;; X+ "stop") X+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \ X+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do X+ if [ -x "${curr_pis}" ]; then X+ case "${curr_pis}" in X+ *.sh) X+ . "${curr_pis}" X+ ;; X+ *) X+ ${curr_pis} "stop" X+ ;; X+ esac X+ fi X+ done X+ ;; X+ *) X+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2 X+ exit 1 X+ ;; X+ esac X } X X #uncomment for debugging X #set -x X X-moz_libdir=%MOZAPPDIR% X-MRE_HOME=%MREDIR% X+# X+# variables X+# X+location="new-tab" X+#MOZILLA_UILOCALE="en-US" X+#MOZILLA_UIREGION="US" X X-# honor MOZILLA_FIVE_HOME if it's there X-if [ -n "$MOZILLA_FIVE_HOME" ] ; then X- dist_bin="$MOZILLA_FIVE_HOME" X-else X- # Use run-mozilla.sh in the current dir if it exists X- # If not, then start resolving symlinks until we find run-mozilla.sh X- found=0 X- progname=$0 X- curdir=`dirname "$progname"` X- run_moz="$curdir/run-mozilla.sh" X- if test -x "$run_moz"; then X- dist_bin=$curdir X+# X+# working definitions X+# X+MOZ_USER_DIR="%MOZ_USER_DIR%" X+moz_libdir="%MOZAPPDIR%" X+MRE_HOME="%MREDIR%" X+ X+debugging= # set the debugging level X+use_openFile="yes" # use openFile() for file/dir X+here=`pwd` X+ X+if [ ! -d "${MRE_HOME}" ]; then X+ # use moz_libdir as MRE_HOME X+ MRE_HOME="${moz_libdir}" X+fi X+export MRE_HOME X+ X+# Use run-mozilla.sh in the current dir if it exists X+# If not, then start resolving symlinks until we find run-mozilla.sh X+found=0 X+progname="$0" X+curdir=`dirname "$progname"` X+progbase=`basename "$progname"` X+run_moz="$curdir/run-mozilla.sh" X+# mozilla must obey MOZILLA_FIVE_HOME X+if [ -n "$MOZILLA_FIVE_HOME" -a -d "$MOZILLA_FIVE_HOME" -a \ X+ -x "$MOZILLA_FIVE_HOME/run-mozilla.sh" ]; then X+ curdir="$MOZILLA_FIVE_HOME" X+ run_moz="$curdir/run-mozilla.sh" X+ dist_bin="$curdir" X found=1 X- else X- here=`/bin/pwd` X- while [ -h "$progname" ]; do X- bn=`basename "$progname"` X- cd `dirname "$progname"` X- progname=`/bin/ls -l "$bn" |sed -e 's/^.* -> //' ` X- if [ ! -x "$progname" ]; then X- break X- fi X- curdir=`dirname "$progname"` X- run_moz="$curdir/run-mozilla.sh" X- if [ -x "$run_moz" ]; then X- cd "$curdir" X- dist_bin=`pwd` X- found=1 X- break X- fi X+elif [ -x "$run_moz" ]; then X+ dist_bin="$curdir" X+ found=1 X+else X+ while [ -h "${progname}" ]; do X+ bn=`basename "${progname}"` X+ cd `dirname "${progname}"` X+ progname=`ls -l "${bn}" | sed -e 's/^.* -> //'` X+ if [ ! -x "$progname" ]; then X+ break X+ fi X+ curdir=`dirname "${progname}"` X+ run_moz="${curdir}/run-mozilla.sh" X+ if [ -x "${run_moz}" ]; then X+ cd "$curdir" X+ dist_bin=`pwd` X+ run_moz="${dist_bin}/run-mozilla.sh" X+ found=1 X+ break X+ fi X done X- cd "$here" X- fi X- if [ $found = 0 ]; then X+ cd "${here}" X+fi X+if [ $found = 0 ]; then X # Check default compile-time libdir X- if [ -x "$moz_libdir/run-mozilla.sh" ]; then X- dist_bin=$moz_libdir X- else X- echo "Cannot find mozilla runtime directory. Exiting." X- exit 1 X- fi X- fi X+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then X+ dist_bin="$moz_libdir" X+ run_moz="${dist_bin}/run-mozilla.sh" X+ else X+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 X+ exit 1 X+ fi X fi X X-script_args="" X-debugging=0 X-MOZILLA_BIN="%MOZILLA-BIN%" X- X+MOZILLA_BIN="${progbase}-bin" X if [ "$OSTYPE" = "beos" ]; then X- mimeset -F $MOZILLA_BIN X+ mimeset -F "$MOZILLA_BIN" X fi X X+# test for binary apps in ${dist_bin} X+if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then X+ MOZILLA_BIN="${dist_bin}/${progbase}-bin" X+else X+ echo "$0: Cannot find mozilla binary executable. Exiting." 1>&2 X+ exit 1 X+fi X+if [ -x "${dist_bin}/mozilla-xremote-client" ]; then X+ MOZ_CLIENT_PROGRAM="${dist_bin}/mozilla-xremote-client -a ${progbase}" X+else X+ MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}" X+fi X+ X+# guest a default remote command X+_remote_cmd="xfeDoCommand(openBrowser)" X+ X+# parse options X+script_args= # null X+moreargs= # null X+target= # null X+ALREADY_RUNNING="test" X pass_arg_count=0 X while [ $# -gt $pass_arg_count ] X do X- case "$1" in X- -p | -pure) X- MOZILLA_BIN="%MOZILLA-BIN%.pure" X- shift X- ;; X- -g | --debug) X- script_args="$script_args -g" X- debugging=1 X- shift X- ;; X- -d | --debugger) X- script_args="$script_args -d $2" X- shift 2 X- ;; X- *) X- # Move the unrecognized argument to the end of the list. X- arg="$1" X- shift X- set -- "$@" "$arg" X- pass_arg_count=`expr $pass_arg_count + 1` X- ;; X- esac X+ if [ -n "${target}" ]; then X+ # well, this can't be the target if not last X+ moreargs="${moreargs} \"${target}\"" X+ target= # null X+ fi X+ case "$1" in X+ # preserve [pP] for profile X+ --pure | -pure) X+ MOZILLA_BIN="${MOZILLA_BIN}.pure" X+ shift X+ ;; X+ -g | --debug) X+ script_args="${script_args} -g" X+ debugging=1 X+ shift X+ ;; X+ -d | --debugger) X+ if [ -n "$2" ]; then X+ script_args="${script_args} -d $2" X+ shift 2 X+ else X+ "$0: ERROR, $1 needs an argument. Exiting" 1>&2 X+ exit 1 X+ fi X+ ;; X+ -[Uu][Ii][Ll]ocale) X+ if [ -n "$2" ]; then X+ uilocale="$2" X+ shift 2 X+ else X+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 X+ exit 1 X+ fi X+ ;; X+ -[Uu][Ii][Rr]egion) X+ if [ -n "$2" ]; then X+ uiregion="$2" X+ shift 2 X+ else X+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 X+ exit 1 X+ fi X+ ;; X+ -browser) X+ # browser is default for mozilla X+ shift X+ ;; X+ -mail) X+ _remote_cmd="xfeDoCommand(openInbox)" X+ moreargs="${moreargs} $1" X+ shift X+ ;; X+ -compose) X+ _remote_cmd="xfeDoCommand(composeMessage)" X+ moreargs="${moreargs} $1" X+ shift X+ ;; X+ -turbo | -nosplash | -quiet) X+ # use remote even with this X+ moreargs="${moreargs} $1" X+ shift X+ ;; X+ -*) X+ # don't use remote with options X+ ALREADY_RUNNING= # null X+ moreargs="${moreargs} $1" X+ shift X+ ;; X+ *) X+ target="$1" X+ shift X+ ;; X+ esac X done X X-export MRE_HOME X+# test for a running copy of firefox X+# seems this is not needed X+#if [-n "${ALREADY_RUNNING}" ]; then X+# if [ -n "${DISPLAY}" ]; then X+# if [ -n "${debugging}" ]; then X+# echo "${run_moz} ${MOZ_CLIENT_PROGRAM} ping()" X+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' && ALREADY_RUNNING="yes" X+# else X+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' >/dev/null 2>&1 && X+# ALREADY_RUNNING="yes" X+# fi X+# elif [ -n "${debugging}" ]; then X+# echo "$0: WARN, no DISPLAY environment" 1>&2 X+# fi X+#fi X+ X+# process target X+if [ -n "${target}" ]; then X+ moreargs="${moreargs} \"${target}\"" X+ if [ -n "${ALREADY_RUNNING}" ]; then X+ if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then X+ if [ `expr "${target}" : '/.*'` -eq 0 ]; then X+ target="${here}/${target}" X+ fi X+ if [ -r "${target}" -o -d "${target}" ]; then X+ [ -n "${use_openFile}" ] || target="file://${target}" X+ else X+ echo "$0: WARN, target: ${target} not an URI/file/dir" 1>&2 X+ ALREADY_RUNNING= # null X+ fi X+ else X+ # an former URI, don't use openFile X+ use_openFile= # null X+ fi X+ fi X+fi X+ X+# try remote protocol if running X+if [ -n "${ALREADY_RUNNING}" ]; then X+ if [ -n "${target}" ]; then X+ if [ -n "${use_openFile}" ]; then X+ _remote_cmd="openFile(${target})" X+ elif [ -n "${location}" ]; then X+ _remote_cmd="openURL(${target},${location})" X+ else X+ _remote_cmd="openURL(${target})" X+ fi X+ fi X+ # FIXME problems with freedesktop StartupNotify X+ if [ -n "${debugging}" ]; then X+ echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}" X+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} && X+ exit 0 X+ else X+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} \ X+ >/dev/null 2>&1 && exit 0 X+ fi X+fi X+ X+# fallback to direct invocation X+ X+# UILocale, UIRegion X+if [ -z "${uilocale}" -a -n "${MOZILLA_UILOCALE}" ]; then X+ uilocale="${MOZILLA_UILOCALE}" X+fi X+if [ -z "${uiregion}" -a -n "${MOZILLA_UIREGION}" ]; then X+ uiregion="${MOZILLA_UIREGION}" X+fi X+if [ -n "${uiregion}" -a -z "${uilocale}" ]; then X+ uilocale="en-US" X+fi X+if [ -n "${uilocale}" ]; then X+ if [ -n "${uiregion}" ]; then X+ moreargs="-UIRegion ${uiregion} ${moreargs}" X+ fi X+ moreargs="-UILocale ${uilocale} ${moreargs}" X+fi X+ X+# real invocation X+eval "set -- ${moreargs}" X X ## Start addon scripts X moz_pis_startstop_scripts "start" X X-if [ $debugging = 1 ] X-then X- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" X+if [ -n "${debugging}" ]; then X+ echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@" X fi X-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" X+${run_moz} ${script_args} ${MOZILLA_BIN} "$@" X exitcode=$? X X ## Stop addon scripts END-of-mozilla/files/patch-xpfe_bootstrap_mozilla.in echo x - mozilla/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc sed 's/^X//' >mozilla/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc << 'END-of-mozilla/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc' X--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 X+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 X@@ -8,7 +8,7 @@ X * 1 is AddRef X * 2 is Release X */ X-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) X+#if !defined(__ia64) X NS_IMETHOD Stub3(); X NS_IMETHOD Stub4(); X NS_IMETHOD Stub5(); END-of-mozilla/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc echo x - mozilla/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp sed 's/^X//' >mozilla/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp << 'END-of-mozilla/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp' X--- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 X+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 X@@ -143,7 +143,7 @@ X PR_END_MACRO X X // Attempt to open libgconf X- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); X+ gconfLib = PR_LoadLibrary("libgconf-2.so"); X ENSURE_LIB(gconfLib); X X GET_LIB_FUNCTION(gconf, gconf_client_get_default); X@@ -151,7 +151,7 @@ X GET_LIB_FUNCTION(gconf, gconf_client_get_bool); X X // Attempt to open libgnome X- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); X+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); X ENSURE_LIB(gnomeLib); X X GET_LIB_FUNCTION(gnome, gnome_url_show); X@@ -160,7 +160,7 @@ X GET_LIB_FUNCTION(gnome, gnome_program_get); X X // Attempt to open libgnomevfs X- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); X+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); X ENSURE_LIB(vfsLib); X X GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); END-of-mozilla/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp echo x - mozilla/files/patch-security::coreconf::FreeBSD.mk sed 's/^X//' >mozilla/files/patch-security::coreconf::FreeBSD.mk << 'END-of-mozilla/files/patch-security::coreconf::FreeBSD.mk' X--- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 X+++ security/coreconf/FreeBSD.mk Thu Jul 8 12:56:24 2004 X@@ -35,16 +35,18 @@ X X include $(CORE_DEPTH)/coreconf/UNIX.mk X X-DEFAULT_COMPILER = gcc X-CC = gcc X-CCC = g++ X+CCC = ${CXX} X RANLIB = ranlib X X ifeq ($(OS_TEST),alpha) X CPU_ARCH = alpha X else X+ifeq ($(OS_TEST),amd64) X+CPU_ARCH = amd64 X+else X CPU_ARCH = x86 X endif X+endif X X OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK X X@@ -71,7 +73,11 @@ X DLL_SUFFIX = so.1.0 X endif X X-MKSHLIB = $(CC) $(DSO_LDOPTS) X+ifneq (,$(filter alpha ia64,$(OS_TEST))) X+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ X+else X+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ X+endif X ifdef MAPFILE X # Add LD options to restrict exported symbols to those in the map file X endif END-of-mozilla/files/patch-security::coreconf::FreeBSD.mk echo x - mozilla/files/patch-qt sed 's/^X//' >mozilla/files/patch-qt << 'END-of-mozilla/files/patch-qt' X--- configure.orig Tue Apr 20 21:39:17 2004 X+++ configure Thu Apr 29 14:01:52 2004 X@@ -9362,7 +9362,7 @@ X echo $ac_n "(cached) $ac_c" 1>&6 X else X ac_save_LIBS="$LIBS" X-LIBS="-liconv $LIBS" X+LIBS="-L$LOCALBASE/lib -liconv $LIBS" X cat > conftest.$ac_ext <&6 X- _ICONV_LIBS="$_ICONV_LIBS -liconv" X+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" X else X echo "$ac_t""no" 1>&6 X echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 X@@ -9403,7 +9403,7 @@ X echo $ac_n "(cached) $ac_c" 1>&6 X else X ac_save_LIBS="$LIBS" X-LIBS="-liconv $LIBS" X+LIBS="-L$LOCALBASE/lib -liconv $LIBS" X cat > conftest.$ac_ext <&6 X- _ICONV_LIBS="$_ICONV_LIBS -liconv" X+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" X else X echo "$ac_t""no" 1>&6 X fi X@@ -12298,9 +12298,9 @@ X X X X-MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth" X+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth" X X-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug tasks" X+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug tasks" X X # Check whether --enable-extensions or --disable-extensions was given. X if test "${enable_extensions+set}" = set; then END-of-mozilla/files/patch-qt echo x - mozilla/files/mozconfig.in sed 's/^X//' >mozilla/files/mozconfig.in << 'END-of-mozilla/files/mozconfig.in' X# $FreeBSD$ X# $MCom$ Xexport MOZ_INTERNAL_LIBART_LGPL=1 Xmk_add_options MOZ_INTERNAL_LIBART_LGPL=1 X Xif test -z "$WITHOUT_MAILNEWS" ; then Xif test -z "$WITHOUT_LDAP" ; then X ac_add_options --enable-ldap Xelse X ac_add_options --disable-ldap Xfi X ac_add_options --enable-mailnews Xelse X ac_add_options --enable-mailnews Xfi # end WITHOUT_MAILNEWS X Xif test -z "$WITH_JAVASCRIPT_DEBUGGER" ; then X ac_add_options --disable-jsd X ac_add_options --disable-dtd-debug Xelse X ac_add_options --enable-jsd X ac_add_options --enable-dtd-debug Xfi # end WITH_JAVASCRIPT_DEBUGGER END-of-mozilla/files/mozconfig.in echo x - mozilla/files/patch-sysnss sed 's/^X//' >mozilla/files/patch-sysnss << 'END-of-mozilla/files/patch-sysnss' X--- Makefile.in Tue Sep 14 16:59:40 2004 X+++ Makefile.in Tue Aug 2 08:26:55 2005 X@@ -102,6 +102,4 @@ X # tier 1 - 3rd party individual libraries X # X-tier_1_dirs += dbm X- X ifndef MOZ_NATIVE_JPEG X tier_1_dirs += jpeg X--- security/manager/Makefile.in Mon Mar 28 19:56:36 2005 X+++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005 X@@ -37,16 +37,7 @@ X SOFTOKEN3_LIB \ X SOFTOKEN3_CHK \ X- LOADABLE_ROOT_MODULE \ X HAVE_FREEBL_MODULES \ X $(NULL) X X-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) X- X-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) X-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) X-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) X-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) X-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk X- X ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) X ifeq (,$(filter i86pc ia64,$(OS_TEST))) X@@ -132,9 +123,4 @@ X .nss.cleaned: .nss.checkout X $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean X- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean X-ifndef SKIP_CHK X- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean X- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean X-endif X touch $@ X X@@ -153,43 +139,4 @@ X ifeq ($(OS_ARCH),WINNT) X cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) X-else X- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) X-endif X- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) X-ifndef SKIP_CHK X- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) X- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) X-endif X-ifndef DISABLE_DIST_GRE X- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST) X-ifndef SKIP_CHK X- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST) X-endif X- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST) X- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST) X- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST) X- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST) X-ifdef HAVE_FREEBL_MODULES X- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST) X- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST) X- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST) X- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST) X-endif X-endif X-ifndef _SKIP_OLD_GRE_INSTALL X- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin X-ifndef SKIP_CHK X- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin X-endif X- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin X- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin X- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin X- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin X-ifdef HAVE_FREEBL_MODULES X- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin X- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin X- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin X- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin X-endif X endif X $(MAKE) -C boot $@ X@@ -200,18 +147,4 @@ X X install:: X- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) X-ifndef SKIP_CHK X- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) X-endif X- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) X- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) X- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) X- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) X-ifdef HAVE_FREEBL_MODULES X- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) X- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) X- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) X- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) X-endif X $(MAKE) -C boot $@ X $(MAKE) -C ssl $@ X@@ -227,9 +160,4 @@ X endif X $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean X- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean X-ifndef SKIP_CHK X- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean X- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean X-endif X X echo-requires-recursive:: X--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 X+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 X@@ -117,5 +117,5 @@ X # Use local includes because they are inserted before INCLUDES X # so that Mozilla's nss.h is used, not glibc's X-LOCAL_INCLUDES += -I$(DIST)/public/nss \ X+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ X $(NULL) X X--- config/config.mk Tue Oct 12 00:11:11 2004 X+++ config/config.mk Tue Aug 2 09:19:18 2005 X@@ -170,5 +170,4 @@ X NSS_LIBS = \ X $(LIBS_DIR) \ X- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ X -lsmime3 \ X -lssl3 \ X@@ -189,11 +188,5 @@ X endif X X-NSS_DEP_LIBS = \ X- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ X- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ X- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ X- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ X- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ X- $(NULL) X+NSS_DEP_LIBS = X X MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) X--- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 X+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 X@@ -88,4 +88,8 @@ X } X X+#include X+#include X+#include X+ X #ifdef PR_LOGGING X PRLogModuleInfo* gPIPNSSLog = nsnull; X@@ -406,4 +410,5 @@ X const char *possible_ckbi_locations[] = { X NS_GRE_DIR, X+ NS_UNIX_LIB_DIR, X NS_XPCOM_CURRENT_PROCESS_DIR X }; X@@ -419,5 +424,5 @@ X } X X- char *fullModuleName = nsnull; X+ char *fullModuleName; X #ifdef XP_MAC X nsCAutoString nativePath; X@@ -431,4 +436,12 @@ X fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); X #endif X+ if (fullModuleName == nsnull) X+ continue; X+ struct stat sb; X+ if (stat(fullModuleName, &sb)) { X+ if (errno != ENOENT) X+ perror(fullModuleName); X+ continue; X+ } X /* If a module exists with the same name, delete it. */ X NS_ConvertUCS2toUTF8 modNameUTF8(modName); END-of-mozilla/files/patch-sysnss echo x - mozilla/files/patch-xptcall-sparc64 sed 's/^X//' >mozilla/files/patch-xptcall-sparc64 << 'END-of-mozilla/files/patch-xptcall-sparc64' X--- /dev/null Mon May 26 13:22:00 2003 X+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 X@@ -0,0 +1,123 @@ X+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- X+ * X+ * The contents of this file are subject to the Mozilla Public X+ * License Version 1.1 (the "License"); you may not use this file X+ * except in compliance with the License. You may obtain a copy of X+ * the License at http://www.mozilla.org/MPL/ X+ * X+ * Software distributed under the License is distributed on an "AS X+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or X+ * implied. See the License for the specific language governing X+ * rights and limitations under the License. X+ * X+ * The Original Code is mozilla.org code. X+ * X+ * The Initial Developer of the Original Code is Netscape X+ * Communications Corporation. Portions created by Netscape are X+ * Copyright (C) 2001 Netscape Communications Corporation. All X+ * Rights Reserved. X+ * X+ * Contributor(s): X+ * Stuart Parmenter X+ */ X+ X+/* Implement shared vtbl methods. */ X+ X+#include "xptcprivate.h" X+ X+#if defined(sparc) || defined(__sparc__) X+ X+extern "C" nsresult X+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) X+{ X+ X+#define PARAM_BUFFER_COUNT 16 X+ X+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; X+ nsXPTCMiniVariant* dispatchParams = NULL; X+ nsIInterfaceInfo* iface_info = NULL; X+ const nsXPTMethodInfo* info; X+ PRUint8 paramCount; X+ PRUint8 i; X+ nsresult result = NS_ERROR_FAILURE; X+ X+ NS_ASSERTION(self,"no self"); X+ X+ self->GetInterfaceInfo(&iface_info); X+ NS_ASSERTION(iface_info,"no interface info"); X+ X+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); X+ NS_ASSERTION(info,"no interface info"); X+ X+ paramCount = info->GetParamCount(); X+ X+ // setup variant array pointer X+ if(paramCount > PARAM_BUFFER_COUNT) X+ dispatchParams = new nsXPTCMiniVariant[paramCount]; X+ else X+ dispatchParams = paramBuffer; X+ NS_ASSERTION(dispatchParams,"no place for params"); X+ X+ PRUint64* ap = args; X+ for(i = 0; i < paramCount; i++, ap++) X+ { X+ const nsXPTParamInfo& param = info->GetParam(i); X+ const nsXPTType& type = param.GetType(); X+ nsXPTCMiniVariant* dp = &dispatchParams[i]; X+ X+ if(param.IsOut() || !type.IsArithmetic()) X+ { X+ dp->val.p = (void*) *ap; X+ continue; X+ } X+ // else X+ switch(type) X+ { X+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; X+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; X+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; X+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; X+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; X+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; X+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; X+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; X+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; X+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; X+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; X+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; X+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; X+ default: X+ NS_ASSERTION(0, "bad type"); X+ break; X+ } X+ } X+ X+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); X+ X+ NS_RELEASE(iface_info); X+ X+ if(dispatchParams != paramBuffer) X+ delete [] dispatchParams; X+ X+ return result; X+} X+ X+extern "C" int SharedStub(int, int*); X+ X+#define STUB_ENTRY(n) \ X+nsresult nsXPTCStubBase::Stub##n() \ X+{ \ X+ int dummy; /* defeat tail-call optimization */ \ X+ return SharedStub(n, &dummy); \ X+} X+ X+#define SENTINEL_ENTRY(n) \ X+nsresult nsXPTCStubBase::Sentinel##n() \ X+{ \ X+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ X+ return NS_ERROR_NOT_IMPLEMENTED; \ X+} X+ X+#include "xptcstubsdef.inc" X+ X+#endif /* sparc || __sparc__ */ X--- /dev/null Mon May 26 13:22:00 2003 X+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 X@@ -0,0 +1,104 @@ X+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- X+ * X+ * The contents of this file are subject to the Mozilla Public X+ * License Version 1.1 (the "License"); you may not use this file X+ * except in compliance with the License. You may obtain a copy of X+ * the License at http://www.mozilla.org/MPL/ X+ * X+ * Software distributed under the License is distributed on an "AS X+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or X+ * implied. See the License for the specific language governing X+ * rights and limitations under the License. X+ * X+ * The Original Code is mozilla.org code. X+ * X+ * The Initial Developer of the Original Code is Netscape X+ * Communications Corporation. Portions created by Netscape are X+ * Copyright (C) 2001 Netscape Communications Corporation. All X+ * Rights Reserved. X+ * X+ * Contributor(s): X+ * Stuart Parmenter X+ * Chris Seawood X+ */ X+ X+/* X+ Platform specific code to invoke XPCOM methods on native objects X+ for sparcv9 Solaris. X+ X+ See the SPARC Compliance Definition (SCD) Chapter 3 X+ for more information about what is going on here, including X+ the use of BIAS (0x7ff). X+ The SCD is available from http://www.sparc.com/. X+*/ X+ X+ .global XPTC_InvokeByIndex X+ .type XPTC_InvokeByIndex, #function X+ X+/* X+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, X+ PRUint32 paramCount, nsXPTCVariant* params); X+ X+*/ X+XPTC_InvokeByIndex: X+ save %sp,-(128 + 64),%sp ! room for the register window and X+ ! struct pointer, rounded up to 0 % 64 X+ sll %i2,4,%l0 ! assume the worst case X+ ! paramCount * 2 * 8 bytes X+ cmp %l0, 0 ! are there any args? If not, X+ be .invoke ! no need to copy args to stack X+ nop X+ X+ sub %sp,%l0,%sp ! create the additional stack space X+ add %sp,0x7ff+136,%o0 ! step past the register window, the X+ ! struct result pointer and the 'this' slot X+ mov %i2,%o1 ! paramCount X+ call invoke_copy_to_stack X+ mov %i3,%o2 ! params X+ X+! X+! load arguments from stack into the outgoing registers X+! BIAS is 0x7ff (2047) X+! X+ X+! load the %o1..5 64bit (extended word) output registers registers X+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 X+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 X+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 X+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 X+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 X+ X+! load the even number double registers starting with %d2 X+ ldd [%sp + 0x7ff + 136],%f2 X+ ldd [%sp + 0x7ff + 144],%f4 X+ ldd [%sp + 0x7ff + 152],%f6 X+ ldd [%sp + 0x7ff + 160],%f8 X+ ldd [%sp + 0x7ff + 168],%f10 X+ ldd [%sp + 0x7ff + 176],%f12 X+ ldd [%sp + 0x7ff + 184],%f14 X+ ldd [%sp + 0x7ff + 192],%f16 X+ ldd [%sp + 0x7ff + 200],%f18 X+ ldd [%sp + 0x7ff + 208],%f20 X+ ldd [%sp + 0x7ff + 216],%f22 X+ ldd [%sp + 0x7ff + 224],%f24 X+ ldd [%sp + 0x7ff + 232],%f26 X+ ldd [%sp + 0x7ff + 240],%f28 X+ ldd [%sp + 0x7ff + 248],%f30 X+ X+! X+! calculate the target address from the vtable X+! X+.invoke: X+ sll %i1,3,%l0 ! index *= 8 X+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) X+ ldx [%i0],%l1 ! *that --> address of vtable X+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address X+ X+ jmpl %l0,%o7 ! call the routine X+ mov %i0,%o0 ! move 'this' pointer to out register X+ X+ mov %o0,%i0 ! propagate return value X+ ret X+ restore X+ X+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex X--- /dev/null Mon May 26 14:00:00 2003 X+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 X@@ -0,0 +1,91 @@ X+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- X+ * X+ * The contents of this file are subject to the Mozilla Public X+ * License Version 1.1 (the "License"); you may not use this file X+ * except in compliance with the License. You may obtain a copy of X+ * the License at http://www.mozilla.org/MPL/ X+ * X+ * Software distributed under the License is distributed on an "AS X+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or X+ * implied. See the License for the specific language governing X+ * rights and limitations under the License. X+ * X+ * The Original Code is mozilla.org code. X+ * X+ * The Initial Developer of the Original Code is Netscape X+ * Communications Corporation. Portions created by Netscape are X+ * Copyright (C) 2001 Netscape Communications Corporation. All X+ * Rights Reserved. X+ * X+ * Contributor(s): X+ * Stuart Parmenter X+ * Chris Seawood X+ */ X+ X+ X+/* Platform specific code to invoke XPCOM methods on native objects */ X+ X+#include "xptcprivate.h" X+ X+#if !defined(__sparc) && !defined(__sparc__) X+#error "This code is for Sparc only" X+#endif X+ X+/* Prototype specifies unmangled function name */ X+extern "C" PRUint64 X+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); X+ X+extern "C" PRUint64 X+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) X+{ X+ /* X+ We need to copy the parameters for this function to locals and use them X+ from there since the parameters occupy the same stack space as the stack X+ we're trying to populate. X+ */ X+ PRUint64 *l_d = d; X+ nsXPTCVariant *l_s = s; X+ PRUint64 l_paramCount = paramCount; X+ PRUint64 regCount = 0; // return the number of registers to load from the stack X+ X+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) X+ { X+ if (regCount < 5) regCount++; X+ X+ if (l_s->IsPtrData()) X+ { X+ *l_d = (PRUint64)l_s->ptr; X+ continue; X+ } X+ switch (l_s->type) X+ { X+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; X+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; X+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; X+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; X+ X+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; X+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; X+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; X+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; X+ X+ /* in the case of floats, we want to put the bits in to the X+ 64bit space right justified... floats in the paramter array on X+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip X+ the space that would be occupied by %f0, %f2, etc. X+ */ X+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; X+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; X+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; X+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; X+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; X+ X+ default: X+ // all the others are plain pointer types X+ *((void**)l_d) = l_s->val.p; X+ break; X+ } X+ } X+ X+ return regCount; X+} END-of-mozilla/files/patch-xptcall-sparc64 echo x - mozilla/files/patch-libm sed 's/^X//' >mozilla/files/patch-libm << 'END-of-mozilla/files/patch-libm' X--- js/src/Makefile.in Thu Aug 4 22:26:52 2005 X+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 X@@ -148,5 +148,4 @@ X endif X X-FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) X JSMATH_PRELINK = jsmathtemp.o X JS_SAFE_ARENA = 1 X@@ -320,7 +319,4 @@ X endif X @$(RM) -f $(JSMATH_PRELINK) X-else X-# Create dependency so we build fdlibm X-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in X endif X X--- js/Makefile.in Sun Mar 23 14:36:00 2003 X+++ js/Makefile.in Thu Aug 4 23:08:06 2005 X@@ -46,5 +46,5 @@ X # X X-DIRS = src/fdlibm src X+DIRS = src X X include $(topsrcdir)/config/rules.mk END-of-mozilla/files/patch-libm echo x - mozilla/files/patch-gfx-src-gtk-Makefile.in sed 's/^X//' >mozilla/files/patch-gfx-src-gtk-Makefile.in << 'END-of-mozilla/files/patch-gfx-src-gtk-Makefile.in' XWhen using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not Xcontain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''. X XThis causes an error, because libgfxshared_s is only under dist/lib. X X -mi X X--- gfx/src/gtk/Makefile.in Mon Nov 10 07:24:51 2003 X+++ gfx/src/gtk/Makefile.in Thu Jul 21 23:58:26 2005 X@@ -165,4 +165,5 @@ X ifdef MOZ_ENABLE_GTK2 X EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \ X+ $(LIBS_DIR) \ X -lgkgfx \ X -lgfxshared_s \ END-of-mozilla/files/patch-gfx-src-gtk-Makefile.in echo x - mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in sed 's/^X//' >mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in << 'END-of-mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in' X--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 X+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 14:31:25 2004 X@@ -49,6 +49,9 @@ X ifeq (86,$(findstring 86,$(OS_TEST))) X CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp X endif X+ifeq (amd64,$(OS_TEST)) X+CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp X+endif X endif X # X # New code for Linux, et. al., with gcc X@@ -59,8 +62,8 @@ X CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp X endif X endif X-# IA64 Linux X-ifneq (,$(filter Linux,$(OS_ARCH))) X+# IA64 Linux & FreeBSD X+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) X ifneq (,$(findstring ia64,$(OS_TEST))) X CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp X ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s X@@ -106,9 +109,15 @@ X ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s X endif X # X+# FreeBSD/Alpha X+# X+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) X+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp X+endif X+# X # Linux/Alpha X # X-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) X+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) X CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp X endif X # X@@ -294,6 +303,15 @@ X ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) X CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp X ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s X+endif X+# X+# FreeBSD/SPARC64 X+# X+ifeq ($(OS_ARCH),FreeBSD) X+ifneq (,$(findstring sparc,$(OS_TEST))) X+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp X+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s X+endif X endif X # X # Solaris/SPARC END-of-mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in echo x - mozilla/files/patch-extensions_negotiateauth_Makefile.in sed 's/^X//' >mozilla/files/patch-extensions_negotiateauth_Makefile.in << 'END-of-mozilla/files/patch-extensions_negotiateauth_Makefile.in' X--- extensions/negotiateauth/Makefile.in.orig Mon Jul 12 15:18:06 2004 X+++ extensions/negotiateauth/Makefile.in Sat Dec 18 16:10:49 2004 X@@ -64,7 +64,6 @@ X $(NULL) X X EXTRA_DSO_LDOPTS = \ X- $(MOZ_COMPONENT_LIBS) \ X $(NULL) X X ifneq (,$(GSSAPI_LIBS)) X@@ -81,6 +80,9 @@ X # to install GSSAPI libraries in order to use the rest of mozilla ;-) X FORCE_SHARED_LIB = 1 X endif X+ X+EXTRA_DSO_LDOPTS = \ X+ $(MOZ_COMPONENT_LIBS) X X ifeq ($(OS_ARCH),WINNT) X LOCAL_INCLUDES = -DUSE_SSPI END-of-mozilla/files/patch-extensions_negotiateauth_Makefile.in echo x - mozilla/files/patch-config_autoconf.mk.in sed 's/^X//' >mozilla/files/patch-config_autoconf.mk.in << 'END-of-mozilla/files/patch-config_autoconf.mk.in' X--- config/autoconf.mk.in.orig Mon Mar 15 22:56:25 2004 X+++ config/autoconf.mk.in Fri Mar 19 15:17:50 2004 X@@ -31,13 +31,13 @@ X prefix = @prefix@ X exec_prefix = @exec_prefix@ X bindir = @bindir@ X-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) X+includedir = @includedir@/mozilla%%HEADERS_SUFX%% X libdir = @libdir@ X datadir = @datadir@ X mandir = @mandir@ X idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) X X-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) X+mozappdir = $(libdir)/%%MOZILLA%% X mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) X mrelibdir = $(mredir)/lib X END-of-mozilla/files/patch-config_autoconf.mk.in echo x - mozilla/files/patch-config::rules.mk sed 's/^X//' >mozilla/files/patch-config::rules.mk << 'END-of-mozilla/files/patch-config::rules.mk' X--- config/rules.mk.orig Sun May 18 16:10:18 2003 X+++ config/rules.mk Sun Jul 20 18:07:26 2003 X@@ -448,7 +448,11 @@ X X ifeq ($(OS_ARCH),FreeBSD) X ifdef IS_COMPONENT X+ifneq (,$(filter alpha ia64,$(OS_TEST))) X+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc X+else X EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic X+endif X endif X endif X END-of-mozilla/files/patch-config::rules.mk echo x - mozilla/files/patch-config::mkdepend::Makefile.in sed 's/^X//' >mozilla/files/patch-config::mkdepend::Makefile.in << 'END-of-mozilla/files/patch-config::mkdepend::Makefile.in' X--- config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004 X+++ config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004 X@@ -57,6 +57,7 @@ X include $(topsrcdir)/config/rules.mk X X HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" X+HOST_CFLAGS += $(XCFLAGS) X X ifdef GNU_CC X _GCCDIR = $(shell $(CC) -print-file-name=include) END-of-mozilla/files/patch-config::mkdepend::Makefile.in echo x - mozilla/files/patch-config-mkdepend-imakemdep.h sed 's/^X//' >mozilla/files/patch-config-mkdepend-imakemdep.h << 'END-of-mozilla/files/patch-config-mkdepend-imakemdep.h' X--- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 X+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 X@@ -278,4 +278,7 @@ X "-D__i386__", X # endif X+# if defined(__amd64__) || defined(__x86_64__) X+ "-D__amd64__ -D__x86_64__", X+# endif X # ifdef __GNUC__ X "-traditional", END-of-mozilla/files/patch-config-mkdepend-imakemdep.h echo x - mozilla/files/patch-build_unix_run-mozilla.sh sed 's/^X//' >mozilla/files/patch-build_unix_run-mozilla.sh << 'END-of-mozilla/files/patch-build_unix_run-mozilla.sh' X--- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003 X+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004 X@@ -355,7 +355,7 @@ X fi X ## X ## Set LD_LIBRARY_PATH X-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} X+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} X if [ -n "$LD_LIBRARYN32_PATH" ] X then X LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} X@@ -442,6 +442,9 @@ X # X export MOZILLA_FIVE_HOME LD_LIBRARY_PATH X export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH X+ X+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins X+export MOZ_PLUGIN_PATH X X if [ $moz_debug -eq 1 ] X then END-of-mozilla/files/patch-build_unix_run-mozilla.sh echo x - mozilla/files/patch-bugzilla149334 sed 's/^X//' >mozilla/files/patch-bugzilla149334 << 'END-of-mozilla/files/patch-bugzilla149334' XIndex: gfx/idl/nsIFreeType2.idl X=================================================================== XRCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v Xretrieving revision 1.10 Xdiff -u -3 -p -r1.10 nsIFreeType2.idl X--- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10 X+++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000 X@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer); X native FT_Sfnt_Tag(FT_Sfnt_Tag); X native FT_Size(FT_Size); X X-[ptr] native FTC_Image_Desc_p(FTC_Image_Desc); X+[ptr] native FTC_ImageType_p(FTC_ImageType); X native FTC_Face_Requester(FTC_Face_Requester); X native FTC_Font(FTC_Font); X-native FTC_Image_Cache(FTC_Image_Cache); X+native FTC_FaceID(FTC_FaceID); X+native FTC_ImageCache(FTC_ImageCache); X native FTC_Manager(FTC_Manager); X X // #ifdef MOZ_SVG X@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports X X readonly attribute FT_Library library; X readonly attribute FTC_Manager FTCacheManager; X- readonly attribute FTC_Image_Cache ImageCache; X+ readonly attribute FTC_ImageCache ImageCache; X X void doneFace(in FT_Face face); X void doneFreeType(in FT_Library lib); X@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports X void outlineDecompose(in FT_Outline_p outline, X in const_FT_Outline_Funcs_p funcs, in voidPtr p); X void setCharmap(in FT_Face face, in FT_CharMap charmap); X- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc, X+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc, X in FT_UInt gindex, out FT_Glyph glyph); X- void managerLookupSize(in FTC_Manager manager, in FTC_Font font, X- out FT_Face face, out FT_Size size); X+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id, X+ out FT_Face face); X void managerDone(in FTC_Manager manager); X void managerNew(in FT_Library lib, in FT_UInt max_faces, X in FT_UInt max_sizes, in FT_ULong max_bytes, X in FTC_Face_Requester requester, in FT_Pointer req_data, X out FTC_Manager manager); X- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache); X+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache); X /* #ifdef MOZ_SVG */ X void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix, X in FT_Vector_p delta); XIndex: gfx/src/freetype/nsFreeType.cpp X=================================================================== XRCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v Xretrieving revision 1.25 Xdiff -u -3 -p -r1.25 nsFreeType.cpp X--- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25 X+++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000 X@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = { X {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE}, X {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE}, X {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE}, X- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, X- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE}, X+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, X+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE}, X {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE}, X {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE}, X- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, X+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, X // #ifdef MOZ_SVG X {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE}, X {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE}, X@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT X } X X NS_IMETHODIMP X-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc, X+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc, X FT_UInt glyphID, FT_Glyph *glyph) X { X // call the FreeType2 function via the function pointer X@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_ X } X X NS_IMETHODIMP X-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font, X- FT_Face *face, FT_Size *size) X+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id, X+ FT_Face *face) X { X // call the FreeType2 function via the function pointer X- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size); X+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face); X return error ? NS_ERROR_FAILURE : NS_OK; X } X X@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra X } X X NS_IMETHODIMP X-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache) X+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache) X { X // call the FreeType2 function via the function pointer X FT_Error error = nsFTC_Image_Cache_New(manager, cache); X@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res X } X X NS_IMETHODIMP X-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache) X+nsFreeType2::GetImageCache(FTC_ImageCache *aCache) X { X *aCache = mImageCache; X return NS_OK; XIndex: gfx/src/freetype/nsFreeType.h X=================================================================== XRCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v Xretrieving revision 1.17 Xdiff -u -3 -p -r1.17 nsFreeType.h X--- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17 X+++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000 X@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_ X typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*); X typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap); X typedef FT_Error (*FTC_Image_Cache_Lookup_t) X- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*); X-typedef FT_Error (*FTC_Manager_Lookup_Size_t) X- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*); X+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*); X+typedef FT_Error (*FTC_Manager_LookupFace_t) X+ (FTC_Manager, FTC_FaceID, FT_Face*); X typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager); X typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong, X FTC_Face_Requester, FT_Pointer, FTC_Manager*); X-typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*); X+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*); X // #ifdef MOZ_SVG X typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*); X typedef FT_Error (*FT_Get_Kerning_t) X@@ -181,7 +181,7 @@ protected: X FT_Outline_Decompose_t nsFT_Outline_Decompose; X FT_Set_Charmap_t nsFT_Set_Charmap; X FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; X- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size; X+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace; X FTC_Manager_Done_t nsFTC_Manager_Done; X FTC_Manager_New_t nsFTC_Manager_New; X FTC_Image_Cache_New_t nsFTC_Image_Cache_New; X@@ -229,7 +229,7 @@ protected: X PRLibrary *mSharedLib; X FT_Library mFreeTypeLibrary; X FTC_Manager mFTCacheManager; X- FTC_Image_Cache mImageCache; X+ FTC_ImageCache mImageCache; X X static nsHashtable *sFontFamilies; X static nsHashtable *sRange1CharSetNames; XIndex: gfx/src/ps/nsFontMetricsPS.cpp X=================================================================== XRCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v Xretrieving revision 1.43 Xdiff -u -3 -p -r1.43 nsFontMetricsPS.cpp X--- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43 X+++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000 X@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa X X mPixelSize = NSToIntRound(app2dev * mFont->size); X X- mImageDesc.font.face_id = (void*)mEntry; X- mImageDesc.font.pix_width = mPixelSize; X- mImageDesc.font.pix_height = mPixelSize; X- mImageDesc.image_type = 0; X+ mImageDesc->face_id = (FTC_FaceID)&mEntry; X+ mImageDesc->width = mPixelSize; X+ mImageDesc->height = mPixelSize; X+ mImageDesc->flags = 0; X X nsresult rv; X mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); X@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich X if (!face) X return 0; X X- FTC_Image_Cache iCache; X+ FTC_ImageCache iCache; X nsresult rv = mFt2->GetImageCache(&iCache); X if (NS_FAILED(rv)) { X NS_ERROR("Failed to get Image Cache"); X@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace() X X FTC_Manager cManager; X mFt2->GetFTCacheManager(&cManager); X- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, X- &face, nsnull); X+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, X+ &face); X NS_ASSERTION(rv==0, "failed to get face/size"); X if (rv) X return nsnull; X@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont X mEntry->GetFamilyName(fontName); X mEntry->GetStyleName(styleName); X X- mImageDesc.font.face_id = (void*)mEntry; X+ mImageDesc->face_id = (FTC_FaceID)&mEntry; X // TT glyph has no relation to size X- mImageDesc.font.pix_width = 16; X- mImageDesc.font.pix_height = 16; X- mImageDesc.image_type = 0; X+ mImageDesc->width = 16; X+ mImageDesc->height = 16; X+ mImageDesc->flags = 0; X FT_Face face = nsnull; X FTC_Manager cManager; X mFt2->GetFTCacheManager(&cManager); X- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, X- &face, nsnull); X+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, X+ &face); X if (NS_FAILED(rv)) X return; X XIndex: gfx/src/ps/nsFontMetricsPS.h X=================================================================== XRCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v Xretrieving revision 1.25 Xdiff -u -3 -p -r1.25 nsFontMetricsPS.h X--- gfx/src/ps/nsFontMetricsPS.h 17 Apr 2004 21:52:31 -0000 1.25 X+++ gfx/src/ps/nsFontMetricsPS.h 26 May 2004 10:01:03 -0000 X@@ -319,7 +319,7 @@ protected: X nsCOMPtr mFaceID; X nsCOMPtr mFt2; X PRUint16 mPixelSize; X- FTC_Image_Desc mImageDesc; X+ FTC_ImageType mImageDesc; X X X static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, X@@ -362,7 +362,7 @@ public: X protected: X nsCOMPtr mEntry; X nsCOMPtr mFt2; X- FTC_Image_Desc mImageDesc; X+ FTC_ImageType mImageDesc; X }; X #endif X XIndex: gfx/src/x11shared/nsFontFreeType.cpp X=================================================================== XRCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v Xretrieving revision 1.14 Xdiff -u -3 -p -r1.14 nsFontFreeType.cpp X--- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14 X+++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000 X@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace() X FTC_Manager mgr; X nsresult rv; X mFt2->GetFTCacheManager(&mgr); X- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull); X+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face); X NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); X if (NS_FAILED(rv)) X return nsnull; X@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy X PRBool embedded_bimap = PR_FALSE; X mFaceID = aFaceID; X mPixelSize = aPixelSize; X- mImageDesc.font.face_id = (void*)mFaceID; X- mImageDesc.font.pix_width = aPixelSize; X- mImageDesc.font.pix_height = aPixelSize; X- mImageDesc.image_type = 0; X+ mImageDesc->face_id = (FTC_FaceID)&mFaceID; X+ mImageDesc->width = aPixelSize; X+ mImageDesc->height = aPixelSize; X+ mImageDesc->flags = 0; X X if (aPixelSize < nsFreeType2::gAntiAliasMinimum) { X- mImageDesc.image_type |= ftc_image_mono; X anti_alias = PR_FALSE; X } X X- if (nsFreeType2::gFreeType2Autohinted) X- mImageDesc.image_type |= ftc_image_flag_autohinted; X- X- if (nsFreeType2::gFreeType2Unhinted) X- mImageDesc.image_type |= ftc_image_flag_unhinted; X- X PRUint32 num_embedded_bitmaps, i; X PRInt32* embedded_bitmapheights; X mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, X@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy X if (embedded_bitmapheights[i] == aPixelSize) { X embedded_bimap = PR_TRUE; X // unhinted must be set for embedded bitmaps to be used X- mImageDesc.image_type |= ftc_image_flag_unhinted; X break; X } X } X@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con X if (!face) X return NS_ERROR_FAILURE; X X- FTC_Image_Cache icache; X+ FTC_ImageCache icache; X mFt2->GetImageCache(&icache); X if (!icache) X return NS_ERROR_FAILURE; X@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar X if (!face) X return 0; X X- FTC_Image_Cache icache; X+ FTC_ImageCache icache; X mFt2->GetImageCache(&icache); X if (!icache) X return 0; X@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering X if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); X #endif X X- FTC_Image_Cache icache; X+ FTC_ImageCache icache; X mFt2->GetImageCache(&icache); X if (!icache) X return 0; XIndex: gfx/src/x11shared/nsFontFreeType.h X=================================================================== XRCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v Xretrieving revision 1.10 Xdiff -u -3 -p -r1.10 nsFontFreeType.h X--- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10 X+++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000 X@@ -110,7 +110,7 @@ protected: X XImage *GetXImage(PRUint32 width, PRUint32 height); X nsITrueTypeFontCatalogEntry *mFaceID; X PRUint16 mPixelSize; X- FTC_Image_Desc mImageDesc; X+ FTC_ImageType mImageDesc; X nsCOMPtr mFt2; X }; X END-of-mozilla/files/patch-bugzilla149334 echo x - mozilla/files/patch-Makefile.in sed 's/^X//' >mozilla/files/patch-Makefile.in << 'END-of-mozilla/files/patch-Makefile.in' X--- Makefile.in.orig Fri Aug 29 20:20:58 2003 X+++ Makefile.in Sat Oct 18 15:34:15 2003 X@@ -67,8 +67,7 @@ X $(tier_2_dirs) \ X $(tier_9_dirs) \ X $(tier_40_dirs) \ X- $(tier_50_dirs) \ X- $(NULL) X+ $(tier_50_dirs) X X ifdef GC_LEAK_DETECTOR X DIRS += gc/boehm X@@ -87,7 +86,8 @@ X DIRS += $(tier_98_dirs) X endif X X-DIRS += $(tier_99_dirs) X+DIRS += $(tier_99_dirs) \ X+ $(NULL) X X # X # tier 0 - base build config dirs END-of-mozilla/files/patch-Makefile.in echo x - mozilla/files/patch-Double.cpp sed 's/^X//' >mozilla/files/patch-Double.cpp << 'END-of-mozilla/files/patch-Double.cpp' X--- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 X+++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 X@@ -51,10 +51,10 @@ X //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. X #ifdef __FreeBSD__ X #include X-#ifdef __alpha__ X-fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; X-#else X+#if defined(__i386__) X fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; X+#else X+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; X #endif X fp_except_t oldmask = fpsetmask(~allmask); X #endif X@@ -75,22 +75,31 @@ X #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 X #define TX_DOUBLE_HI32_MANTMASK 0x000fffff X X+union ui32dun { X+ PRUint32 i[2]; X+ double d; X+}; X+ X //-- Initialize Double related constants X #ifdef IS_BIG_ENDIAN X-const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, X- 0xffffffff}; X-const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; X-const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; X+const union ui32dun nanMask = X+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}}; X+const union ui32dun infMask = X+ {{TX_DOUBLE_HI32_EXPMASK, 0}}; X+const union ui32dun negInfMask = X+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}}; X #else X-const PRUint32 nanMask[2] = {0xffffffff, X- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; X-const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; X-const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; X+const union ui32dun nanMask = X+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}; X+const union ui32dun infMask = X+ {{0, TX_DOUBLE_HI32_EXPMASK}}; X+const union ui32dun negInfMask = X+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}}; X #endif X X-const double Double::NaN = *((double*)nanMask); X-const double Double::POSITIVE_INFINITY = *((double*)infMask); X-const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); X+const double Double::NaN = nanMask.d; X+const double Double::POSITIVE_INFINITY = infMask.d; X+const double Double::NEGATIVE_INFINITY = negInfMask.d; X X /* X * Determines whether the given double represents positive or negative END-of-mozilla/files/patch-Double.cpp echo x - mozilla/files/mozilla.desktop.in sed 's/^X//' >mozilla/files/mozilla.desktop.in << 'END-of-mozilla/files/mozilla.desktop.in' X[Desktop Entry] XEncoding=UTF-8 XName=Mozilla Web Browser XName[az]=Mozilla Veb Səyyahı XName[bg]=Интернет браузър (Mozilla) XName[bs]=Mozilla web preglednik XName[ca]=Navegador web Mozilla XName[cs]=Prohlížeč WWW Mozilla XName[cy]=Y Porwr Gwe Mozilla XName[da]=Mozilla - internetbrowser XName[de]=Mozilla Webbrowser XName[el]=Περιηγητής Διαδικτύου Mozilla XName[en_CA]=Mozilla Web Browser XName[en_GB]=Mozilla Web Browser XName[es]=Navegador Web Mozilla XName[et]=Mozilla veebibrauser XName[eu]=Mozilla web arakatzailea XName[fa]=مرورگر وب Mozilla XName[fi]=Mozilla, WWW-selain XName[fr]=Navigateur Web Mozilla XName[ga]=Brabhsálaí Lín Mozilla XName[he]=דפדפן Mozilla XName[hr]=Mozilla Web preglednik XName[hu]=Mozilla webböngésző XName[id]=Web Browser Mozilla XName[it]=Browser web Mozilla XName[ja]=Mozilla ウェブ・ブラウザ XName[ko]=Mozilla 웹 브라우저 XName[li]=Mozilla Web Browser XName[lt]=Mozilla web naršyklė XName[mk]=Mozilla Веб Прелистувач XName[mn]=Mozilla веб хөтөч XName[ms]=Pelungsur Web Mozilla XName[nb]=Mozilla nettleser XName[nl]=Mozilla webbrowser XName[nn]=Mozilla nettlesar XName[no]=Mozilla nettleser XName[pl]=Przeglądarka WWW Mozilla XName[pt]=Navegador Web Mozilla XName[pt_BR]=Navegador Web Mozilla XName[ro]=Navigatorul Mozilla XName[sl]=Spletni brskalnik Mozilla XName[sq]=Mozilla - Shfletuesi Web XName[sv]=Webbläsaren Mozilla XName[tk]=Mozilla Web Ahtarçisi XName[tr]=Mozilla Web Tarayıcı XName[uk]=Переглядач web Mozilla XName[vi]=Trình Duyệt Web Mozilla XName[wa]=Betchteu waibe mozilla XName[zh_CN]=Mozilla Web 浏览器 XName[zh_TW]=Mozilla 網頁瀏覽器 XGenericName=Mozilla Web Browser XGenericName[az]=Mozilla Veb Səyyahı XGenericName[bg]=Интернет браузър (Mozilla) XGenericName[bs]=Mozilla web preglednik XGenericName[ca]=Navegador web Mozilla XGenericName[cs]=Prohlížeč WWW Mozilla XGenericName[cy]=Y Porwr Gwe Mozilla XGenericName[da]=Mozilla - internetbrowser XGenericName[de]=Mozilla Webbrowser XGenericName[el]=Περιηγητής Διαδικτύου Mozilla XGenericName[en_CA]=Mozilla Web Browser XGenericName[en_GB]=Mozilla Web Browser XGenericName[es]=Navegador Web Mozilla XGenericName[et]=Mozilla veebibrauser XGenericName[eu]=Mozilla web arakatzailea XGenericName[fa]=مرورگر وب Mozilla XGenericName[fi]=Mozilla, WWW-selain XGenericName[fr]=Navigateur Web Mozilla XGenericName[ga]=Brabhsálaí Lín Mozilla XGenericName[he]=דפדפן Mozilla XGenericName[hr]=Mozilla Web preglednik XGenericName[hu]=Mozilla webböngésző XGenericName[id]=Web Browser Mozilla XGenericName[it]=Browser web Mozilla XGenericName[ja]=Mozilla ウェブ・ブラウザ XGenericName[ko]=Mozilla 웹 브라우저 XGenericName[li]=Mozilla Web Browser XGenericName[lt]=Mozilla web naršyklė XGenericName[mk]=Mozilla Веб Прелистувач XGenericName[mn]=Mozilla веб хөтөч XGenericName[ms]=Pelungsur Web Mozilla XGenericName[nb]=Mozilla nettleser XGenericName[nl]=Mozilla webbrowser XGenericName[nn]=Mozilla nettlesar XGenericName[no]=Mozilla nettleser XGenericName[pl]=Przeglądarka WWW Mozilla XGenericName[pt]=Navegador Web Mozilla XGenericName[pt_BR]=Navegador Web Mozilla XGenericName[ro]=Navigatorul Mozilla XGenericName[sl]=Spletni brskalnik Mozilla XGenericName[sq]=Mozilla - Shfletuesi Web XGenericName[sv]=Webbläsaren Mozilla XGenericName[tk]=Mozilla Web Ahtarçisi XGenericName[tr]=Mozilla Web Tarayıcı XGenericName[uk]=Переглядач web Mozilla XGenericName[vi]=Trình Duyệt Web Mozilla XGenericName[wa]=Betchteu waibe mozilla XGenericName[zh_CN]=Mozilla Web 浏览器 XGenericName[zh_TW]=Mozilla 網頁瀏覽器 XComment=Browse the web XComment[ar]=تصفح الانترنت XComment[az]=Vebi gəzin XComment[be]=Вандраваць па павуціньню XComment[bg]=Сърфиране в интернет XComment[bn]=ওয়েব ব্রাউজ করুন XComment[bs]=Pregledaj na internetu XComment[ca]=Navegueu per la web XComment[cs]=Prohlížet WWW XComment[cy]=Pori'r we XComment[da]=Benyt internettet XComment[de]=Im Web surfen XComment[el]=Περιήγηση στον παγκόσμιο ιστό XComment[en_CA]=Browse the web XComment[en_GB]=Browse the web XComment[es]=Navegar por la web XComment[et]=Sirvi veebi XComment[eu]=Arakatu web-a XComment[fa]=مرور وب XComment[fi]=Selaa WWW:tä XComment[fr]=Naviguer sur Internet XComment[ga]=Brabhsáil an Líon XComment[gu]=વેબમાં શોધો XComment[he]=גלוש ברשת XComment[hi]=वेब ब्राउज़ करें XComment[hr]=Pregledaj Web XComment[hu]=A világháló böngészése XComment[id]=Jelajah web XComment[it]=Esplora il web XComment[ja]=ウェブを閲覧します XComment[ko]=웹을 돌아 다닙니다 XComment[li]=Blajere op internet XComment[lt]=Naršyti internete XComment[mk]=Прелистувајте го вебот XComment[ml]=വലക്കെട്ട് തിരയുക XComment[mn]=Веб броузе хийх XComment[ms]=Layari web XComment[nb]=Surf på nettet XComment[nl]=Websurfen XComment[nn]=Surf på nettet XComment[no]=Surf på nettet XComment[pa]=ਵੈਬ ਬਰਾਊਜ਼ XComment[pl]=Przeglądanie stron WWW XComment[pt]=Navegar na web XComment[pt_BR]=Navegar na web XComment[ro]=Navigare Internet XComment[ru]=Программа для просмотра веб-страниц XComment[sk]=Prehliadať internet XComment[sl]=Brskaj po spletu XComment[sq]=Eksploro web-in XComment[sr]=Прегледај веб XComment[sr@Latn]=Pregledaj veb XComment[sv]=Surfa på nätet XComment[ta]=வலையில் உலாவு XComment[th]=ใช้งานเว็บบราวเซอร์ Mozilla XComment[tk]=Webi Ahtar XComment[tr]=Web'e Gözat XComment[uk]=Програма перегляду web-сторінок XComment[vi]=Duyệt web XComment[wa]=Naivyî avå les waibes XComment[zh_CN]=浏览 Web XComment[zh_TW]=瀏覽網頁 XExec=mozilla %U XStartupNotify=false XTerminal=false XType=Application XIcon=%%PREFIX%%/lib/mozilla/chrome/icons/default/default.xpm XCategories=Application;Network; XMimeType=text/html;text/xml;application/xhtml+xml; END-of-mozilla/files/mozilla.desktop.in echo x - mozilla/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c sed 's/^X//' >mozilla/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c << 'END-of-mozilla/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c' X--- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002 X+++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005 X@@ -168,7 +168,9 @@ X X drawingarea = MOZ_DRAWINGAREA(object); X X+ gdk_window_set_user_data(drawingarea->inner_window, NULL); X gdk_window_destroy(drawingarea->inner_window); X+ gdk_window_set_user_data(drawingarea->clip_window, NULL); X gdk_window_destroy(drawingarea->clip_window); X X (* parent_class->finalize) (object); END-of-mozilla/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c echo x - mozilla/files/mozconfig-generic.in sed 's/^X//' >mozilla/files/mozconfig-generic.in << 'END-of-mozilla/files/mozconfig-generic.in' X# $FreeBSD$ X# $MCom$ X###################################################################### X# standard opts from README Xac_add_options --enable-crypto Xac_add_options --disable-tests Xac_add_options --disable-mailnews Xac_add_options --disable-composer Xac_add_options --enable-default-toolkit=gtk2 Xac_add_options --enable-xft X# See the following URL for approval email for using official branding X# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt Xac_add_options --enable-official-branding X###################################################################### X# FreeBSD specific Xexport CPPFLAGS="@CPPFLAGS@" Xexport CFLAGS="@CFLAGS@" Xexport LIBS="@LIBS@" Xexport LDFLAGS="@LDFLAGS@" Xexport CONFIG_SH=/bin/sh Xexport XP_UNIX=1 Xmk_add_options XP_UNIX=1 Xexport PERL="@PERL@" Xmk_add_options PERL=$PERL X# Configure options for installation Xac_add_options --prefix=@FAKEDIR@ Xac_add_options --x-includes=@X11BASE@/include Xac_add_options --x-libraries=@X11BASE@/lib X###################################################################### X# Use ports for these libraries Xac_add_options --with-system-jpeg=@LOCALBASE@ Xac_add_options --with-system-zlib Xac_add_options --with-system-png=@LOCALBASE@ Xac_add_options --with-gssapi=@KRB5_HOME@ Xac_add_options --with-system-nspr X###################################################################### X# set compile/link features Xac_add_options --with-pthreads X###################################################################### X# disable unneeded/unavailable Xac_add_options --disable-auto-deps Xac_add_options --disable-bidi Xac_add_options --disable-dtd-debug Xac_add_options --disable-jsd Xac_add_options --disable-ldap Xac_add_options --disable-pedantic Xac_add_options --disable-profilesharing Xac_add_options --disable-installer Xac_add_options --enable-single-profile Xac_add_options --disable-profilesharing Xac_add_options --enable-image-decoders=png,gif,jpeg,bmp Xac_add_options --enable-extensions="default" X###################################################################### Xif test -n "$WITH_DEBUG"; then X ac_add_options --enable-debug X ac_add_options --disable-strip Xelse X ac_add_options --disable-debug X ac_add_options --enable-optimize=${WITH_OPTIMIZE} X ac_add_options --enable-strip Xfi Xif test -n "$WITH_LOGGING"; then X ac_add_options --enable-logging Xelse X ac_add_options --disable-logging Xfi Xif test -z "$WITH_SMB"; then X ac_add_options --disable-gnomevfs Xfi X###################################################################### END-of-mozilla/files/mozconfig-generic.in echo x - mozilla/pkg-deinstall.in sed 's/^X//' >mozilla/pkg-deinstall.in << 'END-of-mozilla/pkg-deinstall.in' X#!/bin/sh X# X# $FreeBSD$ X# $MCom$ X# X# Date created: Mon Nov 29, 2003 X# Whom: Thierry Thomas () X# Fix the chrome registry. X Xumask 022 XPATH=/bin:/usr/bin X X[ "x$1" = "x" ] && exit 1 X[ "x$2" != "xDEINSTALL" ] && exit 0 X XMOZDIR=%%MOZDIR%% X Xrm -rf ${MOZDIR}/chrome/overlayinfo Xrm -f ${MOZDIR}/chrome/*.rdf Xrm -f ${MOZDIR}/component.reg Xrm -f ${MOZDIR}/components/*.dat X Xexit 0 END-of-mozilla/pkg-deinstall.in echo x - mozilla/pkg-descr sed 's/^X//' >mozilla/pkg-descr << 'END-of-mozilla/pkg-descr' XThis is the current release of the Mozilla open source web browser. It should Xbe fully compliant with all W3C standards, including HTML, CSS, XML, XSL, XJavaScript, MathML, SVG and RDF. This version also supports SSL encryption, Xand Java with the use of the FreeBSD native Java plug-in. X XThis is the latest release of the Mozilla browser. It contains all the Xbugfixes and security enhancements from the mozilla port as well as Xnew new features. X XThis version has been built with GTK+-2 bindings for use with applications Xsuch as Galeon 2. X XWWW: http://www.mozilla.org/ END-of-mozilla/pkg-descr echo x - mozilla/distinfo sed 's/^X//' >mozilla/distinfo << 'END-of-mozilla/distinfo' XMD5 (mozilla-1.7.12-source.tar.bz2) = f1ad6adbbc0510eb76d352c94c801fac XSIZE (mozilla-1.7.12-source.tar.bz2) = 30446836 XMD5 (libart_lgpl-1.tar.bz2) = c6dba83a091336ef8abdb7c85694f16e XSIZE (libart_lgpl-1.tar.bz2) = 102977 END-of-mozilla/distinfo echo x - mozilla/Makefile sed 's/^X//' >mozilla/Makefile << 'END-of-mozilla/Makefile' X# New ports collection makefile for: mozilla X# Date created: 31 Mar 1998 X# Whom: eivind/dima/jseger X# X# $FreeBSD$ X# $MCom$ X# X XPORTNAME= mozilla XPORTVERSION= 1.7.12 XPORTREVISION?= 1 XPORTEPOCH= 2 XCATEGORIES?= www XMASTER_SITES= ${MASTER_SITE_MOZILLA} \ X ${MASTER_SITE_LOCAL:S/$/:local/} XMASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION}/source \ X ahze/:local XDISTFILES= ${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX} \ X libart_lgpl-1${EXTRACT_SUFX}:local X XMAINTAINER= gnome@FreeBSD.org XCOMMENT= The open source, standards compliant web browser X XUSE_GMAKE= yes XUSE_BZIP2= yes XUSE_X_PREFIX= yes XWANT_GNOME= yes XUSE_REINPLACE= yes XHAS_CONFIGURE= yes XMAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin XALL_TARGET= default XMOZ_PIS_DIR= ${FAKEDIR}/lib/${MOZILLA}/init.d XMOZ_PIS_SCRIPTS= # No default X XMOZ_EXTENSIONS= default XCONFIGURE_ENV= LOCALBASE=${LOCALBASE} XPKGINSTALL= ${WRKDIR}/pkg-install XPKGDEINSTALL= ${WRKDIR}/pkg-deinstall XFREETYPE_LIB= libfreetype.so.9 X XOPTIONS=CALENDAR "Enable the Calendar module" off \ X MAILNEWS "Enable Mail and News modules" on \ X COMPOSER "Enable the HTML Composer module" on \ X DEBUG "Enable debugging (i.e. gdb) support" off \ X LDAP "Enable LDAP support for Mailnews" on \ X CHATZILLA "Enable the Chatzilla IRC module" on \ X XMLTERM "Enable the XMLTerm module" on \ X JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \ X OPTIMIZED_CFLAGS "Enable -O2 optimizations" off \ X SMB "Enable smb:// URI support via gnomevfs" off X X.include X.include "${.CURDIR}/Makefile.common" X XLATEST_LINK= ${MOZILLA} X X.if ${ARCH} == "alpha" && ${OSVERSION} < 500035 XIGNORE= core dumps on ${ARCH} during post-build X.endif X X.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \ X defined(WITHOUT_COMPOSER)) XBROKEN= "Calendar requires Composer and Mailnews support." X.endif X.if defined(WITHOUT_MAILNEWS) XCONFIGURE_ENV+= WITHOUT_MAILNEWS=yes X.else X.if defined(WITHOUT_LDAP) XCONFIGURE_ENV+= WITHOUT_LDAP=yes X.endif X.endif X X.if !defined(WITHOUT_CHATZILLA) XMOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc X.endif X.if !defined(WITHOUT_XMLTERM) XMOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},xmlterm X.endif XCONFIGURE_ARGS+= --enable-extensions=${MOZ_EXTENSIONS} X X.if defined(WITH_JAVASCRIPT_DEBUGGER) XCONFIGURE_ENV+= WITH_JAVASCRIPT_DEBUGGER=yes X.endif X X.if defined(WITH_CALENDAR) XCONFIGURE_ARGS+= --enable-calendar X.endif X X.if defined(WITHOUT_COMPOSER) XCONFIGURE_ARGS+= --disable-composer X.endif X Xpost-patch: X @${REINPLACE_CMD} -e 's/%{idldir}/%idldir%/g' \ X ${WRKSRC}/build/unix/mozilla-config.in X @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ X ${WRKSRC}/build/unix/run-mozilla.sh X @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ X -e 's|%%HEADERS_SUFX%%|${MOZ_SUFX}|g' \ X ${WRKSRC}/config/autoconf.mk.in X @${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \ X ${REINPLACE_CMD} 's|||g' X @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ X s|-lpthread|${PTHREAD_LIBS}|g ; \ X s|/usr/X11R6|${X11BASE}|g' \ X ${WRKSRC}/configure X @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ X ${WRKSRC}/security/coreconf/FreeBSD.mk \ X ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ X ${WRKSRC}/js/src/Makefile.in X @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ X ${WRKSRC}/widget/src/gtk2/nsSound.cpp X @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ X ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp X @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ X ${WRKSRC}/modules/libpref/src/init/all.js X @${REINPLACE_CMD} -e 's||\"${LOCALBASE}/include/iconv.h\"|g' \ X ${WRKSRC}/configure \ X ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ X ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp X @${REINPLACE_CMD} -E -e 's|libfreetype\.so\.[0-9]+|${FREETYPE_LIB}|g' \ X ${WRKSRC}/modules/libpref/src/init/all.js X @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \ X < ${FILESDIR}/mozilla.desktop.in > \ X ${WRKDIR}/mozilla.desktop X.for ii in ${MOZ_PIS_SCRIPTS} X @${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g ; \ X s|%%PREFIX%%|${PREFIX}|g ; \ X s|%%X11BASE%%|${X11BASE}|g' \ X < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} X.endfor X Xpre-install: X ${RM} -rf ${FAKEDIR} ${PLIST} X ${TOUCH} -f ${PLIST} X cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ X Makefile ${MAKE_ARGS} ${INSTALL_TARGET} X ${MKDIR} ${MOZ_PIS_DIR} X ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ X ${FAKEDIR}/bin/mozilla \ X ${FAKEDIR}/bin/mozilla-config X if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ X ${ECHO_CMD} bin/mozilla >> ${PLIST} ; \ X fi X if [ "${MOZILLA}" != "mozilla" ]; then \ X ${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} ; \ X fi X if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ X for jpi in ${JPI_LIST}; do \ X if [ -f $${jpi} ]; then \ X ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ X break; \ X fi; \ X done; \ X fi X ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} X ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} X ${ECHO_CMD} lib/${MOZILLA}/mozilla >> ${PLIST} X ${ECHO_CMD} lib/${MOZILLA}/mozilla-config >> ${PLIST} X.for ii in ${MOZ_PIS_SCRIPTS} X ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} X.endfor X.if !defined(WITHOUT_MAILNEWS) X @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults X.endif X ${ECHO_CMD} share/applications/mozilla.desktop >> ${PLIST} X ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} X cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} -s * -type f -o -type l | \ X ${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \ X && ${FIND} -d * -type d | \ X ${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST} X ${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST} X for pcfile in ${PKGCONFIG_FILES}; do \ X ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \ X done X cd ${FAKEDIR}/include/mozilla && ${FIND} -s * -type f -o -type l | \ X ${SED} -e 's:^:include/${MOZILLA}/:' >> ${PLIST} \ X && ${FIND} -d * -type d | \ X ${SED} -e 's:^:@dirrm include/${MOZILLA}/:' >> ${PLIST} X ${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST} X ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} X ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} X cd ${FAKEDIR}/share/idl/${MOZILLA}-${PORTVERSION} \ X && ${FIND} -s * -type f -o -type l | \ X ${SED} -e 's:^:share/idl/${MOZILLA}/:' >> ${PLIST} \ X && ${FIND} -d * -type d | \ X ${SED} -e 's:^:@dirrm share/idl/${MOZILLA}/:' >> ${PLIST} X ${ECHO_CMD} "@dirrm share/idl/${MOZILLA}" >> ${PLIST} X ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST} X Xdo-install: X ${MKDIR} ${PREFIX}/lib/${MOZILLA} X ${CHMOD} 755 ${PREFIX}/lib/${MOZILLA} X ${INSTALL_SCRIPT} ${FAKEDIR}/bin/mozilla ${PREFIX}/lib/${MOZILLA} X ${INSTALL_SCRIPT} ${FAKEDIR}/bin/mozilla-config ${PREFIX}/lib/${MOZILLA} X cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} . | \ X ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} X ${INSTALL_SCRIPT} ${FAKEDIR}/bin/mozilla ${PREFIX}/bin X if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ X ${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \ X fi X if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ X ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ X fi X ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep X if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ X for jpi in ${JPI_LIST}; do \ X if [ -f $${jpi} ]; then \ X ${LN} -sf $${jpi} \ X ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ X break; \ X fi; \ X done; \ X fi X for pcfile in ${PKGCONFIG_FILES}; do \ X ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ X ${WRKSRC}/build/unix/$${pcfile}.pc; \ X ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \ X ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \ X done X -${RM} -fr ${PREFIX}/include/${MOZILLA} X ${MKDIR} ${PREFIX}/include/${MOZILLA} X ${CHMOD} 755 ${PREFIX}/include/${MOZILLA} X cd ${FAKEDIR}/include/mozilla && ${FIND} . | \ X ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA} X ${MKDIR} ${PREFIX}/share/applications X ${INSTALL_DATA} ${WRKDIR}/mozilla.desktop \ X ${PREFIX}/share/applications X ${MKDIR} ${PREFIX}/share/idl/${MOZILLA} X cd ${FAKEDIR}/share/idl/${MOZILLA}-${PORTVERSION} && ${FIND} . | \ X ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${MOZILLA} X Xpost-install: X @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components X.if !defined(PACKAGE_BUILDING) X @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL X.endif X @-update-desktop-database X X.include END-of-mozilla/Makefile echo x - mozilla/pkg-install.in sed 's/^X//' >mozilla/pkg-install.in << 'END-of-mozilla/pkg-install.in' X#!/bin/sh X# X# $FreeBSD$ X# $MCom$ X# X# Date created: Mon Nov 29, 2003 X# Whom: Thierry Thomas () X# Fix the chrome registry. X Xumask 022 XPATH=/bin:/usr/bin X X[ "x$1" = "x" ] && exit 1 X[ "x$2" != "xPOST-INSTALL" ] && exit 0 X XMOZDIR=%%MOZDIR%% XREGXPCOM=${MOZDIR}/regxpcom XREGCHROME=${MOZDIR}/regchrome X Xecho "===> Building Chrome's registry..." Xrm -rf ${MOZDIR}/chrome/overlayinfo Xrm -f ${MOZDIR}/chrome/*.rdf Xmkdir -p ${MOZDIR}/chrome/overlayinfo Xrm -f ${MOZDIR}/component.reg X Xcd ${MOZDIR} || exit 1 X./run-mozilla.sh ${REGXPCOM} || true X./run-mozilla.sh ${REGCHROME} || true X Xif [ ! -d %%PREFIX%%/lib/browser_plugins ]; then X mkdir -p %%PREFIX%%/lib/browser_plugins Xfi X Xexit 0 END-of-mozilla/pkg-install.in echo x - mozilla/Makefile.common sed 's/^X//' >mozilla/Makefile.common << 'END-of-mozilla/Makefile.common' X# $FreeBSD$ X# $MCom$ X XBUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip XLIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ X png.5:${PORTSDIR}/graphics/png \ X nspr4:${PORTSDIR}/devel/nspr \ X nss3:${PORTSDIR}/security/nss \ X Xft.2:${PORTSDIR}/x11-fonts/libXft X XMAINTAINER?= gnome@FreeBSD.org X XMOZILLA?= ${PORTNAME} XMOZILLA_VER?= ${PORTVERSION} XUSE_GNOME+= gtk20 libidl desktopfileutils XUSE_ICONV= yes XUSE_PERL5_BUILD=yes XUSE_X_PREFIX= yes X XWRKSRC?= ${WRKDIR}/mozilla XPKGINSTALL?= ${WRKDIR}/pkg-install XPKGDEINSTALL?= ${WRKDIR}/pkg-deinstall XFAKEDIR?= ${WRKDIR}/fake XPLIST?= ${WRKDIR}/plist X XKRB5_HOME?= /usr X XGENERIC_MOZCONFIG?= ${.CURDIR}/../../www/mozilla/files/mozconfig-generic.in XPORT_MOZCONFIG?= ${FILESDIR}/files/mozconfig.in XMOZCONFIG?= ${WRKSRC}/.mozconfig X XEXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ X --exclude */macbuild/* \ X --exclude */package/* \ X --exclude .cvsignore \ X --exclude makefile.win \ X --exclude MANIFEST \ X --exclude */nsprpub/* \ X --exclude */zlib/ \ X --exclude mozilla/modules/libimg/png \ X --exclude mozilla/jpeg \ X --exclude mozilla/dbm \ X --exclude mozilla/js/src/fdlibm \ X --exclude mozilla/security/nss \ X --exclude mozilla/gc/boehm \ X --exclude mozilla/gfx/cairo X XJPI_LIST?=\ X ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \ X ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so X XPKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ X ${MOZILLA}-xpcom ${MOZILLA}-plugin X X.if defined(WITH_SMB) XUSE_GNOME+= gnomevfs2 XCONFIGURE_ENV+= WITH_SMB=yes X.endif X X.if defined(WITH_DEBUG) XCONFIGURE_ENV+= WITH_DEBUG=yes XWITH_LOGGING= yes X.endif X X.if defined(WITH_LOGGING) XCONFIGURE_ENV+= WITH_LOGGING=yes X.endif X X.if defined(WITH_OPTIMIZED_CFLAGS) XCFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} X.else XCFLAGS:= ${CFLAGS:N-O*:N-m*} -O XCONFIGURE_ENV+= WITH_OPTIMIZE=-O X.endif X X.if exists(${LOCALBASE}/include/freetype/freetype.h) XBROKEN= "You must upgrade your freetype port to 1.3.1_2 or higher before \ X installing ${PORTNAME}. If you have 1.3.1_2 installed, please remove \ X ${LOCALBASE}/include/freetype, then build ${PORTNAME}" X.endif X X# Makefile.common defines XMOZCONFIG_SED= ${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ X -e 's|@CFLAGS@|${CFLAGS}|' \ X -e 's|@LDFLAGS@|${LDFLAGS}|' \ X -e 's|@LIBS@|${LIBS}|' \ X -e 's|@X11BASE@|${X11BASE}|' \ X -e 's|@LOCALBASE@|${LOCALBASE}|' \ X -e 's|@FAKEDIR@|${FAKEDIR}|' \ X -e 's|@PERL@|${PERL5}|' \ X -e 's|@KRB5_HOME@|${KRB5_HOME}|' \ X -e 's|@MOZDIR@|${PREFIX}/lib/${MOZILLA}|' X Xpre-configure: X.if exists(${.CURDIR}/pkg-install.in) X @${MOZCONFIG_SED} < ${.CURDIR}/pkg-install.in > ${PKGINSTALL} X.endif X.if exists(${.CURDIR}/pkg-deinstall.in) X @${MOZCONFIG_SED} < ${.CURDIR}/pkg-deinstall.in > ${PKGDEINSTALL} X.endif X @${RM} -f ${MOZCONFIG} X.if exists(${GENERIC_MOZCONFIG}) X @${MOZCONFIG_SED} < ${GENERIC_MOZCONFIG} >> ${MOZCONFIG} X.endif X.if exists(${PORT_MOZCONFIG}) X @${MOZCONFIG_SED} < ${PORT_MOZCONFIG} >> ${MOZCONFIG} X.endif X @${REINPLACE_CMD} -e 's/%{idldir}/%idldir%/g ; \ X s|"%FULL_NSPR_CFLAGS%"|`nspr-config --cflags`|g ; \ X s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \ X ${WRKSRC}/build/unix/mozilla-config.in X @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \ X ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ X ${FALSE}; \ X fi END-of-mozilla/Makefile.common exit