[128696] trunk/dports/graphics/scantailor

[jeremyhu at macports.org]

Revision: 128696
          https://trac.macports.org/changeset/128696
Author:   jeremyhu at macports.org
Date:     2014-11-25 14:55:30 -0800 (Tue, 25 Nov 2014)
Log Message:
-----------
scantailor: Build with clang (#37877)

Modified Paths:
--------------
    trunk/dports/graphics/scantailor/Portfile

Added Paths:
-----------
    trunk/dports/graphics/scantailor/files/
    trunk/dports/graphics/scantailor/files/0001-Compatibility-with-clang-compiler.patch

Modified: trunk/dports/graphics/scantailor/Portfile
===================================================================
--- 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)
@@ -7,7 +7,7 @@
 
 name                            scantailor
 version                         0.9.11.1
-revision                        4
+revision                        5
 platforms                       darwin
 maintainers                     raphael openmaintainer
 license                         GPL-3+
@@ -33,14 +33,14 @@
 checksums                       rmd160  43958c567bffe17bda2af4873f7beb0b71b77ab4 \
                                 sha256  881647a4172c55a067a7b6687965441cf21176d79d93075b22a373ea9accd8d3
 
+patchfiles \
+    0001-Compatibility-with-clang-compiler.patch
+patch.pre_args -p1
+
 post-patch {
     reinplace "s|@VERSION@|${version}|" ${worksrcpath}/packaging/osx/Info.plist.in
 }
 
-# scantailor does not build with clang
-# http://trac.macports.org/ticket/37877
-compiler.blacklist *clang*
-
 configure.args-append           ${qt_cmake_defines}
 
 post-destroot {                 # create application bundle

Added: trunk/dports/graphics/scantailor/files/0001-Compatibility-with-clang-compiler.patch
===================================================================
--- 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)
@@ -0,0 +1,71 @@
+From 123a71afaf7d3bb6151cfa22b4a974e64a2f26d3 Mon Sep 17 00:00:00 2001
+From: Joseph Artsimovich <joseph.artsimovich at 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
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141125/74b51f3e/attachment.html>