Hello all, In the process of compiling sugar for debian I came across a compilation bug in the declaration of string.h in xapian.
I am attaching a patch that fixes the problem and lets this stage compile in debian. It should be harmless to other distros. I hope you can commit it in to the code. Or tell me who I should turn to commit it. Guy Sheffer GuySoft -- 42
*** sugar-jhbuild/source/xapian-core-1.0.2/examples/delve.cc 2007-07-05 03:39:51.000000000 +0300 --- sugar-jhbuild/source/xapian-core-1.0.2/examples/delve.cc 2008-09-28 03:08:00.000000000 +0300 *************** *** 21,26 **** --- 21,27 ---- */ #include <config.h> + #include <string.h> #include <xapian.h> diff -crB sugar-jhbuild/source/xapian-core-1.0.2/examples/simpleexpand.cc sugar-jhbuild/source/xapian-core-1.0.2/examples/simpleexpand.cc *** sugar-jhbuild/source/xapian-core-1.0.2./examples/simpleexpand.cc 2007-07-05 03:39:51.000000000 +0300 --- sugar-jhbuild/source/xapian-core-1.0.2/examples/simpleexpand.cc 2008-09-28 03:08:53.000000000 +0300 *************** *** 21,27 **** #include <xapian.h> #include <iostream> ! #include <string> #include <stdlib.h> // For exit(). --- 21,27 ---- #include <xapian.h> #include <iostream> ! #include <string.h> #include <stdlib.h> // For exit(). diff -crB sugar-jhbuild/source/xapian-core-1.0.2/net/serialise.cc sugar-jhbuild/source/xapian-core-1.0.2/net/serialise.cc *** sugar-jhbuild/source/xapian-core-1.0.2/net/serialise.cc 2007-07-05 03:39:29.000000000 +0300 --- sugar-jhbuild/source/xapian-core-1.0.2/net/serialise.cc 2008-09-28 02:38:40.000000000 +0300 *************** *** 33,39 **** #include "stats.h" #include "utils.h" ! #include <string> using namespace std; --- 33,39 ---- #include "stats.h" #include "utils.h" ! #include <string.h> using namespace std; diff -crB sugar-jhbuild/source/xapian-core-1.0.2/net/tcpserver.cc sugar-jhbuild/source/xapian-core-1.0.2/net/tcpserver.cc *** sugar-jhbuild/source/xapian-core-1.0.2/net/tcpserver.cc 2007-07-05 03:39:29.000000000 +0300 --- sugar-jhbuild/source/xapian-core-1.0.2/net/tcpserver.cc 2008-09-28 03:01:56.000000000 +0300 *************** *** 21,26 **** --- 21,27 ---- */ #include <config.h> + #include <string.h> #include "safeerrno.h" #include "safefcntl.h" diff -crB sugar-jhbuild/source/xapian-core-1.0.2/queryparser/queryparser.cc sugar-jhbuild/source/xapian-core-1.0.2/queryparser/queryparser.cc *** sugar-jhbuild/source/xapian-core-1.0.2/queryparser/queryparser.cc 2007-07-05 03:38:41.000000000 +0300 --- sugar-jhbuild/source/xapian-core-1.0.2/queryparser/queryparser.cc 2008-09-28 03:03:26.000000000 +0300 *************** *** 20,25 **** --- 20,26 ---- */ #include <config.h> + #include <string.h> #include <xapian/queryparser.h> #include <xapian/termiterator.h> diff -crB sugar-jhbuild/source/xapian-core-1.0.2/queryparser/queryparser_internal.cc sugar-jhbuild/source/xapian-core-1.0.2/queryparser/queryparser_internal.cc *** sugar-jhbuild/source/xapian-core-1.0.2/queryparser/queryparser_internal.cc 2007-07-05 03:45:22.000000000 +0300 --- sugar-jhbuild/source/xapian-core-1.0.2/queryparser/queryparser_internal.cc 2008-09-28 03:04:50.000000000 +0300 *************** *** 37,43 **** #include <algorithm> #include <list> ! #include <string> using namespace std; --- 37,43 ---- #include <algorithm> #include <list> ! #include <string.h>
_______________________________________________ Sugar mailing list [email protected] http://lists.laptop.org/listinfo/sugar
