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
8 +# --- Hack to get system db libraries ------------------------------
11 + @echo "Since you're running a real OS, we're assuming you have db..."
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)
15 + +$(COPY) /usr$/lib$/db.jar $(DLLDEST)
18 # --- Settings -----------------------------------------------------
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
25 mkdir: %_DEST%\inc%_EXT%\berkeleydb
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
36 ..\%__SRC%\lib\libdb32.lib %_DEST%\lib%_EXT%\libdb32.lib
37 ..\%__SRC%\lib\libdb_java32.lib %_DEST%\lib%_EXT%\libdb_java32.lib
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
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
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
49 ..\%__SRC%\bin\libdb32.dll %_DEST%\bin%_EXT%\libdb32.dll
50 ..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll
52 -..\%__SRC%\bin\db.jar %_DEST%\bin%_EXT%\db.jar
53 +\usr\share\java\db.jar %_DEST%\bin%_EXT%\db.jar
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
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
71 Dir = GID_DIR_PROGRAM;
73 - Name = STRING(CONCAT2(libdb-3.2,UNXSUFFIX));
74 + Name = STRING(CONCAT2(libdb-4.2,UNXSUFFIX));
80 Dir = GID_DIR_PROGRAM;
82 - Name = STRING(CONCAT2(libdb_java-3.2,UNXSUFFIX));
83 + Name = STRING(CONCAT2(libdb_java-4.2,UNXSUFFIX));
85 Name = "libdb_java32.dll";
90 Dir = GID_DIR_PROGRAM;
91 - Name = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX));
92 + Name = STRING(CONCAT2(libdb_cxx-4.2,UNXSUFFIX));
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
102 File gid_File_Lib_Db31
103 - Name = "libdb-3.1.so";
104 + Name = "libdb-4.2.so";
105 PackedName = "f_0352";
107 Dir = gid_Dir_Program;
108 @@ -6700,7 +6700,7 @@
111 File gid_File_Lib_Dbjava31
112 - Name = "libdb_java-3.1.so";
113 + Name = "libdb_java-4.2.so";
114 PackedName = "f_0353";
116 Dir = gid_Dir_Program;
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
120 @@ -7474,7 +7474,7 @@
123 File gid_File_Lib_Db31
124 - Name = "libdb-3.1.so";
125 + Name = "libdb-4.2.so";
126 PackedName = "f_0358";
128 DownloadSize = 196814;
129 @@ -7488,7 +7488,7 @@
132 File gid_File_Lib_Dbjava31
133 - Name = "libdb_java-3.1.so";
134 + Name = "libdb_java-4.2.so";
135 PackedName = "f_0359";
137 DownloadSize = 212931;
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
141 @@ -7512,7 +7512,7 @@
144 File gid_File_Lib_Db31
145 - Name = "libdb-3.1.so";
146 + Name = "libdb-4.2.so";
147 PackedName = "f_0361";
149 DownloadSize = 196814;
150 @@ -7526,7 +7526,7 @@
153 File gid_File_Lib_Dbjava31
154 - Name = "libdb_java-3.1.so";
155 + Name = "libdb_java-4.2.so";
156 PackedName = "f_0362";
158 DownloadSize = 212931;
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
166 -BERKELEYLIB=-ldb-3.2
167 -BERKELEYCPPLIB=-ldb_cxx-3.2
168 +BERKELEYLIB=-ldb-4.2
169 +BERKELEYCPPLIB=-ldb_cxx-4.2
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
177 table.set_errpfx( "HelpAccess" );
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 );
184 StringDbt key = new StringDbt();
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);
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
198 table = new Db( null,0 );
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 );
205 catch( DbException e )
207 table = new Db( null,0 );
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 );
214 catch( DbException e )
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();
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
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();
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 );
243 for( int i = 0; i < list.length; ++i )
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 );
252 for( int i = 0; i < list.length; ++i )
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
258 ************************************************************************/
261 -#include <berkeleydb/db_cxx.h>
263 #ifndef _VOS_DIAGNOSE_HXX_
264 #include <vos/diagnose.hxx>
268 rtl::OString fileName( fileNameOU.getStr(),fileNameOU.getLength(),osl_getThreadTextEncoding() );
270 +#if ((DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) >= 41)
271 + if( table->open( NULL, fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
273 if( table->open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
279 osl_getThreadTextEncoding() );
281 Db table(0,DB_CXX_NO_EXCEPTIONS);
283 +#if ((DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) >= 41)
284 + if( 0 == table.open( NULL,fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
286 if( 0 == table.open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
289 std::vector<KeywordInfo::KeywordElement> aVector;
290 Db* idmap = getBerkeley( Database,Language );
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
295 #include <sablot/shandler.h>
298 -#include <berkeleydb/db_cxx.h>
301 #ifndef _URLPARAMETER_HXX_
302 #include <provider/urlparameter.hxx>