[Libreoffice-commits] .: 6 commits - berkeleydb/db-4.7.25-mingw.patch berkeleydb/db-4.7.25.NC-mingw32hack.patch berkeleydb/db-4.7.25.patch berkeleydb/db-aix.patch berkeleydb/makefile.mk berkeleydb/prj berkeleydb/README config_host.mk.in configure.ac cross_tail_build/prj desktop/Library_migrationoo3.mk external/mingw-dlls helpcompiler/prj Library_merged.mk Makefile.top ooo.lst.in python/makefile.mk python/prj python/Python-2.6.1-cross.berkeleydb.patch RepositoryExternal.mk sal/android sal/cpprt sal/cppunittester sal/CppunitTest_Module_DLL.mk sal/inc sal/Makefile sal/osl sal/Package_inc.mk sal/qa sal/rtl sal/test sal/textenc sal/typesconfig sal/util sal/workben scp2/InstallModule_ooo.mk scp2/source solenv/gbuild solenv/inc tail_build/prj xmlhelp/Library_ucpchelp1.mk xmlhelp/Makefile xmlhelp/prj xmlhelp/source xmlhelp/util
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Nov 21 06:52:35 PST 2012
Library_merged.mk | 6
Makefile.top | 1
RepositoryExternal.mk | 45
berkeleydb/README | 5
berkeleydb/db-4.7.25-mingw.patch | 348 ---
berkeleydb/db-4.7.25.NC-mingw32hack.patch | 11
berkeleydb/db-4.7.25.patch | 1104 ----------
berkeleydb/db-aix.patch | 205 -
berkeleydb/makefile.mk | 197 -
berkeleydb/prj/build.lst | 3
berkeleydb/prj/d.lst | 12
config_host.mk.in | 6
configure.ac | 77
cross_tail_build/prj/build.lst | 2
desktop/Library_migrationoo3.mk | 4
external/mingw-dlls/makefile.mk | 1
helpcompiler/prj/build.lst | 2
ooo.lst.in | 2
python/Python-2.6.1-cross.berkeleydb.patch | 15
python/makefile.mk | 6
python/prj/build.lst | 2
sal/CppunitTest_Module_DLL.mk | 2
sal/Makefile | 17
sal/Package_inc.mk | 1
sal/android/android_native_app_glue.c | 20
sal/cpprt/operators_new_delete.cxx | 37
sal/cppunittester/cppunittester.cxx | 50
sal/inc/cppunittester/protectorfactory.hxx | 43
sal/inc/osl/armarch.h | 63
sal/inc/osl/conditn.h | 37
sal/inc/osl/conditn.hxx | 37
sal/inc/osl/detail/android_native_app_glue.h | 20
sal/inc/osl/diagnose.h | 37
sal/inc/osl/diagnose.hxx | 37
sal/inc/osl/endian.h | 37
sal/inc/osl/file.h | 37
sal/inc/osl/file.hxx | 37
sal/inc/osl/interlck.h | 37
sal/inc/osl/module.h | 37
sal/inc/osl/module.hxx | 37
sal/inc/osl/mutex.h | 37
sal/inc/osl/mutex.hxx | 37
sal/inc/osl/nlsupport.h | 43
sal/inc/osl/pipe.h | 37
sal/inc/osl/pipe.hxx | 37
sal/inc/osl/pipe_decl.hxx | 37
sal/inc/osl/process.h | 37
sal/inc/osl/profile.h | 37
sal/inc/osl/profile.hxx | 37
sal/inc/osl/security.h | 37
sal/inc/osl/security.hxx | 37
sal/inc/osl/security_decl.hxx | 37
sal/inc/osl/semaphor.h | 37
sal/inc/osl/semaphor.hxx | 37
sal/inc/osl/signal.h | 37
sal/inc/osl/socket.h | 37
sal/inc/osl/socket.hxx | 37
sal/inc/osl/socket_decl.hxx | 37
sal/inc/osl/thread.h | 37
sal/inc/osl/thread.hxx | 37
sal/inc/osl/time.h | 37
sal/inc/osl/util.h | 43
sal/inc/rtl/alloc.h | 43
sal/inc/rtl/allocator.hxx | 37
sal/inc/rtl/bootstrap.h | 40
sal/inc/rtl/bootstrap.hxx | 37
sal/inc/rtl/byteseq.h | 37
sal/inc/rtl/byteseq.hxx | 37
sal/inc/rtl/cipher.h | 37
sal/inc/rtl/crc.h | 43
sal/inc/rtl/digest.h | 37
sal/inc/rtl/instance.hxx | 37
sal/inc/rtl/locale.h | 37
sal/inc/rtl/locale.hxx | 37
sal/inc/rtl/logfile.h | 37
sal/inc/rtl/logfile.hxx | 37
sal/inc/rtl/math.h | 37
sal/inc/rtl/math.hxx | 37
sal/inc/rtl/memory.h | 43
sal/inc/rtl/process.h | 37
sal/inc/rtl/random.h | 37
sal/inc/rtl/ref.hxx | 37
sal/inc/rtl/strbuf.h | 37
sal/inc/rtl/strbuf.hxx | 37
sal/inc/rtl/string.h | 37
sal/inc/rtl/string.hxx | 37
sal/inc/rtl/tencinfo.h | 37
sal/inc/rtl/textcvt.h | 37
sal/inc/rtl/unload.h | 37
sal/inc/rtl/uri.h | 37
sal/inc/rtl/uri.hxx | 37
sal/inc/rtl/ustrbuf.h | 37
sal/inc/rtl/ustrbuf.hxx | 37
sal/inc/rtl/ustring.h | 37
sal/inc/rtl/ustring.hxx | 37
sal/inc/rtl/uuid.h | 37
sal/inc/sal/config.h | 37
sal/inc/sal/macros.h | 37
sal/inc/sal/main.h | 37
sal/inc/sal/mathconf.h | 37
sal/inc/sal/saldllapi.h | 18
sal/inc/sal/types.h | 37
sal/inc/systools/win32/qswin32.h | 43
sal/inc/systools/win32/snprintf.h | 18
sal/inc/systools/win32/uwinapi.h | 43
sal/osl/all/debugbase.cxx | 37
sal/osl/all/loadmodulerelative.cxx | 37
sal/osl/all/utility.cxx | 37
sal/osl/unx/backtrace.c | 37
sal/osl/unx/backtrace.h | 37
sal/osl/unx/conditn.cxx | 37
sal/osl/unx/diagnose.cxx | 37
sal/osl/unx/file.cxx | 37
sal/osl/unx/file_impl.hxx | 43
sal/osl/unx/file_misc.cxx | 37
sal/osl/unx/file_path_helper.cxx | 37
sal/osl/unx/file_stat.cxx | 37
sal/osl/unx/file_url.cxx | 246 +-
sal/osl/unx/file_volume.cxx | 37
sal/osl/unx/interlck.c | 38
sal/osl/unx/module.cxx | 37
sal/osl/unx/mutex.c | 37
sal/osl/unx/nlsupport.c | 37
sal/osl/unx/pipe.c | 37
sal/osl/unx/process.cxx | 37
sal/osl/unx/process_impl.cxx | 37
sal/osl/unx/profile.c | 37
sal/osl/unx/salinit.cxx | 37
sal/osl/unx/security.c | 37
sal/osl/unx/semaphor.c | 37
sal/osl/unx/signal.c | 37
sal/osl/unx/socket.c | 39
sal/osl/unx/system.c | 37
sal/osl/unx/system.h | 37
sal/osl/unx/tempfile.c | 37
sal/osl/unx/thread.c | 37
sal/osl/unx/time.c | 37
sal/osl/unx/util.c | 37
sal/osl/unx/uunxapi.cxx | 37
sal/osl/unx/uunxapi.h | 37
sal/osl/unx/uunxapi.hxx | 37
sal/osl/w32/diagnose.c | 37
sal/osl/w32/dllentry.c | 37
sal/osl/w32/file.cxx | 37
sal/osl/w32/file_dirvol.cxx | 37
sal/osl/w32/file_error.c | 37
sal/osl/w32/file_url.cxx | 42
sal/osl/w32/module.cxx | 45
sal/osl/w32/mutex.c | 37
sal/osl/w32/path_helper.cxx | 37
sal/osl/w32/pipe.c | 37
sal/osl/w32/process.cxx | 55
sal/osl/w32/procimpl.cxx | 37
sal/osl/w32/profile.cxx | 43
sal/osl/w32/salinit.cxx | 37
sal/osl/w32/security.c | 37
sal/osl/w32/signal.cxx | 43
sal/osl/w32/socket.cxx | 37
sal/osl/w32/sockimpl.h | 37
sal/osl/w32/system.h | 37
sal/osl/w32/util.c | 43
sal/qa/ByteSequence/ByteSequence.cxx | 43
sal/qa/OStringBuffer/makefile.mk | 72
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 37
sal/qa/OStringBuffer/rtl_String_Const.h | 37
sal/qa/OStringBuffer/rtl_String_Utils.cxx | 38
sal/qa/OStringBuffer/rtl_String_Utils.hxx | 37
sal/qa/buildall.pl | 33
sal/qa/helper/gcov/build_coverage | 17
sal/qa/helper/gcov/deprecated.txt | 18
sal/qa/helper/gcov/gcov_all | 20
sal/qa/helper/gcov/gcov_run.sh | 17
sal/qa/helper/gcov/statistics | 20
sal/qa/inc/valueequal.hxx | 18
sal/qa/libs2test.txt | 18
sal/qa/makefile.mk | 53
sal/qa/osl/condition/osl_Condition.cxx | 37
sal/qa/osl/condition/osl_Condition_Const.h | 43
sal/qa/osl/file/osl_File.cxx | 41
sal/qa/osl/file/osl_File_Const.h | 37
sal/qa/osl/file/osl_old_test_file.cxx | 37
sal/qa/osl/file/test_cpy_wrt_file.cxx | 37
sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx | 282 --
sal/qa/osl/module/osl_Module.cxx | 37
sal/qa/osl/module/osl_Module_Const.h | 43
sal/qa/osl/module/osl_Module_DLL.cxx | 46
sal/qa/osl/mutex/osl_Mutex.cxx | 37
sal/qa/osl/pipe/osl_Pipe.cxx | 37
sal/qa/osl/process/batch.bat | 17
sal/qa/osl/process/osl_Thread.cxx | 37
sal/qa/osl/process/osl_Thread.xsce | 17
sal/qa/osl/process/osl_process.cxx | 37
sal/qa/osl/process/osl_process_child.cxx | 37
sal/qa/osl/profile/osl_old_testprofile.cxx | 37
sal/qa/osl/security/osl_Security.cxx | 37
sal/qa/osl/security/osl_Security_Const.h | 43
sal/qa/osl/setthreadname/test-setthreadname.cxx | 43
sal/qa/osl/socket/makefile.mk | 224 --
sal/qa/osl/socket/osl_AcceptorSocket.cxx | 37
sal/qa/osl/socket/osl_ConnectorSocket.cxx | 37
sal/qa/osl/socket/osl_ConnectorSocket.xsce | 17
sal/qa/osl/socket/osl_DatagramSocket.cxx | 37
sal/qa/osl/socket/osl_Socket.cxx | 37
sal/qa/osl/socket/osl_Socket.xsce | 17
sal/qa/osl/socket/osl_Socket2.cxx | 37
sal/qa/osl/socket/osl_Socket2.xsce | 17
sal/qa/osl/socket/osl_SocketAddr.cxx | 37
sal/qa/osl/socket/osl_SocketOld.xsce | 17
sal/qa/osl/socket/osl_Socket_tests.cxx | 37
sal/qa/osl/socket/osl_Socket_tests.xsce | 17
sal/qa/osl/socket/osl_StreamSocket.cxx | 37
sal/qa/osl/socket/osl_StreamSocket.xsce | 17
sal/qa/osl/socket/sockethelper.cxx | 37
sal/qa/osl/thread/makefile.mk | 49
sal/qa/osl/thread/test_thread.cxx | 37
sal/qa/rtl/alloc/rtl_alloc.cxx | 37
sal/qa/rtl/bootstrap/bootstrap_process.cxx | 37
sal/qa/rtl/bootstrap/makefile.mk | 76
sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx | 37
sal/qa/rtl/bootstrap/rtl_Bootstrap.xsce | 17
sal/qa/rtl/cipher/rtl_cipher.cxx | 37
sal/qa/rtl/crc32/rtl_crc32.cxx | 37
sal/qa/rtl/digest/makefile.mk | 62
sal/qa/rtl/digest/rtl_digest.cxx | 37
sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 37
sal/qa/rtl/locale/rtl_locale.cxx | 37
sal/qa/rtl/logfile/makefile.mk | 64
sal/qa/rtl/logfile/rtl_logfile.cxx | 37
sal/qa/rtl/math/rtl_math.cxx | 629 -----
sal/qa/rtl/math/test-rtl-math.cxx | 43
sal/qa/rtl/math/test_rtl_math.cxx | 660 -----
sal/qa/rtl/ostring/makefile.mk | 93
sal/qa/rtl/ostring/rtl_OString2.cxx | 37
sal/qa/rtl/ostring/rtl_str.cxx | 37
sal/qa/rtl/ostring/rtl_str.xsce | 17
sal/qa/rtl/ostring/rtl_string.cxx | 37
sal/qa/rtl/ostring/rtl_string.xsce | 17
sal/qa/rtl/oustring/joblist.txt | 17
sal/qa/rtl/oustring/makefile.mk | 82
sal/qa/rtl/oustring/rtl_OUString2.cxx | 37
sal/qa/rtl/oustring/rtl_ustr.cxx | 37
sal/qa/rtl/oustring/rtl_ustr.xsce | 17
sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx | 43
sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx | 43
sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx | 37
sal/qa/rtl/process/makefile.mk | 77
sal/qa/rtl/process/rtl_Process.cxx | 37
sal/qa/rtl/process/rtl_Process_Const.h | 17
sal/qa/rtl/random/makefile.mk | 59
sal/qa/rtl/random/random.txt | 17
sal/qa/rtl/random/rtl_random.cxx | 37
sal/qa/rtl/strings/makefile.mk | 59
sal/qa/rtl/strings/test_oustring_compare.cxx | 37
sal/qa/rtl/strings/test_oustring_convert.cxx | 37
sal/qa/rtl/strings/test_oustring_endswith.cxx | 37
sal/qa/rtl/strings/test_oustring_noadditional.cxx | 43
sal/qa/rtl/textenc/makefile.mk | 76
sal/qa/rtl/textenc/rtl_textcvt.cxx | 37
sal/qa/rtl/uri/makefile.mk | 76
sal/qa/rtl/uri/rtl_Uri.cxx | 37
sal/qa/rtl/uri/rtl_testuri.cxx | 37
sal/qa/rtl/uuid/rtl_Uuid.cxx | 37
sal/qa/rtl_strings/makefile.mk | 151 -
sal/qa/rtl_strings/rtl_OString.cxx | 37
sal/qa/rtl_strings/rtl_OUString.cxx | 37
sal/qa/rtl_strings/rtl_OUStringBuffer.cxx | 37
sal/qa/rtl_strings/rtl_String_Const.h | 37
sal/qa/rtl_strings/rtl_String_Utils.cxx | 37
sal/qa/rtl_strings/rtl_String_Utils.hxx | 37
sal/qa/rtl_strings/rtl_old_testostring.cxx | 37
sal/qa/rtl_strings/rtl_old_testowstring.cxx | 37
sal/qa/rtl_strings/rtl_old_teststrbuf.cxx | 37
sal/qa/sal/test_types.cxx | 37
sal/qa/systools/makefile.mk | 70
sal/qa/systools/test_comtools.cxx | 37
sal/rtl/source/alloc_arena.cxx | 37
sal/rtl/source/alloc_arena.hxx | 37
sal/rtl/source/alloc_cache.cxx | 37
sal/rtl/source/alloc_cache.hxx | 37
sal/rtl/source/alloc_fini.cxx | 37
sal/rtl/source/alloc_global.cxx | 37
sal/rtl/source/alloc_impl.hxx | 37
sal/rtl/source/bootstrap.cxx | 708 ++++--
sal/rtl/source/byteseq.cxx | 37
sal/rtl/source/cipher.cxx | 37
sal/rtl/source/cmdargs.cxx | 37
sal/rtl/source/crc.cxx | 37
sal/rtl/source/digest.cxx | 37
sal/rtl/source/hash.cxx | 37
sal/rtl/source/hash.hxx | 18
sal/rtl/source/locale.cxx | 37
sal/rtl/source/logfile.cxx | 37
sal/rtl/source/math.cxx | 37
sal/rtl/source/memory.cxx | 43
sal/rtl/source/random.cxx | 37
sal/rtl/source/rtl_process.cxx | 43
sal/rtl/source/strbuf.cxx | 37
sal/rtl/source/strimp.cxx | 43
sal/rtl/source/strimp.hxx | 37
sal/rtl/source/string.cxx | 37
sal/rtl/source/strtmpl.cxx | 37
sal/rtl/source/surrogates.hxx | 43
sal/rtl/source/unload.cxx | 37
sal/rtl/source/uri.cxx | 37
sal/rtl/source/ustrbuf.cxx | 37
sal/rtl/source/ustring.cxx | 37
sal/rtl/source/uuid.cxx | 37
sal/test/bootstrap | 17
sal/test/bootstrap.bat | 17
sal/test/unloading/makefile.mk | 118 -
sal/test/unloading/samplelib1.cxx | 37
sal/test/unloading/samplelib1.xml | 17
sal/test/unloading/samplelib2.cxx | 37
sal/test/unloading/unloadTest.cxx | 37
sal/textenc/context.cxx | 43
sal/textenc/context.hxx | 43
sal/textenc/convertadobe.tab | 37
sal/textenc/convertbig5hkscs.cxx | 37
sal/textenc/convertbig5hkscs.hxx | 37
sal/textenc/convertbig5hkscs.tab | 43
sal/textenc/converter.cxx | 37
sal/textenc/converter.hxx | 38
sal/textenc/converteuctw.cxx | 37
sal/textenc/converteuctw.hxx | 37
sal/textenc/converteuctw.tab | 43
sal/textenc/convertgb18030.cxx | 37
sal/textenc/convertgb18030.hxx | 37
sal/textenc/convertgb18030.tab | 43
sal/textenc/convertiscii.tab | 115 -
sal/textenc/convertiso2022cn.cxx | 37
sal/textenc/convertiso2022cn.hxx | 39
sal/textenc/convertiso2022cn.tab | 43
sal/textenc/convertiso2022jp.cxx | 37
sal/textenc/convertiso2022jp.hxx | 39
sal/textenc/convertiso2022jp.tab | 43
sal/textenc/convertiso2022kr.cxx | 37
sal/textenc/convertiso2022kr.hxx | 39
sal/textenc/convertiso2022kr.tab | 43
sal/textenc/convertsinglebytetobmpunicode.cxx | 37
sal/textenc/convertsinglebytetobmpunicode.hxx | 37
sal/textenc/generate/big5hkscs2001.tab | 37
sal/textenc/generate/cns116431992.tab | 37
sal/textenc/gettextencodingdata.hxx | 43
sal/textenc/tables.cxx | 42
sal/textenc/tcvtarb1.tab | 37
sal/textenc/tcvtbyte.cxx | 37
sal/textenc/tcvteas1.tab | 37
sal/textenc/tcvtest1.tab | 37
sal/textenc/tcvtjp1.tab | 37
sal/textenc/tcvtjp2.tab | 37
sal/textenc/tcvtjp3.tab | 37
sal/textenc/tcvtjp4.tab | 37
sal/textenc/tcvtjp5.tab | 37
sal/textenc/tcvtjp6.tab | 37
sal/textenc/tcvtkr1.tab | 37
sal/textenc/tcvtkr2.tab | 37
sal/textenc/tcvtkr4.tab | 37
sal/textenc/tcvtkr5.tab | 37
sal/textenc/tcvtkr6.tab | 37
sal/textenc/tcvtlat1.tab | 37
sal/textenc/tcvtmb.cxx | 37
sal/textenc/tcvtscn1.tab | 37
sal/textenc/tcvtscn2.tab | 37
sal/textenc/tcvtscn3.tab | 37
sal/textenc/tcvtscn4.tab | 37
sal/textenc/tcvtscn5.tab | 37
sal/textenc/tcvtscn6.tab | 37
sal/textenc/tcvtsym1.tab | 43
sal/textenc/tcvttcn1.tab | 37
sal/textenc/tcvttcn2.tab | 37
sal/textenc/tcvttcn6.tab | 37
sal/textenc/tcvtuni1.tab | 43
sal/textenc/tcvtutf7.cxx | 37
sal/textenc/tcvtutf8.cxx | 37
sal/textenc/tenchelp.hxx | 37
sal/textenc/tencinfo.cxx | 37
sal/textenc/textcvt.cxx | 37
sal/textenc/textenc.cxx | 37
sal/textenc/unichars.cxx | 39
sal/textenc/unichars.hxx | 39
sal/typesconfig/typesconfig.c | 37
sal/util/sal.map | 18
sal/workben/clipboardwben/testcopy/cbcpytest.cxx | 37
sal/workben/clipboardwben/testcopy/cbcpytest.rc | 18
sal/workben/clipboardwben/testpaste/cbptest.cxx | 37
sal/workben/clipboardwben/testpaste/cbptest.rc | 18
sal/workben/clipboardwben/testviewer/cbvtest.cxx | 37
sal/workben/clipboardwben/testviewer/cbvtest.rc | 18
sal/workben/getlocaleinfotest.cxx | 43
sal/workben/makefile.mk | 33
sal/workben/t_cipher.c | 37
sal/workben/t_digest.c | 37
sal/workben/t_osl_getVolInfo.cxx | 37
sal/workben/t_osl_joinProcess.cxx | 37
sal/workben/t_random.c | 37
sal/workben/t_readline.c | 16
sal/workben/testfile.cxx | 37
sal/workben/testpip2.cxx | 37
sal/workben/testpipe.cxx | 37
sal/workben/testproc.cxx | 43
scp2/InstallModule_ooo.mk | 2
scp2/source/ooo/file_library_ooo.scp | 15
scp2/source/ooo/mingw_dlls.scp | 6
scp2/source/ooo/module_hidden_ooo.scp | 1
solenv/gbuild/CppunitTest.mk | 1
solenv/inc/libs.mk | 8
tail_build/prj/build.lst | 2
xmlhelp/Library_ucpchelp1.mk | 1
xmlhelp/Makefile | 7
xmlhelp/prj/build.lst | 2
xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx | 43
xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx | 37
xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx | 43
xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx | 37
xmlhelp/source/cxxhelp/provider/content.cxx | 37
xmlhelp/source/cxxhelp/provider/databases.cxx | 233 --
xmlhelp/source/cxxhelp/provider/databases.hxx | 53
xmlhelp/source/cxxhelp/provider/db.cxx | 226 --
xmlhelp/source/cxxhelp/provider/db.hxx | 194 -
xmlhelp/source/cxxhelp/provider/inputstream.cxx | 37
xmlhelp/source/cxxhelp/provider/provider.cxx | 37
xmlhelp/source/cxxhelp/provider/resultset.cxx | 37
xmlhelp/source/cxxhelp/provider/resultset.hxx | 43
xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 37
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 37
xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx | 37
xmlhelp/source/cxxhelp/provider/services.cxx | 43
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 100
xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 43
xmlhelp/source/cxxhelp/test/makefile.mk | 33
xmlhelp/source/cxxhelp/test/searchdemo.cxx | 37
xmlhelp/source/treeview/tvfactory.cxx | 37
xmlhelp/source/treeview/tvhlp1.component | 43
xmlhelp/source/treeview/tvread.cxx | 37
xmlhelp/source/treeview/tvread.hxx | 37
xmlhelp/util/embed.xsl | 17
xmlhelp/util/idxcaption.xsl | 19
xmlhelp/util/idxcontent.xsl | 19
xmlhelp/util/main_transform.xsl | 42
xmlhelp/util/ucpchelp.xml | 18
xmlhelp/util/ucpchelp1.component | 43
441 files changed, 6376 insertions(+), 14288 deletions(-)
New commits:
commit eae732641ff2a60bb5bc50e60f8404aae7a7decb
Author: Michael Meeks <michael.meeks at suse.com>
Date: Wed Nov 21 14:51:27 2012 +0000
fix day of week naming in sal unit test.
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index d06671f..1b4fa25 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -220,8 +220,8 @@ inline void printTime( TimeValue *tv )
case 0: printf("Sun. "); break;
case 1: printf("Mon. "); break;
case 2: printf("Tue. "); break;
- case 3: printf("Thr. "); break;
- case 4: printf("Wen. "); break;
+ case 3: printf("Wed. "); break;
+ case 4: printf("Thu. "); break;
case 5: printf("Fri. "); break;
case 6: printf("Sat. "); break;
}
commit d04ac66578b41345305d620d3eaf6ca7ee83c6c3
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon Nov 19 20:58:18 2012 +0000
dung out berkeleydb gnumake / configure bits ...
diff --git a/Library_merged.mk b/Library_merged.mk
index b943f38..61de3a2 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -76,12 +76,6 @@ $(eval $(call gb_Library_use_externals,merged,\
))
endif
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-$(eval $(call gb_Library_use_externals,merged,\
- berkeleydb \
-))
-endif
-
ifneq ($(OS),IOS)
$(eval $(call gb_Library_use_libraries,merged,\
jvmaccess \
diff --git a/Makefile.top b/Makefile.top
index 59bef7e..d41fdd9 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -216,7 +216,6 @@ xsltml\
zlib\
dmake_modules:=\
-berkeleydb\
cppunit\
crashrep\
external\
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a6d9251..349f83a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1415,51 +1415,6 @@ define gb_LinkTarget__use_pixbuf
$(error gb_LinkTarget__use_pixbuf should not be used any more)
endef
-ifeq ($(SYSTEM_DB),YES)
-
-define gb_LinkTarget__use_berkeleydb
-$(call gb_LinkTarget_set_include,$(1),\
- $$(INCLUDE) \
- $(filter -I%,$(SYSTEM_DB_CFLAGS)) \
-)
-
-$(call gb_LinkTarget_add_defs,$(1),\
- $(filter -D%,$(SYSTEM_DB_CFLAGS)) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),\
- -l$(DB_LIB) \
-)
-
-endef
-
-else # !SYSTEM_DB
-
-ifneq ($(OS),WNT)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
- db-4.7 \
-))
-else
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
- db47 \
-))
-endif
-
-define gb_LinkTarget__use_berkeleydb
-ifneq ($(OS),WNT)
-$(call gb_LinkTarget_use_libraries,$(1),\
- db-4.7 \
-)
-else
-$(call gb_LinkTarget_use_libraries,$(1),\
- db47 \
-)
-endif
-
-endef
-
-endif # SYSTEM_DB
-
ifeq ($(SYSTEM_LIBPNG),YES)
define gb_LinkTarget__use_png
diff --git a/berkeleydb/README b/berkeleydb/README
deleted file mode 100644
index 470f2ab..0000000
--- a/berkeleydb/README
+++ /dev/null
@@ -1,5 +0,0 @@
-The Berkeley database.
-
-This code is used primarily for legacy UNO component registration in
-the users' directory, for some small bits in xmlhelp, and for the help
-compiler.
\ No newline at end of file
diff --git a/berkeleydb/db-4.7.25-mingw.patch b/berkeleydb/db-4.7.25-mingw.patch
deleted file mode 100644
index 38d83d1..0000000
--- a/berkeleydb/db-4.7.25-mingw.patch
+++ /dev/null
@@ -1,348 +0,0 @@
---- misc/db-4.7.25.NC/dist/Makefile.in 2008-05-06 12:03:36.000000000 +0900
-+++ misc/build/db-4.7.25.NC/dist/Makefile.in 2009-07-11 13:38:07.419875000 +0900
-@@ -44,7 +44,7 @@
- SOLINK= @MAKEFILE_SOLINK@ @CFLAGS@
- SOFLAGS= @SOFLAGS@
- LIBMAJOR= @DB_VERSION_MAJOR@
--LIBVERSION= @DB_VERSION_MAJOR at .@DB_VERSION_MINOR@
-+LIBVERSION= @DB_VERSION_MAJOR@@DB_VERSION_MINOR@
-
- CPPFLAGS= -I$(builddir) -I$(srcdir) @CPPFLAGS@
-
-@@ -62,18 +62,18 @@
-
- libdb_base= libdb
- libdb= $(libdb_base).a
--libdb_version= $(libdb_base)-$(LIBVERSION).a
--libso= $(libdb_base)-$(LIBVERSION)@SOSUFFIX@
--libso_target= $(libdb_base)-$(LIBVERSION).la
-+libdb_version= $(libdb_base)$(LIBVERSION).a
-+libso= $(libdb_base)$(LIBVERSION)@SOSUFFIX@
-+libso_target= $(libdb_base)$(LIBVERSION).la
- libso_default= $(libdb_base)@SOSUFFIX@
--libso_major= $(libdb_base)-$(LIBMAJOR)@SOSUFFIX@
-+libso_major= $(libdb_base)$(LIBMAJOR)@SOSUFFIX@
-
- ##################################################
- # C++ API.
- #
- # C++ support is optional, and can be built with static or shared libraries.
- ##################################################
--CXXFLAGS= -c $(CPPFLAGS) @CXXFLAGS@
-+CXXFLAGS= -c $(SOLARINC) $(CPPFLAGS) -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) @CXXFLAGS@
- CXX= @MAKEFILE_CXX@
- CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@
- XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@
-@@ -81,11 +81,11 @@
-
- libcxx_base= libdb_cxx
- libcxx= $(libcxx_base).a
--libcxx_version= $(libcxx_base)-$(LIBVERSION).a
--libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
--libxso_target= $(libcxx_base)-$(LIBVERSION).la
-+libcxx_version= $(libcxx_base)$(LIBVERSION).a
-+libxso= $(libcxx_base)$(LIBVERSION)@SOSUFFIX@
-+libxso_target= $(libcxx_base)$(LIBVERSION).la
- libxso_default= $(libcxx_base)@SOSUFFIX@
--libxso_major= $(libcxx_base)-$(LIBMAJOR)@SOSUFFIX@
-+libxso_major= $(libcxx_base)$(LIBMAJOR)@SOSUFFIX@
-
- ##################################################
- # Java API.
-@@ -108,12 +108,12 @@
- libj_jarfile= db.jar
- libj_exjarfile= dbexamples.jar
- libjso_base= libdb_java
--libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@
--libjso_static= $(libjso_base)-$(LIBVERSION).a
--libjso_target= $(libjso_base)-$(LIBVERSION).la
-+libjso= $(libjso_base)$(LIBVERSION)@JMODSUFFIX@
-+libjso_static= $(libjso_base)$(LIBVERSION).a
-+libjso_target= $(libjso_base)$(LIBVERSION).la
- libjso_default= $(libjso_base)@JMODSUFFIX@
--libjso_major= $(libjso_base)-$(LIBMAJOR)@JMODSUFFIX@
--libjso_g= $(libjso_base)-$(LIBVERSION)_g at JMODSUFFIX@
-+libjso_major= $(libjso_base)$(LIBMAJOR)@JMODSUFFIX@
-+libjso_g= $(libjso_base)$(LIBVERSION)_g at JMODSUFFIX@
-
- ##################################################
- # TCL API.
-@@ -123,11 +123,11 @@
- TCL_INCLUDE_SPEC= @TCL_INCLUDE_SPEC@
- LIBTSO_LIBS= @LIBTSO_LIBS@ @LIBSO_LIBS@
- libtso_base= libdb_tcl
--libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@
--libtso_static= $(libtso_base)-$(LIBVERSION).a
--libtso_target= $(libtso_base)-$(LIBVERSION).la
-+libtso= $(libtso_base)$(LIBVERSION)@MODSUFFIX@
-+libtso_static= $(libtso_base)$(LIBVERSION).a
-+libtso_target= $(libtso_base)$(LIBVERSION).la
- libtso_default= $(libtso_base)@MODSUFFIX@
--libtso_major= $(libtso_base)-$(LIBMAJOR)@MODSUFFIX@
-+libtso_major= $(libtso_base)$(LIBMAJOR)@MODSUFFIX@
-
- ##################################################
- # db_dump185 UTILITY
-@@ -756,7 +756,7 @@
-
- # Shared Java library.
- $(libjso_target): $(JAVA_OBJS) $(C_OBJS)
-- $(SOLINK) -shrext @JMODSUFFIX@ $(SOFLAGS) $(LDFLAGS) \
-+ $(SOLINK) -shrext @JMODSUFFIX@ -add-underscore $(SOFLAGS) $(LDFLAGS) \
- -o $@ $(JAVA_OBJS) $(C_OBJS) $(LIBJSO_LIBS)
-
- # Shared Tcl library.
---- misc/db-4.7.25.NC/dist/configure 2008-05-16 06:12:41.000000000 +0900
-+++ misc/build/db-4.7.25.NC/dist/configure 2009-07-11 16:00:39.255625000 +0900
-@@ -9488,7 +9488,7 @@
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+ archive_cmds='$DLLTOOL $add_underscore --export-all-symbols --dllname $soname --output-lib $lib --output-exp $output_objdir/$soname.exp $libobjs; $CC -shared $output_objdir/$soname.exp $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--image-base=0x10000000'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9497,7 +9497,7 @@
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
-- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+ $DLLTOOL $add_underscore --dllname $soname --output-lib $lib --output-exp $output_objdir/$soname.exp --input-def $output_objdir/$soname.def; $CC -shared $output_objdir/$soname.exp $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--image-base=0x10000000'
- else
- ld_shlibs=no
- fi
-@@ -13680,15 +13680,15 @@
-
- if test "$pre_test_object_deps_done" = no; then
- if test -z "$predep_objects_CXX"; then
-- predep_objects_CXX="$p"
-+ predep_objects_CXX=`cygpath -m "$p"`
- else
-- predep_objects_CXX="$predep_objects_CXX $p"
-+ predep_objects_CXX="$predep_objects_CXX "`cygpath -m "$p"`
- fi
- else
- if test -z "$postdep_objects_CXX"; then
-- postdep_objects_CXX="$p"
-+ postdep_objects_CXX=`cygpath -m "$p"`
- else
-- postdep_objects_CXX="$postdep_objects_CXX $p"
-+ postdep_objects_CXX="$postdep_objects_CXX "`cygpath -m "$p"`
- fi
- fi
- ;;
-@@ -22371,6 +22371,154 @@
-
-
-
-+case "$host_os" in
-+mingw*)
-+for ac_header in execinfo.h sys/time.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+else
-+ # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ ( cat <<\_ASBOX
-+## ---------------------------------------------------------- ##
-+## Report this to Oracle Technology Network Berkeley DB forum ##
-+## ---------------------------------------------------------- ##
-+_ASBOX
-+ ) | sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+;;
-+*)
- for ac_header in execinfo.h sys/select.h sys/socket.h sys/time.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-@@ -22515,6 +22663,8 @@
-
- done
-
-+;;
-+esac
- { echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
- echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; }
- if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
-@@ -27697,6 +27847,18 @@
-
-
-
-+ac_cv_sizeof_char_p=`echo $ac_cv_sizeof_char_p | tr -d '\015'`
-+ac_cv_sizeof_unsigned_int=`echo $ac_cv_sizeof_unsigned_int | tr -d '\015'`
-+ac_cv_sizeof_unsigned_char=`echo $ac_cv_sizeof_unsigned_char | tr -d '\015'`
-+ac_cv_sizeof_unsigned_short=`echo $ac_cv_sizeof_unsigned_short | tr -d '\015'`
-+ac_cv_sizeof_unsigned_long=`echo $ac_cv_sizeof_unsigned_long | tr -d '\015'`
-+ac_cv_sizeof_unsigned_long_long=`echo $ac_cv_sizeof_unsigned_long_long | tr -d '\015'`
-+ac_cv_sizeof_int=`echo $ac_cv_sizeof_int | tr -d '\015'`
-+ac_cv_sizeof_char=`echo $ac_cv_sizeof_char | tr -d '\015'`
-+ac_cv_sizeof_short=`echo $ac_cv_sizeof_short | tr -d '\015'`
-+ac_cv_sizeof_long=`echo $ac_cv_sizeof_long | tr -d '\015'`
-+ac_cv_sizeof_long_long=`echo $ac_cv_sizeof_long_long | tr -d '\015'`
-+
- # We look for u_char, u_short, u_int, u_long -- if we can't find them,
- # we create our own.
-
---- misc/db-4.7.25.NC/dist/ltmain.sh 2006-06-27 10:03:33.000000000 +0900
-+++ misc/build/db-4.7.25.NC/dist/ltmain.sh 2009-07-11 13:38:07.388625000 +0900
-@@ -1103,6 +1103,7 @@
- lib_search_path=`pwd`
- inst_prefix_dir=
-
-+ add_underscore=
- avoid_version=no
- dlfiles=
- dlprefiles=
-@@ -1435,6 +1436,11 @@
- prevarg="$arg"
-
- case $arg in
-+ -add-underscore)
-+ add_underscore="--add-underscore"
-+ continue
-+ ;;
-+
- -all-static)
- if test -n "$link_static_flag"; then
- compile_command="$compile_command $link_static_flag"
-@@ -4869,7 +4875,7 @@
- esac
- # test for cygwin because mv fails w/o .exe extensions
- case $host in
-- *cygwin*)
-+ *cygwin* | *mingw*)
- exeext=.exe
- outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
- *) exeext= ;;
diff --git a/berkeleydb/db-4.7.25.NC-mingw32hack.patch b/berkeleydb/db-4.7.25.NC-mingw32hack.patch
deleted file mode 100644
index 62137ef..0000000
--- a/berkeleydb/db-4.7.25.NC-mingw32hack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/db-4.7.25.NC/dist/configure 2012-03-30 00:25:17.456408946 +0200
-+++ misc/build/db-4.7.25.NC/dist/configure 2012-03-30 00:24:44.344633205 +0200
-@@ -34776,7 +34776,7 @@
- no | unknown) ;;
- *)
- cat >>confdefs.h <<_ACEOF
--#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-+#define _FILE_OFFSET_BITS 32
- _ACEOF
- ;;
- esac
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch
deleted file mode 100644
index 5c099c2..0000000
--- a/berkeleydb/db-4.7.25.patch
+++ /dev/null
@@ -1,1104 +0,0 @@
---- misc/db-4.7.25.NC/btree/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/btree/makefile.mk 2009-07-21 11:39:25.000000000 +0200
-@@ -1 +1,35 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=btree
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/bt_compact.obj \
-+ $(SLO)$/bt_compare.obj \
-+ $(SLO)$/bt_conv.obj \
-+ $(SLO)$/bt_curadj.obj \
-+ $(SLO)$/bt_cursor.obj \
-+ $(SLO)$/bt_delete.obj \
-+ $(SLO)$/bt_method.obj \
-+ $(SLO)$/bt_open.obj \
-+ $(SLO)$/bt_put.obj \
-+ $(SLO)$/bt_rec.obj \
-+ $(SLO)$/bt_reclaim.obj \
-+ $(SLO)$/bt_recno.obj \
-+ $(SLO)$/bt_rsearch.obj \
-+ $(SLO)$/bt_search.obj \
-+ $(SLO)$/bt_split.obj \
-+ $(SLO)$/bt_stat.obj \
-+ $(SLO)$/bt_upgrade.obj \
-+ $(SLO)$/bt_verify.obj \
-+ $(SLO)$/btree_auto.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/clib/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/clib/makefile.mk 2009-07-21 11:39:25.000000000 +0200
-@@ -1 +1,16 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=clib
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/dbinc ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= $(SLO)$/strsep.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/common/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/common/makefile.mk 2009-07-21 11:39:25.000000000 +0200
-@@ -1 +1,31 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=common
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/crypto_stub.obj \
-+ $(SLO)$/db_byteorder.obj \
-+ $(SLO)$/db_err.obj \
-+ $(SLO)$/db_getlong.obj \
-+ $(SLO)$/db_idspace.obj \
-+ $(SLO)$/db_log2.obj \
-+ $(SLO)$/db_shash.obj \
-+ $(SLO)$/dbt.obj \
-+ $(SLO)$/mkpath.obj \
-+ $(SLO)$/openflags.obj \
-+ $(SLO)$/os_method.obj \
-+ $(SLO)$/util_cache.obj \
-+ $(SLO)$/util_log.obj \
-+ $(SLO)$/util_sig.obj \
-+ $(SLO)$/zerofill.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/cxx/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/cxx/makefile.mk 2009-07-21 11:39:25.000000000 +0200
-@@ -1 +1,27 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=cxx
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/cxx_db.obj \
-+ $(SLO)$/cxx_dbc.obj \
-+ $(SLO)$/cxx_dbt.obj \
-+ $(SLO)$/cxx_env.obj \
-+ $(SLO)$/cxx_except.obj \
-+ $(SLO)$/cxx_lock.obj \
-+ $(SLO)$/cxx_logc.obj \
-+ $(SLO)$/cxx_mpool.obj \
-+ $(SLO)$/cxx_multi.obj \
-+ $(SLO)$/cxx_seq.obj \
-+ $(SLO)$/cxx_txn.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/db/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/db/makefile.mk 2009-07-21 11:39:25.000000000 +0200
-@@ -1 +1,47 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=db_src
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/crdel_auto.obj \
-+ $(SLO)$/crdel_rec.obj \
-+ $(SLO)$/db.obj \
-+ $(SLO)$/db_am.obj \
-+ $(SLO)$/db_auto.obj \
-+ $(SLO)$/db_cam.obj \
-+ $(SLO)$/db_cds.obj \
-+ $(SLO)$/db_conv.obj \
-+ $(SLO)$/db_dispatch.obj \
-+ $(SLO)$/db_dup.obj \
-+ $(SLO)$/db_iface.obj \
-+ $(SLO)$/db_join.obj \
-+ $(SLO)$/db_meta.obj \
-+ $(SLO)$/db_method.obj \
-+ $(SLO)$/db_open.obj \
-+ $(SLO)$/db_overflow.obj \
-+ $(SLO)$/db_ovfl_vrfy.obj \
-+ $(SLO)$/db_pr.obj \
-+ $(SLO)$/db_rec.obj \
-+ $(SLO)$/db_reclaim.obj \
-+ $(SLO)$/db_remove.obj \
-+ $(SLO)$/db_rename.obj \
-+ $(SLO)$/db_ret.obj \
-+ $(SLO)$/db_setid.obj \
-+ $(SLO)$/db_setlsn.obj \
-+ $(SLO)$/db_stati.obj \
-+ $(SLO)$/db_truncate.obj \
-+ $(SLO)$/db_upg.obj \
-+ $(SLO)$/db_upg_opd.obj \
-+ $(SLO)$/db_vrfy.obj \
-+ $(SLO)$/db_vrfyutil.obj
-+
-+.INCLUDE: target.mk
-+
---- misc/db-4.7.25.NC/db_4_7_gcc4.map 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/db_4_7_gcc4.map 2009-07-21 11:39:25.000000000 +0200
-@@ -1 +1,147 @@
--dummy
-+DB_4_7 {
-+ global:
-+__bam_adj_read;
-+__bam_cadjust_read;
-+__bam_cdel_read;
-+__bam_curadj_read;
-+__bam_merge_44_read;
-+__bam_merge_read;
-+__bam_pgno_read;
-+__bam_relink_read;
-+__bam_relink_43_read;
-+__bam_repl_read;
-+__bam_root_read;
-+__bam_rcuradj_read;
-+__bam_rsplit_read;
-+__bam_split_read;
-+__config_split;
-+__crdel_inmem_create_read;
-+__crdel_inmem_rename_read;
-+__crdel_inmem_remove_read;
-+__crdel_metasub_read;
-+__db_add_recovery_int;
-+__db_addrem_read;
-+__db_big_read;
-+__db_cksum_read;
-+__db_dbm_close;
-+__db_dbm_delete;
-+__db_dbm_fetch;
-+__db_dbm_firstkey;
-+__db_dbm_init;
-+__db_dbm_nextkey;
-+__db_dbm_store;
-+__db_debug_read;
-+__db_dispatch;
-+__db_dumptree;
-+__db_hcreate;
-+__db_hdestroy;
-+__db_hsearch;
-+__db_idspace;
-+__db_mkpath;
-+__db_ndbm_clearerr;
-+__db_ndbm_close;
-+__db_ndbm_delete;
-+__db_ndbm_dirfno;
-+__db_ndbm_error;
-+__db_ndbm_fetch;
-+__db_ndbm_firstkey;
-+__db_ndbm_nextkey;
-+__db_ndbm_open;
-+__db_ndbm_pagfno;
-+__db_ndbm_rdonly;
-+__db_ndbm_store;
-+__db_noop_read;
-+__db_pg_alloc_42_read;
-+__db_pg_alloc_read;
-+__db_pg_free_42_read;
-+__db_pg_free_read;
-+__db_pg_freedata_42_read;
-+__db_pg_freedata_read;
-+__db_pg_init_read;
-+__db_pg_sort_read;
-+__db_pr_callback;
-+__db_relink_42_read;
-+__db_rpath;
-+__db_getlong;
-+__db_getulong;
-+__db_ovref_read;
-+__dbreg_register_read;
-+__fop_create_read;
-+__fop_file_remove_read;
-+__fop_remove_read;
-+__fop_rename_read;
-+__fop_write_read;
-+__ham_chgpg_read;
-+__ham_copypage_read;
-+__ham_curadj_read;
-+__ham_groupalloc_42_read;
-+__ham_groupalloc_read;
-+__ham_insdel_read;
-+__ham_metagroup_42_read;
-+__ham_metagroup_read;
-+__ham_newpage_read;
-+__ham_replace_read;
-+__ham_splitdata_read;
-+__lock_list_print;
-+__os_abspath;
-+__os_calloc;
-+__os_closehandle;
-+__os_ctime;
-+__os_dirfree;
-+__os_dirlist;
-+__os_free;
-+__os_fsync;
-+__os_getenv;
-+__os_mkdir;
-+__os_open;
-+__os_read;
-+__os_rename;
-+__os_strdup;
-+__os_unlink;
-+__os_write;
-+__os_yield;
-+__os_id;
-+__qam_add_read;
-+__qam_del_read;
-+__qam_delext_read;
-+__qam_incfirst_read;
-+__qam_mvptr_read;
-+__txn_ckp_read;
-+__txn_ckp_42_read;
-+__txn_child_read;
-+__txn_recycle_read;
-+__txn_regop_42_read;
-+__txn_regop_read;
-+__txn_xa_regop_read;
-+db_create;
-+db_env_create;
-+db_env_set_func_close;
-+db_env_set_func_dirfree;
-+db_env_set_func_dirlist;
-+db_env_set_func_exists;
-+db_env_set_func_file_map;
-+db_env_set_func_free;
-+db_env_set_func_fsync;
-+db_env_set_func_ftruncate;
-+db_env_set_func_ioinfo;
-+db_env_set_func_malloc;
-+db_env_set_func_open;
-+db_env_set_func_pread;
-+db_env_set_func_pwrite;
-+db_env_set_func_read;
-+db_env_set_func_realloc;
-+db_env_set_func_region_map;
-+db_env_set_func_rename;
-+db_env_set_func_seek;
-+db_env_set_func_unlink;
-+db_env_set_func_write;
-+db_env_set_func_yield;
-+db_sequence_create;
-+db_strerror;
-+db_version;
-+db_xa_switch;
-+log_compare;
-+
-+ local:
-+ *;
-+};
---- misc/db-4.7.25.NC/dbm/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/dbm/makefile.mk 2009-07-21 11:39:25.000000000 +0200
-@@ -1 +1,16 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=dbm
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= $(SLO)$/dbm.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/dbreg/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/dbreg/makefile.mk 2009-07-21 11:39:25.000000000 +0200
-@@ -1 +1,21 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=dbreg
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/dbreg.obj \
-+ $(SLO)$/dbreg_auto.obj \
-+ $(SLO)$/dbreg_rec.obj \
-+ $(SLO)$/dbreg_stat.obj \
-+ $(SLO)$/dbreg_util.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/dist/Makefile.in 2008-05-06 05:03:36.000000000 +0200
-+++ misc/build/db-4.7.25.NC/dist/Makefile.in 2009-07-21 11:39:25.000000000 +0200
-@@ -13,7 +13,7 @@
- libdir= @libdir@
- docdir= $(prefix)/docs
-
--dmode= 755
-+dmode= 775
- emode= 555
- fmode= 444
-
-@@ -56,6 +56,7 @@
- CCLINK= @MAKEFILE_CCLINK@ @CFLAGS@
-
- LDFLAGS= @LDFLAGS@
-+LDFLAGSVERSION= @LDFLAGSVERSION@
- LIBS= @LIBSO_LIBS@
- TEST_LIBS= @TEST_LIBS@
- LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@
-@@ -733,7 +734,7 @@
-
- # Shared C library.
- $(libso_target): $(C_OBJS)
-- $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
-+ $(SOLINK) $(SOFLAGS) $(LDFLAGS) $(LDFLAGSVERSION) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
- $(RM) -f $(libdb)
- $(LN) -s .libs/$(libdb_version) $(libdb)
-
---- misc/db-4.7.25.NC/dist/config.sub
-+++ misc/build/db-4.7.25.NC/dist/config.sub
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -1247,7 +1247,7 @@
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
---- misc/db-4.7.25.NC/dist/configure 2008-05-15 23:12:41.000000000 +0200
-+++ misc/build/db-4.7.25.NC/dist/configure 2009-07-21 11:39:25.000000000 +0200
-@@ -3757,8 +3757,10 @@
- # Set CFLAGS/CXXFLAGS. We MUST set the flags before we call autoconf
- # compiler configuration macros, because if we don't, they set CFLAGS
- # to no optimization and -g, which isn't what we want.
--CFLAGS=${CFLAGS-$optimize_debug}
--CXXFLAGS=${CXXFLAGS-"$CFLAGS"}
-+#CFLAGS=${CFLAGS-$optimize_debug}
-+#CXXFLAGS=${CXXFLAGS-"$CFLAGS"}
-+CFLAGS="$CFLAGS $optimize_def"
-+CXXFLAGS="$CXXFLAGS $CFLAGS"
-
- # The default compiler is cc (NOT gcc), the default CFLAGS is as specified
- # above, NOT what is set by AC_PROG_CC, as it won't set optimization flags
-@@ -12566,7 +12568,8 @@
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some variants of GNU ld only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
-- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+# case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+ case `$lt_cv_path_LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
- ;;
-@@ -36624,6 +36627,7 @@
- JAR!$JAR$ac_delim
- JAVACFLAGS!$JAVACFLAGS$ac_delim
- LDFLAGS!$LDFLAGS$ac_delim
-+LDFLAGSVERSION!$LDFLAGSVERSION$ac_delim
- LIBCSO_LIBS!$LIBCSO_LIBS$ac_delim
- LIBJSO_LIBS!$LIBJSO_LIBS$ac_delim
- LIBSO_LIBS!$LIBSO_LIBS$ac_delim
-@@ -36655,7 +36659,7 @@
- DB_VERSION_PATCH!$DB_VERSION_PATCH$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
---- misc/db-4.7.25.NC/dist/ltmain.sh 2006-06-27 03:03:33.000000000 +0200
-+++ misc/build/db-4.7.25.NC/dist/ltmain.sh 2009-07-21 11:39:25.000000000 +0200
-@@ -1700,7 +1700,9 @@
- # We need an absolute path.
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) ;;
-- *)
-+ # or $ORIGIN altenatively
-+ *\$ORIGIN*) ;;
-+ *)
- $echo "$modename: only absolute run-paths are allowed" 1>&2
- exit $EXIT_FAILURE
- ;;
---- misc/db-4.7.25.NC/env/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/env/makefile.mk 2009-07-21 11:39:25.000000000 +0200
-@@ -1 +1,29 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=env
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/env_alloc.obj \
-+ $(SLO)$/env_config.obj \
-+ $(SLO)$/env_failchk.obj \
-+ $(SLO)$/env_file.obj \
-+ $(SLO)$/env_globals.obj \
-+ $(SLO)$/env_method.obj \
-+ $(SLO)$/env_name.obj \
-+ $(SLO)$/env_open.obj \
-+ $(SLO)$/env_recover.obj \
-+ $(SLO)$/env_region.obj \
-+ $(SLO)$/env_register.obj \
-+ $(SLO)$/env_sig.obj \
-+ $(SLO)$/env_stat.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/fileops/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/fileops/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,20 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=fileops
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/fileops_auto.obj \
-+ $(SLO)$/fop_basic.obj \
-+ $(SLO)$/fop_rec.obj \
-+ $(SLO)$/fop_util.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/hash/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/hash/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,30 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=hash
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/hash.obj \
-+ $(SLO)$/hash_auto.obj \
-+ $(SLO)$/hash_conv.obj \
-+ $(SLO)$/hash_dup.obj \
-+ $(SLO)$/hash_func.obj \
-+ $(SLO)$/hash_meta.obj \
-+ $(SLO)$/hash_method.obj \
-+ $(SLO)$/hash_open.obj \
-+ $(SLO)$/hash_page.obj \
-+ $(SLO)$/hash_rec.obj \
-+ $(SLO)$/hash_reclaim.obj \
-+ $(SLO)$/hash_stat.obj \
-+ $(SLO)$/hash_upgrade.obj \
-+ $(SLO)$/hash_verify.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/hmac/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/hmac/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,18 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=hmac
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/hmac.obj \
-+ $(SLO)$/sha1.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/hsearch/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/hsearch/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,16 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=hsearch
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= $(SLO)$/hsearch.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/lock/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/lock/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,26 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=lock
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/lock.obj \
-+ $(SLO)$/lock_deadlock.obj \
-+ $(SLO)$/lock_failchk.obj \
-+ $(SLO)$/lock_id.obj \
-+ $(SLO)$/lock_list.obj \
-+ $(SLO)$/lock_method.obj \
-+ $(SLO)$/lock_region.obj \
-+ $(SLO)$/lock_stat.obj \
-+ $(SLO)$/lock_timer.obj \
-+ $(SLO)$/lock_util.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/log/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/log/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,24 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=log
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/log.obj \
-+ $(SLO)$/log_archive.obj \
-+ $(SLO)$/log_compare.obj \
-+ $(SLO)$/log_debug.obj \
-+ $(SLO)$/log_get.obj \
-+ $(SLO)$/log_method.obj \
-+ $(SLO)$/log_put.obj \
-+ $(SLO)$/log_stat.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,76 @@
--dummy
-+PRJ=..$/..$/..$/..
-+PRJNAME=libdb47
-+TARGET=libdb47
-+USE_DEFFILE=true
-+UWINAPILIB=
-+
-+.INCLUDE : settings.mk
-+CFLAGS+=-GS -EHsc -Gy
-+
-+#LINKFLAGS!:=$(LINKFLAGS:s/NODEFAULTLIB/NOLOGO/)
-+
-+CHILDREN= \
-+ btree clib common cxx \
-+ db dbm dbreg env fileops \
-+ hash hmac hsearch lock \
-+ log mp mutex os os_windows \
-+ qam rep repmgr sequence \
-+ txn xa
-+
-+LIB1TARGET= $(SLB)$/$(TARGET).lib
-+LIB1FILES= \
-+ $(SLB)$/btree.lib \
-+ $(SLB)$/clib.lib \
-+ $(SLB)$/common.lib \
-+ $(SLB)$/cxx.lib \
-+ $(SLB)$/db_src.lib \
-+ $(SLB)$/dbm.lib \
-+ $(SLB)$/dbreg.lib \
-+ $(SLB)$/env.lib \
-+ $(SLB)$/fileops.lib \
-+ $(SLB)$/hash.lib \
-+ $(SLB)$/hmac.lib \
-+ $(SLB)$/hsearch.lib \
-+ $(SLB)$/lock.lib \
-+ $(SLB)$/log.lib \
-+ $(SLB)$/mp.lib \
-+ $(SLB)$/mutex.lib \
-+ $(SLB)$/os.lib \
-+ $(SLB)$/os_windows.lib \
-+ $(SLB)$/qam.lib \
-+ $(SLB)$/rep.lib \
-+ $(SLB)$/repmgr.lib \
-+ $(SLB)$/sequence.lib \
-+ $(SLB)$/txn.lib \
-+ $(SLB)$/xa.lib
-+
-+SHL1LIBS=$(LIB1TARGET)
-+SHL1STDLIBS = $(WS2_32LIB) $(ADVAPI32LIB)
-+SHL1TARGET = $(TARGET)
-+SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-+SHL1IMPLIB = $(SHL1TARGET)
-+SHL1LIBS = $(SLB)$/$(TARGET).lib
-+SHL1DEPN = $(CHILDREN)
-+
-+#The following line prevents that the resource file is automatically generated
-+use_shl_versions:=
-+#use the berkeley's resource file
-+RCFILES = build_windows$/libdb.rc
-+SHL1RES= $(RES)$/libdb47.res
-+
-+#DEF1NAME=$(SHL1TARGET)
-+#DEF1EXPORTFILE=$(TARGET).dxp
-+
-+# dmake builds the first rule
-+ALLTAR : $(CHILDREN)
-+
-+$(CHILDREN) .PHONY :
-+ cd $@ ; $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS)
-+
-+.INCLUDE : target.mk
-+
-+$(MISC)$/$(SHL1TARGET).def : build_windows$/libdb.def
-+ $(COPY) $< $@
-+
-+ #$(DUMPBIN) -DIRECTIVES $(SLB)$/$(TARGET).lib | $(GREP) EXPORT: | $(GREP) -v ",DATA" | $(SED) "s/.*EXPORT://" >> $@
-+
---- misc/db-4.7.25.NC/mp/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/mp/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,31 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=mp
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/mp_alloc.obj \
-+ $(SLO)$/mp_bh.obj \
-+ $(SLO)$/mp_fget.obj \
-+ $(SLO)$/mp_fmethod.obj \
-+ $(SLO)$/mp_fopen.obj \
-+ $(SLO)$/mp_fput.obj \
-+ $(SLO)$/mp_fset.obj \
-+ $(SLO)$/mp_method.obj \
-+ $(SLO)$/mp_mvcc.obj \
-+ $(SLO)$/mp_region.obj \
-+ $(SLO)$/mp_register.obj \
-+ $(SLO)$/mp_resize.obj \
-+ $(SLO)$/mp_stat.obj \
-+ $(SLO)$/mp_sync.obj \
-+ $(SLO)$/mp_trickle.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/mutex/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/mutex/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,23 @@
--dummy
-+
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=mutex
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=-I..$/build_windows -I..$/ -I$(COMPATH)$/include $(PSDKINC)
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/mut_alloc.obj \
-+ $(SLO)$/mut_failchk.obj \
-+ $(SLO)$/mut_method.obj \
-+ $(SLO)$/mut_region.obj \
-+ $(SLO)$/mut_stat.obj \
-+ $(SLO)$/mut_win32.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/os/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/os/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,26 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=os
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/os_abort.obj \
-+ $(SLO)$/os_addrinfo.obj \
-+ $(SLO)$/os_alloc.obj \
-+ $(SLO)$/os_ctime.obj \
-+ $(SLO)$/os_pid.obj \
-+ $(SLO)$/os_root.obj \
-+ $(SLO)$/os_rpath.obj \
-+ $(SLO)$/os_stack.obj \
-+ $(SLO)$/os_tmpdir.obj \
-+ $(SLO)$/os_uid.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/os/os_fsync.c 2008-05-06 05:03:37.000000000 +0200
-+++ misc/build/db-4.7.25.NC/os/os_fsync.c 2009-07-21 11:42:03.000000000 +0200
-@@ -79,13 +79,17 @@
- ret = DB_GLOBAL(j_fsync)(fhp->fd);
- else {
- #if defined(F_FULLFSYNC)
-+/* When running OOo on MacOS using an NFS mounted disk, fcntl failed with errno
-+ ENOTTY (25). Since full sync only works on HFS, FAT and UDF (according to the
-+ man page) and also is more time consuming we just use the fallback.
- RETRY_CHK((fcntl(fhp->fd, F_FULLFSYNC, 0)), ret);
-- /*
-+*/ /*
- * On OS X, F_FULLSYNC only works on HFS+, so we need to fall
- * back to regular fsync on other filesystems.
- */
-- if (ret == ENOTSUP)
-- RETRY_CHK((fsync(fhp->fd)), ret);
-+/* if (ret == ENOTSUP)
-+*/
-+ RETRY_CHK((fsync(fhp->fd)), ret);
- #elif defined(HAVE_QNX)
- ret = __qnx_fsync(fhp);
- #elif defined(HAVE_FDATASYNC)
---- misc/db-4.7.25.NC/os_windows/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/os_windows/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,37 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=os_windows
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/os_abs.obj \
-+ $(SLO)$/os_clock.obj \
-+ $(SLO)$/os_config.obj \
-+ $(SLO)$/os_cpu.obj \
-+ $(SLO)$/os_dir.obj \
-+ $(SLO)$/os_errno.obj \
-+ $(SLO)$/os_fid.obj \
-+ $(SLO)$/os_flock.obj \
-+ $(SLO)$/os_fsync.obj \
-+ $(SLO)$/os_getenv.obj \
-+ $(SLO)$/os_handle.obj \
-+ $(SLO)$/os_map.obj \
-+ $(SLO)$/os_mkdir.obj \
-+ $(SLO)$/os_open.obj \
-+ $(SLO)$/os_rename.obj \
-+ $(SLO)$/os_rw.obj \
-+ $(SLO)$/os_seek.obj \
-+ $(SLO)$/os_stat.obj \
-+ $(SLO)$/os_truncate.obj \
-+ $(SLO)$/os_unlink.obj \
-+ $(SLO)$/os_yield.obj \
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/qam/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/qam/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,26 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=qam
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/qam.obj \
-+ $(SLO)$/qam_auto.obj \
-+ $(SLO)$/qam_conv.obj \
-+ $(SLO)$/qam_files.obj \
-+ $(SLO)$/qam_method.obj \
-+ $(SLO)$/qam_open.obj \
-+ $(SLO)$/qam_rec.obj \
-+ $(SLO)$/qam_stat.obj \
-+ $(SLO)$/qam_upgrade.obj \
-+ $(SLO)$/qam_verify.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/rep/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/rep/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,27 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=rep
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/rep_auto.obj \
-+ $(SLO)$/rep_backup.obj \
-+ $(SLO)$/rep_elect.obj \
-+ $(SLO)$/rep_lease.obj \
-+ $(SLO)$/rep_log.obj \
-+ $(SLO)$/rep_method.obj \
-+ $(SLO)$/rep_record.obj \
-+ $(SLO)$/rep_region.obj \
-+ $(SLO)$/rep_stat.obj \
-+ $(SLO)$/rep_util.obj \
-+ $(SLO)$/rep_verify.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/repmgr/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/repmgr/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,26 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=repmgr
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/repmgr_auto.obj \
-+ $(SLO)$/repmgr_elect.obj \
-+ $(SLO)$/repmgr_method.obj \
-+ $(SLO)$/repmgr_msg.obj \
-+ $(SLO)$/repmgr_net.obj \
-+ $(SLO)$/repmgr_queue.obj \
-+ $(SLO)$/repmgr_sel.obj \
-+ $(SLO)$/repmgr_stat.obj \
-+ $(SLO)$/repmgr_util.obj \
-+ $(SLO)$/repmgr_windows.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/sequence/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/sequence/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,18 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=sequence
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/seq_stat.obj \
-+ $(SLO)$/sequence.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/txn/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/txn/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,26 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=txn
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/txn.obj \
-+ $(SLO)$/txn_auto.obj \
-+ $(SLO)$/txn_chkpt.obj \
-+ $(SLO)$/txn_failchk.obj \
-+ $(SLO)$/txn_method.obj \
-+ $(SLO)$/txn_rec.obj \
-+ $(SLO)$/txn_recover.obj \
-+ $(SLO)$/txn_region.obj \
-+ $(SLO)$/txn_stat.obj \
-+ $(SLO)$/txn_util.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/xa/makefile.mk 2009-07-21 11:42:40.000000000 +0200
-+++ misc/build/db-4.7.25.NC/xa/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,19 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=berkeleydb
-+TARGET=xa
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+INCPRE+=..$/build_windows ..$/
-+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
-+
-+SLOFILES= \
-+ $(SLO)$/xa.obj \
-+ $(SLO)$/xa_db.obj \
-+ $(SLO)$/xa_map.obj
-+
-+.INCLUDE : target.mk
-+
---- misc/db-4.7.25.NC/dbinc/mutex_int.h
-+++ misc/build/db-4.7.25.NC/dbinc/mutex_int.h
-@@ -402,6 +402,25 @@
-
- #ifdef LOAD_ACTUAL_MUTEX_CODE
- /* gcc/arm: 0 is clear, 1 is set. */
-+#if defined __thumb__
-+#define MUTEX_SET(tsl) ({ \
-+ int __r, __p; \
-+ __asm__ volatile( \
-+ ".align 2\n\t" \
-+ "bx pc\n\t" \
-+ "nop\n\t" \
-+ ".arm\n\t" \
-+ "swpb %0, %2, [%3]\n\t" \
-+ "eor %0, %0, #1\n\t" \
-+ "orr %1, pc, #1\n\t" \
-+ "bx %1\n\t" \
-+ ".force_thumb" \
-+ : "=&r" (__r), "=r" (__p) \
-+ : "r" (1), "r" (tsl) \
-+ ); \
-+ __r & 1; \
-+})
-+#else
- #define MUTEX_SET(tsl) ({ \
- int __r; \
- asm volatile( \
-@@ -484,6 +503,7 @@
- ); \
- __r & 1; \
- })
-+#endif
-
- #define MUTEX_UNSET(tsl) (*(volatile tsl_t *)(tsl) = 0)
- #define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0)
diff --git a/berkeleydb/db-aix.patch b/berkeleydb/db-aix.patch
deleted file mode 100644
index 3a2c21f..0000000
--- a/berkeleydb/db-aix.patch
+++ /dev/null
@@ -1,205 +0,0 @@
---- misc/db-4.7.25.NC/dist/config.guess 2010-08-19 03:29:33.000000000 -0500
-+++ misc/build/db-4.7.25.NC/dist/config.guess 2010-08-19 03:32:57.000000000 -0500
-@@ -532,7 +532,7 @@
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
-- *:AIX:*:[456])
-+ *:AIX:*:[4567])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
-@@ -544,6 +544,9 @@
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
-+ if [ "$IBM_REV" == "V7BETA" ]; then
-+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+ fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit ;;
- *:AIX:*:*)
---- misc/db-4.7.25.NC/dist/configure 2010-09-15 10:06:54.000000000 -0500
-+++ misc/build/db-4.7.25.NC/dist/configure 2010-09-15 10:12:41.000000000 -0500
-@@ -3701,7 +3701,7 @@
- # Don't override anything if it's already set from the environment.
- optimize_debug="-O"
- case "$host_os" in
--aix4.3.*|aix5*)
-+aix[4-9]*)
- case "$host_os" in
- aix4.3.*)
- CPPFLAGS="$CPPFLAGS -D_LINUX_SOURCE_COMPAT";;
-@@ -6452,7 +6452,7 @@
- # whether `pass_all' will *always* work, you probably want this one.
-
- case $host_os in
--aix4* | aix5*)
-+aix[4-9]*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-@@ -9439,7 +9439,7 @@
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[4-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs=no
-@@ -9649,7 +9649,7 @@
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -9669,7 +9669,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
-@@ -10410,7 +10410,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -11826,7 +11826,7 @@
- fi
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-@@ -12670,7 +12670,7 @@
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -12683,7 +12683,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- case $ld_flag in
- *-brtl*)
-@@ -13805,7 +13805,7 @@
- esac
- else
- case $host_os in
-- aix4* | aix5*)
-+ aix[4-9]*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
-@@ -14201,7 +14201,7 @@
-
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
-- aix4* | aix5*)
-+ aix[4-9]*)
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -14334,7 +14334,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -15455,7 +15455,7 @@
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
--aix4* | aix5*)
-+aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-@@ -15966,7 +15966,7 @@
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs_F77=no
-@@ -16176,7 +16176,7 @@
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -16917,7 +16917,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -18540,7 +18540,7 @@
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs_GCJ=no
-@@ -18750,7 +18750,7 @@
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -19511,7 +19511,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
---- misc/db-4.7.25.NC/dist/configure.ac 2010-09-15 10:06:54.000000000 -0500
-+++ misc/build/db-4.7.25.NC/dist/configure.ac 2010-09-15 10:08:45.000000000 -0500
-@@ -154,7 +154,7 @@
- # Don't override anything if it's already set from the environment.
- optimize_debug="-O"
- case "$host_os" in
--aix4.3.*|aix5*)
-+aix[4-9]*)
- case "$host_os" in
- aix4.3.*)
- CPPFLAGS="$CPPFLAGS -D_LINUX_SOURCE_COMPAT";;
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
deleted file mode 100644
index c68a404..0000000
--- a/berkeleydb/makefile.mk
+++ /dev/null
@@ -1,197 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=so_berkeleydb
-TARGET=so_berkeleydb
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_DB)" == "YES"
-all:
- @echo "An already available installation of db should exist on your system."
- @echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=db-4.7.25.NC-custom
-TARFILE_MD5=d70951c80dabecc2892c919ff5d07172
-TARFILE_ROOTDIR=db-4.7.25.NC
-
-ADDITIONAL_FILES= \
- makefile.mk btree$/makefile.mk clib$/makefile.mk common$/makefile.mk \
- cxx$/makefile.mk db$/makefile.mk dbm$/makefile.mk dbreg$/makefile.mk \
- env$/makefile.mk fileops$/makefile.mk hash$/makefile.mk hmac$/makefile.mk \
- hsearch$/makefile.mk lock$/makefile.mk log$/makefile.mk mp$/makefile.mk \
- mutex$/makefile.mk os$/makefile.mk os_windows$/makefile.mk \
- qam$/makefile.mk rep$/makefile.mk repmgr$/makefile.mk \
- sequence$/makefile.mk txn$/makefile.mk xa$/makefile.mk \
- db_4_7_gcc4.map
-
-# not needed for win32. comment out when causing problems...
-.IF "$(GUI)$(COM)"=="WNTGCC"
-PATCH_FILES=db-4.7.25-mingw.patch
-PATCH_FILES += db-4.7.25.NC-mingw32hack.patch
- # otherwise, db-4.7.25.NC/dist/configure decides for _FILE_OFFSET_BITS=64,
- # which causes /usr/i686-w64-mingw32/sys-root/mingw/include/_mingw.h to not
- # define _USE_32BIT_TIME_T, so that berkeleydb uses a 64 bit time_t while
- # the rest of LibreOffice uses a 32 bit time_t, which causes problems as
- # there is e.g. a member time_t timestamp of struct __db in db.h; see
- # <http://sourceforge.net/support/tracker.php?aid=3513251> "_mingw.h: size
- # of time_t depends on _FILE_OFFSET_BITS"
-.ELSE
-PATCH_FILES=\
- db-4.7.25.patch \
- db-aix.patch
-.ENDIF
-
-# clean compiler flags
-CFLAGS:=
-CXXFLAGS:=
-
-# disable aliasing for all GCC platforms, at least GCC 4.x needs it if
-# optimization level >= 2
-.IF "$(COM)"=="GCC"
-CFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS)
-CXXFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS)
-.IF "$(ENABLE_SYMBOLS)"!="" && "$(ENABLE_SYMBOLS)"!="FALSE"
-CFLAGS+=-g
-CXXFLAGS+=-g
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-z,origin -Wl,-rpath,'$$$$ORIGIN'
-.EXPORT: LDFLAGS
-#The current dir when linking is unxlngi6.pro/misc/build/db-4.2.52.NC/out
-# the map file is in unxlngi6.pro/misc/build/db-4.2.52.NC
-LDFLAGSVERSION:= -Wl,--version-script=../db_4_7_gcc4.map
-.EXPORT: LDFLAGSVERSION
-.ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-.IF "$(OS)$(COM)"=="SOLARISC52"
-LDFLAGS:=$(ARCH_FLAGS) -R\''$$$$ORIGIN'\'
-.EXPORT: LDFLAGS
-.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
-
-CONFIGURE_DIR=out
-#relative to CONFIGURE_DIR
-CONFIGURE_ACTION= \
- ..$/dist$/configure
-CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-compat185 CC='$(CC) $(SOLARLIB)'
-.IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS+= --disable-shared
-.ELSE
-CONFIGURE_FLAGS+= --enable-shared
-.ENDIF
-.IF "$(OS)"=="MACOSX"
-CONFIGURE_FLAGS += \
- --prefix=/@.__________________________________________________$(EXTRPATH) \
- CPPFLAGS="$(EXTRA_CDEFS)"
-.ENDIF
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-# just pass ARCH_FLAGS to native build
-CFLAGS+:=$(ARCH_FLAGS)
-CXXFLAGS+:=$(ARCH_FLAGS)
-.EXPORT : CFLAGS CXXFLAGS
-
-BUILD_DIR=$(CONFIGURE_DIR)
-BUILD_DIR_OUT=$(CONFIGURE_DIR)
-BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
-
-.IF "$(OS)"=="IOS"
-OUT2LIB=$(BUILD_DIR)$/libdb*.a
-.ELSE
-OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
-.ENDIF
-OUT2INC= \
- $(BUILD_DIR)$/db.h
-
-.ENDIF # "$(GUI)"=="UNX"
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-CONFIGURE_DIR=out
-#relative to CONFIGURE_DIR
-# TODO needs clean up
-db_CC=$(CC) -mthreads
-db_CXX=$(CXX) -mthreads
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-db_CC+=-shared-libgcc
-db_CXX+=-shared-libgcc
-.ENDIF
-db_LDFLAGS=-L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin
-db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR)
-db_LIBS=
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-CFLAGS+=-D_GLIBCXX_DLL
-db_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
-.ENDIF
-db_LIBXSO_LIBS=$(db_LIBS)
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-db_LIBXSO_LIBS+=-lgcc_s
-.ENDIF
-CONFIGURE_ACTION=..$/dist$/configure
-CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)"
-
-BUILD_DIR=$(CONFIGURE_DIR)
-BUILD_DIR_OUT=$(CONFIGURE_DIR)
-BUILD_ACTION=make
-
-OUT2LIB=$(BUILD_DIR)$/.libs$/libdb47.dll.a
-OUT2BIN=$(BUILD_DIR)$/.libs$/libdb47.dll
-
-OUT2INC= \
- $(BUILD_DIR)$/db.h
-.IF "$(GUI)$(COM)"=="WNTGCC"
-.EXPORT : PWD
-.ENDIF
-
-.ELSE
-BUILD_DIR=
-BUILD_ACTION=dmake
-
-BUILD_DIR_OUT=build_windows
-OUT2INC= \
- $(BUILD_DIR_OUT)$/db.h
-.ENDIF
-.ENDIF # "$(GUI)"=="WNT"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-
diff --git a/berkeleydb/prj/build.lst b/berkeleydb/prj/build.lst
deleted file mode 100644
index 55a7bf1..0000000
--- a/berkeleydb/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-db berkeleydb : external NULL
-db berkeleydb nmake - u as_mkout NULL
-db berkeleydb nmake - w,vc7 as_mkout NULL
diff --git a/berkeleydb/prj/d.lst b/berkeleydb/prj/d.lst
deleted file mode 100644
index 1de53d4..0000000
--- a/berkeleydb/prj/d.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-mkdir: %_DEST%\inc\berkeleydb
-
-..\%__SRC%\inc\db.h %_DEST%\inc\berkeleydb\db.h
-
-..\%__SRC%\lib\libdb47.lib %_DEST%\lib\libdb47.lib
-..\%__SRC%\lib\libdb-4.7.a %_DEST%\lib\libdb-4.7.a
-..\%__SRC%\lib\libdb-4.7.so %_DEST%\lib\libdb-4.7.so
-..\%__SRC%\lib\libdb-4.7.dylib %_DEST%\lib\libdb-4.7.dylib
-..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib\libdb47.dll.a
-..\%__SRC%\bin\libdb47.dll %_DEST%\bin\libdb47.dll
-
-
diff --git a/berkeleydb/prj/dmake b/berkeleydb/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/config_host.mk.in b/config_host.mk.in
index 6b3abda..a689182 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -38,7 +38,6 @@ export ATL_INCLUDE=@ATL_INCLUDE@
export ATL_LIB=@ATL_LIB@
export AWTLIB=@AWTLIB@
export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
-export BERKELEYDB_TARBALL=@BERKELEYDB_TARBALL@
export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@
export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
export BOOST_LDFLAGS=@BOOST_LDFLAGS@
@@ -103,8 +102,6 @@ export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@
export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
-export DB_CPPLIB=@DB_CPPLIB@
-export DB_LIB=@DB_LIB@
export debug=@ENABLE_DEBUG@
export DEFAULT_MOZILLA_TOOLKIT=@MOZILLA_TOOLKIT@
export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
@@ -373,7 +370,6 @@ export MINGW_CAIRO_DLL=@MINGW_CAIRO_DLL@
export MINGW_CLIB_DIR=@MINGW_CLIB_DIR@
export MINGW_CRYPTO_DLL=@MINGW_CRYPTO_DLL@
export MINGW_CURL_DLL=@MINGW_CURL_DLL@
-export MINGW_DB_DLL=@MINGW_DB_DLL@
export MINGW_EXPAT_DLL=@MINGW_EXPAT_DLL@
export MINGW_FONTCONFIG_DLL=@MINGW_FONTCONFIG_DLL@
export MINGW_FREETYPE_DLL=@MINGW_FREETYPE_DLL@
@@ -585,8 +581,6 @@ export SYSTEM_CAIRO=@SYSTEM_CAIRO@
export SYSTEM_CLUCENE=@SYSTEM_CLUCENE@
export SYSTEM_CPPUNIT=@SYSTEM_CPPUNIT@
export SYSTEM_CURL=@SYSTEM_CURL@
-export SYSTEM_DB=@SYSTEM_DB@
-export SYSTEM_DB_CFLAGS=@SYSTEM_DB_CFLAGS@
export SYSTEM_DICTS=@SYSTEM_DICTS@
export SYSTEM_EXPAT=@SYSTEM_EXPAT@
export SYSTEM_GENBRK=@SYSTEM_GENBRK@
diff --git a/configure.ac b/configure.ac
index cce65a6..5de1096 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1379,11 +1379,6 @@ AC_ARG_WITH(system-poppler,
[Use system poppler. (only needed for pdfimport extension)]),,
[with_system_poppler="$with_system_libs"])
-AC_ARG_WITH(system-db,
- AS_HELP_STRING([--with-system-db],
- [Use Berkeley db already on system.]),,
- [with_system_db="$with_system_libs"])
-
AC_ARG_WITH(system-apache-commons,
AS_HELP_STRING([--with-system-apache-commons],
[Use Apache commons libraries already on system.]),,
@@ -2208,10 +2203,6 @@ AC_ARG_WITH(system-cppunit-for-build,
AS_HELP_STRING([--with-system-cppunit-for-build],
[Use cppunit already on system for build tools (cross-compilation only).]))
-AC_ARG_WITH(system-db-for-build,
- AS_HELP_STRING([--with-system-db-for-build],
- [Use db already on system for build tools (cross-compilation only).]))
-
AC_ARG_WITH(system-expat-for-build,
AS_HELP_STRING([--with-system-expat-for-build],
[Use expat already on system for build tools (cross-compilation only).]))
@@ -4090,7 +4081,6 @@ if test "$cross_compiling" = "yes"; then
test -n "${with_solver_and_workdir_root}" && sub_conf_opts="$sub_conf_opts --with-solver-and-workdir-root=${with_solver_and_workdir_root}"
test -n "$with_system_boost_for_build" && sub_conf_opts="$sub_conf_opts --with-system-boost"
test -n "$with_system_cppunit_for_build" && sub_conf_opts="$sub_conf_opts --with-system-cppunit"
- test -n "$with_system_db_for_build" && sub_conf_opts="$sub_conf_opts --with-system-db"
test -n "$with_system_expat_for_build" && sub_conf_opts="$sub_conf_opts --with-system-expat"
test "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" = "force" && sub_conf_opts="$sub_conf_opts --with-system-icu"
test -n "$with_system_libxml_for_build" && sub_conf_opts="$sub_conf_opts --with-system-libxml"
@@ -7440,71 +7430,6 @@ AC_SUBST([MINGW_TERMCAP_DLL])
AC_SUBST(MINGW_PYVERSION)
AC_SUBST(MINGW_PYTHON_MAJOR_VERSION)
-dnl ===================================================================
-dnl Check for system Berkeley db
-dnl ===================================================================
-AC_MSG_CHECKING([which db to use])
-if test "$with_system_db" = "yes"; then
- SYSTEM_DB=YES
- AC_MSG_RESULT([external])
-
- db_header=
- for dbver in 5.3 5.1 5.0 5 4.8 4.7 4; do
- for dash in - ''; do
- AC_CHECK_HEADER([db$dash$dbver/db.h],
- [ db_header="db$dash$dbver/db.h"; break 2 ])
- done
- done
-
- if test -z "$db_header"; then
- AC_CHECK_HEADER([db/db.h], [db_header='db/db.h'; dbver=''])
- fi
-
- if test -z "$db_header"; then
- AC_CHECK_HEADER(db.h, [ db_header='db.h'; dbver='' ])
- fi
-
- if test -z "$db_header"; then
- AC_MSG_ERROR([db.h not found. Use the correct -I flag, or install the Berkeley db development package.])
- fi
-
- AC_MSG_CHECKING([whether db is at least 4.1])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <$db_header>]], [[int array[(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))-1];]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([no. you need at least db 4.1])])
-
- SYSTEM_DB_CFLAGS="-DSYSTEM_DB_HEADER='<$db_header>'"
-
- DB_LIB=
- dnl At least on OpenBSD and RHEL-6 dbver is not appended to the library
- dnl even though the headers are in a versioned dir
- for suffix in '' '-$dbver' '$dbver' ''; do
- AC_CHECK_LIB(db$suffix, dbopen,
- [ DB_LIB="db$suffix"; DB_CPPLIB="db_cxx$suffix"; break ])
- AC_CHECK_LIB(db$suffix, __db185_open,
- [ DB_LIB="db$suffix"; DB_CPPLIB="db_cxx$suffix"; break ])
- done
-
- if test -z "$DB_LIB"; then
- AC_MSG_ERROR([db library not found. Use the correct -L flag,
-or install the Berkeley db development package.])
- fi
-
- SCPDEFS="$SCPDEFS -DSYSTEM_DB"
- libo_MINGW_CHECK_DLL([DB], [libdb])
-elif test $_os != iOS -a $_os != Android; then
- AC_MSG_RESULT([internal])
- SYSTEM_DB=NO
- BERKELEYDB_TARBALL="d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz"
- BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
-else
- AC_MSG_RESULT([none])
-fi
-AC_SUBST(SYSTEM_DB)
-AC_SUBST(SYSTEM_DB_CFLAGS)
-AC_SUBST(DB_LIB)
-AC_SUBST(DB_CPPLIB)
-AC_SUBST(BERKELEYDB_TARBALL)
-AC_SUBST([MINGW_DB_DLL])
-
AC_MSG_CHECKING([whether to build the MySQL Connector extension])
if test "x$enable_ext_mysql_connector" = "xyes" -a "x$enable_extension_integration" != "xno"; then
AC_MSG_RESULT([yes])
@@ -12423,8 +12348,6 @@ AC_SUBST(LO_PATH)
BUILD_TARBALLS=
# Ugly hack to get what we need for build platform into ooo.lst
if test "$CROSS_COMPILING" = "YES" ; then
- # BERKELEYDB_TARBALL
- BUILD_TARBALLS="$BUILD_TARBALLS d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz"
# ICU_DATA_SUBSET_ZIP
BUILD_TARBALLS="$BUILD_TARBALLS fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip"
fi
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index 8710b08..c3d8c72 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb cross_tail_build :: BERKELEYDB:berkeleydb CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBXML2:libxml2 LIBXSLT:libxslt solenv soltools NULL
+ctb cross_tail_build :: CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBXML2:libxml2 LIBXSLT:libxslt solenv soltools NULL
ctb tail_build\prj nmake - all ctb_prj NULL
diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk
index 57381fa..51f1439 100644
--- a/external/mingw-dlls/makefile.mk
+++ b/external/mingw-dlls/makefile.mk
@@ -46,7 +46,6 @@ MINGW_DLLS:= \
$(MINGW_CAIRO_DLL) \
$(MINGW_CRYPTO_DLL) \
$(MINGW_CURL_DLL) \
- $(MINGW_DB_DLL) \
$(MINGW_EXPAT_DLL) \
$(MINGW_FONTCONFIG_DLL) \
$(MINGW_FREETYPE_DLL) \
diff --git a/ooo.lst.in b/ooo.lst.in
index 4f7596c..2872ccf 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -1,5 +1,4 @@
http://dev-www.libreoffice.org/src
- at BUILD_TARBALLS@
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
@@ -9,7 +8,6 @@ c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
@APACHE_COMMONS_HTTPCLIENT_TARBALL@
@APACHE_COMMONS_LANG_TARBALL@
@APACHE_COMMONS_LOGGING_TARBALL@
- at BERKELEYDB_TARBALL@
@BOOST_TARBALL@
@BSH_TARBALL@
@CAIRO_TARBALL@
diff --git a/python/Python-2.6.1-cross.berkeleydb.patch b/python/Python-2.6.1-cross.berkeleydb.patch
deleted file mode 100644
index e6783f6..0000000
--- a/python/Python-2.6.1-cross.berkeleydb.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- misc/build/Python-2.6.1/Modules/Setup.dist (revision 74955)
-+++ misc/build/Python-2.6.1/Modules/Setup.dist (working copy)
-@@ -413,9 +413,9 @@
- # and the subdirectory of PORT where you built it.
- DB=$(prefix)
- DBLIBVER=4.8
--DBINC=$(DB)/include
--DBLIB=$(DB)/lib
--_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
-+DBINC=$(OUTDIR)/inc/berkeleydb
-+DBLIB=$(OUTDIR)/lib
-+_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb47
-
- # Historical Berkeley DB 1.85
- #
diff --git a/python/makefile.mk b/python/makefile.mk
index 9ea78ef..87014ca 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -129,12 +129,6 @@ PATCH_FILES= \
Python-2.6.2-cross.patch \
Python-2.6.2-cross.fix-configure.patch \
-.IF "$(SYSTEM_DB)" != "YES"
-PATCH_FILES += \
- Python-2.6.1-cross.berkeleydb.patch \
-
-.ENDIF
-
BUILD_DIR=
MYCWD=$(shell @pwd)/$(INPATH)/misc/build
.IF "$(PYTHON_FOR_BUILD)" == ""
diff --git a/python/prj/build.lst b/python/prj/build.lst
index c83e39a..9f2619f 100644
--- a/python/prj/build.lst
+++ b/python/prj/build.lst
@@ -1,3 +1,3 @@
-py python : BERKELEYDB:berkeleydb solenv OPENSSL:openssl NULL
+py python: solenv OPENSSL:openssl NULL
py python nmake - w,vc7 py_mkout NULL
py python nmake - u py_mkout NULL
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 5816861..d41db04 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
SYSTEM_CAIRO \
SYSTEM_CLUCENE \
SYSTEM_CURL \
- SYSTEM_DB \
SYSTEM_EXPAT \
SYSTEM_GRAPHITE \
SYSTEM_HSQLDB \
@@ -89,7 +88,6 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
MINGW_CAIRO_DLL \
MINGW_CRYPTO_DLL \
MINGW_CURL_DLL \
- MINGW_DB_DLL \
MINGW_EXPAT_DLL \
MINGW_FONTCONFIG_DLL \
MINGW_FREETYPE_DLL \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 9df93a8..27c47f9 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -199,21 +199,6 @@ End
#endif
-#ifndef SYSTEM_DB
-
-File gid_File_Lib_Db
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef UNX
- Name = STRING(CONCAT2(libdb-4.7,UNXSUFFIX));
- #else
- Name = "libdb47.dll";
- #endif
-End
-
-#endif
-
#ifdef UNX
#ifdef ENABLE_GTK
#ifdef ENABLE_SYSTRAY_GTK
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp
index 17d1139..7a3b093 100644
--- a/scp2/source/ooo/mingw_dlls.scp
+++ b/scp2/source/ooo/mingw_dlls.scp
@@ -67,12 +67,6 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxml2, MINGW_LIBXML_DLL )
#endif
#endif
-#ifdef SYSTEM_DB
-#ifdef NEEDS_MINGW_DB_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdb, MINGW_DB_DLL )
-#endif
-#endif
-
#if defined SYSTEM_CURL || defined SYSTEM_NSS
#ifdef NEEDS_MINGW_NSPR4_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libnspr, MINGW_NSPR4_DLL )
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index fce5821..5a3accc 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -323,7 +323,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Comphelper2,
gid_File_Lib_Curl,
gid_Unixlink_File_Lib_Curl,
- gid_File_Lib_Db,
gid_File_Lib_Dbpool,
gid_File_Lib_Embobj,
gid_File_Lib_Emboleobj,
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index d6c7f9e..5764d0e 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -188,13 +188,6 @@ ZLIB3RDLIB=-lz
ZLIB3RDLIB=-lzlib
.ENDIF
JPEG3RDLIB=-ljpeg
-.IF "$(SYSTEM_DB)" == "YES"
-BERKELEYLIB=-l$(DB_LIB)
-.ELIF "$(GUI)$(COM)"=="WNTGCC"
-BERKELEYLIB=-ldb47
-.ELSE
-BERKELEYLIB=-ldb-4.7
-.ENDIF
CURLLIB=-lcurl
SFX2LIB=-lsfx$(DLLPOSTFIX)
SFXLIB=-lsfx$(DLLPOSTFIX)
@@ -418,7 +411,6 @@ EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib
EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib
ZLIB3RDLIB=zlib.lib
JPEG3RDLIB=jpeg.lib
-BERKELEYLIB=libdb47.lib
CURLLIB=libcurl.lib
CHAOSLIB=ichaos.lib
UUILIB=iuui.lib
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 7eec9e9..8ff3ce7 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : BERKELEYDB:berkeleydb CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
+tb tail_build : CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
tb tail_build\prj nmake - all tb_prj NULL
commit f78a2bcce88dd5c12052ae3e55c561cdd48b05fe
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon Nov 19 19:45:04 2012 +0000
re-base on ALv2 code. Includes:
Patch contributed by Herbert Duerr:
#i118662# remove berkeleyDB from module xmlhelp (author=orwitt)
http://svn.apache.org/viewvc?view=revision&revision=1213188
#i119141# remove ISCII converter for now
http://svn.apache.org/viewvc?view=revision&revision=1306246
make exceptions for cppunittester verbose
http://svn.apache.org/viewvc?view=revision&revision=1174831
Patches contributed by Pedro Giffuni:
Avoid some uses of non portable #!/bin/bash in shell scripts.
http://svn.apache.org/viewvc?view=revision&revision=1235297
Patch contributed by Oliver-Rainer Wittmann
88652: applied patch, remove unicows deps
http://svn.apache.org/viewvc?view=revision&revision=1177585
drop OS/2 code, remove in-line assembler ARM atomics,
and obsolete armarch header.
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index 6c0783b..7fc3bf9 100644
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@@ -42,10 +42,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_use_externals,migrationoo3,\
- berkeleydb \
-))
-
$(eval $(call gb_Library_set_componentfile,migrationoo3,desktop/source/migration/services/migrationoo3))
$(eval $(call gb_Library_add_exception_objects,migrationoo3,\
diff --git a/helpcompiler/prj/build.lst b/helpcompiler/prj/build.lst
index 2f74f60..2e10667 100644
--- a/helpcompiler/prj/build.lst
+++ b/helpcompiler/prj/build.lst
@@ -1,3 +1,3 @@
-tr helpcompiler : BERKELEYDB:berkeleydb EXPAT:expat LIBXSLT:libxslt CLUCENE:clucene sal NULL
+tr helpcompiler : EXPAT:expat LIBXSLT:libxslt CLUCENE:clucene sal NULL
tr helpcompiler usr1 - all tr_mkout NULL
tr helpcompiler\prj nmake - all tr_prj NULL
diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk
index 8d7bb0f..9c72bc4 100644
--- a/sal/CppunitTest_Module_DLL.mk
+++ b/sal/CppunitTest_Module_DLL.mk
@@ -30,6 +30,8 @@
$(eval $(call gb_CppunitTest_CppunitTest,Module_DLL))
+$(eval $(call gb_CppunitTest_set_visibility_default,Module_DLL))
+
$(eval $(call gb_CppunitTest_add_exception_objects,Module_DLL,\
sal/qa/osl/module/osl_Module_DLL \
))
diff --git a/sal/Makefile b/sal/Makefile
index ccb1c85..d22b9ac 100644
--- a/sal/Makefile
+++ b/sal/Makefile
@@ -1,4 +1,21 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to you under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk
index 7ed1a9b..1c19b63 100644
--- a/sal/Package_inc.mk
+++ b/sal/Package_inc.mk
@@ -28,7 +28,6 @@
$(eval $(call gb_Package_Package,sal_inc,$(SRCDIR)/sal/inc))
$(eval $(call gb_Package_add_file,sal_inc,inc/protectorfactory.hxx,cppunittester/protectorfactory.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/armarch.h,osl/armarch.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/osl/conditn.h,osl/conditn.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/osl/conditn.hxx,osl/conditn.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/osl/diagnose.h,osl/diagnose.h))
diff --git a/sal/android/android_native_app_glue.c b/sal/android/android_native_app_glue.c
index c01db3b..0c2dd5e 100644
--- a/sal/android/android_native_app_glue.c
+++ b/sal/android/android_native_app_glue.c
@@ -1,18 +1,18 @@
/*
- * Copyright (C) 2010 The Android Open Source Project
+ * This file is part of the LibreOffice project.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This file incorporates work covered by the following license notice:
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright (C) 2010 The Android Open Source Project
*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*/
#include <jni.h>
diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx
index 567287b..1943d52 100644
--- a/sal/cpprt/operators_new_delete.cxx
+++ b/sal/cpprt/operators_new_delete.cxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
*
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
#ifdef WNT /* avoid 'std::bad_alloc' unresolved externals */
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 81cf9bf..722fc04 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org. If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
#ifdef WNT
#include <windows.h>
@@ -138,11 +129,12 @@ public:
// we statically link to the app executable.
#else
CppUnit::PlugInManager manager;
+ bool bSuccess = false;
try {
manager.load(testlib, args);
+ bSuccess = true;
} catch (const CppUnit::DynamicLibraryManagerException &e) {
- fprintf(stderr, "%s\n", e.what());
- return false;
+ std::cerr << "DynamicLibraryManagerException: \"" << e.what() << "\"\n";
}
#endif
CppUnit::TestRunner runner;
@@ -165,7 +157,7 @@ public:
result.popProtector();
CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write();
- return collector.wasSuccessful();
+ return bSuccess && collector.wasSuccessful();
}
virtual bool operator()() const
{
diff --git a/sal/inc/cppunittester/protectorfactory.hxx b/sal/inc/cppunittester/protectorfactory.hxx
index 11eb0fb..b0b21bd 100644
--- a/sal/inc/cppunittester/protectorfactory.hxx
+++ b/sal/inc/cppunittester/protectorfactory.hxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2011 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org. If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-************************************************************************/
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
#ifndef INCLUDED_CPPUNITTESTER_PROTECTORFACTORY_HXX
#define INCLUDED_CPPUNITTESTER_PROTECTORFACTORY_HXX
diff --git a/sal/inc/osl/armarch.h b/sal/inc/osl/armarch.h
deleted file mode 100644
index ab50f5b..0000000
--- a/sal/inc/osl/armarch.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* -----------------------------------------------------------------------
- Copyright (c) 1998, 2008 Red Hat, Inc.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- ``Software''), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
- ----------------------------------------------------------------------- */
-
-// shamelessly copied from libffi src/arm/sysv.h
-#ifndef _OSL_ARMARCH_H_
-#define _OSL_ARMARCH_H_
-#ifdef ARM
-
-#define __ARM_ARCH__ 3
-
-#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
-# undef __ARM_ARCH__
-# define __ARM_ARCH__ 4
-#endif
-
-#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) \
- || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) \
- || defined(__ARM_ARCH_5TEJ__)
-# undef __ARM_ARCH__
-# define __ARM_ARCH__ 5
-#endif
-
-#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
- || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \
- || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \
- || defined(__ARM_ARCH_6M__)
-# undef __ARM_ARCH__
-# define __ARM_ARCH__ 6
-#endif
-
-#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
- || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__)
-# undef __ARM_ARCH__
-# define __ARM_ARCH__ 7
-#endif
-
-#endif
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/conditn.h b/sal/inc/osl/conditn.h
index 982d8cc..8803ee8 100644
--- a/sal/inc/osl/conditn.h
+++ b/sal/inc/osl/conditn.h
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
*
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
#ifndef _OSL_CONDITION_H_
diff --git a/sal/inc/osl/conditn.hxx b/sal/inc/osl/conditn.hxx
index bfd5169..4492422 100644
--- a/sal/inc/osl/conditn.hxx
+++ b/sal/inc/osl/conditn.hxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
*
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
#ifndef _OSL_CONDITN_HXX_
#define _OSL_CONDITN_HXX_
diff --git a/sal/inc/osl/detail/android_native_app_glue.h b/sal/inc/osl/detail/android_native_app_glue.h
index 07b2f02..862ca9e 100644
--- a/sal/inc/osl/detail/android_native_app_glue.h
+++ b/sal/inc/osl/detail/android_native_app_glue.h
@@ -1,18 +1,18 @@
/*
- * Copyright (C) 2010 The Android Open Source Project
+ * This file is part of the LibreOffice project.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This file incorporates work covered by the following license notice:
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright (C) 2010 The Android Open Source Project
*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*/
#ifndef _ANDROID_NATIVE_APP_GLUE_H
diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h
index 191bba0..eb52b20 100644
--- a/sal/inc/osl/diagnose.h
+++ b/sal/inc/osl/diagnose.h
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+/*
+ * This file is part of the LibreOffice project.
*
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * This file incorporates work covered by the following license notice:
*
- ************************************************************************/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
#ifndef _OSL_DIAGNOSE_H_
diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx
index 7ae1554..bbf1fa7 100644
--- a/sal/inc/osl/diagnose.hxx
+++ b/sal/inc/osl/diagnose.hxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list