Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[cppmicroservices] update to 3.8.6 (#43830)

This commit is contained in:
toge 2025-02-28 21:07:53 +09:00 committed by GitHub
parent 4921a996e1
commit 784b7c165c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 62 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ports/cppmicroservices/devendor_boost_absl.patch
View File

@ -1,13 +1,10 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55b99bb765..85b4484990 100644
index 87cfb37..d7fbd20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -692,9 +692,9 @@ endif()
#-----------------------------------------------------------------------------
@@ -693,7 +693,7 @@ endif()
# Compile libraries here if you do not want -Werror or /WX on
#-----------------------------------------------------------------------------
-add_subdirectory(third_party/absl)
+find_package(absl CONFIG REQUIRED)
set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries" FORCE)
-add_subdirectory(third_party/boost/nowide)
+find_package(Boost COMPONENTS nowide CONFIG REQUIRED)
@ -15,7 +12,7 @@ index 55b99bb765..85b4484990 100644
#-----------------------------------------------------------------------------
diff --git a/cmake/usBundleConfig.cmake.in b/cmake/usBundleConfig.cmake.in
index c9cf743790..078c5b3fad 100644
index c9cf743..f0ab1ca 100644
--- a/cmake/usBundleConfig.cmake.in
+++ b/cmake/usBundleConfig.cmake.in
@@ -3,6 +3,10 @@
@ -30,7 +27,7 @@ index c9cf743790..078c5b3fad 100644
include("${CMAKE_CURRENT_LIST_DIR}/us@PROJECT_NAME@Targets.cmake")
endif()
diff --git a/compendium/CMakeLists.txt b/compendium/CMakeLists.txt
index a5713313ec..d26ac7e4fe 100644
index a571331..d26ac7e 100644
--- a/compendium/CMakeLists.txt
+++ b/compendium/CMakeLists.txt
@@ -1,3 +1,4 @@
@ -39,7 +36,7 @@ index a5713313ec..d26ac7e4fe 100644
add_subdirectory(test_bundles)
endif()
diff --git a/compendium/ConfigurationAdmin/src/CMAsyncWorkService.cpp b/compendium/ConfigurationAdmin/src/CMAsyncWorkService.cpp
index 50f02e6e1f..fdfa45d991 100644
index 50f02e6..fdfa45d 100644
--- a/compendium/ConfigurationAdmin/src/CMAsyncWorkService.cpp
+++ b/compendium/ConfigurationAdmin/src/CMAsyncWorkService.cpp
@@ -22,10 +22,10 @@
@ -58,10 +55,10 @@ index 50f02e6e1f..fdfa45d991 100644
namespace cppmicroservices
{
diff --git a/compendium/ConfigurationAdmin/src/CMakeLists.txt b/compendium/ConfigurationAdmin/src/CMakeLists.txt
index f2eca66ce7..8d7c8bd671 100644
index a079c20..2657610 100644
--- a/compendium/ConfigurationAdmin/src/CMakeLists.txt
+++ b/compendium/ConfigurationAdmin/src/CMakeLists.txt
@@ -25,7 +25,7 @@ set(_private_headers
@@ -28,7 +28,7 @@ set(_private_headers
)
add_library(ConfigurationAdminObjs OBJECT ${_srcs} ${_private_headers})
@ -71,7 +68,7 @@ index f2eca66ce7..8d7c8bd671 100644
get_property(_compile_flags TARGET ConfigurationAdminObjs PROPERTY COMPILE_FLAGS)
set_property(TARGET ConfigurationAdminObjs PROPERTY COMPILE_FLAGS "${_compile_flags} -fPIC")
diff --git a/compendium/DeclarativeServices/CMakeLists.txt b/compendium/DeclarativeServices/CMakeLists.txt
index 24f2820fa5..cb518781b4 100644
index 2920189..810b00b 100755
--- a/compendium/DeclarativeServices/CMakeLists.txt
+++ b/compendium/DeclarativeServices/CMakeLists.txt
@@ -37,14 +37,14 @@ endif()
@ -81,7 +78,7 @@ index 24f2820fa5..cb518781b4 100644
-
+find_package(Boost COMPONENTS asio CONFIG REQUIRED)
usMacroCreateBundle(DeclarativeServices
VERSION "1.5.10"
VERSION "1.5.13"
DEPENDS Framework
TARGET DeclarativeServices
SYMBOLIC_NAME declarative_services
@ -92,22 +89,23 @@ index 24f2820fa5..cb518781b4 100644
SOURCES $<TARGET_OBJECTS:DeclarativeServicesObjs> src/SCRActivator.cpp
BINARY_RESOURCES manifest.json
diff --git a/compendium/DeclarativeServices/src/CMakeLists.txt b/compendium/DeclarativeServices/src/CMakeLists.txt
index d25961b6d7..9283babe46 100644
index 726d402..4e075d5 100644
--- a/compendium/DeclarativeServices/src/CMakeLists.txt
+++ b/compendium/DeclarativeServices/src/CMakeLists.txt
@@ -79,8 +79,9 @@ set(_private_headers
@@ -80,9 +80,9 @@ set(_private_headers
metadata/ServiceMetadata.hpp
metadata/Util.hpp
)
-
+find_package(Boost COMPONENTS asio CONFIG REQUIRED)
add_library(DeclarativeServicesObjs OBJECT ${_srcs} ${_private_headers})
-
+target_link_libraries(DeclarativeServicesObjs PUBLIC Boost::asio)
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
get_property(_compile_flags TARGET DeclarativeServicesObjs PROPERTY COMPILE_FLAGS)
set_property(TARGET DeclarativeServicesObjs PROPERTY COMPILE_FLAGS "${_compile_flags} -fPIC")
diff --git a/compendium/DeclarativeServices/src/SCRAsyncWorkService.cpp b/compendium/DeclarativeServices/src/SCRAsyncWorkService.cpp
index ffc93e9e86..1b9af7bd6c 100644
index ffc93e9..1b9af7b 100644
--- a/compendium/DeclarativeServices/src/SCRAsyncWorkService.cpp
+++ b/compendium/DeclarativeServices/src/SCRAsyncWorkService.cpp
@@ -22,10 +22,10 @@
@ -126,7 +124,7 @@ index ffc93e9e86..1b9af7bd6c 100644
namespace cppmicroservices
{
diff --git a/compendium/DeclarativeServices/src/manager/ComponentConfigurationImpl.cpp b/compendium/DeclarativeServices/src/manager/ComponentConfigurationImpl.cpp
index c4483a98c1..84d4217e7a 100644
index c4483a9..84d4217 100644
--- a/compendium/DeclarativeServices/src/manager/ComponentConfigurationImpl.cpp
+++ b/compendium/DeclarativeServices/src/manager/ComponentConfigurationImpl.cpp
@@ -30,7 +30,7 @@
@ -139,14 +137,13 @@ index c4483a98c1..84d4217e7a 100644
#include "states/CCUnsatisfiedReferenceState.hpp"
#include "states/ComponentConfigurationState.hpp"
diff --git a/tools/rc/CMakeLists.txt b/tools/rc/CMakeLists.txt
index c4a36f8dd1..ffcf13e44a 100644
index c4a36f8..8844292 100755
--- a/tools/rc/CMakeLists.txt
+++ b/tools/rc/CMakeLists.txt
@@ -19,9 +19,8 @@ set_property(TARGET ${US_RCC_EXECUTABLE_TARGET} PROPERTY OUTPUT_NAME ${US_RCC_EX
if(WIN32)
@@ -20,8 +20,8 @@ if(WIN32)
target_link_libraries(${US_RCC_EXECUTABLE_TARGET} Shlwapi)
endif()
-
-target_link_libraries(${US_RCC_EXECUTABLE_TARGET} nowide::nowide)
-target_include_directories(${US_RCC_EXECUTABLE_TARGET} PRIVATE ${CppMicroServices_SOURCE_DIR}/third_party/boost/nowide/include)
+find_package(Boost COMPONENTS nowide CONFIG REQUIRED)
@ -155,7 +152,7 @@ index c4a36f8dd1..ffcf13e44a 100644
set_property(TARGET ${US_RCC_EXECUTABLE_TARGET} APPEND PROPERTY
COMPILE_DEFINITIONS "MINIZ_NO_ARCHIVE_READING_API;MINIZ_NO_ZLIB_COMPATIBLE_NAMES")
diff --git a/tools/rc/ResourceCompiler.cpp b/tools/rc/ResourceCompiler.cpp
index a5b81d3522..4e92db4e3a 100644
index a5b81d3..4e92db4 100755
--- a/tools/rc/ResourceCompiler.cpp
+++ b/tools/rc/ResourceCompiler.cpp
@@ -37,9 +37,12 @@

12
ports/cppmicroservices/portfile.cmake
View File

@ -2,12 +2,13 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CppMicroServices/CppMicroservices
REF "v${VERSION}"
SHA512 26b76b124fba50a079b002867f5d349b4719833358f09712a73bc3f4370362bc27b01eb7ba31e3a0d01f101f70e5be45d5d99fe9f25216eadacc02127459d91b
SHA512 6378f929bebd2d77d260791c0518dc0fcda43a19ade2475d5e20698c594c178ed1f9123d65017fc25c34c95437d25d5eca889224c6650a1c37584842ddc6dbab
HEAD_REF development
PATCHES
werror.patch
fix_strnicmp.patch
devendor_boost_absl.patch
remove-ut-macro.patch
)
# TODO: De-vendor everything
@ -28,16 +29,17 @@ vcpkg_cmake_configure(
vcpkg_cmake_install(ADD_BIN_TO_PATH)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_cmake_config_fixup()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
# CppMicroServices uses a custom resource compiler to compile resources
# the zipped resources are then appended to the target which cause the linker to crash
# when compiling a static library
if(NOT BUILD_SHARED_LIBS)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
endif()
endif()

16
ports/cppmicroservices/remove-ut-macro.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/framework/include/FrameworkConfig.h.in b/framework/include/FrameworkConfig.h.in
index 024a0ec..9eba2f8 100644
--- a/framework/include/FrameworkConfig.h.in
+++ b/framework/include/FrameworkConfig.h.in
@@ -18,11 +18,4 @@
#define US_FRAMEWORK_VERSION @Framework_VERSION@
#define US_FRAMEWORK_VERSION_STR "@Framework_VERSION@"
-
-///-------------------------------------------------------------------
-// Macros used by the unit tests
-//-------------------------------------------------------------------
-
-#define US_FRAMEWORK_SOURCE_DIR "@PROJECT_SOURCE_DIR@"
-
#endif // CPPMICROSERVICES_FRAMEWORKCONFIG_H

2
ports/cppmicroservices/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "cppmicroservices",
"version": "3.8.4",
"version": "3.8.6",
"description": "An OSGi-like C++ dynamic module system and service registry",
"homepage": "https://github.com/CppMicroServices/CppMicroServices",
"license": "Apache-2.0",

26
ports/cppmicroservices/werror.patch
View File

@ -1,13 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24fd87e..974064c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -382,7 +382,7 @@ else()
usFunctionCheckCompilerFlags(-fstack-protector-all US_CXX_FLAGS)
endif()
- foreach(_cxxflag -Werror -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align
+ foreach(_cxxflag -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align
-Wwrite-strings -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast
-Wstrict-null-sentinel -Wsign-promo -fdiagnostics-show-option )
usFunctionCheckCompilerFlags(${_cxxflag} US_CXX_FLAGS)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 267b82e..87cfb37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -552,7 +552,7 @@ else()
usFunctionCheckCompilerFlags(-fstack-protector-all US_CXX_FLAGS)
endif()
- foreach(_cxxflag -Werror -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align
+ foreach(_cxxflag -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align
-Wwrite-strings -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast
-Wstrict-null-sentinel -Wsign-promo -fdiagnostics-show-option )
usFunctionCheckCompilerFlags(${_cxxflag} US_CXX_FLAGS)

2
versions/baseline.json
View File

@ -1969,7 +1969,7 @@
"port-version": 0
},
"cppmicroservices": {
"baseline": "3.8.4",
"baseline": "3.8.6",
"port-version": 0
},
"cppp-reiconv": {

5
versions/c-/cppmicroservices.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2fc030a8861f6cdaf6b6521ea481b5a15e19c714",
"version": "3.8.6",
"port-version": 0
},
{
"git-tree": "6139bba03bcfb25bcf76fca8ef1a2b3124eb63a1",
"version": "3.8.4",