<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9e808a9a0d3c9fe51b7fdb62a22d160be27365a1">https://github.com/macports/macports-ports/commit/9e808a9a0d3c9fe51b7fdb62a22d160be27365a1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9e808a9a0d3 ismrmrd: 1.13.1 and patches to use MP's pugixml (#17190)
</span>9e808a9a0d3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9e808a9a0d3c9fe51b7fdb62a22d160be27365a1
</span>Author: Eric A. Borisch <eborisch@gmail.com>
AuthorDate: Tue Jan 3 16:13:24 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> ismrmrd: 1.13.1 and patches to use MP's pugixml (#17190)
</span>---
science/ismrmrd/Portfile | 25 ++++++++++++++++++-------
science/ismrmrd/files/pugixml.patch | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ismrmrd/Portfile b/science/ismrmrd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c5de56f1a4e..6daa94e9f52 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ismrmrd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ismrmrd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup cmake 1.1
</span> PortGroup conflicts_build 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ismrmrd ismrmrd 1.8.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ismrmrd ismrmrd 1.13.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories science
maintainers {eborisch @eborisch} openmaintainer
license permissive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,26 +17,31 @@ description ISMRM Raw Data Format
</span> long_description ISMRM Raw Data format tools and libraries.
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 79b2f5a266b4456716ddd34d020e2e83152f792c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fd65237876d3b2214fcad408e4215f9d0d7b50baa99a9081b259a2855e2e58fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 197937
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 11716eae0d5224fb05158ecf765bf8fd17a82a69 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 55d6984c17d52593c88b6808c8e0bc6b814dda54cc10b64239be02c8c159b08d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 234258
</span>
compiler.cxx_standard 2011
depends_lib-append port:hdf5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3-single
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3-single \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pugixml
</span>
depends_build-append path:bin/doxygen:doxygen \
path:bin/dot:graphviz
conflicts_build ${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DUSE_SYSTEM_PUGIXML=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.target-append doc
test.run yes
test.target check
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles pugixml.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span> foreach pat {
"/^(HAVE_DOT|DOT_MULTI_TARGETS)/s/NO/YES/"
"/^GENERATE_XML/s/YES/NO/"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +52,12 @@ post-extract {
</span> reinplace \
"s#COMMAND#COMMAND DYLD_LIBRARY_PATH=${cmake.build_dir}#" \
tests/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Patch for updated interface for current pugixml; remove private copies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/result/s/load/load_string/" utilities/ismrmrd_test_xml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pugifile { pugixml.hpp pugixml.cpp pugiconfig.hpp } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/libsrc/${pugifile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ismrmrd/files/pugixml.patch b/science/ismrmrd/files/pugixml.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0d94dc1de55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ismrmrd/files/pugixml.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libsrc/meta.cpp 2022-11-28 12:07:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libsrc/meta.cpp 2022-11-29 11:46:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,7 +5,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace ISMRMRD {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void deserialize(const char *xml, MetaContainer &h) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pugi::xml_document doc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pugi::xml_parse_result result = doc.load(xml);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pugi::xml_parse_result result = doc.load_string(xml);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!result) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw std::runtime_error("Unable to load ISMRMRD Meta XML document");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru libsrc/xml.cpp libsrc/xml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libsrc/xml.cpp 2022-11-28 12:07:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libsrc/xml.cpp 2022-11-29 11:46:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,7 +315,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void deserialize(const char* xml, IsmrmrdHeader& h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pugi::xml_document doc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pugi::xml_parse_result result = doc.load(xml);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pugi::xml_parse_result result = doc.load_string(xml);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!result) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw std::runtime_error("Unable to load ISMRMRD XML header");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Only in utilities: .CMakeLists.txt.un~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ru utilities/CMakeLists.txt utilities/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- utilities/CMakeLists.txt 2022-11-28 12:07:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ utilities/CMakeLists.txt 2022-11-29 11:45:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NOT WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(ismrmrd_test_xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ismrmrd_test_xml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/libsrc/pugixml.cpp )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(ismrmrd_test_xml ismrmrd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS ismrmrd_test_xml DESTINATION bin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span></pre><pre style='margin:0'>
</pre>