[packages/libreoffice.git] / openoffice-system-db.patch

diff -Nur oo.orig/berkeleydb/makefile.mk oo.chng/berkeleydb/makefile.mk
--- oo.orig/berkeleydb/makefile.mk	Thu Jun 12 11:50:38 2003
+++ oo.chng/berkeleydb/makefile.mk	Wed Jul 30 19:14:32 2003
@@ -65,6 +65,16 @@
 PRJNAME=so_berkeleydb
 TARGET=so_berkeleydb
 
+# --- Hack to get system db libraries ------------------------------
+.IF "$(GUI)"=="UNX"
+all:
+	@echo "Since you're running a real OS, we're assuming you have db..."
+	+$(COPY) /usr$/lib$/libdb-4.2.so $(DLLDEST)
+	+$(COPY) /usr$/lib$/libdb_cxx-4.2.so $(DLLDEST)
+	+$(COPY) /usr$/lib$/libdb_java-4.2.so $(DLLDEST)
+	+$(COPY) /usr$/lib$/db.jar $(DLLDEST)
+.ENDIF
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
diff -Nur oo.orig/berkeleydb/prj/d.lst oo.chng/berkeleydb/prj/d.lst
--- oo.orig/berkeleydb/prj/d.lst	Mon Jul 14 20:43:57 2003
+++ oo.chng/berkeleydb/prj/d.lst	Wed Jul 30 19:13:27 2003
@@ -1,15 +1,17 @@
 mkdir: %_DEST%\inc%_EXT%\berkeleydb
 
-..\%__SRC%\inc\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
-..\%__SRC%\inc\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
-..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
+\usr\include\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
+\usr\include\cxx_common.h %_DEST%\inc%_EXT%\berkeleydb\cxx_common.h
+\usr\include\cxx_except.h %_DEST%\inc%_EXT%\berkeleydb\cxx_except.h
+\usr\include\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
+\usr\include\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
 
 ..\%__SRC%\lib\libdb32.lib %_DEST%\lib%_EXT%\libdb32.lib
 ..\%__SRC%\lib\libdb_java32.lib %_DEST%\lib%_EXT%\libdb_java32.lib
 
-..\%__SRC%\lib\libdb-3.2.so %_DEST%\lib%_EXT%\libdb-3.2.so
-..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so
-..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so
+\usr\lib\libdb-4.2.so %_DEST%\lib%_EXT%\libdb-4.2.so
+\usr\lib\libdb_java-4.2.so %_DEST%\lib%_EXT%\libdb_java-4.2.so
+\usr\lib\libdb_cxx-4.2.so %_DEST%\lib%_EXT%\libdb_cxx-4.2.so
 
 ..\%__SRC%\lib\libdb-3.2.dylib %_DEST%\lib%_EXT%\libdb-3.2.dylib
 ..\%__SRC%\lib\libdb_java-3.2.dylib %_DEST%\lib%_EXT%\libdb_java-3.2.dylib
@@ -18,5 +20,5 @@
 ..\%__SRC%\bin\libdb32.dll %_DEST%\bin%_EXT%\libdb32.dll
 ..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll
 
-..\%__SRC%\bin\db.jar %_DEST%\bin%_EXT%\db.jar
+\usr\share\java\db.jar %_DEST%\bin%_EXT%\db.jar
 
diff -Nur oo.orig/config_office/makefile.rc oo.chng/config_office/makefile.rc
--- oo.orig/config_office/makefile.rc	Mon Jul  7 16:46:29 2003
+++ oo.chng/config_office/makefile.rc	Wed Jul 30 19:05:47 2003
@@ -159,7 +159,6 @@
 	so3 \
 	soltools \
 	sot \
-	berkeleydb \
 	starmath \
 	stoc \
 	store \
diff -Nur oo.orig/scp/source/office/files.scp oo.chng/scp/source/office/files.scp
--- oo.orig/scp/source/office/files.scp	Wed Jul 30 15:28:10 2003
+++ oo.chng/scp/source/office/files.scp	Wed Jul 30 19:09:56 2003
@@ -983,7 +983,7 @@
         Styles          = (PACKED);
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = STRING(CONCAT2(libdb-3.2,UNXSUFFIX));
+        Name            = STRING(CONCAT2(libdb-4.2,UNXSUFFIX));
         #else
         Name            = "libdb32.dll";
         #endif
