Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rapidxml] Fix gcc and clang build issue #43199

Merged
merged 5 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from 3 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
47 changes: 47 additions & 0 deletions ports/rapidxml/Fix-clang-gcc-compilation.patch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has this patch been submitted upstream? See our policy regarding patches

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An equivalent patch was submitted to the rapdixml project on 2013-09-21, but there have not been any rapidxml releases since 2013-04-26
https://sourceforge.net/p/rapidxml/bugs/16/
If preferred, I can include the exact patch from that link with adjusted paths and a comment referencing this issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated this PR with the "official" patch submitted to rapidxml via https://sourceforge.net/p/rapidxml/bugs/16/ with minor tweaks to the file paths to allow the patch to be applied via vcpkg.

Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
Subject: [PATCH] Fix clang and gcc compilation

---
rapidxml_print.hpp | 28 +++++++++++++++++++
1 file changed, 28 insertions(+)

diff --git a/rapidxml_print.hpp b/rapidxml_print.hpp
index 0ae2b14faa..e8439f3d78 100644
--- a/rapidxml_print.hpp
+++ b/rapidxml_print.hpp
@@ -102,6 +102,34 @@ namespace rapidxml
///////////////////////////////////////////////////////////////////////////
// Internal printing operations

+ // FIX FOR CLANG BUILD - NEED TO DECLARE THESE METHODS BEFORE print_node
+ template<class OutIt, class Ch>
+ inline OutIt print_children(OutIt out, const xml_node<Ch> *node, int flags, int indent);
+
+ template<class OutIt, class Ch>
+ inline OutIt print_attributes(OutIt out, const xml_node<Ch> *node, int flags);
+
+ template<class OutIt, class Ch>
+ inline OutIt print_data_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
+
+ template<class OutIt, class Ch>
+ inline OutIt print_cdata_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
+
+ template<class OutIt, class Ch>
+ inline OutIt print_element_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
+
+ template<class OutIt, class Ch>
+ inline OutIt print_declaration_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
+
+ template<class OutIt, class Ch>
+ inline OutIt print_comment_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
+
+ template<class OutIt, class Ch>
+ inline OutIt print_doctype_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
+
+ template<class OutIt, class Ch>
+ inline OutIt print_pi_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
+
// Print node
template<class OutIt, class Ch>
inline OutIt print_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)


31 changes: 16 additions & 15 deletions ports/rapidxml/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
#header-only library
vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH
REPO rapidxml/rapidxml
REF rapidxml%201.13
FILENAME "rapidxml-1.13.zip"
SHA512 6c10583e6631ccdb0217d0a5381172cb4c1046226de6ef1acf398d85e81d145228e14c3016aefcd7b70a1db8631505b048d8b4f5d4b0dbf1811d2482eefdd265
)

# Handle copyright
file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rapidxml)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/rapidxml/license.txt ${CURRENT_PACKAGES_DIR}/share/rapidxml/copyright)

# Copy the header files
file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/rapidxml FILES_MATCHING PATTERN "*.hpp")
#header-only library
vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH
REPO rapidxml/rapidxml
REF rapidxml%20${VERSION}
FILENAME "rapidxml-${VERSION}.zip"
SHA512 6c10583e6631ccdb0217d0a5381172cb4c1046226de6ef1acf398d85e81d145228e14c3016aefcd7b70a1db8631505b048d8b4f5d4b0dbf1811d2482eefdd265
PATCHES
Fix-clang-gcc-compilation.patch # Fix clang and gcc builds
)

# Handle copyright
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt")

# Copy the header files
file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/rapidxml FILES_MATCHING PATTERN "*.hpp")
2 changes: 1 addition & 1 deletion ports/rapidxml/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "rapidxml",
"version": "1.13",
"port-version": 6,
"port-version": 7,
"description": "RapidXml is an attempt to create the fastest XML parser possible, while retaining useability, portability and reasonable W3C compatibility.",
"homepage": "https://sourceforge.net/projects/rapidxml"
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -7838,7 +7838,7 @@
},
"rapidxml": {
"baseline": "1.13",
"port-version": 6
"port-version": 7
},
"rapidxml-ns": {
"baseline": "1.13.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/r-/rapidxml.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "db76c4a27643a420fcf2b2c97d4e8b8a129e3d79",
"version": "1.13",
"port-version": 7
},
{
"git-tree": "a460282de022af98f967771cdecab3efee97bc5d",
"version": "1.13",
Expand Down
Loading