diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig
--- mozilla-orig/.mozconfig Wed Dec 31 19:00:00 1969
+++ mozilla/.mozconfig Mon Jun 19 15:10:13 2006
@@ -0,0 +1,44 @@
+# sh
+# Build configuration script
+#
+# See http://www.mozilla.org/build/unix.html for build instructions.
+#
+
+. $topsrcdir/browser/config/mozconfig
+
+# Options for client.mk.
+# environment variables to set
+#mk_add_options MOZILLA_OFFICIAL=1
+#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --enable-official-branding
+ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-xft
+#ac_add_options --disable-xft
+#ac_add_options --enable-freetype2
+ac_add_options --disable-freetype2
+ac_add_options --enable-postscript
+ac_add_options --enable-xinerama
+ac_add_options --with-pthreads
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-gnomeui
+ac_add_options --enable-extensions=default,-gnomevfs,xforms,schema-validation
+ac_add_options --enable-canvas
+ac_add_options --enable-svg
+
+# prebinding disabled or otherwise don't get binary
+ac_add_options --disable-prebinding
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+ac_add_options --enable-strip
+ac_add_options --enable-optimize='-Os'
+ac_add_options --enable-macos-target=10.3
+ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/firefox1.5
+ac_add_options --with-system-jpeg=@PREFIX@
+ac_add_options --with-system-png=@PREFIX@
+ac_add_options --with-system-zlib=/usr
+ac_add_options --with-freetype-prefix=@PREFIX@/lib/freetype219
+
+#ac_add_options --with-ft-prefix=@PREFIX@/lib/freetype2
+#ac_add_options --with-ft-exec-prefix=@PREFIX@/lib/freetype2/bin
diff -ruN mozilla-orig/browser/app/mozilla.in mozilla/browser/app/mozilla.in
--- mozilla-orig/browser/app/mozilla.in Tue Sep 20 17:13:03 2005
+++ mozilla/browser/app/mozilla.in Mon Jun 19 15:10:13 2006
@@ -99,7 +99,9 @@
# If not, then start resolving symlinks until we find run-mozilla.sh
found=0
progname="$0"
-curdir=`dirname "$progname"`
+#curdir=`dirname "$progname"`
+# looking in %p/bin, not %p/lib/firefox, so fixing to $moz_libdir
+curdir="$moz_libdir"
progbase=`basename "$progname"`
run_moz="$curdir/run-mozilla.sh"
if test -x "$run_moz"; then
@@ -140,9 +142,75 @@
debugging=0
MOZILLA_BIN="${progbase}-bin"
+# The following is to check for a currently running instance.
+# This is taken almost verbatim from the Mozilla RPM package's launch script.
+MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client"
+check_running() {
+ "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null
+ RETURN_VAL=$?
+ if [ $RETURN_VAL -eq 0 ]; then
+ echo 1
+ return 1
+ else
+ echo 0
+ return 0
+ fi
+}
+
if [ "$OSTYPE" = "beos" ]; then
mimeset -F "$MOZILLA_BIN"
fi
+
+ALREADY_RUNNING=`check_running`
+
+################################################################ Parse Arguments
+# If there's a command line argument but it doesn't begin with a -
+# it's probably a url. Try to send it to a running instance.
+_USE_EXIST=0
+_optOne="$1"
+case "${_optOne}" in
+ -*)
+ ;;
+ *)
+ _USE_EXIST=1
+ ;;
+esac
+
+_optLast=
+for i in "$@"; do
+ _optLast="${i}"
+done #last arg
+
+if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+ # Last argument seems to be a local file/directory
+ # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
+ # If it is just "relatively" (./file) specified, make it absolutely
+ [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+fi
+################################################################ Parse Arguments
+
+########################################################################### Main
+if [ $ALREADY_RUNNING -eq 1 ]; then
+ # There's an instance already running. Use it.
+ # Any command line args passed in?
+ if [ $# -gt 0 ]; then
+ # There were "some" command line args.
+ if [ ${_USE_EXIST} -eq 1 ]; then
+ # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1
+ _remote_cmd="openURL(${_optLast})"
+ "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}"
+ unset _remote_cmd
+ exit $?
+ fi
+ else
+ # No command line args. Open new window/tab
+ #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
+ "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
+ exit $?
+ fi
+fi
+# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
+########################################################################### Main
pass_arg_count=0
while [ $# -gt $pass_arg_count ]
diff -ruN mozilla-orig/browser/components/build/Makefile.in mozilla/browser/components/build/Makefile.in
--- mozilla-orig/browser/components/build/Makefile.in Wed Jun 22 22:25:04 2005
+++ mozilla/browser/components/build/Makefile.in Mon Jun 19 15:10:13 2006
@@ -74,6 +74,12 @@
$(MOZ_COMPONENT_LIBS) \
$(NULL)
+# fix for building on Mac/X11 (bug 257773)
+# dependencies for gkgfx
+ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
+endif
+
# Need to link to CoreFoundation for Mac Migrators (PList reading code)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
EXTRA_DSO_LDOPTS += \
diff -ruN mozilla-orig/browser/locales/en-US/profile/bookmarks.html mozilla/browser/locales/en-US/profile/bookmarks.html
--- mozilla-orig/browser/locales/en-US/profile/bookmarks.html Thu Nov 3 03:30:35 2005
+++ mozilla/browser/locales/en-US/profile/bookmarks.html Mon Jun 19 15:10:14 2006
@@ -12,6 +12,7 @@
- Getting Started
- Latest Headlines
+
- Fink - Home
Quick Searches
diff -ruN mozilla-orig/build/unix/mozilla-config.in mozilla/build/unix/mozilla-config.in
--- mozilla-orig/build/unix/mozilla-config.in Thu Apr 22 16:17:59 2004
+++ mozilla/build/unix/mozilla-config.in Mon Jun 19 15:01:39 2006
@@ -115,7 +115,7 @@
fi
_nspr_libs="%FULL_NSPR_LIBS%"
-_xpcom_libs="-lxpcom $_nspr_libs"
+_xpcom_libs="-lxpcom -lxpcom_core $_nspr_libs"
_js_libs="-ljs"
if test "$echo_libs" = "yes"; then
diff -ruN mozilla-orig/build/unix/mozilla-xpcom.pc.in mozilla/build/unix/mozilla-xpcom.pc.in
--- mozilla-orig/build/unix/mozilla-xpcom.pc.in Tue Jul 5 19:21:52 2005
+++ mozilla/build/unix/mozilla-xpcom.pc.in Mon Jun 19 15:03:51 2006
@@ -8,5 +8,5 @@
Description: The Mozilla Cross Platform Component Library
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
-Libs: -L${libdir} -lxpcom
+Libs: -L${libdir} -lxpcom -lxpcom_core
Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in
--- mozilla-orig/config/autoconf.mk.in Fri Apr 21 16:50:30 2006
+++ mozilla/config/autoconf.mk.in Mon Jun 19 15:10:14 2006
@@ -56,14 +56,14 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir = @includedir@/$(MOZ_APP_NAME)1.5
libdir = @libdir@
datadir = @datadir@
mandir = @mandir@
-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir = @datadir@/idl/$(MOZ_APP_NAME)1.5
-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
+mozappdir = $(libdir)/$(MOZ_APP_NAME)1.5
+mredir = $(libdir)/mre/mre1.5
mrelibdir = $(mredir)/lib
DIST = $(DEPTH)/dist
diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk
--- mozilla-orig/config/config.mk Thu Apr 6 12:28:13 2006
+++ mozilla/config/config.mk Mon Jun 19 15:10:14 2006
@@ -679,7 +679,7 @@
ifeq ($(OS_ARCH),Darwin)
ifdef USE_PREBINDING
export LD_PREBIND=1
-export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir); pwd)/config/prebind-address-table
+export LD_PREBIND_ALLOW_OVERLAP=1
endif # USE_PREBINDING
ifdef NEXT_ROOT
export NEXT_ROOT
diff -ruN mozilla-orig/configure mozilla/configure
--- mozilla-orig/configure Fri Apr 21 17:41:39 2006
+++ mozilla/configure Mon Jun 19 15:10:14 2006
@@ -5410,7 +5410,7 @@
;;
*-darwin*)
- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(DIST)/bin'
@@ -5696,10 +5696,10 @@
*-darwin*)
_PEDANTIC=
- CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
- CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
+ CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
+ CXXFLAGS="$CXXFLAGS -no-cpp-precomp -fno-common"
DLL_SUFFIX=".dylib"
- DSO_LDOPTS=''
+ DSO_LDOPTS='-framework CoreFoundation'
STRIP="$STRIP -x -S"
_PLATFORM_DEFAULT_TOOLKIT='mac'
MOZ_ENABLE_POSTSCRIPT=
diff -ruN mozilla-orig/fink/applications/firefox.desktop mozilla/fink/applications/firefox.desktop
--- mozilla-orig/fink/applications/firefox.desktop Wed Dec 31 19:00:00 1969
+++ mozilla/fink/applications/firefox.desktop Mon Jun 19 15:10:14 2006
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Firefox Web Browser
+Comment=Browse the World Wide Web
+Exec=firefox
+Icon=firefox.xpm
+Terminal=false
+Type=Application
+Categories=Application;Network
+StartupNotify=true
diff -ruN mozilla-orig/fink/fink.js mozilla/fink/fink.js
--- mozilla-orig/fink/fink.js Wed Dec 31 19:00:00 1969
+++ mozilla/fink/fink.js Mon Jun 19 15:10:14 2006
@@ -0,0 +1,27 @@
+pref("general.useragent.extra.vendorComment", "Fink Community Edition");
+
+// Give a default font set that can do BOLD
+pref("font.name.serif.x-western", "Bitstream Vera Serif");
+pref("font.name.sans-serif.x-western", "Bitstream Vera Sans");
+pref("font.size.variable.x-western", 15);
+
+// TrueType
+//pref("font.FreeType2.enable", true);
+//pref("font.freetype2.shared-library", "@PREFIX@/lib/freetype219/lib/libfreetype.6.dylib");
+//pref("font.freetype2.shared-library", "/usr/X11R6/lib/libfreetype.6.dylib");
+//pref("font.freetype2.autohinted", true);
+//pref("font.freetype2.unhinted", true);
+//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.0");
+//pref("font.directory.truetype.1", "/Library/Fonts");
+//pref("font.directory.truetype.2", "/Network/Library/Fonts");
+//pref("font.directory.truetype.3", "/System/Library/Fonts");
+//pref("font.directory.truetype.4", "/usr/X11R6/lib/X11/fonts/TTF");
+//pref("font.directory.truetype.5", "@PREFIX@/share/fonts/truetype");
+
+// AA with Bitmap scaling.
+//pref("font.scale.aa_bitmap.enable", true);
+//pref("font.scale.aa_bitmap.always", false);
+//pref("font.scale.aa_bitmap.min", 6);
diff -ruN mozilla-orig/modules/libpref/src/nsPrefService.cpp mozilla/modules/libpref/src/nsPrefService.cpp
--- mozilla-orig/modules/libpref/src/nsPrefService.cpp Fri May 13 20:30:08 2005
+++ mozilla/modules/libpref/src/nsPrefService.cpp Mon Jun 19 15:10:14 2006
@@ -748,6 +748,7 @@
#elif defined(XP_BEOS)
"beos.js"
#endif
+ , "fink.js"
};
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
diff -ruN mozilla-orig/nsprpub/config/nspr.m4 mozilla/nsprpub/config/nspr.m4
--- mozilla-orig/nsprpub/config/nspr.m4 Fri May 11 20:36:57 2001
+++ mozilla/nsprpub/config/nspr.m4 Mon Jun 19 17:06:49 2006
@@ -5,7 +5,7 @@
dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
-AC_DEFUN(AM_PATH_NSPR,
+AC_DEFUN([AM_PATH_NSPR],
[dnl
AC_ARG_WITH(nspr-prefix,
diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure
--- mozilla-orig/nsprpub/configure Wed Feb 22 18:03:10 2006
+++ mozilla/nsprpub/configure Mon Jun 19 15:10:14 2006
@@ -3338,9 +3338,6 @@
# Add Mac OS X support for loading CFM & CFBundle plugins
if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
- cat >> confdefs.h <<\EOF
-#define XP_MACOSX 1
-EOF
OS_TARGET=MacOSX
@@ -4960,8 +4957,6 @@
case $target in
-*-darwin*)
- ;;
*)
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "configure:4968: checking for dlopen in -ldl" >&5
diff -ruN mozilla-orig/nsprpub/pr/include/md/_darwin.h mozilla/nsprpub/pr/include/md/_darwin.h
--- mozilla-orig/nsprpub/pr/include/md/_darwin.h Tue Jan 10 18:16:38 2006
+++ mozilla/nsprpub/pr/include/md/_darwin.h Mon Jun 19 15:10:14 2006
@@ -62,7 +62,8 @@
#undef HAVE_STACK_GROWING_UP
#define HAVE_DLL
-#define USE_MACH_DYLD
+/* #define USE_MACH_DYLD */
+#define USE_DLFCN
#define _PR_HAVE_SOCKADDR_LEN
#define _PR_STAT_HAS_ST_ATIMESPEC
#define _PR_NO_LARGE_FILES
diff -ruN mozilla-orig/nsprpub/pr/src/Makefile.in mozilla/nsprpub/pr/src/Makefile.in
--- mozilla-orig/nsprpub/pr/src/Makefile.in Mon Feb 13 13:48:14 2006
+++ mozilla/nsprpub/pr/src/Makefile.in Mon Jun 19 15:10:14 2006
@@ -204,9 +204,9 @@
endif
endif
-ifeq ($(OS_TARGET),MacOSX)
-OS_LIBS = -framework CoreServices -framework CoreFoundation
-endif
+#ifeq ($(OS_TARGET),MacOSX)
+#OS_LIBS = -framework CoreServices -framework CoreFoundation
+#endif
ifdef GC_LEAK_DETECTOR
EXTRA_LIBS = -L$(dist_libdir) -lboehm
diff -ruN mozilla-orig/nsprpub/pr/src/linking/prlink.c mozilla/nsprpub/pr/src/linking/prlink.c
--- mozilla-orig/nsprpub/pr/src/linking/prlink.c Thu Aug 18 13:24:29 2005
+++ mozilla/nsprpub/pr/src/linking/prlink.c Mon Jun 19 15:10:14 2006
@@ -154,7 +154,8 @@
#if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
|| defined(WIN16) || defined(XP_OS2) \
|| ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
-#define NEED_LEADING_UNDERSCORE
+/* On MacOSX 10.3, dlsym does not accept symbols with '_'. */
+/* #define NEED_LEADING_UNDERSCORE */
#endif
/************************************************************************/
diff -ruN mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
--- mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h Thu Feb 23 14:37:11 2006
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h Mon Jun 19 15:10:14 2006
@@ -163,7 +163,7 @@
/* Define KEEP_STACK_16_BYTE_ALIGNED if the stack needs to maintain alignment
* in a CALL for some good reason (like ABI compliance). */
-#ifdef XP_MACOSX
+#ifdef __APPLE__
/* http://developer.apple.com/documentation/DeveloperTools/Conceptual/LowLevelABI/Articles/IA32.html */
#define KEEP_STACK_16_BYTE_ALIGNED
#endif
diff -ruN mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp
--- mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp Mon Oct 24 01:42:28 2005
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp Mon Jun 19 15:10:14 2006
@@ -104,7 +104,7 @@
#ifdef __GNUC__ /* Gnu Compiler. */
-#ifdef XP_MACOSX
+#ifdef __APPLE__
/* Make sure the stack is 16-byte aligned. Do that by aligning to 16 bytes and
* then subtracting 4 so the three subsequent pushes result in a 16-byte aligned
* stack. */