- Fix build on 10.x

- Fix build after swig package name change

PR:		183202
Submitted by:	amdmi3
Approved by:	maintainer timeout
This commit is contained in:
Dmitry Marakasov 2014-01-13 04:40:37 +00:00
parent 00a809db8f
commit e0ae1a19ba
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=339567
3 changed files with 23 additions and 1 deletions

View File

@ -12,7 +12,7 @@ COMMENT= Fast image processing library
LICENSE= GPLv2
BUILD_DEPENDS= swig>=1.3.32:${PORTSDIR}/devel/swig13
BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13
LIB_DEPENDS= libagg.so:${PORTSDIR}/graphics/agg \
libjpeg.so:${PORTSDIR}/graphics/jpeg \
libtiff.so:${PORTSDIR}/graphics/tiff \

View File

@ -0,0 +1,11 @@
--- api/api.cc.orig 2009-06-15 14:39:45.000000000 +0400
+++ api/api.cc 2014-01-13 07:25:57.460488862 +0400
@@ -909,7 +909,7 @@
}
std::vector<std::string> ret;
- for (std::map<scanner_result_t,int>::const_iterator it = retcodes.begin();
+ for (std::map<scanner_result_t,int,comp>::const_iterator it = retcodes.begin();
it != retcodes.end();
++it) {
if (it->first.type || it->second > 1)

View File

@ -0,0 +1,11 @@
--- frontends/bardecode.cc.orig 2010-06-18 18:02:15.000000000 +0400
+++ frontends/bardecode.cc 2014-01-13 07:31:33.549465639 +0400
@@ -145,7 +145,7 @@
}
}
- for (std::map<scanner_result_t,int>::const_iterator it = codes.begin();
+ for (std::map<scanner_result_t,int,comp>::const_iterator it = codes.begin();
it != codes.end();
++it) {
if (it->first.type&(ean|code128|gs1_128) || it->second > 1)