- Fix build with boost 1.60

PR:		199601
Approved by:	portmgr blanket

3 files changed, 60 insertions, 0 deletions

diff --git a/graphics/scantailor/Makefile b/graphics/scantailor/Makefile
index 6c3a2fecb6a0..6a673ed43dae 100644
--- a/graphics/scantailor/Makefile
+++ b/graphics/scantailor/Makefile
@@ -46,6 +46,10 @@ PORTDOCS=	*
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|_[12]|boost::lambda::&|g; s|bind(|boost::lambda::&|' \
+		${WRKSRC}/filters/*/Filter.cpp
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/resources/icons/appicon-about.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
diff --git a/graphics/scantailor/files/patch-MainWindow.cpp b/graphics/scantailor/files/patch-MainWindow.cpp
new file mode 100644
index 000000000000..c73621ee7e0e
--- /dev/null
+++ b/graphics/scantailor/files/patch-MainWindow.cpp
@@ -0,0 +1,22 @@
+--- MainWindow.cpp.orig	2012-02-27 20:21:08 UTC
++++ MainWindow.cpp
+@@ -1896,8 +1896,8 @@ MainWindow::showInsertFileDialog(BeforeO
+ 		ImageFileInfo image_file_info(file_info, std::vector<ImageMetadata>());
+ 
+ 		ImageMetadataLoader::Status const status = ImageMetadataLoader::load(
+-			files.at(i), bind(&std::vector<ImageMetadata>::push_back,
+-			boost::ref(image_file_info.imageInfo()), _1)
++			files.at(i), boost::lambda::bind(&std::vector<ImageMetadata>::push_back,
++			boost::ref(image_file_info.imageInfo()), boost::lambda::_1)
+ 		);
+ 
+ 		if (status == ImageMetadataLoader::LOADED) {
+@@ -1919,7 +1919,7 @@ MainWindow::showInsertFileDialog(BeforeO
+ 	}
+ 
+ 	// Check if there is at least one DPI that's not OK.
+-	if (std::find_if(new_files.begin(), new_files.end(), !bind(&ImageFileInfo::isDpiOK, _1)) != new_files.end()) {
++	if (std::find_if(new_files.begin(), new_files.end(), !boost::lambda::bind(&ImageFileInfo::isDpiOK, boost::lambda::_1)) != new_files.end()) {
+ 
+ 		std::auto_ptr<FixDpiDialog> dpi_dialog(new FixDpiDialog(new_files, this));
+ 		dpi_dialog->setWindowModality(Qt::WindowModal);
diff --git a/graphics/scantailor/files/patch-ThumbnailSequence.cpp b/graphics/scantailor/files/patch-ThumbnailSequence.cpp
new file mode 100644
index 000000000000..1571ba175666
--- /dev/null
+++ b/graphics/scantailor/files/patch-ThumbnailSequence.cpp
@@ -0,0 +1,34 @@
+--- ThumbnailSequence.cpp.orig	2012-02-27 20:21:08 UTC
++++ ThumbnailSequence.cpp
+@@ -489,7 +489,7 @@ ThumbnailSequence::Impl::Impl(
+ 	m_pSelectionLeader(0)
+ {
+ 	m_graphicsScene.setContextMenuEventCallback(
+-		bind(&Impl::sceneContextMenuEvent, this, _1)
++		boost::lambda::bind(&Impl::sceneContextMenuEvent, this, boost::lambda::_1)
+ 	);
+ }
+ 
+@@ -603,7 +603,7 @@ ThumbnailSequence::Impl::invalidateThumb
+ {
+ 	ItemsById::iterator const id_it(m_itemsById.find(page_info.id()));
+ 	if (id_it != m_itemsById.end()) {
+-		m_itemsById.modify(id_it, bind(&Item::pageInfo, _1) = page_info);
++		m_itemsById.modify(id_it, boost::lambda::bind(&Item::pageInfo, boost::lambda::_1) = page_info);
+ 		invalidateThumbnailImpl(id_it);
+ 	}
+ }
+@@ -723,10 +723,10 @@ ThumbnailSequence::Impl::invalidateAllTh
+ 	// Sort pages in m_itemsInOrder using m_ptrOrderProvider.
+ 	if (m_ptrOrderProvider.get()) {
+ 		m_itemsInOrder.sort(
+-			bind(
++			boost::lambda::bind(
+ 				&PageOrderProvider::precedes, m_ptrOrderProvider.get(),
+-				bind(&Item::pageId, _1), bind(&Item::incompleteThumbnail, _1),
+-				bind(&Item::pageId, _2), bind(&Item::incompleteThumbnail, _2) 
++				boost::lambda::bind(&Item::pageId, boost::lambda::_1), bind(&Item::incompleteThumbnail, boost::lambda::_1),
++				boost::lambda::bind(&Item::pageId, boost::lambda::_2), bind(&Item::incompleteThumbnail, boost::lambda::_2) 
+ 			)
+ 		);
+ 	}