Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto
In directory
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19182/10.4/unstable/main/finkinfo/crypto
Modified Files:
monotone-10.6.info monotone.patch
Log Message:
New upstream version, plus a patch to fix sqlite breakage.
Index: monotone-10.6.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/monotone-10.6.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- monotone-10.6.info 9 Jul 2010 21:59:35 -0000 1.2
+++ monotone-10.6.info 22 Oct 2010 13:39:58 -0000 1.3
@@ -1,12 +1,14 @@
Package: monotone
-Version: 0.48
+Version: 0.48.1
Revision: 1
Source: http://www.monotone.ca/downloads/%v/monotone-%v.tar.gz
-Source-MD5: 330a1fe1d92c899d1ad539606f85a9f8
-#PatchFile: %n.patch
+Source-MD5: b5fa9e3b02ca3dcaf58fb7a2519ef956
+PatchFile: %n.patch
+PatchFile-MD5: 3057175fa149abcb8b86edd981b4e060
#PatchScript: sed -e 's|@SW@|%p|g' < %{PatchFile} | patch -p1
Distribution: 10.6
BuildDepends:<<
+ fink (>= 0.24.12),
boost1.41.cmake,
botan (>=1.8.1-1),
libgettext3-dev (>= 0.14.5-2),
Index: monotone.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/monotone.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- monotone.patch 1 Jul 2010 01:37:10 -0000 1.1
+++ monotone.patch 22 Oct 2010 13:39:58 -0000 1.2
@@ -1,48 +1,28 @@
-Only in monotone-0.31-patched: cmd_automate.cc.orig
-diff -ru monotone-0.31/configure monotone-0.31-patched/configure
---- monotone-0.31/configure 2006-11-11 13:08:59.000000000 -0600
-+++ monotone-0.31-patched/configure 2006-11-14 00:09:01.000000000 -0600
-@@ -3256,13 +3256,13 @@
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
-- CFLAGS="-g -O2"
-+ CFLAGS="-g -O0"
- else
- CFLAGS="-g"
- fi
- else
- if test "$GCC" = yes; then
-- CFLAGS="-O2"
-+ CFLAGS="-O0"
- else
- CFLAGS=
- fi
-@@ -4527,13 +4527,13 @@
- CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
-- CXXFLAGS="-g -O2"
-+ CXXFLAGS="-g -O0"
- else
- CXXFLAGS="-g"
- fi
- else
- if test "$GXX" = yes; then
-- CXXFLAGS="-O2"
-+ CXXFLAGS="-O0"
- else
- CXXFLAGS=
- fi
-Only in monotone-0.31-patched: configure.orig
-diff -ru monotone-0.31/hash_map.hh monotone-0.31-patched/hash_map.hh
---- monotone-0.31/hash_map.hh 2006-11-11 13:08:11.000000000 -0600
-+++ monotone-0.31-patched/hash_map.hh 2006-11-14 00:09:01.000000000 -0600
-@@ -3,6 +3,7 @@
-
- #include "config.h"
-
-+#undef _T
- #include <functional>
- namespace hashmap {
-
+diff -ru monotone-0.48/database.cc monotone-0.48-patched/database.cc
+--- monotone-0.48/database.cc 2010-06-13 12:46:00.000000000 -0500
++++ monotone-0.48-patched/database.cc 2010-10-22 07:35:24.000000000 -0500
+@@ -1489,12 +1489,19 @@
+ vector<string> row;
+ for (int col = 0; col < ncol; col++)
+ {
++ // We never store NULLs, so we should never see one.
++ int const datatype = sqlite3_column_type(i->second.stmt(), col);
++ E(datatype != SQLITE_NULL, origin::database,
++ F("null result in query: %s") % query.sql_cmd);
+ const char * value = (const
char*)sqlite3_column_blob(i->second.stmt(), col);
+ int bytes = sqlite3_column_bytes(i->second.stmt(), col);
+- E(value, origin::database,
+- F("null result in query: %s") % query.sql_cmd);
+- row.push_back(string(value, value + bytes));
+- //L(FL("row %d col %d value='%s'") % nrow % col % value);
++ if (value) {
++ row.push_back(string(value, value + bytes));
++ } else {
++ // sqlite3_column_blob() returns null for zero-length
++ I(bytes == 0);
++ row.push_back(string());
++ }
+ }
+ res.push_back(row);
+ }
+Only in monotone-0.48-patched/: database.cc.orig
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
