Update of /cvsroot/fink/experimental/fangism/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26007

Modified Files:
        firefox3-10.4.info firefox3-10.4.patch 
Log Message:
!lart firefox's-build-system
work in progress, don't even bother yet.  


Index: firefox3-10.4.info
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/firefox3-10.4.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- firefox3-10.4.info  22 Mar 2010 23:03:30 -0000      1.7
+++ firefox3-10.4.info  7 Apr 2010 21:11:41 -0000       1.8
@@ -1,7 +1,7 @@
 Info3: <<
 Package: firefox3
-Version: 3.6
-Revision: 2
+Version: 3.6.3
+Revision: 1
 Architecture: i386, powerpc
 Distribution: 10.4, 10.5, 10.6
 Description: Lightweight browser from mozilla.org
@@ -52,9 +52,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: 458051557ff49e6a352c1d56eee5782a
+Source-MD5: 5e4541ab23084b7b14ba228291ce2688
 PatchFile: %n.patch
-PatchFile-MD5: 7d074c02bdf47b5a7b6063c9c1c6ca6f
+PatchFile-MD5: 3bff301795465aad1054ad96a2784896
 PatchScript: <<
   ### apply the patch
   /usr/bin/sed -e 's|@FINKPREFIX@|%p|g' -e 's|@FINK_ARCH_TARGET@|%m|g' 
<%{PatchFile} | /usr/bin/patch -p1

Index: firefox3-10.4.patch
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/firefox3-10.4.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- firefox3-10.4.patch 22 Mar 2010 23:03:30 -0000      1.7
+++ firefox3-10.4.patch 7 Apr 2010 21:11:41 -0000       1.8
@@ -94,7 +94,7 @@
 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 @@
+@@ -58,16 +58,17 @@
  prefix                = @prefix@
  exec_prefix   = @exec_prefix@
  bindir                = @bindir@
@@ -112,7 +112,60 @@
 +sdkdir                = $(libdir)/$(MOZ_APP_NAME)3-devel
  
  DIST          = $(DEPTH)/dist
++DISTLIB               = $(DIST)/lib
  LIBXUL_SDK      = @LIBXUL_SDK@
+ 
+ MOZ_FS_LAYOUT = unix
+@@ -195,8 +195,15 @@
+ moz_fix_link_pat...@moz_fix_link_paths@
+ 
+ xpcom_frozen_ldop...@xpcom_frozen_ldopts@
++XPCOM_DYLIB_FILES = \
++      $(NSS_DYLIB_FILES) \
++      -dylib_file 
$(installdir)/$(DLL_PREFIX)xul$(DLL_SUFFIX):$(DISTLIB)/$(DLL_PREFIX)xul$(DLL_SUFFIX)
 \
++      -dylib_file 
$(installdir)/$(DLL_PREFIX)mozjs$(DLL_SUFFIX):$(DISTLIB)/$(DLL_PREFIX)mozjs$(DLL_SUFFIX)
++XPCOM_FROZEN_LDOPTS += $(XPCOM_DYLIB_FILES)
+ xpcom_li...@xpcom_libs@
++XPCOM_LIBS += $(XPCOM_DYLIB_FILES)
+ libxul_li...@libxul_libs@
++LIBXUL_LIBS += $(XPCOM_DYLIB_FILES)
+ moz_timeli...@moz_timeline@
+ 
+ ENABLE_STRIP  = @ENABLE_STRIP@
+@@ -468,10 +475,21 @@
+ NSPR_CONFIG   = @NSPR_CONFIG@
+ NSPR_CFLAGS   = @NSPR_CFLAGS@
+ NSPR_LIBS     = @NSPR_LIBS@
++NSPR_DYLIB_FILES = \
++      -dylib_file 
$(installdir)/$(DLL_PREFIX)plds4$(DLL_SUFFIX):$(DISTLIB)/$(DLL_PREFIX)plds4$(DLL_SUFFIX)
 \
++      -dylib_file 
$(installdir)/$(DLL_PREFIX)plc4$(DLL_SUFFIX):$(DISTLIB)/$(DLL_PREFIX)plc4$(DLL_SUFFIX)
 \
