diff --git a/.hgignore b/.hgignore
index 960c9edf95382b45a0ee78910fabee3480229ce7..08e60a452a43fda9d2a420ad7484aa73aa460a25 100755
--- a/.hgignore
+++ b/.hgignore
@@ -5,7 +5,6 @@ syntax: glob
# Compiled python bytecode
*.pyc
# Emacs temp files
-*~
.*.swp
#OSX image cache file
*.DS_Store
diff --git a/autobuild.xml b/autobuild.xml
index 04c15f5479c74961cb3d748998b3e51dcbd0df40..ff7aa17182194e066a909f4013a599ef43cface1 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -465,50 +465,6 @@
<key>version</key>
<string>7.41.0</string>
</map>
- <key>db</key>
- <map>
- <key>copyright</key>
- <string>Copyright (c) 1990, 2010 Oracle and/or its affiliates. All rights reserved.</string>
- <key>description</key>
- <string>Berkeley DB (libdb) is a programmatic toolkit that provides embedded database support for both traditional and client/server applications.</string>
- <key>license</key>
- <string>bsd</string>
- <key>license_file</key>
- <string>LICENSES/db.txt</string>
- <key>name</key>
- <string>db</string>
- <key>platforms</key>
- <map>
- <key>linux</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>8f57c413e0786681cbcb9ed2fb8a6d37</string>
- <key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/db-5.1.25-linux-20110309.tar.bz2</string>
- </map>
- <key>name</key>
- <string>linux</string>
- </map>
- <key>linux64</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>f501cca2e6dadef1bf9e407a9cd89142</string>
- <key>hash_algorithm</key>
- <string>md5</string>
- <key>url</key>
- <string>http://depot.alchemyviewer.org/pub/linux64/lib/db-5.1.25-linux64-201501030326.tar.bz2</string>
- </map>
- <key>name</key>
- <string>linux64</string>
- </map>
- </map>
- <key>version</key>
- <string>5.1.25</string>
- </map>
<key>dbus-glib</key>
<map>
<key>copyright</key>
@@ -2271,50 +2227,6 @@
<key>version</key>
<string>1.6.16</string>
</map>
- <key>libuuid</key>
- <map>
- <key>copyright</key>
- <string>Copyright (c) 2004-2008 Ralf S. Engelschall (rse@engelschall.com) Copyright (c) 2004-2008 The OSSP Project (http://www.ossp.org/)</string>
- <key>description</key>
- <string>OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). </string>
- <key>license</key>
- <string>UUID</string>
- <key>license_file</key>
- <string>LICENSES/uuid.txt</string>
- <key>name</key>
- <string>libuuid</string>
- <key>platforms</key>
- <map>
- <key>linux</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>873e8e99d29711df2efa30646dca1795</string>
- <key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/uuid-1.6.2-linux-20110315.tar.bz2</string>
- </map>
- <key>name</key>
- <string>linux</string>
- </map>
- <key>linux64</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>ee13f908fb50995ff3cdbc21c3c938ad</string>
- <key>hash_algorithm</key>
- <string>md5</string>
- <key>url</key>
- <string>http://depot.alchemyviewer.org/pub/linux64/lib/libuuid-1.6.2-linux64-201501030156.tar.bz2</string>
- </map>
- <key>name</key>
- <string>linux64</string>
- </map>
- </map>
- <key>version</key>
- <string>1.6.2</string>
- </map>
<key>libxml2</key>
<map>
<key>copyright</key>
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 69c8c7b0ff0ffd55854180717e3297d9e7946e65..82ffd6e458b8fdf4c6db1cc3d8d475df6fefe5d3 100755
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -1,4 +1,3 @@
-include(BerkeleyDB)
include(Linking)
include(Prebuilt)
@@ -49,7 +48,6 @@ else (USESYSTEMLIBS)
set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1)
if (LINUX)
- list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES})
- list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt)
+ list(APPEND APRUTIL_LIBRARIES rt)
endif (LINUX)
endif (USESYSTEMLIBS)
diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake
deleted file mode 100755
index ee670ac6502d0bdf1f07bf50c6d021b9f2e27732..0000000000000000000000000000000000000000
--- a/indra/cmake/BerkeleyDB.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-set(DB_FIND_QUIETLY ON)
-set(DB_FIND_REQUIRED ON)
-
-if (USESYSTEMLIBS)
- include(FindBerkeleyDB)
-else (USESYSTEMLIBS)
- if (LINUX)
- # Need to add dependency pthread explicitely to support ld.gold.
- use_prebuilt_binary(db)
- set(DB_LIBRARIES db-5.1 pthread)
- else (LINUX)
- set(DB_LIBRARIES db-4.2)
- endif (LINUX)
- set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (USESYSTEMLIBS)
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 47c8662f643e6051e78a4381ae23718c18373d20..2f6541f844ca29d67b2b74bd3914261cc1701a30 100755
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -10,7 +10,6 @@ set(cmake_SOURCE_FILES
00-Common.cmake
APR.cmake
Audio.cmake
- BerkeleyDB.cmake
Boost.cmake
BuildVersion.cmake
CARes.cmake
@@ -26,7 +25,6 @@ set(cmake_SOURCE_FILES
ExamplePlugin.cmake
FindAPR.cmake
FindAutobuild.cmake
- FindBerkeleyDB.cmake
FindCARes.cmake
FindCXX14Features.cmake
FindFMODEX.cmake
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 6a6e068c2b12b432aadc4a0dff70fe6bee72049b..e7f7fdc7b8229c4dc90dfc37d0a95d71d39d07da 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -234,7 +234,6 @@ elseif(LINUX)
libapr-1.so.0
libaprutil-1.so.0
libatk-1.0.so
- libdb-5.1.so
libexpat.so
libexpat.so.1
libfreetype.so.6.11.4
@@ -245,8 +244,6 @@ elseif(LINUX)
libgobject-2.0.so
libopenal.so
libopenjpeg.so
- #libuuid.so.16
- #libuuid.so.16.0.22
libfontconfig.so.1.8.0
libfontconfig.so.1
libfontconfig.so
diff --git a/indra/cmake/FindBerkeleyDB.cmake b/indra/cmake/FindBerkeleyDB.cmake
deleted file mode 100755
index 2d633c74ecb3fcd693a9e4ea520eef98249868b8..0000000000000000000000000000000000000000
--- a/indra/cmake/FindBerkeleyDB.cmake
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- cmake -*-
-
-# - Find BerkeleyDB
-# Find the BerkeleyDB includes and library
-# This module defines
-# DB_INCLUDE_DIR, where to find db.h, etc.
-# DB_LIBRARIES, the libraries needed to use BerkeleyDB.
-# DB_FOUND, If false, do not try to use BerkeleyDB.
-# also defined, but not for general use are
-# DB_LIBRARY, where to find the BerkeleyDB library.
-
-FIND_PATH(DB_INCLUDE_DIR db.h
-/usr/local/include/db4
-/usr/local/include
-/usr/include/db4
-/usr/include
-)
-
-SET(DB_NAMES ${DB_NAMES} db)
-FIND_LIBRARY(DB_LIBRARY
- NAMES ${DB_NAMES}
- PATHS /usr/lib /usr/local/lib
- )
-
-IF (DB_LIBRARY AND DB_INCLUDE_DIR)
- SET(DB_LIBRARIES ${DB_LIBRARY})
- SET(DB_FOUND "YES")
-ELSE (DB_LIBRARY AND DB_INCLUDE_DIR)
- SET(DB_FOUND "NO")
-ENDIF (DB_LIBRARY AND DB_INCLUDE_DIR)
-
-
-IF (DB_FOUND)
- IF (NOT DB_FIND_QUIETLY)
- MESSAGE(STATUS "Found BerkeleyDB: ${DB_LIBRARIES}")
- ENDIF (NOT DB_FIND_QUIETLY)
-ELSE (DB_FOUND)
- IF (DB_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find BerkeleyDB library")
- ENDIF (DB_FIND_REQUIRED)
-ENDIF (DB_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_DB_INCLUDE_PATH ${DB_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_DB_LIB_PATH ${DB_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
- DB_LIBRARY
- DB_INCLUDE_DIR
- )
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index 4d95b8812a1be7ee82666ef6218de8e391201163..89478e890c15971f8c8f85193110899042311a2d 100755
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -3,7 +3,6 @@ include(Prebuilt)
if (NOT USESYSTEMLIBS)
if (LINUX)
- use_prebuilt_binary(libuuid)
use_prebuilt_binary(fontconfig)
endif (LINUX)
use_prebuilt_binary(libhunspell)
diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt
index c0fc1b2be0ecce2bceb1b2263c6e29a77c3ca09f..c2b4a4faae1f7206f9dad5f068089d4ee97b48c7 100755
--- a/indra/linux_crash_logger/CMakeLists.txt
+++ b/indra/linux_crash_logger/CMakeLists.txt
@@ -62,7 +62,6 @@ target_link_libraries(linux-crash-logger
${LLMATH_LIBRARIES}
${LLCOMMON_LIBRARIES}
${UI_LIBRARIES}
- ${DB_LIBRARIES}
${FREETYPE_LIBRARIES}
)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index a22eb2bca7194a02e4aebf59767804a54e5f4428..cc698e71f8ea375428beaabadc08be0804b7badc 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1224,10 +1224,8 @@ class Linux_i686_Manifest(LinuxManifest):
self.path("libaprutil-1.so")
self.path("libaprutil-1.so.0")
self.path("libaprutil-1.so.0.4.1")
- self.path("libdb*.so")
self.path("libexpat.so.*")
self.path("libGLOD.so")
- self.path("libuuid.so*")
self.path("libSDL-1.2.so.*")
self.path("libdirectfb-1.*.so.*")
self.path("libfusion-1.*.so.*")
@@ -1334,10 +1332,8 @@ class Linux_x86_64_Manifest(LinuxManifest):
self.path("libaprutil-1.so")
self.path("libaprutil-1.so.0")
self.path("libaprutil-1.so.0.4.1")
- self.path("libdb*.so")
self.path("libexpat.so.*")
self.path("libGLOD.so")
- self.path("libuuid.so*")
self.path("libSDL-1.2.so.*")
self.path("libopenjpeg.so*")
self.path("libhunspell-1.3.so*")