- Patched for nest

Changed files:
    openoffice-gcc3-1.patch -> 1.2
    openoffice-system-db.patch -> 1.7

diff --git a/openoffice-gcc3-1.patch b/openoffice-gcc3-1.patch
index eaca7ff821d175a9157cc933053437ca6ed17e61..d6c1dfc36d0919fcea4ca0b7aabf6871f2c88070 100644 (file)
--- a/openoffice-gcc3-1.patch
+++ b/openoffice-gcc3-1.patch
@@ -25,7 +25,7 @@
  File gid_File_Lib_Stdc
      BIN_FILE_BODY;
 -    Name               = STRING(libstdc++.so.4.0.0);
-+    Name               = STRING(libstdc++.so.5.0.0);
++    Name               = STRING(libstdc++.so.5.0.1);
      Dir                        = GCFG_BINARY_DIR;
      Styles             = (PACKED, SETUPZIP);
  End
@@ -45,8 +45,8 @@
         $(DESTDIRDLL)$/libgcc_s.so              \
 -       $(DESTDIRDLL)$/libstdc++.so.4           \
 -       $(DESTDIRDLL)$/libstdc++.so.4.0.0
-+       $(DESTDIRDLL)$/libstdc++.so.X           \
-+       $(DESTDIRDLL)$/libstdc++.so.X.Y.Z
++       $(DESTDIRDLL)$/libstdc++.so.5           \
++       $(DESTDIRDLL)$/libstdc++.so.5.0.1
  .ELSE
  ADDITIONAL_DLLS= \
        $(DESTDIRDLL)$/libgcc_s.so.1            \
@@ -55,16 +55,16 @@
  .IF "$(CCNUMVER)">="000300010000"
  
 -$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.X.Y.Z : $(DLLOUT)$/libstdc++.so.X.Y.Z $(DIRLIST)
++$(DESTDIRDLL)$/libstdc++.so.5.0.1 : $(DLLOUT)$/libstdc++.so.5.0.1 $(DIRLIST)
         -rm -f $@
 -       $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
-+       $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.X.Y.Z $@
++       $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.5.0.1 $@
  
 -$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.X : $(DESTDIRDLL)$/libstdc++.so.X.Y.Z $(DIRLIST)
++$(DESTDIRDLL)$/libstdc++.so.5 : $(DESTDIRDLL)$/libstdc++.so.5.0.1 $(DIRLIST)
         -rm -f $@
 -       +ln -s libstdc++.so.4.0.0 $@
-+       +ln -s libstdc++.so.X.Y.Z $@
++       +ln -s libstdc++.so.5.0.1 $@
  
  .ELSE
   

diff --git a/openoffice-system-db.patch b/openoffice-system-db.patch
index cdab5939e50900c334433c5896e641a7fe9b45af..e5f71dedb710932996dcbddc7dc192f7e787bb29 100644 (file)
--- a/openoffice-system-db.patch
+++ b/openoffice-system-db.patch
@@ -5,7 +5,7 @@
  
  File gid_File_Lib_Db31
 -      Name             = "libdb-3.1.so";
-+      Name             = "libdb-4.0.so";
++      Name             = "libdb-4.1.so";
        PackedName       = "f_0352";
        Size             = 458008;
        Dir                      = gid_Dir_Program;
@@ -14,7 +14,7 @@
  
  File gid_File_Lib_Dbjava31
 -      Name             = "libdb_java-3.1.so";
-+      Name             = "libdb_java-4.0.so";
++      Name             = "libdb_java-4.1.so";
        PackedName       = "f_0353";
        Size             = 506820;
        Dir                      = gid_Dir_Program;
@@ -25,7 +25,7 @@
  
  File gid_File_Lib_Db31
 -      Name             = "libdb-3.1.so";
-+      Name             = "libdb-4.0.so";
++      Name             = "libdb-4.1.so";
        PackedName       = "f_0358";
        Size             = 458008;
        DownloadSize = 196814;
