From patchwork Fri Sep 25 03:55:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jesse Gibbons X-Patchwork-Id: 24290 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 F274727BBE9; Fri, 25 Sep 2020 04:56:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 686F227BBE8 for ; Fri, 25 Sep 2020 04:56:08 +0100 (BST) Received: from localhost ([::1]:56324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLeq7-0002da-HQ for patchwork@mira.cbaines.net; Thu, 24 Sep 2020 23:56:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLeq2-0002c1-Fl for guix-patches@gnu.org; Thu, 24 Sep 2020 23:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58991) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLeq2-0005D2-6t for guix-patches@gnu.org; Thu, 24 Sep 2020 23:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kLeq2-000702-6Y for guix-patches@gnu.org; Thu, 24 Sep 2020 23:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43194] [PATCH] gnu: publicly define freedink-engine and freedink-data Resent-From: Jesse Gibbons Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Sep 2020 03:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43194 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 43194@debbugs.gnu.org Received: via spool by 43194-submit@debbugs.gnu.org id=B43194.160100611326849 (code B ref 43194); Fri, 25 Sep 2020 03:56:02 +0000 Received: (at 43194) by debbugs.gnu.org; 25 Sep 2020 03:55:13 +0000 Received: from localhost ([127.0.0.1]:42304 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLepF-0006yy-En for submit@debbugs.gnu.org; Thu, 24 Sep 2020 23:55:13 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:45235) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLepD-0006yl-Nr for 43194@debbugs.gnu.org; Thu, 24 Sep 2020 23:55:12 -0400 Received: by mail-pf1-f196.google.com with SMTP id x22so1870052pfo.12 for <43194@debbugs.gnu.org>; Thu, 24 Sep 2020 20:55:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language; bh=eEfzGFlEA5Spf8WAIaxETmQOciEut3JZmi7tU5N98Vw=; b=WuB3mVS7RBZ/9KXxY1nnW+jJ2ec80RCztZA7hqYPjzdyAwH6lAeOpdbOkOz5qwWlS/ A7KlVX2ieGHjFvJrETYkiJoSyL0iF4l2LodCMyKOSn8yacBYes4x7wO2fbI7WkZx7BWI pr3h1ttWUlQ8tXaP5GDveRUvLZxIftRFV1BvNoQGx1BQvABYmA3HOhzjR5yEN6H5bb95 8kDr388On6nuQGyj4GAIdi+BV3MDDnyT2A5k0w4Ds2bPs6WefD9Iw8FncN+tais9/RwY zqZ9Cr7G5WKMe6LRXqgLpFg7zMiT3fbKKlIf326ZdyF0RcCwjo4BshRf+ssxuWrsJr61 x2sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=eEfzGFlEA5Spf8WAIaxETmQOciEut3JZmi7tU5N98Vw=; b=fYNVb4r1ep/AXwW1Vl6RFfhId6a9+ge/bFYTG1CvR/G7BIGLH33A9mzIfM6RkowdHX 6gNmz8v8IS9bcgco1wGxWFrUUu4pQw0Ebej9pBwaGeM62zKjmP6DY0HPb4AK54ncgh1J r4WMwXftkbmzIaLWZDh6K9Tj8smZazj2yYeQ/6u6n8zj622d1reOZE/WrlKKiymNYTdR Wv4ljQEO7Z/4HgSIHjqAetf4VbddfCVOlrj27KHW+wU9Y+RxXjcWCMDpw4RWcz034ZQF 4KdDyRnUKzU6fKgd9ccuZkQTQY6lpg0bDGx6ICrZ7ua/DMty9j1u+XCSdjwwDB7+MmWO UX3Q== X-Gm-Message-State: AOAM531hFYBXACikekjx3hkqtmsZKtlNdn3xKNU7FiRLBaEhBUBm8Kkg ULCaQLefvFzuwnEDlE85eG8rX12hai4= X-Google-Smtp-Source: ABdhPJw690/OvMm3pctM8atc6pY/CdETLI+ZcgmA+mtJqfr/zSHGn2rMoAPrJjOdhoXWhDC7lRHTdg== X-Received: by 2002:a63:1c1b:: with SMTP id c27mr1867381pgc.439.1601006105360; Thu, 24 Sep 2020 20:55:05 -0700 (PDT) Received: from [192.168.1.25] ([38.141.58.134]) by smtp.gmail.com with ESMTPSA id w185sm955975pfc.36.2020.09.24.20.55.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 24 Sep 2020 20:55:04 -0700 (PDT) References: <69eb1bb4-ff32-9267-84cf-0c36d52e32c1@gmail.com> <87a6y1itry.fsf@gnu.org> <197d4953-0c53-eb82-24e9-1dc99d0b6e3b@gmail.com> <87y2llfqh9.fsf@gnu.org> <87zh5f6w54.fsf@gnu.org> From: Jesse Gibbons Message-ID: Date: Thu, 24 Sep 2020 21:55:01 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Icedove/68.12.0 MIME-Version: 1.0 In-Reply-To: <87zh5f6w54.fsf@gnu.org> Content-Language: en-US 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 Sorry it took so long. Updated patch is attached. -Jesse. On 9/24/20 9:18 AM, Ludovic Courtès wrote: > Ping! :-) > > Ludovic Courtès skribis: > > ... >>> -> Freedink-engine installs desktop files to launch freedink without >>> freedink-dfarc or the console. This is actually a new issue I will >>> address in an updated patch: the desktop files fail because the data >>> location is not hard-coded. I think the freedink desktop file can be >>> patched if freedink-data is an input, but, like I said above, it's >>> pointless to use dinkedit on a read-only directory, so I intend to >>> remove it. The patch removes both desktop files. >> OK, makes sense—thanks for explaining. >>>>> (define-public freedink >>>>> ;; This is a wrapper that tells the engine where to find the data. >>>>> - (package (inherit freedink-engine) >>>>> + (package ;(inherit freedink-engine) >>>> Is it intended? Looks like inheriting avoids duplicating fields, no? >>> Oops! I did not intend to leave (inherit freedink-engine) in a >>> comment. I initially commented it out because freedink does nothing >>> with the source anyway, and I wanted to see what would happen if I >>> removed the inheritance. I guess I forgot to remove the semicolon and >>> other additions. The patch fixes this. >>> As noted above, it is easiest to use freedink-dfarc to launch the >>> editor, but freedink-dfarc must be told what editor to use, and it is >>> easier to identify it if the editor is installed in a profile (or >>> included as an input). Also, freedink-engine includes (broken) desktop >>> files. Since freedink just installs a wrapper script around the >>> engine, and does not include the editor or any desktop files, perhaps >>> it would be better to put the wrapper script in freedink-engine (thus >>> fixing the desktop file), completely remove the freedink package, and >>> rename "freedink-engine" to just "freedink"? But freedink-dfarc would >>> still need to be able to launch freedink without pointing to any >>> read-only data if a user wants to test the edited freedink data. >> Maybe, sounds like a reasonable option. The patch does not do this. For now, I don't have the time (and probably won't have much time until late December), so I'll leave it as a to-do item for anyone who wants to accomplish this. -Jesse From 438c2044f23e36fc1ddc07b388624194caebb077 Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Wed, 26 Aug 2020 21:38:24 -0600 Subject: [PATCH 1/1] gnu: publicly define freedink-engine and freedink-data * gnu/packages/games.scm: (freedink-engine): make public (freedink-data): make public --- gnu/packages/games.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 126539825c..8182bbbe6c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2861,7 +2861,7 @@ interface or via an external visual interface such as GNU XBoard.") (ftp-directory . "/chess"))) (license license:gpl3+))) -(define freedink-engine +(define-public freedink-engine (package (name "freedink-engine") (version "109.6") @@ -2891,7 +2891,16 @@ interface or via an external visual interface such as GNU XBoard.") (invoke "autoreconf") ;; Build fails when autom4te.cache exists. (delete-file-recursively "autom4te.cache") - #t))))) + #t)) + (add-after 'install 'delete-freedinkedit-desktop + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; freedinkedit does not know where to find freedink data + ;; freedink data is read-only, so it cannot be edited anyway. + ;; TODO: fix freedink.desktop + (delete-file-recursively (string-append + out "/share/applications")) + #t)))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("cxxtest" ,cxxtest) @@ -2913,7 +2922,7 @@ game data files but it also supports user-produced game mods or \"D-Mods\". To that extent, it also includes a front-end for managing all of your D-Mods.") (license license:gpl3+))) -(define freedink-data +(define-public freedink-data (package (name "freedink-data") (version "1.08.20190120") @@ -2971,7 +2980,6 @@ and its numerous D-Mods.") (arguments '(#:builder (begin (use-modules (guix build utils)) - (let* ((output (assoc-ref %outputs "out")) (bin (string-append output "/bin")) (executable (string-append bin "/freedink"))) -- 2.28.0