rpms/dbxml/devel dbxml-g++-4.3.patch,NONE,1.1 dbxml.spec,1.2,1.3

Milan Zazrivec (mzazrive) fedora-extras-commits at redhat.com
Wed Feb 20 16:56:42 UTC 2008


Author: mzazrive

Update of /cvs/pkgs/rpms/dbxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25578

Modified Files:
	dbxml.spec 
Added Files:
	dbxml-g++-4.3.patch 
Log Message:
Add #include lines where needed for succesful g++ 4.3 build


dbxml-g++-4.3.patch:

--- NEW FILE dbxml-g++-4.3.patch ---
--- examples/cxx/gettingStarted/deleteDocument.cpp	2006-10-30 12:45:44.000000000 -0500
+++ examples/cxx/gettingStarted/deleteDocument.cpp	2008-02-20 11:37:52.000000000 -0500
@@ -9,6 +9,7 @@
 #include <fstream>
 #include <cstdio>
 #include <cassert>
+#include <cstdlib>
 
 #include "dbxml/DbXml.hpp"
 
--- examples/cxx/gettingStarted/simpleAdd.cpp	2006-10-30 12:45:45.000000000 -0500
+++ examples/cxx/gettingStarted/simpleAdd.cpp	2008-02-20 11:42:19.000000000 -0500
@@ -6,6 +6,7 @@
 // $Id: simpleAdd.cpp,v 1.14 2006/10/30 17:45:45 bostic Exp $
 //
 
+#include <cstdlib>
 #include "dbxml/DbXml.hpp"
 
 using namespace DbXml;
--- examples/cxx/gettingStarted/updateDocument.cpp	2006-10-30 12:45:45.000000000 -0500
+++ examples/cxx/gettingStarted/updateDocument.cpp	2008-02-20 11:42:57.000000000 -0500
@@ -9,6 +9,7 @@
 #include <fstream>
 #include <cstdio>
 #include <cassert>
+#include <cstdlib>
 
 #include "dbxml/DbXml.hpp"
 
--- examples/cxx/gettingStarted/queryWithContext.cpp	2007-01-18 15:12:33.000000000 -0500
+++ examples/cxx/gettingStarted/queryWithContext.cpp	2008-02-20 11:40:48.000000000 -0500
@@ -8,6 +8,7 @@
 
 #include <fstream>
 #include <cstdio>
+#include <cstdlib>
 
 #include "dbxml/DbXml.hpp"
 
--- examples/cxx/gettingStarted/queryForDocumentValue.cpp	2006-10-30 12:45:45.000000000 -0500
+++ examples/cxx/gettingStarted/queryForDocumentValue.cpp	2008-02-20 11:39:34.000000000 -0500
@@ -9,6 +9,7 @@
 #include <fstream>
 #include <cstdio>
 #include <cassert>
+#include <cstdlib>
 
 #include "dbxml/DbXml.hpp"
 
--- examples/cxx/gettingStarted/exampleLoadContainer.cpp	2006-10-30 12:45:44.000000000 -0500
+++ examples/cxx/gettingStarted/exampleLoadContainer.cpp	2008-02-20 11:38:45.000000000 -0500
@@ -10,6 +10,7 @@
 
 #include <vector>
 #include <fstream>
+#include <cstdlib>
 #include <time.h>
 
 using namespace DbXml;
--- examples/cxx/gettingStarted/queryForMetaData.cpp	2006-10-30 12:45:45.000000000 -0500
+++ examples/cxx/gettingStarted/queryForMetaData.cpp	2008-02-20 11:40:11.000000000 -0500
@@ -8,6 +8,7 @@
 
 #include <fstream>
 #include <cstdio>
+#include <cstdlib>
 
 #include "dbxml/DbXml.hpp"
 
--- examples/cxx/gettingStarted/deleteIndex.cpp	2006-10-30 12:45:44.000000000 -0500
+++ examples/cxx/gettingStarted/deleteIndex.cpp	2008-02-20 11:38:21.000000000 -0500
@@ -8,6 +8,7 @@
 
 #include <fstream>
 #include <cstdio>
+#include <cstdlib>
 
 #include "dbxml/DbXml.hpp"
 
--- examples/cxx/gettingStarted/replaceIndex.cpp	2006-10-30 12:45:45.000000000 -0500
+++ examples/cxx/gettingStarted/replaceIndex.cpp	2008-02-20 11:41:38.000000000 -0500
@@ -8,6 +8,7 @@
 
 #include <fstream>
 #include <cstdio>