@@ -34,7 +34,7 @@
  
  File gid_File_Lib_Dbjava31
 -      Name             = "libdb_java-3.1.so";
-+      Name             = "libdb_java-4.0.so";
++      Name             = "libdb_java-4.1.so";
        PackedName       = "f_0359";
        Size             = 506820;
        DownloadSize = 212931;
@@ -45,7 +45,7 @@
  
  File gid_File_Lib_Db31
 -      Name             = "libdb-3.1.so";
-+      Name             = "libdb-4.0.so";
++      Name             = "libdb-4.1.so";
        PackedName       = "f_0361";
        Size             = 458008;
        DownloadSize = 196814;
@@ -54,7 +54,7 @@
  
  File gid_File_Lib_Dbjava31
 -      Name             = "libdb_java-3.1.so";
-+      Name             = "libdb_java-4.0.so";
++      Name             = "libdb_java-4.1.so";
        PackedName       = "f_0362";
        Size             = 506820;
        DownloadSize = 212931;
@@ -65,7 +65,7 @@
          Dir             = GID_DIR_PROGRAM;
          #ifdef UNX
 -        Name            = "libdb-3.2.so";
-+        Name            = "libdb-4.0.so";
++        Name            = "libdb-4.1.so";
          #else
          Name            = "libdb32.dll";
          #endif
@@ -74,7 +74,7 @@
          Dir             = GID_DIR_PROGRAM;
          #ifdef UNX
 -        Name            = "libdb_java-3.2.so";
-+        Name            = "libdb_java-4.0.so";
++        Name            = "libdb_java-4.1.so";
          #else
          Name            = "libdb_java32.dll";
          #endif
@@ -83,7 +83,7 @@
          Styles          = (PACKED);
          Dir             = GID_DIR_PROGRAM;
 -        Name            = "libdb_cxx-3.2.so";
-+        Name            = "libdb_cxx-4.0.so";
++        Name            = "libdb_cxx-4.1.so";
  End
  
  #endif
@@ -95,8 +95,8 @@
  NEON3RDLIB=-lneon
 -BERKELEYLIB=-ldb-3.2
 -BERKELEYCPPLIB=-ldb_cxx-3.2
-+BERKELEYLIB=-ldb-4.0
-+BERKELEYCPPLIB=-ldb_cxx-4.0
++BERKELEYLIB=-ldb-4.1
++BERKELEYCPPLIB=-ldb_cxx-4.1
  SFX2LIB=-lsfx$(UPD)$(DLLPOSTFIX)
  SFXLIB=-lsfx$(UPD)$(DLLPOSTFIX)
  SFXDEBUGLIB=
@@ -108,11 +108,11 @@
 -..\%__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\db4\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
-+\usr\include\db4\cxx_common.h %_DEST%\inc%_EXT%\berkeleydb\cxx_common.h
-+\usr\include\db4\cxx_except.h %_DEST%\inc%_EXT%\berkeleydb\cxx_except.h
-+\usr\include\db4\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
-+\usr\include\db4\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
@@ -120,9 +120,9 @@
 -..\%__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.0.so %_DEST%\lib%_EXT%\libdb-4.0.so
-+\usr\lib\libdb_java-4.0.so %_DEST%\lib%_EXT%\libdb_java-4.0.so
-+\usr\lib\libdb_cxx-4.0.so %_DEST%\lib%_EXT%\libdb_cxx-4.0.so
++\usr\lib\libdb-4.1.so %_DEST%\lib%_EXT%\libdb-4.1.so
++\usr\lib\libdb_java-4.1.so %_DEST%\lib%_EXT%\libdb_java-4.1.so
++\usr\lib\libdb_cxx-4.1.so %_DEST%\lib%_EXT%\libdb_cxx-4.1.so
  
  ..\%__SRC%\bin\libdb32.dll %_DEST%\bin%_EXT%\libdb32.dll
  ..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll
@@ -140,34 +140,121 @@
 +.IF "$(GUI)"=="UNX"
 +all:
 +      @echo "Since you're running a real OS, we're assuming you have db..."
