From 081960079bd647d063b253c464bf905c2c914e0e Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Thu, 9 Apr 2026 13:03:37 +1000 Subject: [PATCH 1/4] Upgrade Log4cxx to 1.7.0 --- ports/log4cxx/portfile.cmake | 2 +- ports/log4cxx/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 4 ++-- versions/l-/log4cxx.json | 5 +++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ports/log4cxx/portfile.cmake b/ports/log4cxx/portfile.cmake index 916dcb1cf24430..f67c3c344dce5c 100644 --- a/ports/log4cxx/portfile.cmake +++ b/ports/log4cxx/portfile.cmake @@ -1,7 +1,7 @@ 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 6ee406314bd7ab02a46c98cc8a0d5ad5aec8928a23716a81a152775ca315cd3b950d600b2e221d5b4a88416ae9bbda1215fae43626107feea4df2f3e074303ad + SHA512 0e94946457423689af6d85074ab97b717e0cec85a4f548e6650b060e8f98b780f980b7d4a7780410fa64681376fb4bc62fab6ed9068fc944e07f9f32ac0413af ) vcpkg_extract_source_archive( diff --git a/ports/log4cxx/vcpkg.json b/ports/log4cxx/vcpkg.json index 331fec721ad306..8947d63664faf5 100644 --- a/ports/log4cxx/vcpkg.json +++ b/ports/log4cxx/vcpkg.json @@ -1,7 +1,6 @@ { "name": "log4cxx", - "version": "1.6.1", - "port-version": 1, + "version": "1.7.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", @@ -37,6 +36,15 @@ "default-features": false } ] + }, + "qt6": { + "description": "Allow QString values in the LOG4CXX_WARN, LOG4CXX_INFO, LOG4CXX_DEBUG etc. macros", + "dependencies": [ + { + "name": "qtbase", + "default-features": false + } + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 27d60fd1eb833d..ecfcf8ce874682 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6101,8 +6101,8 @@ "port-version": 0 }, "log4cxx": { - "baseline": "1.6.1", - "port-version": 1 + "baseline": "1.7.0", + "port-version": 0 }, "logme": { "baseline": "2.4.14", diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json index bcd3cfc3941b88..60b1a3f1cd3766 100644 --- a/versions/l-/log4cxx.json +++ b/versions/l-/log4cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff79bc9d3882ee12ae5613c6af0c172ad7df367f", + "version": "1.7.0", + "port-version": 0 + }, { "git-tree": "5c8b00c1fc97b2cd862922240686dc170692226c", "version": "1.6.1", From 95d1fdac441f5a20a902e344f490b1978d8d59a8 Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Thu, 9 Apr 2026 13:11:35 +1000 Subject: [PATCH 2/4] Enable Qt support when using Qt6 --- ports/log4cxx/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/log4cxx/portfile.cmake b/ports/log4cxx/portfile.cmake index f67c3c344dce5c..81982790dd6a06 100644 --- a/ports/log4cxx/portfile.cmake +++ b/ports/log4cxx/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_extract_source_archive( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES qt LOG4CXX_QT_SUPPORT + qt6 LOG4CXX_QT_SUPPORT fmt ENABLE_FMT_LAYOUT fmt ENABLE_FMT_ASYNC fmt VCPKG_LOCK_FIND_PACKAGE_fmt From fe063c93e0d1afc9354968926c2933938a13c60b Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Thu, 9 Apr 2026 15:10:31 +1000 Subject: [PATCH 3/4] Fix git-tree hash --- versions/l-/log4cxx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json index 60b1a3f1cd3766..05a8d4edef2824 100644 --- a/versions/l-/log4cxx.json +++ b/versions/l-/log4cxx.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ff79bc9d3882ee12ae5613c6af0c172ad7df367f", + "git-tree": "daf90f7b7ad960ae47322d5b339725c7980972c9", "version": "1.7.0", "port-version": 0 }, From dcaf971cb5b90e8a53ff3b07f132e859dce85e47 Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Thu, 9 Apr 2026 16:12:59 +1000 Subject: [PATCH 4/4] qt feature now depends on qtbase (Qt6) --- ports/log4cxx/portfile.cmake | 1 - ports/log4cxx/vcpkg.json | 9 --------- versions/l-/log4cxx.json | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/ports/log4cxx/portfile.cmake b/ports/log4cxx/portfile.cmake index 81982790dd6a06..f67c3c344dce5c 100644 --- a/ports/log4cxx/portfile.cmake +++ b/ports/log4cxx/portfile.cmake @@ -11,7 +11,6 @@ vcpkg_extract_source_archive( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES qt LOG4CXX_QT_SUPPORT - qt6 LOG4CXX_QT_SUPPORT fmt ENABLE_FMT_LAYOUT fmt ENABLE_FMT_ASYNC fmt VCPKG_LOCK_FIND_PACKAGE_fmt diff --git a/ports/log4cxx/vcpkg.json b/ports/log4cxx/vcpkg.json index 8947d63664faf5..75882b92d6f094 100644 --- a/ports/log4cxx/vcpkg.json +++ b/ports/log4cxx/vcpkg.json @@ -29,15 +29,6 @@ "description": "Synchronizes rollover when multiple process log to the same file" }, "qt": { - "description": "Allow QString values in the LOG4CXX_WARN, LOG4CXX_INFO, LOG4CXX_DEBUG etc. macros", - "dependencies": [ - { - "name": "qt5-base", - "default-features": false - } - ] - }, - "qt6": { "description": "Allow QString values in the LOG4CXX_WARN, LOG4CXX_INFO, LOG4CXX_DEBUG etc. macros", "dependencies": [ { diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json index 05a8d4edef2824..a31b34fdefcd8b 100644 --- a/versions/l-/log4cxx.json +++ b/versions/l-/log4cxx.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "daf90f7b7ad960ae47322d5b339725c7980972c9", + "git-tree": "5cd7c09e1cb7f87e7d8d1b42cf6d2b0848a0b12e", "version": "1.7.0", "port-version": 0 },