+#include <cstdlib>
 
 #include "dbxml/DbXml.hpp"
 
--- examples/cxx/gettingStarted/modifyDocument.cpp	2007-01-18 15:12:33.000000000 -0500
+++ examples/cxx/gettingStarted/modifyDocument.cpp	2008-02-20 11:39:08.000000000 -0500
@@ -9,6 +9,7 @@
 #include <fstream>
 #include <cstdio>
 #include <cassert>
+#include <cstdlib>
 
 #include "dbxml/DbXml.hpp"
 
--- examples/cxx/gettingStarted/addIndex.cpp	2008-02-20 11:36:41.000000000 -0500
+++ examples/cxx/gettingStarted/addIndex.cpp	2008-02-20 11:37:00.000000000 -0500
@@ -8,6 +8,7 @@
 
 #include <fstream>
 #include <cstdio>
+#include <cstdlib>
 
 #include "dbxml/DbXml.hpp"
 
--- examples/cxx/gettingStarted/retrieveDB.cpp	2006-10-30 12:45:45.000000000 -0500
+++ examples/cxx/gettingStarted/retrieveDB.cpp	2008-02-20 11:41:57.000000000 -0500
@@ -7,6 +7,7 @@
 //
 
 #include <cassert>
+#include <cstdlib>
 
 #include "dbxml/DbXml.hpp"
 #include "myDb.hpp"
--- examples/cxx/gettingStarted/queryWithDocumentNames.cpp	2006-10-30 12:45:45.000000000 -0500
+++ examples/cxx/gettingStarted/queryWithDocumentNames.cpp	2008-02-20 11:41:15.000000000 -0500
@@ -8,6 +8,7 @@
 
 #include <fstream>
 #include <cstdio>
+#include <cstdlib>
 
 #include "dbxml/DbXml.hpp"
 
--- examples/cxx/gettingStarted/simpleQuery.cpp		2006-10-30 12:45:45.000000000 -0500
+++ examples/cxx/gettingStarted/simpleQuery.cpp		2008-02-20 11:42:40.000000000 -0500
@@ -8,6 +8,7 @@
 
 #include <fstream>
 #include <cstdio>
+#include <cstdlib>
 
 #include "dbxml/DbXml.hpp"
 
--- examples/cxx/gettingStarted/buildDB.cpp	2006-10-30 12:45:44.000000000 -0500
+++ examples/cxx/gettingStarted/buildDB.cpp	2008-02-20 11:37:27.000000000 -0500
@@ -7,6 +7,7 @@
 //
 
 #include <cassert>
+#include <cstdlib>
 
 #include "myDb.hpp"
 
--- examples/cxx/basic/helloWorldTxn.cpp	2006-10-30 12:45:44.000000000 -0500
+++ examples/cxx/basic/helloWorldTxn.cpp	2008-02-20 11:43:33.000000000 -0500
@@ -33,6 +33,7 @@
  *
  */
 
+#include <cstdlib>
 #include <dbxml/DbXml.hpp>
 
 using namespace DbXml;
--- examples/cxx/basic/queryTxn.cpp	2006-10-30 12:45:44.000000000 -0500
+++ examples/cxx/basic/queryTxn.cpp	2008-02-20 11:43:54.000000000 -0500
@@ -26,6 +26,7 @@
  */
 
 #include <dbxml/DbXml.hpp>
+#include <cstdlib>
 
 using namespace DbXml;
 
--- src/utils/shell/SetQueryTimeoutCommand.cpp	2006-10-30 12:46:08.000000000 -0500
+++ src/utils/shell/SetQueryTimeoutCommand.cpp	2008-02-20 11:36:07.000000000 -0500
@@ -7,6 +7,7 @@
 //
 
 #include "SetQueryTimeoutCommand.hpp"
+#include <cstdlib>
 
 using namespace DbXml;
 using namespace std;
--- src/utils/shell/dbxmlsh.cpp		2008-02-20 11:33:36.000000000 -0500
+++ src/utils/shell/dbxmlsh.cpp		2008-02-20 11:33:51.000000000 -0500
@@ -8,6 +8,7 @@
 
 #include <fstream>
 #include <string>
+#include <cstdlib>
 
 #include "dbxml/DbXml.hpp"
 #include "Environment.hpp"
--- src/utils/shell/SetVerboseCommand.cpp	2008-02-20 11:34:54.000000000 -0500
+++ src/utils/shell/SetVerboseCommand.cpp	2008-02-20 11:35:25.000000000 -0500
@@ -7,6 +7,7 @@
 //
 
 #include "SetVerboseCommand.hpp"
