| 1 |
diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig
|
| 2 |
--- mozilla-orig/.mozconfig Wed Dec 31 19:00:00 1969
|
| 3 |
+++ mozilla/.mozconfig Tue Jun 20 11:43:33 2006
|
| 4 |
@@ -0,0 +1,42 @@
|
| 5 |
+# sh
|
| 6 |
+# Build configuration script
|
| 7 |
+#
|
| 8 |
+# See http://www.mozilla.org/build/unix.html for build instructions.
|
| 9 |
+#
|
| 10 |
+
|
| 11 |
+. $topsrcdir/browser/config/mozconfig
|
| 12 |
+
|
| 13 |
+# Options for client.mk.
|
| 14 |
+# environment variables to set
|
| 15 |
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@
|
| 16 |
+
|
| 17 |
+# Options for 'configure' (same as command-line options).
|
| 18 |
+ac_add_options --prefix=@PREFIX@
|
| 19 |
+ac_add_options --enable-official-branding
|
| 20 |
+ac_add_options --enable-default-toolkit=gtk2
|
| 21 |
+ac_add_options --enable-xft
|
| 22 |
+#ac_add_options --disable-xft
|
| 23 |
+#ac_add_options --enable-freetype2
|
| 24 |
+ac_add_options --disable-freetype2
|
| 25 |
+ac_add_options --enable-postscript
|
| 26 |
+ac_add_options --enable-xinerama
|
| 27 |
+ac_add_options --with-pthreads
|
| 28 |
+ac_add_options --disable-gnomevfs
|
| 29 |
+ac_add_options --disable-gnomeui
|
| 30 |
+ac_add_options --enable-extensions=default,-gnomevfs,xforms,schema-validation
|
| 31 |
+ac_add_options --enable-canvas
|
| 32 |
+ac_add_options --enable-svg
|
| 33 |
+
|
| 34 |
+# prebinding disabled or otherwise don't get binary
|
| 35 |
+ac_add_options --disable-prebinding
|
| 36 |
+ac_add_options --disable-debug
|
| 37 |
+ac_add_options --disable-tests
|
| 38 |
+ac_add_options --enable-strip
|
| 39 |
+ac_add_options --enable-optimize='-Os'
|
| 40 |
+ac_add_options --enable-macos-target=10.3
|
| 41 |
+ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/firefox2
|
| 42 |
+ac_add_options --with-system-jpeg=@PREFIX@
|
| 43 |
+ac_add_options --with-system-png=@PREFIX@
|
| 44 |
+
|
| 45 |
+#ac_add_options --with-ft-prefix=@PREFIX@/lib/freetype2
|
| 46 |
+#ac_add_options --with-ft-exec-prefix=@PREFIX@/lib/freetype2/bin
|
| 47 |
diff -ruN mozilla-orig/browser/app/mozilla.in mozilla/browser/app/mozilla.in
|
| 48 |
--- mozilla-orig/browser/app/mozilla.in Wed May 10 12:23:59 2006
|
| 49 |
+++ mozilla/browser/app/mozilla.in Tue Jun 20 11:43:33 2006
|
| 50 |
@@ -99,7 +99,9 @@
|
| 51 |
# If not, then start resolving symlinks until we find run-mozilla.sh
|
| 52 |
found=0
|
| 53 |
progname="$0"
|
| 54 |
-curdir=`dirname "$progname"`
|
| 55 |
+#curdir=`dirname "$progname"`
|
| 56 |
+# looking in %p/bin, not %p/lib/firefox, so fixing to $moz_libdir
|
| 57 |
+curdir="$moz_libdir"
|
| 58 |
progbase=`basename "$progname"`
|
| 59 |
run_moz="$curdir/run-mozilla.sh"
|
| 60 |
if test -x "$run_moz"; then
|
| 61 |
@@ -140,9 +142,75 @@
|
| 62 |
debugging=0
|
| 63 |
MOZILLA_BIN="${progbase}-bin"
|
| 64 |
|
| 65 |
+# The following is to check for a currently running instance.
|
| 66 |
+# This is taken almost verbatim from the Mozilla RPM package's launch script.
|
| 67 |
+MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client"
|
| 68 |
+check_running() {
|
| 69 |
+ "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null
|
| 70 |
+ RETURN_VAL=$?
|
| 71 |
+ if [ $RETURN_VAL -eq 0 ]; then
|
| 72 |
+ echo 1
|
| 73 |
+ return 1
|
| 74 |
+ else
|
| 75 |
+ echo 0
|
| 76 |
+ return 0
|
| 77 |
+ fi
|
| 78 |
+}
|
| 79 |
+
|
| 80 |
if [ "$OSTYPE" = "beos" ]; then
|
| 81 |
mimeset -F "$MOZILLA_BIN"
|
| 82 |
fi
|
| 83 |
+
|
| 84 |
+ALREADY_RUNNING=`check_running`
|
| 85 |
+
|
| 86 |
+################################################################ Parse Arguments
|
| 87 |
+# If there's a command line argument but it doesn't begin with a -
|
| 88 |
+# it's probably a url. Try to send it to a running instance.
|
| 89 |
+_USE_EXIST=0
|
| 90 |
+_optOne="$1"
|
| 91 |
+case "${_optOne}" in
|
| 92 |
+ -*)
|
| 93 |
+ ;;
|
| 94 |
+ *)
|
| 95 |
+ _USE_EXIST=1
|
| 96 |
+ ;;
|
| 97 |
+esac
|
| 98 |
+
|
| 99 |
+_optLast=
|
| 100 |
+for i in "$@"; do
|
| 101 |
+ _optLast="${i}"
|
| 102 |
+done #last arg
|
| 103 |
+
|
| 104 |
+if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
|
| 105 |
+ # Last argument seems to be a local file/directory
|
| 106 |
+ # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
|
| 107 |
+ # If it is just "relatively" (./file) specified, make it absolutely
|
| 108 |
+ [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
|
| 109 |
+fi
|
| 110 |
+################################################################ Parse Arguments
|
| 111 |
+
|
| 112 |
+########################################################################### Main
|
| 113 |
+if [ $ALREADY_RUNNING -eq 1 ]; then
|
| 114 |
+ # There's an instance already running. Use it.
|
| 115 |
+ # Any command line args passed in?
|
| 116 |
+ if [ $# -gt 0 ]; then
|
| 117 |
+ # There were "some" command line args.
|
| 118 |
+ if [ ${_USE_EXIST} -eq 1 ]; then
|
| 119 |
+ # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1
|
| 120 |
+ _remote_cmd="openURL(${_optLast})"
|
| 121 |
+ "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}"
|
| 122 |
+ unset _remote_cmd
|
| 123 |
+ exit $?
|
| 124 |
+ fi
|
| 125 |
+ else
|
| 126 |
+ # No command line args. Open new window/tab
|
| 127 |
+ #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
|
| 128 |
+ "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
|
| 129 |
+ exit $?
|
| 130 |
+ fi
|
| 131 |
+fi
|
| 132 |
+# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
|
| 133 |
+########################################################################### Main
|
| 134 |
|
| 135 |
pass_arg_count=0
|
| 136 |
while [ $# -gt $pass_arg_count ]
|
| 137 |
--- mozilla-orig/browser/components/build/Makefile.in Tue Oct 31 10:55:32 2006
|
| 138 |
+++ mozilla/browser/components/buildMakefile.in Tue Oct 31 11:01:11 2006
|
| 139 |
@@ -113,6 +113,12 @@
|
| 140 |
EXTRA_DSO_LDOPTS += $(DIST)/lib/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX)
|
| 141 |
endif
|
| 142 |
|
| 143 |
+# fix for building on Mac/X11 (bug 257773)
|
| 144 |
+# dependencies for gkgfx
|
| 145 |
+ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
|
| 146 |
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
|
| 147 |
+endif
|
| 148 |
+
|
| 149 |
# Mac: Need to link to CoreFoundation for Mac Migrators (PList reading code)
|
| 150 |
# GTK2: Need to link with glib for GNOME shell service
|
| 151 |
ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
|
| 152 |
diff -ruN mozilla-orig/browser/locales/en-US/profile/bookmarks.html mozilla/browser/locales/en-US/profile/bookmarks.html
|
| 153 |
--- mozilla-orig/browser/locales/en-US/profile/bookmarks.html Tue May 16 15:44:44 2006
|
| 154 |
+++ mozilla/browser/locales/en-US/profile/bookmarks.html Tue Jun 20 11:43:33 2006
|
| 155 |
@@ -14,6 +14,7 @@
|
| 156 |
<DL><p>
|
| 157 |
<DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/central/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$GvPhC3">Getting Started</A>
|
| 158 |
<DT><A HREF="http://en-US.fxfeeds.mozilla.com/en-US/firefox/livebookmarks/" FEEDURL="http://en-US.fxfeeds.mozilla.com/en-US/firefox/headlines.xml" ID="rdf:#$HvPhC3">Latest Headlines</A>
|
| 159 |
+ <DT><A HREF="http://fink.sourceforge.net/">Fink - Home</A>
|
| 160 |
</DL><p>
|
| 161 |
<HR>
|
| 162 |
<DT><H3 ID="rdf:#$ZvPhC3">Mozilla Firefox</H3>
|
| 163 |
diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in
|
| 164 |
--- mozilla-orig/config/autoconf.mk.in Mon Jun 19 09:49:54 2006
|
| 165 |
+++ mozilla/config/autoconf.mk.in Tue Jun 20 11:43:33 2006
|
| 166 |
@@ -57,14 +57,14 @@
|
| 167 |
prefix = @prefix@
|
| 168 |
exec_prefix = @exec_prefix@
|
| 169 |
bindir = @bindir@
|
| 170 |
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 171 |
+includedir = @includedir@/$(MOZ_APP_NAME)2
|
| 172 |
libdir = @libdir@
|
| 173 |
datadir = @datadir@
|
| 174 |
mandir = @mandir@
|
| 175 |
-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 176 |
+idldir = @datadir@/idl/$(MOZ_APP_NAME)2
|
| 177 |
|
| 178 |
-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 179 |
-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
|
| 180 |
+mozappdir = $(libdir)/$(MOZ_APP_NAME)2
|
| 181 |
+mredir = $(libdir)/mre/mre2
|
| 182 |
mrelibdir = $(mredir)/lib
|
| 183 |
|
| 184 |
DIST = $(DEPTH)/dist
|
| 185 |
diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk
|
| 186 |
--- mozilla-orig/config/config.mk Tue Apr 18 13:02:19 2006
|
| 187 |
+++ mozilla/config/config.mk Tue Jun 20 11:43:33 2006
|
| 188 |
@@ -665,7 +665,7 @@
|
| 189 |
ifeq ($(OS_ARCH),Darwin)
|
| 190 |
ifdef USE_PREBINDING
|
| 191 |
export LD_PREBIND=1
|
| 192 |
-export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir); pwd)/config/prebind-address-table
|
| 193 |
+export LD_PREBIND_ALLOW_OVERLAP=1
|
| 194 |
endif # USE_PREBINDING
|
| 195 |
ifdef NEXT_ROOT
|
| 196 |
export NEXT_ROOT
|
| 197 |
diff -ruN mozilla-orig/configure mozilla/configure
|
| 198 |
--- mozilla-orig/configure Mon Jun 19 09:49:47 2006
|
| 199 |
+++ mozilla/configure Tue Jun 20 11:43:33 2006
|
| 200 |
@@ -5549,7 +5549,7 @@
|
| 201 |
;;
|
| 202 |
|
| 203 |
*-darwin*)
|
| 204 |
- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
|
| 205 |
+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
|
| 206 |
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
|
| 207 |
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
|
| 208 |
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(DIST)/bin'
|
| 209 |
@@ -5839,10 +5839,10 @@
|
| 210 |
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
|
| 211 |
|
| 212 |
_PEDANTIC=
|
| 213 |
- CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
|
| 214 |
- CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
|
| 215 |
+ CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
|
| 216 |
+ CXXFLAGS="$CXXFLAGS -no-cpp-precomp -fno-common"
|
| 217 |
DLL_SUFFIX=".dylib"
|
| 218 |
- DSO_LDOPTS=''
|
| 219 |
+ DSO_LDOPTS='-framework CoreFoundation'
|
| 220 |
STRIP="$STRIP -x -S"
|
| 221 |
_PLATFORM_DEFAULT_TOOLKIT='mac'
|
| 222 |
MOZ_ENABLE_POSTSCRIPT=
|
| 223 |
diff -ruN mozilla-orig/fink/applications/firefox.desktop mozilla/fink/applications/firefox.desktop
|
| 224 |
--- mozilla-orig/fink/applications/firefox.desktop Wed Dec 31 19:00:00 1969
|
| 225 |
+++ mozilla/fink/applications/firefox.desktop Tue Jun 20 11:43:33 2006
|
| 226 |
@@ -0,0 +1,10 @@
|
| 227 |
+[Desktop Entry]
|
| 228 |
+Encoding=UTF-8
|
| 229 |
+Name=Firefox Web Browser
|
| 230 |
+Comment=Browse the World Wide Web
|
| 231 |
+Exec=firefox
|
| 232 |
+Icon=firefox.xpm
|
| 233 |
+Terminal=false
|
| 234 |
+Type=Application
|
| 235 |
+Categories=Application;Network
|
| 236 |
+StartupNotify=true
|
| 237 |
diff -ruN mozilla-orig/fink/fink.js mozilla/fink/fink.js
|
| 238 |
--- mozilla-orig/fink/fink.js Wed Dec 31 19:00:00 1969
|
| 239 |
+++ mozilla/fink/fink.js Tue Jun 20 11:43:33 2006
|
| 240 |
@@ -0,0 +1,27 @@
|
| 241 |
+pref("general.useragent.extra.vendorComment", "Fink Community Edition");
|
| 242 |
+
|
| 243 |
+// Give a default font set that can do BOLD
|
| 244 |
+pref("font.name.serif.x-western", "Bitstream Vera Serif");
|
| 245 |
+pref("font.name.sans-serif.x-western", "Bitstream Vera Sans");
|
| 246 |
+pref("font.size.variable.x-western", 15);
|
| 247 |
+
|
| 248 |
+// TrueType
|
| 249 |
+//pref("font.FreeType2.enable", true);
|
| 250 |
+//pref("font.freetype2.shared-library", "@PREFIX@/lib/freetype2/lib/libfreetype.6.dylib");
|
| 251 |
+//pref("font.freetype2.shared-library", "/usr/X11R6/lib/libfreetype.6.dylib");
|
| 252 |
+//pref("font.freetype2.autohinted", true);
|
| 253 |
+//pref("font.freetype2.unhinted", true);
|
| 254 |
+//pref("font.antialias.min", 10);
|
| 255 |
+//pref("font.embedded_bitmaps.max", 1000000);
|
| 256 |
+//pref("font.scale.tt_bitmap.dark_text.min", 64);
|
| 257 |
+//pref("font.scale.tt_bitmap.dark_text.gain", "0.0");
|
| 258 |
+//pref("font.directory.truetype.1", "/Library/Fonts");
|
| 259 |
+//pref("font.directory.truetype.2", "/Network/Library/Fonts");
|
| 260 |
+//pref("font.directory.truetype.3", "/System/Library/Fonts");
|
| 261 |
+//pref("font.directory.truetype.4", "/usr/X11R6/lib/X11/fonts/TTF");
|
| 262 |
+//pref("font.directory.truetype.5", "@PREFIX@/share/fonts/truetype");
|
| 263 |
+
|
| 264 |
+// AA with Bitmap scaling.
|
| 265 |
+//pref("font.scale.aa_bitmap.enable", true);
|
| 266 |
+//pref("font.scale.aa_bitmap.always", false);
|
| 267 |
+//pref("font.scale.aa_bitmap.min", 6);
|
| 268 |
diff -ruN mozilla-orig/modules/libpref/src/nsPrefService.cpp mozilla/modules/libpref/src/nsPrefService.cpp
|
| 269 |
--- mozilla-orig/modules/libpref/src/nsPrefService.cpp Wed May 10 12:23:59 2006
|
| 270 |
+++ mozilla/modules/libpref/src/nsPrefService.cpp Tue Jun 20 11:43:33 2006
|
| 271 |
@@ -748,6 +748,7 @@
|
| 272 |
#elif defined(XP_BEOS)
|
| 273 |
"beos.js"
|
| 274 |
#endif
|
| 275 |
+ , "fink.js"
|
| 276 |
};
|
| 277 |
|
| 278 |
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
|
Parent Directory
| 
Revision Log