From owner-svn-ports-all@freebsd.org Tue Feb 9 20:21:58 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 91E5DAA339D; Tue, 9 Feb 2016 20:21:58 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6CA8EF5; Tue, 9 Feb 2016 20:21:58 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u19KLvZs050917; Tue, 9 Feb 2016 20:21:57 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u19KLv5j050914; Tue, 9 Feb 2016 20:21:57 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201602092021.u19KLv5j050914@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 9 Feb 2016 20:21:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408592 - in head/graphics/scantailor: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2016 20:21:58 -0000 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()); + + 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); 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) + ) + ); + }