Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29113
Modified Files:
firefox1.5.info firefox1.5.patch
Added Files:
firefox2.info firefox2.patch
Log Message:
New from tracker
https://sourceforge.net/tracker/?func=detail&atid=414256&aid=1733697&group_id=17203
--- NEW FILE: firefox2.info ---
Package: firefox2
Version: 2.0.0.11
Revision: 1003
Description: Lightweight browser from mozilla.org
License: OSI-Approved
Maintainer: Hanspeter Niederstrasser <[EMAIL PROTECTED]>
Depends: <<
%N-shlibs (= %v-%r),
atk1-shlibs (>=1.12.2-1),
fontconfig2-shlibs,
freetype219-shlibs,
glib2-shlibs (>= 2.12.0-1),
gtk+2-shlibs (>= 2.6.10-1),
libgettext3-shlibs,
libiconv,
pango1-xft2-ft219-shlibs (>= 1.8.0-1),
x11
<<
BuildConflicts: <<
freetype,
freetype-hinting,
nspr
<<
BuildDepends: <<
atk1 (>=1.12.2-1),
fontconfig2-dev,
freetype219,
glib2-dev (>= 2.12.0-1),
gtk+2-dev (>= 2.6.10-1),
libgettext3-dev,
libiconv-dev,
libidl2 (>= 0.8.7-1),
libjpeg,
libpng3 (>= 1.2.8-1),
pango1-xft2-ft219-dev (>= 1.8.0-1),
pkgconfig,
x11-dev,
xft2-dev
<<
Conflicts: <<
firefox,
firefox1.5,
firefox2
<<
Replaces: <<
firefox,
firefox1.5,
firefox2
<<
Source:
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%v/source/firefox-%v-source.tar.bz2
SourceDirectory: mozilla
Source-MD5: b2f982f9f3085195d4797957537ca75d
PatchScript: <<
/usr/bin/sed 's|@PREFIX@|%p|g' <%a/%n.patch | /usr/bin/patch -p1
### hardcode paths inside dylibs so that programs linking to them can see them
/usr/bin/perl -pi -e 's,[EMAIL PROTECTED],%p/lib/%n,g' `/usr/bin/grep -lr
@executable_path .`
### Needed by programs linking against gecko (eg yelp) using pkg-config
/usr/bin/perl -pi -e 's,lxpcom,$& -lxpcom_core,'
build/unix/mozilla-{config,xpcom.pc}.in
### To fix EXC_BAD_INSTRUCTION on macintel (XP_MACOSX is zapped in the patch
file):
/usr/bin/perl -pi -e 's,XP_MACOSX,__APPLE__,'
xpcom/reflect/xptcall/src/md/unix/xptc{stubs_unixish_x86.cpp,_platforms_unixish_x86.h}
### Fix for automake1.9. Remove for releases *AFTER* firefox2 (outside of
gecko 1.8 branch).
/usr/bin/perl -pi -e 's/(AC_DEFUN\()([^[,]+)(,)/\1\[\2]\3/'
{{build,directory/c-sdk/config}/autoconf,nsprpub/config}/nspr.m4
### -no-cpp-precomp crashes out on OS X >= 10.5
/usr/bin/perl -pi -e 's,-no-cpp-precomp,,' configure
### fix bad stripping on 10.5 from jfm with seamonkey. No damage to 10.4?
/usr/bin/perl -pi -e 's,argument missing, -exported_symbols_list,'
configure{,.in}
<<
#NoSetCXX: true
#NoSetLDFLAGS: true
#SetLDFLAGS: -L%p/lib
#NoSetCPPFLAGS: true
#SetCC: gcc -I%p/lib/freetype219/include -I%p/lib/freetype219/include/freetype2
#SetCXX: g++ -I%p/lib/freetype219/include -I%p/lib/freetype219/include/freetype2
ConfigureParams: --disable-dependency-tracking
GCC: 4.0
CompileScript: <<
#!/bin/sh -ev
export PATH="%p/lib/freetype219/bin:$PATH"
export
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig"
export FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
./configure %c
/usr/bin/make -w \
MOZ_XFT_CFLAGS="-I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I/usr/X11R6/include" \
MOZ_XFT_LIBS="-L%p/lib/freetype219/lib -L/usr/X11R6/lib -lXft -lfreetype
-lXrender -lfontconfig"
<<
InstallScript: <<
#!/bin/sh -ev
/usr/bin/make -w install DESTDIR=%d
# Install NSS headers.
/bin/cp -R -L dist/public/nss %i/include/%n/nss
# Install the GNOME .desktop launcher.
/usr/bin/install -d -m 755 %i/share/applications
/usr/bin/install -c -m 644 fink/applications/* %i/share/applications/
# Install the GNOME pixmap for launcher
/usr/bin/install -d -m 755 %i/share/pixmaps
/usr/bin/install -c -m 644 dist/bin/chrome/icons/default/default.xpm
%i/share/pixmaps/firefox.xpm
# install the Fink specific prefs file
/usr/bin/install -c -m 644 fink/fink.js %i/lib/%n/defaults/pref/fink.js
# rename nspr.m4 to avoid clashes with other gecko installs
/bin/mv %i/share/aclocal/nspr.m4 %i/share/aclocal/nspr-%n.m4
<<
DocFiles: LEGAL LICENSE README.txt
SplitOff: <<
Package: %N-dev
Depends: <<
%N-shlibs (= %v-%r),
glib2-shlibs (>= 2.12.0-1),
libgettext3-shlibs,
libiconv,
libidl2-shlibs (>= 0.8.7-1)
<<
Conflicts: <<
firefox-dev,
firefox1.5-dev,
firefox2-dev
<<
Replaces: <<
firefox-dev,
firefox1.5-dev,
firefox2-dev
<<
BuildDependsOnly: true
Description: Lightweight browser from mozilla.org
DocFiles: LEGAL LICENSE README.txt
Files: <<
bin/firefox-config
include
lib/pkgconfig
lib/%N/xp*
share/aclocal
share/idl
<<
<<
SplitOff2: <<
Package: %N-shlibs
Depends: <<
atk1-shlibs (>=1.12.2-1),
fontconfig2-shlibs,
freetype219-shlibs,
glib2-shlibs (>= 2.12.0-1),
gtk+2-shlibs (>= 2.6.10-1),
libgettext3-shlibs,
libiconv,
libjpeg-shlibs,
libpng3-shlibs (>= 1.2.8-1),
pango1-xft2-ft219-shlibs (>= 1.8.0-1),
x11-shlibs
<<
Description: Lightweight browser from mozilla.org
DocFiles: LEGAL LICENSE README.txt
Files: <<
lib/%N/lib*.dylib
lib/%N/chrome
lib/%N/components
lib/%N/greprefs
lib/%N/res
<<
Shlibs: <<
%p/lib/%N/libfreebl3.dylib 1.0.0 %n (>= 1.5.0.10-1001)
%p/lib/%N/libgfxpsshar.dylib 1.0.0 %n (>= 1.5-1)
%p/lib/%N/libgkgfx.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libgtkembedmoz.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libgtkxtbin.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libjsj.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libmozjs.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libmozz.dylib 1.0.0 %n (>= 1.5-4)
%p/lib/%N/libnspr4.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libnss3.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libplc4.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libplds4.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libsmime3.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libsoftokn3.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libssl3.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libxpcom.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libxpcom_compat.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libxpcom_core.dylib 1.0.0 %n (>= 1.1-8)
%p/lib/%N/libxpistub.dylib 1.0.0 %n (>= 0.10.1-4)
<<
<<
Homepage: http://www.mozilla.org/products/firefox/
DescDetail: <<
Firefox is a free, open-source web browser for Windows, Linux and
MacOS X and is based on the Mozilla codebase. It is small, fast and easy
to use, and offers many advantages over Internet Explorer, such as the
ability to block pop-up windows.
<<
DescUsage: <<
firefox
<<
DescPackaging: <<
Changed package name from firefox to firefox1.5 because libxlibrgb.dylib
was removed in the 1.0.x to 1.5.x transition.
Moved chrome* components* greprefs* res* to -shlibs because gecko needs
those files when loaded by a third party.
<<
DescPort: <<
GTK+2 build of the Mozilla Firefox browser for Mac OS X/X11. Compiled
without built-in support for GNOME (except for an app launcher button).
Patch includes fix for bug #257773, which allows building on OS X/X11
w/out the need for setting missing LDFLAGS.
Building with freetype2 is disabled because of incompatabilities with
Xorg X11 (Apple's X11 and Xfree4.4 work though). Theoretically fixed
from FF1.5 onward, but I'm unable to test, so still disabled. Seems
to cause no harm as is, however.
ac_add_options --enable-macos-target=10.3 in patch file (.mozconfig) is
for the minimum OS version that this will compile in.
<<
Index: firefox1.5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/firefox1.5.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- firefox1.5.info 20 Nov 2007 18:06:46 -0000 1.14
+++ firefox1.5.info 19 Dec 2007 14:37:09 -0000 1.15
@@ -1,6 +1,6 @@
Package: firefox1.5
Version: 1.5.0.12
-Revision: 1001
+Revision: 1005
Distribution: 10.4
Description: Lightweight browser from mozilla.org
License: OSI-Approved
@@ -54,8 +54,8 @@
/usr/bin/perl -pi -e 's,-no-cpp-precomp,,' configure
<<
#NoSetCXX: true
-GCC: 4.0
ConfigureParams: --disable-dependency-tracking
+GCC: 4.0
CompileScript: <<
#!/bin/sh -ev
export PATH='%p/bin:%p/sbin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/X11R6/bin'
--- NEW FILE: firefox2.patch ---
diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig
--- mozilla-orig/.mozconfig 1969-12-31 19:00:00.000000000 -0500
+++ mozilla/.mozconfig 2007-12-10 13:06:44.000000000 -0500
@@ -0,0 +1,42 @@
+# 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
+
+# Options for 'configure' (same as command-line options).
+ac_add_options [EMAIL PROTECTED]@
+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='-Os'
+ac_add_options --enable-macos-target=10.4
+ac_add_options [EMAIL PROTECTED]@/lib/firefox2
+ac_add_options [EMAIL PROTECTED]@
+ac_add_options [EMAIL PROTECTED]@
+ac_add_options [EMAIL PROTECTED]@/lib/freetype219
+
+ac_add_options [EMAIL PROTECTED]@/lib/freetype219
+ac_add_options [EMAIL PROTECTED]@/lib/freetype219/bin
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 2006-08-19
02:04:11.000000000 -0400
+++ mozilla/browser/locales/en-US/profile/bookmarks.html 2007-12-10
13:06:44.000000000 -0500
@@ -14,6 +14,7 @@
<DL><p>
<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>
<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>
+ <DT><A HREF="http://fink.sourceforge.net/";>Fink - Home</A>
</DL><p>
<HR>
<DT><H3 ID="rdf:#$ZvPhC3">Mozilla Firefox</H3>
diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in
--- mozilla-orig/config/autoconf.mk.in 2006-09-14 14:07:03.000000000 -0400
+++ mozilla/config/autoconf.mk.in 2007-12-10 13:06:44.000000000 -0500
@@ -57,14 +57,14 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir = @includedir@/$(MOZ_APP_NAME)2
libdir = @libdir@
datadir = @datadir@
mandir = @mandir@
-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir = @datadir@/idl/$(MOZ_APP_NAME)2
-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
+mozappdir = $(libdir)/$(MOZ_APP_NAME)2
+mredir = $(libdir)/mre/mre2
mrelibdir = $(mredir)/lib
DIST = $(DEPTH)/dist
diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk
--- mozilla-orig/config/config.mk 2007-02-01 17:31:07.000000000 -0500
+++ mozilla/config/config.mk 2007-12-10 13:06:44.000000000 -0500
@@ -665,7 +665,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
diff -ruN mozilla-orig/configure mozilla/configure
--- mozilla-orig/configure 2007-11-08 14:22:51.000000000 -0500
+++ mozilla/configure 2007-12-10 13:06:44.000000000 -0500
@@ -5709,7 +5709,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'
@@ -6003,10 +6003,10 @@
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=''
+ DSO_LDOPTS='-framework CoreFoundation'
STRIP="$STRIP -x -S"
_PLATFORM_DEFAULT_TOOLKIT='mac'
MOZ_ENABLE_POSTSCRIPT=
@@ -13579,14 +13579,14 @@
echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6
echo "configure:13582: checking MOZ_XFT_CFLAGS" >&5
- MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"`
+ MOZ_XFT_CFLAGS="`$PKG_CONFIG --cflags "freetype2"` `$PKG_CONFIG
--cflags "xft"`"
echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6
echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6
echo "configure:13587: checking MOZ_XFT_LIBS" >&5
## don't use --libs since that can do evil things like add
## -Wl,--export-dynamic
- MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG
--libs-only-l \"xft\"`"
+ MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"freetype2\"`
`$PKG_CONFIG --libs-only-l \"freetype2\"` `$PKG_CONFIG --libs-only-L \"xft\"`
`$PKG_CONFIG --libs-only-l \"xft\"`"
echo "$ac_t""$MOZ_XFT_LIBS" 1>&6
else
MOZ_XFT_CFLAGS=""
diff -ruN mozilla-orig/fink/applications/firefox.desktop
mozilla/fink/applications/firefox.desktop
--- mozilla-orig/fink/applications/firefox.desktop 1969-12-31
19:00:00.000000000 -0500
+++ mozilla/fink/applications/firefox.desktop 2007-12-10 13:06:44.000000000
-0500
@@ -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 1969-12-31 19:00:00.000000000 -0500
+++ mozilla/fink/fink.js 2007-12-10 13:06:44.000000000 -0500
@@ -0,0 +1,25 @@
+pref("general.useragent.extra.vendorComment", "Fink Community Edition");
+
+// Give a default font set that can do BOLD
+pref("font.name.serif.x-western", "Bitstream Vera Serif");
+pref("font.name.sans-serif.x-western", "Bitstream Vera Sans");
+pref("font.size.variable.x-western", 15);
+
+// 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);
diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure
--- mozilla-orig/nsprpub/configure 2007-04-27 16:01:01.000000000 -0400
+++ mozilla/nsprpub/configure 2007-12-10 13:08:06.000000000 -0500
@@ -3338,9 +3338,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
@@ -3349,7 +3346,7 @@
elif test -z "$MACOSX_DEPLOYMENT_TARGET" ; then
case "${target_cpu}" in
powerpc*)
- export MACOSX_DEPLOYMENT_TARGET=10.1
+ export MACOSX_DEPLOYMENT_TARGET=10.2
;;
i*86*)
export MACOSX_DEPLOYMENT_TARGET=10.4
@@ -4956,8 +4953,6 @@
case $target in
-*-darwin*)
- ;;
*)
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "configure:4964: checking for dlopen in -ldl" >&5
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 2006-12-06
13:02:35.000000000 -0500
+++ mozilla/nsprpub/pr/include/md/_darwin.h 2007-12-10 13:06:44.000000000
-0500
@@ -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_HAVE_LARGE_OFF_T
diff -ruN mozilla-orig/nsprpub/pr/include/md/_pth.h
mozilla/nsprpub/pr/include/md/_pth.h
--- mozilla-orig/nsprpub/pr/include/md/_pth.h 2005-07-21 14:22:53.000000000
-0400
+++ mozilla/nsprpub/pr/include/md/_pth.h 2007-12-10 13:18:36.000000000
-0500
@@ -202,12 +202,15 @@
#define PT_NO_SIGTIMEDWAIT
#endif
+/* remove pthread_kill for Leopard */
+/* Unpatched dies at /usr/include/signal.h:84 */
+/* Bug 401813 */
/*
* These platforms don't have pthread_kill()
- */
#if defined(DARWIN)
#define pthread_kill(thread, sig) ENOSYS
#endif
+*/
#if defined(OSF1) || defined(VMS)
#define PT_PRIO_MIN PRI_OTHER_MIN
diff -ruN mozilla-orig/nsprpub/pr/src/Makefile.in
mozilla/nsprpub/pr/src/Makefile.in
--- mozilla-orig/nsprpub/pr/src/Makefile.in 2006-10-18 20:39:28.000000000
-0400
+++ mozilla/nsprpub/pr/src/Makefile.in 2007-12-10 13:06:44.000000000 -0500
@@ -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 2006-10-06
19:36:22.000000000 -0400
+++ mozilla/nsprpub/pr/src/linking/prlink.c 2007-12-10 13:06:44.000000000
-0500
@@ -158,7 +158,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
#define PR_LD_PATHW 0x8000 /* for PR_LibSpec_PathnameU */
Index: firefox1.5.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/firefox1.5.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- firefox1.5.patch 12 Apr 2007 10:45:11 -0000 1.3
+++ firefox1.5.patch 19 Dec 2007 14:37:09 -0000 1.4
@@ -1,7 +1,7 @@
diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig
---- mozilla-orig/.mozconfig Wed Dec 31 19:00:00 1969
-+++ mozilla/.mozconfig Mon Jun 19 15:10:13 2006
-@@ -0,0 +1,43 @@
+--- mozilla-orig/.mozconfig 1969-12-31 19:00:00.000000000 -0500
++++ mozilla/.mozconfig 2007-11-08 09:49:21.000000000 -0500
+@@ -0,0 +1,42 @@
+# sh
+# Build configuration script
+#
@@ -13,7 +13,6 @@
+# Options for client.mk.
+# environment variables to set
+#mk_add_options MOZILLA_OFFICIAL=1
-+#mk_add_options [EMAIL PROTECTED]@/[EMAIL PROTECTED]@
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --enable-official-branding
@@ -45,99 +44,9 @@
+
+#ac_add_options [EMAIL PROTECTED]@/lib/freetype2
+#ac_add_options [EMAIL PROTECTED]@/lib/freetype2/bin
-diff -ruN mozilla-orig/browser/app/mozilla.in mozilla/browser/app/mozilla.in
---- mozilla-orig/browser/app/mozilla.in Tue Sep 20 17:13:03 2005
-+++ mozilla/browser/app/mozilla.in Mon Jun 19 15:10:13 2006
-@@ -99,7 +99,9 @@
- # If not, then start resolving symlinks until we find run-mozilla.sh
- found=0
- progname="$0"
--curdir=`dirname "$progname"`
-+#curdir=`dirname "$progname"`
-+# looking in %p/bin, not %p/lib/firefox, so fixing to $moz_libdir
-+curdir="$moz_libdir"
- progbase=`basename "$progname"`
- run_moz="$curdir/run-mozilla.sh"
- if test -x "$run_moz"; then
-@@ -140,9 +142,75 @@
- debugging=0
- MOZILLA_BIN="${progbase}-bin"
-
-+# The following is to check for a currently running instance.
-+# This is taken almost verbatim from the Mozilla RPM package's launch script.
-+MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client"
-+check_running() {
-+ "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null
>/dev/null
-+ RETURN_VAL=$?
-+ if [ $RETURN_VAL -eq 0 ]; then
-+ echo 1
-+ return 1
-+ else
-+ echo 0
-+ return 0
-+ fi
-+}
-+
- if [ "$OSTYPE" = "beos" ]; then
- mimeset -F "$MOZILLA_BIN"
- fi
-+
-+ALREADY_RUNNING=`check_running`
-+
-+################################################################ Parse
Arguments
-+# If there's a command line argument but it doesn't begin with a -
-+# it's probably a url. Try to send it to a running instance.
-+_USE_EXIST=0
-+_optOne="$1"
-+case "${_optOne}" in
-+ -*)
-+ ;;
-+ *)
-+ _USE_EXIST=1
-+ ;;
-+esac
-+
-+_optLast=
-+for i in "$@"; do
-+ _optLast="${i}"
-+done #last arg
-+
-+if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d
"${_optLast}" \) ]; then
-+ # Last argument seems to be a local file/directory
-+ # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
-+ # If it is just "relatively" (./file) specified, make it absolutely
-+ [ `expr "${_optLast}" : '/.*'` -eq 0 ] &&
_optLast="file://`pwd`/${_optLast}"
-+fi
-+################################################################ Parse
Arguments
-+
-+###########################################################################
Main
-+if [ $ALREADY_RUNNING -eq 1 ]; then
-+ # There's an instance already running. Use it.
-+ # Any command line args passed in?
-+ if [ $# -gt 0 ]; then
-+ # There were "some" command line args.
-+ if [ ${_USE_EXIST} -eq 1 ]; then
-+ # We should use an existing instance, as
_USE_EXIST=$_USE_EXIST=-1
-+ _remote_cmd="openURL(${_optLast})"
-+ "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}"
"${_remote_cmd}"
-+ unset _remote_cmd
-+ exit $?
-+ fi
-+ else
-+ # No command line args. Open new window/tab
-+ #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}"
"xfeDoCommand(openBrowser)"
-+ "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}"
"xfeDoCommand(openBrowser)"
-+ exit $?
-+ fi
-+fi
-+# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
-+###########################################################################
Main
-
- pass_arg_count=0
- while [ $# -gt $pass_arg_count ]
diff -ruN mozilla-orig/browser/components/build/Makefile.in
mozilla/browser/components/build/Makefile.in
---- mozilla-orig/browser/components/build/Makefile.in Wed Jun 22 22:25:04 2005
-+++ mozilla/browser/components/build/Makefile.in Mon Jun 19 15:10:13 2006
+--- mozilla-orig/browser/components/build/Makefile.in 2005-06-22
22:25:04.000000000 -0400
++++ mozilla/browser/components/build/Makefile.in 2007-11-08
09:49:21.000000000 -0500
@@ -74,6 +74,12 @@
$(MOZ_COMPONENT_LIBS) \
$(NULL)
@@ -152,19 +61,19 @@
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 Thu Nov 3
03:30:35 2005
-+++ mozilla/browser/locales/en-US/profile/bookmarks.html Mon Jun 19
15:10:14 2006
+--- mozilla-orig/browser/locales/en-US/profile/bookmarks.html 2005-11-03
03:30:35.000000000 -0500
++++ mozilla/browser/locales/en-US/profile/bookmarks.html 2007-11-08
09:49:21.000000000 -0500
@@ -12,6 +12,7 @@
<DL><p>
<DT><A HREF="http://www.mozilla.com/products/firefox/central.html";
ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg=="
LAST_CHARSET="ISO-8859-1" ID="rdf:#$GvPhC3">Getting Started</A>
<DT><A HREF="http://fxfeeds.mozilla.com/"; LAST_MODIFIED="1094668003"
FEEDURL="http://fxfeeds.mozilla.com/rss20.xml"; ID="rdf:#$HvPhC3">Latest
Headlines</A>
-+ <DT><A HREF="http://fink.sourceforge.net/";>Fink - Home</A>
++ <DT><A HREF="http://www.finkproject.org/";>Fink - Home</A>
</DL><p>
<HR>
<DT><H3 ID="rdf:#$6wPhC3">Quick Searches</H3>
diff -ruN mozilla-orig/build/unix/mozilla-config.in
mozilla/build/unix/mozilla-config.in
---- mozilla-orig/build/unix/mozilla-config.in Thu Apr 22 16:17:59 2004
-+++ mozilla/build/unix/mozilla-config.in Mon Jun 19 15:01:39 2006
+--- mozilla-orig/build/unix/mozilla-config.in 2004-04-22 16:17:59.000000000
-0400
++++ mozilla/build/unix/mozilla-config.in 2007-11-08 09:49:21.000000000
-0500
@@ -115,7 +115,7 @@
fi
@@ -175,8 +84,8 @@
if test "$echo_libs" = "yes"; then
diff -ruN mozilla-orig/build/unix/mozilla-xpcom.pc.in
mozilla/build/unix/mozilla-xpcom.pc.in
---- mozilla-orig/build/unix/mozilla-xpcom.pc.in Tue Jul 5 19:21:52 2005
-+++ mozilla/build/unix/mozilla-xpcom.pc.in Mon Jun 19 15:03:51 2006
+--- mozilla-orig/build/unix/mozilla-xpcom.pc.in 2005-07-05
19:21:52.000000000 -0400
++++ mozilla/build/unix/mozilla-xpcom.pc.in 2007-11-08 09:49:21.000000000
-0500
@@ -8,5 +8,5 @@
Description: The Mozilla Cross Platform Component Library
Version: %MOZILLA_VERSION%
@@ -185,8 +94,8 @@
+Libs: -L${libdir} -lxpcom -lxpcom_core
Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in
---- mozilla-orig/config/autoconf.mk.in Fri Apr 21 16:50:30 2006
-+++ mozilla/config/autoconf.mk.in Mon Jun 19 15:10:14 2006
+--- mozilla-orig/config/autoconf.mk.in 2006-04-21 16:50:30.000000000 -0400
++++ mozilla/config/autoconf.mk.in 2007-11-08 09:49:21.000000000 -0500
@@ -56,14 +56,14 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -207,8 +116,8 @@
DIST = $(DEPTH)/dist
diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk
---- mozilla-orig/config/config.mk Thu Apr 6 12:28:13 2006
-+++ mozilla/config/config.mk Mon Jun 19 15:10:14 2006
+--- mozilla-orig/config/config.mk 2006-04-06 12:28:13.000000000 -0400
++++ mozilla/config/config.mk 2007-11-08 09:49:21.000000000 -0500
@@ -679,7 +679,7 @@
ifeq ($(OS_ARCH),Darwin)
ifdef USE_PREBINDING
@@ -219,9 +128,9 @@
ifdef NEXT_ROOT
export NEXT_ROOT
diff -ruN mozilla-orig/configure mozilla/configure
---- mozilla-orig/configure Fri Apr 21 17:41:39 2006
-+++ mozilla/configure Mon Jun 19 15:10:14 2006
-@@ -5410,7 +5410,7 @@
+--- mozilla-orig/configure 2007-03-29 20:33:27.000000000 -0400
++++ mozilla/configure 2007-11-08 09:49:21.000000000 -0500
+@@ -5516,7 +5516,7 @@
;;
*-darwin*)
@@ -230,7 +139,7 @@
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(DIST)/bin'
-@@ -5696,10 +5696,10 @@
+@@ -5802,10 +5802,10 @@
*-darwin*)
_PEDANTIC=
@@ -245,8 +154,8 @@
_PLATFORM_DEFAULT_TOOLKIT='mac'
MOZ_ENABLE_POSTSCRIPT=
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 Mon Jun 19 15:10:14 2006
+--- mozilla-orig/fink/applications/firefox.desktop 1969-12-31
19:00:00.000000000 -0500
++++ mozilla/fink/applications/firefox.desktop 2007-11-08 09:49:22.000000000
-0500
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
@@ -259,8 +168,8 @@
+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 Mon Jun 19 15:10:14 2006
+--- mozilla-orig/fink/fink.js 1969-12-31 19:00:00.000000000 -0500
++++ mozilla/fink/fink.js 2007-11-08 09:49:22.000000000 -0500
@@ -0,0 +1,27 @@
+pref("general.useragent.extra.vendorComment", "Fink Community Edition");
+
@@ -290,8 +199,8 @@
+//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 Mon Jun 19 15:10:14 2006
+--- mozilla-orig/modules/libpref/src/nsPrefService.cpp 2005-05-13
20:30:08.000000000 -0400
++++ mozilla/modules/libpref/src/nsPrefService.cpp 2007-11-08
09:49:22.000000000 -0500
@@ -748,6 +748,7 @@
#elif defined(XP_BEOS)
"beos.js"
@@ -301,8 +210,8 @@
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles,
NS_ARRAY_LENGTH(specialFiles));
diff -ruN mozilla-orig/nsprpub/config/nspr.m4 mozilla/nsprpub/config/nspr.m4
---- mozilla-orig/nsprpub/config/nspr.m4 Fri May 11 20:36:57 2001
-+++ mozilla/nsprpub/config/nspr.m4 Mon Jun 19 17:06:49 2006
+--- mozilla-orig/nsprpub/config/nspr.m4 2001-05-11 20:36:57.000000000
-0400
++++ mozilla/nsprpub/config/nspr.m4 2007-11-08 09:49:22.000000000 -0500
@@ -5,7 +5,7 @@
dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
@@ -313,8 +222,8 @@
AC_ARG_WITH(nspr-prefix,
diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure
---- mozilla-orig/nsprpub/configure Wed Feb 22 18:03:10 2006
-+++ mozilla/nsprpub/configure Mon Jun 19 15:10:14 2006
+--- mozilla-orig/nsprpub/configure 2007-04-27 16:01:01.000000000 -0400
++++ mozilla/nsprpub/configure 2007-11-08 09:49:22.000000000 -0500
@@ -3338,9 +3338,6 @@
# Add Mac OS X support for loading CFM & CFBundle plugins
@@ -325,7 +234,7 @@
OS_TARGET=MacOSX
-@@ -4960,8 +4957,6 @@
+@@ -4956,8 +4953,6 @@
case $target in
@@ -333,10 +242,10 @@
- ;;
*)
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
- echo "configure:4968: checking for dlopen in -ldl" >&5
+ echo "configure:4964: checking for dlopen in -ldl" >&5
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 Tue Jan 10 18:16:38 2006
-+++ mozilla/nsprpub/pr/include/md/_darwin.h Mon Jun 19 15:10:14 2006
+--- mozilla-orig/nsprpub/pr/include/md/_darwin.h 2006-12-06
13:02:35.000000000 -0500
++++ mozilla/nsprpub/pr/include/md/_darwin.h 2007-11-08 09:49:22.000000000
-0500
@@ -62,7 +62,8 @@
#undef HAVE_STACK_GROWING_UP
@@ -346,10 +255,10 @@
+#define USE_DLFCN
#define _PR_HAVE_SOCKADDR_LEN
#define _PR_STAT_HAS_ST_ATIMESPEC
- #define _PR_NO_LARGE_FILES
+ #define _PR_HAVE_LARGE_OFF_T
diff -ruN mozilla-orig/nsprpub/pr/src/Makefile.in
mozilla/nsprpub/pr/src/Makefile.in
---- mozilla-orig/nsprpub/pr/src/Makefile.in Mon Feb 13 13:48:14 2006
-+++ mozilla/nsprpub/pr/src/Makefile.in Mon Jun 19 15:10:14 2006
+--- mozilla-orig/nsprpub/pr/src/Makefile.in 2006-10-18 20:39:28.000000000
-0400
++++ mozilla/nsprpub/pr/src/Makefile.in 2007-11-08 09:49:22.000000000 -0500
@@ -204,9 +204,9 @@
endif
endif
@@ -364,9 +273,9 @@
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 Thu Aug 18 13:24:29 2005
-+++ mozilla/nsprpub/pr/src/linking/prlink.c Mon Jun 19 15:10:14 2006
-@@ -154,7 +154,8 @@
+--- mozilla-orig/nsprpub/pr/src/linking/prlink.c 2006-10-06
19:36:22.000000000 -0400
++++ mozilla/nsprpub/pr/src/linking/prlink.c 2007-11-08 09:49:22.000000000
-0500
+@@ -158,7 +158,8 @@
#if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
|| defined(WIN16) || defined(XP_OS2) \
|| ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
@@ -375,11 +284,11 @@
+/* #define NEED_LEADING_UNDERSCORE */
#endif
- /************************************************************************/
+ #define PR_LD_PATHW 0x8000 /* for PR_LibSpec_PathnameU */
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
----
mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
Thu Feb 23 14:37:11 2006
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
Mon Jun 19 15:10:14 2006
-@@ -163,7 +163,7 @@
+---
mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
2007-04-09 16:01:13.000000000 -0400
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
2007-11-08 09:49:22.000000000 -0500
+@@ -167,7 +167,7 @@
/* Define KEEP_STACK_16_BYTE_ALIGNED if the stack needs to maintain alignment
* in a CALL for some good reason (like ABI compliance). */
@@ -389,8 +298,8 @@
#define KEEP_STACK_16_BYTE_ALIGNED
#endif
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
---- mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp
Mon Oct 24 01:42:28 2005
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp
Mon Jun 19 15:10:14 2006
+--- mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp
2005-10-24 01:42:28.000000000 -0400
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp
2007-11-08 09:49:22.000000000 -0500
@@ -104,7 +104,7 @@
#ifdef __GNUC__ /* Gnu Compiler. */
@@ -400,5 +309,3 @@
/* Make sure the stack is 16-byte aligned. Do that by aligning to 16 bytes
and
* then subtracting 4 so the three subsequent pushes result in a 16-byte
aligned
* stack. */
-
-
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