++      -dylib_file 
$(installdir)/$(DLL_PREFIX)nspr4$(DLL_SUFFIX):$(DISTLIB)/$(DLL_PREFIX)nspr4$(DLL_SUFFIX)
++NSPR_LIBS += $(NSPR_DYLIB_FILES)
+ 
+ NSS_CONFIG    = @NSS_CONFIG@
+ NSS_CFLAGS    = @NSS_CFLAGS@
+ NSS_LIBS      = @NSS_LIBS@
++NSS_DYLIB_FILES = \
++      -dylib_file 
$(installdir)/$(DLL_PREFIX)smime3$(DLL_SUFFIX):$(DISTLIB)/$(DLL_PREFIX)smime3$(DLL_SUFFIX)
 \
++      -dylib_file 
$(installdir)/$(DLL_PREFIX)ssl3$(DLL_SUFFIX):$(DISTLIB)/$(DLL_PREFIX)ssl3$(DLL_SUFFIX)
 \
++      -dylib_file 
$(installdir)/$(DLL_PREFIX)nss3$(DLL_SUFFIX):$(DISTLIB)/$(DLL_PREFIX)nss3$(DLL_SUFFIX)
 \
++      -dylib_file 
$(installdir)/$(DLL_PREFIX)nssutil3$(DLL_SUFFIX):$(DISTLIB)/$(DLL_PREFIX)nssutil3$(DLL_SUFFIX)
++NSS_LIBS += $(NSS_DYLIB_FILES)
+ NSS_DEP_LIBS  = @NSS_DEP_LIBS@
+ NSS_DISABLE_DBM = @NSS_DISABLE_DBM@
+ 
+@@ -521,7 +521,10 @@
+ MOZ_ENABLE_XREMOTE    = @MOZ_ENABLE_XREMOTE@
+ 
+ MOZ_GTK2_CFLAGS               = @MOZ_GTK2_CFLAGS@
+-MOZ_GTK2_LIBS         = @MOZ_GTK2_LIBS@
++MOZ_GTK2_LIBS_CAIRO           = @MOZ_GTK2_LIBS@
++# remove -lcairo to avoid symbol conflict with mozcairo
++MOZ_GTK2_LIBS_NOCAIRO         = $(filter-out -lcairo,$(MOZ_GTK2_LIBS_CAIRO))
++MOZ_GTK2_LIBS         = $(MOZ_GTK2_LIBS_NOCAIRO)
+ 
+ MOZ_QT_CFLAGS         = @MOZ_QT_CFLAGS@
+ MOZ_QT_LIBS           = @MOZ_QT_LIBS@
 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
@@ -239,3 +292,34 @@
  else # ! CPP_PROG_LINK
        $(CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) 
$(SOLARIS_JEMALLOC_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) 
$(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
  endif # CPP_PROG_LINK
+diff -ruN mozilla-1.9.2-orig/toolkit/library/Makefile.in 
mozilla-1.9.2/toolkit/library/Makefile.in
+--- mozilla-1.9.2-orig/toolkit/library/Makefile.in     2010-03-30 
09:58:07.000000000 -0700
++++ mozilla-1.9.2/toolkit/library/Makefile.in  2010-04-07 00:51:47.000000000 
-0700
+@@ -182,6 +182,7 @@
+       $(INSTALL) $^ .
+ 
+ EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
++MKSHLIB += -Wl,-undefined,dynamic_lookup
+ 
+ ifdef MOZ_ENABLE_LIBXUL
+ include $(srcdir)/libxul-rules.mk
+diff -ruN mozilla-1.9.2-orig/xpcom/stub/Makefile.in 
mozilla-1.9.2/xpcom/stub/Makefile.in
+--- mozilla-1.9.2/xpcom/stub/Makefile.in.orig  2010-04-07 01:48:44.000000000 
-0700
++++ mozilla-1.9.2/xpcom/stub/Makefile.in       2010-04-07 02:11:28.000000000 
-0700
+@@ -80,6 +80,7 @@
+       $(LIB_PREFIX)nspr4$(DLL_SUFFIX) \
+       $(LIB_PREFIX)plc4$(DLL_SUFFIX) \
+       $(LIB_PREFIX)plds4$(DLL_SUFFIX) \
++      $(NSPR_DYLIB_FILES) \
+       $(NULL)
+ 
+ ifdef MOZ_ENABLE_LIBXUL
+@@ -120,6 +121,8 @@
+ endif
+ 
+ EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS) $(NSPR_LIBS)
++EXTRA_DSO_LDOPTS += $(XPCOM_DYLIB_FILES)
++MKSHLIB += -Wl,-undefined,dynamic_lookup
+ 
+ include $(topsrcdir)/config/rules.mk
+ 


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to