| 1 |
diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig
|
| 2 |
--- mozilla-orig/.mozconfig Wed Dec 31 19:00:00 1969
|
| 3 |
+++ mozilla/.mozconfig Mon Jul 17 11:23:37 2006
|
| 4 |
@@ -0,0 +1,35 @@
|
| 5 |
+#
|
| 6 |
+# See http://www.mozilla.org/build/ for build instructions.
|
| 7 |
+#
|
| 8 |
+
|
| 9 |
+ . $topsrcdir/mail/config/mozconfig
|
| 10 |
+
|
| 11 |
+# Options for client.mk.
|
| 12 |
+mk_add_options MOZ_CO_PROJECT=mail
|
| 13 |
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@
|
| 14 |
+
|
| 15 |
+# Options for 'configure' (same as command-line options).
|
| 16 |
+ac_add_options --enable-official-branding
|
| 17 |
+ac_add_options --enable-default-toolkit=gtk2
|
| 18 |
+ac_add_options --enable-postscript
|
| 19 |
+ac_add_options --enable-xinerama
|
| 20 |
+ac_add_options --with-pthreads
|
| 21 |
+ac_add_options --disable-gnomevfs
|
| 22 |
+ac_add_options --disable-gnomeui
|
| 23 |
+
|
| 24 |
+#ac_add_options --enable-xft
|
| 25 |
+#ac_add_options --disable-xft
|
| 26 |
+#ac_add_options --enable-freetype2
|
| 27 |
+#ac_add_options --disable-freetype2
|
| 28 |
+
|
| 29 |
+# prebinding is disabled, otherwise don't get binary
|
| 30 |
+ac_add_options --disable-prebinding
|
| 31 |
+ac_add_options --disable-debug
|
| 32 |
+ac_add_options --disable-tests
|
| 33 |
+ac_add_options --enable-strip
|
| 34 |
+
|
| 35 |
+ac_add_options --enable-optimize=-Os
|
| 36 |
+ac_add_options --enable-macos-target=10.3
|
| 37 |
+
|
| 38 |
+ac_add_options --with-system-jpeg=@PREFIX@
|
| 39 |
+ac_add_options --with-system-png=@PREFIX@
|
| 40 |
diff -ruN mozilla-orig/build/unix/mozilla-config.in mozilla/build/unix/mozilla-config.in
|
| 41 |
--- mozilla-orig/build/unix/mozilla-config.in Thu Apr 22 16:17:59 2004
|
| 42 |
+++ mozilla/build/unix/mozilla-config.in Mon Jul 17 11:23:37 2006
|
| 43 |
@@ -115,7 +115,7 @@
|
| 44 |
fi
|
| 45 |
|
| 46 |
_nspr_libs="%FULL_NSPR_LIBS%"
|
| 47 |
-_xpcom_libs="-lxpcom $_nspr_libs"
|
| 48 |
+_xpcom_libs="-lxpcom -lxpcom_core $_nspr_libs"
|
| 49 |
_js_libs="-ljs"
|
| 50 |
|
| 51 |
if test "$echo_libs" = "yes"; then
|
| 52 |
diff -ruN mozilla-orig/build/unix/mozilla-xpcom.pc.in mozilla/build/unix/mozilla-xpcom.pc.in
|
| 53 |
--- mozilla-orig/build/unix/mozilla-xpcom.pc.in Tue Jul 5 19:21:52 2005
|
| 54 |
+++ mozilla/build/unix/mozilla-xpcom.pc.in Mon Jul 17 11:23:37 2006
|
| 55 |
@@ -8,5 +8,5 @@
|
| 56 |
Description: The Mozilla Cross Platform Component Library
|
| 57 |
Version: %MOZILLA_VERSION%
|
| 58 |
Requires: %NSPR_NAME% >= %NSPR_VERSION%
|
| 59 |
-Libs: -L${libdir} -lxpcom
|
| 60 |
+Libs: -L${libdir} -lxpcom -lxpcom_core
|
| 61 |
Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
|
| 62 |
diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in
|
| 63 |
--- mozilla-orig/config/autoconf.mk.in Fri Apr 21 16:50:30 2006
|
| 64 |
+++ mozilla/config/autoconf.mk.in Mon Jul 17 11:23:37 2006
|
| 65 |
@@ -56,14 +56,14 @@
|
| 66 |
prefix = @prefix@
|
| 67 |
exec_prefix = @exec_prefix@
|
| 68 |
bindir = @bindir@
|
| 69 |
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 70 |
+includedir = @includedir@/$(MOZ_APP_NAME)1.5
|
| 71 |
libdir = @libdir@
|
| 72 |
datadir = @datadir@
|
| 73 |
mandir = @mandir@
|
| 74 |
-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 75 |
+idldir = @datadir@/idl/$(MOZ_APP_NAME)1.5
|
| 76 |
|
| 77 |
-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 78 |
-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
|
| 79 |
+mozappdir = $(libdir)/$(MOZ_APP_NAME)1.5
|
| 80 |
+mredir = $(libdir)/mre/mre1.5
|
| 81 |
mrelibdir = $(mredir)/lib
|
| 82 |
|
| 83 |
DIST = $(DEPTH)/dist
|
| 84 |
diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk
|
| 85 |
--- mozilla-orig/config/config.mk Thu Apr 6 12:28:13 2006
|
| 86 |
+++ mozilla/config/config.mk Mon Jul 17 11:24:29 2006
|
| 87 |
@@ -679,7 +679,7 @@
|
| 88 |
ifeq ($(OS_ARCH),Darwin)
|
| 89 |
ifdef USE_PREBINDING
|
| 90 |
export LD_PREBIND=1
|
| 91 |
-export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir); pwd)/config/prebind-address-table
|
| 92 |
+export LD_PREBIND_ALLOW_OVERLAP=1
|
| 93 |
endif # USE_PREBINDING
|
| 94 |
ifdef NEXT_ROOT
|
| 95 |
export NEXT_ROOT
|
| 96 |
diff -ruN mozilla-orig/configure mozilla/configure
|
| 97 |
--- mozilla-orig/configure Fri Apr 21 17:41:39 2006
|
| 98 |
+++ mozilla/configure Mon Jul 17 12:44:46 2006
|
| 99 |
@@ -5410,7 +5410,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 |
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(DIST)/bin'
|
| 108 |
@@ -5696,10 +5696,10 @@
|
| 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 |
+ DSO_LDOPTS='-framework CoreFoundation'
|
| 119 |
STRIP="$STRIP -x -S"
|
| 120 |
_PLATFORM_DEFAULT_TOOLKIT='mac'
|
| 121 |
MOZ_ENABLE_POSTSCRIPT=
|
| 122 |
diff -ruN mozilla-orig/fink/applications/thunderbird.desktop mozilla/fink/applications/thunderbird.desktop
|
| 123 |
--- mozilla-orig/fink/applications/thunderbird.desktop Wed Dec 31 19:00:00 1969
|
| 124 |
+++ mozilla/fink/applications/thunderbird.desktop Mon Jul 17 11:23:37 2006
|
| 125 |
@@ -0,0 +1,10 @@
|
| 126 |
+[Desktop Entry]
|
| 127 |
+Encoding=UTF-8
|
| 128 |
+Name=Thunderbird Mail Reader
|
| 129 |
+Comment=Read your email
|
| 130 |
+Exec=thunderbird
|
| 131 |
+Icon=thunderbird.xpm
|
| 132 |
+Terminal=false
|
| 133 |
+Type=Application
|
| 134 |
+Categories=Application;Network
|
| 135 |
+StartupNotify=true
|
| 136 |
diff -ruN mozilla-orig/fink/fink.js mozilla/fink/fink.js
|
| 137 |
--- mozilla-orig/fink/fink.js Wed Dec 31 19:00:00 1969
|
| 138 |
+++ mozilla/fink/fink.js Mon Jul 17 11:23:37 2006
|
| 139 |
@@ -0,0 +1 @@
|
| 140 |
+pref("general.useragent.extra.vendorComment", "Fink Community Edition");
|
| 141 |
diff -ruN mozilla-orig/mail/components/build/Makefile.in mozilla/mail/components/build/Makefile.in
|
| 142 |
--- mozilla-orig/mail/components/build/Makefile.in Thu Jul 28 18:17:21 2005
|
| 143 |
+++ mozilla/mail/components/build/Makefile.in Mon Jul 17 11:23:37 2006
|
| 144 |
@@ -86,6 +86,12 @@
|
| 145 |
$(MOZ_COMPONENT_LIBS) \
|
| 146 |
$(NULL)
|
| 147 |
|
| 148 |
+# fix for building on Mac/X11 (bug 257773)
|
| 149 |
+# dependencies for gkgfx
|
| 150 |
+ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
|
| 151 |
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
|
| 152 |
+endif
|
| 153 |
+
|
| 154 |
# Need to link to CoreFoundation for Mac shell service
|
| 155 |
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
| 156 |
EXTRA_DSO_LDOPTS += \
|
| 157 |
diff -ruN mozilla-orig/modules/libpref/src/nsPrefService.cpp mozilla/modules/libpref/src/nsPrefService.cpp
|
| 158 |
--- mozilla-orig/modules/libpref/src/nsPrefService.cpp Fri May 13 20:30:08 2005
|
| 159 |
+++ mozilla/modules/libpref/src/nsPrefService.cpp Mon Jul 17 12:45:48 2006
|
| 160 |
@@ -748,6 +748,7 @@
|
| 161 |
#elif defined(XP_BEOS)
|
| 162 |
"beos.js"
|
| 163 |
#endif
|
| 164 |
+ , "fink.js"
|
| 165 |
};
|
| 166 |
|
| 167 |
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
|
| 168 |
diff -ruN mozilla-orig/nsprpub/config/nspr.m4 mozilla/nsprpub/config/nspr.m4
|
| 169 |
--- mozilla-orig/nsprpub/config/nspr.m4 Fri May 11 20:36:57 2001
|
| 170 |
+++ mozilla/nsprpub/config/nspr.m4 Mon Jul 17 11:23:37 2006
|
| 171 |
@@ -5,7 +5,7 @@
|
| 172 |
|
| 173 |
dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
| 174 |
dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
|
| 175 |
-AC_DEFUN(AM_PATH_NSPR,
|
| 176 |
+AC_DEFUN([AM_PATH_NSPR],
|
| 177 |
[dnl
|
| 178 |
|
| 179 |
AC_ARG_WITH(nspr-prefix,
|
| 180 |
diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure
|
| 181 |
--- mozilla-orig/nsprpub/configure Wed Feb 22 18:03:10 2006
|
| 182 |
+++ mozilla/nsprpub/configure Mon Jul 17 12:47:31 2006
|
| 183 |
@@ -3338,9 +3338,6 @@
|
| 184 |
|
| 185 |
# Add Mac OS X support for loading CFM & CFBundle plugins
|
| 186 |
if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
|
| 187 |
- cat >> confdefs.h <<\EOF
|
| 188 |
-#define XP_MACOSX 1
|
| 189 |
-EOF
|
| 190 |
|
| 191 |
OS_TARGET=MacOSX
|
| 192 |
|
| 193 |
@@ -4960,8 +4957,6 @@
|
| 194 |
|
| 195 |
|
| 196 |
case $target in
|
| 197 |
-*-darwin*)
|
| 198 |
- ;;
|
| 199 |
*)
|
| 200 |
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
| 201 |
echo "configure:4968: checking for dlopen in -ldl" >&5
|
| 202 |
diff -ruN mozilla-orig/nsprpub/pr/include/md/_darwin.h mozilla/nsprpub/pr/include/md/_darwin.h
|
| 203 |
--- mozilla-orig/nsprpub/pr/include/md/_darwin.h Tue Jan 10 18:16:38 2006
|
| 204 |
+++ mozilla/nsprpub/pr/include/md/_darwin.h Mon Jul 17 12:48:02 2006
|
| 205 |
@@ -62,7 +62,8 @@
|
| 206 |
|
| 207 |
#undef HAVE_STACK_GROWING_UP
|
| 208 |
#define HAVE_DLL
|
| 209 |
-#define USE_MACH_DYLD
|
| 210 |
+/* #define USE_MACH_DYLD */
|
| 211 |
+#define USE_DLFCN
|
| 212 |
#define _PR_HAVE_SOCKADDR_LEN
|
| 213 |
#define _PR_STAT_HAS_ST_ATIMESPEC
|
| 214 |
#define _PR_NO_LARGE_FILES
|
| 215 |
diff -ruN mozilla-orig/nsprpub/pr/src/Makefile.in mozilla/nsprpub/pr/src/Makefile.in
|
| 216 |
--- mozilla-orig/nsprpub/pr/src/Makefile.in Mon Feb 13 13:48:14 2006
|
| 217 |
+++ mozilla/nsprpub/pr/src/Makefile.in Mon Jul 17 12:48:26 2006
|
| 218 |
@@ -204,9 +204,9 @@
|
| 219 |
endif
|
| 220 |
endif
|
| 221 |
|
| 222 |
-ifeq ($(OS_TARGET),MacOSX)
|
| 223 |
-OS_LIBS = -framework CoreServices -framework CoreFoundation
|
| 224 |
-endif
|
| 225 |
+#ifeq ($(OS_TARGET),MacOSX)
|
| 226 |
+#OS_LIBS = -framework CoreServices -framework CoreFoundation
|
| 227 |
+#endif
|
| 228 |
|
| 229 |
ifdef GC_LEAK_DETECTOR
|
| 230 |
EXTRA_LIBS = -L$(dist_libdir) -lboehm
|
| 231 |
diff -ruN mozilla-orig/nsprpub/pr/src/linking/prlink.c mozilla/nsprpub/pr/src/linking/prlink.c
|
| 232 |
--- mozilla-orig/nsprpub/pr/src/linking/prlink.c Thu Aug 18 13:24:29 2005
|
| 233 |
+++ mozilla/nsprpub/pr/src/linking/prlink.c Mon Jul 17 12:49:30 2006
|
| 234 |
@@ -154,7 +154,8 @@
|
| 235 |
#if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
|
| 236 |
|| defined(WIN16) || defined(XP_OS2) \
|
| 237 |
|| ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
|
| 238 |
-#define NEED_LEADING_UNDERSCORE
|
| 239 |
+/* on MacOSX 10.3, dlsym does not accept symbols with '_'. */
|
| 240 |
+/* #define NEED_LEADING_UNDERSCORE */
|
| 241 |
#endif
|
| 242 |
|
| 243 |
/************************************************************************/
|
| 244 |
diff -ruN mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
|
| 245 |
--- mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h Thu Feb 23 14:37:11 2006
|
| 246 |
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h Mon Jul 17 11:23:37 2006
|
| 247 |
@@ -163,7 +163,7 @@
|
| 248 |
/* Define KEEP_STACK_16_BYTE_ALIGNED if the stack needs to maintain alignment
|
| 249 |
* in a CALL for some good reason (like ABI compliance). */
|
| 250 |
|
| 251 |
-#ifdef XP_MACOSX
|
| 252 |
+#ifdef __APPLE__
|
| 253 |
/* http://developer.apple.com/documentation/DeveloperTools/Conceptual/LowLevelABI/Articles/IA32.html */
|
| 254 |
#define KEEP_STACK_16_BYTE_ALIGNED
|
| 255 |
#endif
|
| 256 |
diff -ruN mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp
|
| 257 |
--- mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp Mon Oct 24 01:42:28 2005
|
| 258 |
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp Mon Jul 17 11:23:37 2006
|
| 259 |
@@ -104,7 +104,7 @@
|
| 260 |
|
| 261 |
#ifdef __GNUC__ /* Gnu Compiler. */
|
| 262 |
|
| 263 |
-#ifdef XP_MACOSX
|
| 264 |
+#ifdef __APPLE__
|
| 265 |
/* Make sure the stack is 16-byte aligned. Do that by aligning to 16 bytes and
|
| 266 |
* then subtracting 4 so the three subsequent pushes result in a 16-byte aligned
|
| 267 |
* stack. */
|
Parent Directory
| 
Revision Log