From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id eJPNMOhGPmJbGgEAgWs5BA (envelope-from ) for ; Fri, 25 Mar 2022 23:49:12 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id sG7LKehGPmL6YwEAG6o9tA (envelope-from ) for ; Fri, 25 Mar 2022 23:49:12 +0100 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 486ED79C6 for ; Fri, 25 Mar 2022 23:49:12 +0100 (CET) Received: from localhost ([::1]:60048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXsk3-0006qV-EK for larch@yhetil.org; Fri, 25 Mar 2022 18:49:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXsjv-0006q2-5c for bug-guix@gnu.org; Fri, 25 Mar 2022 18:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58803) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXsju-0008TF-TI for bug-guix@gnu.org; Fri, 25 Mar 2022 18:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nXsju-0005ul-Rq for bug-guix@gnu.org; Fri, 25 Mar 2022 18:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#54558: [PATCH 1/2] gnu: mcomix: Update to 2.0.1. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 25 Mar 2022 22:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54558 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 54558@debbugs.gnu.org Received: via spool by 54558-submit@debbugs.gnu.org id=B54558.164824852622705 (code B ref 54558); Fri, 25 Mar 2022 22:49:02 +0000 Received: (at 54558) by debbugs.gnu.org; 25 Mar 2022 22:48:46 +0000 Received: from localhost ([127.0.0.1]:52699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXsja-0005tz-NQ for submit@debbugs.gnu.org; Fri, 25 Mar 2022 18:48:46 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:42664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXsjZ-0005tY-9f for 54558@debbugs.gnu.org; Fri, 25 Mar 2022 18:48:41 -0400 Received: by mail-ej1-f66.google.com with SMTP id j15so17991932eje.9 for <54558@debbugs.gnu.org>; Fri, 25 Mar 2022 15:48:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:cc:content-transfer-encoding :message-id; bh=SFPJH8FQ6Hlr0LkeuoMSbPcLoVIMalryrrmsgbItjcM=; b=fHcYql9uH+rFaP8CBTTFUT2nvG5t1nllo3LU/Awjk3p68NZ5oYrprT7LKkIsdX3WkF ckrs0cefYTfa97uZhmb1+RtxZcI1U99w0mvpP+XGrfBYHlhPyshBh8gFGCoaH4MdX6IA iWo5tV+g6yGLAGv1lOuuSqiITnI9cRLNXyx2Ak1CqYEQ3lNGOSexWt9YcjJvr7JB+f6s N1f36yBv/stwFHytgwmBPVeQO9R6AlvFlL9ptGUEieXYKmSou0uzGpOYN17aqOBz8zNp fxHQy/rmrZTGnzuQnO5Ie2quvwR/iUihtrfUVetUQVOQ35n9kvkjl0xs4iH8Arq0BNKq 7V3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to:cc :content-transfer-encoding:message-id; bh=SFPJH8FQ6Hlr0LkeuoMSbPcLoVIMalryrrmsgbItjcM=; b=mkcAccdVUqr6yrLVMPty1UVJjKDI1tYDKa+OIo1hZtSMkBUwP3Y0/3V9/jC5Bhfm3m xHVVH6jhM9jqZq6rxM5wnnwRsDCeShYtFGHQhc+u8PzjCTcqjXiHufKEk4JEyCWBPUEk dzmQ50eXgh2HdfuF4LnM5BwKDsLBbf23hfAPt2emH03GsJrq6XC2xtpCG9AZRgjZQWOj 7Y25bxAXu2w8OTppe4SIFj96yEYITGHuQaHtsnv5RKXIgz5NDgK8f9ozW09UmdsxCtSf wbkrnT2bv1dIWFVRLmPFqOvYNtaUD8Jkul215L9XToemZxIDKoDOaHuAZp169kI76QWX 5yBw== X-Gm-Message-State: AOAM532b8X73P8kAVE0YtMm1TMV8SUq26+oLK1YY3sguvz5C9Frqtvq6 iSyVYeYELyh/ED0BAwGmseMrGD9haOY= X-Google-Smtp-Source: ABdhPJziOSOdwVsjJ/DDLYCe8nwzsSByw07uUhu9egaUNIZl425/NmO1sxOrEk741Lw65fewrUfAhw== X-Received: by 2002:a17:907:7284:b0:6df:9120:d935 with SMTP id dt4-20020a170907728400b006df9120d935mr14387475ejc.276.1648248515152; Fri, 25 Mar 2022 15:48:35 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id bm5-20020a170906c04500b006ce6f8892a5sm2822429ejb.7.2022.03.25.15.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 15:48:34 -0700 (PDT) From: Liliana Marie Prikler Date: Fri, 25 Mar 2022 21:37:01 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: batalie@riseup.net Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648248552; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=SFPJH8FQ6Hlr0LkeuoMSbPcLoVIMalryrrmsgbItjcM=; b=NjI0HVyW0tAGvcftFZvoJZlx3onJqtKO2NnQTbifEJahenKqrltJ3c0rYEuypaRepn7Kt4 nVCdewe5puAxD0Jykav2VOMJwBZTnPcHyqt7IVpIz7nkI4M9dUMBYMSHEddhB0VyVVCnFe 41xoLzBdcx/Lj/H5byadqf4wMZxHOEkxnU//ySszBl9O5gguJ/tpXhIsQkLAQ2lVSQcGsd RpUZl04MbtiBoaD3njTRPPYk2FKyvBpHayy8xNHjep5t2CwH2919FUK0hO6s8GJ7ZU+wDq q8+e9Dr5AvPERRePagXIvrNeVc2xRfCz2wbN+09pb7mCHpe2y4G51MqR81Zhtg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648248552; a=rsa-sha256; cv=none; b=V/5UKSeHfJiv2pe/GdnA+LAqFvQCvJyaahx5BJqulFJDXubYkkWxyFSrMJAr6ZCgr9JLte 1gx96K/HSjdULBbCljcVYAFHW8pSA9NGIReHPgpiIyZPiSNF81d6eJKkPAoZr7iw6X2AIH NuGI5GewZeWCBFUCf0mP9q2HIFvm/YFU3AsRG0X73G99i1weiiFSh8yBaiFp7mN+z6acYt +gih09VNtiudv/+a0EFr+7aG+Ietl3Z3tL+imG8YtO0U3uirQBheJwDjKRbhERjh22STqE i35PVhDDmvp1bW/MkD+vsZ0R2g17cXOa+wX7i4s7NPEX68hOs2COEEqj3FTt4w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=fHcYql9u; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=fHcYql9u; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 486ED79C6 X-Spam-Score: 5.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: tW5M/S6E2vKM * gnu/packages/image-viewers.scm (mcomix): Update to 2.0.1. [source]: Use sourceforge once again. [inputs]: Add ‘python’. [arguments]: Convert to a list of G-Expressions. <#:tests?>: Drop. <#:phases>: Rename ‘configure’ to ‘patch-sources’. Also fix an assertion error in "mcomix/image_tools.py". No longer replace ‘build’ or ‘install’. Add ‘install-data’ phase after ‘install’. Use (this-package-input) to refer to the python input. --- gnu/packages/image-viewers.scm | 123 +++++++++++---------------------- 1 file changed, 42 insertions(+), 81 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 6ab6cf3307..1c325cd8a7 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -662,91 +662,52 @@ (define-public luminance-hdr ;; CBR and RAR are currently unsupported, due to non-free dependencies. (define-public mcomix - ;; Official mcomix hasn't been updated since 2016, it's broken with - ;; python-pillow 6+ and only supports Python 2. We use fork instead. - (let ((commit "fea55a7a9369569eefed72209eed830409c4af98")) - (package - (name "mcomix") - (version (git-version "1.2.1" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/multiSnow/mcomix3") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "05zl0dkjwbdcm2zlk4nz9w33amlqj8pbf32a8ymshc2356fqhhi5")))) - (build-system python-build-system) - (inputs - (list p7zip python-pillow python-pygobject python-pycairo)) - (arguments - `(#:tests? #f ; FIXME: How do we run tests? - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'configure - (lambda* (#:key inputs #:allow-other-keys) - (let ((p7zip (assoc-ref inputs "p7zip"))) - ;; insert absolute path to 7z executable - (substitute* "mcomix/mcomix/archive/sevenzip_external.py" - (("_7z_executable = -1") - (string-append "_7z_executable = u'" p7zip "/bin/7z'")))) - #t)) - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (pyver ,(version-major+minor (package-version python))) - (lib (string-append out "/lib/python" pyver))) - (invoke (which "python") "installer.py" "--srcdir=mcomix" - (string-append "--target=" lib)) - (rename-file (string-append lib "/mcomix") - (string-append lib "/site-packages")) - #t))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share")) - (bin (string-append out "/bin")) - (pyver ,(version-major+minor (package-version python))) - (lib (string-append out "/lib/python" pyver "/site-packages"))) - (mkdir-p bin) - (rename-file (string-append lib "/mcomixstarter.py") - (string-append bin "/mcomix")) - (rename-file (string-append lib "/comicthumb.py") - (string-append bin "/comicthumb")) - (install-file "mime/mcomix.desktop" - (string-append share "/applications")) - (install-file "mime/mcomix.appdata.xml" - (string-append share "/metainfo")) - (install-file "mime/mcomix.xml" - (string-append share "/mime/packages")) - (install-file "mime/comicthumb.thumbnailer" - (string-append share "/thumbnailers")) - (install-file "man/mcomix.1" (string-append share "/man/man1")) - (install-file "man/comicthumb.1" (string-append share "/man/man1")) - (for-each - (lambda (size) - (install-file - (format #f "mcomix/mcomix/images/~sx~s/mcomix.png" size size) - (format #f "~a/icons/hicolor/~sx~s/apps/" share size size)) - (for-each - (lambda (ext) - (install-file - (format #f "mime/icons/~sx~s/application-x-~a.png" size size ext) - (format #f "~a/icons/hicolor/~sx~s/mimetypes/" - share size size))) - '("cb7" "cbr" "cbt" "cbz"))) - '(16 22 24 32 48)) - #t)))))) - (home-page "https://sourceforge.net/p/mcomix/wiki/Home/") - (synopsis "Image viewer for comics") - (description "MComix is a customizable image viewer that specializes as + (package + (name "mcomix") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/mcomix/MComix-" version "/" + "mcomix-" version ".tar.gz")) + (sha256 + (base32 + "187ca815vxb2in1ryvfiaf1zapi0bc9jxdac3c1bky0kr6x7xyap")))) + (build-system python-build-system) + (inputs + (list p7zip python python-pillow python-pygobject python-pycairo)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (let ((p7zip (assoc-ref inputs "p7zip"))) + ;; insert absolute path to 7z executable + (substitute* "mcomix/archive/sevenzip_external.py" + (("_7z_executable = -1") + (string-append "_7z_executable = u'" p7zip "/bin/7z'"))) + + (substitute* "mcomix/image_tools.py" + (("assert name not in supported_formats_gdk") + "if name in supported_formats_gdk: continue"))))) + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively + "mcomix/images" + (string-append (assoc-ref outputs "out") + "/lib/python" + #$(version-major+minor + (package-version (this-package-input "python"))) + "/site-packages/mcomix/images"))))))) + (home-page "https://sourceforge.net/p/mcomix/wiki/Home/") + (synopsis "Image viewer for comics") + (description "MComix is a customizable image viewer that specializes as a comic and manga reader. It supports a variety of container formats including CBZ, CB7, CBT, LHA. For PDF support, install the @emph{mupdf} package.") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public qview (package -- 2.34.0