tesseract: fix build on x86_64.

* also declares compat on provides.
haikuports · Jan 21, 2017 · acd57fe · acd57fe
1 parent 2f0696d
commit acd57fe
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/...tesseract/patches/tesseract-3.02.02.patch → ...seract/patches/tesseract-3.02.02.patchset b/...tesseract/patches/tesseract-3.02.02.patch → ...seract/patches/tesseract-3.02.02.patchset
@@ -3,9 +3,6 @@ From: Sergei Reznikov <diver@gelios.net>
 Date: Tue, 31 Mar 2015 14:43:55 +0300
 Subject: [PATCH] Backport 16aa99315a3d - make ocrclass.h public header
 
----
- ccutil/Makefile.am | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/ccutil/Makefile.am b/ccutil/Makefile.am
 index 5c08f6b..8737dda 100644
@@ -36,5 +33,27 @@ index 5c08f6b..8737dda 100644
 \ No newline at end of file
 +endif
 -- 
-2.2.2
+2.10.2
+
+
+From b71ceaebdb44e530bce9c3400ab3d08c51202399 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 21 Jan 2017 14:05:21 +0100
+Subject: fix missing declaration for fd_set,FD_SET,FD_ZERO,select.
+
+
+diff --git a/viewer/svutil.cpp b/viewer/svutil.cpp
+index bef51b1..20b1d6b 100644
+--- a/viewer/svutil.cpp
++++ b/viewer/svutil.cpp
+@@ -38,6 +38,7 @@ struct addrinfo {
+ #include <stdlib.h>
+ #include <string.h>
+ #include <netdb.h>
++#include <sys/select.h>
+ #include <sys/socket.h>
+ #ifdef __linux__
+ #include <sys/prctl.h>
+-- 
+2.10.2
 
diff --git a/app-text/tesseract/tesseract-3.02.02.recipe b/app-text/tesseract/tesseract-3.02.02.recipe
@@ -13,16 +13,17 @@ HOMEPAGE="http://code.google.com/p/tesseract-ocr"
 LICENSE="Apache v2"
 COPYRIGHT="1985-1995 HP labs
 	2012 Google Inc."
-SOURCE_URI="https://github.com/tesseract-ocr/tesseract/archive/3.02.02.tar.gz"
+SOURCE_URI="https://github.com/tesseract-ocr/tesseract/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="1566a78f81570e7dc656e881a0fa688fe1c700d4657041807f2160bf67fbb485"
-REVISION="1"
+REVISION="2"
+PATCHES="tesseract-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	tesseract$secondaryArchSuffix = $portVersion
-	lib:libtesseract$secondaryArchSuffix = $portVersion
+	lib:libtesseract$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:ambiguous_words$secondaryArchSuffix = $portVersion
 	cmd:classifier_tester$secondaryArchSuffix = $portVersion
 	cmd:cntraining$secondaryArchSuffix = $portVersion
@@ -36,7 +37,7 @@ PROVIDES="
 	"
 PROVIDES_devel="
 	tesseract${secondaryArchSuffix}_devel = $portVersion
-	devel:libtesseract$secondaryArchSuffix = $portVersion
+	devel:libtesseract$secondaryArchSuffix = $portVersion compat >= 3
 	"
 
 REQUIRES_devel="
@@ -70,7 +71,6 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-PATCHES="tesseract-3.02.02.patch"
 
 PATCH()
 {