[log4cplus/muparser/nmslib] Update to the latest version (#13585)

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

3 files changed, 8 insertions, 114 deletions

diff --git a/ports/log4cplus/CONTROL b/ports/log4cplus/CONTROL
index 99771644a..9a288a1b3 100644
--- a/ports/log4cplus/CONTROL
+++ b/ports/log4cplus/CONTROL
@@ -1,5 +1,5 @@
 Source: log4cplus
-Version: 2.0.4-1
+Version: 2.0.5
 Homepage: https://github.com/log4cplus/log4cplus
 Description: A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration
 Build-Depends: catch
diff --git a/ports/log4cplus/fix-usage-error.patch b/ports/log4cplus/fix-usage-error.patch
deleted file mode 100644
index 4a2753ffc..000000000
--- a/ports/log4cplus/fix-usage-error.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/qt4debugappender/CMakeLists.txt b/qt4debugappender/CMakeLists.txt
-index 2f28be5..0a98704 100644
---- a/qt4debugappender/CMakeLists.txt
-+++ b/qt4debugappender/CMakeLists.txt
-@@ -4,15 +4,17 @@ set (qt4debugappender_sources
- if (${BUILD_SHARED_LIBS})
-   add_definitions (-D${log4cplus}_EXPORTS)
- endif ()
--if (UNICODE)
--  add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS)
--endif (UNICODE)
- 
- find_package (Qt4 REQUIRED)
- include (${QT_USE_FILE})
- 
- set (qt4debugappender log4cplusqt4debugappender${log4cplus_postfix})
- add_library (${qt4debugappender} ${qt4debugappender_sources})
-+if (UNICODE)
-+  target_compile_definitions (${qt4debugappender} PUBLIC UNICODE)
-+  target_compile_definitions (${qt4debugappender} PUBLIC _UNICODE)
-+  add_definitions (-UMBCS -U_MBCS)
-+endif (UNICODE)
- target_link_libraries (${qt4debugappender}
-   ${log4cplus}
-   ${QT_LIBRARIES}
-diff --git a/qt5debugappender/CMakeLists.txt b/qt5debugappender/CMakeLists.txt
-index 9570e76..de6fecf 100644
---- a/qt5debugappender/CMakeLists.txt
-+++ b/qt5debugappender/CMakeLists.txt
-@@ -4,15 +4,17 @@ set (qt5debugappender_sources
- if (${BUILD_SHARED_LIBS})
-   add_definitions (-D${log4cplus}_EXPORTS)
- endif ()
--if (UNICODE)
--  add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS)
--endif (UNICODE)
- 
- find_package (Qt5Core REQUIRED)
- #include (${QT_USE_FILE})
- 
- set (qt5debugappender log4cplusqt5debugappender${log4cplus_postfix})
- add_library (${qt5debugappender} ${qt5debugappender_sources})
-+if (UNICODE)
-+  target_compile_definitions (${qt5debugappender} PUBLIC UNICODE)
-+  target_compile_definitions (${qt5debugappender} PUBLIC _UNICODE)
-+  add_definitions (-UMBCS -U_MBCS)
-+endif (UNICODE)
- target_link_libraries (${qt5debugappender}
-   ${log4cplus}
-   ${Qt5Widgets_LIBRARIES}
-diff --git a/simpleserver/CMakeLists.txt b/simpleserver/CMakeLists.txt
-index e535120..5202f42 100644
---- a/simpleserver/CMakeLists.txt
-+++ b/simpleserver/CMakeLists.txt
-@@ -1,14 +1,15 @@
--if (UNICODE)
--  add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS)
--endif (UNICODE)
--
- message (STATUS "Threads: ${CMAKE_THREAD_LIBS_INIT}")
--
- set (loggingserver_sources loggingserver.cxx)
- 
- message (STATUS "Sources: ${loggingserver_sources}")
- 
--add_executable (loggingserver ${loggingserver_sources})
--target_link_libraries (loggingserver ${log4cplus})
-+set (loggingserver loggingserver${log4cplus_postfix})
-+add_executable (${loggingserver} ${loggingserver_sources})
-+if (UNICODE)
-+  target_compile_definitions (${loggingserver} PUBLIC UNICODE)
-+  target_compile_definitions (${loggingserver} PUBLIC _UNICODE)
-+  add_definitions (-UMBCS -U_MBCS)
-+endif (UNICODE)
-+target_link_libraries (${loggingserver} ${log4cplus})
- 
--install(TARGETS loggingserver DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(TARGETS ${loggingserver} DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b7b7ad8..91e0c63 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -67,9 +67,6 @@ endif ()
- 
- # Define _GNU_SOURCE so that functions like `pipe2()` are visible.
- add_definitions (-D_GNU_SOURCE=1)
--if (UNICODE)
--  add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS)
--endif (UNICODE)
- if (WIN32)
-   add_definitions (-DMINGW_HAS_SECURE_API=1)
-   add_definitions (-D_WIN32_WINNT=${_WIN32_WINNT})
-@@ -85,6 +82,12 @@ endif (WIN32)
- 
- add_library (${log4cplus} ${log4cplus_sources})
- 
-+if (UNICODE)
-+  target_compile_definitions (${log4cplus} PUBLIC UNICODE)
-+  target_compile_definitions (${log4cplus} PUBLIC _UNICODE)
-+  add_definitions (-UMBCS -U_MBCS)
-+endif (UNICODE)
-+
- set (log4cplus_LIBS ${CMAKE_THREAD_LIBS_INIT})
- if (LIBRT)
-   list (APPEND log4cplus_LIBS ${LIBRT})
diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake
index 28056958d..a8862e725 100644
--- a/ports/log4cplus/portfile.cmake
+++ b/ports/log4cplus/portfile.cmake
@@ -1,12 +1,9 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO log4cplus/log4cplus
-    REF REL_2_0_4
-    SHA512 194e37b8de7be377dabe911d1cec831de41f5ce14dd617b5333739a7ab8dbc3061aa24351abe811588db507aa1563a637023b26684fb21bbfc88d24b4e4ce062
+    REF 9d00f7d10f2507f68f9ab5fea8b842735d9c6cfe # REL_2_0_5
+    SHA512 b64a1d3a60584b2ba3a58470a0b0ec4c22eb0c054c0ef8ef3808fcba5604860fbd5b2d96148939ea15d3bf2ff1e40e684710dc81b57b73232851a486251f648d
     HEAD_REF master
-    PATCHES fix-usage-error.patch
 )
 
 vcpkg_from_github(
@@ -29,7 +26,10 @@ file(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DLOG4CPLUS_BUILD_TESTING=OFF -DLOG4CPLUS_BUILD_LOGGINGSERVER=OFF -DWITH_UNIT_TESTS=OFF
+    OPTIONS 
+        -DLOG4CPLUS_BUILD_TESTING=OFF 
+        -DLOG4CPLUS_BUILD_LOGGINGSERVER=OFF 
+        -DWITH_UNIT_TESTS=OFF
 )
 
 vcpkg_install_cmake()
@@ -42,5 +42,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/log4cplus)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/log4cplus/LICENSE ${CURRENT_PACKAGES_DIR}/share/log4cplus/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file