<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8c2db60eb2bb8efc0a0821cbc0ed42598ba0e652">https://github.com/macports/macports-ports/commit/8c2db60eb2bb8efc0a0821cbc0ed42598ba0e652</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 8c2db60 pbzip2: Fix build with clang 8
</span>8c2db60 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8c2db60eb2bb8efc0a0821cbc0ed42598ba0e652
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Sep 27 21:43:11 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> pbzip2: Fix build with clang 8
</span>---
archivers/pbzip2/Portfile | 8 +--
.../space-between-literal-and-identifier.patch | 59 ++++++++++++++++++++++
2 files changed, 64 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/pbzip2/Portfile b/archivers/pbzip2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9dde506..57ee140 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/pbzip2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/pbzip2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ version 1.1.13
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories archivers
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span> license Permissive
installs_libs no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,11 +21,13 @@ homepage http://compression.ca/pbzip2/
</span> master_sites https://launchpad.net/pbzip2/${branch}/${version}/+download/
checksums rmd160 cc73779cb262afd7150960ee3989d901bf10de8d \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8fd13eaaa266f7ee91f85c1ea97c86d9c9cc985969db9059cdebcb1e1b7bdbe6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8fd13eaaa266f7ee91f85c1ea97c86d9c9cc985969db9059cdebcb1e1b7bdbe6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 48015
</span>
depends_lib port:bzip2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ space-between-literal-and-identifier.patch
</span>
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/pbzip2/files/space-between-literal-and-identifier.patch b/archivers/pbzip2/files/space-between-literal-and-identifier.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7e347fa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/pbzip2/files/space-between-literal-and-identifier.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,59 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix error seen with clang 8:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.launchpad.net/pbzip2/+bug/1746369
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pbzip2.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pbzip2.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1220,7 +1220,7 @@ int producer_decompress(int hInfile, OFF_T fileSize, queue *fifo)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // give warning to user if block is larger than 250 million bytes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fileData->bufSize > 250000000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr, "pbzip2: *WARNING: Compressed block size is large [%"PRIuMAX" bytes].\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "pbzip2: *WARNING: Compressed block size is large [%" PRIuMAX " bytes].\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (uintmax_t) fileData->bufSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, " If program aborts, use regular BZIP2 to decompress.\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1829,7 +1829,7 @@ void *fileWriter(void *outname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (QuietMode != 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr, " Output Size: %"PRIuMAX" bytes\n", (uintmax_t)CompressedSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, " Output Size: %" PRIuMAX " bytes\n", (uintmax_t)CompressedSize);
</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;'>+ #ifdef PBZIP_DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2072,7 +2072,7 @@ int directcompress(int hInfile, OFF_T fileSize, int blockSize, const char *OutFi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(hOutfile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (QuietMode != 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr, " Output Size: %"PRIuMAX" bytes\n", (uintmax_t)CompressedSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, " Output Size: %" PRIuMAX " bytes\n", (uintmax_t)CompressedSize);
</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;'>+ syncSetProducerDone(1); // Not really needed for direct version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2794,7 +2794,7 @@ void outputBufferInit(size_t size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // unlikely to get here since more likely exception will be thrown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (OutputBuffer.size() != size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr, "pbzip2: *ERROR: Could not initialize (OutputBuffer); size=%"PRIuMAX"! Aborting...\n", (uintmax_t)size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "pbzip2: *ERROR: Could not initialize (OutputBuffer); size=%" PRIuMAX "! Aborting...\n", (uintmax_t)size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ safe_mutex_unlock(OutMutex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4102,7 +4102,7 @@ int main(int argc, char* argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (decompress == 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, " BWT Block Size: %c00k\n", BWTblockSizeChar);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (hasInFile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr, " Input Size: %"PRIuMAX" bytes\n", (uintmax_t)InFileSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, " Input Size: %" PRIuMAX " bytes\n", (uintmax_t)InFileSize);
</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;'>+ if (decompress == 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4224,7 +4224,7 @@ int main(int argc, char* argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NumBufferedBlocksMax = numCPU;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (QuietMode != 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr, "*Warning* Max memory limit increased to %"PRIuMAX" MB to support %d CPUs\n", (uintmax_t)((NumBufferedBlocksMax + (numCPU * 2)) * blockSize)/1000000, numCPU);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "*Warning* Max memory limit increased to %" PRIuMAX " MB to support %d CPUs\n", (uintmax_t)((NumBufferedBlocksMax + (numCPU * 2)) * blockSize)/1000000, numCPU);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>
</pre>