Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6714
Added Files:
firefox3.info firefox3.patch
Log Message:
CAREFUL: works, but might have things changed around until it stabilizes
--- NEW FILE: firefox3.info ---
Package: firefox3
Version: 3.1
Revision: b3.6
## next revision will be %v=3.5, %r=0.b4.[1,2,...] and then %r=1 at 3.5 (final).
Distribution: 10.5, 10.6
Description: Lightweight browser from mozilla.org
License: OSI-Approved
Maintainer: Hanspeter Niederstrasser <[email protected]>
Depends: <<
%N-shlibs (= %v-%r),
atk1-shlibs (>= 1.20.0-1),
bzip2-shlibs,
cairo-shlibs (>= 1.6-1),
fontconfig2-shlibs (>= 2.4.1-1),
freetype219-shlibs (>= 2.3.7-7),
glib2-shlibs (>= 2.14.0-1),
gtk+2-shlibs (>= 2.12.0-1),
libgettext3-shlibs,
pango1-xft2-ft219-shlibs (>= 1.20.0-3),
x11
<<
BuildConflicts: <<
freetype,
freetype-hinting,
nspr
<<
BuildDepends: <<
atk1 (>= 1.20.0-1),
bzip2-dev,
cairo (>= 1.6-1),
dbus-dev,
fink (>= 0.28-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
glib2-dev (>= 2.14.0-1),
glitz,
gtk+2-dev (>= 2.12.0-1),
libgettext3-dev,
libiconv-dev,
libidl2 (>= 0.8.9-1),
libjpeg,
libpng3 (>= 1.2.8-1),
pango1-xft2-ft219-dev (>= 1.20.0-3),
pixman (>= 0.10.0-1),
pkgconfig (>= 0.21-1),
sqlite3-dev (>= 3.6.7-1),
x11-dev,
xft2-dev
<<
Source:
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%vb3/source/firefox-3.1b3-source.tar.bz2
SourceDirectory: mozilla-1.9.1
Source-MD5: 61cd1a7fc587f6d2a33c564033198e2c
PatchFile: %n.patch
PatchFile-MD5: 159e6900dfe38eff3dd7efaf62100498
PatchScript: <<
### apply the patch
/usr/bin/sed 's|@FINKPREFIX@|%p|g' <%{PatchFile} | /usr/bin/patch -p1
### hardcode paths inside dylibs so that programs linking to them can see them
/usr/bin/perl -pi -e 's,\...@executable_path,%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.in
### 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}
### find autoconf-2.13 and put plain ol' autoconf in front of it
#/usr/bin/perl -pi -e 's,autoconf-2.13, autoconf autoconf-2.13,g' client.mk
### pogma says this will help with diff files that use the same name. Rename
here and patch also modifies the build system for them.
### http://paste.lisp.org/display/77124
/bin/cp modules/libjar/nsWildCard.cpp modules/libjar/nsWildCard_old.cpp
/bin/cp modules/libjar/nsWildCard.h modules/libjar/nsWildCard_old.h
<<
GCC: 4.0
CompileScript: <<
#!/bin/sh -ev
export PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/pkgconfig"
/usr/bin/make -w -f client.mk build \
MOZ_XFT_CFLAGS="-I%p/include/freetype2 -I%p/include -I/usr/X11R6/include" \
MOZ_XFT_LIBS="-L%p/lib -L/usr/X11R6/lib -lXft -lfreetype -lXrender -lfontconfig"
<<
InstallScript: <<
#!/bin/sh -ev
/usr/bin/make -j1 -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/default16.png
%i/share/pixmaps/firefox.png
# 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
# fix install_names for the base package plugins
for file in %i/lib/%n/plugins/*.dylib; do
FILENAME=`basename "$file"`;
install_name_tool -id "%p/lib/%n/plugins/$FILENAME"
"%i/lib/%n/plugins/$FILENAME";
done
# remove the %N-devel directory because it's not needed in FF
/bin/rm -r %i/lib/%n-devel
<<
DocFiles: LEGAL LICENSE README.txt
Shlibs: <<
!%p/lib/%N/plugins/libnullplugin.dylib
!%p/lib/%N/plugins/libunixprintplugin.dylib
<<
SplitOff: <<
Package: firefox
Depends: <<
%N (= %v-%r),
%N-shlibs (= %v-%r)
<<
Conflicts: <<
firefox (>= 3.1-6),
firefox2
<<
Replaces: <<
firefox (>= 3.1-6),
firefox2
<<
Description: Lightweight browser from mozilla.org (main user files)
DocFiles: LEGAL LICENSE README.txt
Files: <<
bin/firefox
share/applications/firefox.desktop
share/pixmaps/firefox.png
<<
<<
SplitOff2: <<
Package: %N-dev
Depends: <<
%N-shlibs (= %v-%r),
atk1-shlibs (>= 1.20.0-1),
cairo-shlibs (>= 1.6-1),
dbus-shlibs,
freetype219-shlibs (>= 2.3.7-7),
glib2-shlibs (>= 2.14.0-1),
gtk+2-shlibs (>= 2.12.0-1),
libgettext3-shlibs,
libjpeg-shlibs,
pango1-xft2-ft219-shlibs (>= 1.20.0-3),
sqlite3-shlibs (>= 3.6.7-1)
<<
BuildDependsOnly: true
Description: Lightweight browser from mozilla.org (development files)
DocFiles: LEGAL LICENSE README.txt
Files: <<
include
share/idl
<<
# lib/%N-devel
# bin/firefox-config
# lib/pkgconfig
# lib/%N/xp*
# share/aclocal
<<
SplitOff3: <<
Package: %N-shlibs
Depends: <<
atk1-shlibs (>= 1.20.0-1),
cairo-shlibs (>= 1.6-1),
dbus-shlibs,
fontconfig2-shlibs (>= 2.4.1-1),
freetype219-shlibs (>= 2.3.7-7),
glib2-shlibs (>= 2.14.0-1),
gtk+2-shlibs (>= 2.12.0-1),
libgettext3-shlibs,
libjpeg-shlibs,
pango1-xft2-ft219-shlibs (>= 1.20.0-3),
sqlite3-shlibs (>= 3.6.7-1),
x11-shlibs
<<
Description: Lightweight browser from mozilla.org (shared libraries)
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/libmozjs.dylib 1.0.0 %n (>= 0.10.1-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/libnssdbm3.dylib 1.0.0 %n (>= 3.1-2)
%p/lib/%N/libnssutil3.dylib 1.0.0 %n (>= 3.1-2)
%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/libsqlite3.dylib 1.0.0 %n (>= 3.1-1)
%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/libxul.dylib 1.0.0 %n (>= 3.1-1)
<<
# %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/libmozz.dylib 1.0.0 %n (>= 1.5-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: <<
As of firefox3-3.1-b3.6, includes a splitoff 'firefox' that includes
the main user interaction files to simplify upgrading between major
versions.
Moved chrome* components* greprefs* res* to -shlibs because gecko needs
those files when loaded by a third party.
The directory %p/lib/%N-devel is removed because it only contains
symlinks to files found under %p/lib/%N.
<<
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.
ac_add_options --enable-macos-target=foo in patch file (.mozconfig) is
for the minimum OS version that this will compile in, so usually the
lowest Distribution used in the Fink tree this lives in.
Using system-provided libraries:
--------------------------------
. system-cairo (>= 1.6) can be used as long as it has gfxQuartzSurface.h.
. system-png cannot be used because it lacks APNG (upstream won't include it)
<<
--- NEW FILE: firefox3.patch ---
diff -ruN mozilla-1.9.1-orig/.mozconfig mozilla-1.9.1/.mozconfig
--- mozilla-1.9.1-orig/.mozconfig 1969-12-31 19:00:00.000000000 -0500
+++ mozilla-1.9.1/.mozconfig 2009-03-16 16:34:22.000000000 -0400
@@ -0,0 +1,39 @@
+# 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 --pref...@finkprefix@
+ac_add_options --enable-official-branding
+ac_add_options --enable-default-toolkit=cairo-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-xinerama
+#ac_add_options --with-pthreads
+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-debug
+ac_add_options --disable-tests
+ac_add_options --enable-strip
+ac_add_options --enable-optimize='-Os'
+ac_add_options --enable-macos-target=10.5
+#ac_add_options --with-default-mozilla-five-ho...@finkprefix@/lib/firefox3
+ac_add_options --with-system-jp...@finkprefix@
+ac_add_options --disable-system-cairo
diff -ruN mozilla-1.9.1-orig/browser/components/build/Makefile.in
mozilla-1.9.1/browser/components/build/Makefile.in
--- mozilla-1.9.1-orig/browser/components/build/Makefile.in 2009-03-05
16:31:44.000000000 -0500
+++ mozilla-1.9.1/browser/components/build/Makefile.in 2009-03-16
16:34:22.000000000 -0400
@@ -76,6 +76,12 @@
$(MOZ_COMPONENT_LIBS) \
$(NULL)
+# fix for building on Mac/X11 (bug 257773)
+# dependencies for gkgfx
+ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
+endif
+
# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
# GTK2: Need to link with glib for GNOME shell service
ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
--- mozilla-1.9.1-orig/browser/locales/generic/profile/bookmarks.html.in
2009-03-05 16:31:44.000000000 -0500
+++ mozilla-1.9.1/browser/locales/generic/profile/bookmarks.html.in
2009-03-24 14:06:17.000000000 -0400
@@ -15,6 +15,7 @@
<DL><p>
<DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/";
ID="rdf:#$GvPhC3">@getting_started@</A>
<DT><A
HREF="http://fxfeeds.mozilla.com/@AB_CD@/firefox/livebookmarks/";
FEEDURL="http://fxfeeds.mozilla.com/@AB_CD@/firefox/headlines.xml";
ID="rdf:#$HvPhC3">@latest_headlines@</A>
+ <DT><A HREF="http://www.finkproject.org/";
ICON_URI="http://www.finkproject.org/favicon.ico";
ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA+0lEQVQ4jWNgGDLg/6sTqv9OVe75uzv43J+TpUv/MzAwEqfxfEfU3y3O///u9P//d5v7/7/HCir/vz8n//9ir9+fffF+eDX/O5yxCqLR4///28u0GRgYGP6uN/sPN/zNBWlMG9+e4Pt7tq0bbutO//9/t3v9///qFQ9e2/7uCZ3/b3fwvX9HMg//PZpz7e9O//9/9ye8+Lc34ubf7V7/f1+e4Irdj3dWVf//f5UNzn91VeLvzoD/f0+U1OK1EadLtrr8/3+uoYcszf+PZHX/OxB/jizNDAwMDP92BX0hW/P/o1k7ydbMwMDA8P98D/ZQJkrz+6sJFNk+oAAAPwyICxl3w8YAAAAASUVORK5CYII=">Fink
- Home</A>
</DL><p>
<HR>
<DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
diff -ruN mozilla-1.9.1-orig/config/autoconf.mk.in
mozilla-1.9.1/config/autoconf.mk.in
--- mozilla-1.9.1-orig/config/autoconf.mk.in 2009-03-05 16:31:44.000000000
-0500
+++ mozilla-1.9.1/config/autoconf.mk.in 2009-03-16 16:36:19.000000000 -0400
@@ -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)3
libdir = @libdir@
datadir = @datadir@
mandir = @mandir@
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir = $(datadir)/idl/$(MOZ_APP_NAME)3
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+installdir = $(libdir)/$(MOZ_APP_NAME)3
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+sdkdir = $(libdir)/$(MOZ_APP_NAME)3-devel
DIST = $(DEPTH)/dist
LIBXUL_SDK =
diff -ruN mozilla-1.9.1-orig/configure mozilla-1.9.1/configure
--- mozilla-1.9.1-orig/configure 2009-03-05 16:39:06.000000000 -0500
+++ mozilla-1.9.1/configure 2009-03-16 22:06:47.000000000 -0400
@@ -5869,11 +5869,11 @@
;;
*-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,$(LIBXUL_DIST)/bin'
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
+ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/libxul.dylib -lobjc'
;;
*-linux*|*-kfreebsd*-gnu)
@@ -6158,10 +6158,10 @@
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
MOZ_OPTIMIZE_FLAGS="-O2"
_PEDANTIC=
- CFLAGS="$CFLAGS -fpascal-strings -fno-common"
- CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common"
+ CFLAGS="$CFLAGS -fno-common"
+ CXXFLAGS="$CXXFLAGS -fno-common"
DLL_SUFFIX=".dylib"
- DSO_LDOPTS=''
+ DSO_LDOPTS='-framework CoreFoundation'
STRIP="$STRIP -x -S"
_PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
MOZ_ENABLE_POSTSCRIPT=
diff -ruN mozilla-1.9.1-orig/fink/applications/firefox.desktop
mozilla-1.9.1/fink/applications/firefox.desktop
--- mozilla-1.9.1-orig/fink/applications/firefox.desktop 1969-12-31
19:00:00.000000000 -0500
+++ mozilla-1.9.1/fink/applications/firefox.desktop 2009-03-16
16:36:19.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-1.9.1-orig/fink/fink.js mozilla-1.9.1/fink/fink.js
--- mozilla-1.9.1-orig/fink/fink.js 1969-12-31 19:00:00.000000000 -0500
+++ mozilla-1.9.1/fink/fink.js 2009-03-16 16:36:19.000000000 -0400
@@ -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", "@FINKPREFIX@/lib/libfreetype.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", "@FINKPREFIX@/share/fonts/truetype");
+
+// AA with Bitmap scaling.
+//pref("font.scale.aa_bitmap.enable", true);
---
mozilla-1.9.1-orig/media/liboggplay/src/liboggplay/std_semaphore.h2009-03-05
16:32:15.000000000 -0500
+++ mozilla-1.9.1/media/liboggplay/src/liboggplay/std_semaphore.h
2009-04-01 14:14:08.000000000 -0400
@@ -50,7 +50,7 @@
#define SEM_CLOSE(p) CloseHandle(p)
typedef HANDLE semaphore;
#elif defined(__APPLE__)
-#include <Multiprocessing.h>
+#include <Carbon/Carbon.h>
#define SEM_CREATE(p,s) MPCreateSemaphore(s, s, &(p))
#define SEM_SIGNAL(p) MPSignalSemaphore(p)
#define SEM_WAIT(p) MPWaitOnSemaphore(p, kDurationForever)
diff -ruN mozilla-1.9.1-orig/modules/libjar/nsZipArchive.cpp
mozilla-1.9.1/modules/libjar/nsZipArchive.cpp
--- mozilla-1.9.1-orig/modules/libjar/nsZipArchive.cpp 2009-03-05
16:32:15.000000000 -0500
+++ mozilla-1.9.1/modules/libjar/nsZipArchive.cpp 2009-03-16
16:38:29.000000000 -0400
@@ -51,7 +51,7 @@
#ifndef STANDALONE
-#include "nsWildCard.h"
+#include "nsWildCard_old.h"
#include "nscore.h"
#include "prmem.h"
#include "prio.h"
diff -ruN mozilla-1.9.1-orig/modules/libjar/objs.mk
mozilla-1.9.1/modules/libjar/objs.mk
--- mozilla-1.9.1-orig/modules/libjar/objs.mk 2009-03-05 16:32:15.000000000
-0500
+++ mozilla-1.9.1/modules/libjar/objs.mk 2009-03-16 16:37:30.000000000
-0400
@@ -37,7 +37,7 @@
MODULES_STANDALONE_LCPPSRCS = \
nsZipArchive.cpp \
- nsWildCard.cpp \
+ nsWildCard_old.cpp \
$(NULL)
MODULES_LIBJAR_LCPPSRCS = \
--- mozilla-1.9.1-orig/modules/libpr0n/decoders/icon/Makefile.in
2009-03-05 16:32:15.000000000 -0500
+++ mozilla-1.9.1/modules/libpr0n/decoders/icon/Makefile.in 2009-03-17
09:16:57.000000000 -0400
@@ -67,7 +67,7 @@
PLATFORM = os2
endif
-ifeq ($(OS_ARCH),Darwin)
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
PLATFORM = mac
endif
diff -ruN mozilla-1.9.1-orig/nsprpub/configure mozilla-1.9.1/nsprpub/configure
--- mozilla-1.9.1-orig/nsprpub/configure 2009-03-05 16:32:18.000000000
-0500
+++ mozilla-1.9.1/nsprpub/configure 2009-03-16 16:36:19.000000000 -0400
@@ -3376,9 +3376,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
@@ -5023,8 +5020,6 @@
case $target in
-*-darwin*|*-beos*)
- ;;
*)
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "configure:5031: checking for dlopen in -ldl" >&5
diff -ruN mozilla-1.9.1-orig/nsprpub/pr/include/md/_darwin.h
mozilla-1.9.1/nsprpub/pr/include/md/_darwin.h
--- mozilla-1.9.1-orig/nsprpub/pr/include/md/_darwin.h 2009-03-05
16:32:18.000000000 -0500
+++ mozilla-1.9.1/nsprpub/pr/include/md/_darwin.h 2009-03-16
16:36:19.000000000 -0400
@@ -67,7 +67,8 @@
#ifdef __x86_64__
#define USE_DLFCN
#else
-#define USE_MACH_DYLD
+/* #define USE_MACH_DYLD */
+#define USE_DLFCN
#endif
#define _PR_HAVE_SOCKADDR_LEN
#define _PR_STAT_HAS_ST_ATIMESPEC
diff -ruN mozilla-1.9.1-orig/nsprpub/pr/src/Makefile.in
mozilla-1.9.1/nsprpub/pr/src/Makefile.in
--- mozilla-1.9.1-orig/nsprpub/pr/src/Makefile.in 2009-03-05
16:32:18.000000000 -0500
+++ mozilla-1.9.1/nsprpub/pr/src/Makefile.in 2009-03-16 16:36:19.000000000
-0400
@@ -201,9 +201,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-1.9.1-orig/nsprpub/pr/src/linking/prlink.c
mozilla-1.9.1/nsprpub/pr/src/linking/prlink.c
--- mozilla-1.9.1-orig/nsprpub/pr/src/linking/prlink.c 2009-03-05
16:32:19.000000000 -0500
+++ mozilla-1.9.1/nsprpub/pr/src/linking/prlink.c 2009-03-16
16:36:19.000000000 -0400
@@ -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-10.5(+?), dlsym does not accept symbols with '_'. */
+/* #define NEED_LEADING_UNDERSCORE */
#endif
#define PR_LD_PATHW 0x8000 /* for PR_LibSpec_PathnameU */
diff -ruN mozilla-1.9.1-orig/toolkit/library/Makefile.in
mozilla-1.9.1/toolkit/library/Makefile.in
--- mozilla-1.9.1-orig/toolkit/library/Makefile.in 2009-03-05
16:32:46.000000000 -0500
+++ mozilla-1.9.1/toolkit/library/Makefile.in 2009-03-16 22:08:37.000000000
-0400
@@ -230,6 +230,7 @@
ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS)
$(XT_LIBS) -lgthread-2.0
EXTRA_DSO_LDOPTS += $(FT2_LIBS)
+EXTRA_DSO_LDOPTS += -Wl,-framework,AudioUnit
endif
ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
--- mozilla-1.9.1-orig/toolkit/mozapps/installer/packager.mk 2009-03-05
16:32:46.000000000 -0500
+++ mozilla-1.9.1/toolkit/mozapps/installer/packager.mk 2009-03-17
10:58:13.000000000 -0400
@@ -418,7 +418,7 @@
# dist/sdk/lib -> prefix/lib/appname-devel-version/lib
# prefix/lib/appname-devel-version/* symlinks to the above directories
install:: stage-package
-ifneq (,$(filter WINNT Darwin,$(OS_ARCH)))
+ifneq (,$(filter WINNT,$(OS_ARCH)))
$(error "make install" is not supported on this platform. Use "make
package" instead.)
endif
$(NSINSTALL) -D $(DESTDIR)$(installdir)
@@ -434,7 +434,7 @@
(cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
(cd $(DESTDIR)$(includedir)/stable && tar -xf -)
# The dist/include has module subdirectories that we need to flatten
- find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {}
$(DESTDIR)$(includedir)/unstable \;
+ find $(DIST)/include -type f -exec $(SYSINSTALL) $(IFLAGS1) {}
$(DESTDIR)$(includedir)/unstable \;
# IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
$(NSINSTALL) -D $(DESTDIR)$(idldir)/stable
$(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable
diff -ruN mozilla-1.9.1-orig/xpcom/base/nsStackWalk.cpp
mozilla-1.9.1/xpcom/base/nsStackWalk.cpp
--- mozilla-1.9.1-orig/xpcom/base/nsStackWalk.cpp 2009-03-05
16:32:54.000000000 -0500
+++ mozilla-1.9.1/xpcom/base/nsStackWalk.cpp 2009-03-16 16:36:19.000000000
-0400
@@ -1124,7 +1124,7 @@
#define __USE_GNU
#endif
-#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
+#if defined(HAVE_LIBDL) || defined(XP_UNIX)
#include <dlfcn.h>
#endif
--- mozilla-1.9.1-orig/xpcom/stub/Makefile.in 2009-03-05 16:32:56.000000000
-0500
+++ mozilla-1.9.1/xpcom/stub/Makefile.in 2009-03-17 06:22:57.000000000
-0400
@@ -108,8 +108,8 @@
endif
ifeq (Darwin,$(OS_ARCH))
-EXTRA_DSO_LDOPTS += $(DIST)/bin/XUL
-DEPENDENT_LIBS_LIST += XUL
+EXTRA_DSO_LDOPTS += $(DIST)/bin/libxul.dylib
+DEPENDENT_LIBS_LIST += $(LIB_PREFIX)xul$(DLL_SUFFIX)
else
EXTRA_DSO_LIBS = xul
DEPENDENT_LIBS_LIST += $(LIB_PREFIX)xul$(DLL_SUFFIX)
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
