<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[128696] trunk/dports/graphics/scantailor</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/128696">128696</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-11-25 14:55:30 -0800 (Tue, 25 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>scantailor: Build with clang (#37877)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsscantailorPortfile">trunk/dports/graphics/scantailor/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/graphics/scantailor/files/</li>
<li><a href="#trunkdportsgraphicsscantailorfiles0001Compatibilitywithclangcompilerpatch">trunk/dports/graphics/scantailor/files/0001-Compatibility-with-clang-compiler.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsscantailorPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/scantailor/Portfile (128695 => 128696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/scantailor/Portfile 2014-11-25 22:33:45 UTC (rev 128695)
+++ trunk/dports/graphics/scantailor/Portfile 2014-11-25 22:55:30 UTC (rev 128696)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx">
</span><span class="cx"> name scantailor
</span><span class="cx"> version 0.9.11.1
</span><del>-revision 4
</del><ins>+revision 5
</ins><span class="cx"> platforms darwin
</span><span class="cx"> maintainers raphael openmaintainer
</span><span class="cx"> license GPL-3+
</span><span class="lines">@@ -33,14 +33,14 @@
</span><span class="cx"> checksums rmd160 43958c567bffe17bda2af4873f7beb0b71b77ab4 \
</span><span class="cx"> sha256 881647a4172c55a067a7b6687965441cf21176d79d93075b22a373ea9accd8d3
</span><span class="cx">
</span><ins>+patchfiles \
+ 0001-Compatibility-with-clang-compiler.patch
+patch.pre_args -p1
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@VERSION@|${version}|" ${worksrcpath}/packaging/osx/Info.plist.in
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# scantailor does not build with clang
-# http://trac.macports.org/ticket/37877
-compiler.blacklist *clang*
-
</del><span class="cx"> configure.args-append ${qt_cmake_defines}
</span><span class="cx">
</span><span class="cx"> post-destroot { # create application bundle
</span></span></pre></div>
<a id="trunkdportsgraphicsscantailorfiles0001Compatibilitywithclangcompilerpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/scantailor/files/0001-Compatibility-with-clang-compiler.patch (0 => 128696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/scantailor/files/0001-Compatibility-with-clang-compiler.patch (rev 0)
+++ trunk/dports/graphics/scantailor/files/0001-Compatibility-with-clang-compiler.patch 2014-11-25 22:55:30 UTC (rev 128696)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+From 123a71afaf7d3bb6151cfa22b4a974e64a2f26d3 Mon Sep 17 00:00:00 2001
+From: Joseph Artsimovich <joseph.artsimovich@gmail.com>
+Date: Sat, 25 Jan 2014 14:37:41 +0000
+Subject: [PATCH] Compatibility with clang compiler.
+
+Credits: Martin Mueller
+---
+ ProjectFilesDialog.cpp | 6 +++---
+ foundation/GridLineTraverser.cpp | 1 +
+ math/MatrixCalc.h | 2 +-
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/ProjectFilesDialog.cpp b/ProjectFilesDialog.cpp
+index f632b3c..dfa1c14 100644
+--- a/ProjectFilesDialog.cpp
++++ b/ProjectFilesDialog.cpp
+@@ -279,7 +279,7 @@ ProjectFilesDialog::inProjectFiles() const
+ using namespace boost::lambda;
+
+ std::vector<ImageFileInfo> files;
+- m_ptrInProjectFiles->items(bind(&pushFileInfo<Item>, ref(files), _1));
++ m_ptrInProjectFiles->items(bind(&pushFileInfo<Item>, boost::ref(files), _1));
+
+ std::sort(files.begin(), files.end(), imageFileInfoLess);
+
+@@ -439,7 +439,7 @@ ProjectFilesDialog::setInputDir(QString const& dir, bool const auto_add_files)
+ files.begin(), files.end(),
+ bind(
+ &pushItemWithFlags<Item, ItemList>,
+- _1, ref(items), cref(m_supportedExtensions)
++ _1, boost::ref(items), cref(m_supportedExtensions)
+ )
+ );
+
+@@ -510,7 +510,7 @@ ProjectFilesDialog::removeFromProject()
+ m_ptrInProjectFiles->items(
+ selection, bind(
+ &pushItemIfSameDir<Item, ItemList>,
+- ref(items), _1, cref(input_dir)
++ boost::ref(items), _1, cref(input_dir)
+ )
+ );
+
+diff --git a/foundation/GridLineTraverser.cpp b/foundation/GridLineTraverser.cpp
+index 72f51e8..0c9b5cb 100644
+--- a/foundation/GridLineTraverser.cpp
++++ b/foundation/GridLineTraverser.cpp
+@@ -19,6 +19,7 @@
+ #include "GridLineTraverser.h"
+ #include "LineIntersectionScalar.h"
+ #include <algorithm>
++#include <cstdlib>
+
+ GridLineTraverser::GridLineTraverser(QLineF const& line)
+ {
+diff --git a/math/MatrixCalc.h b/math/MatrixCalc.h
+index 0dd8de0..e915ea0 100644
+--- a/math/MatrixCalc.h
++++ b/math/MatrixCalc.h
+@@ -74,7 +74,7 @@ private:
+ template<typename T>
+ class Mat
+ {
+- template<typename OT, typename Alloc> friend class MatrixCalc;
++ template<typename OT, typename Alloc> friend class ::MatrixCalc;
+ template<typename OT> friend Mat<OT> operator+(Mat<OT> const& m1, Mat<OT> const& m2);
+ template<typename OT> friend Mat<OT> operator-(Mat<OT> const& m1, Mat<OT> const& m2);
+ template<typename OT> friend Mat<OT> operator*(Mat<OT> const& m1, Mat<OT> const& m2);
+--
+2.1.3
+
</ins></span></pre>
</div>
</div>
</body>
</html>