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.

Sign up for GitHub

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

[rapidxml] Fix gcc and clang build issue #43199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86a10b6
Apply patch to allow rapidxml to build with gcc and clang, some tidy …
tartanpaint Jan 10, 2025
ce24883
Increase port version
tartanpaint Jan 10, 2025
4f0794a
Update version database
tartanpaint Jan 10, 2025
82cd893
Reference the official patch submitted to rapidxml for https://source…
tartanpaint Jan 14, 2025
2b7bfee
Update version database
tartanpaint Jan 14, 2025
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
37 changes: 37 additions & 0 deletions ports/rapidxml/0001-fix-for-a-bug-in-gcc-that-won-t-let-rapidxml-compile.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 2cf47bb8fb1de71bb2d2e059c15a30ffa4ca4cd6 Mon Sep 17 00:00:00 2001
From: Ferdinand Niedermann <[email protected]>
Date: Sat, 21 Sep 2013 01:55:58 +0200
Subject: [PATCH] fix for a bug in gcc that won't let rapidxml compile on clang

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

diff --git a/rapidxml_print.hpp b/rapidxml_print.hpp
index d03d5f5..7ef305e 100755
--- a/rapidxml_print.hpp
+++ b/rapidxml_print.hpp
@@ -102,6 +102,20 @@ namespace rapidxml
///////////////////////////////////////////////////////////////////////////
// Internal printing operations

+ // =====================================
+ // fix for clang for this bug in gcc and others: http://sourceforge.net/p/rapidxml/bugs/16/
+
+ 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_element_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
+ 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_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)
--
1.8.4

31 changes: 16 additions & 15 deletions ports/rapidxml/portfile.cmake
View file
Open in desktop
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
0001-fix-for-a-bug-in-gcc-that-won-t-let-rapidxml-compile.patch # https://sourceforge.net/p/rapidxml/bugs/16/
)

# 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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "465505477fa97594a58e69f34a0c1a7fdccd9c59",
"version": "1.13",
"port-version": 7
},
{
"git-tree": "a460282de022af98f967771cdecab3efee97bc5d",
"version": "1.13",
Expand Down
Loading