diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig --- mozilla-orig/.mozconfig Wed Dec 31 19:00:00 1969 +++ mozilla/.mozconfig Tue Jun 20 11:43:33 2006 @@ -0,0 +1,43 @@ +# 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 MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ + +# Options for 'configure' (same as command-line options). +ac_add_options --prefix=@PREFIX@ +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/firefox2 +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-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 Wed May 10 12:23:59 2006 +++ mozilla/browser/app/mozilla.in Tue Jun 20 11:43:33 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/locales/en-US/profile/bookmarks.html mozilla/browser/locales/en-US/profile/bookmarks.html --- mozilla-orig/browser/locales/en-US/profile/bookmarks.html Tue May 16 15:44:44 2006 +++ mozilla/browser/locales/en-US/profile/bookmarks.html Tue Jun 20 11:43:33 2006 @@ -14,6 +14,7 @@

Getting Started
Latest Headlines +
Fink - Home

Mozilla Firefox

diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in --- mozilla-orig/config/autoconf.mk.in Mon Jun 19 09:49:54 2006 +++ mozilla/config/autoconf.mk.in Tue Jun 20 11:43:33 2006 @@ -57,14 +57,14 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +includedir = @includedir@/$(MOZ_APP_NAME)2 libdir = @libdir@ datadir = @datadir@ mandir = @mandir@ -idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +idldir = @datadir@/idl/$(MOZ_APP_NAME)2 -mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) +mozappdir = $(libdir)/$(MOZ_APP_NAME)2 +mredir = $(libdir)/mre/mre2 mrelibdir = $(mredir)/lib DIST = $(DEPTH)/dist diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk --- mozilla-orig/config/config.mk Tue Apr 18 13:02:19 2006 +++ mozilla/config/config.mk Tue Jun 20 11:43:33 2006 @@ -660,7 +660,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 Mon Jun 19 09:49:47 2006 +++ mozilla/configure Tue Jun 20 11:43:33 2006 @@ -5549,7 +5549,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' @@ -5839,10 +5839,10 @@ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' _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 Tue Jun 20 11:43:33 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 Tue Jun 20 11:43:33 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/freetype2/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 Wed May 10 12:23:59 2006 +++ mozilla/modules/libpref/src/nsPrefService.cpp Tue Jun 20 11:43:33 2006 @@ -748,6 +748,7 @@ #elif defined(XP_BEOS) "beos.js" #endif + , "fink.js" }; rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));