diff options
author | amdmi3 <amdmi3@FreeBSD.org> | 2014-01-13 12:40:37 +0800 |
---|---|---|
committer | amdmi3 <amdmi3@FreeBSD.org> | 2014-01-13 12:40:37 +0800 |
commit | 571822c22a15d0a908f591d7db2fa02b2f28e4a1 (patch) | |
tree | badcfe8316eda93a120c55ee0f8c2ebf70f37581 /graphics/exact-image | |
parent | 2d87e9baed01e91e85f8f049ed696e947a75921f (diff) | |
download | freebsd-ports-gnome-571822c22a15d0a908f591d7db2fa02b2f28e4a1.tar.gz freebsd-ports-gnome-571822c22a15d0a908f591d7db2fa02b2f28e4a1.tar.zst freebsd-ports-gnome-571822c22a15d0a908f591d7db2fa02b2f28e4a1.zip |
- Fix build on 10.x
- Fix build after swig package name change
PR: 183202
Submitted by: amdmi3
Approved by: maintainer timeout
Diffstat (limited to 'graphics/exact-image')
-rw-r--r-- | graphics/exact-image/Makefile | 2 | ||||
-rw-r--r-- | graphics/exact-image/files/patch-api-api.cc | 11 | ||||
-rw-r--r-- | graphics/exact-image/files/patch-frontends-bardecode.cc | 11 |
3 files changed, 23 insertions, 1 deletions
diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile index ed8a0eab0dd9..7d1a0582012e 100644 --- a/graphics/exact-image/Makefile +++ b/graphics/exact-image/Makefile @@ -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 \ diff --git a/graphics/exact-image/files/patch-api-api.cc b/graphics/exact-image/files/patch-api-api.cc new file mode 100644 index 000000000000..1ca6edc5dd6c --- /dev/null +++ b/graphics/exact-image/files/patch-api-api.cc @@ -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) diff --git a/graphics/exact-image/files/patch-frontends-bardecode.cc b/graphics/exact-image/files/patch-frontends-bardecode.cc new file mode 100644 index 000000000000..15ebbcfb985e --- /dev/null +++ b/graphics/exact-image/files/patch-frontends-bardecode.cc @@ -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) |