[log4cxx] Update to 0.12.0 (#19963)

* [log4cxx] Update to 0.12.0

* version

* Replace depreciate functions

* version

6 files changed, 56 insertions, 46 deletions

diff --git a/ports/log4cxx/expat.patch b/ports/log4cxx/expat.patch
index 250035021..7dfb0f009 100644
--- a/ports/log4cxx/expat.patch
+++ b/ports/log4cxx/expat.patch
@@ -1,32 +1,31 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d30a71b..3ecf5f0 100644
+index e5b44ef..e84e497 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -23,6 +23,9 @@ find_package(APR REQUIRED)
- # Find Apache Runtime Utilities
- find_package(APR-Util REQUIRED)
+@@ -33,7 +33,7 @@ find_package(APR-Util REQUIRED)
+ find_package( Threads REQUIRED )
  
-+# Find expat for XML parsing
+ # Find expat for XML parsing
+-find_package(EXPAT REQUIRED)
 +find_package(expat CONFIG REQUIRED)
-+
- # Building
- add_subdirectory(src)
  
+ # Request C++17, if available
+ # This *should* fallback to an older standard if it is not available
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3e0cb17..9a450b7 100644
+index b60e54f..b6138b3 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -1,7 +1,7 @@
+@@ -3,7 +3,7 @@ cmake_policy(SET CMP0079 NEW)
  add_subdirectory(main)
  target_compile_definitions(log4cxx PRIVATE ${LOG4CXX_COMPILE_DEFINITIONS} ${APR_COMPILE_DEFINITIONS} ${APR_UTIL_COMPILE_DEFINITIONS} )
  target_include_directories(log4cxx INTERFACE $<INSTALL_INTERFACE:include> PRIVATE ${APR_INCLUDE_DIR} ${APR_UTIL_INCLUDE_DIR})
--target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} ${XMLLIB_LIBRARIES} ${APR_LIBRARIES} ${APR_SYSTEM_LIBS})
+-target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} EXPAT::EXPAT ${APR_LIBRARIES} ${APR_SYSTEM_LIBS})
 +target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} expat::expat ${APR_LIBRARIES} ${APR_SYSTEM_LIBS})
  if(WIN32)
- # The ODBC appender is always enabled in the Windows configuration
- target_link_libraries(log4cxx PRIVATE odbc32.lib)
+ 	# The ODBC appender is always enabled in the Windows configuration
+ 	target_link_libraries(log4cxx PRIVATE odbc32.lib)
 diff --git a/src/cmake/FindAPR-Util.cmake b/src/cmake/FindAPR-Util.cmake
-index bb4e951..75093d8 100644
+index d9cf4df..17a2457 100644
 --- a/src/cmake/FindAPR-Util.cmake
 +++ b/src/cmake/FindAPR-Util.cmake
 @@ -38,7 +38,6 @@ if(EXISTS ${APR_UTIL_CONFIG_EXECUTABLE})
@@ -37,23 +36,14 @@ index bb4e951..75093d8 100644
        set(APR_UTIL_COMPILE_DEFINITIONS APU_DECLARE_STATIC)
      else()
        _apu_invoke(APR_UTIL_LIBRARIES   --link-ld)
-@@ -48,8 +47,6 @@ else()
-     if (APU_STATIC OR NOT BUILD_SHARED_LIBS)
-       set(APR_UTIL_COMPILE_DEFINITIONS APU_DECLARE_STATIC)
-       find_library(APR_UTIL_LIBRARIES NAMES aprutil-1)
--      find_library(XMLLIB_LIBRARIES NAMES libexpat)
--      find_program(XMLLIB_DLL libexpat.dll)
-     else()
-       find_library(APR_UTIL_LIBRARIES NAMES libaprutil-1)
-       find_program(APR_UTIL_DLL libaprutil-1.dll)
 diff --git a/src/test/cpp/xml/CMakeLists.txt b/src/test/cpp/xml/CMakeLists.txt
-index bddfe48..138c489 100644
+index 138c489..7b62f3e 100644
 --- a/src/test/cpp/xml/CMakeLists.txt
 +++ b/src/test/cpp/xml/CMakeLists.txt
 @@ -4,5 +4,5 @@ add_executable(xmltests
      xmllayouttestcase
  )
  
--target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} ${XMLLIB_LIBRARIES})
+-target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} EXPAT::EXPAT)
 +target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} expat::expat)
  set(ALL_LOG4CXX_TESTS ${ALL_LOG4CXX_TESTS} xmltests PARENT_SCOPE)
