Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

17 files changed, 25 insertions, 58 deletions

diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake
index b531f29ee2..aa151bafc8 100644
--- a/indra/cmake/BuildVersion.cmake
+++ b/indra/cmake/BuildVersion.cmake
@@ -39,7 +39,7 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n
         endif (DEFINED ENV{revision})
         message(STATUS "Building '${VIEWER_CHANNEL}' Version ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}")
     else ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
-        message(SEND_ERROR "Cannot get viewer version from '${VIEWER_VERSION_BASE_FILE}'") 
+        message(SEND_ERROR "Cannot get viewer version from '${VIEWER_VERSION_BASE_FILE}'")
     endif ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
 
     if ("${VIEWER_VERSION_REVISION}" STREQUAL "")
diff --git a/indra/cmake/CMakeCopyIfDifferent.cmake b/indra/cmake/CMakeCopyIfDifferent.cmake
index 55e71ff153..fe6806e38b 100644
--- a/indra/cmake/CMakeCopyIfDifferent.cmake
+++ b/indra/cmake/CMakeCopyIfDifferent.cmake
@@ -10,20 +10,20 @@
 
 MACRO(COPY_IF_DIFFERENT FROM_DIR TO_DIR TARGETS)
 # Macro to implement copy_if_different for a list of files
-# Arguments - 
+# Arguments -
 #   FROM_DIR - this is the source directory
 #   TO_DIR   - this is the destination directory
 #   TARGETS  - A variable to receive a list of targets
-#   FILES    - names of the files to copy 
-#              TODO: add globing. 
+#   FILES    - names of the files to copy
+#              TODO: add globing.
 SET(AddTargets "")
 FOREACH(SRC ${ARGN})
-    GET_FILENAME_COMPONENT(SRCFILE ${SRC} NAME) 
+    GET_FILENAME_COMPONENT(SRCFILE ${SRC} NAME)
     IF("${FROM_DIR}" STREQUAL "")
         SET(FROM ${SRC})
     ELSE("${FROM_DIR}" STREQUAL "")
         SET(FROM ${FROM_DIR}/${SRC})
-    ENDIF("${FROM_DIR}" STREQUAL "")        
+    ENDIF("${FROM_DIR}" STREQUAL "")
     IF("${TO_DIR}" STREQUAL "")
         SET(TO ${SRCFILE})
     ELSE("${TO_DIR}" STREQUAL "")
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 3a7fe7302e..e1507bf6a0 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -29,7 +29,6 @@ set(cmake_SOURCE_FILES
         GoogleMock.cmake
         Havok.cmake
         Hunspell.cmake
-        ICU4C.cmake
         JsonCpp.cmake
         LLAddBuildTest.cmake
         LLAppearance.cmake
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 9f577bc9bc..e3fbf7234f 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -62,15 +62,6 @@ if(WINDOWS)
         uriparser.dll
         )
 
-    # ICU4C (same filenames for 32 and 64 bit builds)
-    set(release_files ${release_files} icudt48.dll)
-    set(release_files ${release_files} icuin48.dll)
-    set(release_files ${release_files} icuio48.dll)
-    set(release_files ${release_files} icule48.dll)
-    set(release_files ${release_files} iculx48.dll)
-    set(release_files ${release_files} icutu48.dll)
-    set(release_files ${release_files} icuuc48.dll)
-
     # OpenSSL
     if(ADDRESS_SIZE EQUAL 64)
         set(release_files ${release_files} libcrypto-1_1-x64.dll)
diff --git a/indra/cmake/DeploySharedLibs.cmake b/indra/cmake/DeploySharedLibs.cmake
index 9d6cf0cb35..fe9ffcd8f1 100644
--- a/indra/cmake/DeploySharedLibs.cmake
+++ b/indra/cmake/DeploySharedLibs.cmake
@@ -5,7 +5,7 @@
 # This  script requires a few cmake variable to be set on the command line:
 # BIN_NAME= The full path the the binary to search for dependecies.
 # SEARCH_DIRS= The full paths to dirs to search for dependencies.
-# DST_PATH= The full path where the dependecies will be copied. 
+# DST_PATH= The full path where the dependecies will be copied.
 
 include(GetPrerequisites)
 
