--- /dev/null +++ mozilla-release/.mozconfig 2009-04-27 16:56:30.000000000 -0400 @@ -0,0 +1,66 @@ +# sh +# Build configuration script +# +# See https://developer.mozilla.org/en/Configuring_Build_Options for build options. +# and http://code.google.com/p/tenfourfox/wiki/HowToBuildNow + +# default to G3 if unknown +tune=G3 +case `machine` in + ppc750) tune=G3 ;; + ppc7400) tune=G4-7400 ;; + ppc7450) tune=G4-7450 ;; + ppc970) tune=G5 ;; +esac +. $topsrcdir/$tune.mozcfg + +# This is already called inside the above config: +# . $topsrcdir/browser/config/mozconfig + +# Options for client.mk. +# environment variables to set + +mk_add_options MOZ_OBJDIR=$topsrcdir/obj-@FINK_ARCH_TARGET@-apple-darwin`uname -r` +#mk_add_options AUTOCONF=autoconf + +# compiler wrappers +GCC_PREFIX="flag-sort" +GCC_EXEC_OVERRIDE="-B$topsrcdir/opt-bin" +CC="$GCC_PREFIX $CC $GCC_EXEC_OVERRIDE" +CXX="$GCC_PREFIX $CXX $GCC_EXEC_OVERRIDE" + +ac_add_options --target=@FINK_ARCH_TARGET@-apple-darwin`uname -r` +#ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk +#HOST_CC="$CC" +#HOST_CXX="$CXX" +#RANLIB=/usr/bin/ranlib +#AR=/usr/bin/ar +#AS=$CC +#LD="$GCC_EXEC_OVERRIDE/ld" +#STRIP="strip -x -S" +#CROSS_COMPILE=1 + +# Options for 'configure' (same as command-line options). +ac_add_options --prefix=@FINKPREFIX@ +#ac_add_options --enable-official-branding +#ac_add_options --enable-default-toolkit=cairo-gtk2 +#ac_add_options --x-libraries=/usr/X11R6/lib +#ac_add_options --x-includes=/usr/X11R6/include +#ac_add_options --disable-gnomevfs +#ac_add_options --disable-gnomeui +#ac_add_options --enable-dbus +#ac_add_options --enable-extensions=default,-gnomevfs + +#ac_add_options --disable-dependency-tracking +#ac_add_options --disable-crashreporter +#ac_add_options --disable-ipc +ac_add_options --disable-necko-wifi + +#ac_add_options --disable-debug +#ac_add_options --disable-tests +#ac_add_options --enable-strip +#ac_add_options --enable-macos-target=10.4 +#ac_add_options --with-default-mozilla-five-home=@FINKPREFIX@/lib/firefox5 +ac_add_options --with-system-jpeg=@FINKPREFIX@ +ac_add_options --disable-system-cairo +ac_add_options --disable-system-sqlite diff -ruN mozilla-release-orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in --- mozilla-release-orig/browser/locales/generic/profile/bookmarks.html.in 2009-04-23 21:46:37.000000000 -0400 +++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2009-04-27 16:56:30.000000000 -0400 @@ -15,4 +15,5 @@

@getting_started@ +
Fink - Home

@firefox_heading@

