Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
patches/vcpkg-ports/**/* -text
10 changes: 10 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
Libdigidocpp library [3.14.11](https://github.com/open-eid/libdigidocpp/releases/tag/v3.14.11) release notes
--------------------------------------
- Update libraries (#472, #495, #490, #500)
- TSL parsing improvementsa (#492, #495, #499)
- Fix memory leaks (#488)
- Prefer PSS padding with RSA key (#437)
- Code fixes and improvements (#478, #487, #513)

[Full Changelog](https://github.com/open-eid/libdigidocpp/compare/v3.14.10...v3.14.11)

Libdigidocpp library [3.14.10](https://github.com/open-eid/libdigidocpp/releases/tag/v3.14.10) release notes
--------------------------------------
- Trust intermediate certificates in trust store (#476)
Expand Down
1 change: 1 addition & 0 deletions patches/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* xalan-CMakeLists.txt - Xalan-C cmake project for static build

# Windows patches
* vcpkg-ports/xalan-c - https://github.com/microsoft/vcpkg/commit/299b1e17df207b4ea4b07c85af15cc7027f8cc25
* vcpkg-ports/xml-security-c - vcpkg port file for windows
* vcpkg-triplet - vcpkg triplet files for windows

Expand Down
20 changes: 20 additions & 0 deletions patches/vcpkg-ports/xalan-c/fix-linux-no-bin.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/src/xalanc/Utils/CMakeLists.txt b/src/xalanc/Utils/CMakeLists.txt
index 2d78685..72b611b 100644
--- a/src/xalanc/Utils/CMakeLists.txt
+++ b/src/xalanc/Utils/CMakeLists.txt
@@ -41,11 +41,15 @@ add_custom_target(locale ALL)
set_target_properties(locale PROPERTIES FOLDER "Message Library")

# workaround for case of missing xerces-c dll
+if(CMAKE_HOST_WIN32)
if(EXISTS ${XercesC_INCLUDE_DIR}/../bin)
set(MsgCreator_WD $<TARGET_FILE_DIR:XercesC::XercesC>/../bin)
else()
set(MsgCreator_WD "${XSL_NLS_GEN_DIR}")
endif()
+else()
+ set(MsgCreator_WD "${PROJECT_BINARY_DIR}")
+endif()

if(msgloader STREQUAL "inmemory")
add_custom_command(
48 changes: 48 additions & 0 deletions patches/vcpkg-ports/xalan-c/fix-missing-dll-error.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
diff --git a/src/xalanc/Utils/CMakeLists.txt b/src/xalanc/Utils/CMakeLists.txt
index dc39ad0..2d78685 100644
--- a/src/xalanc/Utils/CMakeLists.txt
+++ b/src/xalanc/Utils/CMakeLists.txt
@@ -40,6 +40,13 @@ set(SUPPORTMSGINDEX "${GEN_SUPPORTDIR}/LocalMsgIndex.hpp")
add_custom_target(locale ALL)
set_target_properties(locale PROPERTIES FOLDER "Message Library")

+# workaround for case of missing xerces-c dll
+if(EXISTS ${XercesC_INCLUDE_DIR}/../bin)
+ set(MsgCreator_WD $<TARGET_FILE_DIR:XercesC::XercesC>/../bin)
+else()
+ set(MsgCreator_WD "${XSL_NLS_GEN_DIR}")
+endif()
+
if(msgloader STREQUAL "inmemory")
add_custom_command(
OUTPUT "${GENMSGINDEX}"
@@ -48,7 +55,8 @@ if(msgloader STREQUAL "inmemory")
"${XLIFF_FILE_NAME}"
-TYPE inmem
-LOCALE ${LOCALE}
- WORKING_DIRECTORY "${XSL_NLS_GEN_DIR}"
+ -OUTDIR "${XSL_NLS_GEN_DIR}"
+ WORKING_DIRECTORY "${MsgCreator_WD}"
COMMENT "Generating inmemory locale message data"
DEPENDS MsgCreator "${XLIFF_FILE_NAME}")

@@ -92,7 +100,8 @@ if(msgloader STREQUAL "icu")
"${XLIFF_FILE_NAME}"
-TYPE icu
-LOCALE ${LOCALE}
- WORKING_DIRECTORY "${XSL_NLS_GEN_DIR}"
+ -OUTDIR "${XSL_NLS_GEN_DIR}"
+ WORKING_DIRECTORY "${MsgCreator_WD}"
COMMENT "Generating ICU locale message data"
DEPENDS MsgCreator "${XLIFF_FILE_NAME}")

@@ -141,7 +150,8 @@ if(msgloader STREQUAL "nls")
"${XLIFF_FILE_NAME}"
-TYPE nls
-LOCALE ${LOCALE}
- WORKING_DIRECTORY "${XSL_NLS_GEN_DIR}"
+ -OUTDIR "${XSL_NLS_GEN_DIR}"
+ WORKING_DIRECTORY "${MsgCreator_WD}"
COMMENT "Generating nls locale message data"
DEPENDS MsgCreator "${XLIFF_FILE_NAME}")

15 changes: 15 additions & 0 deletions patches/vcpkg-ports/xalan-c/fix-win-deprecated-err.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/src/xalanc/Utils/MsgCreator/CMakeLists.txt b/src/xalanc/Utils/MsgCreator/CMakeLists.txt
index 20215d4..dc74c1b 100644
--- a/src/xalanc/Utils/MsgCreator/CMakeLists.txt
+++ b/src/xalanc/Utils/MsgCreator/CMakeLists.txt
@@ -37,6 +37,10 @@ set(msgcreator_headers
NLSHandler.hpp
SAX2Handler.hpp)

+if(MSVC)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
+endif()
+
add_executable(MsgCreator ${msgcreator_sources} ${msgcreator_headers})
target_include_directories(MsgCreator PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
40 changes: 40 additions & 0 deletions patches/vcpkg-ports/xalan-c/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apache/xalan-c
REF 4055bb0c58e3053b04fcd0c68fdcda8f84411213 #1.12
SHA512 0d591f5a07dbc69050c7b696189c46a32e6dd7a80a302fd38dcc82f9454688729e361c4d5c3b0aacfc3acc7df78c0981ba54eb3ce82b1ca6566a30aa19648280
PATCHES
fix-win-deprecated-err.patch
fix-missing-dll-error.patch
fix-linux-no-bin.patch
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_ICU=ON
)

vcpkg_install_cmake()
vcpkg_copy_tools(TOOL_NAMES Xalan AUTO_CLEAN)

if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/xalanc)
else()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/XalanC TARGET_PATH share/xalanc)
endif()

# cleanup
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)

vcpkg_copy_pdbs()

vcpkg_fixup_pkgconfig()
10 changes: 10 additions & 0 deletions patches/vcpkg-ports/xalan-c/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "xalan-c",
"version": "1.12",
"port-version": 1,
"description": "Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types",
"homepage": "https://github.com/apache/xalan-c",
"dependencies": [
"xerces-c"
]
}