Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/text
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21483
Modified Files:
openjade.patch
Log Message:
patch out many clang warnings and assume maintainership
Index: openjade.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/text/openjade.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- openjade.patch 27 Jun 2013 00:50:53 -0000 1.2
+++ openjade.patch 17 Jul 2013 16:09:05 -0000 1.3
@@ -1,3 +1,85 @@
+--- openjade-1.3.2/spgrove/GroveBuilder.cxx.orig 2013-07-17
10:57:07.000000000 -0400
++++ openjade-1.3.2/spgrove/GroveBuilder.cxx 2013-07-17 11:00:38.000000000
-0400
+@@ -2127,7 +2127,7 @@
+ chunk = new (grove.allocChunk(CharsChunk::allocSize(dataLen))) DataChunk;
+ chunk->size = dataLen;
+ chunk->locIndex = event.location().index();
+- memcpy(chunk + 1, event.data(), dataLen * sizeof(Char));
++ memcpy((void*)(chunk + 1), event.data(), dataLen * sizeof(Char));
+ grove.appendSibling(chunk);
+ }
+ }
+@@ -3435,7 +3435,7 @@
+ chunk = new (mem) PiChunk;
+ chunk->size = dataLen;
+ chunk->locIndex = event.location().index();
+- memcpy(chunk + 1, event.data(), dataLen * sizeof(Char));
++ memcpy((void*)(chunk + 1), event.data(), dataLen * sizeof(Char));
+ grove.appendSibling(chunk);
+ }
+ }
+--- openjade-1.3.2/jade/SgmlFOTBuilder.cxx.orig 2013-07-17
11:04:52.000000000 -0400
++++ openjade-1.3.2/jade/SgmlFOTBuilder.cxx 2013-07-17 11:05:55.000000000
-0400
+@@ -393,7 +393,7 @@
+ OutputCharStream &operator<<(OutputCharStream &os, Units u)
+ {
+ char buf[32];
+- sprintf(buf, "%03d", u.n);
++ sprintf(buf, "%03ld", u.n);
+ int len = strlen(buf);
+ int i = 0;
+ for (; i < 3 && buf[len - i - 1] == '0'; i++)
+--- openjade-1.3.2/style/DssslSpecEventHandler.cxx.orig 2013-07-17
11:38:53.000000000 -0400
++++ openjade-1.3.2/style/DssslSpecEventHandler.cxx 2013-07-17
11:40:07.000000000 -0400
+@@ -365,13 +365,13 @@
+ type = DssslSpecEventHandler::DeclarationElement::sgmlGrovePlan;
+ currentDecl_ = new DeclarationElement(type);
+ const StringC *str;
+- if (str = attributeString(event, "NAME"))
++ if ((str = attributeString(event, "NAME")))
+ currentDecl_->setName(*str);
+- if (str = attributeString(event, "TEXT"))
++ if ((str = attributeString(event, "TEXT")))
+ currentDecl_->setText(*str);
+- if (str = attributeString(event, "MODADD"))
++ if ((str = attributeString(event, "MODADD")))
+ currentDecl_->setModadd(*str);
+- if (str = attributeString(event, "DESC"))
++ if ((str = attributeString(event, "DESC")))
+ currentDecl_->setDesc(*str);
+ }
+ }
+--- openjade-1.3.2/style/primitive.cxx.orig 2013-07-17 11:44:29.000000000
-0400
++++ openjade-1.3.2/style/primitive.cxx 2013-07-17 11:44:56.000000000 -0400
+@@ -5304,7 +5304,7 @@
+ ELObj *ret;
+ InsnPtr insn(func->makeCallInsn(0, interp, loc, InsnPtr()));
+ VM vm(context, interp);
+- while (nd = nl->nodeListFirst(context, interp)) {
++ while ((nd = nl->nodeListFirst(context, interp))) {
+ nl = nl->nodeListRest(context, interp);
+ protect1 = nl;
+ EvalContext::CurrentNodeSetter cns(nd, context.processingMode, vm);
+--- openjade-1.3.2/jade/MifFOTBuilder.cxx.orig 2013-07-17 11:46:33.000000000
-0400
++++ openjade-1.3.2/jade/MifFOTBuilder.cxx 2013-07-17 11:47:43.000000000
-0400
+@@ -3370,7 +3370,7 @@
+ }
+
+
+- int numTabs = mifDoc.curFormat().PgfNumTabs + leadingTab ? 2 : 1;
++ int numTabs = (mifDoc.curFormat().PgfNumTabs + leadingTab) ? 2 : 1;
+ mifDoc.curFormat().setPgfNumTabs( numTabs );
+ mifDoc.curPara()->format().setPgfNumTabs( numTabs );
+ mifDoc.curPara()->curFormat().setPgfNumTabs( numTabs );
+@@ -5748,7 +5748,7 @@
+ char idxStr[32];
+ for( size_t i = 0; i < BookComponents.size(); i++ ) {
+ fileName.resize( 0 );
+- sprintf( idxStr, "%u", i+1 );
++ sprintf( idxStr, "%lu", i+1 );
+ for( const char *c = idxStr; *c; c++)
+ fileName += CmdLineApp::AppChar(*c);
+ fileName += '.'; fileName += fileNameExt;
diff -Nurd -x'*~' openjade-1.3.2.orig/Makefile.comm.in
openjade-1.3.2/Makefile.comm.in
--- openjade-1.3.2.orig/Makefile.comm.in 2002-12-01 06:56:47.000000000
-0500
+++ openjade-1.3.2/Makefile.comm.in 2007-04-23 03:55:18.000000000 -0400
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
