From patchwork Tue Dec 31 10:40:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilles Talis X-Patchwork-Id: 1216643 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PGtpKMhF"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47n9nR0YPVz9sPK for ; Tue, 31 Dec 2019 21:40:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8A38986F85; Tue, 31 Dec 2019 10:40:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Se+Xyhom9o+C; Tue, 31 Dec 2019 10:40:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4048B86F1B; Tue, 31 Dec 2019 10:40:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 918151BF30B for ; Tue, 31 Dec 2019 10:40:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8D5E7860FF for ; Tue, 31 Dec 2019 10:40:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dpxoQeBPtdGW for ; Tue, 31 Dec 2019 10:40:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id DF8C9860F9 for ; Tue, 31 Dec 2019 10:40:46 +0000 (UTC) Received: by mail-wm1-f53.google.com with SMTP id t14so1570633wmi.5 for ; Tue, 31 Dec 2019 02:40:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=RAjHwzVcRqLDNWZDnz/oCyb6XMI3Wv+fe/g1yYVp7rA=; b=PGtpKMhFKb4c4Zn6hrCXdDyYSQrAHYxBgJAUET9Wt/QpHROt1fs9EUlQFszXPjcpLp PzOWHVrMppDGbKlpROiNgVmDc6t/K1MPX4CKPsGs6iwkHfLZQGkO6atTJACE6cSDyGWE SeypzaEAL8l2TmoUxrpD025pLurBqgPJehL1vfbYVLOlyHMpiuBUPDkOkVSuKuZV5M+B L6tURXCrmIp42XXyXUyFCc6oVEIgt7iIDPohSq7u2j0JrDZRIGn8+DKAar7JRu7bO5/G sjU8DHia8nOW3bJHpeKoCm5eumoXUxHFjl1QF4klEeGLV4XczCMyWZheLV7jgC1j2L+N 41jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=RAjHwzVcRqLDNWZDnz/oCyb6XMI3Wv+fe/g1yYVp7rA=; b=WVh0thbFN524szlrRQle80aIjYZOpraLPJ9rLXk7yjgwbH19/w4XvXdB04iAVYYSGt SI1J/qH1sOFpVHT0oYoD8OLRfvwAfeYk8s/yy7YAOLtXfVMbpefj4rZLkvaR9x/sPOsd DY/NGa6k444olO+K1a6Te6R4mrVOyVUND9238Y+u3M/xML0ezahhT+zzRfpKT/7LBZoJ ZqCSsS0iWskL210c9Fh1nnyB2XA1NPr6iespX4xAvUjJAHiwVST/XiWVgxd6vw2glWVd zTG0QDEYHI8b2ZOBRMBAcvCucrsj+epgW9JVE4gevoD/hQJgjZIWuLBiwtyHyZjXkTJS mOWA== X-Gm-Message-State: APjAAAUeECrymfkdcj08Gq8MihY828vYTMbQDj7eo6x18MNYCFIv7NRU LNvMZfWdQfQu5GOk5iMM6eDC/xPP X-Google-Smtp-Source: APXvYqwCR+k/dVGniJ070qOjj8gt0DdU80QXKWfB01reoFd8I5rBt+USOUGicvMdWzigfr6qnLS0/g== X-Received: by 2002:a7b:cf0d:: with SMTP id l13mr3518842wmg.13.1577788844795; Tue, 31 Dec 2019 02:40:44 -0800 (PST) Received: from gilles-Gazelle-Professional.home (2a01cb04048e090010461bad03bc33f8.ipv6.abo.wanadoo.fr. [2a01:cb04:48e:900:1046:1bad:3bc:33f8]) by smtp.gmail.com with ESMTPSA id x26sm2146783wmc.30.2019.12.31.02.40.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Dec 2019 02:40:44 -0800 (PST) From: Gilles Talis To: buildroot@buildroot.org Date: Tue, 31 Dec 2019 11:40:35 +0100 Message-Id: <20191231104035.5506-1-gilles.talis@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH] package/tesseract-ocr: bump to version 4.1.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gilles Talis MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Also removed one patch that was merged upstream Signed-off-by: Gilles Talis --- ...stead-of-off_t-for-result-from-ftell.patch | 26 ------------------- package/tesseract-ocr/tesseract-ocr.hash | 2 +- package/tesseract-ocr/tesseract-ocr.mk | 2 +- 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 package/tesseract-ocr/0001-Use-long-instead-of-off_t-for-result-from-ftell.patch diff --git a/package/tesseract-ocr/0001-Use-long-instead-of-off_t-for-result-from-ftell.patch b/package/tesseract-ocr/0001-Use-long-instead-of-off_t-for-result-from-ftell.patch deleted file mode 100644 index 7cb5d6877e..0000000000 --- a/package/tesseract-ocr/0001-Use-long-instead-of-off_t-for-result-from-ftell.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d4e0ab3014c57e519513c10b8e23d8bf66610bff Mon Sep 17 00:00:00 2001 -From: Stefan Weil -Date: Wed, 17 Jul 2019 21:11:53 +0200 -Subject: [PATCH] Use long instead of off_t for result from ftell - -Signed-off-by: Stefan Weil -[Retrieved from: -https://github.com/tesseract-ocr/tesseract/commit/d4e0ab3014c57e519513c10b8e23d8bf66610bff] -Signed-off-by: Fabrice Fontaine ---- - src/ccutil/scanutils.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ccutil/scanutils.cpp b/src/ccutil/scanutils.cpp -index da0c6918e..ea376a570 100644 ---- a/src/ccutil/scanutils.cpp -+++ b/src/ccutil/scanutils.cpp -@@ -214,7 +214,7 @@ static int tvfscanf(FILE* stream, const char *format, va_list ap) { - (CHAR_BIT * sizeof(long))]; - int matchinv = 0; // Is match map inverted? - unsigned char range_start = 0; -- off_t start_off = ftell(stream); -+ long start_off = ftell(stream); - - // Skip leading spaces - SkipSpace(stream); diff --git a/package/tesseract-ocr/tesseract-ocr.hash b/package/tesseract-ocr/tesseract-ocr.hash index a5601adfc7..808ea174ef 100644 --- a/package/tesseract-ocr/tesseract-ocr.hash +++ b/package/tesseract-ocr/tesseract-ocr.hash @@ -1,5 +1,5 @@ # locally computed -sha256 5c5ed5f1a76888dc57a83704f24ae02f8319849f5c4cf19d254296978a1a1961 tesseract-ocr-4.1.0.tar.gz +sha256 2a66ff0d8595bff8f04032165e6c936389b1e5727c3ce5a27b3e059d218db1cb tesseract-ocr-4.1.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047 eng.traineddata sha256 eac01c1d72540d6090facb7b2f42dd0a2ee8fc57c5be1b20548ae668e2761913 fra.traineddata diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index 0fbbb93422..4d2df5cb39 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -4,7 +4,7 @@ # ################################################################################ -TESSERACT_OCR_VERSION = 4.1.0 +TESSERACT_OCR_VERSION = 4.1.1 TESSERACT_OCR_DATA_VERSION = 4.0.0 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION)) TESSERACT_OCR_LICENSE = Apache-2.0