Update of /cvsroot/fink/experimental/fangism/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv3291
Modified Files:
tenfourfox6.info tenfourfox6.patch
Log Message:
increasing fuzz-factor helps apply TFF change-set, also updated patch slightly
Index: tenfourfox6.info
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/tenfourfox6.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tenfourfox6.info 30 Aug 2011 17:54:07 -0000 1.3
+++ tenfourfox6.info 31 Aug 2011 01:18:09 -0000 1.4
@@ -53,14 +53,14 @@
Source3: http://tenfourfox.googlecode.com/files/ldx3.zip
Source3-MD5: 849c5bc88f06387bbd2040cf804204e7
PatchFile: %n.patch
-PatchFile-MD5: 5f6a780246066a8f037040d64518f994
+PatchFile-MD5: 72d62cc4a3aff2cd428a81245f6892dd
PatchScript: <<
#!/bin/sh -ev
# apply patchset from TenFourFox:
for f in ../6exports/*
do
echo "Patching in changeset $f ..."
- git apply -p1 $f || { echo "... patch $f failed." ; patch_err=1 ;}
+ git apply -v -C3 -p1 $f || { echo "... patch $f failed." ; patch_err=1 ;}
done
test -z "$patch_err" || { echo "Patch error above. Aborting." ; exit 1;}
### apply the patch
Index: tenfourfox6.patch
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/tenfourfox6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tenfourfox6.patch 16 Aug 2011 01:05:07 -0000 1.1
+++ tenfourfox6.patch 31 Aug 2011 01:18:09 -0000 1.2
@@ -141,8 +141,8 @@
fi
_PEDANTIC=
+# keep pascal strings for cocoa build
- CFLAGS="$CFLAGS -fpascal-strings -fno-common"
- CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common"
+ CFLAGS="$CFLAGS -fno-common"
+ CXXFLAGS="$CXXFLAGS -fno-common"
DLL_SUFFIX=".dylib"
- DSO_LDOPTS=''
+ DSO_LDOPTS='-framework CoreFoundation'
@@ -261,18 +261,19 @@
# Add dummy depend target for tinderboxes
depend::
-@@ -990,9 +995,9 @@
+@@ -990,10 +995,10 @@
endif
else # !WINNT || GNU_CC
ifeq ($(CPP_PROG_LINK),1)
- $(EXPAND_CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS)
$(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS)
$(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(EXE_DEF_FILE)
+ $(EXPAND_CCC) -o $@ $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(RESFILE)
$(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS)
$(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(EXE_DEF_FILE)
+ @$(call CHECK_STDCXX,$@)
else # ! CPP_PROG_LINK
- $(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE)
$(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS)
$(BIN_FLAGS) $(EXE_DEF_FILE)
+ $(EXPAND_CC) -o $@ $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS)
$(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS)
$(EXE_DEF_FILE)
endif # CPP_PROG_LINK
endif # WINNT && !GNU_CC
- endif # WINCE
+
@@ -1943,7 +1948,7 @@
JAR_MANIFEST := $(srcdir)/jar.mn
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
