Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7110
Modified Files:
firefox3.info firefox3.patch
Log Message:
3.6 release
Index: firefox3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/firefox3.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- firefox3.info 6 Jan 2010 14:47:41 -0000 1.19
+++ firefox3.info 21 Jan 2010 20:06:40 -0000 1.20
@@ -1,8 +1,8 @@
Package: firefox3
-Version: 3.5.7
+Version: 3.6
Revision: 1
Architecture: i386, powerpc
-Distribution: 10.5
+Distribution: 10.5, (%m = i386) 10.6
Description: Lightweight browser from mozilla.org
License: OSI-Approved
Maintainer: Hanspeter Niederstrasser <nie...@users.sourceforge.net>
@@ -15,7 +15,7 @@
freetype219-shlibs (>= 2.3.7-7),
glib2-shlibs (>= 2.14.0-1),
gtk+2-shlibs (>= 2.12.0-1),
- libgettext3-shlibs,
+ libgettext8-shlibs,
pango1-xft2-ft219-shlibs (>= 1.20.0-3),
x11
<<
@@ -33,47 +33,41 @@
fink (>= 0.28-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
+ gcc4.2 (>= 4.2.1-5574),
glib2-dev (>= 2.14.0-1),
glitz,
gtk+2-dev (>= 2.12.0-1),
- libgettext3-dev,
+ libgettext8-dev,
libidl2 (>= 0.8.9-1),
libjpeg,
+ libnotify (>= 0.4-1),
pango1-xft2-ft219-dev (>= 1.20.0-3),
pixman (>= 0.10.0-1),
pkgconfig (>= 0.21-1),
+ system-sdk-10.5,
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
+SourceDirectory: mozilla-1.9.2
+Source-MD5: 458051557ff49e6a352c1d56eee5782a
PatchFile: %n.patch
-PatchFile-MD5: 83abc233723411614652db1a1f5bfa9c
+PatchFile-MD5: 62f807a23c53a14c12bc07c182414827
PatchScript: <<
### apply the patch
- /usr/bin/sed 's|@FINKPREFIX@|%p|g' <%{PatchFile} | /usr/bin/patch -p1
+ /usr/bin/sed -e 's|@FINKPREFIX@|%p|g' -e 's|@FINK_ARCH_TARGET@|%m|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"
+export PATH=%p/var/lib/fink/path-prefix-10.6:$PATH
+/usr/bin/make -w -f client.mk build
<<
InstallScript: <<
#!/bin/sh -ev
@@ -81,7 +75,7 @@
/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
+/bin/cp -R -L obj-%m-apple-darwin`uname -r`/dist/public/nss %i/include/%n/nss
# Install the GNOME .desktop launcher.
/usr/bin/install -d -m 755 %i/share/applications
@@ -89,7 +83,7 @@
# 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
+/usr/bin/install -c -m 644 obj-%m-apple-darwin`uname
-r`/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
@@ -162,7 +156,7 @@
freetype219-shlibs (>= 2.3.7-7),
glib2-shlibs (>= 2.14.0-1),
gtk+2-shlibs (>= 2.12.0-1),
- libgettext3-shlibs,
+ libgettext8-shlibs,
libjpeg-shlibs,
pango1-xft2-ft219-shlibs (>= 1.20.0-3),
x11-shlibs
Index: firefox3.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/firefox3.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- firefox3.patch 15 Nov 2009 17:46:11 -0000 1.7
+++ firefox3.patch 21 Jan 2010 20:06:40 -0000 1.8
@@ -1,7 +1,7 @@
-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 @@
+diff -ruN mozilla-1.9.2-orig/.mozconfig mozilla-1.9.2/.mozconfig
+--- mozilla-1.9.2-orig/.mozconfig 1969-12-31 19:00:00.000000000 -0500
++++ mozilla-1.9.2/.mozconfig 2009-04-27 16:56:30.000000000 -0400
+@@ -0,0 +1,55 @@
+# sh
+# Build configuration script
+#
@@ -13,8 +13,20 @@
+# Options for client.mk.
+# environment variables to set
+
-+#mk_add_options moz_objd...@topsrcdir@/o...@config_guess@
++mk_add_options
moz_objd...@topsrcdir@/o...@fink_arch_target@-apple-darwin`uname -r`
+mk_add_options AUTOCONF=autoconf
++CC="gcc-4.2"
++CXX="g++-4.2"
++ac_add_options --targ...@fink_arch_target@-apple-darwin`uname -r`
++ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
++HOST_CC="gcc-4.2"
++HOST_CXX="g++-4.2"
++RANLIB=/usr/bin/ranlib
++AR=/usr/bin/ar
++AS=$CC
++LD=/usr/bin/ld
++#STRIP="strip -x -S"
++CROSS_COMPILE=1
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --pref...@finkprefix@
@@ -35,20 +47,41 @@
+
+ac_add_options --disable-dependency-tracking
+ac_add_options --disable-crashreporter
-+#ac_add_options --disable-necko-wifi
++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
+diff -ruN mozilla-1.9.2-orig/browser/installer/package-manifest.in
mozilla-1.9.2/browser/installer/package-manifest.in
+--- mozilla-1.9.2-orig/browser/installer/package-manifest.in
++++ mozilla-1.9.2/browser/installer/package-manifest.in
+@@ -77,7 +77,8 @@
+ @BINPATH@/plugins/MRJPlugin.plugin/
+ #endif
+ #elifdef XP_UNIX
+...@binpath@/plugins/libnullplugin.so
+...@binpath@/plugins/libnullplugin.dylib
+...@binpath@/plugins/libunixprintplugin.dylib
+ #elifdef XP_WIN32
+ #ifndef WINCE
+ @BINPATH@/plugins/npnul32.dll
+@@ -189,7 +189,7 @@
+ @BINPATH@/components/layout_xul.xpt
+ #ifdef XP_UNIX
+ #ifndef XP_MACOSX
+...@binpath@/components/libimgicon.so
+...@binpath@/components/libimgicon.dylib
+ #endif
+ #endif
+ @BINPATH@/components/locale.xpt
+diff -ruN mozilla-1.9.2-orig/browser/locales/generic/profile/bookmarks.html.in
mozilla-1.9.2/browser/locales/generic/profile/bookmarks.html.in
+--- mozilla-1.9.2-orig/browser/locales/generic/profile/bookmarks.html.in
2009-04-23 21:46:37.000000000 -0400
++++ mozilla-1.9.2/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>
@@ -57,10 +90,10 @@
</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 @@
+diff -ruN mozilla-1.9.2-orig/config/autoconf.mk.in
mozilla-1.9.2/config/autoconf.mk.in
+--- mozilla-1.9.2-orig/config/autoconf.mk.in 2009-04-23 21:46:37.000000000
-0400
++++ mozilla-1.9.2/config/autoconf.mk.in 2009-04-27 16:56:30.000000000
-0400
+@@ -58,14 +58,14 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
@@ -79,10 +112,10 @@
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 @@
+diff -ruN mozilla-1.9.2-orig/configure mozilla-1.9.2/configure
+--- mozilla-1.9.2-orig/configure 2009-04-23 21:51:07.000000000 -0400
++++ mozilla-1.9.2/configure 2009-04-27 16:56:30.000000000 -0400
+@@ -6381,7 +6381,7 @@
;;
*-darwin*)
@@ -91,14 +124,9 @@
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 @@
+@@ -6680,10 +6680,10 @@
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
- MOZ_OPTIMIZE_FLAGS="-O2"
+ MOZ_OPTIMIZE_FLAGS="-O3"
_PEDANTIC=
- CFLAGS="$CFLAGS -fpascal-strings -fno-common"
- CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common"
@@ -110,9 +138,22 @@
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
+diff -ruN mozilla-1.9.2-orig/browser/installer/Makefile.in
mozilla-1.9.2/browser/installer/Makefile.in
+--- mozilla-1.9.2-orig/browser/installer/Makefile.in 2009-11-10
12:53:40.000000000 -0800
++++ mozilla-1.9.2/browser/installer/Makefile.in 2009-11-10
13:01:38.000000000 -0800
+@@ -120,7 +120,7 @@ endif
+
+ include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
+
+-ifeq (Darwin, $(OS_ARCH))
++ifeq (bundle, $(MOZ_FS_LAYOUT))
+ DEFINES += \
+ -DBINPATH=$(_BINPATH) \
+ -DAPPNAME=$(_APPNAME) \
+
+diff -ruN mozilla-1.9.2-orig/fink/applications/firefox.desktop
mozilla-1.9.2/fink/applications/firefox.desktop
+--- mozilla-1.9.2-orig/fink/applications/firefox.desktop 1969-12-31
19:00:00.000000000 -0500
++++ mozilla-1.9.2/fink/applications/firefox.desktop 2009-04-27
16:56:30.000000000 -0400
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
@@ -124,73 +165,14 @@
+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
+diff -ruN mozilla-1.9.2-orig/fink/fink.js mozilla-1.9.2/fink/fink.js
+--- mozilla-1.9.2-orig/fink/fink.js 1969-12-31 19:00:00.000000000 -0500
++++ mozilla-1.9.2/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
+diff -ruN mozilla-1.9.2-orig/netwerk/wifi/src/nsWifiMonitor.h
mozilla-1.9.2/netwerk/wifi/src/nsWifiMonitor.h
+--- mozilla-1.9.2-orig/netwerk/wifi/src/nsWifiMonitor.h 2009-10-16
11:14:14.000000000 -0400
++++ mozilla-1.9.2/netwerk/wifi/src/nsWifiMonitor.h 2009-10-28
09:30:59.000000000 -0400
@@ -88,7 +88,7 @@
nsresult DoScan();
@@ -200,62 +182,10 @@
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 @@
+diff -ruN mozilla-1.9.2-orig/xpcom/base/nsStackWalk.cpp
mozilla-1.9.2/xpcom/base/nsStackWalk.cpp
+--- mozilla-1.9.2-orig/xpcom/base/nsStackWalk.cpp 2009-04-23
21:47:11.000000000 -0400
++++ mozilla-1.9.2/xpcom/base/nsStackWalk.cpp 2009-04-27 16:56:31.000000000
-0400
+@@ -1132,7 +1132,7 @@
#define __USE_GNU
#endif
@@ -264,17 +194,3 @@
#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
