<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b1def42336a3aec0a30e94a77dafc6901f2c6da8">https://github.com/macports/macports-ports/commit/b1def42336a3aec0a30e94a77dafc6901f2c6da8</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 b1def42 sword: remove comparisons between pointers and ints
</span>b1def42 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b1def42336a3aec0a30e94a77dafc6901f2c6da8
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Sep 12 09:12:56 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> sword: remove comparisons between pointers and ints
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This causes errors on certain versions of Clang.
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since the port either builds correctly or not at all.
</span>---
textproc/sword/Portfile | 3 +-
textproc/sword/files/patch-pointer_comparison.diff | 178 +++++++++++++++++++++
2 files changed, 180 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/sword/Portfile b/textproc/sword/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74db0ba..cf974eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/sword/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/sword/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,8 @@ depends_lib port:curl \
</span> path:lib/libssl.dylib:openssl \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-automake-1.13.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-automake-1.13.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pointer_comparison.diff
</span>
# llvm-gcc-4.2 hangs
compiler.blacklist *llvm-gcc-4.2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/sword/files/patch-pointer_comparison.diff b/textproc/sword/files/patch-pointer_comparison.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fd3c50c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/sword/files/patch-pointer_comparison.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,178 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/mgr/swmgr.cpp.orig 2014-04-16 20:50:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/mgr/swmgr.cpp 2019-09-12 08:14:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1362,7 +1362,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!conffd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conffd = FileMgr::getSystemFileMgr()->open(config->filename.c_str(), FileMgr::WRONLY|FileMgr::APPEND);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (conffd > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (conffd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conffd->seek(0L, SEEK_END);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FileMgr::getSystemFileMgr()->close(conffd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/keys/treekeyidx.cpp.orig 2013-09-14 14:51:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/keys/treekeyidx.cpp 2019-09-12 08:13:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buf.setFormatted("%s.dat", path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ datfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (datfd <= 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!datfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SWLog::getSystemLog()->logError("%d", errno);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error = errno;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -331,7 +331,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __s32 tmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __u16 tmp2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (datfd > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (datfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ datfd->seek(ioffset, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -385,7 +385,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ node->offset = ioffset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (idxfd > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (idxfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (idxfd->getFd() > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ idxfd->seek(ioffset, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (idxfd->read(&offset, 4) == 4) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -422,7 +422,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long datOffset = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __s32 tmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (idxfd > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (idxfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ idxfd->seek(node->offset, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (idxfd->read(&tmp, 4) != 4) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ datOffset = datfd->seek(0, SEEK_END);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -488,7 +488,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void TreeKeyIdx::saveTreeNode(TreeNode *node) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long datOffset = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __s32 tmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (idxfd > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (idxfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ idxfd->seek(node->offset, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ datOffset = datfd->seek(0, SEEK_END);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/modules/common/rawstr.cpp.orig 2014-04-16 21:27:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/modules/common/rawstr.cpp 2019-09-12 08:36:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +74,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buf.setFormatted("%s.dat", path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ datfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (datfd < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!datfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SWLog::getSystemLog()->logError("%d", errno);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,7 +111,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char ch;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (datfd > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (datfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ datfd->seek(ioffset, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (size = 0; datfd->read(&ch, 1) == 1; size++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((ch == '\\') || (ch == 10) || (ch == 13))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,7 +145,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __u32 offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (idxfd > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (idxfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ idxfd->seek(ioffset, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ idxfd->read(&offset, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/modules/common/rawstr4.cpp.orig 2014-04-16 21:27:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/modules/common/rawstr4.cpp 2019-09-12 08:38:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +74,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buf.setFormatted("%s.dat", path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ datfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (datfd < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!datfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SWLog::getSystemLog()->logError("%d", errno);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,7 +111,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char ch;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (datfd > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (datfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ datfd->seek(ioffset, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (size = 0; datfd->read(&ch, 1) == 1; size++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((ch == '\\') || (ch == 10) || (ch == 13))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,7 +145,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __u32 offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (idxfd > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (idxfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ idxfd->seek(ioffset, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ idxfd->read(&offset, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/modules/common/zstr.cpp.orig 2013-09-14 14:51:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/modules/common/zstr.cpp 2019-09-12 08:39:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buf.setFormatted("%s.zdt", path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zdtfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (datfd <= 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!datfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SWLog::getSystemLog()->logError("%d", errno);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,7 +133,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char ch;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (datfd > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (datfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ datfd->seek(ioffset, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (size = 0; datfd->read(&ch, 1) == 1; size++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((ch == '\\') || (ch == 10) || (ch == 13))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,7 +167,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __u32 offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (idxfd > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (idxfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ idxfd->seek(ioffset, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ idxfd->read(&offset, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ offset = swordtoarch32(offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/modules/lexdict/zld/zld.cpp.orig 2013-09-14 14:51:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/modules/lexdict/zld/zld.cpp 2019-09-12 08:42:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,7 +166,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long zLD::getEntryCount() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (idxfd < 0) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!idxfd) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return idxfd->seek(0, SEEK_END) / IDXENTRYSIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/modules/lexdict/rawld4/rawld4.cpp.orig 2013-09-14 14:51:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/modules/lexdict/rawld4/rawld4.cpp 2019-09-12 08:41:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,7 +166,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long RawLD4::getEntryCount() const {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (idxfd < 0) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!idxfd) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return idxfd->seek(0, SEEK_END) / IDXENTRYSIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/modules/lexdict/rawld/rawld.cpp.orig 2013-09-14 14:51:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/modules/lexdict/rawld/rawld.cpp 2019-09-12 08:40:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -168,7 +168,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long RawLD::getEntryCount() const {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (idxfd < 0) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!idxfd) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return idxfd->seek(0, SEEK_END) / IDXENTRYSIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>