Ticket #202: mozilla-1.0.1.patch

build/unix/run-mozilla.sh

@@ -65 +65 @@
 #
 cmdname=`basename $0`
 MOZ_DIST_BIN=`dirname $0`
-MOZ_DEFAULT_NAME="./${cmdname}-bin"
-MOZ_APPRUNNER_NAME="./mozilla-bin"
-MOZ_VIEWER_NAME="./viewer"
+MOZ_DEFAULT_NAME="${MOZ_DIST_BIN}/${cmdname}-bin"
+MOZ_APPRUNNER_NAME="${MOZ_DIST_BIN}/mozilla-bin"
+MOZ_VIEWER_NAME="${MOZ_DIST_BIN}/viewer"
 MOZ_PROGRAM=""
+MOZ_CLIENT_PROGRAM="${MOZ_DIST_BIN}/mozilla-xremote-client"
 
 exitcode=0
 #
@@ -131 +132 @@
         return 0
 }
 ##########################################################################
+function check_running() {
+    $MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null
+    RETURN_VAL=$?
+    if [ "$RETURN_VAL" -eq "2" ]; then
+      echo 0
+      return 0
+    else
+      echo 1
+      return 1
+    fi
+}
+##########################################################################
 moz_get_debugger()
 {
         debuggers="ddd gdb dbx bdb"
@@ -349 +362 @@
 ## Set MOZILLA_FIVE_HOME
 ##
 MOZILLA_FIVE_HOME=$MOZ_DIST_BIN
+export XPCOM_CHECK_THREADSAFE=0
 
 if [ -z "$MRE_HOME" ]; then
     MRE_HOME=$MOZILLA_FIVE_HOME
@@ -429 +443 @@
 
 if [ $moz_debug -eq 1 ]
 then
-        moz_debug_program ${1+"$@"}
+  moz_debug_program ${1+"$@"}
 else
-        moz_run_program ${1+"$@"}
+  USE_EXIST=1
+  ALREADY_RUNNING=`check_running`
+  if [ "${ALREADY_RUNNING}" -eq "1" ] && [ -n "$1" ]; then
+    USE_EXIST=0
+    opt="$1"
+    case "$opt" in
+      -mail)
+        exec $MOZ_CLIENT_PROGRAM 'xfeDoCommand(openInbox)'
+        ;;
+      -compose)
+        exec $MOZ_CLIENT_PROGRAM 'xfeDoCommand(composeMessage)'
+        ;;
+      -*) ;;
+      *) USE_EXIST=1 ;;
+    esac
+  fi
+  if [ "${ALREADY_RUNNING}" -eq "1" ] && [ "${USE_EXIST}" -eq "1" ]; then
+    # If there is no command line argument at all then try to open a new
+    # window in an already running instance.
+    if [ -z "$1" ]; then
+      exec $MOZ_CLIENT_PROGRAM "xfeDoCommand(openBrowser)"
+    fi
+
+    # check to make sure that the command contains at least a :/ in it.
+    echo $opt | grep -e ':/' 2>/dev/null > /dev/null
+    RETURN_VAL=$?
+    if [ "$RETURN_VAL" -eq "1" ]; then
+      # if it doesn't begin with a '/' and it exists when the pwd is
+      # prepended to it then append the full path
+      echo $opt | grep -e '^/' 2>/dev/null > /dev/null
+      if [ "${RETURN_VAL}" -ne "0" ] && [ -e `pwd`/$opt ]; then
+        opt="`pwd`/$opt"
+      fi
+      exec $MOZ_CLIENT_PROGRAM "openurl($opt)"
+    fi
+    exec $MOZ_CLIENT_PROGRAM "openurl($opt,new-window)"
+  fi
+  moz_run_program ${1+"$@"}
 fi
 
 exit $exitcode

security/coreconf/headers.mk

@@ -58 +58 @@
 endif
 
 MK_HEADERS = included
+INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm

xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_x86.cpp

@@ -40 +40 @@
 #include "xptcprivate.h"
 #include "xptc_platforms_unixish_x86.h"
 
-extern "C" {
-
-static void
+extern "C" void
 invoke_copy_to_stack(PRUint32 paramCount, nsXPTCVariant* s, PRUint32* d)
 {
     for(PRUint32 i = paramCount; i >0; i--, d++, s++)
@@ -70 +68 @@
     }
 }
 
-}
-
+extern "C"
 XPTC_PUBLIC_API(nsresult)
 XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-                   PRUint32 paramCount, nsXPTCVariant* params)
