Update of /cvsroot/fink/experimental/fangism/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20857
Modified Files:
firefox3-10.4.info firefox3-10.4.patch
Log Message:
upstream update 3.6.10, merge from Snaggle
Index: firefox3-10.4.info
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/firefox3-10.4.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- firefox3-10.4.info 9 Sep 2010 17:33:46 -0000 1.14
+++ firefox3-10.4.info 27 Sep 2010 18:03:48 -0000 1.15
@@ -1,6 +1,6 @@
Info3: <<
Package: firefox3
-Version: 3.6.9
+Version: 3.6.10
Revision: 1
Architecture: i386, powerpc
Distribution: 10.4
@@ -18,13 +18,13 @@
gtk+2-shlibs (>= 2.12.0-1),
libgettext8-shlibs,
pango1-xft2-ft219-shlibs (>= 1.20.0-3),
+ sqlite3-shlibs (>= 3.6.22-1),
x11
<<
BuildConflicts: <<
freetype,
freetype-hinting,
- nspr,
- sqlite3-dev
+ nspr
<<
BuildDepends: <<
atk1 (>= 1.20.0-1),
@@ -45,6 +45,7 @@
pango1-xft2-ft219-dev (>= 1.20.0-3),
pixman (>= 0.10.0-1),
pkgconfig (>= 0.21-1),
+ sqlite3-dev (>= 3.6.22-1),
system-sdk-10.4,
# system-sdk-10.5,
x11-dev,
@@ -52,9 +53,9 @@
<<
Source:
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%v/source/firefox-%v.source.tar.bz2
SourceDirectory: mozilla-1.9.2
-Source-MD5: 100ecafd6c6c5062bc03bb2fb651fc17
+Source-MD5: 59ee60ddfd8b33e99a24788d3b12adb3
PatchFile: %n.patch
-PatchFile-MD5: 00a2d23a64604187bf7d33c7f5c14b28
+PatchFile-MD5: dd5b305e71f7df982352b1ae1fa2339d
PatchScript: <<
### apply the patch
/usr/bin/sed -e 's|@FINKPREFIX@|%p|g' -e 's|@FINK_ARCH_TARGET@|%m|g'
<%{PatchFile} | /usr/bin/patch -p1
@@ -185,11 +186,11 @@
%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/libsqlite3.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)
@@ -240,6 +241,6 @@
--------------------------------
. 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 needs >= 3.6.23.1, but with extra options compiled in.
+. firefox3 as of 3.6.8 now uses system-sqlite to avoid conflicts on 10.6 when
Security.framework needs a system libsqlite3.dylib with a newer compat_version
than the internal libsqlite3.dylib.
<https://bugzilla.mozilla.org/show_bug.cgi?id=513747>. Firefox4 has renamed to
libmozsqlite3.dylib and so that conflict no longer occurs.
<<
<<
Index: firefox3-10.4.patch
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/firefox3-10.4.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- firefox3-10.4.patch 9 Apr 2010 16:01:22 -0000 1.10
+++ firefox3-10.4.patch 27 Sep 2010 18:03:48 -0000 1.11
@@ -57,7 +57,7 @@
+#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
++ac_add_options --enable-system-sqlite
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
@@ -261,6 +261,31 @@
nsresult DoScanWithCoreWLAN();
nsresult DoScanOld();
#endif
+diff -ruN mozilla-central-orig/xpcom/io/nsAppFileLocationProvider.cpp
mozilla-central/xpcom/io/nsAppFileLocationProvider.cpp
+--- mozilla-central-orig/xpcom/io/nsAppFileLocationProvider.cpp
++++ mozilla-central/xpcom/io/nsAppFileLocationProvider.cpp
+@@ -235,19 +235,19 @@ nsAppFileLocationProvider::GetFile(const
+ 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)
+ {
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
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
