diff options
| author | vg <vg@FreeBSD.org> | 2016-08-22 21:40:50 +0800 |
|---|---|---|
| committer | vg <vg@FreeBSD.org> | 2016-08-22 21:40:50 +0800 |
| commit | 6d60a0cec8a0d77c3fcb4b1969d0a4aea466fbfd (patch) | |
| tree | 12ccb2ae41f91555b41e29b29c1b66060cdc5e83 /graphics | |
| parent | 037325591c6aea2f1eeb4895d126c37a3f4513ee (diff) | |
| download | freebsd-ports-gnome-6d60a0cec8a0d77c3fcb4b1969d0a4aea466fbfd.tar.gz freebsd-ports-gnome-6d60a0cec8a0d77c3fcb4b1969d0a4aea466fbfd.tar.zst freebsd-ports-gnome-6d60a0cec8a0d77c3fcb4b1969d0a4aea466fbfd.zip | |
- Fix complie errors
PR: ports/211652
Submitted by: w.schwarzenfeld@utanet.at
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/scantailor/Makefile | 8 | ||||
| -rw-r--r-- | graphics/scantailor/files/patch-GridTraverser_cpp | 11 | ||||
| -rw-r--r-- | graphics/scantailor/files/patch-MatrixCalc.h | 12 | ||||
| -rw-r--r-- | graphics/scantailor/files/patch-ProfilesDialog_cpp | 29 |
4 files changed, 57 insertions, 3 deletions
diff --git a/graphics/scantailor/Makefile b/graphics/scantailor/Makefile index 93778647a832..e60838666e5a 100644 --- a/graphics/scantailor/Makefile +++ b/graphics/scantailor/Makefile @@ -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 diff --git a/graphics/scantailor/files/patch-GridTraverser_cpp b/graphics/scantailor/files/patch-GridTraverser_cpp new file mode 100644 index 000000000000..c5f56cf99755 --- /dev/null +++ b/graphics/scantailor/files/patch-GridTraverser_cpp @@ -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) + { + diff --git a/graphics/scantailor/files/patch-MatrixCalc.h b/graphics/scantailor/files/patch-MatrixCalc.h new file mode 100644 index 000000000000..5c63389341d9 --- /dev/null +++ b/graphics/scantailor/files/patch-MatrixCalc.h @@ -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); + diff --git a/graphics/scantailor/files/patch-ProfilesDialog_cpp b/graphics/scantailor/files/patch-ProfilesDialog_cpp new file mode 100644 index 000000000000..a12d19971034 --- /dev/null +++ b/graphics/scantailor/files/patch-ProfilesDialog_cpp @@ -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) + ) + ); + |