Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto
In directory vz-cvs-3.sog:/tmp/cvs-serv22151
Added Files:
firefox8-internal-nspr-nss.patch
firefox8-xcode4.2-gcc4.2.patch firefox8.info firefox8.patch
Log Message:
firefox 8.0.1
Uses internal nspr/nss
--- NEW FILE: firefox8-xcode4.2-gcc4.2.patch ---
From: Ralph Giles <gi...@mozilla.com>
Bug 697881 - Fall back to gcc on darwin if there's no gcc-4.2. r=ted
Since Bug 513353, we've defaulted to gcc-4.2 on darwin.
Unfortunately the default was unconditional, and while
XCode 4.1 provided a gcc-4.2 alias, XCode 4.2 does not,
although 'gcc' is llvm-gcc 4.2.1. As such, the configure
script immediately fails.
The patch still prefers gcc-4.2, but falls back to plain
gcc if it's not available.
Note that we try $CC and $CXX from the environment first
so it is still possible to override this default.
diff -ruN mozilla-release-orig/configure.in mozilla-release/configure.in
--- mozilla-release-orig/configure.in 2011-09-02 16:15:20.000000000 -0400
+++ mozilla-release/configure.in 2011-11-01 17:06:31.000000000 -0400
@@ -199,18 +199,21 @@
x86_64)
AS=ml64;
;;
esac
fi
if test -z "$MIDL"; then MIDL=midl; fi
;;
*-darwin*)
- if test -z "$CC"; then CC=gcc-4.2; fi
- if test -z "$CXX"; then CXX=g++-4.2; fi
+ # prefer gcc-4.2 to default cc on older darwin, so
+ # use that specific version if it's available.
+ # Bug 697881 - Will be in Firefox10.
+ MOZ_PATH_PROGS(CC, $CC gcc-4.2 gcc)
+ MOZ_PATH_PROGS(CXX, $CXX g++-4.2 g++)
;;
esac
fi
COMPILE_ENVIRONMENT=1
MOZ_ARG_DISABLE_BOOL(compile-environment,
[ --disable-compile-environment
Disable compiler/library checks.],
diff --git a/js/src/configure.in b/js/src/configure.in
index 499154c..806a20b 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -168,17 +168,17 @@ dnl
==============================================================
MOZ_ARG_WITH_STRING(dist-dir,
[ --with-dist-dir=DIR Use DIR as 'dist' staging area. DIR may be
relative to the top of SpiderMonkey build tree,
or absolute.],
TOP_DIST=$withval,
TOP_DIST=dist)
AC_SUBST(TOP_DIST)
-dnl Default to MSVC for win32 and gcc-4.2 for darwin
+dnl Default to MSVC for win32
dnl ==============================================================
if test -z "$CROSS_COMPILE"; then
case "$target" in
*-mingw*)
if test -z "$CC"; then CC=cl; fi
if test -z "$CXX"; then CXX=cl; fi
if test -z "$CPP"; then CPP="cl -E -nologo"; fi
if test -z "$CXXCPP"; then CXXCPP="cl -TP -E -nologo";
ac_cv_prog_CXXCPP="$CXXCPP"; fi
@@ -191,18 +191,19 @@ case "$target" in
x86_64)
AS=ml64;
;;
esac
fi
if test -z "$MIDL"; then MIDL=midl; fi
;;
*-darwin*)
- if test -z "$CC"; then CC=gcc-4.2; fi
- if test -z "$CXX"; then CXX=g++-4.2; fi
+ # prefer gcc-4.2 to default cc on older xcode
+ MOZ_PATH_PROGS(CC, $CC gcc-4.2 gcc)
+ MOZ_PATH_PROGS(CXX, $CXX g++-4.2 g++)
;;
esac
fi
COMPILE_ENVIRONMENT=1
MOZ_ARG_DISABLE_BOOL(compile-environment,
[ --disable-compile-environment
Disable compiler/library checks.],
--- NEW FILE: firefox8.info ---
Package: firefox8
Version: 8.0.1
Revision: 2
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),
default-icon-theme,
fontconfig2-shlibs (>= 2.8.0-6),
freetype219-shlibs (>= 2.4.4-2),
glib2-shlibs (>= 2.14.0-1),
gtk+2-shlibs (>= 2.12.0-1),
libgettext8-shlibs,
pango1-xft2-ft219-shlibs (>= 1.20.0-3),
x11
<<
# nspr.0d-shlibs (>= 4.8.8-1),
BuildConflicts: <<
freetype
<<
BuildDepends: <<
atk1 (>= 1.20.0-1),
autoconf2.13-legacy,
bzip2-dev,
cairo (>= 1.6-1),
dbus-glib1.2-dev,
dbus1.3-dev,
fink (>= 0.30.0-1),
fink-package-precedence,
fontconfig2-dev (>= 2.8.0-6),
freetype219 (>= 2.4.4-2),
glib2-dev (>= 2.14.0-1),
glitz,
gtk+2-dev (>= 2.12.0-1),
libgettext8-dev,
libidl2 (>= 0.8.9-1),
libjpeg8-turbo,
pango1-xft2-ft219-dev (>= 1.20.0-3),
pixman (>= 0.10.0-1),
pkgconfig (>= 0.23-1),
sqlite3-dev,
x11-dev,
xft2-dev (>= 2.2.0-2),
yasm
<<
# libnss.1d (>= 3.12.10-1),
# nspr.0d (>= 4.8.8-1),
Source:
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%v/source/firefox-%v.source.tar.bz2
SourceDirectory: mozilla-release
Source-MD5: b7d09b082e88a74860a51a8e04e29333
PatchFile: %n.patch
PatchFile-MD5: 66d80ded5ca33b9eec770b6bd7927904
## Use internal nspr/nss
## Apply after PatchFile to remove external nspr/nss config settings
## nspr/configure* fixes from bug 702997, fixed for firefox11
PatchFile2: firefox8-internal-nspr-nss.patch
PatchFile2-MD5: df6e170e0df343236a26e0b58e0c9e90
## xcode4.2 fix will be in firefox10 Bug 697881
PatchFile3: %n-xcode4.2-gcc4.2.patch
PatchFile3-MD5: 18471efb9ceb28c60f9f8d9835b6514f
PatchScript: <<
### apply the patch
/usr/bin/sed -e 's|@FINKPREFIX@|%p|g' -e 's|@FINK_ARCH_TARGET@|%m|g' -e
's|@FIREFOX_MAJOR_VERSION@|8|g' <%{PatchFile} | /usr/bin/patch -p1
/usr/bin/sed -e 's|@FINKPREFIX@|%p|g' <%{PatchFile2} | /usr/bin/patch -p1
/usr/bin/patch -p1 < %{PatchFile3}
### 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 .`
### -DXP_MACOSX is not always getting defined, so force __APPLE__ in those
instances :
### nsStackWalk.cpp
### gfx/ycbcr/yuv_row_posix.cpp
### layout/style/nsComputedDOMStyle.cpp
### https://bugzilla.mozilla.org/show_bug.cgi?id=485857 for nsStackWalk.cpp
/usr/bin/perl -pi -e 's,XP_MACOSX,__APPLE__,g' xpcom/base/nsStackWalk.cpp
gfx/ycbcr/yuv_row_posix.cpp layout/style/nsComputedDOMStyle.cpp
### gfx/cairo/cairo/src/cairo-ft-font.c includes x11/fontconfig w/ no
external way to use %p/fontconfig first,
### so add the proper -I flag to put %p/include first
/usr/bin/perl -pi -e 's|OS_INCLUDES \+\= \$\(XCFLAGS\)|OS_INCLUDES \+\=
\$\(FT2_CFLAGS\) \$\(XCFLAGS\)|g' gfx/cairo/cairo/src/Makefile.in
<<
### force X11 to the end
NoSetLDFLAGS: true
SetLDFLAGS: -L%p/lib -L/usr/X11R6/lib
NoSetCPPFLAGS: true
SetCPPFLAGS: -I%p/include -I/usr/X11R6/include
UseMaxBuildJobs: true
GCC: 4.0
CompileScript: <<
#!/bin/sh -ev
/usr/bin/make -w -f client.mk build
%p/bin/fink-package-precedence --depfile-ext='\.pp' --libs
--prohibit-bdep=%n-dev .
<<
InstallScript: <<
#!/bin/sh -ev
/usr/bin/make -j1 -w -f client.mk install DESTDIR=%d
# Install NSS headers.
/bin/cp -R -L obj-%m-apple-darwin`uname -r`/dist/public/nss %i/include/%n/nss
# Fix loading of libnssckbi.dylib when using system-libnss
#/bin/ln -s %p/lib/nss.1d/libnssckbi.dylib %i/lib/%n/libnssckbi.dylib
# 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 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
# remove the %N-devel directory because it's not needed in FF
/bin/rm -r %i/lib/%n-devel
<<
DocFiles: LEGAL LICENSE README.txt
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
share/pixmaps
<<
<<
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
<<
<<
SplitOff3: <<
Package: %N-shlibs
Depends: <<
atk1-shlibs (>= 1.20.0-1),
cairo-shlibs (>= 1.6-1),
dbus-glib1.2-shlibs,
dbus1.3-shlibs,
fontconfig2-shlibs (>= 2.8.0-6),
freetype219-shlibs (>= 2.4.4-2),
glib2-shlibs (>= 2.14.0-1),
gtk+2-shlibs (>= 2.12.0-1),
libgettext8-shlibs,
libjpeg8-turbo-shlibs,
pango1-xft2-ft219-shlibs (>= 1.20.0-3),
sqlite3-shlibs,
x11-shlibs
<<
# libnss.1d-shlibs (>= 3.12.10-1),
# nspr.0d-shlibs (>= 4.8.8-1),
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/omni.jar
<<
Shlibs: <<
%p/lib/%N/libmozalloc.dylib 1.0.0 %n (>= 4.0-0.b1.1)
%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/libfreebl3.dylib 1.0.0 %n (>= 1.5.0.10-1001)
%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/libnssckbi.dylib 1.0.0 %n (>= 4.0-0.b1.1)
%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/libssl3.dylib 1.0.0 %n (>= 0.10.1-4)
<<
# %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)
# add to get libmozjs back: --enable-shared-js
# %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/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)
# move to system sqlite3
# %p/lib/%N/libmozsqlite3.dylib 1.0.0 %n (>= 4.0-0.b1.1)
# move to system nspr, nss
# %p/lib/%N/libfreebl3.dylib 1.0.0 %n (>= 1.5.0.10-1001)
# %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/libnssckbi.dylib 1.0.0 %n (>= 4.0-0.b1.1)
# %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/libssl3.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*, omni.jar (prev greprefs* and 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).
Using system-provided libraries:
--------------------------------
. system-cairo (>= 1.6) can be used when --disable-quartz-image is removed from
its %c (otherwise Fx build fails looking for gfxQuartzSurface.h)
. system-png cannot be used because it lacks APNG (upstream won't include it)
. system-sqlite can be used, but must patch security/nss/lib/softoken/config.mk
to avoid pulling in system-system sqlite as well
.. if using system-libnss, gets around having to patch internal softoken files.
<<
--- NEW FILE: firefox8-internal-nspr-nss.patch ---
# HG changeset patch
# User Hub Figuiere <h...@mozilla.com>
# Date 1321307028 28800
# Node ID 624d6bdf496a582a3ba1324474a5a8a4b0692036
# Parent eb84780783ed7204a54af564e3f226304ba44506
Bug 702997 - Fix nsprpub CPU_ARCH on x86_64. r=ted
The configure script for nsprpub sets -arch ppc on darwin
if $target_cpu doesn't match i?86. Some 64 bit builds
set this to x86_64, causing us to try to build for an
unsupported architecture.
This resolves the build issue on osx64 described in
https://bugzilla.mozilla.org/show_bug.cgi?id=697881#c7
diff --git a/nsprpub/configure b/nsprpub/configure
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -3818,16 +3818,19 @@ EOF
;;
i*86*)
if test -n "$USE_64"; then
CPU_ARCH=x86_64
else
CPU_ARCH=i386
fi
;;
+ x86_64*)
+ CPU_ARCH=x86_64
+ ;;
*)
CPU_ARCH=ppc
;;
esac
if test "`echo $CC | grep -c '\-arch '`" = "0"; then
CC="$CC -arch $CPU_ARCH"
fi
ac_safe=`echo "crt_externs.h" | sed 'y%./+-%__p_%'`
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -1353,16 +1353,19 @@ case "$target" in
;;
i*86*)
if test -n "$USE_64"; then
CPU_ARCH=x86_64
else
CPU_ARCH=i386
fi
;;
+ x86_64*)
+ CPU_ARCH=x86_64
+ ;;
*)
CPU_ARCH=ppc
;;
esac
if test "`echo $CC | grep -c '\-arch '`" = "0"; then
CC="$CC -arch $CPU_ARCH"
fi
AC_CHECK_HEADER(crt_externs.h)
--- mozilla-release/.mozconfig-orig 2011-11-24 07:19:22.000000000 -0500
+++ mozilla-release/.mozconfig 2011-11-24 07:19:51.000000000 -0500
@@ -37,7 +37,7 @@
ac_add_options --with-system-jpeg=@FINKPREFIX@/lib/libjpeg8-turbo
ac_add_options --disable-system-cairo
ac_add_options --enable-system-sqlite
-ac_add_options --with-system-nspr
-ac_add_options --with-nspr-prefix=@FINKPREFIX@
-ac_add_options --with-system-nss
-ac_add_options --with-nss-prefix=@FINKPREFIX@
+#ac_add_options --with-system-nspr
+#ac_add_options --with-nspr-prefix=@FINKPREFIX@
+#ac_add_options --with-system-nss
+#ac_add_options --with-nss-prefix=@FINKPREFIX@
diff -ruN -U 8 mozilla-release-orig/security/nss/lib/softoken/config.mk
mozilla-release/security/nss/lib/softoken/config.mk
--- mozilla-release-orig/security/nss/lib/softoken/config.mk 2011-08-11
17:41:33.000000000 -0400
+++ mozilla-release/security/nss/lib/softoken/config.mk 2011-08-16
09:15:05.000000000 -0400
@@ -75,16 +75,17 @@
endif # NS_USE_GCC
else
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
+ -L@FINKPREFIX@/lib \
-l$(SQLITE_LIB_NAME) \
-L$(NSSUTIL_LIB_DIR) \
-lnssutil3 \
-L$(NSPR_LIB_DIR) \
-lplc4 \
-lplds4 \
-lnspr4 \
$(NULL)
--- NEW FILE: firefox8.patch ---
diff -ruN mozilla-release-orig/.mozconfig mozilla-release/.mozconfig
--- mozilla-release-orig/.mozconfig 1969-12-31 19:00:00.000000000 -0500
+++ mozilla-release/.mozconfig 2011-08-16 10:32:15.000000000 -0400
@@ -0,0 +1,43 @@
+# 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_OBJDIR=@TOPSRCDIR@/obj-@FINK_ARCH_TARGET@-apple-darwin`uname -r`
+mk_add_options AUTOCONF=@FINKPREFIX@/lib/autoconf2.13/bin/autoconf
+ac_add_options --target=@FINK_ARCH_TARGET@-apple-darwin`uname -r`
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --prefix=@FINKPREFIX@
+ac_add_options --enable-official-branding
+ac_add_options --with-distribution-id=org.fink
+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 --disable-gnomevfs
+ac_add_options --disable-gnomeui
+ac_add_options --enable-extensions=default,-gnomevfs
+
+ac_add_options --disable-dependency-tracking
+ac_add_options --disable-crashreporter
+#ac_add_options --disable-ipc
+#ac_add_options --enable-necko-wifi
+ac_add_options --disable-libnotify
+
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+ac_add_options --enable-strip
+#ac_add_options
--with-default-mozilla-five-home=@FINKPREFIX@/lib/firefox@FIREFOX_MAJOR_VERSION@
+ac_add_options --with-system-jpeg=@FINKPREFIX@/lib/libjpeg8-turbo
+ac_add_options --disable-system-cairo
+ac_add_options --enable-system-sqlite
+ac_add_options --with-system-nspr
+ac_add_options --with-nspr-prefix=@FINKPREFIX@
+ac_add_options --with-system-nss
+ac_add_options --with-nss-prefix=@FINKPREFIX@
diff -ruN
mozilla-release-orig/browser/locales/generic/profile/bookmarks.html.in
mozilla-release/browser/locales/generic/profile/bookmarks.html.in
--- mozilla-release-orig/browser/locales/generic/profile/bookmarks.html.in
2009-04-23 21:46:37.000000000 -0400
+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in
2009-04-27 16:56:30.000000000 -0400
@@ -13,6 +13,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>
<DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
<DL><p>
diff -ruN mozilla-release-orig/config/autoconf.mk.in
mozilla-release/config/autoconf.mk.in
--- mozilla-release-orig/config/autoconf.mk.in 2011-08-11 17:40:51.000000000
-0400
+++ mozilla-release/config/autoconf.mk.in 2011-08-16 09:15:05.000000000
-0400
@@ -57,24 +57,24 @@
MOZ_UA_FIREFOX_VERSION = @FIREFOX_VERSION@
MOZ_UA_BUILDID = @MOZ_UA_BUILDID@
MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir = @includedir@/$(MOZ_APP_NAME)@FIREFOX_MAJOR_VERSION@
libdir = @libdir@
datadir = @datadir@
mandir = @mandir@
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir = $(datadir)/idl/$(MOZ_APP_NAME)@FIREFOX_MAJOR_VERSION@
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+installdir = $(libdir)/$(MOZ_APP_NAME)@FIREFOX_MAJOR_VERSION@
+sdkdir = $(libdir)/$(MOZ_APP_NAME)@FIREFOX_MAJOR_VERSION@-devel
DIST = $(DEPTH)/dist
LIBXUL_SDK = @LIBXUL_SDK@
MOZ_FS_LAYOUT = @MOZ_FS_LAYOUT@
L10NBASEDIR = @L10NBASEDIR@
diff -ruN mozilla-release-orig/configure.in mozilla-release/configure.in
--- mozilla-release-orig/configure.in 2011-08-11 17:56:47.000000000 -0400
+++ mozilla-release/configure.in 2011-08-16 09:28:25.000000000 -0400
@@ -1903,17 +1903,18 @@
case "${host_cpu}" in
x86_64)
HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_"
;;
esac
;;
*-darwin*)
- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX"
+ HOST_CXXFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX"
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
;;
*-linux*|*-kfreebsd*-gnu|*-gnu*)
HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
diff -ruN mozilla-release-orig/fink/applications/firefox.desktop
mozilla-release/fink/applications/firefox.desktop
--- mozilla-release-orig/fink/applications/firefox.desktop 1969-12-31
19:00:00.000000000 -0500
+++ mozilla-release/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-release-orig/fink/fink.js mozilla-release/fink/fink.js
--- mozilla-release-orig/fink/fink.js 1969-12-31 19:00:00.000000000 -0500
+++ mozilla-release/fink/fink.js 2009-04-27 16:56:30.000000000 -0400
@@ -0,0 +1 @@
+pref("dom.ipc.plugins.enabled", false);
diff -ruN -U 8 mozilla-release-orig/netwerk/wifi/nsWifiMonitor.h
mozilla-release/netwerk/wifi/nsWifiMonitor.h
--- mozilla-release-orig/netwerk/wifi/nsWifiMonitor.h 2011-08-11
17:41:20.000000000 -0400
+++ mozilla-release/netwerk/wifi/nsWifiMonitor.h 2011-08-16
09:15:05.000000000 -0400
@@ -82,17 +82,17 @@
nsWifiMonitor();
private:
~nsWifiMonitor();
nsresult DoScan();
-#if defined(XP_MACOSX)
+#if defined(__APPLE__)
nsresult DoScanWithCoreWLAN();
nsresult DoScanOld();
#endif
nsresult CallWifiListeners(const nsCOMArray<nsWifiAccessPoint>
&aAccessPoints,
PRBool aAccessPointsChanged);
PRBool mKeepGoing;
diff -ruN -U 8 mozilla-release-orig/xpcom/io/nsAppFileLocationProvider.cpp
mozilla-release/xpcom/io/nsAppFileLocationProvider.cpp
--- mozilla-release-orig/xpcom/io/nsAppFileLocationProvider.cpp 2011-08-11
17:41:33.000000000 -0400
+++ mozilla-release/xpcom/io/nsAppFileLocationProvider.cpp 2011-08-16
09:15:05.000000000 -0400
@@ -231,19 +231,19 @@
rv = GetProductDirectory(getter_AddRefs(localFile));
if (NS_SUCCEEDED(rv))
rv = localFile->AppendRelativeNativePath(PLUGINS_DIR_NAME);
}
#ifdef XP_UNIX
else if (nsCRT::strcmp(prop, NS_SYSTEM_PLUGINS_DIR) == 0) {
static const char *const sysLPlgDir =
#if defined(HAVE_USR_LIB64_DIR) && defined(__LP64__)
- "/usr/lib64/mozilla/plugins";
+ "@FINKPREFIX@/lib64/mozilla/plugins";
#else
- "/usr/lib/mozilla/plugins";
+ "@FINKPREFIX@/lib/mozilla/plugins";
#endif
rv = NS_NewNativeLocalFile(nsDependentCString(sysLPlgDir),
PR_FALSE, getter_AddRefs(localFile));
}
#endif
#endif
else if (nsCRT::strcmp(prop, NS_APP_SEARCH_DIR) == 0)
{
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
