Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Jan 2014 04:40:37 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339567 - in head/graphics/exact-image: . files
Message-ID:  <201401130440.s0D4ebNZ087246@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Jan 13 04:40:37 2014
New Revision: 339567
URL: http://svnweb.freebsd.org/changeset/ports/339567

Log:
  - Fix build on 10.x
  - Fix build after swig package name change
  
  PR:		183202
  Submitted by:	amdmi3
  Approved by:	maintainer timeout

Added:
  head/graphics/exact-image/files/patch-api-api.cc   (contents, props changed)
  head/graphics/exact-image/files/patch-frontends-bardecode.cc   (contents, props changed)
Modified:
  head/graphics/exact-image/Makefile

Modified: head/graphics/exact-image/Makefile
==============================================================================
--- head/graphics/exact-image/Makefile	Mon Jan 13 01:31:03 2014	(r339566)
+++ head/graphics/exact-image/Makefile	Mon Jan 13 04:40:37 2014	(r339567)
@@ -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 \

Added: head/graphics/exact-image/files/patch-api-api.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/exact-image/files/patch-api-api.cc	Mon Jan 13 04:40:37 2014	(r339567)
@@ -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)

Added: head/graphics/exact-image/files/patch-frontends-bardecode.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/exact-image/files/patch-frontends-bardecode.cc	Mon Jan 13 04:40:37 2014	(r339567)
@@ -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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401130440.s0D4ebNZ087246>