mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
- Fix complie errors
PR: ports/211652 Submitted by: w.schwarzenfeld@utanet.at
This commit is contained in:
parent
8355ce3191
commit
8fcc23c359
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=420616
@ -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
|
||||
|
11
graphics/scantailor/files/patch-GridTraverser_cpp
Normal file
11
graphics/scantailor/files/patch-GridTraverser_cpp
Normal file
@ -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)
|
||||
{
|
||||
|
12
graphics/scantailor/files/patch-MatrixCalc.h
Normal file
12
graphics/scantailor/files/patch-MatrixCalc.h
Normal file
@ -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);
|
||||
|
29
graphics/scantailor/files/patch-ProfilesDialog_cpp
Normal file
29
graphics/scantailor/files/patch-ProfilesDialog_cpp
Normal file
@ -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)
|
||||
)
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user