From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id WHMNLGjVIWBEYgAA0tVLHw (envelope-from ) for ; Tue, 09 Feb 2021 00:20:56 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id eGvgJ2jVIWBPFQAAB5/wlQ (envelope-from ) for ; Tue, 09 Feb 2021 00:20:56 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 42603940275 for ; Tue, 9 Feb 2021 00:20:56 +0000 (UTC) Received: from localhost ([::1]:49386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Glz-0000vb-52 for larch@yhetil.org; Mon, 08 Feb 2021 19:20:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9FlD-0007iv-7M for guix-patches@gnu.org; Mon, 08 Feb 2021 18:16:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l9FlC-0006d4-Cs for guix-patches@gnu.org; Mon, 08 Feb 2021 18:16:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l9FlC-00038J-99 for guix-patches@gnu.org; Mon, 08 Feb 2021 18:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46376] [PATCH] gnu: tesseract-ocr: update to 4.1.1) Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Feb 2021 23:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46376 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jelle Licht Cc: 46376@debbugs.gnu.org Received: via spool by 46376-submit@debbugs.gnu.org id=B46376.161282610811966 (code B ref 46376); Mon, 08 Feb 2021 23:16:02 +0000 Received: (at 46376) by debbugs.gnu.org; 8 Feb 2021 23:15:08 +0000 Received: from localhost ([127.0.0.1]:52124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l9FkJ-00036u-BB for submit@debbugs.gnu.org; Mon, 08 Feb 2021 18:15:07 -0500 Received: from mail-io1-f42.google.com ([209.85.166.42]:33561) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l9FkG-000368-So for 46376@debbugs.gnu.org; Mon, 08 Feb 2021 18:15:05 -0500 Received: by mail-io1-f42.google.com with SMTP id q7so16905829iob.0 for <46376@debbugs.gnu.org>; Mon, 08 Feb 2021 15:15:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atai-org.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=14lYyYIFk87/sL0Vvd0O8OYbU2taFK8FSs0kF93xiZs=; b=y67q12hHb8qXf6dBf4rcZR2CRgQT/KqqIdZSoi0jr2YQYTTw3QK3afUA+eW80dlyTF hOZjznJ1a5KQkr6PqYsqmak1UdFS/9qM/YxMJRI5TuFN7I/8h0eSqiN+i3YStox3d51f YMdCT9nyVCFMt75XZVJ8c4psWoVP5ywBSHligAc/fOU7o+eYfO/deJNWInyb8iMRe0FY ZjiC8o3ElLnv+El2H2r/f7LpEqCrI6bkt815RcjI5NTUEmVlZhqT0gP9rwyarIPVa6rf bz5GHiqFlV3BUIDFCrcW+5esg3hvn9SFviur6lWztjZXHyrwPx5ROzUvBjHgb1Tcrn6Q kEOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=14lYyYIFk87/sL0Vvd0O8OYbU2taFK8FSs0kF93xiZs=; b=bJyLZ4c9xGBDIABc1uq1CeFmcS378Ecoe1JFJBAGw3WHKR609PEMOQH6xXmhvsvAsI FRl6aYUsNpilzN7OHbkBHwM4QyL1A0Ql/+0XstoH6wN372fsu4vtT1XkCmhd0YJfE78u oNb4PuZP343DrgTHztSocTfuA1TDl0yY5nxwZ9vzrEsWE83eSZbYqX+8/eVkWI2z9/Uf NET17eCU/HOlUQ8bn8ghpxztEWLFY3Il5IhJFyDV31+wzZbpdA4UYmrAxx9qausson0S 4pgjiUJl1uj0Y113F8kkTk4SSd4bV6UmPeKXsSdLB4Jw8HzBT4tOiJpkKNN+osfoC2Ed yDsQ== X-Gm-Message-State: AOAM531V93arIs4j/JOs2NVPfMrqKt1Pr9W/sG/A3JglYZCqI+LbhpWy FEYL8/SohIitBX6p4Gzn9vEw5u6IR5xk4Mt3fdNWDi7DTUk= X-Google-Smtp-Source: ABdhPJzqVyho88WpjlG/m3RdvC7AfYjdvnJATtXO95OzqpB6Aicssc+MEEbobGbp7QIedTZ09WyzdSXqvs+zjOHq+uQ= X-Received: by 2002:a5d:94cb:: with SMTP id y11mr16726917ior.117.1612826099153; Mon, 08 Feb 2021 15:14:59 -0800 (PST) MIME-Version: 1.0 References: <86a6sep7h0.fsf@posteo.net> In-Reply-To: <86a6sep7h0.fsf@posteo.net> From: Andy Tai Date: Mon, 8 Feb 2021 15:14:22 -0800 Message-ID: Content-Type: multipart/mixed; boundary="000000000000b9a92e05badb563b" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.26 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=atai-org.20150623.gappssmtp.com header.s=20150623 header.b=y67q12hH; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 42603940275 X-Spam-Score: -1.26 X-Migadu-Scanner: scn1.migadu.com X-TUID: FikSXhpVwllc --000000000000b9a92e05badb563b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable updated patch attached On Mon, Feb 8, 2021 at 1:36 PM Jelle Licht wrote: > > > > * gnu/packages/ocr.scm (tesseract-ocr): update to 4.1.1 > ^ This is usually capitalised. capitalized > > [snip] > > (define-public tesseract-ocr > > + ;; some useful commits beyond last official stable release in releas= e branch > > + (let ((commit "97079fa353557af6df86fd20b5d2e0dff5d8d5df")) > > (package > > (name "tesseract-ocr") > > - (version "3.04.01") > > + (version "4.1.1") > ^ Since we are not _actually_ using version 4.1.1, but a > later commit, you could use > `(git-version "4.1.1" revision commit)' here instead changed as suggested > > > (source > > (origin > > (method git-fetch) > > (uri (git-reference > > (url "https://github.com/tesseract-ocr/tesseract") > > - (commit version))) > > - (file-name (git-file-name name version)) > > + (commit commit) > > + ;; Fetch git submodules > > + (recursive? #t))) > > Instead of stating what the code does, would you consider adding a > comment why this is needed? > commented as suggested > > + (file-name (string-append name "-" version "-" commit "-checkou= t")) > ^ You can use `(git-file-name name version)' here. > changed as suggested > > (sha256 > > - (base32 "0h1x4z1h86n2gwknd0wck6gykkp99bmm02lg4a47a698g4az6ybv"= )))) > > + (base32 "0axwla82fpzp86lc553wp3hk0fz5dylw4as0jbf4hkqcyajlbzp4"= )))) > > (build-system gnu-build-system) > > (inputs > > - `(("leptonica" ,leptonica))) > > + `( ("cairo" ,cairo) > > + ("icu" ,icu4c) > > + ("leptonica" ,leptonica) > > + ("pango" ,pango))) > > + (native-inputs > > + `(("autoconf" ,autoconf) > > + ("autoconf-archive" ,autoconf-archive) > > + ("automake" ,automake) > > + ("googletest" ,googletest) > > + ("libtool" ,libtool) > > + ("pkg-config" ,pkg-config))) > > (arguments > > '(#:configure-flags > > (let ((leptonica (assoc-ref %build-inputs "leptonica"))) > > - (list (string-append "LIBLEPT_HEADERSDIR=3D" leptonica "/incl= ude"))))) > > + (list (string-append "LIBLEPT_HEADERSDIR=3D" leptonica "/incl= ude"))) > > + ;; some test, applybox_test fails to build > > + #:tests? #f)) > 2 nits: Is it possible to patch or disable only the failing tests? tests failing to build probably due to some issue with parallel builds; did not dig into it as probably will take much time; will be TODO if time allows) > Is there a reason googletest is added if testing is subsequently disable= d? > removed > Thanks, > - Jelle -- Andy Tai, atai@atai.org, Skype: licheng.tai, Line: andy_tai, WeChat: andyta= i1010 Year 2021 =E6=B0=91=E5=9C=8B110=E5=B9=B4 =E8=87=AA=E5=8B=95=E7=9A=84=E7=B2=BE=E7=A5=9E=E5=8A=9B=E6=98=AF=E4=BF=A1=E4= =BB=B0=E8=88=87=E8=A6=BA=E6=82=9F =E8=87=AA=E5=8B=95=E7=9A=84=E8=A1=8C=E7=82=BA=E5=8A=9B=E6=98=AF=E5=8B=9E=E5= =8B=95=E8=88=87=E6=8A=80=E8=83=BD --000000000000b9a92e05badb563b Content-Type: text/x-patch; charset="UTF-8"; name="0001-gnu-tesseract-ocr-Update-to-4.1.1.patch" Content-Disposition: attachment; filename="0001-gnu-tesseract-ocr-Update-to-4.1.1.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kkx6wlar0 RnJvbSA3YWI3ZmNiYjk1ZDkzM2Y2YTdiYTNlNjg4MTMxY2FhMDQzNWJkZmRkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmR5IFRhaSA8YXRhaUBhdGFpLm9yZz4KRGF0ZTogU3VuLCA3 IEZlYiAyMDIxIDIyOjIzOjQ3IC0wODAwClN1YmplY3Q6IFtQQVRDSF0gZ251OiB0ZXNzZXJhY3Qt b2NyOiBVcGRhdGUgdG8gNC4xLjEKCiogZ251L3BhY2thZ2VzL29jci5zY20gKHRlc3NlcmFjdC1v Y3IpOiBVcGRhdGUgdG8gNC4xLjEKLS0tCiBnbnUvcGFja2FnZXMvb2NyLnNjbSB8IDM0ICsrKysr KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyOCBpbnNlcnRp b25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9vY3Iuc2Nt IGIvZ251L3BhY2thZ2VzL29jci5zY20KaW5kZXggZGM0OTMwOTE4YS4uMGQzNTc3MjZiMiAxMDA2 NDQKLS0tIGEvZ251L3BhY2thZ2VzL29jci5zY20KKysrIGIvZ251L3BhY2thZ2VzL29jci5zY20K QEAgLTMsNiArMyw3IEBACiA7OzsgQ29weXJpZ2h0IMKpIDIwMTYsIDIwMjAgRWZyYWltIEZsYXNo bmVyIDxlZnJhaW1AZmxhc2huZXIuY28uaWw+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMTkgVG9iaWFz IEdlZXJpbmNreC1SaWNlIDxtZUB0b2JpYXMuZ3I+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMTkgQWxl eCBWb25nIDxhbGV4dm9uZzE5OTVAZ21haWwuY29tPgorOzs7IENvcHlyaWdodCDCqSAyMDIxIEFu ZHkgVGFpIDxhdGFpQGF0YWkub3JnPgogOzs7CiA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05V IEd1aXguCiA7OzsKQEAgLTI2LDcgKzI3LDEyIEBACiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBnaXQt ZG93bmxvYWQpCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBidWlsZC1zeXN0ZW0gZ251KQogICAjOnVz ZS1tb2R1bGUgKGd1aXggYnVpbGQtc3lzdGVtIHB5dGhvbikKKyAgIzp1c2UtbW9kdWxlIChnbnUg cGFja2FnZXMgYXV0b3Rvb2xzKQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBjaGVjaykK ICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgY29tcHJlc3Npb24pCisgICM6dXNlLW1vZHVs ZSAoZ251IHBhY2thZ2VzIGd0aykKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgaWN1NGMp CisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHBrZy1jb25maWcpCiAgICM6dXNlLW1vZHVs ZSAoZ251IHBhY2thZ2VzIHB5dGhvbikKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgaW1h Z2UpKQogCkBAIC01MiwyNSArNTgsNDEgQEAgaXQgcHJvZHVjZXMgdGV4dCBpbiA4LWJpdCBvciBV VEYtOCBmb3JtYXRzLiIpCiAgICAgKGxpY2Vuc2UgbGljZW5zZTpncGwzKykpKQogCiAoZGVmaW5l LXB1YmxpYyB0ZXNzZXJhY3Qtb2NyCisgIDs7IHNvbWUgdXNlZnVsIGNvbW1pdHMgYmV5b25kIGxh c3Qgb2ZmaWNpYWwgc3RhYmxlIHJlbGVhc2UgaW4gcmVsZWFzZSBicmFuY2gKKyAgKGxldCAoKGNv bW1pdCAiOTcwNzlmYTM1MzU1N2FmNmRmODZmZDIwYjVkMmUwZGZmNWQ4ZDVkZiIpCisgICAgICAg IChyZXZpc2lvbiAiMSIpKQogICAocGFja2FnZQogICAgIChuYW1lICJ0ZXNzZXJhY3Qtb2NyIikK LSAgICAodmVyc2lvbiAiMy4wNC4wMSIpCisgICAgKHZlcnNpb24gKGdpdC12ZXJzaW9uICI0LjEu MSIgcmV2aXNpb24gY29tbWl0KSkKICAgICAoc291cmNlCiAgICAgIChvcmlnaW4KICAgICAgICAo bWV0aG9kIGdpdC1mZXRjaCkKICAgICAgICAodXJpIChnaXQtcmVmZXJlbmNlCiAgICAgICAgICAg ICAgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNvbS90ZXNzZXJhY3Qtb2NyL3Rlc3NlcmFjdCIpCi0g ICAgICAgICAgICAgIChjb21taXQgdmVyc2lvbikpKQorICAgICAgICAgICAgICAoY29tbWl0IGNv bW1pdCkKKyAgICAgICAgICAgICAgOzsgc291cmNlIGdpdCByZXBvIHdpdGggc3VibW9kdWxlczsg ZW5zdXJlIHRoZXkgYXJlIGZldGNoZWQKKyAgICAgICAgICAgICAgKHJlY3Vyc2l2ZT8gI3QpKSkK ICAgICAgICAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCiAgICAgICAg KHNoYTI1NgotICAgICAgICAoYmFzZTMyICIwaDF4NHoxaDg2bjJnd2tuZDB3Y2s2Z3lra3A5OWJt bTAybGc0YTQ3YTY5OGc0YXo2eWJ2IikpKSkKKyAgICAgICAgKGJhc2UzMiAiMGF4d2xhODJmcHpw ODZsYzU1M3dwM2hrMGZ6NWR5bHc0YXMwamJmNGhrcWN5YWpsYnpwNCIpKSkpCiAgICAgKGJ1aWxk LXN5c3RlbSBnbnUtYnVpbGQtc3lzdGVtKQogICAgIChpbnB1dHMKLSAgICAgYCgoImxlcHRvbmlj YSIgLGxlcHRvbmljYSkpKQorICAgICBgKCAgKCJjYWlybyIgLGNhaXJvKQorICAgICAgICAgKCJp Y3UiICxpY3U0YykKKyAgICAgICAgICgibGVwdG9uaWNhIiAsbGVwdG9uaWNhKQorICAgICAgICAg KCJwYW5nbyIgLHBhbmdvKSkpCisgICAgKG5hdGl2ZS1pbnB1dHMKKyAgICAgYCgoImF1dG9jb25m IiAsYXV0b2NvbmYpCisgICAgICAgKCJhdXRvY29uZi1hcmNoaXZlIiAsYXV0b2NvbmYtYXJjaGl2 ZSkKKyAgICAgICAoImF1dG9tYWtlIiAsYXV0b21ha2UpCisgICAgICAgKCJsaWJ0b29sIiAsbGli dG9vbCkKKyAgICAgICAoInBrZy1jb25maWciICxwa2ctY29uZmlnKSkpCiAgICAgKGFyZ3VtZW50 cwogICAgICAnKCM6Y29uZmlndXJlLWZsYWdzCiAgICAgICAgKGxldCAoKGxlcHRvbmljYSAoYXNz b2MtcmVmICVidWlsZC1pbnB1dHMgImxlcHRvbmljYSIpKSkKLSAgICAgICAgIChsaXN0IChzdHJp bmctYXBwZW5kICJMSUJMRVBUX0hFQURFUlNESVI9IiBsZXB0b25pY2EgIi9pbmNsdWRlIikpKSkp CisgICAgICAgICAobGlzdCAoc3RyaW5nLWFwcGVuZCAiTElCTEVQVF9IRUFERVJTRElSPSIgbGVw dG9uaWNhICIvaW5jbHVkZSIpKSkKKyAgICAgICA7OyBzb21lIHRlc3QsIGFwcGx5Ym94X3Rlc3Qg ZmFpbHMgdG8gYnVpbGQKKyAgICAgICAjOnRlc3RzPyAjZikpCiAgICAgKGhvbWUtcGFnZSAiaHR0 cHM6Ly9naXRodWIuY29tL3Rlc3NlcmFjdC1vY3IvdGVzc2VyYWN0IikKICAgICAoc3lub3BzaXMg Ik9wdGljYWwgY2hhcmFjdGVyIHJlY29nbml0aW9uIGVuZ2luZSIpCiAgICAgKGRlc2NyaXB0aW9u CkBAIC03OSw3ICsxMDEsNyBAQCBoaWdoIGFjY3VyYWN5LiAgSXQgc3VwcG9ydHMgbWFueSBsYW5n dWFnZXMsIG91dHB1dCB0ZXh0IGZvcm1hdHRpbmcsIGhPQ1IKIHBvc2l0aW9uYWwgaW5mb3JtYXRp b24gYW5kIHBhZ2UgbGF5b3V0IGFuYWx5c2lzLiAgU2V2ZXJhbCBpbWFnZSBmb3JtYXRzIGFyZQog c3VwcG9ydGVkIHRocm91Z2ggdGhlIExlcHRvbmljYSBsaWJyYXJ5LiAgSXQgY2FuIGFsc28gZGV0 ZWN0IHdoZXRoZXIgdGV4dCBpcwogbW9ub3NwYWNlZCBvciBwcm9wb3J0aW9uYWwuIikKLSAgICAo bGljZW5zZSBsaWNlbnNlOmFzbDIuMCkpKQorICAgIChsaWNlbnNlIGxpY2Vuc2U6YXNsMi4wKSkp KQogCiAoZGVmaW5lLXB1YmxpYyB6aW5uaWEKICAgKGxldCogKChjb21taXQgIjU4MWZhYThmNmYx NWU0YTdiMjE5NjRiZTNhNWVjMzYyNjVjODBlNWIiKQotLSAKMi4zMC4wCgo= --000000000000b9a92e05badb563b--