From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id oAZQJ6rQ3GXYKQAAqHPOHw:P1 (envelope-from ) for ; Mon, 26 Feb 2024 18:55:54 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id oAZQJ6rQ3GXYKQAAqHPOHw (envelope-from ) for ; Mon, 26 Feb 2024 18:55:54 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=libero.it header.s=s2021 header.b=Iap50abC; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708970154; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=If/k/iBnA+6gQUZJnbB5ELYv8swP2us4VJJ2Qqw+9g8=; b=CG34G6I0R2hon43LRjVPSikIaIbcpdRvcDvTl/n3iG/9bVxoEKDB76CfwBuK4N4yBx5R7o h+vl2fEU8JzSPEX+kOqzsPEbLN9hDjWq2yUxCitofz7YCSha13qPjwbFjMhqkI0q29XNJY ya9fyq0E8pV6asXwT3rfF2D2bCwSjKo3w4Pr/5GccE6tFOkt44+iA4yZ5wzlhJwQP7SMVc 4J+lhoq3hYy1MdwdPknBdWTX/hbYCJMygHgUY7IcDDZl/9kznCBWzENCfkU+qwZF2cgyHt twl1g66xqEj22kCdlqc1Q5ti8xHQ+MJ1lTwCuG3pYAv9/8Q9502eoeSBk9EDPw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=libero.it header.s=s2021 header.b=Iap50abC; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708970154; a=rsa-sha256; cv=none; b=H16o5WbqmHMgGoK/TtHkJwo7G0IyinSw+Thm18qVi+SOyJgftS9uNSrMDIiC0ZC4olvOxB xCxViwfa66OwWqyk9a3Xnpyaghqt5qaxPPpowfp9WJeLr1Oo/YDMBfLfO69E+CuT2VHQ1b KdpeJnmmCpCd96tGdOOf/nILjZcAb2XZjB+ZHNwvlmJ7bu/AQE82VHfWeFMqBZPy9wEw8B 4eUfZn+38UmmnTPX3g0QS5FRr3fg/OZM3QO0ovPc8X85Z0xOFEqs7Eo/y1uNPYOha1P4ni BXHWNzseYJnsy3RDQJVaSmQCb9DlgJAf4g+lcwyaKDALd/P/rXxHwu1mOQQBNw== 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 2D93D159E7 for ; Mon, 26 Feb 2024 18:55:54 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1refCW-0000gH-W8; Mon, 26 Feb 2024 12:55:41 -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 1refCT-0000f8-I4 for guix-patches@gnu.org; Mon, 26 Feb 2024 12:55:38 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1refCT-0001bl-9l for guix-patches@gnu.org; Mon, 26 Feb 2024 12:55:37 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1refCs-0003nZ-La for guix-patches@gnu.org; Mon, 26 Feb 2024 12:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69412] [PATCH] gnu: poedit: Update to 3.4.2 and wrap executable. Resent-From: rimarko@libero.it Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Feb 2024 17:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69412 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69412@debbugs.gnu.org Cc: Marco Rimoldi X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170897011914499 (code B ref -1); Mon, 26 Feb 2024 17:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Feb 2024 17:55:19 +0000 Received: from localhost ([127.0.0.1]:52897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1refCA-0003ll-Cg for submit@debbugs.gnu.org; Mon, 26 Feb 2024 12:55:19 -0500 Received: from lists.gnu.org ([209.51.188.17]:37828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ref2S-0003Gx-Dk for submit@debbugs.gnu.org; Mon, 26 Feb 2024 12:45:17 -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 1reeM0-0006EY-Jz for guix-patches@gnu.org; Mon, 26 Feb 2024 12:01:25 -0500 Received: from smtp-32.italiaonline.it ([213.209.10.32] helo=libero.it) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1reeLv-0000Yz-T2 for guix-patches@gnu.org; Mon, 26 Feb 2024 12:01:24 -0500 Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA id eeLlrt4t5XR0qeeLrrSuwF; Mon, 26 Feb 2024 18:01:15 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1708966875; bh=If/k/iBnA+6gQUZJnbB5ELYv8swP2us4VJJ2Qqw+9g8=; h=From; b=Iap50abC+SW09SiMwb3RdWgUNnWz7Mk1nPHXH3hlnFFM4KSXdhLaBVxo4QbQ4eIyg Vhl5P31p62iDTbn3Dy71B4EzdZMM+0NBsnNS6vGEcRCLPERonbxig6uBlBOSxNrsct odVhKpEdbF1tWeZZFH+e4mBTZkviaKnrDVZD14cAZeuNm0tWVCkOXPl08WAhun+qFp wYeJWAqjByoNO9ivkiVsFuN+GhaQ4C4HCrLZAjmoRwnBYbcgDTP/I8Z5mHtl27kSpb 4UM0eAMSL1g2Jt5krJ9EzE3N46gTLlZgVX2UK5KqOzju20rC+uP6l2TiR25zDMonsH 180At4ckucLCw== X-CNFS-Analysis: v=2.4 cv=Rc4zCEtv c=1 sm=1 tr=0 ts=65dcc3db cx=a_exe a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=mDV3o1hIAAAA:8 a=NEAV23lmAAAA:8 a=6tf4vIPNAAAA:8 a=qZ0tGSetVW3pAIOLHPUA:9 a=_FVE-zBwftR9WsbkzFJk:22 a=i6MpR9aiCqehW5VvG_u_:22 Date: Mon, 26 Feb 2024 17:51:10 +0100 Message-ID: <5004bb571222ad1573fb31fdf7936dee82801f56.1708966270.git.rimarko@libero.it> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4xfIa3410OTo2FwENc1hMpNYrXLY/lnzMzCZWTfFfO3pkYStQ3bcO3S7r1QgmMqrSGVIpvokKURpxbe/kqzTxNNEZaZXEi1ds9l+D3Xkb1DBGjH0F8/4Iz XRvPirG0Ip0m5J/8BQA180Wv+P5R5eULtT8dHCmhktYsdH9A7kZwkPBQCY9o8XYQ6IY7ERX18r0U4WdlBnB5DyiyM1j8Huosjmo= Received-SPF: pass client-ip=213.209.10.32; envelope-from=rimarko@libero.it; helo=libero.it X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: rimarko@libero.it X-ACL-Warn: , Marco Rimoldi via Guix-patches From: Marco Rimoldi via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.47 X-Spam-Score: -6.47 X-Migadu-Queue-Id: 2D93D159E7 X-TUID: ed79Kia1T1Xx From: Marco Rimoldi Hello, see the bug reported here: https://issues.guix.gnu.org/58046 gettext-minimal is now both in inputs and native-inputs, does it makes sense? :D Anyway the program runs and opens .po files alright. Have not attempted cross-compilation. Also guix style'd. cheers Marco * gnu/packages/poedit.scm (poedit): Update to 3.4.2. [arguments]: Use G-expressions throughout. : Wrap the program with gettext binaries in PATH so that it does not crash. [inputs]: Add gettext-minimal (see above), nlohmann-json, python-minimal (needed for utility scripts). Change-Id: I09976a81ad93fa7850a4d414dbcbaa98eb778ece --- gnu/packages/poedit.scm | 73 ++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/gnu/packages/poedit.scm b/gnu/packages/poedit.scm index fd8ed06c83..617daaefdb 100644 --- a/gnu/packages/poedit.scm +++ b/gnu/packages/poedit.scm @@ -21,16 +21,20 @@ (define-module (gnu packages poedit) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) #:use-module (gnu packages boost) + #:use-module (gnu packages cpp) #:use-module (gnu packages enchant) #:use-module (gnu packages gettext) #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages rdf) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml)) @@ -38,41 +42,48 @@ (define-module (gnu packages poedit) (define-public poedit (package (name "poedit") - (version "2.2.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/vslavik/poedit") - (commit (string-append "v" version "-oss")))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "147jiiab4n0nbhzp1vw1jn8ykhy7qh6zf02654ppi0imdfvfnjss")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "deps") - #t)))) + (version "3.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vslavik/poedit") + (commit (string-append "v" version "-oss")))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nhbc127k2n1pnrmg2yjrzrxp19vmsv08x7hyfj62y3kliy9dw09")) + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "deps") #t)))) (build-system gnu-build-system) (arguments - `(#:configure-flags - (list (string-append "--with-boost-libdir=" - (assoc-ref %build-inputs "boost") - "/lib")))) - (native-inputs - (list autoconf automake gettext-minimal pkg-config)) - (inputs - (list boost - enchant - gtk+ - gtkspell3 - icu4c - lucene++ - pugixml - wxwidgets)) + (list + #:configure-flags #~(list (string-append "--with-boost-libdir=" + #$boost "/lib")) + #:phases #~(modify-phases %standard-phases + (add-after 'install 'wrap-executable + (lambda _ + (wrap-program (string-append #$output "/bin/poedit") + `("PATH" prefix + ,(list (string-append #$gettext-minimal "/bin"))))))))) + + (native-inputs (list autoconf automake gettext-minimal pkg-config)) + (inputs (list bash-minimal + boost + enchant + gettext-minimal + gtk+ + gtkspell3 + icu4c + lucene++ + nlohmann-json + python-minimal + pugixml + wxwidgets)) (home-page "https://poedit.net/") (synopsis "Gettext catalog editing tool") - (description "Poedit is a GUI frontend to the GNU gettext utilities and + (description + "Poedit is a GUI frontend to the GNU gettext utilities and a catalog editor/source code parser. It helps with translating applications into other languages.") (license license:expat))) base-commit: bf17a01e06abc100651ed643f2d5c7fea07d37ba -- 2.41.0