]> git.pld-linux.org Git - packages/libreoffice.git/blame - openoffice-system_ra-db.patch
projects / packages / libreoffice.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- up
[packages/libreoffice.git] / openoffice-system_ra-db.patch
CommitLineData
57856ccb 1diff -Nur oo/berkeleydb/makefile.mk oo.new/berkeleydb/makefile.mk
2--- oo/berkeleydb/makefile.mk Fri Feb 8 16:18:17 2002
3+++ oo.new/berkeleydb/makefile.mk Sun Apr 14 23:56:12 2002
4@@ -117,12 +117,12 @@
5
6 .INCLUDE : set_ext.mk
7 .INCLUDE : target.mk
8-.INCLUDE : tg_ext.mk
9+#.INCLUDE : tg_ext.mk
10
11-TG_DELIVER : $(INPATH)$/misc$/build$/so_predeliver
12- $(DELIVER)
13+#TG_DELIVER : $(INPATH)$/misc$/build$/so_predeliver
14+# $(DELIVER)
15
16-.IF "$(BUILD_SOSL)"!=""
17-ALLTAR : TG_DELIVER
18-.ENDIF # "$(BUILD_SOSL)"!=""
19+#.IF "$(BUILD_SOSL)"!=""
20+#ALLTAR : TG_DELIVER
21+#.ENDIF # "$(BUILD_SOSL)"!=""
22
23diff -Nur oo/config_office/makefile.rc oo.new/config_office/makefile.rc
24--- oo/config_office/makefile.rc Fri Oct 19 17:25:23 2001
25+++ oo.new/config_office/makefile.rc Sun Apr 14 23:56:12 2002
26@@ -155,7 +155,6 @@
27 so3 \
28 soltools \
29 sot \
30- berkeleydb \
31 starmath \
32 stoc \
33 store \
34diff -Nur oo/xmlhelp/source/cxxhelp/provider/databases.cxx oo.new/xmlhelp/source/cxxhelp/provider/databases.cxx
35--- oo/xmlhelp/source/cxxhelp/provider/databases.cxx Fri Nov 23 17:51:01 2001
36+++ oo.new/xmlhelp/source/cxxhelp/provider/databases.cxx Mon Apr 15 10:59:50 2002
37@@ -60,7 +60,7 @@
38 ************************************************************************/
39
40
41-#include <berkeleydb/db_cxx.h>
42+#include <db_cxx.h>
43 #ifndef _VOS_DIAGNOSE_HXX_
44 #include <vos/diagnose.hxx>
45 #endif
46diff -Nur oo/xmlhelp/source/cxxhelp/provider/urlparameter.cxx oo.new/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
47--- oo/xmlhelp/source/cxxhelp/provider/urlparameter.cxx Wed Oct 31 14:08:14 2001
48+++ oo.new/xmlhelp/source/cxxhelp/provider/urlparameter.cxx Mon Apr 15 11:05:50 2002
49@@ -88,7 +88,7 @@
50 #include <sablot/shandler.h>
51 #endif
52 #ifndef _DB_CXX_H_
53-#include <berkeleydb/db_cxx.h>
54+#include <db_cxx.h>
55 #endif
56 #ifndef _URLPARAMETER_HXX_
57 #include <provider/urlparameter.hxx>
58--- oo_1.0_src/scp/source/office/files.scp.systemdb Fri May 31 17:43:01 2002
59+++ oo_1.0_src/scp/source/office/files.scp Fri May 31 17:43:37 2002
60@@ -994,7 +994,7 @@
61 Styles = (PACKED);
62 Dir = GID_DIR_PROGRAM;
63 #ifdef UNX
64- Name = "libdb-3.2.so";
65+ Name = "libdb-3.1.so";
66 #else
67 Name = "libdb32.dll";
68 #endif
69@@ -1007,7 +1007,7 @@
70 Styles = (PACKED);
71 Dir = GID_DIR_PROGRAM;
72 #ifdef UNX
73- Name = "libdb_java-3.2.so";
74+ Name = "libdb_java-3.1.so";
75 #else
76 Name = "libdb_java32.dll";
77 #endif
78@@ -1021,7 +1021,7 @@
79 BIN_FILE_BODY;
80 Styles = (PACKED);
81 Dir = GID_DIR_PROGRAM;
82- Name = "libdb_cxx-3.2.so";
83+ Name = "libdb_cxx-3.1.so";
84 End
85
86 #endif
87--- oo_1.0_src/solenv/inc/libs.mk.systemdb Fri May 31 17:43:57 2002
88+++ oo_1.0_src/solenv/inc/libs.mk Fri May 31 17:45:32 2002
89@@ -174,8 +174,8 @@
90 ZLIB3RDLIB=-lzlib
91 JPEG3RDLIB=-ljpeglib
92 NEON3RDLIB=-lneon
93-BERKELEYLIB=-ldb-3.2
94-BERKELEYCPPLIB=-ldb_cxx-3.2
95+BERKELEYLIB=-ldb-3.1
96+BERKELEYCPPLIB=-ldb_cxx-3.1
97 CURLLIB=-lcurl
98 SFX2LIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
99 SFXLIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
100--- oo_1.0_src/berkeleydb/prj/d.lst.systemdb Fri May 31 17:38:58 2002
101+++ oo_1.0_src/berkeleydb/prj/d.lst Fri May 31 17:42:14 2002
102@@ -1,18 +1,17 @@
103 mkdir: %_DEST%\inc%_EXT%\berkeleydb
104
105-..\%__SRC%\inc\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
106-..\%__SRC%\inc\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
107-..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
108+\usr\include\db3\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
109+\usr\include\db3\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
110+\usr\include\db3\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
111
112 ..\%__SRC%\lib\libdb32.lib %_DEST%\lib%_EXT%\libdb32.lib
113 ..\%__SRC%\lib\libdb_java32.lib %_DEST%\lib%_EXT%\libdb_java32.lib
114
115-..\%__SRC%\lib\libdb-3.2.so %_DEST%\lib%_EXT%\libdb-3.2.so
116-..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so
117-..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so
118+\usr\lib\libdb-3.1.so %_DEST%\lib%_EXT%\libdb-3.1.so
119+\usr\lib\libdb_java-3.1.so %_DEST%\lib%_EXT%\libdb_java-3.1.so
120+\usr\lib\libdb_cxx-3.1.so %_DEST%\lib%_EXT%\libdb_cxx-3.1.so
121
122 ..\%__SRC%\bin\libdb32.dll %_DEST%\bin%_EXT%\libdb32.dll
123 ..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll
124
125-..\%__SRC%\bin\db.jar %_DEST%\bin%_EXT%\db.jar
126
127--- oo_1.0_src/berkeleydb/makefile.mk.systemdb Fri May 31 17:34:42 2002
128+++ oo_1.0_src/berkeleydb/makefile.mk Fri May 31 17:38:51 2002
129@@ -65,6 +65,16 @@
130 PRJNAME=so_berkeleydb
131 TARGET=so_berkeleydb
132
133+# --- Hack to get system db libraries ------------------------------
134+.IF "$(GUI)"=="UNX"
135+all:
136+ @echo "Since you're running a real OS, we're assuming you have db..."
137+ +$(COPY) /usr$/lib$/libdb-3.1.so $(DLLDEST)
138+ +$(COPY) /usr$/lib$/libdb_cxx-3.1.so $(DLLDEST)
139+ +$(COPY) /usr$/lib$/libdb_java-3.1.so $(DLLDEST)
140+ +$(COPY) /usr$/lib$/db.jar $(DLLDEST)
141+.ENDIF
142+
143 # --- Settings -----------------------------------------------------
144
145 .INCLUDE : settings.mk
146diff -uNr xmlhelp.old/source/cxxhelp/provider/databases.cxx xmlhelp/source/cxxhelp/provider/databases.cxx
147--- oo/xmlhelp.old/source/cxxhelp/provider/databases.cxx Wed Dec 4 15:19:26 2002
148+++ oo/xmlhelp/source/cxxhelp/provider/databases.cxx Wed Dec 4 15:33:41 2002
149@@ -495,7 +495,11 @@
150
151 rtl::OString fileName( fileNameOU.getStr(),fileNameOU.getLength(),osl_getThreadTextEncoding() );
152
153- if( table->open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
154+#if ((DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) >= 41)
155+ if( table->open( NULL, fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
156+#else
157+ if( table->open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
158+#endif
159 {
160 table->close( 0 );
161 delete table;
162@@ -709,7 +713,11 @@
163 osl_getThreadTextEncoding() );
164
165 Db table(0,DB_CXX_NO_EXCEPTIONS);
166+#if ((DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) >= 41)
167+ if( 0 == table.open( NULL, fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
168+#else
169 if( 0 == table.open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
170+#endif
171 {
172 std::vector<KeywordInfo::KeywordElement> aVector;
173 Db* idmap = getBerkeley( Database,Language );
LibreOffice - powerful office suite
This page took 0.090099 seconds and 4 git commands to generate.