diff --git a/ports/log4cxx/pkgconfig.patch b/ports/log4cxx/pkgconfig.patch
index 06eb7c00e..ee109775c 100644
--- a/ports/log4cxx/pkgconfig.patch
+++ b/ports/log4cxx/pkgconfig.patch
@@ -1,13 +1,22 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 523fbd9..0467470 100644
+index e84e497..ff8b920 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -66,7 +66,7 @@ if(UNIX)
+@@ -94,7 +94,7 @@ if(UNIX)
    )
  
    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblog4cxx.pc" 
 -    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)
 +    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+   if(LOG4CXX_QT_SUPPORT)
+       set(prefix "${CMAKE_INSTALL_PREFIX}")
+@@ -107,7 +107,7 @@ if(UNIX)
+       )
+ 
+       install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblog4cxx-qt.pc"
+-	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)
++	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+   endif(LOG4CXX_QT_SUPPORT)
  endif(UNIX)
  
- # Support for find_package(log4cxx) in consuming CMake projects using
diff --git a/ports/log4cxx/portfile.cmake b/ports/log4cxx/portfile.cmake
index 7292c0007..102d5eb3e 100644
--- a/ports/log4cxx/portfile.cmake
+++ b/ports/log4cxx/portfile.cmake
@@ -1,8 +1,8 @@
-set(VERSION 0.11.0)

+set(VERSION 0.12.0)

 vcpkg_download_distfile(ARCHIVE

     URLS "https://archive.apache.org/dist/logging/log4cxx/${VERSION}/apache-log4cxx-${VERSION}.tar.gz"

     FILENAME "apache-log4cxx-${VERSION}.tar.gz"

-    SHA512 f8aa37c9c094e7a4d6ca92dff13c032f69f1e078c51ea55e284fcb931c13256b08950af3ea6eaf7a12282240f6073e9acab19bfe217f88dbd62a5d2360f3fbdd  

+    SHA512 00fe571f9c511bf93b17cac8269ce00f7e817e8d723acf62bddff1bbe0e7facd0ab2fd75c01a93870f7e5c66718b2b73fc22c5f193bfd204e34d052b1123e60d  

 )

 

 vcpkg_extract_source_archive_ex(

@@ -15,31 +15,30 @@ vcpkg_extract_source_archive_ex(
         pkgconfig.patch

 )

 

-vcpkg_configure_cmake(

+vcpkg_cmake_configure(

     SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

     OPTIONS

         -DLOG4CXX_INSTALL_PDB=OFF # Installing pdbs failed on debug static. So, disable it and let vcpkg_copy_pdbs() do it

         -DBUILD_TESTING=OFF

 )

 

-vcpkg_install_cmake()

+vcpkg_cmake_install()

+vcpkg_copy_pdbs()

 

-vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/log4cxx)

+vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/log4cxx)

 

 if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)

     vcpkg_fixup_pkgconfig()

 endif()

 

-file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cxxConfig.cmake _contents)

-file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cxxConfig.cmake

+file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cxxConfig.cmake" _contents)

+file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cxxConfig.cmake"

 "include(CMakeFindDependencyMacro)

 find_dependency(expat CONFIG)

-${_contents}")

-

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)

+${_contents}"

+)

 

-vcpkg_copy_pdbs()

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")

 

 # Handle copyright

-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/log4cxx/vcpkg.json b/ports/log4cxx/vcpkg.json
index c10ca2960..e0092cba6 100644
--- a/ports/log4cxx/vcpkg.json
+++ b/ports/log4cxx/vcpkg.json
@@ -1,13 +1,20 @@
 {
   "name": "log4cxx",
-  "version-string": "0.11.0",
-  "port-version": 3,
+  "version-string": "0.12.0",
   "description": "Apache log4cxx is a logging framework for C++ patterned after Apache log4j, which uses Apache Portable Runtime for most platform-specific code and should be usable on any platform supported by APR",
   "homepage": "https://logging.apache.org/log4cxx",
   "supports": "!uwp",
   "dependencies": [
     "apr",
     "apr-util",
-    "expat"
+    "expat",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 65f30a0e5..e321afb99 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4065,8 +4065,8 @@
       "port-version": 5
     },
     "log4cxx": {
-      "baseline": "0.11.0",
-      "port-version": 3
+      "baseline": "0.12.0",
+      "port-version": 0
     },
     "loguru": {
       "baseline": "2.1.0",
diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json
index 7b2598b2a..dcc83c471 100644
--- a/versions/l-/log4cxx.json
+++ b/versions/l-/log4cxx.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "3a0d34c9d2f6f0d0811bdb43d1a233e025963185",
+      "version-string": "0.12.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "406017355e07d94a41999c3db5e015be8bf0fbbd",
       "version-string": "0.11.0",
       "port-version": 3