kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Fix build with boost 1.60

Browse source 
PR:		199601
Approved by:	portmgr blanket
This commit is contained in:
Dmitry Marakasov 2016-02-09 20:21:57 +00:00
parent 6fbec020d8
commit c4984f58f6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=408592
3 changed files with 60 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
graphics/scantailor/Makefile
View file

@ -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

22
graphics/scantailor/files/patch-MainWindow.cpp Normal file
View file

@ -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);

34
graphics/scantailor/files/patch-ThumbnailSequence.cpp Normal file
View file

@ -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)
)
);
}