Skip to content

Commit 19f945a

Browse files
MonicaLiu0311Monica
andauthored
[log4cxx] update to 1.3.1 (microsoft#42943)
Co-authored-by: Monica <[email protected]>
1 parent caaabe3 commit 19f945a

File tree

5 files changed

+12
-15
lines changed

5 files changed

+12
-15
lines changed

ports/log4cxx/fix-find-package.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 7b1c0d52..62c4fb43 100644
2+
index 498d0b5..22815a5 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -70,7 +70,7 @@ find_package( Threads REQUIRED )
6-
include("${CMAKE_CURRENT_LIST_DIR}/src/cmake/FindLibFuzzer.cmake")
5+
@@ -67,7 +67,7 @@ find_package(APR-Util REQUIRED)
6+
find_package( Threads REQUIRED )
77

88
# Find expat for XML parsing
99
-find_package(EXPAT REQUIRED)

ports/log4cxx/portfile.cmake

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
11
vcpkg_download_distfile(ARCHIVE
22
URLS "https://archive.apache.org/dist/logging/log4cxx/${VERSION}/apache-log4cxx-${VERSION}.tar.gz"
33
FILENAME "apache-log4cxx-${VERSION}.tar.gz"
4-
SHA512 bd481d69e29b3c8908bbc91489bf4e752e6edb147404454c0e88fd8f107d68ae5a98e220ab912692e555ca071d1cff7fb99ffa51194cfa7d070593ce6285d2b0
5-
)
6-
7-
vcpkg_download_distfile(MAKE_PKG_CONFIG_SUPPORT_OPT_IN
8-
URLS https://github.com/apache/logging-log4cxx/commit/4642a50c70b6cbd9b68d7e8dace9c049c8198b07.patch?full_index=1
9-
SHA512 4b3628d98d233a2e68d1183a8bb2156c2f1e6f80ab50cfe75a6df799d14bc3c7ba028fbb7ff524c56530a2260be37fd9f3d089422027987b5c8c36e9978c254c
10-
FILENAME Make_pkg_config_support_opt_in-4642a50c70b6cbd9b68d7e8dace9c049c8198b07.patch
4+
SHA512 0956fd034fd1a98d2e48ed461578c1e85da02d176850a580195b6a60b959feaf402a2743cc84ccb5d467dd924ee46422b8a7b39d2be9ee131e4e275e65ba839c
115
)
126

137
vcpkg_extract_source_archive(
148
SOURCE_PATH ARCHIVE "${ARCHIVE}"
159
PATCHES
1610
fix-find-package.patch
17-
${MAKE_PKG_CONFIG_SUPPORT_OPT_IN}
1811
)
1912

2013
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -48,5 +41,4 @@ ${_contents}"
4841

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

51-
# Handle copyright
52-
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
44+
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

ports/log4cxx/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "log4cxx",
3-
"version": "1.3.0",
3+
"version": "1.3.1",
44
"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",
55
"homepage": "https://logging.apache.org/log4cxx",
66
"license": "Apache-2.0",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5613,7 +5613,7 @@
56135613
"port-version": 0
56145614
},
56155615
"log4cxx": {
5616-
"baseline": "1.3.0",
5616+
"baseline": "1.3.1",
56175617
"port-version": 0
56185618
},
56195619
"loguru": {

versions/l-/log4cxx.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "699df3eeb8f994155f24dd335626fc938f7dc412",
5+
"version": "1.3.1",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "fb973202e7b0a9c6060e23b92fee4b33df52204a",
510
"version": "1.3.0",

0 commit comments

Comments
 (0)