From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 33AE158973 for ; Tue, 2 Feb 2016 14:31:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E0EB21C084; Tue, 2 Feb 2016 14:31:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D79D221C084 for ; Tue, 2 Feb 2016 14:31:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E307E340D77 for ; Tue, 2 Feb 2016 14:31:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6D7D8F2 for ; Tue, 2 Feb 2016 14:31:28 +0000 (UTC) From: "Thomas Kahle" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Kahle" Message-ID: <1454423483.4e1b8e325f0e834e270d0be5643e281dcaeae5b1.tomka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/tesseract/, app-text/tesseract/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/tesseract/files/tesseract-3.04.00-leptonica-1.73-compat.patch app-text/tesseract/tesseract-3.04.00-r4.ebuild X-VCS-Directories: app-text/tesseract/ app-text/tesseract/files/ X-VCS-Committer: tomka X-VCS-Committer-Name: Thomas Kahle X-VCS-Revision: 4e1b8e325f0e834e270d0be5643e281dcaeae5b1 X-VCS-Branch: master Date: Tue, 2 Feb 2016 14:31:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 99130f51-0604-4b61-b12d-77ed9a2768c9 X-Archives-Hash: 4ef09a6c4200de3d664207fbfab46112 commit: 4e1b8e325f0e834e270d0be5643e281dcaeae5b1 Author: Thomas Kahle gentoo org> AuthorDate: Tue Feb 2 14:31:08 2016 +0000 Commit: Thomas Kahle gentoo org> CommitDate: Tue Feb 2 14:31:23 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e1b8e32 app-text/tesseract: leptonica-1.73 compatibility Fixes bug 573382. Thanks Dennis Schridde. Package-Manager: portage-2.2.26 .../tesseract-3.04.00-leptonica-1.73-compat.patch | 24 ++++++++++++++++++++++ app-text/tesseract/tesseract-3.04.00-r4.ebuild | 1 + 2 files changed, 25 insertions(+) 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 0000000..50d342c --- /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 8fce6ae..3c43d7b 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() {