-{
-#ifdef __GNUC__            /* Gnu compiler. */
-  PRUint32 result;
-  // Each param takes at most 2, 4-byte words
-  // It doesn't matter if we push too many words, and calculating the exact
-  // ammount takes time.
-  PRUint32 n = paramCount << 3;
-  void (*fn_copy) (unsigned int, nsXPTCVariant *, PRUint32 *) = invoke_copy_to_stack;
-  int temp1, temp2, temp3;
- 
- __asm__ __volatile__(
-    "subl  %8, %%esp\n\t" /* make room for params */
-    "pushl %%esp\n\t"
-    "pushl %7\n\t"
-    "pushl %6\n\t"
-    "call  *%0\n\t"       /* copy params */
-    "addl  $0xc, %%esp\n\t"
-    "movl  %4, %%ecx\n\t"
+                   PRUint32 paramCount, nsXPTCVariant* params);
+
+#ifdef __GNUC__                 /* GNU compiler */
+asm(".section   \".text\"\n\t"
+    ".align     2\n\t"
+    ".globl     XPTC_InvokeByIndex\n\t"
+    ".type      XPTC_InvokeByIndex,@function\n"
+"XPTC_InvokeByIndex:\n\t"
+    "pushl %ebp\n\t"
+    "movl  %esp, %ebp\n\t"
+    "pushl %ecx\n\t"
+    "pushl %edx\n\t"
+    "pushl %edi\n\t"
+    "movl  0x10(%ebp), %ecx\n\t"        /* paramCount */
+    "movl  0x14(%ebp), %edx\n\t"        /* params */
+    // Each param takes at most 2, 4-byte words
+    // It doesn't matter if we push too many words, and calculating the exact
+    // ammount takes time.
+    "leal  0(,%ecx,8), %edi\n\t"
+    "subl  %edi, %esp\n\t"
+    "pushl %esp\n\t"                    /* copy params */
+    "pushl %edx\n\t"
+    "pushl %ecx\n\t"
+    "call  invoke_copy_to_stack\n\t"
+    "addl  $12, %esp\n\t"
+    "movl  0x08(%ebp), %ecx\n\t"        /* that */
+    "movl  0x0c(%ebp), %eax\n\t"        /* methodIndex */
 #ifdef CFRONT_STYLE_THIS_ADJUST
-    "movl  (%%ecx), %%edx\n\t"
-    "movl  %5, %%eax\n\t"   /* function index */
-    "shl   $3, %%eax\n\t"   /* *= 8 */
-    "addl  $8, %%eax\n\t"   /* += 8 skip first entry */
-    "addl  %%eax, %%edx\n\t"
-    "movswl (%%edx), %%eax\n\t" /* 'this' offset */
-    "addl  %%eax, %%ecx\n\t"
-    "pushl %%ecx\n\t"
-    "addl  $4, %%edx\n\t"   /* += 4, method pointer */
+#error "FIXME: untested"
+    "movl  (%ecx), %edx\n\t"
+    "shl   $3, %eax\n\t"                /* *= 8 */
+    "addl  $8, %eax\n\t"                /* += 8 skip first entry */
+    "addl  %eax, %edx\n\t"
+    "movswl (%edx), %eax\n\t"           /* 'this' offset */
+    "addl  %eax, %ecx\n\t"
+    "pushl %ecx\n\t"
+    "addl  $4, %edx\n\t"                /* += 4, method pointer */
 #else /* THUNK_BASED_THIS_ADJUST */
-    "pushl %%ecx\n\t"
-    "movl  (%%ecx), %%edx\n\t"
-    "movl  %5, %%eax\n\t"   /* function index */
+    "pushl %ecx\n\t"
+    "movl  (%ecx), %edx\n\t"
 #if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-    "leal  (%%edx,%%eax,4), %%edx\n\t"
+    "leal  0(%edx,%eax,4), %edx\n\t"
 #else /* not G++ V3 ABI  */
-    "leal  8(%%edx,%%eax,4), %%edx\n\t"
+    "leal  8(%edx,%eax,4), %edx\n\t"
 #endif /* G++ V3 ABI */
 #endif
-    "call  *(%%edx)\n\t"    /* safe to not cleanup esp */
-    "addl  $4, %%esp\n\t"
-    "addl  %8, %%esp"
-    : "=a" (result),        /* %0 */
-      "=c" (temp1),         /* %1 */
-      "=d" (temp2),         /* %2 */
-      "=g" (temp3)          /* %3 */
-    : "g" (that),           /* %4 */
-      "g" (methodIndex),    /* %5 */
-      "1" (paramCount),     /* %6 */
-      "2" (params),         /* %7 */
-      "g" (n),              /* %8 */
-      "0" (fn_copy)         /* %3 */
-    : "memory"
-    );
-    
-  return result;
-
+    "call  *(%edx)\n\t"
+    "addl  $4, %esp\n\t"                /* reajust stack for "this" pointer */
+    "addl  %edi, %esp\n\t"              /* ... and space for params */
+    "popl  %edi\n\t"
+    "popl  %edx\n\t"
+    "popl  %ecx\n\t"
+    "popl  %ebp\n\t"
+    "ret"
+);
 #else
 #error "can't find a compiler to use"
 #endif /* __GNUC__ */
