openoffice-system-db.patch

   1 --- oo_1.0_src/setup2/script/linux/1.0.0/webinstdb.inf.systemdb Fri May 31 17:46:36 2002
   2 +++ oo_1.0_src/setup2/script/linux/1.0.0/webinstdb.inf  Fri May 31 17:47:08 2002
   3 @@ -6687,7 +6687,7 @@
   4  End
   5
   6  File gid_File_Lib_Db31
   7 -       Name             = "libdb-3.1.so";
   8 +       Name             = "libdb-4.0.so";
   9         PackedName       = "f_0352";
  10         Size             = 458008;
  11         Dir                      = gid_Dir_Program;
  12 @@ -6700,7 +6700,7 @@
  13  End
  14
  15  File gid_File_Lib_Dbjava31
  16 -       Name             = "libdb_java-3.1.so";
  17 +       Name             = "libdb_java-4.0.so";
  18         PackedName       = "f_0353";
  19         Size             = 506820;
  20         Dir                      = gid_Dir_Program;
  21 --- oo_1.0_src/setup2/script/linux/1.0.1/webinstdb.inf.systemdb Fri May 31 17:47:16 2002
  22 +++ oo_1.0_src/setup2/script/linux/1.0.1/webinstdb.inf  Fri May 31 17:47:27 2002
  23 @@ -7474,7 +7474,7 @@
  24  End
  25
  26  File gid_File_Lib_Db31
  27 -       Name             = "libdb-3.1.so";
  28 +       Name             = "libdb-4.0.so";
  29         PackedName       = "f_0358";
  30         Size             = 458008;
  31         DownloadSize = 196814;
  32 @@ -7488,7 +7488,7 @@
  33  End
  34
  35  File gid_File_Lib_Dbjava31
  36 -       Name             = "libdb_java-3.1.so";
  37 +       Name             = "libdb_java-4.0.so";
  38         PackedName       = "f_0359";
  39         Size             = 506820;
  40         DownloadSize = 212931;
  41 --- oo_1.0_src/setup2/script/linux/1.1.1/webinstdb.inf.systemdb Fri May 31 17:47:37 2002
  42 +++ oo_1.0_src/setup2/script/linux/1.1.1/webinstdb.inf  Fri May 31 17:47:48 2002
  43 @@ -7512,7 +7512,7 @@
  44  End
  45
  46  File gid_File_Lib_Db31
  47 -       Name             = "libdb-3.1.so";
  48 +       Name             = "libdb-4.0.so";
  49         PackedName       = "f_0361";
  50         Size             = 458008;
  51         DownloadSize = 196814;
  52 @@ -7526,7 +7526,7 @@
  53  End
  54
  55  File gid_File_Lib_Dbjava31
  56 -       Name             = "libdb_java-3.1.so";
  57 +       Name             = "libdb_java-4.0.so";
  58         PackedName       = "f_0362";
  59         Size             = 506820;
  60         DownloadSize = 212931;
  61 --- oo_1.0_src/scp/source/office/files.scp.systemdb     Fri May 31 17:43:01 2002
  62 +++ oo_1.0_src/scp/source/office/files.scp      Fri May 31 17:43:37 2002
  63 @@ -994,7 +994,7 @@
  64          Styles          = (PACKED);
  65          Dir             = GID_DIR_PROGRAM;
  66          #ifdef UNX
  67 -        Name            = "libdb-3.2.so";
  68 +        Name            = "libdb-4.0.so";
  69          #else
  70          Name            = "libdb32.dll";
  71          #endif
  72 @@ -1007,7 +1007,7 @@
  73          Styles          = (PACKED);
  74          Dir             = GID_DIR_PROGRAM;
  75          #ifdef UNX
  76 -        Name            = "libdb_java-3.2.so";
  77 +        Name            = "libdb_java-4.0.so";
  78          #else
  79          Name            = "libdb_java32.dll";
  80          #endif
  81 @@ -1021,7 +1021,7 @@
  82          BIN_FILE_BODY;
  83          Styles          = (PACKED);
  84          Dir             = GID_DIR_PROGRAM;
  85 -        Name            = "libdb_cxx-3.2.so";
  86 +        Name            = "libdb_cxx-4.0.so";
  87  End
  88
  89  #endif
  90 --- oo_1.0_src/solenv/inc/libs.mk.systemdb      Fri May 31 17:43:57 2002
  91 +++ oo_1.0_src/solenv/inc/libs.mk       Fri May 31 17:45:32 2002
  92 @@ -169,8 +169,8 @@
  93  ZLIB3RDLIB=-lzlib
  94  JPEG3RDLIB=-ljpeglib
  95  NEON3RDLIB=-lneon
  96 -BERKELEYLIB=-ldb-3.2
  97 -BERKELEYCPPLIB=-ldb_cxx-3.2
  98 +BERKELEYLIB=-ldb-4.0
  99 +BERKELEYCPPLIB=-ldb_cxx-4.0
 100  SFX2LIB=-lsfx$(UPD)$(DLLPOSTFIX)
 101  SFXLIB=-lsfx$(UPD)$(DLLPOSTFIX)
 102  SFXDEBUGLIB=
 103 --- oo_1.0_src/berkeleydb/prj/d.lst.systemdb    Fri May 31 17:38:58 2002
 104 +++ oo_1.0_src/berkeleydb/prj/d.lst     Fri May 31 17:42:14 2002
 105 @@ -1,18 +1,20 @@
 106  mkdir: %_DEST%\inc%_EXT%\berkeleydb
 107
 108 -..\%__SRC%\inc\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
 109 -..\%__SRC%\inc\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
 110 -..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
 111 +\usr\include\db4\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
 112 +\usr\include\db4\cxx_common.h %_DEST%\inc%_EXT%\berkeleydb\cxx_common.h
 113 +\usr\include\db4\cxx_except.h %_DEST%\inc%_EXT%\berkeleydb\cxx_except.h
 114 +\usr\include\db4\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
 115 +\usr\include\db4\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
 116
 117  ..\%__SRC%\lib\libdb32.lib %_DEST%\lib%_EXT%\libdb32.lib
 118  ..\%__SRC%\lib\libdb_java32.lib %_DEST%\lib%_EXT%\libdb_java32.lib
 119
 120 -..\%__SRC%\lib\libdb-3.2.so %_DEST%\lib%_EXT%\libdb-3.2.so
 121 -..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so
 122 -..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so
 123 +\lib\libdb-4.0.so %_DEST%\lib%_EXT%\libdb-4.0.so
 124 +\usr\lib\libdb_java-4.0.so %_DEST%\lib%_EXT%\libdb_java-4.0.so
 125 +\usr\lib\libdb_cxx-4.0.so %_DEST%\lib%_EXT%\libdb_cxx-4.0.so
 126
 127  ..\%__SRC%\bin\libdb32.dll %_DEST%\bin%_EXT%\libdb32.dll
 128  ..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll
 129
 130 -..\%__SRC%\bin\db.jar %_DEST%\bin%_EXT%\db.jar
 131 +\usr\share\java\db.jar %_DEST%\bin%_EXT%\db.jar
 132
 133 --- oo_1.0_src/berkeleydb/makefile.mk.systemdb  Fri May 31 17:34:42 2002
 134 +++ oo_1.0_src/berkeleydb/makefile.mk   Fri May 31 17:38:51 2002
 135 @@ -65,6 +65,16 @@
 136  PRJNAME=so_berkeleydb
 137  TARGET=so_berkeleydb
 138
 139 +# --- Hack to get system db libraries ------------------------------
 140 +.IF "$(GUI)"=="UNX"
 141 +all:
 142 +       @echo "Since you're running a real OS, we're assuming you have db..."
 143 +       +$(COPY) /lib$/libdb-4.0.so $(DLLDEST)
 144 +       +$(COPY) /usr$/lib$/libdb_cxx-4.0.so $(DLLDEST)
 145 +       +$(COPY) /usr$/lib$/libdb_java-4.0.so $(DLLDEST)
 146 +       +$(COPY) /usr$/share$/java$/db.jar $(DLLDEST)
 147 +.ENDIF
 148 +
 149  # --- Settings -----------------------------------------------------
 150
 151  .INCLUDE :     settings.mk