Update of /cvsroot/fink/experimental/fangism/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7595
Modified Files:
firefox3-10.4.info firefox3-10.4.patch
Log Message:
compiles by hand at least, and patch applies
need to see if $(filter-out -lcairo,$(MOZ_GTK2_LIBS)) is detrimental
!lart mozilla's-way-of-building-sh*t
!botsnack
Index: firefox3-10.4.info
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/firefox3-10.4.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- firefox3-10.4.info 7 Apr 2010 21:11:41 -0000 1.8
+++ firefox3-10.4.info 9 Apr 2010 03:52:29 -0000 1.9
@@ -54,7 +54,7 @@
SourceDirectory: mozilla-1.9.2
Source-MD5: 5e4541ab23084b7b14ba228291ce2688
PatchFile: %n.patch
-PatchFile-MD5: 3bff301795465aad1054ad96a2784896
+PatchFile-MD5: db5956d00af6384fa27e345788dbdcca
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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- firefox3-10.4.patch 7 Apr 2010 21:11:41 -0000 1.8
+++ firefox3-10.4.patch 9 Apr 2010 03:52:29 -0000 1.9
@@ -295,16 +295,18 @@
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 @@
+@@ -181,7 +181,9 @@
+ export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS)
$(INSTALL) $^ .
++# patch: because -lcairo (shlib) was filtered out of link command
++EXTRA_DSO_LDOPTS += -Wl,-undefined,dynamic_lookup
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-orig/xpcom/stub/Makefile.in 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) \
@@ -314,12 +316,51 @@
$(NULL)
ifdef MOZ_ENABLE_LIBXUL
-@@ -120,6 +121,8 @@
+@@ -119,7 +120,10 @@
+
endif
++# patch: because -lcairo (shlib) was filtered out of link command
++EXTRA_DSO_LDOPTS += -Wl,-undefined,dynamic_lookup
EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS) $(NSPR_LIBS)
+EXTRA_DSO_LDOPTS += $(XPCOM_DYLIB_FILES)
-+MKSHLIB += -Wl,-undefined,dynamic_lookup
include $(topsrcdir)/config/rules.mk
+diff -ruN mozilla-1.9.2-orig/js/src/xpconnect/shell/Makefile.in
mozilla-1.9.2/js/src/xpconnect/shell/Makefile.in
+--- mozilla-1.9.2-orig/js/src/xpconnect/shell/Makefile.in 2010-04-08
19:02:44.000000000 -0700
++++ mozilla-1.9.2/js/src/xpconnect/shell/Makefile.in 2010-04-08
19:08:17.000000000 -0700
+@@ -78,6 +78,8 @@
+ include $(topsrcdir)/config/rules.mk
+
+ DEFINES += -DJS_THREADSAFE
++# patch: because -lcairo (shlib) was filtered out of link command
++LDFLAGS += -Wl,-undefined,dynamic_lookup
+
+ ifdef MOZ_SHARK
+ DEFINES += -DMOZ_SHARK
+diff -ruN mozilla-1.9.2-orig/browser/components/build/Makefile.in
mozilla-1.9.2/browser/components/build/Makefile.in
+--- mozilla-1.9.2-orig/browser/components/build/Makefile.in 2010-04-08
19:26:50.000000000 -0700
++++ mozilla-1.9.2/browser/components/build/Makefile.in 2010-04-08
19:28:31.000000000 -0700
+@@ -68,6 +68,8 @@
+ SHARED_LIBRARY_LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
+ endif
+
++# patch: because -lcairo (shlib) was filtered out of link command
++EXTRA_DSO_LDOPTS += -Wl,-undefined,dynamic_lookup
+ EXTRA_DSO_LDOPTS += $(call
EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib)
+
+ # migration requires mozreg, which doesn't build on WINCE; only include
+diff -ruN mozilla-1.9.2-orig/browser/app/Makefile.in
mozilla-1.9.2/browser/app/Makefile.in
+--- mozilla-1.9.2-orig/browser/app/Makefile.in 2010-04-08 20:08:13.000000000
-0700
++++ mozilla-1.9.2/browser/app/Makefile.in 2010-04-08 20:14:06.000000000
-0700
+@@ -363,6 +363,9 @@
+ endif
+ endif
+
++# patch: because -lcairo (shlib) was filtered out of link command
++LDFLAGS += -Wl,-undefined,dynamic_lookup
++
+ libs::
+ ifeq ($(OS_ARCH),WINNT)
+ $(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/LICENSE >
$(DIST)/bin/LICENSE
------------------------------------------------------------------------------
Download Intel® 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
