summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kahle <tomka@gentoo.org>2016-02-02 15:31:08 +0100
committerThomas Kahle <tomka@gentoo.org>2016-02-02 15:31:23 +0100
commit4e1b8e325f0e834e270d0be5643e281dcaeae5b1 (patch)
treebd6817f9a89d0ca4cf09c02ee309d462c5905ec3 /app-text/tesseract
parentx11-misc/quitcount: Fix metadata.xml (diff)
downloadgentoo-4e1b8e325f0e834e270d0be5643e281dcaeae5b1.tar.gz
gentoo-4e1b8e325f0e834e270d0be5643e281dcaeae5b1.tar.bz2
gentoo-4e1b8e325f0e834e270d0be5643e281dcaeae5b1.zip
app-text/tesseract: leptonica-1.73 compatibility
Fixes bug 573382. Thanks Dennis Schridde. Package-Manager: portage-2.2.26
Diffstat (limited to 'app-text/tesseract')
-rw-r--r--app-text/tesseract/files/tesseract-3.04.00-leptonica-1.73-compat.patch24
-rw-r--r--app-text/tesseract/tesseract-3.04.00-r4.ebuild1
2 files changed, 25 insertions, 0 deletions
diff --git a/app-text/tesseract/files/tesseract-3.04.00-leptonica-1.73-compat.patch b/app-text/tesseract/files/tesseract-3.04.00-leptonica-1.73-compat.patch
new file mode 100644
index 00000000000..50d342c25c1
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.04.00-leptonica-1.73-compat.patch
@@ -0,0 +1,24 @@
+--- tesseract-3.04.00/opencl/openclwrapper.cpp.orig 2016-01-31 11:55:02.535154846 +0100
++++ tesseract-3.04.00/opencl/openclwrapper.cpp 2016-01-31 12:04:23.727809089 +0100
+@@ -14,6 +14,21 @@
+ #include "otsuthr.h"
+ #include "thresholder.h"
+
++/*
++ Convenience macro to test the version of Leptonica.
++*/
++#if defined(LIBLEPT_MAJOR_VERSION) && defined(LIBLEPT_MINOR_VERSION)
++# define TESSERACT_LIBLEPT_PREREQ(maj, min) \
++ ((LIBLEPT_MAJOR_VERSION) > (maj) || ((LIBLEPT_MAJOR_VERSION) == (maj) && (LIBLEPT_MINOR_VERSION) >= (min)))
++#else
++# define TESSERACT_LIBLEPT_PREREQ(maj, min) 0
++#endif
++
++#if TESSERACT_LIBLEPT_PREREQ(1,73)
++# define CALLOC LEPT_CALLOC
++# define FREE LEPT_FREE
++#endif
++
+ #ifdef USE_OPENCL
+
+ #if ON_APPLE
diff --git a/app-text/tesseract/tesseract-3.04.00-r4.ebuild b/app-text/tesseract/tesseract-3.04.00-r4.ebuild
index 8fce6ae0baa..3c43d7bbc5b 100644
--- a/app-text/tesseract/tesseract-3.04.00-r4.ebuild
+++ b/app-text/tesseract/tesseract-3.04.00-r4.ebuild
@@ -94,6 +94,7 @@ PATCHES=(
"${FILESDIR}/tesseract-2.04-gcc47.patch"
"${FILESDIR}/${P}-fix-scrollview-disabled.patch"
"${FILESDIR}/${P}-use-system-piccolo2d.patch"
+ "${FILESDIR}/${P}-leptonica-1.73-compat.patch"
)
src_unpack() {