Hello community, here is the log from the commit of package scantailor for openSUSE:Factory checked in at 2016-02-25 22:08:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scantailor (Old) and /work/SRC/openSUSE:Factory/.scantailor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scantailor" Changes: -------- --- /work/SRC/openSUSE:Factory/scantailor/scantailor.changes 2015-01-24 22:21:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scantailor.new/scantailor.changes 2016-02-26 00:44:55.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 24 07:06:09 UTC 2016 - [email protected] + +- Fix build with boost 1.60 + * scantailor-boost-1.60.patch + +------------------------------------------------------------------- New: ---- scantailor-boost-1.60.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scantailor.spec ++++++ --- /var/tmp/diff_new_pack.zHRNvi/_old 2016-02-26 00:44:56.000000000 +0100 +++ /var/tmp/diff_new_pack.zHRNvi/_new 2016-02-26 00:44:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package scantailor # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ Url: http://scantailor.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}-icons.tar.bz2 +# PATCH-FIX-UPSTREAM scantailor-boost-1.60.patch -- Fix build with new boost +Patch1: scantailor-boost-1.60.patch BuildRequires: boost-devel >= 1.42 BuildRequires: cmake BuildRequires: hicolor-icon-theme @@ -52,6 +54,7 @@ %prep %setup -q -a 1 +%patch1 -p1 cp -p resources/icons/{COPYING,COPYING.icons} %build ++++++ scantailor-boost-1.60.patch ++++++ diff --git a/MainWindow.cpp b/MainWindow.cpp index 37426bf..dd0caed 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -1898,8 +1898,8 @@ MainWindow::showInsertFileDialog(BeforeOrAfter before_or_after, ImageId const& e 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) { @@ -1921,7 +1921,7 @@ MainWindow::showInsertFileDialog(BeforeOrAfter before_or_after, ImageId const& e } // 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/ThumbnailSequence.cpp b/ThumbnailSequence.cpp index b0dd21a..896b37c 100644 --- a/ThumbnailSequence.cpp +++ b/ThumbnailSequence.cpp @@ -491,7 +491,7 @@ ThumbnailSequence::Impl::Impl( m_pSelectionLeader(0) { m_graphicsScene.setContextMenuEventCallback( - bind(&Impl::sceneContextMenuEvent, this, _1) + boost::lambda::bind(&Impl::sceneContextMenuEvent, this, boost::lambda::_1) ); } @@ -605,7 +605,7 @@ ThumbnailSequence::Impl::invalidateThumbnail(PageInfo const& page_info) { 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); } } @@ -725,10 +725,10 @@ ThumbnailSequence::Impl::invalidateAllThumbnails() // 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) ) ); } diff --git a/filters/deskew/Filter.cpp b/filters/deskew/Filter.cpp index 527d8f6..9fcb5c1 100644 --- a/filters/deskew/Filter.cpp +++ b/filters/deskew/Filter.cpp @@ -85,9 +85,9 @@ Filter::saveSettings(ProjectWriter const& writer, QDomDocument& doc) const QDomElement filter_el(doc.createElement("deskew")); writer.enumPages( - bind( + boost::lambda::bind( &Filter::writePageSettings, - this, boost::ref(doc), var(filter_el), _1, _2 + this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 ) ); diff --git a/filters/fix_orientation/Filter.cpp b/filters/fix_orientation/Filter.cpp index 6779c21..142b23d 100644 --- a/filters/fix_orientation/Filter.cpp +++ b/filters/fix_orientation/Filter.cpp @@ -100,9 +100,9 @@ Filter::saveSettings( QDomElement filter_el(doc.createElement("fix-orientation")); writer.enumImages( - bind( + boost::lambda::bind( &Filter::writeImageSettings, - this, boost::ref(doc), var(filter_el), _1, _2 + this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 ) ); diff --git a/filters/output/Filter.cpp b/filters/output/Filter.cpp index dd2f46a..b47c869 100644 --- a/filters/output/Filter.cpp +++ b/filters/output/Filter.cpp @@ -91,9 +91,9 @@ Filter::saveSettings( QDomElement filter_el(doc.createElement("output")); writer.enumPages( - bind( + boost::lambda::bind( &Filter::writePageSettings, - this, boost::ref(doc), var(filter_el), _1, _2 + this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 ) ); diff --git a/filters/page_layout/Filter.cpp b/filters/page_layout/Filter.cpp index df315c6..7e54d99 100644 --- a/filters/page_layout/Filter.cpp +++ b/filters/page_layout/Filter.cpp @@ -136,9 +136,9 @@ Filter::saveSettings( QDomElement filter_el(doc.createElement("page-layout")); writer.enumPages( - bind( + boost::lambda::bind( &Filter::writePageSettings, - this, boost::ref(doc), var(filter_el), _1, _2 + this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 ) ); diff --git a/filters/page_split/Filter.cpp b/filters/page_split/Filter.cpp index 83fd165..a830b99 100644 --- a/filters/page_split/Filter.cpp +++ b/filters/page_split/Filter.cpp @@ -110,9 +110,9 @@ Filter::saveSettings( ); writer.enumImages( - bind( + boost::lambda::bind( &Filter::writeImageSettings, - this, boost::ref(doc), var(filter_el), _1, _2 + this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 ) ); diff --git a/filters/select_content/Filter.cpp b/filters/select_content/Filter.cpp index b0361b0..a442c84 100644 --- a/filters/select_content/Filter.cpp +++ b/filters/select_content/Filter.cpp @@ -119,9 +119,9 @@ Filter::saveSettings( QDomElement filter_el(doc.createElement("select-content")); writer.enumPages( - bind( + boost::lambda::bind( &Filter::writePageSettings, - this, boost::ref(doc), var(filter_el), _1, _2 + this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 ) );
