From patchwork Mon Jan 2 01:08:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parnikkapore X-Patchwork-Id: 45795 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 02BA927BBED; Mon, 2 Jan 2023 01:09:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FORGED_MSGID_YAHOO,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 EEE0B27BBE9 for ; Mon, 2 Jan 2023 01:09:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC9K4-0005EX-F7; Sun, 01 Jan 2023 20:09:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pC9K3-0005E4-1I for guix-patches@gnu.org; Sun, 01 Jan 2023 20:09:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pC9K2-0000YQ-PE for guix-patches@gnu.org; Sun, 01 Jan 2023 20:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC9K2-0007to-F3 for guix-patches@gnu.org; Sun, 01 Jan 2023 20:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60480] [PATCH 1/2] gnu: plover: Wrap so that icons can be found Resent-From: Parnikkapore Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 01:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60480 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60480@debbugs.gnu.org Received: via spool by 60480-submit@debbugs.gnu.org id=B60480.167262170330308 (code B ref 60480); Mon, 02 Jan 2023 01:09:02 +0000 Received: (at 60480) by debbugs.gnu.org; 2 Jan 2023 01:08:23 +0000 Received: from localhost ([127.0.0.1]:42110 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC9JP-0007sm-9g for submit@debbugs.gnu.org; Sun, 01 Jan 2023 20:08:23 -0500 Received: from sonic305-21.consmr.mail.sg3.yahoo.com ([106.10.241.84]:45072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC9JK-0007sK-Vk for 60480@debbugs.gnu.org; Sun, 01 Jan 2023 20:08:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1672621691; bh=9xRFgE3gRrugxnMW7FI0jjAdH2wrule1CjDY5BS82vA=; h=From:To:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=EDgzAp3AQqvX1Bog5FnTzr0pKHDfVAh2RMjByISraULmWbYQ8/RWbdxkVCuGGtYnsnCcKsVh3e7oiAfMEfjUQlwlgrMX8rMVYmVVXqVXegg5E7mLlzybhKPuNzc9gSsjOLSXyPTlQ5Hh1iAuajDPu0FkEVntVCIimDbDNbDNEzec8GrpMAFKt8zV12f/KM9faO/1jY69i20DU/OVV3s8qDHqYXbM9fdSfLoFxTDr871slnfcwrAYT523Sg2qmPoYh966Gk1yvCAfQ1PQyQxcTFVdrb29VeFno/POQkFu7e9hn8/+1aZoyYrCGqSsuZ89Pdhhq0kNaDYimlZupesMgg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1672621691; bh=5xSYM7k+zQ/EvB8l8TyybiK9rOVltNCTdBRYRwn0w5q=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=mDkvhYjLgQ0oXBj74TMbjY+NUJYxIEi9cgM8o2lfVj/+vCK5Zyeq/baqJKM9f8RF3q1FU/AvTYmCZsYidTb+LcoASVbOo8dQ0BVU9+J+OLq9FpNBludGNjXp+s/6yxHzPeRW54g8T+rqcYn87qho2q8qgAvjIq6XHl5XjuhD71hONUog8F9ZJv4uhG19RvCRYWyQvIap/UWhtjFo2qlltLl80GTgzy21Xk7MeMuacOrt3yDso0+xaz2CV1sJO5Wk3i6flOhEfmelfz0ioFB50l5n6ZD6LZwt6bdulSLojHwJopoK/6jWAcjCHsaIYECOmYLVmBdpls51+y+LEHjJkA== X-YMail-OSG: gdT0VggVM1mHCw59Y994QtQVQekPyZMDuhXheepVW3Ed9JDeuCIdoVqEWy6lZ20 .wZMg7gRyee2FTrusn728kW9Ql9wnmToaqkZSrR.WEgqMUSKUiAKzXcGxIso2mYgaewP0w.Sn9Up OiXqWFPNkLuLPLXadQCOFQEzfjIN1SMipbl2LAsGwYF1t3YeadCXuQ1H3E0L.bti8Ls8KAq1oSdB W1G4SbzQYEtCTze66l2NGr10e_kByYz.dbFkDns48xLHW5mFpFSuuv2Zm4A6kF.bpvNt1Bn9L4nj d8FlQdaLGgzcgnI1g8iACbghbXhm8EEydASuA6OmuIYWijHYDeI26B56N6OQQygPlys8oZ0FG8rI PguWurHtZg3X0YybFUPjfgBAAA4SCs..eGySE1T.IZW8G80xGNLe3Ej_ux.cCJgb5N66VMnWQqZg fTyBsi4W6GSZ1wjwftDaci_.GvF9QemGP2Png29T5vtu.6TuZ7R62waplkbDHPMdmMM2EFgxUf5h 2d8jHqh8OYUWapTqRC6hNNmLQSIwBRAkIFA2AZG3HFcZXVKWWaEtFNAulFenPNBUuh6P.XD69v7_ MQz4TTr7N3foa42FnUOCaxeG0hwaavc_MPzk5b4GnRLZEGJwj2qX7dPUSL_QOo3I9fxI4ZvspFaw 6ru2z9HkISBAN3yVlPFoF.MBUptJMFlpFMQ588cPuVWdD0xud4RGghKHRmVmxSnP7Z2_4ewPvYfN 4ZKfiHCiLOTB63mA_uvq.Jfdhjw4yjZW.TkDOntUgWBjQS2dQDCow1cHS3pSFo9AyI2NVO8j7Kyk xjRmmK9G.MlONDl66V1TIYb8Kzpmqa2mo0Sq_nk8qvRqYlr3vnYIjyaz0Mye7giWBZRjLI9KJwan NlDEdnkFfne2JO5NxSIoDA2VzFtr_yV1SOVwkLa_rE5WDSQP_pws0pyL._VxVuwyAEhEP_3qM7KX gtvfu.75q0QE4h5ALBEHILd9iT9p0pMarSUSsx8WWV1J5SresOgVmVDIbFtFLT1zUl.n6cnYRDyQ oV7fehyxgSRt_jKFKw4FxWEkKNazJ15mPThuPl2nBwjqzybA6NibF2JjhsfLPed.KAUECf06F0k2 oXrSIYIY9c33t8QujagPHex2q.GbDpPkYvF06uzKIfD8sAw1rQp4BCAJOVooTzT2dPDVlTY_UINV ukjW1qt.SkkO9bquuqdtn7oEehdXzMvpjPde3DIx0RFYB3nUPjSaBuuno6TC7kxNF4ErwWbbwWb6 _vSvqNKZAi6p64KfAQ2M9o9qvUoHTjJf7vZE372OInuXYpyd_m2hGNiqnT12RRUspq676EeOEf48 IMvvfo2j2V8uiiZB9IHRHvKQFZ8ChfCyH01UmSM.RrNGCrmL4ESngh_RNibEaaapzSBQ5HfMmsy7 OYFvFNfp33eW1qWzFLsE6QBk.OhYKGTfTSklp7wGO.w1GWu._azyGTcNrvIXxdIXpClDdXdEIfb7 M40jGsalTy4tGEH9zs5vzYea2CUIinbbPYKqn.tB8UtfvOyFIfwwEwbSSqK3Vtbd58lHJ2mdq.1k Ptgegy_AcnSbmQT.auO1fA3A1d8yKM3fdtTJGnG4uY0dLYmPUFR2qomYGHjVmCuYSaX4mtB09uOS TrbhVlDuulbtE24JOhnGaNPyz.euzV_2CatWf.x1z8q5kI_uk84kl.57neaFofVG4WbRMxzkkCbt 6Hgwac74AyXGQimoZlmLJleue7r9JPZ8y45F8mkI9bea9Ow.IbTzNYqqFv2eDmsQicfJ6dd0bufj lrrmRhj9eDt1jBidKZi4j2u4_LHGvxZAWFq26RaXT7HJfIp7IxfU9txdYyDJ6W5nnZfYb.OBff0a 6ZTwGQs9odcfaR5Ij8b29d32rpHiQuwhv62xYz3ZmyOrb7YWdRHcyHv.HZSViRZJWFkSm67YohL1 8njPNh6_bj8mXhCAShWD8TY5FyL7unzSv8kTAiJKfSkdhWHckQwOqYVLbm.YwAQJlodBrlXhmyS5 xuhIacPQFYw3fx9OcMT1N5KeT3ZF0OGHj5AyW9ASaou.Xt6r8_uI8j0.XY937pQOPXQaSSXugnUc beqfH0A.0rQGaxhyj1zrqFYWGPNpRxh8rP3gktd9bN_K0C_hu7C_bDJBpcNlNIprN1n5B7GDVnex CRo_GSaVv4ui.PgfOaaOoFFnsFWEus8tcytAZEtdfM2Kowle9437Ec.yNba0Ug_JpgQcdM.nzQ9B Ia84YBuyS5gtDdN26DrZlj26DUy.Ywog4SFfPEO0mEKYNoQ3FeWAB3R_ZT5Ny X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.sg3.yahoo.com with HTTP; Mon, 2 Jan 2023 01:08:11 +0000 Received: by hermes--production-sg3-b666c6484-8hzhs (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID ea88ad194a060a8f0d9de55afc6f64c1; Mon, 02 Jan 2023 01:08:05 +0000 (UTC) Date: Mon, 2 Jan 2023 08:08:03 +0700 Message-Id: <02f456e3dd1951b64ee6216bef6d424ff139667f.1672504941.git.poomklao@yahoo.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: 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: , Reply-to: Parnikkapore X-ACL-Warn: , Parnikkapore via Guix-patches X-Patchwork-Original-From: Parnikkapore via Guix-patches via From: Parnikkapore Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/stenography.scm (plover): Wrap and add qtsvg to QT_PLUGIN_PATH This is needed for the icons in Plover's UI to appear. --- gnu/packages/stenography.scm | 81 +++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/gnu/packages/stenography.scm b/gnu/packages/stenography.scm index 504dfc990f..3249ee4c4f 100644 --- a/gnu/packages/stenography.scm +++ b/gnu/packages/stenography.scm @@ -26,6 +26,7 @@ (define-module (gnu packages stenography) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (gnu packages bash) #:use-module (gnu packages qt) #:use-module (gnu packages check) #:use-module (gnu packages libusb) @@ -55,46 +56,50 @@ (define-public plover (package (name "plover") (version "4.0.0.dev12") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/openstenoproject/plover") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0vk6nh2gpn7f7rv2spi2a7n3m0d9kaan6r22mx3vwxprpbvrkbm8")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openstenoproject/plover") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vk6nh2gpn7f7rv2spi2a7n3m0d9kaan6r22mx3vwxprpbvrkbm8")))) (build-system python-build-system) (arguments - (list - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "python" "-m" "pytest" - "-p" "pytest-qt" - "-p" "xvfb" - "test" - ;; FIXME: Ignore failing test. - "--ignore" - "test/gui_qt/test_dictionaries_widget.py"))))))) - (native-inputs - (list python-babel - python-mock - python-pytest - python-pytest-qt - python-pytest-xvfb)) - (inputs - (list python-appdirs - python-dbus - python-hidapi - python-plover-stroke - python-pyqt - python-pyserial - python-rtf-tokenize - python-xlib - qtsvg-5)) + (list #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "pytest" + "-p" "pytest-qt" + "-p" "xvfb" + "test" + ;; FIXME: Ignore failing test. + "--ignore" + "test/gui_qt/test_dictionaries_widget.py")))) + ;; Ensure that icons are found at runtime. + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/plover") + `("QT_PLUGIN_PATH" prefix + ,(list (string-append (assoc-ref + inputs + "qtsvg") + "/lib/qt5/plugins/")))))))))) + (native-inputs (list python-babel python-mock python-pytest + python-pytest-qt python-pytest-xvfb)) + (inputs (list bash-minimal + python-appdirs + python-dbus + python-hidapi + python-plover-stroke + python-pyqt + python-pyserial + python-rtf-tokenize + python-xlib + qtsvg-5)) (home-page "https://www.openstenoproject.org/plover/") (synopsis "Stenography engine") (description