Index: head/graphics/scantailor/Makefile =================================================================== --- head/graphics/scantailor/Makefile (revision 408591) +++ head/graphics/scantailor/Makefile (revision 408592) @@ -1,65 +1,69 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= scantailor PORTVERSION= 0.9.11.1 PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= vg@FreeBSD.org COMMENT= Interactive post-processing tool for scanned pages LICENSE= GPLv3 LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ libjbig.so:${PORTSDIR}/graphics/jbigkit \ libpng.so:${PORTSDIR}/graphics/png BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs USES= cmake gettext jpeg USE_GCC= yes USE_QT4= gui xml qmake_build uic_build moc_build rcc_build \ linguist_build DESKTOP_ENTRIES="Scan Tailor" "${COMMENT}" "${PORTNAME}" \ "${PORTNAME}" "Graphics;Scanning;" false OPTIONS_GROUP= DOXYGEN OPTIONS_GROUP_DOXYGEN= HTML LATEX OPTIONS_DEFAULT= HTML_DESC= Install HTML Doxygen files LATEX_DESC= Install LaTeX Doxygen files OPTIONS_DEFINE= DOCS .include .if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MLATEX} PORTDOCS= * .endif .if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MLATEX} 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 .if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MLATEX} @cd ${WRKSRC} && doxygen . .endif .if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MHTML} @(cd ${WRKSRC} && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}) .endif .if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MLATEX} @(cd ${WRKSRC} && ${COPYTREE_SHARE} latex ${STAGEDIR}${DOCSDIR}) .endif .include Index: head/graphics/scantailor/files/patch-MainWindow.cpp =================================================================== --- head/graphics/scantailor/files/patch-MainWindow.cpp (nonexistent) +++ head/graphics/scantailor/files/patch-MainWindow.cpp (revision 408592) @@ -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()); + + ImageMetadataLoader::Status const status = ImageMetadataLoader::load( +- files.at(i), bind(&std::vector::push_back, +- boost::ref(image_file_info.imageInfo()), _1) ++ files.at(i), boost::lambda::bind(&std::vector::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 dpi_dialog(new FixDpiDialog(new_files, this)); + dpi_dialog->setWindowModality(Qt::WindowModal); Property changes on: head/graphics/scantailor/files/patch-MainWindow.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/scantailor/files/patch-ThumbnailSequence.cpp =================================================================== --- head/graphics/scantailor/files/patch-ThumbnailSequence.cpp (nonexistent) +++ head/graphics/scantailor/files/patch-ThumbnailSequence.cpp (revision 408592) @@ -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) + ) + ); + } Property changes on: head/graphics/scantailor/files/patch-ThumbnailSequence.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property