<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/cd718f022c6b1f0771acfb05dd36e0df43e7670a">https://github.com/macports/macports-ports/commit/cd718f022c6b1f0771acfb05dd36e0df43e7670a</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 cd718f022c6 ismrmrd: Bump; update for upstream changes. (#17606)
</span>cd718f022c6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cd718f022c6b1f0771acfb05dd36e0df43e7670a
</span>Author: Eric A. Borisch <eborisch@gmail.com>
AuthorDate: Mon Feb 6 14:41:53 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> ismrmrd: Bump; update for upstream changes. (#17606)
</span>---
science/ismrmrd/Portfile | 18 +++++-------------
science/ismrmrd/files/pugixml.patch | 36 ------------------------------------
2 files changed, 5 insertions(+), 49 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 4c22575941b..e5ac31b63c4 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,7 @@ 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.13.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ismrmrd ismrmrd 1.13.2 v
</span> categories science
maintainers {eborisch @eborisch} openmaintainer
license permissive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +16,9 @@ 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 11716eae0d5224fb05158ecf765bf8fd17a82a69 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 55d6984c17d52593c88b6808c8e0bc6b814dda54cc10b64239be02c8c159b08d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 234258
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ddc31e9e1515b7b945548b3820afa74172104b11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2155c80a6cea8cbf8ddaf36425981c974523bf3d833273df7156338f2176ab4c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 169538
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,8 +46,7 @@ test.dir ${cmake.build_dir}/tests
</span> test.cmd ./test_ismrmrd
test.target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles pugixml.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ismrmrd-no-werror.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-ismrmrd-no-werror.diff
</span>
post-patch {
foreach pat {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,12 +54,6 @@ post-patch {
</span> "/^GENERATE_XML/s/YES/NO/"
"/^DOT_IMAGE_FORMAT/s/png/svg/"
} { reinplace -E $pat doc/Doxyfile.in }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Patch for updated interface for current pugixml; remove private copies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/result/s/load/load_string/" utilities/ismrmrd_test_xml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach pugifile { pugixml.hpp pugixml.cpp pugiconfig.hpp } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${worksrcpath}/libsrc/${pugifile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0d94dc1de55..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ismrmrd/files/pugixml.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libsrc/meta.cpp 2022-11-28 12:07:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libsrc/meta.cpp 2022-11-29 11:46:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,7 +5,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace ISMRMRD {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void deserialize(const char *xml, MetaContainer &h) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pugi::xml_document doc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pugi::xml_parse_result result = doc.load(xml);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pugi::xml_parse_result result = doc.load_string(xml);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!result) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw std::runtime_error("Unable to load ISMRMRD Meta XML document");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru libsrc/xml.cpp libsrc/xml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libsrc/xml.cpp 2022-11-28 12:07:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libsrc/xml.cpp 2022-11-29 11:46:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -315,7 +315,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void deserialize(const char* xml, IsmrmrdHeader& h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pugi::xml_document doc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pugi::xml_parse_result result = doc.load(xml);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pugi::xml_parse_result result = doc.load_string(xml);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!result) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw std::runtime_error("Unable to load ISMRMRD XML header");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in utilities: .CMakeLists.txt.un~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru utilities/CMakeLists.txt utilities/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- utilities/CMakeLists.txt 2022-11-28 12:07:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ utilities/CMakeLists.txt 2022-11-29 11:45:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (NOT WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_executable(ismrmrd_test_xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ismrmrd_test_xml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CMAKE_SOURCE_DIR}/libsrc/pugixml.cpp )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(ismrmrd_test_xml ismrmrd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(TARGETS ismrmrd_test_xml DESTINATION bin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span></pre><pre style='margin:0'>
</pre>