-
-}    

xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp

@@ -40 +40 @@
 #include "xptcprivate.h"
 #include "xptc_platforms_unixish_x86.h"
 
-static nsresult
+extern "C" nsresult
 PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
 {
 #define PARAM_BUFFER_COUNT     16
@@ -102 +102 @@
     return result;
 }
 
-#ifdef __GNUC__         /* Gnu Compiler. */
-#define STUB_ENTRY(n) \
-nsresult nsXPTCStubBase::Stub##n() \
-{ \
-  register nsresult (*method) (nsXPTCStubBase *, uint32, PRUint32 *) = PrepareAndDispatch; \
-  int temp0, temp1; \
-  register nsresult result; \
-  __asm__ __volatile__( \
-    "leal   0x0c(%%ebp), %%ecx\n\t"    /* args */ \
-    "pushl  %%ecx\n\t" \
-    "pushl  $"#n"\n\t"                 /* method index */ \
-    "movl   0x08(%%ebp), %%ecx\n\t"    /* this */ \
-    "pushl  %%ecx\n\t" \
-    "call   *%%edx\n\t"                /* PrepareAndDispatch */ \
-    "addl   $12, %%esp" \
-    : "=a" (result),    /* %0 */ \
-      "=&c" (temp0),    /* %1 */ \
-      "=d" (temp1)      /* %2 */ \
-    : "2" (method)      /* %2 */ \
-    : "memory" ); \
-    return result; \
-}
+#ifndef __GNUC__
+#error "can't find a compiler to use"
+#endif
 
+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
+// gcc3 mangling tends to insert the length of the method name
+#define STUB_ENTRY(n)                                                   \
+asm(".section   \".text\"\n\t"                                          \
+    ".align     2\n\t"                                                  \
+    ".if        " #n " < 10\n\t"                                        \
+    ".globl     _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t"                   \
+    ".type      _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n"           \
+"_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t"                                 \
+                                                                        \
+    ".elseif    " #n " < 100\n\t"                                       \
+    ".globl     _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t"                   \
+    ".type      _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n"           \
+"_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t"                                 \
+                                                                        \
+    ".elseif    " #n " < 1000\n\t"                                      \
+    ".globl     _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t"                   \
+    ".type      _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n"           \
+"_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t"                                 \
+                                                                        \
+    ".else\n\t"                                                         \
+    ".err       \"stub number " #n " >= 1000 not yet supported\"\n\t"   \
+    ".endif\n\t"                                                        \
+                                                                        \
+    "movl       $" #n ", %eax\n\t"                                      \
+    "jmp        SharedStub"                                             \
+);
 #else
-#error "can't find a compiler to use"
-#endif /* __GNUC__ */
+// gcc2 version
+#define STUB_ENTRY(n)                                           \
+asm(".section   \".text\"\n\t"                                  \
+    ".align     2\n\t"                                          \
+    ".globl     Stub" #n "__14nsXPTCStubBase\n\t"               \
+    ".type      Stub" #n "__14nsXPTCStubBase,@function\n"       \
+"Stub" #n "__14nsXPTCStubBase:\n\t"                             \
+    "movl       $" #n ", %eax\n\t"                              \
+    "jmp        SharedStub\n\t"                                 \
+);
+#endif
+
+// static nsresult SharedStub(PRUint32 methodIndex) __attribute__((regparm(1)))
+asm(".section   \".text\"\n\t"
+    ".align     2\n\t"
+    ".type      SharedStub,@function\n\t"
+"SharedStub:\n\t"
+    "pushl %ebp\n\t"
+    "movl  %esp, %ebp\n\t"
+    "leal  0x0c(%ebp), %ecx\n\t"
+    "pushl %ecx\n\t"
+    "pushl %eax\n\t"
+    "movl  0x08(%ebp), %ecx\n\t"
+    "pushl %ecx\n\t"
+    "call  PrepareAndDispatch\n\t"
+    "addl  $12, %esp\n\t"
+    "popl  %ebp\n\t"
+    "ret"
+);
 
 #define SENTINEL_ENTRY(n) \
 nsresult nsXPTCStubBase::Sentinel##n() \