@@ -996,7 +996,7 @@
         Styles          = (PACKED);
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = STRING(CONCAT2(libdb_java-3.2,UNXSUFFIX));
+        Name            = STRING(CONCAT2(libdb_java-4.2,UNXSUFFIX));
         #else
         Name            = "libdb_java32.dll";
         #endif
@@ -1010,7 +1010,7 @@
         TXT_FILE_BODY;
         Styles          = (PACKED);
         Dir             = GID_DIR_PROGRAM;
-        Name            = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX));
+        Name            = STRING(CONCAT2(libdb_cxx-4.2,UNXSUFFIX));
 End
 
 #endif
diff -Nur oo.orig/setup2/script/linux/1.0.0/webinstdb.inf oo.chng/setup2/script/linux/1.0.0/webinstdb.inf
--- oo.orig/setup2/script/linux/1.0.0/webinstdb.inf	Thu May 24 08:45:47 2001
+++ oo.chng/setup2/script/linux/1.0.0/webinstdb.inf	Wed Jul 30 19:08:11 2003
@@ -6687,7 +6687,7 @@
 End
 
 File gid_File_Lib_Db31
-	Name		 = "libdb-3.1.so";
+	Name		 = "libdb-4.2.so";
 	PackedName	 = "f_0352";
 	Size		 = 458008;
 	Dir			 = gid_Dir_Program;
@@ -6700,7 +6700,7 @@
 End
 
 File gid_File_Lib_Dbjava31
-	Name		 = "libdb_java-3.1.so";
+	Name		 = "libdb_java-4.2.so";
 	PackedName	 = "f_0353";
 	Size		 = 506820;
 	Dir			 = gid_Dir_Program;
diff -Nur oo.orig/setup2/script/linux/1.0.1/webinstdb.inf oo.chng/setup2/script/linux/1.0.1/webinstdb.inf
--- oo.orig/setup2/script/linux/1.0.1/webinstdb.inf	Thu May 17 16:46:41 2001
+++ oo.chng/setup2/script/linux/1.0.1/webinstdb.inf	Wed Jul 30 19:08:31 2003
@@ -7474,7 +7474,7 @@
 End
 
 File gid_File_Lib_Db31
-	Name		 = "libdb-3.1.so";
+	Name		 = "libdb-4.2.so";
 	PackedName	 = "f_0358";
 	Size		 = 458008;
 	DownloadSize = 196814;
@@ -7488,7 +7488,7 @@
 End
 
 File gid_File_Lib_Dbjava31
-	Name		 = "libdb_java-3.1.so";
+	Name		 = "libdb_java-4.2.so";
 	PackedName	 = "f_0359";
 	Size		 = 506820;
 	DownloadSize = 212931;
diff -Nur oo.orig/setup2/script/linux/1.1.1/webinstdb.inf oo.chng/setup2/script/linux/1.1.1/webinstdb.inf
--- oo.orig/setup2/script/linux/1.1.1/webinstdb.inf	Wed Sep 19 14:58:58 2001
+++ oo.chng/setup2/script/linux/1.1.1/webinstdb.inf	Wed Jul 30 19:08:50 2003
@@ -7512,7 +7512,7 @@
 End
 
 File gid_File_Lib_Db31
-	Name		 = "libdb-3.1.so";
+	Name		 = "libdb-4.2.so";
 	PackedName	 = "f_0361";
 	Size		 = 458008;
 	DownloadSize = 196814;
@@ -7526,7 +7526,7 @@
 End
 
 File gid_File_Lib_Dbjava31
-	Name		 = "libdb_java-3.1.so";
+	Name		 = "libdb_java-4.2.so";
 	PackedName	 = "f_0362";
 	Size		 = 506820;
 	DownloadSize = 212931;
