Update of /cvsroot/fink/dists/10.4/stable/crypto/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22988
Added Files:
firefox3.info firefox3.patch
Log Message:
move 3.5.7 to stable for upcoming 3.6 release
--- NEW FILE: firefox3.info ---
Package: firefox3
Version: 3.5.7
Revision: 1
Architecture: i386, powerpc
Distribution: 10.5
Description: Lightweight browser from mozilla.org
License: OSI-Approved
Maintainer: Hanspeter Niederstrasser <nie...@users.sourceforge.net>
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,
sqlite3-dev
<<
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,
libidl2 (>= 0.8.9-1),
libjpeg,
pango1-xft2-ft219-dev (>= 1.20.0-3),
pixman (>= 0.10.0-1),
pkgconfig (>= 0.21-1),
x11-dev,
xft2-dev
<<
Source:
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%v/source/firefox-%v.source.tar.bz2
SourceDirectory: mozilla-1.9.1
Source-MD5: 82e6f568ddeaae52e85aa089277f5d14
PatchFile: %n.patch
PatchFile-MD5: 83abc233723411614652db1a1f5bfa9c
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}
### 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
### https://bugzilla.mozilla.org/show_bug.cgi?id=487192
### https://bugzilla.mozilla.org/show_bug.cgi?id=484353
/bin/cp modules/libjar/nsWildCard.cpp modules/libjar/nsWildCard_jar.cpp
/bin/cp modules/libjar/nsWildCard.h modules/libjar/nsWildCard_jar.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 -f client.mk 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 (= %v-%r),
%N-shlibs (= %v-%r)
<<
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),
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
Mac OS 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: <<
%p/bin/firefox
The user-accessible 'firefox' executable in installed by the
splitoff package 'firefox' and is no longer contained within the
parent package %N.
<<
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).
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-04-27 16:56:30.000000000 -0400
@@ -0,0 +1,44 @@
+# sh
+# Build configuration script
+#
+# See https://developer.mozilla.org/en/Configuring_Build_Options for build
options.
+#
+
+. $topsrcdir/browser/config/mozconfig
+
+# Options for client.mk.
+# environment variables to set
+
+#mk_add_options moz_objd...@topsrcdir@/o...@config_guess@
+mk_add_options AUTOCONF=autoconf
+
+# 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 --x-libraries=/usr/X11R6/lib
+ac_add_options --x-includes=/usr/X11R6/include
+#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-necko-wifi
+
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+ac_add_options --enable-strip
+ac_add_options --enable-optimize='-O3'
+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
+ac_add_options --disable-system-sqlite
diff -ruN mozilla-1.9.1-orig/browser/locales/generic/profile/bookmarks.html.in
mozilla-1.9.1/browser/locales/generic/profile/bookmarks.html.in
--- mozilla-1.9.1-orig/browser/locales/generic/profile/bookmarks.html.in
2009-04-23 21:46:37.000000000 -0400
+++ mozilla-1.9.1/browser/locales/generic/profile/bookmarks.html.in
2009-04-27 16:56:30.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-04-23 21:46:37.000000000
-0400
+++ mozilla-1.9.1/config/autoconf.mk.in 2009-04-27 16:56:30.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)
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+installdir = $(libdir)/$(MOZ_APP_NAME)3
+sdkdir = $(libdir)/$(MOZ_APP_NAME)3-devel
DIST = $(DEPTH)/dist
LIBXUL_SDK = @LIBXUL_SDK@
diff -ruN mozilla-1.9.1-orig/configure mozilla-1.9.1/configure
--- mozilla-1.9.1-orig/configure 2009-04-23 21:51:07.000000000 -0400
+++ mozilla-1.9.1/configure 2009-04-27 16:56:30.000000000 -0400
@@ -5941,11 +5941,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)
@@ -6230,10 +6230,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-04-27
16:56:30.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-04-27 16:56:30.000000000 -0400
@@ -0,0 +1 @@
+pref("general.useragent.extra.vendorComment", "Fink Community Edition");
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-04-23
21:46:48.000000000 -0400
+++ mozilla-1.9.1/modules/libjar/nsZipArchive.cpp 2009-04-27
16:56:30.000000000 -0400
@@ -51,7 +51,7 @@
#ifndef STANDALONE
-#include "nsWildCard.h"
+#include "nsWildCard_jar.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-04-23 21:46:48.000000000
-0400
+++ mozilla-1.9.1/modules/libjar/objs.mk 2009-04-27 16:56:30.000000000
-0400
@@ -37,7 +37,7 @@
MODULES_STANDALONE_LCPPSRCS = \
nsZipArchive.cpp \
- nsWildCard.cpp \
+ nsWildCard_jar.cpp \
$(NULL)
MODULES_LIBJAR_LCPPSRCS = \
diff -ruN mozilla-1.9.1-orig/modules/libpr0n/decoders/icon/Makefile.in
mozilla-1.9.1/modules/libpr0n/decoders/icon/Makefile.in
--- mozilla-1.9.1-orig/modules/libpr0n/decoders/icon/Makefile.in
2009-04-23 21:46:48.000000000 -0400
+++ mozilla-1.9.1/modules/libpr0n/decoders/icon/Makefile.in 2009-04-27
16:56:30.000000000 -0400
@@ -70,7 +70,7 @@
PLATFORM = os2
endif
-ifeq ($(OS_ARCH),Darwin)
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
PLATFORM = mac
endif
diff -ruN mozilla-1.9.1-orig/netwerk/wifi/src/Makefile.in
mozilla-1.9.1/netwerk/wifi/src/Makefile.in
--- mozilla-1.9.1-orig/netwerk/wifi/src/Makefile.in Tue May 05 21:33:44
2009 +0200
+++ mozilla-1.9.1/netwerk/wifi/src/Makefile.in Tue May 05 20:50:38 2009 -0400
@@ -57,16 +57,16 @@
nsWifiAccessPoint.cpp \
$(NULL)
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+ifeq ($(OS_ARCH),Darwin)
CPPSRCS += nsWifiScannerMac.cpp
CMMSRCS = osx_corewlan.mm
else
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
CPPSRCS += nsWifiScannerWin.cpp
else
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ifeq ($(OS_ARCH),Linux)
CPPSRCS += nsWifiScannerUnix.cpp
-endif # gtk
+endif # linux
endif # windows
endif # mac
--- mozilla-1.9.1-orig/netwerk/wifi/src/nsWifiMonitor.h 2009-10-16
11:14:14.000000000 -0400
+++ mozilla-1.9.1/netwerk/wifi/src/nsWifiMonitor.h 2009-10-28
09:30:59.000000000 -0400
@@ -88,7 +88,7 @@
nsresult DoScan();
-#if defined(XP_MACOSX)
+#if defined(XP_UNIX)
nsresult DoScanWithCoreWLAN();
nsresult DoScanOld();
#endif
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-04-23
21:47:06.000000000 -0400
+++ mozilla-1.9.1/toolkit/library/Makefile.in 2009-04-27 17:31:35.000000000
-0400
@@ -205,9 +205,12 @@
-lcrypto \
$(TK_LIBS) \
$(NULL)
+endif
+ifeq ($(OS_ARCH),Darwin)
ifdef MOZ_SYDNEYAUDIO
EXTRA_DSO_LDOPTS += \
+ -framework Carbon \
-framework CoreAudio \
-framework AudioToolbox \
-framework AudioUnit \
diff -ruN mozilla-1.9.1-orig/toolkit/mozapps/installer/packager.mk
mozilla-1.9.1/toolkit/mozapps/installer/packager.mk
--- mozilla-1.9.1-orig/toolkit/mozapps/installer/packager.mk 2009-04-23
21:47:07.000000000 -0400
+++ mozilla-1.9.1/toolkit/mozapps/installer/packager.mk 2009-04-27
16:56:30.000000000 -0400
@@ -437,7 +437,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)
@@ -453,7 +453,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/widget/src/gtk2/nsFilePicker.cpp
mozilla-1.9.1/wiwidget/src/gtk2/nsFilePicker.cpp
--- mozilla-1.9.1-orig/widget/src/gtk2/nsFilePicker.cpp 2009-04-03
18:35:03.000000000 -0700
+++ mozilla-1.9.1/widget/src/gtk2/nsFilePicker.cpp 2009-04-03
18:38:58.000000000 -0700
@@ -203,7 +203,11 @@
_gtk_file_chooser_get_filename = (_gtk_file_chooser_get_filename_fn)func;
} else {
// XXX hmm, this seems to fail when gtk 2.4 is already loaded...
+#ifdef __APPLE__
+ mGTK24 = PR_LoadLibrary("@FINKPREFIX@/lib/libgtk-x11-2.0.dylib");
+#else
mGTK24 = LoadVersionedLibrary("gtk-2", ".4");
+#endif
if (!mGTK24) {
return NS_ERROR_NOT_AVAILABLE;
}
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-04-23
21:47:11.000000000 -0400
+++ mozilla-1.9.1/xpcom/base/nsStackWalk.cpp 2009-04-27 16:56:31.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
diff -ruN mozilla-1.9.1-orig/xpcom/stub/Makefile.in
mozilla-1.9.1/xpcom/stub/Makefile.in
--- mozilla-1.9.1-orig/xpcom/stub/Makefile.in 2009-04-23 21:47:12.000000000
-0400
+++ mozilla-1.9.1/xpcom/stub/Makefile.in 2009-04-27 16:56:31.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)
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