-+      +$(COPY) /usr$/lib$/libdb-4.0.so $(DLLDEST)
-+      +$(COPY) /usr$/lib$/libdb_cxx-4.0.so $(DLLDEST)
-+      +$(COPY) /usr$/lib$/libdb_java-4.0.so $(DLLDEST)
++      +$(COPY) /usr$/lib$/libdb-4.1.so $(DLLDEST)
++      +$(COPY) /usr$/lib$/libdb_cxx-4.1.so $(DLLDEST)
++      +$(COPY) /usr$/lib$/libdb_java-4.1.so $(DLLDEST)
 +      +$(COPY) /usr$/lib$/db.jar $(DLLDEST)
 +.ENDIF
 +
  # --- Settings -----------------------------------------------------
  
  .INCLUDE :    settings.mk
---- ooold/xmlhelp/source/cxxhelp/provider/databases.cxx        Mon Aug  5 10:53:34 2002
-+++ oonew/xmlhelp/source/cxxhelp/provider/databases.cxx        Mon Aug  5 10:52:03 2002
-@@ -60,7 +60,7 @@
-  ************************************************************************/
+diff -uNr xmlhelp.old/source/com/sun/star/help/CreateDb.java xmlhelp/source/com/sun/star/help/CreateDb.java
+--- oo/xmlhelp.old/source/com/sun/star/help/CreateDb.java      Wed Dec  4 15:19:26 2002
++++ oo/xmlhelp/source/com/sun/star/help/CreateDb.java  Wed Dec  4 15:47:07 2002
+@@ -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 -uNr xmlhelp.old/source/com/sun/star/help/HelpDatabases.java xmlhelp/source/com/sun/star/help/HelpDatabases.java
+--- oo/xmlhelp.old/source/com/sun/star/help/HelpDatabases.java Wed Dec  4 15:19:26 2002
++++ oo/xmlhelp/source/com/sun/star/help/HelpDatabases.java     Wed Dec  4 15:46:17 2002
+@@ -239,7 +239,7 @@
+                               table = new Db( null,0 );
  
--#include <db_cxx.h>
-+#include <db4/db_cxx.h>
- #ifndef _VOS_DIAGNOSE_HXX_
- #include <vos/diagnose.hxx>
- #endif
---- ooold/xmlhelp/source/cxxhelp/provider/urlparameter.cxx     Mon Aug  5 10:53:37 2002
-+++ oonew/xmlhelp/source/cxxhelp/provider/urlparameter.cxx     Mon Aug  5 10:52:19 2002
-@@ -88,7 +88,7 @@
- #include <sablot/shandler.h>
- #endif
- #ifndef _DB_CXX_H_
--#include <db_cxx.h>
-+#include <db4/db_cxx.h>
- #endif
- #ifndef _URLPARAMETER_HXX_
- #include <provider/urlparameter.hxx>
+                               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 -uNr xmlhelp.old/source/com/sun/star/help/HelpIndexer.java xmlhelp/source/com/sun/star/help/HelpIndexer.java
+--- oo/xmlhelp.old/source/com/sun/star/help/HelpIndexer.java   Wed Dec  4 15:19:26 2002
++++ oo/xmlhelp/source/com/sun/star/help/HelpIndexer.java       Wed Dec  4 15:46:49 2002
+@@ -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 -uNr xmlhelp.old/source/cxxhelp/provider/databases.cxx xmlhelp/source/cxxhelp/provider/databases.cxx
+--- xmlhelp.old/source/cxxhelp/provider/databases.cxx  Wed Dec  4 15:19:26 2002
++++ xmlhelp/source/cxxhelp/provider/databases.cxx      Wed Dec  4 15:33:41 2002
+@@ -495,7 +495,11 @@
+               
+               rtl::OString fileName( fileNameOU.getStr(),fileNameOU.getLength(),osl_getThreadTextEncoding() );
+               
+-              if( table->open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
++#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;
+@@ -709,7 +713,11 @@
+                                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 );