diff -Nur oo.orig/solenv/inc/libs.mk oo.chng/solenv/inc/libs.mk
--- oo.orig/solenv/inc/libs.mk	Wed Jul 30 15:28:09 2003
+++ oo.chng/solenv/inc/libs.mk	Wed Jul 30 19:11:20 2003
@@ -176,8 +176,8 @@
 ZLIB3RDLIB=-lzlib
 JPEG3RDLIB=-ljpeglib
 NEON3RDLIB=-lneon
-BERKELEYLIB=-ldb-3.2
-BERKELEYCPPLIB=-ldb_cxx-3.2
+BERKELEYLIB=-ldb-4.2
+BERKELEYCPPLIB=-ldb_cxx-4.2
 CURLLIB=-lcurl
 SFX2LIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
 SFXLIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
diff -Nur oo.orig/xmlhelp/source/com/sun/star/help/CreateDb.java oo.chng/xmlhelp/source/com/sun/star/help/CreateDb.java
--- oo.orig/xmlhelp/source/com/sun/star/help/CreateDb.java	Mon Nov 20 13:08:42 2000
+++ oo.chng/xmlhelp/source/com/sun/star/help/CreateDb.java	Wed Jul 30 19:16:26 2003
@@ -37,7 +37,7 @@
 		table.set_errpfx( "HelpAccess" );
 		try
 		{
-			table.open( dbName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
+			table.open( null,dbName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
 			Dbc cursor = table.cursor( null,0 );
 
 			StringDbt key = new StringDbt();
@@ -131,7 +131,7 @@
       		Db table = new Db(null, 0);
       		table.set_error_stream(System.err);
       		table.set_errpfx("AccessExample");
-      		table.open("e:/rvp603b/help/helpaccess.db", null, Db.DB_HASH, Db.DB_CREATE, 0644);
+      		table.open(null,"e:/rvp603b/help/helpaccess.db", null, Db.DB_HASH, Db.DB_CREATE, 0644);
       		StringDbt key = new StringDbt(key1);
       		StringDbt data = new StringDbt(data1);
       		try
diff -Nur oo.orig/xmlhelp/source/com/sun/star/help/HelpDatabases.java oo.chng/xmlhelp/source/com/sun/star/help/HelpDatabases.java
--- oo.orig/xmlhelp/source/com/sun/star/help/HelpDatabases.java	Thu Mar 27 19:07:28 2003
+++ oo.chng/xmlhelp/source/com/sun/star/help/HelpDatabases.java	Wed Jul 30 19:18:28 2003
@@ -239,7 +239,7 @@
 				table = new Db( null,0 );
 
 				String tablePath = _installDirectory + key + ".db";
-				table.open( tablePath,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
+				table.open( null,tablePath,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
 				_dbHash.put( key,table );
             }
             catch( DbException e )
@@ -274,7 +274,7 @@
 				table = new Db( null,0 );
 
 				String tablePath = _installDirectory + key + ".ht";
-				table.open( tablePath,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
+				table.open( null,tablePath,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
 				_dbHash.put( key,table );
             }
             catch( DbException e )
@@ -517,7 +517,7 @@
 				String fileName = HelpDatabases.getInstallDirectory() + keyStr + ".key";
         		Db table = new Db( null,0 );
 				System.err.println( fileName );
-				table.open( fileName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
+				table.open( null,fileName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
 				Dbc cursor = table.cursor( null,0 );
 				StringDbt key = new StringDbt();
 				StringDbt data = new StringDbt();
diff -Nur oo.orig/xmlhelp/source/com/sun/star/help/HelpIndexer.java oo.chng/xmlhelp/source/com/sun/star/help/HelpIndexer.java
--- oo.orig/xmlhelp/source/com/sun/star/help/HelpIndexer.java	Thu Mar 27 19:07:28 2003
+++ oo.chng/xmlhelp/source/com/sun/star/help/HelpIndexer.java	Wed Jul 30 19:18:47 2003
@@ -150,7 +150,7 @@
                     		+ _module
                        		+ ".db";
 
-			table.open( fileName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
+			table.open( null,fileName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
 			Dbc cursor = table.cursor( null,0 );
 			StringDbt key = new StringDbt();
 			StringDbt data = new StringDbt();
@@ -440,7 +440,7 @@
                     		      + _module
                        		      + ".key";
 
-				table.open( fileName,null,Db.DB_BTREE,Db.DB_CREATE,0644 );
+				table.open( null,fileName,null,Db.DB_BTREE,Db.DB_CREATE,0644 );
 
             	for( int i = 0; i < list.length; ++i )
             	{
@@ -481,7 +481,7 @@
                     		+ _module
                        		+ ".ht";
 
-			table.open( fileName,null,Db.DB_BTREE,Db.DB_CREATE,0644 );
+			table.open( null,fileName,null,Db.DB_BTREE,Db.DB_CREATE,0644 );
 
             for( int i = 0; i < list.length; ++i )
             {
diff -Nur oo.orig/xmlhelp/source/cxxhelp/provider/databases.cxx oo.chng/xmlhelp/source/cxxhelp/provider/databases.cxx
--- oo.orig/xmlhelp/source/cxxhelp/provider/databases.cxx	Fri Apr  4 19:09:36 2003
+++ oo.chng/xmlhelp/source/cxxhelp/provider/databases.cxx	Wed Jul 30 19:23:11 2003
@@ -60,7 +60,7 @@
  ************************************************************************/
 
 
-#include <berkeleydb/db_cxx.h>
+#include <db_cxx.h>
 #ifndef _VOS_DIAGNOSE_HXX_
 #include <vos/diagnose.hxx>
 #endif
@@ -497,7 +497,11 @@
 		
 		rtl::OString fileName( fileNameOU.getStr(),fileNameOU.getLength(),osl_getThreadTextEncoding() );
 		
+#if ((DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) >= 41)
+		if( table->open( NULL, fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
+#else
 		if( table->open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
+#endif		
 		{
 			table->close( 0 );
 			delete table;
@@ -711,7 +715,12 @@
                                osl_getThreadTextEncoding() );
 		
 		Db table(0,DB_CXX_NO_EXCEPTIONS);
+
+#if ((DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) >= 41)
+		if( 0 == table.open( NULL,fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
+#else
 		if( 0 == table.open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
+#endif		
 		{   
 			std::vector<KeywordInfo::KeywordElement> aVector;
 			Db* idmap = getBerkeley( Database,Language );
diff -Nur oo.orig/xmlhelp/source/cxxhelp/provider/urlparameter.cxx oo.chng/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
--- oo.orig/xmlhelp/source/cxxhelp/provider/urlparameter.cxx	Fri Jun 27 11:09:21 2003
+++ oo.chng/xmlhelp/source/cxxhelp/provider/urlparameter.cxx	Wed Jul 30 19:07:08 2003
@@ -94,7 +94,7 @@
 #include <sablot/shandler.h>
 #endif
 #ifndef _DB_CXX_H_
-#include <berkeleydb/db_cxx.h>
+#include <db_cxx.h>
 #endif
 #ifndef _URLPARAMETER_HXX_
 #include <provider/urlparameter.hxx>
Commit	Line	Data
566aa072	1	diff -Nur oo.orig/berkeleydb/makefile.mk oo.chng/berkeleydb/makefile.mk
	2	--- oo.orig/berkeleydb/makefile.mk Thu Jun 12 11:50:38 2003
	3	+++ oo.chng/berkeleydb/makefile.mk Wed Jul 30 19:14:32 2003
	4	@@ -65,6 +65,16 @@
	5	PRJNAME=so_berkeleydb
	6	TARGET=so_berkeleydb
	7
	8	+# --- Hack to get system db libraries ------------------------------
	9	+.IF "$(GUI)"=="UNX"
	10	+all:
	11	+ @echo "Since you're running a real OS, we're assuming you have db..."
cbfa2ee2	12	+ +$(COPY) /usr$/lib$/libdb-4.2.so $(DLLDEST)
	13	+ +$(COPY) /usr$/lib$/libdb_cxx-4.2.so $(DLLDEST)
	14	+ +$(COPY) /usr$/lib$/libdb_java-4.2.so $(DLLDEST)
566aa072	15	+ +$(COPY) /usr$/lib$/db.jar $(DLLDEST)
	16	+.ENDIF
	17	+
	18	# --- Settings -----------------------------------------------------
	19
	20	.INCLUDE : settings.mk
	21	diff -Nur oo.orig/berkeleydb/prj/d.lst oo.chng/berkeleydb/prj/d.lst
	22	--- oo.orig/berkeleydb/prj/d.lst Mon Jul 14 20:43:57 2003
	23	+++ oo.chng/berkeleydb/prj/d.lst Wed Jul 30 19:13:27 2003
	24	@@ -1,15 +1,17 @@
	25	mkdir: %_DEST%\inc%_EXT%\berkeleydb
	26
	27	-..\%__SRC%\inc\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
	28	-..\%__SRC%\inc\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
	29	-..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
	30	+\usr\include\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
	31	+\usr\include\cxx_common.h %_DEST%\inc%_EXT%\berkeleydb\cxx_common.h
	32	+\usr\include\cxx_except.h %_DEST%\inc%_EXT%\berkeleydb\cxx_except.h
	33	+\usr\include\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
	34	+\usr\include\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
	35
	36	..\%__SRC%\lib\libdb32.lib %_DEST%\lib%_EXT%\libdb32.lib
	37	..\%__SRC%\lib\libdb_java32.lib %_DEST%\lib%_EXT%\libdb_java32.lib
	38
	39	-..\%__SRC%\lib\libdb-3.2.so %_DEST%\lib%_EXT%\libdb-3.2.so
	40	-..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so
	41	-..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so
cbfa2ee2	42	+\usr\lib\libdb-4.2.so %_DEST%\lib%_EXT%\libdb-4.2.so
	43	+\usr\lib\libdb_java-4.2.so %_DEST%\lib%_EXT%\libdb_java-4.2.so
	44	+\usr\lib\libdb_cxx-4.2.so %_DEST%\lib%_EXT%\libdb_cxx-4.2.so
566aa072	45
	46	..\%__SRC%\lib\libdb-3.2.dylib %_DEST%\lib%_EXT%\libdb-3.2.dylib
	47	..\%__SRC%\lib\libdb_java-3.2.dylib %_DEST%\lib%_EXT%\libdb_java-3.2.dylib
	48	@@ -18,5 +20,5 @@
	49	..\%__SRC%\bin\libdb32.dll %_DEST%\bin%_EXT%\libdb32.dll
	50	..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll
	51
	52	-..\%__SRC%\bin\db.jar %_DEST%\bin%_EXT%\db.jar
	53	+\usr\share\java\db.jar %_DEST%\bin%_EXT%\db.jar
	54
	55	diff -Nur oo.orig/config_office/makefile.rc oo.chng/config_office/makefile.rc
	56	--- oo.orig/config_office/makefile.rc Mon Jul 7 16:46:29 2003
	57	+++ oo.chng/config_office/makefile.rc Wed Jul 30 19:05:47 2003
	58	@@ -159,7 +159,6 @@
16445871	59	so3 \
	60	soltools \
	61	sot \
	62	- berkeleydb \
	63	starmath \
	64	stoc \
	65	store \
566aa072	66	diff -Nur oo.orig/scp/source/office/files.scp oo.chng/scp/source/office/files.scp
	67	--- oo.orig/scp/source/office/files.scp Wed Jul 30 15:28:10 2003
	68	+++ oo.chng/scp/source/office/files.scp Wed Jul 30 19:09:56 2003
	69	@@ -983,7 +983,7 @@
	70	Styles = (PACKED);
	71	Dir = GID_DIR_PROGRAM;
	72	#ifdef UNX
	73	- Name = STRING(CONCAT2(libdb-3.2,UNXSUFFIX));
cbfa2ee2	74	+ Name = STRING(CONCAT2(libdb-4.2,UNXSUFFIX));
566aa072	75	#else
	76	Name = "libdb32.dll";
	77	#endif
	78	@@ -996,7 +996,7 @@
	79	Styles = (PACKED);
	80	Dir = GID_DIR_PROGRAM;
	81	#ifdef UNX
	82	- Name = STRING(CONCAT2(libdb_java-3.2,UNXSUFFIX));
cbfa2ee2	83	+ Name = STRING(CONCAT2(libdb_java-4.2,UNXSUFFIX));
566aa072	84	#else
	85	Name = "libdb_java32.dll";
	86	#endif
	87	@@ -1010,7 +1010,7 @@
	88	TXT_FILE_BODY;
	89	Styles = (PACKED);
	90	Dir = GID_DIR_PROGRAM;
	91	- Name = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX));
cbfa2ee2	92	+ Name = STRING(CONCAT2(libdb_cxx-4.2,UNXSUFFIX));
566aa072	93	End
16445871	94
16445871	95	#endif
566aa072	96	diff -Nur oo.orig/setup2/script/linux/1.0.0/webinstdb.inf oo.chng/setup2/script/linux/1.0.0/webinstdb.inf
	97	--- oo.orig/setup2/script/linux/1.0.0/webinstdb.inf Thu May 24 08:45:47 2001
	98	+++ oo.chng/setup2/script/linux/1.0.0/webinstdb.inf Wed Jul 30 19:08:11 2003
27a626b6 PG	99	@@ -6687,7 +6687,7 @@
	100	End
	101
	102	File gid_File_Lib_Db31
	103	- Name = "libdb-3.1.so";
cbfa2ee2	104	+ Name = "libdb-4.2.so";
27a626b6 PG	105	PackedName = "f_0352";
	106	Size = 458008;
	107	Dir = gid_Dir_Program;
	108	@@ -6700,7 +6700,7 @@
	109	End
	110
	111	File gid_File_Lib_Dbjava31
	112	- Name = "libdb_java-3.1.so";
cbfa2ee2	113	+ Name = "libdb_java-4.2.so";
27a626b6 PG	114	PackedName = "f_0353";
	115	Size = 506820;
	116	Dir = gid_Dir_Program;
566aa072	117	diff -Nur oo.orig/setup2/script/linux/1.0.1/webinstdb.inf oo.chng/setup2/script/linux/1.0.1/webinstdb.inf
	118	--- oo.orig/setup2/script/linux/1.0.1/webinstdb.inf Thu May 17 16:46:41 2001
	119	+++ oo.chng/setup2/script/linux/1.0.1/webinstdb.inf Wed Jul 30 19:08:31 2003
27a626b6 PG	120	@@ -7474,7 +7474,7 @@
	121	End
	122
	123	File gid_File_Lib_Db31
	124	- Name = "libdb-3.1.so";
cbfa2ee2	125	+ Name = "libdb-4.2.so";
27a626b6 PG	126	PackedName = "f_0358";
	127	Size = 458008;
	128	DownloadSize = 196814;
	129	@@ -7488,7 +7488,7 @@
	130	End
	131
	132	File gid_File_Lib_Dbjava31
	133	- Name = "libdb_java-3.1.so";
cbfa2ee2	134	+ Name = "libdb_java-4.2.so";
27a626b6 PG	135	PackedName = "f_0359";
	136	Size = 506820;
	137	DownloadSize = 212931;
566aa072	138	diff -Nur oo.orig/setup2/script/linux/1.1.1/webinstdb.inf oo.chng/setup2/script/linux/1.1.1/webinstdb.inf
	139	--- oo.orig/setup2/script/linux/1.1.1/webinstdb.inf Wed Sep 19 14:58:58 2001
	140	+++ oo.chng/setup2/script/linux/1.1.1/webinstdb.inf Wed Jul 30 19:08:50 2003
27a626b6 PG	141	@@ -7512,7 +7512,7 @@
	142	End
	143
	144	File gid_File_Lib_Db31
	145	- Name = "libdb-3.1.so";
cbfa2ee2	146	+ Name = "libdb-4.2.so";
27a626b6 PG	147	PackedName = "f_0361";
	148	Size = 458008;
	149	DownloadSize = 196814;
	150	@@ -7526,7 +7526,7 @@
	151	End
	152
	153	File gid_File_Lib_Dbjava31
	154	- Name = "libdb_java-3.1.so";
cbfa2ee2	155	+ Name = "libdb_java-4.2.so";
27a626b6 PG	156	PackedName = "f_0362";
	157	Size = 506820;
	158	DownloadSize = 212931;
566aa072	159	diff -Nur oo.orig/solenv/inc/libs.mk oo.chng/solenv/inc/libs.mk
	160	--- oo.orig/solenv/inc/libs.mk Wed Jul 30 15:28:09 2003
	161	+++ oo.chng/solenv/inc/libs.mk Wed Jul 30 19:11:20 2003
	162	@@ -176,8 +176,8 @@
27a626b6 PG	163	ZLIB3RDLIB=-lzlib
	164	JPEG3RDLIB=-ljpeglib
	165	NEON3RDLIB=-lneon
	166	-BERKELEYLIB=-ldb-3.2
	167	-BERKELEYCPPLIB=-ldb_cxx-3.2
cbfa2ee2	168	+BERKELEYLIB=-ldb-4.2
cbfa2ee2	169	+BERKELEYCPPLIB=-ldb_cxx-4.2
82f2c7a3	170	CURLLIB=-lcurl
566aa072	171	SFX2LIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
	172	SFXLIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
	173	diff -Nur oo.orig/xmlhelp/source/com/sun/star/help/CreateDb.java oo.chng/xmlhelp/source/com/sun/star/help/CreateDb.java
	174	--- oo.orig/xmlhelp/source/com/sun/star/help/CreateDb.java Mon Nov 20 13:08:42 2000
	175	+++ oo.chng/xmlhelp/source/com/sun/star/help/CreateDb.java Wed Jul 30 19:16:26 2003
d22a4a6d	176	@@ -37,7 +37,7 @@
	177	table.set_errpfx( "HelpAccess" );
	178	try
	179	{
	180	- table.open( dbName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
	181	+ table.open( null,dbName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
	182	Dbc cursor = table.cursor( null,0 );
d33bf0cd	183
d22a4a6d	184	StringDbt key = new StringDbt();
	185	@@ -131,7 +131,7 @@
	186	Db table = new Db(null, 0);
	187	table.set_error_stream(System.err);
	188	table.set_errpfx("AccessExample");
	189	- table.open("e:/rvp603b/help/helpaccess.db", null, Db.DB_HASH, Db.DB_CREATE, 0644);
	190	+ table.open(null,"e:/rvp603b/help/helpaccess.db", null, Db.DB_HASH, Db.DB_CREATE, 0644);
	191	StringDbt key = new StringDbt(key1);
	192	StringDbt data = new StringDbt(data1);
	193	try
566aa072	194	diff -Nur oo.orig/xmlhelp/source/com/sun/star/help/HelpDatabases.java oo.chng/xmlhelp/source/com/sun/star/help/HelpDatabases.java
	195	--- oo.orig/xmlhelp/source/com/sun/star/help/HelpDatabases.java Thu Mar 27 19:07:28 2003
	196	+++ oo.chng/xmlhelp/source/com/sun/star/help/HelpDatabases.java Wed Jul 30 19:18:28 2003
d22a4a6d	197	@@ -239,7 +239,7 @@
d22a4a6d	198	table = new Db( null,0 );
d33bf0cd	199
d22a4a6d	200	String tablePath = _installDirectory + key + ".db";
	201	- table.open( tablePath,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
	202	+ table.open( null,tablePath,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
	203	_dbHash.put( key,table );
	204	}
	205	catch( DbException e )
	206	@@ -274,7 +274,7 @@
	207	table = new Db( null,0 );
	208
	209	String tablePath = _installDirectory + key + ".ht";
	210	- table.open( tablePath,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
	211	+ table.open( null,tablePath,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
	212	_dbHash.put( key,table );
	213	}
	214	catch( DbException e )
	215	@@ -517,7 +517,7 @@
	216	String fileName = HelpDatabases.getInstallDirectory() + keyStr + ".key";
	217	Db table = new Db( null,0 );
	218	System.err.println( fileName );
	219	- table.open( fileName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
	220	+ table.open( null,fileName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
	221	Dbc cursor = table.cursor( null,0 );
	222	StringDbt key = new StringDbt();
	223	StringDbt data = new StringDbt();
566aa072	224	diff -Nur oo.orig/xmlhelp/source/com/sun/star/help/HelpIndexer.java oo.chng/xmlhelp/source/com/sun/star/help/HelpIndexer.java
	225	--- oo.orig/xmlhelp/source/com/sun/star/help/HelpIndexer.java Thu Mar 27 19:07:28 2003
	226	+++ oo.chng/xmlhelp/source/com/sun/star/help/HelpIndexer.java Wed Jul 30 19:18:47 2003
d22a4a6d	227	@@ -150,7 +150,7 @@
	228	+ _module
	229	+ ".db";
	230
	231	- table.open( fileName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
	232	+ table.open( null,fileName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
	233	Dbc cursor = table.cursor( null,0 );
	234	StringDbt key = new StringDbt();
	235	StringDbt data = new StringDbt();
	236	@@ -440,7 +440,7 @@
	237	+ _module
	238	+ ".key";
	239
	240	- table.open( fileName,null,Db.DB_BTREE,Db.DB_CREATE,0644 );
	241	+ table.open( null,fileName,null,Db.DB_BTREE,Db.DB_CREATE,0644 );
	242
	243	for( int i = 0; i < list.length; ++i )
	244	{
	245	@@ -481,7 +481,7 @@
	246	+ _module
	247	+ ".ht";
	248
	249	- table.open( fileName,null,Db.DB_BTREE,Db.DB_CREATE,0644 );
	250	+ table.open( null,fileName,null,Db.DB_BTREE,Db.DB_CREATE,0644 );
	251
	252	for( int i = 0; i < list.length; ++i )
	253	{
566aa072	254	diff -Nur oo.orig/xmlhelp/source/cxxhelp/provider/databases.cxx oo.chng/xmlhelp/source/cxxhelp/provider/databases.cxx
	255	--- oo.orig/xmlhelp/source/cxxhelp/provider/databases.cxx Fri Apr 4 19:09:36 2003
	256	+++ oo.chng/xmlhelp/source/cxxhelp/provider/databases.cxx Wed Jul 30 19:23:11 2003
	257	@@ -60,7 +60,7 @@
	258	************************************************************************/
	259
	260
	261	-#include <berkeleydb/db_cxx.h>
	262	+#include <db_cxx.h>
	263	#ifndef _VOS_DIAGNOSE_HXX_
	264	#include <vos/diagnose.hxx>
	265	#endif
	266	@@ -497,7 +497,11 @@
d22a4a6d	267
	268	rtl::OString fileName( fileNameOU.getStr(),fileNameOU.getLength(),osl_getThreadTextEncoding() );
	269
d22a4a6d	270	+#if ((DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) >= 41)
566aa072	271	+ if( table->open( NULL, fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
d22a4a6d	272	+#else
566aa072	273	if( table->open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
566aa072	274	+#endif
d22a4a6d	275	{
	276	table->close( 0 );
	277	delete table;
566aa072	278	@@ -711,7 +715,12 @@
d22a4a6d	279	osl_getThreadTextEncoding() );
	280
	281	Db table(0,DB_CXX_NO_EXCEPTIONS);
566aa072	282	+
d22a4a6d	283	+#if ((DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) >= 41)
566aa072	284	+ if( 0 == table.open( NULL,fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
d22a4a6d	285	+#else
d22a4a6d	286	if( 0 == table.open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
566aa072	287	+#endif
d22a4a6d	288	{
	289	std::vector<KeywordInfo::KeywordElement> aVector;
	290	Db* idmap = getBerkeley( Database,Language );
566aa072	291	diff -Nur oo.orig/xmlhelp/source/cxxhelp/provider/urlparameter.cxx oo.chng/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
	292	--- oo.orig/xmlhelp/source/cxxhelp/provider/urlparameter.cxx Fri Jun 27 11:09:21 2003
	293	+++ oo.chng/xmlhelp/source/cxxhelp/provider/urlparameter.cxx Wed Jul 30 19:07:08 2003
	294	@@ -94,7 +94,7 @@
	295	#include <sablot/shandler.h>
	296	#endif
	297	#ifndef _DB_CXX_H_
	298	-#include <berkeleydb/db_cxx.h>
	299	+#include <db_cxx.h>
	300	#endif
	301	#ifndef _URLPARAMETER_HXX_
	302	#include <provider/urlparameter.hxx>