From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 nyMtBOlGPmLhGwEAgWs5BA (envelope-from ) for ; Fri, 25 Mar 2022 23:49:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id APQBAOlGPmKTJQEAauVa8A (envelope-from ) for ; Fri, 25 Mar 2022 23:49:13 +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 BBE977A3A for ; Fri, 25 Mar 2022 23:49:12 +0100 (CET) Received: from localhost ([::1]:60058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXsk4-0006r7-05 for larch@yhetil.org; Fri, 25 Mar 2022 18:49:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXsju-0006pv-Sl for bug-guix@gnu.org; Fri, 25 Mar 2022 18:49:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58802) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXsju-0008T8-KV 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-0005ud-F3 for bug-guix@gnu.org; Fri, 25 Mar 2022 18:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#54558: [PATCH 2/2] gnu: mcomix: Wrap missing paths. 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.164824852222694 (code B ref 54558); Fri, 25 Mar 2022 22:49:02 +0000 Received: (at 54558) by debbugs.gnu.org; 25 Mar 2022 22:48:42 +0000 Received: from localhost ([127.0.0.1]:52697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXsja-0005tw-Ev for submit@debbugs.gnu.org; Fri, 25 Mar 2022 18:48:42 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:35829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXsjZ-0005tZ-IH for 54558@debbugs.gnu.org; Fri, 25 Mar 2022 18:48:41 -0400 Received: by mail-ej1-f68.google.com with SMTP id yy13so18048060ejb.2 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=BVLtp8BaUPuVH89iQUXyKaHZM5ZgEc7bo7R9vQUnKiA=; b=KqNoRlBXwLl8EykugjWa10zwSU5EfjOsrKgWm0Ma2gW6MCMRTH/TIOLP9UZBLP6sRc XbCC7BTte6RT2MsfZQsJpwnkj7enx8KOCas9mEQaRqUaqvruhMPNHP2AojfCQn72KpJP anuh1GhNoTp6afm1NLYMbskcAOkJKk1UObFzrzuhNRmLuXOh3KbBO9+RNbm3JFigoH8O XXsov0tEpq1wrwuA39kBPo+YI68O/kBzaEEzHJyhTIvYRvGEvaWECKKfiRBvyNTcAfmQ pbYPyz4Y6+NbkErUPFo3XxFJwckLY+33MnDJxHJJ1Qc/3ArBgN2ozQf0WlePya3aueiF GscA== 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=BVLtp8BaUPuVH89iQUXyKaHZM5ZgEc7bo7R9vQUnKiA=; b=FSgHJbgEIz6MMXI2XFVW/zXEYvS3nTY8ZfNgVOks+0VJQzCTL1/9VxtVN4OlETPICw 13VDSp4O2o7cwmW7610arEwYrnj2lhSdz+WYxJphc096jmfpqwV2SRQ/qE626rqZatKQ bqpInPOaDPoFlrpXoBzPSP4aver3U+8g1AGRjCRQL/SoO8H0ukRkAo9jFkoR8Kna9uGi /8rfIP0uNg0PjOhCmnbvrC0KrdoxNUBU5Rjq81QIjGyJywtx7/1NSbEa7ctSl9CLbmCA iHhc5Eif+z8Bgss7UpBI5KaMzHR9Uil+8qiGTRQPQpf/eFcbMq16L+pRj6gd6vg1Opeh sBLw== X-Gm-Message-State: AOAM532rAW7aOQt88p1tY/CowTlY978YyWKoJSx/+deXUKEsVtNWsiB/ Tc6xbpYENJVvzExb+uc622wjF2r/CLE= X-Google-Smtp-Source: ABdhPJz9a0tRwfuLv+hDo5PuyMF+NhgofJyYyaiONNqq2638VjNajP1WlAvaSczeGcjJsh62sKdxQw== X-Received: by 2002:a17:907:da6:b0:6e0:c59:f3ad with SMTP id go38-20020a1709070da600b006e00c59f3admr14374387ejc.85.1648248515903; 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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 15:48:35 -0700 (PDT) From: Liliana Marie Prikler Date: Fri, 25 Mar 2022 23:45:51 +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=BVLtp8BaUPuVH89iQUXyKaHZM5ZgEc7bo7R9vQUnKiA=; b=NM4GHwRhP13n28KqzVufo5RPQpnzF1NhUGbRlbzPgwmsZDTKi4GYAntuOOmj7rs+nV+Qcn yekbKuhafiPTYlbf5dWr6BqTDiSWcYit7+qlzuddX3EP0Ou4WaQTz/oV0eQDiVo7wPjDQB zcqFAPiQsa9tfXXP2XIjW0jWAnvn3yJ22YjfSR+2u1PyQYMqDLaz0xH+Sm8LWZ9a/VbL4r RgWmMMoIuw609U/U2GdKY8XFHTXpdRO7X6Qol3CfNxg9YRsoEpBX3IExV3z7A6fmWirNSy b0K8Rqaxst9dbjxhW++QK2QXf5ThAS5WLUOvG1FbISmw7oXQ78574QkYtkrKqg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648248552; a=rsa-sha256; cv=none; b=gQLXg+zjQuq/ceETdxnkpfHjxI0PSMgHRhyKQGeGypbcxPqeeP2sDKpVfn+s8rYD5NtFuI UdBm0biuWbrn6iJlY2EmOMFfft/V3TCE3qEoRB9yTT9HscJRQOfYzQ7G95gxmu/ikbKUG1 xOnr/gN5s1lMaZb6uZSCeQvAMga/GZVZx8vJd/Lsb7aIuhQbhBSuLnZyOAOBkvN4SdawlP UtVntdtBtCCXomtZqTZl5YeBDZ0z66ZscGv0Po0kygRbxfCIclpfOW3GBlmziuPC7HP41b dhHLy7nnklKK1/uOiA5pNSl1GG4T2W0EuraI10xhG6G3T5UQo4QnjrjpVR1Pqw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=KqNoRlBX; 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.92 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=KqNoRlBX; 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: BBE977A3A X-Spam-Score: 5.92 X-Migadu-Scanner: scn1.migadu.com X-TUID: e0WOrKIjf39d * gnu/packages/image-viewers.scm (mcomix)[inputs]: Add gtk+. [arguments]<#:imported-modules,#:modules>: New arguments. <#:phases>: Add ‘glib-or-gtk-wrap’ and ‘gi-wrap’. --- gnu/packages/image-viewers.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 1c325cd8a7..134ffc563a 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -675,9 +675,14 @@ (define-public mcomix "187ca815vxb2in1ryvfiaf1zapi0bc9jxdac3c1bky0kr6x7xyap")))) (build-system python-build-system) (inputs - (list p7zip python python-pillow python-pygobject python-pycairo)) + (list p7zip python python-pillow python-pygobject python-pycairo gtk+)) (arguments (list + #:imported-modules `(,@%python-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules '((guix build python-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -699,7 +704,17 @@ (define-public mcomix "/lib/python" #$(version-major+minor (package-version (this-package-input "python"))) - "/site-packages/mcomix/images"))))))) + "/site-packages/mcomix/images")))) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) + (add-after 'wrap 'gi-wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (for-each + (lambda (prog) + (wrap-program prog + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))) + (list (string-append bin "/mcomix"))))))))) (home-page "https://sourceforge.net/p/mcomix/wiki/Home/") (synopsis "Image viewer for comics") (description "MComix is a customizable image viewer that specializes as -- 2.34.0