| 1 |
diff -Naur mozilla-1.7.2.old/.mozconfig mozilla-1.7.2.new/.mozconfig
|
| 2 |
--- mozilla-1.7.2.old/.mozconfig Thu Jan 1 09:00:00 1970
|
| 3 |
+++ mozilla-1.7.2.new/.mozconfig Sat Aug 21 02:12:35 2004
|
| 4 |
@@ -0,0 +1,24 @@
|
| 5 |
+ac_add_options --enable-macos-target=10.3
|
| 6 |
+ac_add_options --enable-prebinding
|
| 7 |
+ac_add_options --enable-default-toolkit=gtk2
|
| 8 |
+ac_add_options --enable-xft
|
| 9 |
+ac_add_options --with-pthreads
|
| 10 |
+ac_add_options --mandir=@PREFIX@/share/man
|
| 11 |
+ac_add_options --with-system-jpeg=@PREFIX@
|
| 12 |
+ac_add_options --with-system-zlib=@PREFIX@
|
| 13 |
+ac_add_options --with-system-png=@PREFIX@
|
| 14 |
+ac_add_options --with-system-mng=@PREFIX@
|
| 15 |
+ac_add_options --with-gccadpi=/usr
|
| 16 |
+ac_add_options --disable-tests
|
| 17 |
+ac_add_options --disable-debug
|
| 18 |
+ac_add_options --disable-short-wchar
|
| 19 |
+ac_add_options --enable-optimize
|
| 20 |
+ac_add_options --enable-strip
|
| 21 |
+ac_add_options --enable-crypto
|
| 22 |
+ac_add_options --enable-mathml
|
| 23 |
+ac_add_options --enable-extensions=all
|
| 24 |
+ac_add_options --enable-xinerama
|
| 25 |
+ac_add_options --enable-postscript
|
| 26 |
+ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/mozilla
|
| 27 |
+mk_add_options MOZ_MAKE_FLAGS=-j4
|
| 28 |
+
|
| 29 |
diff -Naur mozilla-1.7.2.old/config/add-chrome.pl mozilla-1.7.2.new/config/add-chrome.pl
|
| 30 |
--- mozilla-1.7.2.old/config/add-chrome.pl Sat Feb 21 07:14:12 2004
|
| 31 |
+++ mozilla-1.7.2.new/config/add-chrome.pl Fri Aug 20 20:07:48 2004
|
| 32 |
@@ -14,7 +14,7 @@
|
| 33 |
my $jarFileName = $ARGV[4];
|
| 34 |
|
| 35 |
my $win32 = ($^O =~ /((MS)?win32)|cygwin|os2/i) ? 1 : 0;
|
| 36 |
-my $macos = ($^O =~ /MacOS|darwin/i) ? 1 : 0;
|
| 37 |
+my $macos = 0;
|
| 38 |
my $unix = !($win32 || $macos) ? 1 : 0;
|
| 39 |
|
| 40 |
sub foreignPlatformFile
|
| 41 |
diff -Naur mozilla-1.7.2.old/config/autoconf.mk.in mozilla-1.7.2.new/config/autoconf.mk.in
|
| 42 |
--- mozilla-1.7.2.old/config/autoconf.mk.in Sun Mar 21 11:31:17 2004
|
| 43 |
+++ mozilla-1.7.2.new/config/autoconf.mk.in Fri Aug 20 20:11:09 2004
|
| 44 |
@@ -31,14 +31,14 @@
|
| 45 |
prefix = @prefix@
|
| 46 |
exec_prefix = @exec_prefix@
|
| 47 |
bindir = @bindir@
|
| 48 |
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 49 |
+includedir = @includedir@/$(MOZ_APP_NAME)
|
| 50 |
libdir = @libdir@
|
| 51 |
datadir = @datadir@
|
| 52 |
mandir = @mandir@
|
| 53 |
-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 54 |
+idldir = @datadir@/idl/$(MOZ_APP_NAME)
|
| 55 |
|
| 56 |
-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 57 |
-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
|
| 58 |
+mozappdir = $(libdir)/$(MOZ_APP_NAME)
|
| 59 |
+mredir = $(libdir)/mre/mre
|
| 60 |
mrelibdir = $(mredir)/lib
|
| 61 |
|
| 62 |
DIST = $(DEPTH)/dist
|
| 63 |
diff -Naur mozilla-1.7.2.old/config/config.mk mozilla-1.7.2.new/config/config.mk
|
| 64 |
--- mozilla-1.7.2.old/config/config.mk Sun Apr 11 07:51:37 2004
|
| 65 |
+++ mozilla-1.7.2.new/config/config.mk Fri Aug 20 20:36:42 2004
|
| 66 |
@@ -712,7 +712,7 @@
|
| 67 |
ifeq ($(OS_ARCH),Darwin)
|
| 68 |
ifdef USE_PREBINDING
|
| 69 |
export LD_PREBIND=1
|
| 70 |
-export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir); pwd)/config/prebind-address-table
|
| 71 |
+export LD_PREBIND_ALLOW_OVERLAP=1
|
| 72 |
endif
|
| 73 |
ifdef MACOS_SDK_DIR
|
| 74 |
export NEXT_ROOT=$(MACOS_SDK_DIR)
|
| 75 |
@@ -765,7 +765,7 @@
|
| 76 |
# Tell the linker where NSS is, if we're building crypto
|
| 77 |
ifeq ($(OS_ARCH),Darwin)
|
| 78 |
ifeq (,$(findstring crypto,$(MOZ_META_COMPONENTS)))
|
| 79 |
-MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file @executable_path/$(library):$(DIST)/bin/$(library))
|
| 80 |
+MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file @PREFIX@/lib/mozilla/$(library):$(DIST)/bin/$(library))
|
| 81 |
endif
|
| 82 |
endif
|
| 83 |
endif
|
| 84 |
diff -Naur mozilla-1.7.2.old/config/rules.mk mozilla-1.7.2.new/config/rules.mk
|
| 85 |
--- mozilla-1.7.2.old/config/rules.mk Wed May 5 22:44:22 2004
|
| 86 |
+++ mozilla-1.7.2.new/config/rules.mk Fri Aug 20 20:07:48 2004
|
| 87 |
@@ -420,7 +420,7 @@
|
| 88 |
ifdef IS_COMPONENT
|
| 89 |
EXTRA_DSO_LDOPTS += -bundle
|
| 90 |
else
|
| 91 |
-EXTRA_DSO_LDOPTS += -dynamiclib -install_name @executable_path/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
|
| 92 |
+EXTRA_DSO_LDOPTS += -dynamiclib -install_name \$(mozappdir)/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
|
| 93 |
endif
|
| 94 |
endif
|
| 95 |
endif
|
| 96 |
diff -Naur mozilla-1.7.2.old/configure mozilla-1.7.2.new/configure
|
| 97 |
--- mozilla-1.7.2.old/configure Sun Jun 6 03:44:52 2004
|
| 98 |
+++ mozilla-1.7.2.new/configure Sat Aug 21 03:41:21 2004
|
| 99 |
@@ -4980,7 +4980,7 @@
|
| 100 |
;;
|
| 101 |
|
| 102 |
*-darwin*)
|
| 103 |
- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
|
| 104 |
+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
|
| 105 |
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
|
| 106 |
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
|
| 107 |
;;
|
| 108 |
@@ -5211,8 +5117,8 @@
|
| 109 |
|
| 110 |
*-darwin*)
|
| 111 |
_PEDANTIC=
|
| 112 |
- CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
|
| 113 |
- CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
|
| 114 |
+ CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
|
| 115 |
+ CXXFLAGS="$CXXFLAGS -no-cpp-precomp -fno-common"
|
| 116 |
DLL_SUFFIX=".dylib"
|
| 117 |
DSO_LDOPTS=''
|
| 118 |
STRIP="$STRIP -x -S"
|
| 119 |
diff -Naur mozilla-1.7.2.old/directory/c-sdk/config/config.mk mozilla-1.7.2.new/directory/c-sdk/config/config.mk
|
| 120 |
--- mozilla-1.7.2.old/directory/c-sdk/config/config.mk Mon Feb 24 00:54:18 2003
|
| 121 |
+++ mozilla-1.7.2.new/directory/c-sdk/config/config.mk Fri Aug 20 20:07:48 2004
|
| 122 |
@@ -60,10 +60,10 @@
|
| 123 |
|
| 124 |
NFSPWD = $(MOD_DEPTH)/config/nfspwd
|
| 125 |
|
| 126 |
-CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\
|
| 127 |
- $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
|
| 128 |
-CCCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\
|
| 129 |
- $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
|
| 130 |
+CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(XP_DEFINE)\
|
| 131 |
+ $(DEFINES) $(INCLUDES) $(XCFLAGS) $(OS_CFLAGS)
|
| 132 |
+CCCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(XP_DEFINE)\
|
| 133 |
+ $(DEFINES) $(INCLUDES) $(XCFLAGS) $(OS_CFLAGS)
|
| 134 |
# For purify
|
| 135 |
NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
|
| 136 |
$(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
|
| 137 |
diff -Naur mozilla-1.7.2.old/directory/c-sdk/configure mozilla-1.7.2.new/directory/c-sdk/configure
|
| 138 |
--- mozilla-1.7.2.old/directory/c-sdk/configure Fri Mar 26 10:23:41 2004
|
| 139 |
+++ mozilla-1.7.2.new/directory/c-sdk/configure Fri Aug 20 20:07:48 2004
|
| 140 |
@@ -3401,7 +3401,7 @@
|
| 141 |
|
| 142 |
CPU_ARCH=ppc
|
| 143 |
fi
|
| 144 |
- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@'
|
| 145 |
+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @PREFIX@/lib/mozilla/$@'
|
| 146 |
# Use the standard preprocessor (cpp)
|
| 147 |
CFLAGS="$CFLAGS -no-cpp-precomp"
|
| 148 |
MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
|
| 149 |
diff -Naur mozilla-1.7.2.old/fink/applications/Mozilla-address.desktop mozilla-1.7.2.new/fink/applications/Mozilla-address.desktop
|
| 150 |
--- mozilla-1.7.2.old/fink/applications/Mozilla-address.desktop Thu Jan 1 09:00:00 1970
|
| 151 |
+++ mozilla-1.7.2.new/fink/applications/Mozilla-address.desktop Sun Aug 22 21:36:12 2004
|
| 152 |
@@ -0,0 +1,11 @@
|
| 153 |
+[Desktop Entry]
|
| 154 |
+Encoding=UTF-8
|
| 155 |
+Name=Mozilla Addressbook
|
| 156 |
+Comment=Addressbook from Mozilla Mailnews
|
| 157 |
+Exec=mozilla -addressbook
|
| 158 |
+Icon=mozilla-addressbook.xpm
|
| 159 |
+Terminal=false
|
| 160 |
+MultipleArgs=false
|
| 161 |
+Type=Application
|
| 162 |
+Categories=Application;Network
|
| 163 |
+StartupNotify=true
|
| 164 |
diff -Naur mozilla-1.7.2.old/fink/applications/Mozilla-chatzilla.desktop mozilla-1.7.2.new/fink/applications/Mozilla-chatzilla.desktop
|
| 165 |
--- mozilla-1.7.2.old/fink/applications/Mozilla-chatzilla.desktop Thu Jan 1 09:00:00 1970
|
| 166 |
+++ mozilla-1.7.2.new/fink/applications/Mozilla-chatzilla.desktop Sun Aug 22 21:36:56 2004
|
| 167 |
@@ -0,0 +1,11 @@
|
| 168 |
+[Desktop Entry]
|
| 169 |
+Encoding=UTF-8
|
| 170 |
+Name=Chatzilla
|
| 171 |
+Comment=Mozilla Chatzilla IRC client
|
| 172 |
+Exec=mozilla -chat
|
| 173 |
+Icon=mozilla-chatzilla.xpm
|
| 174 |
+Terminal=false
|
| 175 |
+MultipleArgs=false
|
| 176 |
+Type=Application
|
| 177 |
+Categories=Application;Network
|
| 178 |
+StartupNotify=true
|
| 179 |
diff -Naur mozilla-1.7.2.old/fink/applications/Mozilla-editor.desktop mozilla-1.7.2.new/fink/applications/Mozilla-editor.desktop
|
| 180 |
--- mozilla-1.7.2.old/fink/applications/Mozilla-editor.desktop Thu Jan 1 09:00:00 1970
|
| 181 |
+++ mozilla-1.7.2.new/fink/applications/Mozilla-editor.desktop Sun Aug 22 21:40:48 2004
|
| 182 |
@@ -0,0 +1,10 @@
|
| 183 |
+[Desktop Entry]
|
| 184 |
+Encoding=UTF-8
|
| 185 |
+Name=Mozilla Composer
|
| 186 |
+Comment=HTML editor from Mozilla project
|
| 187 |
+Exec=mozilla -edit
|
| 188 |
+Icon=mozilla-editor.xpm
|
| 189 |
+Terminal=false
|
| 190 |
+Type=Application
|
| 191 |
+Categories=Application;Network
|
| 192 |
+StartupNotify=true
|
| 193 |
diff -Naur mozilla-1.7.2.old/fink/applications/Mozilla-mail-composer.desktop mozilla-1.7.2.new/fink/applications/Mozilla-mail-composer.desktop
|
| 194 |
--- mozilla-1.7.2.old/fink/applications/Mozilla-mail-composer.desktop Thu Jan 1 09:00:00 1970
|
| 195 |
+++ mozilla-1.7.2.new/fink/applications/Mozilla-mail-composer.desktop Sun Aug 22 21:39:25 2004
|
| 196 |
@@ -0,0 +1,11 @@
|
| 197 |
+[Desktop Entry]
|
| 198 |
+Encoding=UTF-8
|
| 199 |
+Name=Mozilla Mail Composer
|
| 200 |
+Comment=Mozilla Mail Composer
|
| 201 |
+Exec=mozilla -compose
|
| 202 |
+Icon=mozilla-mail-composer.xpm
|
| 203 |
+Terminal=false
|
| 204 |
+MultipleArgs=false
|
| 205 |
+Type=Application
|
| 206 |
+Categories=Application;Network
|
| 207 |
+StartupNotify=true
|
| 208 |
diff -Naur mozilla-1.7.2.old/fink/applications/Mozilla-mail.desktop mozilla-1.7.2.new/fink/applications/Mozilla-mail.desktop
|
| 209 |
--- mozilla-1.7.2.old/fink/applications/Mozilla-mail.desktop Thu Jan 1 09:00:00 1970
|
| 210 |
+++ mozilla-1.7.2.new/fink/applications/Mozilla-mail.desktop Sun Aug 22 21:42:26 2004
|
| 211 |
@@ -0,0 +1,11 @@
|
| 212 |
+[Desktop Entry]
|
| 213 |
+Encoding=UTF-8
|
| 214 |
+Name=Mozilla Mail
|
| 215 |
+Comment=Mozilla Mail
|
| 216 |
+Exec=mozilla -mail
|
| 217 |
+Icon=mozilla-mailnews.xpm
|
| 218 |
+Terminal=false
|
| 219 |
+MultipleArgs=false
|
| 220 |
+Type=Application
|
| 221 |
+Categories=Application;Network
|
| 222 |
+StartupNotify=true
|
| 223 |
diff -Naur mozilla-1.7.2.old/fink/applications/Mozilla-news.desktop mozilla-1.7.2.new/fink/applications/Mozilla-news.desktop
|
| 224 |
--- mozilla-1.7.2.old/fink/applications/Mozilla-news.desktop Thu Jan 1 09:00:00 1970
|
| 225 |
+++ mozilla-1.7.2.new/fink/applications/Mozilla-news.desktop Sun Aug 22 21:42:30 2004
|
| 226 |
@@ -0,0 +1,11 @@
|
| 227 |
+[Desktop Entry]
|
| 228 |
+Encoding=UTF-8
|
| 229 |
+Name=Mozilla News
|
| 230 |
+Comment=Mozilla News
|
| 231 |
+Exec=mozilla -news
|
| 232 |
+Icon=mozilla-mailnews.xpm
|
| 233 |
+Terminal=false
|
| 234 |
+MultipleArgs=false
|
| 235 |
+Type=Application
|
| 236 |
+Categories=Application;Network
|
| 237 |
+StartupNotify=true
|
| 238 |
diff -Naur mozilla-1.7.2.old/fink/applications/Mozilla.desktop mozilla-1.7.2.new/fink/applications/Mozilla.desktop
|
| 239 |
--- mozilla-1.7.2.old/fink/applications/Mozilla.desktop Thu Jan 1 09:00:00 1970
|
| 240 |
+++ mozilla-1.7.2.new/fink/applications/Mozilla.desktop Sun Aug 22 21:35:17 2004
|
| 241 |
@@ -0,0 +1,10 @@
|
| 242 |
+[Desktop Entry]
|
| 243 |
+Encoding=UTF-8
|
| 244 |
+Name=Mozilla Web Browser
|
| 245 |
+Comment=Browse the World Wide Web
|
| 246 |
+Exec=mozilla
|
| 247 |
+Icon=mozilla.xpm
|
| 248 |
+Terminal=false
|
| 249 |
+Type=Application
|
| 250 |
+Categories=Application;Network
|
| 251 |
+StartupNotify=true
|
| 252 |
diff -Naur mozilla-1.7.2.old/fink/chrome.d/default mozilla-1.7.2.new/fink/chrome.d/default
|
| 253 |
--- mozilla-1.7.2.old/fink/chrome.d/default Thu Jan 1 09:00:00 1970
|
| 254 |
+++ mozilla-1.7.2.new/fink/chrome.d/default Fri Aug 20 20:07:48 2004
|
| 255 |
@@ -0,0 +1,2 @@
|
| 256 |
+skin,install,select,modern/1.0
|
| 257 |
+locale,install,select,en-US
|
| 258 |
diff -Naur mozilla-1.7.2.old/fink/mozilla mozilla-1.7.2.new/fink/mozilla
|
| 259 |
--- mozilla-1.7.2.old/fink/mozilla Thu Jan 1 09:00:00 1970
|
| 260 |
+++ mozilla-1.7.2.new/fink/mozilla Fri Aug 20 20:07:48 2004
|
| 261 |
@@ -0,0 +1,99 @@
|
| 262 |
+#!/bin/sh
|
| 263 |
+#
|
| 264 |
+# The contents of this file are subject to the Netscape Public
|
| 265 |
+# License Version 1.1 (the "License"); you may not use this file
|
| 266 |
+# except in compliance with the License. You may obtain a copy of
|
| 267 |
+# the License at http://www.mozilla.org/NPL/
|
| 268 |
+#
|
| 269 |
+# Software distributed under the License is distributed on an "AS
|
| 270 |
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
| 271 |
+# implied. See the License for the specific language governing
|
| 272 |
+# rights and limitations under the License.
|
| 273 |
+#
|
| 274 |
+# The Original Code is mozilla.org code.
|
| 275 |
+#
|
| 276 |
+# The Initial Developer of the Original Code is Netscape
|
| 277 |
+# Communications Corporation. Portions created by Netscape are
|
| 278 |
+# Copyright (C) 1998 Netscape Communications Corporation. All
|
| 279 |
+# Rights Reserved.
|
| 280 |
+#
|
| 281 |
+# Contributor(s):
|
| 282 |
+#
|
| 283 |
+
|
| 284 |
+##
|
| 285 |
+## Usage:
|
| 286 |
+##
|
| 287 |
+## $ mozilla
|
| 288 |
+##
|
| 289 |
+## This script is meant to run a mozilla program from the mozilla
|
| 290 |
+## rpm installation.
|
| 291 |
+##
|
| 292 |
+## The script will setup all the environment voodoo needed to make
|
| 293 |
+## mozilla work.
|
| 294 |
+
|
| 295 |
+##
|
| 296 |
+## Variables
|
| 297 |
+##
|
| 298 |
+MOZ_PROGRAM="@PREFIX@/lib/mozilla/mozilla-bin"
|
| 299 |
+
|
| 300 |
+##
|
| 301 |
+## Set MOZILLA_FIVE_HOME
|
| 302 |
+##
|
| 303 |
+MOZILLA_FIVE_HOME="@PREFIX@/lib/mozilla"
|
| 304 |
+export MOZILLA_FIVE_HOME
|
| 305 |
+
|
| 306 |
+##
|
| 307 |
+## Set DYLD_LIBRARY_PATH
|
| 308 |
+##
|
| 309 |
+DYLD_LIBRARY_PATH=@PREFIX@/lib/mozilla:$DYLD_LIBRARY_PATH
|
| 310 |
+export DYLD_LIBRARY_PATH
|
| 311 |
+
|
| 312 |
+# If there is no command line argument at all then try to open a new
|
| 313 |
+# window in an already running instance.
|
| 314 |
+
|
| 315 |
+if [ -z "$1" ]; then
|
| 316 |
+ $MOZ_PROGRAM -remote "openurl(about:blank,new-window)" >/dev/null
|
| 317 |
+ RETURN_VAL=$?
|
| 318 |
+ if [ "$RETURN_VAL" -eq "2" ]; then
|
| 319 |
+ $MOZ_PROGRAM ${1+"$@"}
|
| 320 |
+ RETURN_VAL=$?
|
| 321 |
+ fi
|
| 322 |
+ exit $RETURN_VAL
|
| 323 |
+fi
|
| 324 |
+
|
| 325 |
+# If there's a command line argument but it doesn't begin with a -
|
| 326 |
+# it's probably a url. Try to send it to a running instance.
|
| 327 |
+
|
| 328 |
+USE_EXIST=0
|
| 329 |
+opt="$1"
|
| 330 |
+case "$opt" in
|
| 331 |
+ -*) ;;
|
| 332 |
+ *) USE_EXIST=1 ;;
|
| 333 |
+esac
|
| 334 |
+
|
| 335 |
+if [ "${USE_EXIST}" -eq "1" ]; then
|
| 336 |
+ # check to make sure that the command contains at least a :/ in it.
|
| 337 |
+ echo $opt | grep -e ':/' 2>/dev/null >/dev/null
|
| 338 |
+ RETURN_VAL=$?
|
| 339 |
+ if [ "$RETURN_VAL" -eq "1" ]; then
|
| 340 |
+ # does it begin with a / ?
|
| 341 |
+ echo $opt | grep -e '^/' >/dev/null
|
| 342 |
+ RETURN_VAL=$?
|
| 343 |
+ if [ "$RETURN_VAL" -eq "0" ]; then
|
| 344 |
+ opt="file:$opt"
|
| 345 |
+ elif [ -e `pwd`/$opt ]; then
|
| 346 |
+ opt="`pwd`/$opt"
|
| 347 |
+ else
|
| 348 |
+ opt="http://$opt"
|
| 349 |
+ fi
|
| 350 |
+ fi
|
| 351 |
+ $MOZ_PROGRAM -remote "openurl($opt,new-window)" >/dev/null
|
| 352 |
+ RETURN_VAL=$?
|
| 353 |
+ if [ "$RETURN_VAL" -eq "2" ]; then
|
| 354 |
+ $MOZ_PROGRAM ${1+"$@"}
|
| 355 |
+ RETURN_VAL=$?
|
| 356 |
+ fi
|
| 357 |
+ exit $RETURN_VAL
|
| 358 |
+fi
|
| 359 |
+
|
| 360 |
+$MOZ_PROGRAM ${1+"$@"}
|
| 361 |
diff -Naur mozilla-1.7.2.old/fink/prefs.js mozilla-1.7.2.new/fink/prefs.js
|
| 362 |
--- mozilla-1.7.2.old/fink/prefs.js Thu Jan 1 09:00:00 1970
|
| 363 |
+++ mozilla-1.7.2.new/fink/prefs.js Fri Aug 20 20:07:48 2004
|
| 364 |
@@ -0,0 +1,23 @@
|
| 365 |
+// XIM style
|
| 366 |
+pref("xim.input_style", "over-the-spot");
|
| 367 |
+
|
| 368 |
+// TryeType
|
| 369 |
+pref("font.FreeType2.enable", true);
|
| 370 |
+pref("font.freetype2.shared-library", "@PREFIX@/lib/libfreetype.6.dylib");
|
| 371 |
+pref("font.FreeType2.autohinted", true);
|
| 372 |
+pref("font.FreeType2.unhinted", true);
|
| 373 |
+pref("font.antialias.min", 10);
|
| 374 |
+pref("font.embedded_bitmaps.max", 1000000);
|
| 375 |
+pref("font.scale.tt_bitmap.dark_text.min", 64);
|
| 376 |
+pref("font.scale.tt_bitmap.dark_text.gain", "0.0");
|
| 377 |
+pref("font.directory.truetype.1", "/Library/Fonts");
|
| 378 |
+pref("font.directory.truetype.2", "/Network/Library/Fonts");
|
| 379 |
+pref("font.directory.truetype.3", "/System/Library/Fonts");
|
| 380 |
+pref("font.directory.truetype.4", "/usr/X11R6/lib/X11/fonts/TTF");
|
| 381 |
+pref("font.directory.truetype.5", "@PREFIX@/share/fonts/truetype");
|
| 382 |
+
|
| 383 |
+// AA with Bitmap scaling.
|
| 384 |
+pref("font.scale.aa_bitmap.enable", true);
|
| 385 |
+pref("font.scale.aa_bitmap.always", false);
|
| 386 |
+pref("font.scale.aa_bitmap.min", 6);
|
| 387 |
+
|
| 388 |
diff -Naur mozilla-1.7.2.old/fink/update-mozilla-chrome mozilla-1.7.2.new/fink/update-mozilla-chrome
|
| 389 |
--- mozilla-1.7.2.old/fink/update-mozilla-chrome Thu Jan 1 09:00:00 1970
|
| 390 |
+++ mozilla-1.7.2.new/fink/update-mozilla-chrome Tue Jan 17 04:34:03 2006
|
| 391 |
@@ -0,0 +1,33 @@
|
| 392 |
+#!/bin/sh -e
|
| 393 |
+
|
| 394 |
+if [ "$UID" -ne "0" ]; then
|
| 395 |
+ exec /usr/bin/sudo -H "$0" "$@"
|
| 396 |
+ echo "Could not switch to root...aborting $0"
|
| 397 |
+ exit 0
|
| 398 |
+fi
|
| 399 |
+
|
| 400 |
+ulimit -s unlimited || true
|
| 401 |
+
|
| 402 |
+MOZILLA_FIVE_HOME=@PREFIX@/lib/mozilla
|
| 403 |
+CHROME_DIR=@PREFIX@/var/lib/mozilla/chrome.d
|
| 404 |
+
|
| 405 |
+export DYLD_LIBRARY_PATH=$MOZILLA_FIVE_HOME
|
| 406 |
+
|
| 407 |
+cd ${MOZILLA_FIVE_HOME}
|
| 408 |
+TMPFILE=`tempfile`
|
| 409 |
+cat ${CHROME_DIR}/* >>${TMPFILE}
|
| 410 |
+mv ${TMPFILE} ${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt
|
| 411 |
+chmod 644 ${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt
|
| 412 |
+
|
| 413 |
+rm -rf ${MOZILLA_FIVE_HOME}/chrome/overlayinfo
|
| 414 |
+rm -f ${MOZILLA_FIVE_HOME}/chrome/*.rdf
|
| 415 |
+rm -f ${MOZILLA_FIVE_HOME}/component.reg
|
| 416 |
+rm -f ${MOZILLA_FIVE_HOME}/components/*.dat
|
| 417 |
+
|
| 418 |
+export HOME=~root
|
| 419 |
+sudo -H ./run-mozilla.sh ${MOZILLA_FIVE_HOME}/regxpcom || true
|
| 420 |
+sudo -H ./run-mozilla.sh ${MOZILLA_FIVE_HOME}/regchrome || true
|
| 421 |
+
|
| 422 |
+echo "Done registering components"
|
| 423 |
+exit 0
|
| 424 |
+
|
| 425 |
diff -Naur mozilla-1.7.2.old/modules/libpref/src/nsPrefService.cpp mozilla-1.7.2.new/modules/libpref/src/nsPrefService.cpp
|
| 426 |
--- mozilla-1.7.2.old/modules/libpref/src/nsPrefService.cpp Thu Feb 12 22:09:13 2004
|
| 427 |
+++ mozilla-1.7.2.new/modules/libpref/src/nsPrefService.cpp Fri Aug 20 20:07:49 2004
|
| 428 |
@@ -779,6 +779,7 @@
|
| 429 |
#elif defined(XP_BEOS)
|
| 430 |
"beos.js"
|
| 431 |
#endif
|
| 432 |
+ , "fink.js"
|
| 433 |
};
|
| 434 |
|
| 435 |
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
|
| 436 |
diff -Naur mozilla-1.7.2.old/nsprpub/configure mozilla-1.7.2.new/nsprpub/configure
|
| 437 |
--- mozilla-1.7.2.old/nsprpub/configure Sat Apr 17 07:28:02 2004
|
| 438 |
+++ mozilla-1.7.2.new/nsprpub/configure Fri Aug 20 20:13:54 2004
|
| 439 |
@@ -3305,7 +3305,7 @@
|
| 440 |
|
| 441 |
CPU_ARCH=ppc
|
| 442 |
fi
|
| 443 |
- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
|
| 444 |
+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @PREFIX@/lib/mozilla/$@ -headerpad_max_install_names'
|
| 445 |
# Use the standard preprocessor (cpp)
|
| 446 |
CFLAGS="$CFLAGS -no-cpp-precomp"
|
| 447 |
MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
|
| 448 |
@@ -3320,9 +3320,6 @@
|
| 449 |
|
| 450 |
# Add Mac OS X support for loading CFM & CFBundle plugins
|
| 451 |
if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
|
| 452 |
- cat >> confdefs.h <<\EOF
|
| 453 |
-#define XP_MACOSX 1
|
| 454 |
-EOF
|
| 455 |
|
| 456 |
OS_TARGET=MacOSX
|
| 457 |
|
| 458 |
@@ -4837,8 +4834,6 @@
|
| 459 |
|
| 460 |
|
| 461 |
case $target in
|
| 462 |
-*-darwin*)
|
| 463 |
- ;;
|
| 464 |
*)
|
| 465 |
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
| 466 |
echo "configure:4853: checking for dlopen in -ldl" >&5
|
| 467 |
diff -Naur mozilla-1.7.2.old/nsprpub/pr/include/md/_darwin.h mozilla-1.7.2.new/nsprpub/pr/include/md/_darwin.h
|
| 468 |
--- mozilla-1.7.2.old/nsprpub/pr/include/md/_darwin.h Thu Nov 27 10:30:44 2003
|
| 469 |
+++ mozilla-1.7.2.new/nsprpub/pr/include/md/_darwin.h Fri Aug 20 20:07:49 2004
|
| 470 |
@@ -55,7 +55,8 @@
|
| 471 |
|
| 472 |
#undef HAVE_STACK_GROWING_UP
|
| 473 |
#define HAVE_DLL
|
| 474 |
-#define USE_MACH_DYLD
|
| 475 |
+/* #define USE_MACH_DYLD */
|
| 476 |
+#define USE_DLFCN
|
| 477 |
#define _PR_HAVE_SOCKADDR_LEN
|
| 478 |
#define _PR_STAT_HAS_ST_ATIMESPEC
|
| 479 |
#define _PR_NO_LARGE_FILES
|
| 480 |
diff -Naur mozilla-1.7.2.old/nsprpub/pr/src/Makefile.in mozilla-1.7.2.new/nsprpub/pr/src/Makefile.in
|
| 481 |
--- mozilla-1.7.2.old/nsprpub/pr/src/Makefile.in Tue Mar 23 09:40:17 2004
|
| 482 |
+++ mozilla-1.7.2.new/nsprpub/pr/src/Makefile.in Fri Aug 20 20:07:49 2004
|
| 483 |
@@ -199,9 +199,9 @@
|
| 484 |
endif
|
| 485 |
endif
|
| 486 |
|
| 487 |
-ifeq ($(OS_TARGET),MacOSX)
|
| 488 |
-OS_LIBS = -framework CoreServices -framework CoreFoundation
|
| 489 |
-endif
|
| 490 |
+#ifeq ($(OS_TARGET),MacOSX)
|
| 491 |
+#OS_LIBS = -framework CoreServices -framework CoreFoundation
|
| 492 |
+#endif
|
| 493 |
|
| 494 |
ifdef GC_LEAK_DETECTOR
|
| 495 |
EXTRA_LIBS = -L$(dist_libdir) -lboehm
|
| 496 |
diff -Naur mozilla-1.7.2.old/nsprpub/pr/src/linking/prlink.c mozilla-1.7.2.new/nsprpub/pr/src/linking/prlink.c
|
| 497 |
--- mozilla-1.7.2.old/nsprpub/pr/src/linking/prlink.c Wed Jan 21 04:46:21 2004
|
| 498 |
+++ mozilla-1.7.2.new/nsprpub/pr/src/linking/prlink.c Fri Aug 20 20:16:02 2004
|
| 499 |
@@ -164,7 +164,8 @@
|
| 500 |
#if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
|
| 501 |
|| defined(WIN16) || defined(XP_OS2) \
|
| 502 |
|| ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
|
| 503 |
-#define NEED_LEADING_UNDERSCORE
|
| 504 |
+/* On MacOSX 10.3, dlsym does not accept symbols with '_'.
|
| 505 |
+/* #define NEED_LEADING_UNDERSCORE */
|
| 506 |
#endif
|
| 507 |
|
| 508 |
#ifdef XP_PC
|
| 509 |
diff -Naur mozilla-1.7.2.old/security/coreconf/Darwin.mk mozilla-1.7.2.new/security/coreconf/Darwin.mk
|
| 510 |
--- mozilla-1.7.2.old/security/coreconf/Darwin.mk Thu Nov 13 10:59:22 2003
|
| 511 |
+++ mozilla-1.7.2.new/security/coreconf/Darwin.mk Fri Aug 20 20:18:08 2004
|
| 512 |
@@ -80,7 +80,7 @@
|
| 513 |
ARCH = darwin
|
| 514 |
|
| 515 |
# May override this with -bundle to create a loadable module.
|
| 516 |
-DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
|
| 517 |
+DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name @PREFIX@/lib/mozilla/$(notdir $@) -headerpad_max_install_names
|
| 518 |
|
| 519 |
MKSHLIB = $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS)
|
| 520 |
DLL_SUFFIX = dylib
|
| 521 |
diff -Naur mozilla-1.7.2.old/security/nss/cmd/platlibs.mk mozilla-1.7.2.new/security/nss/cmd/platlibs.mk
|
| 522 |
--- mozilla-1.7.2.old/security/nss/cmd/platlibs.mk Sun Apr 20 13:23:14 2003
|
| 523 |
+++ mozilla-1.7.2.new/security/nss/cmd/platlibs.mk Fri Aug 20 20:07:54 2004
|
| 524 |
@@ -207,7 +207,7 @@
|
| 525 |
endif
|
| 526 |
|
| 527 |
ifeq ($(OS_ARCH), Darwin)
|
| 528 |
-EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
| 529 |
+EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/mozilla/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
| 530 |
endif
|
| 531 |
|
| 532 |
|
| 533 |
diff -Naur mozilla-1.7.2.old/security/nss/lib/smime/config.mk mozilla-1.7.2.new/security/nss/lib/smime/config.mk
|
| 534 |
--- mozilla-1.7.2.old/security/nss/lib/smime/config.mk Sun Apr 20 13:23:33 2003
|
| 535 |
+++ mozilla-1.7.2.new/security/nss/lib/smime/config.mk Fri Aug 20 20:07:54 2004
|
| 536 |
@@ -70,7 +70,7 @@
|
| 537 |
$(NULL)
|
| 538 |
|
| 539 |
ifeq ($(OS_ARCH), Darwin)
|
| 540 |
-EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
| 541 |
+EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/mozilla/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
| 542 |
endif
|
| 543 |
|
| 544 |
endif
|
| 545 |
diff -Naur mozilla-1.7.2.old/security/nss/lib/ssl/config.mk mozilla-1.7.2.new/security/nss/lib/ssl/config.mk
|
| 546 |
--- mozilla-1.7.2.old/security/nss/lib/ssl/config.mk Sun Apr 20 13:23:37 2003
|
| 547 |
+++ mozilla-1.7.2.new/security/nss/lib/ssl/config.mk Fri Aug 20 20:07:54 2004
|
| 548 |
@@ -75,7 +75,7 @@
|
| 549 |
endif
|
| 550 |
|
| 551 |
ifeq ($(OS_ARCH), Darwin)
|
| 552 |
-EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
| 553 |
+EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/mozilla/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
| 554 |
endif
|
| 555 |
|
| 556 |
ifeq ($(OS_TARGET),SunOS)
|
| 557 |
diff -Naur mozilla-1.7.2.old/themes/Makefile.in mozilla-1.7.2.new/themes/Makefile.in
|
| 558 |
--- mozilla-1.7.2.old/themes/Makefile.in Thu Sep 25 21:48:58 2003
|
| 559 |
+++ mozilla-1.7.2.new/themes/Makefile.in Fri Aug 20 20:07:54 2004
|
| 560 |
@@ -36,7 +36,9 @@
|
| 561 |
|
| 562 |
# select classic as the default skin
|
| 563 |
libs::
|
| 564 |
- echo skin,install,select,classic/1.0 >> $(DIST)/bin/chrome/installed-chrome.txt
|
| 565 |
+# fix later
|
| 566 |
+# echo skin,install,select,classic/1.0 >> $(DIST)/bin/chrome/installed-chrome.txt
|
| 567 |
|
| 568 |
install::
|
| 569 |
- echo skin,install,select,classic/1.0 >> $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
|
| 570 |
+# fix later
|
| 571 |
+# echo skin,install,select,classic/1.0 >> $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
|
| 572 |
diff -ur mozilla.bak/dist/private/nss/oiddata.h mozilla/dist/private/nss/oiddata.h
|
| 573 |
--- mozilla.bak/security/nss/lib/pki1/oiddata.h 2002-01-03 21:22:07.000000000 -0800
|
| 574 |
+++ mozilla/security/nss/lib/pki1/oiddata.h 2005-06-13 15:47:27.000000000 -0700
|
| 575 |
@@ -39,6 +39,9 @@
|
| 576 |
static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile: mozilla.patch,v $ $Revision: 1.5 $ $Date: 2006/09/13 18:24:46 $ $Name: $ ; @(#) $RCSfile: mozilla.patch,v $ $Revision: 1.5 $ $Date: 2006/09/13 18:24:46 $ $Name: $";
|
| 577 |
#endif /* DEBUG */
|
| 578 |
|
| 579 |
+/* added to fix building on Tiger/gcc4 (bug 284386) */
|
| 580 |
+/* fixed for mozilla1.8, so remove this block from the patch for 1.8 */
|
| 581 |
+#include "pki1t.h"
|
| 582 |
#ifndef NSSPKI1T_H
|
| 583 |
#include "nsspki1t.h"
|
| 584 |
#endif /* NSSPKI1T_H */
|
| 585 |
|
| 586 |
diff -Naur mozilla/gfx/src/gtk/nsScreenGtk.cpp mozilla/gfx/src/gtk/nsScreenGtk-new.cpp
|
| 587 |
--- mozilla/gfx/src/gtk/nsScreenGtk.cpp 2004-04-20 19:35:51.000000000 +0200
|
| 588 |
+++ mozilla/gfx/src/gtk/nsScreenGtk-new.cpp 2006-01-10 18:40:24.000000000 +0100
|
| 589 |
@@ -143,7 +143,7 @@
|
| 590 |
if (!gdk_property_get(root_window,
|
| 591 |
gdk_atom_intern ("_NET_WORKAREA", FALSE),
|
| 592 |
cardinal_atom,
|
| 593 |
- 0, G_MAXLONG, FALSE,
|
| 594 |
+ 0, G_MAXLONG - 3, FALSE,
|
| 595 |
&type_returned,
|
| 596 |
&format_returned,
|
| 597 |
&length_returned,
|
| 598 |
|
Parent Directory
| 
Revision Log