diff -ruN mozilla-release-orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in --- mozilla-release-orig/config/autoconf.mk.in 2009-04-23 21:46:37.000000000 -0400 +++ mozilla-release/config/autoconf.mk.in 2009-04-27 16:56:30.000000000 -0400 @@ -58,14 +58,14 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +includedir = @includedir@/$(MOZ_APP_NAME)4 libdir = @libdir@ datadir = @datadir@ mandir = @mandir@ -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +idldir = $(datadir)/idl/$(MOZ_APP_NAME)4 -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) +installdir = $(libdir)/$(MOZ_APP_NAME)4 +sdkdir = $(libdir)/$(MOZ_APP_NAME)4-devel DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ diff -ruN mozilla-release-orig/configure mozilla-release/configure --- mozilla-release-orig/configure.in 2009-04-23 21:51:07.000000000 -0400 +++ mozilla-release/configure.in 2009-04-27 16:56:30.000000000 -0400 @@ -203,6 +203,10 @@ fi if test -z "$MIDL"; then MIDL=midl; fi ;; +*-darwin8*) + if test -z "$CC"; then CC=gcc-4.0; fi + if test -z "$CXX"; then CXX=g++-4.0; fi + ;; *-darwin*) if test -z "$CC"; then CC=gcc-4.2; fi if test -z "$CXX"; then CXX=g++-4.2; fi @@ -2013,7 +2017,7 @@ CFLAGS="$CFLAGS -fno-common" CXXFLAGS="$CXXFLAGS -fno-common" DLL_SUFFIX=".dylib" - DSO_LDOPTS='' + DSO_LDOPTS='-framework CoreFoundation' STRIP="$STRIP -x -S" # Check whether we're targeting OS X or iOS AC_CACHE_CHECK(for iOS target, diff -ruN mozilla-release-orig/fink/applications/firefox.desktop mozilla-release/fink/applications/firefox.desktop --- mozilla-release-orig/fink/applications/firefox.desktop 1969-12-31 19:00:00.000000000 -0500 +++ mozilla-release/fink/applications/firefox.desktop 2009-04-27 16:56:30.000000000 -0400 @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Firefox Web Browser +Comment=Browse the World Wide Web +Exec=firefox +Icon=firefox.png +Terminal=false +Type=Application +Categories=Application;Network +StartupNotify=true diff -ruN mozilla-release-orig/fink/fink.js mozilla-release/fink/fink.js --- mozilla-release-orig/fink/fink.js 1969-12-31 19:00:00.000000000 -0500 +++ mozilla-release/fink/fink.js 2009-04-27 16:56:30.000000000 -0400 @@ -0,0 +1 @@ +pref("general.useragent.extra.vendorComment", "Fink Community Edition"); diff -ruN mozilla-release-orig/config/rules.mk mozilla-release/config/rules.mk --- mozilla-release-orig/config/rules.mk 2010-03-22 12:47:26.000000000 -0700 +++ mozilla-release/config/rules.mk 2010-03-22 12:47:35.000000000 -0700 @@ -121,6 +121,11 @@ EXTRA_DSO_LIBS := $(call EXPAND_MOZLIBNAME,$(EXTRA_DSO_LIBS)) endif +# patch for darwin8 (needed for gtk+2 build): +# EXPAND_DYLIB_NAME - $(call EXPAND_DYLIB_NAME,foo) +# expands to -dylib_file $(installdir)/libfoo.dylib:$(DISTLIB)/libfoo.dylib +EXPAND_DYLIB_NAME = -dylib_file $(installdir)/$(DLL_PREFIX)$(1)$(DLL_SUFFIX):$(DISTLIB)/$(DLL_PREFIX)$(1)$(DLL_SUFFIX) + ################################################################################ # Testing frameworks support @@ -485,7 +490,7 @@ define SUBMAKE # $(call SUBMAKE,target,directory) +@$(UPDATE_TITLE) -+$(MAKE) $(if $(2),-C $(2)) $(1) +++$(MAKE) $(if $(2),-C $(2)) $(1) endef # The extra line is important here! don't delete it @@ -786,14 +791,14 @@ $(foreach tier,$(TIERS),tier_$(tier)):: @$(ECHO) "$@: $($@_staticdirs) $($@_dirs)" $(foreach dir,$($@_staticdirs),$(call SUBMAKE,,$(dir))) - $(MAKE) export_$@ - $(MAKE) libs_$@ - $(MAKE) tools_$@ + +$(MAKE) export_$@ + +$(MAKE) libs_$@ + +$(MAKE) tools_$@ # Do everything from scratch everything:: - $(MAKE) clean - $(MAKE) alldep + +$(MAKE) clean + +$(MAKE) alldep # Add dummy depend target for tinderboxes depend:: @@ -990,10 +995,10 @@ endif else # !WINNT || GNU_CC ifeq ($(CPP_PROG_LINK),1) - $(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) + $(EXPAND_CCC) -o $@ $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) @$(call CHECK_STDCXX,$@) else # ! CPP_PROG_LINK - $(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) + $(EXPAND_CC) -o $@ $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) endif # CPP_PROG_LINK endif # WINNT && !GNU_CC @@ -1943,7 +1948,7 @@ JAR_MANIFEST := $(srcdir)/jar.mn chrome:: - $(MAKE) realchrome + +$(MAKE) realchrome $(LOOP_OVER_PARALLEL_DIRS) $(LOOP_OVER_DIRS) $(LOOP_OVER_TOOL_DIRS) --- mozilla-release-orig/client.mk 2010-12-14 17:02:33.000000000 -0800 +++ mozilla-release/client.mk 2010-12-28 16:37:53.000000000 -0800 @@ -207,11 +207,11 @@ endif profiledbuild:: - $(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_GENERATE=1 - $(MAKE) -C $(PGO_OBJDIR) stage-package + +$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_GENERATE=1 + +$(MAKE) -C $(PGO_OBJDIR) stage-package OBJDIR=${PGO_OBJDIR} JARLOG_DIR=${PGO_OBJDIR}/jarlog/en-US $(PROFILE_GEN_SCRIPT) - $(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild - $(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_USE=1 + +$(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild + +$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_USE=1 ##################################################### # Build date unification @@ -234,14 +234,14 @@ # (when MOZ_CURRENT_PROJECT is set.) ifndef MOZ_BUILD_PROJECTS # Building a single project, OBJDIR is usable. - set -e; \ + +set -e; \ for mkfile in $(MOZ_PREFLIGHT_ALL); do \ $(MAKE) -f $(TOPSRCDIR)/$$mkfile preflight_all TOPSRCDIR=$(TOPSRCDIR) OBJDIR=$(OBJDIR) MOZ_OBJDIR=$(MOZ_OBJDIR); \ done else # OBJDIR refers to the project-specific OBJDIR, which is not available at # this point when building multiple projects. Only MOZ_OBJDIR is available. - set -e; \ + +set -e; \ for mkfile in $(MOZ_PREFLIGHT_ALL); do \ $(MAKE) -f $(TOPSRCDIR)/$$mkfile preflight_all TOPSRCDIR=$(TOPSRCDIR) MOZ_OBJDIR=$(MOZ_OBJDIR) MOZ_BUILD_PROJECTS="$(MOZ_BUILD_PROJECTS)"; \ done @@ -253,7 +253,7 @@ ifeq (,$(MOZ_CURRENT_PROJECT)$(if $(MOZ_BUILD_PROJECTS),,1)) configure depend realbuild install export libs clean realclean distclean alldep preflight postflight maybe_clobber_profiledbuild upload sdk:: - set -e; \ + +set -e; \ for app in $(MOZ_BUILD_PROJECTS); do \ $(MAKE) -f $(TOPSRCDIR)/client.mk $@ MOZ_CURRENT_PROJECT=$$app; \ done @@ -312,8 +312,8 @@ $(OBJDIR)/config.status: $(CONFIG_STATUS_DEPS) else $(OBJDIR)/Makefile: $(CONFIG_STATUS_DEPS) endif - @$(MAKE) -f $(TOPSRCDIR)/client.mk configure + +@$(MAKE) -f $(TOPSRCDIR)/client.mk configure ifneq (,$(CONFIG_STATUS)) $(OBJDIR)/config/autoconf.mk: $(TOPSRCDIR)/config/autoconf.mk.in @@ -325,14 +325,14 @@ # Depend depend:: $(OBJDIR)/Makefile $(OBJDIR)/config.status - $(MOZ_MAKE) export && $(MOZ_MAKE) depend + +$(MOZ_MAKE) export && $(MOZ_MAKE) depend #################################### # Preflight realbuild alldep preflight:: ifdef MOZ_PREFLIGHT - set -e; \ + +set -e; \ for mkfile in $(MOZ_PREFLIGHT); do \ $(MAKE) -f $(TOPSRCDIR)/$$mkfile preflight TOPSRCDIR=$(TOPSRCDIR) OBJDIR=$(OBJDIR) MOZ_OBJDIR=$(MOZ_OBJDIR); \ done @@ -342,22 +342,22 @@ # Build it realbuild:: $(OBJDIR)/Makefile $(OBJDIR)/config.status @$(PYTHON) $(TOPSRCDIR)/js/src/config/check-sync-dirs.py $(TOPSRCDIR)/js/src/config $(TOPSRCDIR)/config - $(MOZ_MAKE) + +$(MOZ_MAKE) #################################### # Other targets # Pass these target onto the real build system install export libs clean realclean distclean alldep maybe_clobber_profiledbuild upload sdk:: $(OBJDIR)/Makefile $(OBJDIR)/config.status - $(MOZ_MAKE) $@ + +$(MOZ_MAKE) $@ #################################### # Postflight realbuild alldep postflight:: ifdef MOZ_POSTFLIGHT - set -e; \ + +set -e; \ for mkfile in $(MOZ_POSTFLIGHT); do \ $(MAKE) -f $(TOPSRCDIR)/$$mkfile postflight TOPSRCDIR=$(TOPSRCDIR) OBJDIR=$(OBJDIR) MOZ_OBJDIR=$(MOZ_OBJDIR); \ done @@ -373,14 +373,14 @@ # (when MOZ_CURRENT_PROJECT is set.) ifndef MOZ_BUILD_PROJECTS # Building a single project, OBJDIR is usable. - set -e; \ + +set -e; \ for mkfile in $(MOZ_POSTFLIGHT_ALL); do \ $(MAKE) -f $(TOPSRCDIR)/$$mkfile postflight_all TOPSRCDIR=$(TOPSRCDIR) OBJDIR=$(OBJDIR) MOZ_OBJDIR=$(MOZ_OBJDIR); \ done else # OBJDIR refers to the project-specific OBJDIR, which is not available at # this point when building multiple projects. Only MOZ_OBJDIR is available. - set -e; \ + +set -e; \ for mkfile in $(MOZ_POSTFLIGHT_ALL); do \ $(MAKE) -f $(TOPSRCDIR)/$$mkfile postflight_all TOPSRCDIR=$(TOPSRCDIR) MOZ_OBJDIR=$(MOZ_OBJDIR) MOZ_BUILD_PROJECTS="$(MOZ_BUILD_PROJECTS)"; \ done