[log4cxx] Add 1.3.0 (#41927)

Co-authored-by: Stephen Webb <[email protected]>
microsoft · Nov 11, 2024 · a54c4ba · a54c4ba
1 parent e9235c7
commit a54c4ba
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/ports/log4cxx/fix-find-package.patch b/ports/log4cxx/fix-find-package.patch
@@ -1,9 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 61c0479..3bd3327 100644
+index 7b1c0d52..62c4fb43 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -60,7 +60,7 @@ find_package(APR-Util REQUIRED)
- find_package( Threads REQUIRED )
+@@ -70,7 +70,7 @@ find_package( Threads REQUIRED )
+ include("${CMAKE_CURRENT_LIST_DIR}/src/cmake/FindLibFuzzer.cmake")
 
  # Find expat for XML parsing
 -find_package(EXPAT REQUIRED)

diff --git a/ports/log4cxx/portfile.cmake b/ports/log4cxx/portfile.cmake
@@ -1,13 +1,20 @@
 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 377234407c5f1128fbff6e5d2fcda3f53aae275962cd9207257674fa016095f4bc4ac0c318c1ba2a75f3252402cce0776c1211ffa917a60f8a89a12f01d45efb
+    SHA512 bd481d69e29b3c8908bbc91489bf4e752e6edb147404454c0e88fd8f107d68ae5a98e220ab912692e555ca071d1cff7fb99ffa51194cfa7d070593ce6285d2b0
+)
+
+vcpkg_download_distfile(MAKE_PKG_CONFIG_SUPPORT_OPT_IN
+  URLS https://github.com/apache/logging-log4cxx/commit/4642a50c70b6cbd9b68d7e8dace9c049c8198b07.patch?full_index=1
+  SHA512 4b3628d98d233a2e68d1183a8bb2156c2f1e6f80ab50cfe75a6df799d14bc3c7ba028fbb7ff524c56530a2260be37fd9f3d089422027987b5c8c36e9978c254c
+  FILENAME Make_pkg_config_support_opt_in-4642a50c70b6cbd9b68d7e8dace9c049c8198b07.patch
 )
 
 vcpkg_extract_source_archive(
     SOURCE_PATH ARCHIVE "${ARCHIVE}"
     PATCHES
         fix-find-package.patch
+        ${MAKE_PKG_CONFIG_SUPPORT_OPT_IN}
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

diff --git a/ports/log4cxx/vcpkg.json b/ports/log4cxx/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "log4cxx",
-  "version": "1.2.0",
-  "port-version": 1,
+  "version": "1.3.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",
   "license": "Apache-2.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5585,8 +5585,8 @@
       "port-version": 0
     },
     "log4cxx": {
-      "baseline": "1.2.0",
-      "port-version": 1
+      "baseline": "1.3.0",
+      "port-version": 0
     },
     "loguru": {
       "baseline": "2.1.0",

diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fb973202e7b0a9c6060e23b92fee4b33df52204a",
+      "version": "1.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "69b1cd84fe4dce29fda6b300bf18ebc8de1aa0de",
       "version": "1.2.0",