modules/libpref/src/unix/unix.js

@@ -223 +223 @@
 pref("font.scale.outline.min",      6);
 
 // TrueType
-pref("font.FreeType2.enable", false);
+pref("font.FreeType2.enable", true);
 pref("font.freetype2.shared-library", "libfreetype.so.6");
 // if libfreetype was built without hinting compiled in
 // it is best to leave hinting off
 pref("font.FreeType2.autohinted", false);
-pref("font.FreeType2.unhinted", true);
+pref("font.FreeType2.unhinted", false);
 // below a certian pixel size anti-aliased fonts produce poor results
 pref("font.antialias.min",        10);
 pref("font.embedded_bitmaps.max", 1000000);
 pref("font.scale.tt_bitmap.dark_text.min", 64);
 pref("font.scale.tt_bitmap.dark_text.gain", "0.8");
 // sample prefs for TrueType font dirs
-//pref("font.directory.truetype.1", "/u/sam/tt_font");
+pref("font.directory.truetype.1", "/usr/X11R6/lib/X11/fonts/TTF");
 //pref("font.directory.truetype.2", "/u/sam/tt_font2");
 //pref("font.directory.truetype.3", "/u/sam/tt_font3");
 

other-licenses/freetype/include/freetype/config/ftoption.h

@@ -375 +375 @@
   /* By undefining this, you will only compile the code necessary to load  */
   /* TrueType glyphs without hinting.                                      */
   /*                                                                       */
-#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
 
 
   /*************************************************************************/

xpfe/bootstrap/nsAppRunner.cpp

@@ -135 +135 @@
 #include "jprof.h"
 #endif
 
+// on x86 linux, the current builds of some popular plugins (notably
+// flashplayer and real) expect a few builtin symbols from libgcc
+// which were available in some older versions of gcc.  However,
+// they're _NOT_ available in newer versions of gcc (eg 3.1), so if
+// we want those plugin to work with a gcc-3.1 built binary, we need
+// to provide these symbols.  MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS defaults
+// to true on x86 linux, and false everywhere else.
+//
+// The fact that the new and free operators are mismatched 
+// mirrors the way the original functions in egcs 1.1.2 worked.
+
+extern "C" {
+
+# ifndef HAVE___builtin_vec_new
+  void *__builtin_vec_new(size_t aSize, const std::nothrow_t &aNoThrow) throw()
+  {
+    return ::operator new(aSize, aNoThrow);
+  }
+# endif
+
+# ifndef HAVE___builtin_vec_delete
+  void __builtin_vec_delete(void *aPtr, const std::nothrow_t &) throw ()
+  {
+    if (aPtr) {
+      free(aPtr);
+    }
+  }
+# endif
+
+# ifndef HAVE__builtin_new
+        void *__builtin_new(int aSize)
+  {
+    return malloc(aSize);
+  }
+# endif
+
+# ifndef HAVE__builtin_delete
+        void __builtin_delete(void *aPtr)
+  {
+    free(aPtr);
+  }
+# endif
+
+# ifndef HAVE__pure_virtual
+  void __pure_virtual(void) {
+    extern void __cxa_pure_virtual(void);
+
+    __cxa_pure_virtual();
+  }
+# endif
+}
 
 #ifdef _BUILD_STATIC_BIN
 #include "nsStaticComponent.h"

allmakefiles.sh

@@ -1065 +1065 @@
             extensions/pref/autoconfig/public/Makefile
             extensions/pref/autoconfig/src/Makefile
             " ;;
+        spellcheck ) MAKEFILES_extensions="$MAKEFILES_extensions
+            extensions/spellcheck/Makefile
+            extensions/spellcheck/idl/Makefile
+            extensions/spellcheck/myspell/Makefile
+            extensions/spellcheck/myspell/dictionaries/Makefile
+            extensions/spellcheck/src/Makefile
+            " ;;
         transformiix ) MAKEFILES_extensions="$MAKEFILES_extensions
             $MAKEFILES_transformiix"
             ;;

xpinstall/packager/packages-unix

@@ -403 +403 @@
 bin/defaults/pref/inspector.js
 bin/res/inspector/viewer-registry.rdf
 bin/res/inspector/search-registry.rdf
+
+[spellchecker]
+bin/components/libmyspell.so
+bin/components/libspellchecker.so
+bin/components/spellchecker.xpt
+bin/components/myspell/*