svn commit: r408592 - in head/graphics/scantailor: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Tue Feb 9 20:21:58 UTC 2016
Author: amdmi3
Date: Tue Feb 9 20:21:57 2016
New Revision: 408592
URL: https://svnweb.freebsd.org/changeset/ports/408592
Log:
- Fix build with boost 1.60
PR: 199601
Approved by: portmgr blanket
Added:
head/graphics/scantailor/files/patch-MainWindow.cpp (contents, props changed)
head/graphics/scantailor/files/patch-ThumbnailSequence.cpp (contents, props changed)
Modified:
head/graphics/scantailor/Makefile
Modified: head/graphics/scantailor/Makefile
==============================================================================
--- head/graphics/scantailor/Makefile Tue Feb 9 20:19:07 2016 (r408591)
+++ head/graphics/scantailor/Makefile Tue Feb 9 20:21:57 2016 (r408592)
@@ -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
Added: head/graphics/scantailor/files/patch-MainWindow.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/scantailor/files/patch-MainWindow.cpp Tue Feb 9 20:21:57 2016 (r408592)
@@ -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);
Added: head/graphics/scantailor/files/patch-ThumbnailSequence.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/scantailor/files/patch-ThumbnailSequence.cpp Tue Feb 9 20:21:57 2016 (r408592)
@@ -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)
+ )
+ );
+ }
More information about the svn-ports-all
mailing list