From patchwork Sun May 15 04:37:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 39331 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 28CFE27BBEA; Sun, 15 May 2022 06:01:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A62CE27BBE9 for ; Sun, 15 May 2022 06:01:37 +0100 (BST) Received: from localhost ([::1]:32786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq6Ns-0004Nn-Do for patchwork@mira.cbaines.net; Sun, 15 May 2022 01:01:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq6If-0000YY-Nv for guix-patches@gnu.org; Sun, 15 May 2022 00:56:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq6If-0006cL-7c for guix-patches@gnu.org; Sun, 15 May 2022 00:56:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq6If-0003cC-6s for guix-patches@gnu.org; Sun, 15 May 2022 00:56:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55424] [PATCH 061/602] gnu: Remove ocrodjvu. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 04:56:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55424 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55424@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 55424-submit@debbugs.gnu.org id=B55424.165259053213472 (code B ref 55424); Sun, 15 May 2022 04:56:13 +0000 Received: (at 55424) by debbugs.gnu.org; 15 May 2022 04:55:32 +0000 Received: from localhost ([127.0.0.1]:48210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq6I0-0003V8-Fw for submit@debbugs.gnu.org; Sun, 15 May 2022 00:55:32 -0400 Received: from mail-qk1-f170.google.com ([209.85.222.170]:47091) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq6AL-0002uE-8t for 55424@debbugs.gnu.org; Sun, 15 May 2022 00:47:37 -0400 Received: by mail-qk1-f170.google.com with SMTP id c1so10164077qkf.13 for <55424@debbugs.gnu.org>; Sat, 14 May 2022 21:47:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KWnnQ5l8pJspaetAzOlOPQ/BRsb/1pkXZMc9idL5cKY=; b=X4jaTEC0dCnYjFnPFRnWzjyMX1J3Wr3gIdmeEmKhpek4tLaD+tbsxS6rsE+YvyMNP+ PsFfMs0OlRmNHjnhY589SLalEE5dU+phmlFk1RoN5ceyAZd4dlGol1ZdsNa8amRjuFLN MVG36isXAw7dwHTEGyCZZvtraCauY7imgtqrhOeV2xk01NTtdFVkxiWFGCj2W3uJRqd9 aD0oP6+hEiBsCVlYf1zrsczRkIfxaa8Mbx/ydsDcAgBV4srIt5wm0YP17UNFhPYI5Svp tQAIlrWqsJUGGtyzPPx1Y894Ldx8J89ePRG4R5V2Jq2TM4+3pOjqGdOf7QaKoTE6sW43 gN+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KWnnQ5l8pJspaetAzOlOPQ/BRsb/1pkXZMc9idL5cKY=; b=HINwWuHm6/V1pb4yHKHr/RwqgmF+oEGR0T2FGq0Dg4SlN2upk9QBZHteiUlO98xwE9 ZK82AQ7J1Iou/E4rGRfgS/orEZr66xTbQzLljOFuYdmgAKipGhfxok0F8p4dfFFfOYkM UFcL03mdCGEa4ikIVbKWpBcvFjLwVA4GX5SjZ42/x2scarQHOUsVi1pMEZrK9F24cUJk rXZK39MUCUd+TZmNF2cljvpPUtHcsVXTRhZNFW2vFJEV4GegmDBsqzWOJUI1jferMCSE fA86SfOYCGkwWchIawdcb+hhqSYQzXaw/TIaNuGY5Nam9Ts5HB2BKOWVYxJYSRILR525 7cWw== X-Gm-Message-State: AOAM5334dwoW99Nud3SjcoV2pkhN4Mk4xd0u1ypLyVCo4DZidPqfypvx suEStV0H1ASYWBIjVfL7OQwAodyXMDepEw== X-Google-Smtp-Source: ABdhPJxwoWG2FTd5/+iAERFqrhGzG8hmyoD3Ayw8rQ/7mn+PFiyWEdLPdM03Ho47n7imsbgkgqLnmw== X-Received: by 2002:a05:620a:440c:b0:6a0:4cd7:3834 with SMTP id v12-20020a05620a440c00b006a04cd73834mr8375971qkp.264.1652590056760; Sat, 14 May 2022 21:47:36 -0700 (PDT) Received: from localhost.localdomain (dsl-149-239.b2b2c.ca. [66.158.149.239]) by smtp.gmail.com with ESMTPSA id 2-20020ac82082000000b002f39b99f672sm4287690qtd.12.2022.05.14.21.47.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 21:47:36 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 15 May 2022 00:37:28 -0400 Message-Id: <20220515044629.6843-61-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515044629.6843-1-maxim.cournoyer@gmail.com> References: <20220515044629.6843-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This package still depends on Python 2, and upstream considers this issue as "wontfix". * gnu/packages/djvu.scm (ocrodjvu): Delete variable. --- gnu/packages/djvu.scm | 84 ------------------------------------------- 1 file changed, 84 deletions(-) diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index 07c77f318e..38e6278ce5 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -396,87 +396,3 @@ (define-public didjvu and background layers of images, which can then be encoded into a DjVu file.") (home-page "https://jwilk.net/software/didjvu") (license license:gpl2))) - -(define-public ocrodjvu - (package - (name "ocrodjvu") - (version "0.12") - (source - (origin - (method url-fetch) - (uri (string-append - "https://github.com/jwilk/ocrodjvu/releases/download/" version - "/ocrodjvu-" version ".tar.xz")) - (sha256 - (base32 "09w9rqr7z2jd5kwp178zz2yrsc82mxs7gksipg92znxzgzhmw2ng")))) - (build-system gnu-build-system) - (native-inputs - (list libxml2 python2-nose python2-pillow)) - (inputs - `(("djvulibre" ,djvulibre) - ("ocrad" ,ocrad) - ("python" ,python-2) - ("python2-djvulibre" ,python2-djvulibre) - ("python2-html5lib" ,python2-html5lib) - ("python2-lxml" ,python2-lxml) - ("python2-pyicu" ,python2-pyicu) - ("python2-subprocess32" ,python2-subprocess32) - ("tesseract-ocr" ,tesseract-ocr))) - (arguments - `(#:modules ((guix build gnu-build-system) - ((guix build python-build-system) #:prefix python:) - (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build python-build-system)) - #:test-target "test" - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'check 'disable-failing-test - (lambda _ - (substitute* "tests/test_ipc.py" - ;; test_wait_signal gets stuck forever - (("yield self\\._test_signal, name") - "return True") - ;; test_path fails to find a file it should have created - (("path = os\\.getenv\\('PATH'\\)\\.split\\(':'\\)") - "return True")) - ;; Disable tests with tesseract. They can't work without - ;; the language files that must downloaded by the final user - ;; as they are not packaged in Guix. - (substitute* "tests/ocrodjvu/test.py" - (("engines = stdout\\.getvalue\\(\\)\\.splitlines\\(\\)") - "engines = ['ocrad']")) - (substitute* "tests/ocrodjvu/test_integration.py" - (("engines = 'tesseract', 'cuneiform', 'gocr', 'ocrad'") - "engines = 'ocrad'")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "make" - "DESTDIR=" - (string-append "PREFIX=" out) - "install")))) - (add-after 'install 'wrap-python - (assoc-ref python:%standard-phases 'wrap)) - (add-after 'wrap-python 'wrap-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (djvulibre (assoc-ref inputs "djvulibre")) - (ocrad (assoc-ref inputs "ocrad")) - (tesseract (assoc-ref inputs "tesseract-ocr"))) - (for-each (lambda (file) - (wrap-program (string-append out "/bin/" file) - `("PATH" ":" prefix - (,(string-append djvulibre "/bin:" - ocrad "/bin:" - tesseract "/bin"))))) - '("djvu2hocr" - "hocr2djvused" - "ocrodjvu")))))))) - (synopsis "Program to perform OCR on DjVu files") - (description - "@code{ocrodjvu} is a wrapper for OCR systems, that allows you to perform -OCR on DjVu files.") - (home-page "https://jwilk.net/software/ocrodjvu") - (license license:gpl2)))