diff --git a/indra/cmake/FindAutobuild.cmake b/indra/cmake/FindAutobuild.cmake
index ea5ad6d108..79287d4e01 100644
--- a/indra/cmake/FindAutobuild.cmake
+++ b/indra/cmake/FindAutobuild.cmake
@@ -22,11 +22,11 @@ IF (NOT AUTOBUILD_EXECUTABLE)
 
     SET(AUTOBUILD_EXECUTABLE)
     FIND_PROGRAM(
-      AUTOBUILD_EXECUTABLE 
+      AUTOBUILD_EXECUTABLE
       NAMES ${AUTOBUILD_EXE_NAMES}
-      PATHS 
+      PATHS
         ENV PATH
-        ${CMAKE_SOURCE_DIR}/.. 
+        ${CMAKE_SOURCE_DIR}/..
         ${CMAKE_SOURCE_DIR}/../..
         ${CMAKE_SOURCE_DIR}/../../..
       PATH_SUFFIXES "/autobuild/bin/"
diff --git a/indra/cmake/GoogleMock.cmake b/indra/cmake/GoogleMock.cmake
index e4520fe96e..c3d195c37b 100644
--- a/indra/cmake/GoogleMock.cmake
+++ b/indra/cmake/GoogleMock.cmake
@@ -9,7 +9,7 @@ if(USE_CONAN)
   target_link_libraries( ll::googlemock INTERFACE  CONAN_PKG::gtest )
 
   #Not very nice, but for the moment we need this for tut.hpp
-  target_include_directories( ll::googlemock SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include ) 
+  target_include_directories( ll::googlemock SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include )
   return()
 endif()
 
diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake
index 652760e626..c544440adc 100644
--- a/indra/cmake/Havok.cmake
+++ b/indra/cmake/Havok.cmake
@@ -77,7 +77,7 @@ foreach(HAVOK_LIB ${HAVOK_LIBS})
   find_library(HAVOK_DEBUG_LIB_${HAVOK_LIB}   ${HAVOK_LIB} PATHS ${HAVOK_DEBUG_LIBRARY_PATH})
   find_library(HAVOK_RELEASE_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_RELEASE_LIBRARY_PATH})
   find_library(HAVOK_RELWITHDEBINFO_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_RELWITHDEBINFO_LIBRARY_PATH})
-  
+
   if(LINUX)
     set(debug_dir "${HAVOK_DEBUG_LIBRARY_PATH}/${HAVOK_LIB}")
     set(release_dir "${HAVOK_RELEASE_LIBRARY_PATH}/${HAVOK_LIB}")
diff --git a/indra/cmake/ICU4C.cmake b/indra/cmake/ICU4C.cmake
deleted file mode 100644
index 8382ceef1e..0000000000
--- a/indra/cmake/ICU4C.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-include_guard()
-
-add_library( ll::icu4c INTERFACE IMPORTED )
-
-
-use_system_binary(icu4c)
-use_prebuilt_binary(icu4c)
-if (WINDOWS)
-  target_link_libraries( ll::icu4c INTERFACE  icuuc)
-elseif(DARWIN)
-  target_link_libraries( ll::icu4c INTERFACE  icuuc)
-elseif(LINUX)
-  target_link_libraries( ll::icu4c INTERFACE  ${LIBS_PREBUILT_DIR}/lib/libicuuc.a)
-else()
-  message(FATAL_ERROR "Invalid platform")
-endif()
-
-target_include_directories( ll::icu4c SYSTEM INTERFACE  ${LIBS_PREBUILT_DIR}/include/unicode )
-
-use_prebuilt_binary(dictionaries)
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake
index fda25610da..668b07ffab 100644
--- a/indra/cmake/LLKDU.cmake
+++ b/indra/cmake/LLKDU.cmake
@@ -1,7 +1,7 @@
 # -*- cmake -*-
 
 # USE_KDU can be set when launching cmake as an option using the argument -DUSE_KDU:BOOL=ON
-# When building using proprietary binaries though (i.e. having access to LL private servers), 
+# When building using proprietary binaries though (i.e. having access to LL private servers),
 # we always build with KDU
 if (INSTALL_PROPRIETARY)
   set(USE_KDU ON CACHE BOOL "Use Kakadu library.")
diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake
index 36821447c9..80d243d9f8 100644
--- a/indra/cmake/LLPhysicsExtensions.cmake
+++ b/indra/cmake/LLPhysicsExtensions.cmake
@@ -3,7 +3,7 @@ include(Prebuilt)
 
 # There are three possible solutions to provide the llphysicsextensions:
 # - The full source package, selected by -DHAVOK:BOOL=ON
-# - The stub source package, selected by -DHAVOK:BOOL=OFF 
+# - The stub source package, selected by -DHAVOK:BOOL=OFF
 # - The prebuilt package available to those with sublicenses, selected by -DHAVOK_TPV:BOOL=ON
 
 if (INSTALL_PROPRIETARY)
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 3d8499cbc3..735f5e8052 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -14,7 +14,7 @@ add_library( ll::colladadom INTERFACE IMPORTED )
 # ND, needs fixup in collada conan pkg
 if( USE_CONAN )
   target_include_directories( ll::colladadom SYSTEM INTERFACE
-    "${CONAN_INCLUDE_DIRS_COLLADADOM}/collada-dom/" 
+    "${CONAN_INCLUDE_DIRS_COLLADADOM}/collada-dom/"
     "${CONAN_INCLUDE_DIRS_COLLADADOM}/collada-dom/1.4/" )
 endif()
 
diff --git a/indra/cmake/LLSharedLibs.cmake b/indra/cmake/LLSharedLibs.cmake
index e3e2a3b0c6..48149129d6 100644
--- a/indra/cmake/LLSharedLibs.cmake
+++ b/indra/cmake/LLSharedLibs.cmake
@@ -1,6 +1,6 @@
 # ll_deploy_sharedlibs_command
 # target_exe: the cmake target of the executable for which the shared libs will be deployed.
-macro(ll_deploy_sharedlibs_command target_exe) 
+macro(ll_deploy_sharedlibs_command target_exe)
   set(TARGET_LOCATION $<TARGET_FILE:${target_exe}>)
   get_filename_component(OUTPUT_PATH ${TARGET_LOCATION} PATH)
 
@@ -26,7 +26,7 @@ macro(ll_deploy_sharedlibs_command target_exe)
 
     add_custom_command(
       TARGET ${target_exe} POST_BUILD
-      COMMAND ${CMAKE_COMMAND} 
+      COMMAND ${CMAKE_COMMAND}
       ARGS
       "-DBIN_NAME=\"${TARGET_LOCATION}\""
       "-DSEARCH_DIRS=\"${SEARCH_DIRS}\""
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index 1ce21c11f9..0ab30d0800 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -11,7 +11,7 @@ if (WINDOWS OR DARWIN )
   # Kludge for older cmake versions, 3.20+ is needed to use a genex in add_custom_command( OUTPUT <var> ... )
   # Using this will work okay-ish, as Debug is not supported anyway. But for property multi config and also
   # ninja support the genex version is preferred.
-  if(${CMAKE_VERSION} VERSION_LESS "3.20.0")  
+  if(${CMAKE_VERSION} VERSION_LESS "3.20.0")
     if(CMAKE_BUILD_TYPE MATCHES Release)
       set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/Release)
     elseif (CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
diff --git a/indra/cmake/TinyGLTF.cmake b/indra/cmake/TinyGLTF.cmake
index bb731637a0..92b2de309f 100644
--- a/indra/cmake/TinyGLTF.cmake
+++ b/indra/cmake/TinyGLTF.cmake
@@ -3,5 +3,5 @@ include(Prebuilt)
 
 use_prebuilt_binary(tinygltf)
 
-set(TINYGLTF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tinygltf) 
+set(TINYGLTF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tinygltf)
 
diff --git a/indra/cmake/cmake_dummy.cpp b/indra/cmake/cmake_dummy.cpp
index ae4475a73e..21a47a9b14 100644
--- a/indra/cmake/cmake_dummy.cpp
+++ b/indra/cmake/cmake_dummy.cpp
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file cmake_dummy.cpp
  *
  * $LicenseInfo:firstyear=2008&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library 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 for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py
index 1f040bded5..940a130a50 100755
--- a/indra/cmake/run_build_test.py
+++ b/indra/cmake/run_build_test.py
@@ -152,7 +152,7 @@ def translate_rc(rc):
     """
     if rc is None:
         return "still running"
-    
+
     if rc >= 0:
         return "terminated with rc %s" % rc