diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig --- mozilla-orig/.mozconfig Wed Dec 31 19:00:00 1969 +++ mozilla/.mozconfig Tue Nov 29 16:45:51 2005 @@ -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 MOZILLA_OFFICIAL=1 +#mk_add_options MOZ_MAKE_FLAGS=-j4 + +# 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='-O2' +ac_add_options --enable-macos-target=10.3 +ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/firefox +ac_add_options --with-system-jpeg=@PREFIX@ +ac_add_options --with-system-zlib=@PREFIX@ +ac_add_options --with-system-png=@PREFIX@ + +#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/components/build/Makefile.in mozilla/browser/components/build/Makefile.in --- mozilla-orig/browser/components/build/Makefile.in Mon Nov 7 21:25:21 2005 +++ mozilla/browser/components/build/Makefile.in Tue Nov 29 16:28:40 2005 @@ -94,6 +94,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 Mon Sep 26 20:12:43 2005 +++ mozilla/browser/locales/en-US/profile/bookmarks.html Tue Nov 29 16:28:40 2005 @@ -12,6 +12,7 @@

Getting Started
Latest Headlines +
Fink - Home

Quick Searches

diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in --- mozilla-orig/config/autoconf.mk.in Tue Nov 22 12:20:26 2005 +++ mozilla/config/autoconf.mk.in Tue Nov 29 16:28:40 2005 @@ -54,14 +54,14 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +includedir = @includedir@/$(MOZ_APP_NAME) libdir = @libdir@ datadir = @datadir@ mandir = @mandir@ -idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +idldir = @datadir@/idl/$(MOZ_APP_NAME) -mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) +mozappdir = $(libdir)/$(MOZ_APP_NAME) +mredir = $(libdir)/mre/mre mrelibdir = $(mredir)/lib DIST = $(DEPTH)/dist diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk --- mozilla-orig/config/config.mk Wed Nov 16 15:59:21 2005 +++ mozilla/config/config.mk Tue Nov 29 16:36:23 2005 @@ -689,7 +689,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 @@ -766,7 +766,7 @@ # Tell the linker where NSS is, if we're building crypto ifeq ($(OS_ARCH),Darwin) ifeq (,$(findstring crypto,$(MOZ_META_COMPONENTS))) -MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file @executable_path/$(library):$(DIST)/bin/$(library)) +MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file @PREFIX@/lib/firefox/$(library):$(DIST)/bin/$(library)) endif endif endif diff -ruN mozilla-orig/config/rules.mk mozilla/config/rules.mk --- mozilla-orig/config/rules.mk Tue Nov 8 18:08:05 2005 +++ mozilla/config/rules.mk Tue Nov 29 16:36:17 2005 @@ -424,7 +424,7 @@ ifdef IS_COMPONENT EXTRA_DSO_LDOPTS += -bundle else -EXTRA_DSO_LDOPTS += -dynamiclib -install_name @executable_path/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1 +EXTRA_DSO_LDOPTS += -dynamiclib -install_name @PREFIX@/lib/firefox/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1 endif endif endif diff -ruN mozilla-orig/configure mozilla/configure --- mozilla-orig/configure Tue Nov 29 14:04:31 2005 +++ mozilla/configure Tue Nov 29 16:28:41 2005 @@ -5492,7 +5492,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' @@ -5780,8 +5780,8 @@ 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='' STRIP="$STRIP -x -S" 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 Nov 29 16:28:41 2005 @@ -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 Nov 29 16:28:41 2005 @@ -0,0 +1,22 @@ +pref("general.useragent.extra.vendorComment", "Fink Community Edition"); + +// 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 Tue Nov 29 16:28:41 2005 @@ -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/configure mozilla/nsprpub/configure --- mozilla-orig/nsprpub/configure Wed Nov 23 00:56:56 2005 +++ mozilla/nsprpub/configure Tue Nov 29 16:36:06 2005 @@ -3402,7 +3402,7 @@ ;; esac DSO_CFLAGS=-fPIC - DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names' + DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @PREFIX@/lib/firefox/$@ -headerpad_max_install_names' # Use the standard preprocessor (cpp) CFLAGS="$CFLAGS -no-cpp-precomp" MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@' @@ -3417,9 +3417,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 @@ -5071,8 +5068,6 @@ case $target in -*-darwin*) - ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 echo "configure:5079: checking for dlopen in -ldl" >&5 diff -ruN mozilla-orig/nsprpub/configure.in mozilla/nsprpub/configure.in --- mozilla-orig/nsprpub/configure.in Wed Nov 23 00:56:56 2005 +++ mozilla/nsprpub/configure.in Tue Nov 29 16:35:58 2005 @@ -938,7 +938,7 @@ ;; esac DSO_CFLAGS=-fPIC - DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names' + DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @PREFIX@/lib/firefox/$@ -headerpad_max_install_names' # Use the standard preprocessor (cpp) CFLAGS="$CFLAGS -no-cpp-precomp" MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@' 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 Mon Aug 15 13:53:33 2005 +++ mozilla/nsprpub/pr/include/md/_darwin.h Tue Nov 29 16:28:41 2005 @@ -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 Fri Oct 21 14:15:47 2005 +++ mozilla/nsprpub/pr/src/Makefile.in Tue Nov 29 16:28:41 2005 @@ -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 Mon Nov 7 17:07:32 2005 +++ mozilla/nsprpub/pr/src/linking/prlink.c Tue Nov 29 16:28:41 2005 @@ -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/security/coreconf/Darwin.mk mozilla/security/coreconf/Darwin.mk --- mozilla-orig/security/coreconf/Darwin.mk Thu Oct 27 20:08:14 2005 +++ mozilla/security/coreconf/Darwin.mk Tue Nov 29 16:34:51 2005 @@ -106,7 +106,7 @@ ARCH = darwin # May override this with -bundle to create a loadable module. -DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names $(DARWIN_SDK_DSOFLAGS) +DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name @PREFIX@/lib/firefox/$(notdir $@) -headerpad_max_install_names $(DARWIN_SDK_DSOFLAGS) MKSHLIB = $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) DLL_SUFFIX = dylib diff -ruN mozilla-orig/security/nss/cmd/platlibs.mk mozilla/security/nss/cmd/platlibs.mk --- mozilla-orig/security/nss/cmd/platlibs.mk Wed Apr 6 17:35:41 2005 +++ mozilla/security/nss/cmd/platlibs.mk Tue Nov 29 16:34:39 2005 @@ -211,7 +211,7 @@ endif ifeq ($(OS_ARCH), Darwin) -EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib +EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib endif diff -ruN mozilla-orig/security/nss/lib/smime/config.mk mozilla/security/nss/lib/smime/config.mk --- mozilla-orig/security/nss/lib/smime/config.mk Mon May 24 20:13:09 2004 +++ mozilla/security/nss/lib/smime/config.mk Tue Nov 29 16:34:34 2005 @@ -74,7 +74,7 @@ $(NULL) ifeq ($(OS_ARCH), Darwin) -EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib +EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib endif endif diff -ruN mozilla-orig/security/nss/lib/ssl/config.mk mozilla/security/nss/lib/ssl/config.mk --- mozilla-orig/security/nss/lib/ssl/config.mk Mon May 24 20:13:12 2004 +++ mozilla/security/nss/lib/ssl/config.mk Tue Nov 29 16:34:28 2005 @@ -83,7 +83,7 @@ endif ifeq ($(OS_ARCH), Darwin) -EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib +EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib endif ifeq ($(OS_TARGET),SunOS)