+#include <cstdlib>
 
 using namespace DbXml;
 using namespace std;
--- src/utils/load_container/LoadContainer.cpp	2008-02-20 11:33:04.000000000 -0500
+++ src/utils/load_container/LoadContainer.cpp	2008-02-20 11:33:18.000000000 -0500
@@ -8,6 +8,7 @@
 #include "dbxml/DbXml.hpp"
 
 #include <string>
+#include <cstdlib>
 #include <vector>
 #include <fstream>
 #include "common_utils.h" // for signal handling
--- src/dbxml_dump/dbxml_dump.cpp	2008-02-20 11:31:22.000000000 -0500
+++ src/dbxml_dump/dbxml_dump.cpp	2008-02-20 11:32:02.000000000 -0500
@@ -14,6 +14,8 @@
 #include <dbxml/DbXml.hpp>
 #include <iostream>
 #include <cerrno>
+#include <cstdlib>
+#include <cstring>
 #include "common_utils.h"
 
 #include <db.h>
--- src/dbxml/nodeStore/NsNid.hpp	2008-02-20 11:26:12.000000000 -0500
+++ src/dbxml/nodeStore/NsNid.hpp	2008-02-20 11:26:45.000000000 -0500
@@ -21,6 +21,7 @@
 #define __DBXMLNSNID_HPP
 
 #include "NsTypes.hpp"
+#include <cstring>
 
 #define NIDBUF_SIZE 50
 #define NID_BYTES_SIZE 5
--- src/dbxml/Buffer.cpp	2008-02-20 10:46:41.000000000 -0500
+++ src/dbxml/Buffer.cpp	2008-02-20 10:51:31.000000000 -0500
@@ -11,6 +11,8 @@
 
 #include <sstream>
 #include <cassert>
+#include <cstdlib>
+#include <cstring>
 
 using namespace std;
 using namespace DbXml;
--- src/dbxml_load/dbxml_load.cpp	2008-02-20 11:32:22.000000000 -0500
+++ src/dbxml_load/dbxml_load.cpp	2008-02-20 11:32:31.000000000 -0500
@@ -14,6 +14,8 @@
 #include <dbxml/DbXml.hpp>
 #include <iostream>
 #include <cerrno>
+#include <cstdlib>
+#include <cstring>
 
 #include <db.h>
 #include "db_utils.h"
--- include/dbxml/DbXmlFwd.hpp	2008-02-20 11:25:11.000000000 -0500
+++ include/dbxml/DbXmlFwd.hpp	2008-02-20 11:25:23.000000000 -0500
@@ -15,7 +15,7 @@
 #define DBXML_VERSION_MINOR 3
 #define DBXML_VERSION_PATCH 10
 #define DBXML_VERSION_STRING "Oracle: Berkeley DB XML 2.3.10: (February 20, 2008)"
-#define XERCESC xercesc_2_7
+#define XERCESC xercesc_2_8
 //END-DBXML-VERSION
 
 namespace XERCESC {


Index: dbxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbxml/devel/dbxml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dbxml.spec	19 Feb 2008 15:45:07 -0000	1.2
+++ dbxml.spec	20 Feb 2008 16:55:52 -0000	1.3
@@ -5,7 +5,7 @@
 Summary: An embeddable XML database with XQuery-based access to documents
 Group: System Environment/Libraries
 Version: 2.3.10
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: BSD
 URL: http://www.oracle.com/technology/software/products/berkeley-db/xml/index.html
 # Source tarball from Oracle containing sources of db4, xercesc, xqilla
@@ -25,6 +25,7 @@
 Patch8: dbxml-xmlmodify.patch
 Patch9: dbxml-statistics.patch
 Patch10: dbxml-invalid-schema.patch
+Patch11: dbxml-g++-4.3.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
 
@@ -145,6 +146,7 @@
 %patch8
 %patch9
 %patch10
+%patch11
 
 %build
 export CPPFLAGS="-I%{_includedir}/xqilla10"
@@ -277,6 +279,9 @@
 %{_defaultdocdir}/dbxml-python-%{version}
 
 %changelog
+* Wed Feb 20 2008 Milan Zazrivec <mzazrivec at redhat.com> - 2.3.10-11
+- Add #include lines where needed for succesful g++ 4.3 build
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.3.10-10
 - Autorebuild for GCC 4.3
 




More information about the fedora-extras-commits mailing list