[71896] trunk/dports/graphics/scantailor

raphael at macports.org raphael at macports.org
Sun Sep 26 01:08:11 PDT 2010


Revision: 71896
          http://trac.macports.org/changeset/71896
Author:   raphael at macports.org
Date:     2010-09-26 01:08:08 -0700 (Sun, 26 Sep 2010)
Log Message:
-----------
scantailor: fix for a build incompatibility with boost 1.44.0; see #26624

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

Added Paths:
-----------
    trunk/dports/graphics/scantailor/files/
    trunk/dports/graphics/scantailor/files/patch-ProjectFilesDialog.cpp.diff

Modified: trunk/dports/graphics/scantailor/Portfile
===================================================================
--- trunk/dports/graphics/scantailor/Portfile	2010-09-26 07:40:51 UTC (rev 71895)
+++ trunk/dports/graphics/scantailor/Portfile	2010-09-26 08:08:08 UTC (rev 71896)
@@ -32,6 +32,8 @@
                                 sha1    d3523cb5e9ebb95f2e1d20962595a1fc8f064526 \
                                 rmd160  5bfaa1f55fc42fd6d044a261332ff64d471fdd72
 
+patchfiles                      patch-ProjectFilesDialog.cpp.diff
+
 post-destroot {                 set docdir ${destroot}${prefix}/share/doc/${name}
                                 xinstall -d ${docdir}
                                 xinstall -m 644 -W ${worksrcpath} \

Added: trunk/dports/graphics/scantailor/files/patch-ProjectFilesDialog.cpp.diff
===================================================================
--- trunk/dports/graphics/scantailor/files/patch-ProjectFilesDialog.cpp.diff	                        (rev 0)
+++ trunk/dports/graphics/scantailor/files/patch-ProjectFilesDialog.cpp.diff	2010-09-26 08:08:08 UTC (rev 71896)
@@ -0,0 +1,17 @@
+--- ProjectFilesDialog.cpp
++++ ProjectFilesDialog.cpp
+@@ -697,9 +697,13 @@ ProjectFilesDialog::FileList::remove(QItemSelection const& selection)
+ 			bind(&QItemSelectionRange::bottom, _1)
+ 		)
+ 	);
++	
++	// This hack is required to make it build with boost 1.44.
++	typedef int const Range::* IntMemPtr;
++	
+ 	std::sort(
+ 		sorted_ranges.begin(), sorted_ranges.end(),
+-		bind(&Range::first, _1) < bind(&Range::first, _2)
++		bind((IntMemPtr)&Range::first, _1) < bind((IntMemPtr)&Range::first, _2)
+ 	);
+ 	
+ 	QVectorIterator<Range> it(sorted_ranges);
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100926/4a75d084/attachment.html>


More information about the macports-changes mailing list