Date: Mon, 22 Aug 2016 13:40:50 +0000 (UTC) From: Veniamin Gvozdikov <vg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420616 - in head/graphics/scantailor: . files Message-ID: <201608221340.u7MDeoAj048722@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vg Date: Mon Aug 22 13:40:50 2016 New Revision: 420616 URL: https://svnweb.freebsd.org/changeset/ports/420616 Log: - Fix complie errors PR: ports/211652 Submitted by: w.schwarzenfeld@utanet.at Added: head/graphics/scantailor/files/patch-GridTraverser_cpp (contents, props changed) head/graphics/scantailor/files/patch-MatrixCalc.h (contents, props changed) head/graphics/scantailor/files/patch-ProfilesDialog_cpp (contents, props changed) Modified: head/graphics/scantailor/Makefile Modified: head/graphics/scantailor/Makefile ============================================================================== --- head/graphics/scantailor/Makefile Mon Aug 22 13:33:23 2016 (r420615) +++ head/graphics/scantailor/Makefile Mon Aug 22 13:40:50 2016 (r420616) @@ -14,13 +14,15 @@ LICENSE= GPLv3 LIB_DEPENDS= libtiff.so:graphics/tiff \ libjbig.so:graphics/jbigkit \ - libpng.so:graphics/png + libpng.so:graphics/png \ + BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs +#MAKE_JOBS_UNSAFE= yes USES= cmake gettext jpeg -USE_GCC= yes -USE_QT4= gui xml qmake_build uic_build moc_build rcc_build \ +USE_QT4= corelib gui xml qmake_build uic_build moc_build rcc_build \ linguist_build +USE_XORG+= xrender DESKTOP_ENTRIES="Scan Tailor" "${COMMENT}" "${PORTNAME}" \ "${PORTNAME}" "Graphics;Scanning;" false Added: head/graphics/scantailor/files/patch-GridTraverser_cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/scantailor/files/patch-GridTraverser_cpp Mon Aug 22 13:40:50 2016 (r420616) @@ -0,0 +1,11 @@ +--- foundation/GridLineTraverser.cpp ++++ foundation/GridLineTraverser.cpp +@@ -19,6 +19,7 @@ + #include "GridLineTraverser.h" + #include "LineIntersectionScalar.h" + #include <algorithm> ++#include <cstdlib> + + GridLineTraverser::GridLineTraverser(QLineF const& line) + { + Added: head/graphics/scantailor/files/patch-MatrixCalc.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/scantailor/files/patch-MatrixCalc.h Mon Aug 22 13:40:50 2016 (r420616) @@ -0,0 +1,12 @@ +--- math/MatrixCalc.h ++++ math/MatrixCalc.h +@@ -74,7 +74,7 @@ class DynamicPoolAllocator : public AbstractAllocator<T> + template<typename T> + class Mat + { +- template<typename OT, typename Alloc> friend class MatrixCalc; ++ template<typename OT, typename Alloc> friend class ::MatrixCalc; + template<typename OT> friend Mat<OT> operator+(Mat<OT> const& m1, Mat<OT> const& m2); + template<typename OT> friend Mat<OT> operator-(Mat<OT> const& m1, Mat<OT> const& m2); + template<typename OT> friend Mat<OT> operator*(Mat<OT> const& m1, Mat<OT> const& m2); + Added: head/graphics/scantailor/files/patch-ProfilesDialog_cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/scantailor/files/patch-ProfilesDialog_cpp Mon Aug 22 13:40:50 2016 (r420616) @@ -0,0 +1,29 @@ +--- ProjectFilesDialog.cpp ++++ ProjectFilesDialog.cpp +@@ -279,7 +279,7 @@ ProjectFilesDialog::inProjectFiles() const + using namespace boost::lambda; + + std::vector<ImageFileInfo> files; +- m_ptrInProjectFiles->items(bind(&pushFileInfo<Item>, ref(files), _1)); ++ m_ptrInProjectFiles->items(bind(&pushFileInfo<Item>, boost::ref(files), _1)); + + std::sort(files.begin(), files.end(), imageFileInfoLess); + +@@ -439,7 +439,7 @@ ProjectFilesDialog::setInputDir(QString const& dir, bool const auto_add_files) + files.begin(), files.end(), + bind( + &pushItemWithFlags<Item, ItemList>, +- _1, ref(items), cref(m_supportedExtensions) ++ _1, boost::ref(items), cref(m_supportedExtensions) + ) + ); + +@@ -510,7 +510,7 @@ ProjectFilesDialog::removeFromProject() + m_ptrInProjectFiles->items( + selection, bind( + &pushItemIfSameDir<Item, ItemList>, +- ref(items), _1, cref(input_dir) ++ boost::ref(items), _1, cref(input_dir) + ) + ); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608221340.u7MDeoAj048722>