From unknown Sun Aug 10 09:15:10 2025 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, 04 Sep 2020 04:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43194 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43194@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.159919402529131 (code B ref -1); Fri, 04 Sep 2020 04:34:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Sep 2020 04:33:45 +0000 Received: from localhost ([127.0.0.1]:36899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kE3Q1-0007Zn-Jp for submit@debbugs.gnu.org; Fri, 04 Sep 2020 00:33:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:35294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kE3Q0-0007Zg-N7 for submit@debbugs.gnu.org; Fri, 04 Sep 2020 00:33:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kE3Q0-0005yZ-F0 for guix-patches@gnu.org; Fri, 04 Sep 2020 00:33:44 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:35539) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kE3Py-0001wH-Ro for guix-patches@gnu.org; Fri, 04 Sep 2020 00:33:44 -0400 Received: by mail-pl1-x62f.google.com with SMTP id a8so578325plm.2 for ; Thu, 03 Sep 2020 21:33:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=ZY0MkLKFv+FEhkxx3D1HOdbpNVKnKD8p7OO54IBKPBI=; b=P/joB3AV7EKX8ynv31vKc9M668gWY0cFdZAaWDWFGR6zeYnjK35TiFgkcVh3KyogU4 0qZKB1EK1etQypX1foqonrV2pRkjzqXWhXpXmMvYNFZIBNhLK4rVCngXodnKf72imXit Ahu+FLfVQKwxz0mOVVkmVNVLOXv/Sz0VWVDdTZEP9ev/M/rFqWivrNHhGFguHiQFmn7v etR34hzOzLwVzH/CgZNuFnVHWln5oqIA1OlAnRjl3ZfJ22r9j9EXA20Vu1soy63PpG25 LAMqpP20A8Y9LF31LlltaY8ghRCkPSVEyU80L6NHgkeeVaTmO/bmwPi8odMfd7NCmSym jOiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=ZY0MkLKFv+FEhkxx3D1HOdbpNVKnKD8p7OO54IBKPBI=; b=ofkPtheF6qF9yodOLq9H88lN/6Xct18LRMH4txxUS/GcFZWgA0HmVRCqnK88EPve49 LVpJn8j5h+4BtuWj2nn04xBEnGdkNxQeE4m6qzJwfEi84XLDLS3n4nvBsdGR2zQFqxF1 waLBpVgRZOl7/fi5QBowQpAq9BlGC08wr1RlBHJLtJEsgW4f3Kckqq2Gog7DQaHnb2zM 10lmKuQ8YbHxd1a/ZPJw6NbKJx8YmpMmdhtWzelf6zCMPnr+jw0QbzUxzaHTx7HChqj5 YCioSncMkM3kx3qU68aqbKoROoidavnyjqsL+Z6FCZUQ+j4Jrao/6hemwXl6V98T9ZsZ AJBQ== X-Gm-Message-State: AOAM532LFAo5pX35Aj9WCYZHIrmaC4N7qZAuOme7c5Qs9tJIvsifHV8t LkozX4u5eQN1FKLt05t+JCWiHoofhvadKg== X-Google-Smtp-Source: ABdhPJzwtxX5qL2TNFnZR42+PZKjSgN+N8uUj/5qQJL42i6sV9w0Im4RdqpjXf1DcK6dpxml76WVug== X-Received: by 2002:a17:90a:f998:: with SMTP id cq24mr6583634pjb.9.1599194021277; Thu, 03 Sep 2020 21:33:41 -0700 (PDT) Received: from [192.168.1.25] ([38.141.58.134]) by smtp.gmail.com with ESMTPSA id e1sm4860751pfn.78.2020.09.03.21.33.40 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Sep 2020 21:33:40 -0700 (PDT) From: Jesse Gibbons Message-ID: <69eb1bb4-ff32-9267-84cf-0c36d52e32c1@gmail.com> Date: Thu, 3 Sep 2020 22:33:31 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Icedove/68.12.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------EFB72916D015A2FAE05133C6" Content-Language: en-US Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=jgibbons2357@gmail.com; helo=mail-pl1-x62f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) This is a multi-part message in MIME format. --------------EFB72916D015A2FAE05133C6 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit The attached patch publicly defines freedink-engine and freedink-data. This resolves many of the issues described in #43061. This patch, combined with patch #43193(sent earlier today), can close #43061. -Jesse --------------EFB72916D015A2FAE05133C6 Content-Type: text/x-patch; charset=UTF-8; name="v1-0001-gnu-publicly-define-freedink-engine-and-freedink-.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="v1-0001-gnu-publicly-define-freedink-engine-and-freedink-.pa"; filename*1="tch" >From 583215aced9b557d6f4e54b290e788d33880c03c Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Wed, 26 Aug 2020 21:38:24 -0600 Subject: [PATCH v1 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 ccdc47d5c7..7540cf4603 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2859,7 +2859,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") @@ -2911,7 +2911,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") @@ -2963,8 +2963,10 @@ and its numerous D-Mods.") (define-public freedink ;; This is a wrapper that tells the engine where to find the data. - (package (inherit freedink-engine) + (package ;(inherit freedink-engine) (name "freedink") + (version (package-version freedink-engine)) + (source #f) (build-system trivial-build-system) (arguments '(#:builder (begin @@ -2987,7 +2989,13 @@ exec ~a/bin/freedink -refdir ~a/share/dink\n" (inputs `(("engine" ,freedink-engine) ("data" ,freedink-data) ("bash" ,bash))) - (native-inputs '()))) + (native-inputs '()) + (home-page (package-home-page freedink-engine)) + (synopsis (package-synopsis freedink-engine)) + (description (string-append (package-description freedink-engine) +"\n\nThis package provides a wrapper that points the engine to +the upstream \"vanilla\" data.")) + (license license:gpl3+))) (define-public xboard (package -- 2.28.0 --------------EFB72916D015A2FAE05133C6-- From unknown Sun Aug 10 09:15:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43194] [PATCH] gnu: publicly define freedink-engine and freedink-data Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Sep 2020 13:47:01 +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: Jesse Gibbons Cc: 43194@debbugs.gnu.org Received: via spool by 43194-submit@debbugs.gnu.org id=B43194.15994864151365 (code B ref 43194); Mon, 07 Sep 2020 13:47:01 +0000 Received: (at 43194) by debbugs.gnu.org; 7 Sep 2020 13:46:55 +0000 Received: from localhost ([127.0.0.1]:48440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFHTy-0000Lv-Uf for submit@debbugs.gnu.org; Mon, 07 Sep 2020 09:46:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFHTx-0000Li-7Y for 43194@debbugs.gnu.org; Mon, 07 Sep 2020 09:46:53 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42315) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFHTr-00028M-RD; Mon, 07 Sep 2020 09:46:47 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=44364 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kFHTr-0004wI-AP; Mon, 07 Sep 2020 09:46:47 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <69eb1bb4-ff32-9267-84cf-0c36d52e32c1@gmail.com> Date: Mon, 07 Sep 2020 15:46:41 +0200 In-Reply-To: <69eb1bb4-ff32-9267-84cf-0c36d52e32c1@gmail.com> (Jesse Gibbons's message of "Thu, 3 Sep 2020 22:33:31 -0600") Message-ID: <87a6y1itry.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Jesse Gibbons skribis: > The attached patch publicly defines freedink-engine and > freedink-data. This resolves many of the issues described in > #43061. This patch, combined with patch #43193(sent earlier today), > can close #43061. Now I=E2=80=99m confused: how does it help to make freedink-{engine,data} public? >>>From 583215aced9b557d6f4e54b290e788d33880c03c Mon Sep 17 00:00:00 2001 > From: Jesse Gibbons > Date: Wed, 26 Aug 2020 21:38:24 -0600 > Subject: [PATCH v1 1/1] gnu: publicly define freedink-engine and freedink= -data > > * gnu/packages/games.scm: (freedink-engine): make public > (freedink-data): make public [...] > (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? Thanks, Ludo=E2=80=99. From unknown Sun Aug 10 09:15:10 2025 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: Mon, 07 Sep 2020 17:14: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.159949881824325 (code B ref 43194); Mon, 07 Sep 2020 17:14:02 +0000 Received: (at 43194) by debbugs.gnu.org; 7 Sep 2020 17:13:38 +0000 Received: from localhost ([127.0.0.1]:50672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFKi1-0006KH-Nn for submit@debbugs.gnu.org; Mon, 07 Sep 2020 13:13:38 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:44963) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFKi0-0006K4-M0 for 43194@debbugs.gnu.org; Mon, 07 Sep 2020 13:13:37 -0400 Received: by mail-pg1-f193.google.com with SMTP id 7so8272223pgm.11 for <43194@debbugs.gnu.org>; Mon, 07 Sep 2020 10:13:36 -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-transfer-encoding:content-language; bh=5AI1gTXZwvfcFgyytyP54Ym3yotIE1ncy1vkcm5zbQE=; b=utDRGSr7Niu/tPzshSreBDot7ZP0anVBAHjnqMjVxDoWWw5KT9mGvVZktq9d+IwvbS ZKXdmFrUpt/zphsDOaDJgxkmR5KCq5zZQq44frmdLM6/QZ84msRktMJHhgJZC9mBpWWh bgerms19YHLDiw/4sh2/E63OIXa6k1vmcB3MKy6DVSLWkjDEaKgb3sKREtqZAtlDrs5v ht+akIOftuVcIxjRcmSSrSQIhjoMqo0eMzaRmgYPfvlQIMKdmAehKIwLbnl+O4dDHhA/ BXFJF7FUtlSPMq1i9NW8Lqs64LnyQajgw16wSXPEsgUUejQydipwSM70kE2QIZN4cc6s y24g== 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-transfer-encoding :content-language; bh=5AI1gTXZwvfcFgyytyP54Ym3yotIE1ncy1vkcm5zbQE=; b=Ct2HGinV0jLLZrL9XO+ZWzMAmGwC3RuLLMGF0VLYK5Twee4JLXFhwW9yaiAu1dJEaE hq95LslsRzjMSgmEfMfC+1tEKcuiN9nLxVre7umePdQr2DqM//wUg45tta76g15w5bHA f2n7BY7ni+yw4mXVj1JkHp2M7wWCIOpCwB/Qm71zdxlmfKOti2Kqw2HSjgK9IqUDys5g cy8tjzcF7sn02U/ce5zeu1bJuzPt2nRHegL8gC0bm5edeAoAUy59wIF7WKJyfQNe2peC Os/VBBVF5fLfQcfHs/bEZSSsURKbuYq1HVeVykUhT/et1a0vqywZF63Fbr96K+xqAk8O GMbg== X-Gm-Message-State: AOAM5339Ne1D7b0pNd3mb/GrMVbpZivO5AQSu2DNrlV4wp+heN9OQRV3 rY9hxaDikS4dxqWAICpIpspCfLVXPXOhPg== X-Google-Smtp-Source: ABdhPJyTTK8vDIHKbUb62K2rgi4BeC5HIAhstDo93siDLki+4HMJl6J8RIaVcv9E8mE96Q+V4kJX5g== X-Received: by 2002:a63:4d5b:: with SMTP id n27mr9342069pgl.360.1599498810114; Mon, 07 Sep 2020 10:13:30 -0700 (PDT) Received: from [192.168.1.25] ([38.141.58.134]) by smtp.gmail.com with ESMTPSA id e66sm15390399pfa.130.2020.09.07.10.13.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 07 Sep 2020 10:13:29 -0700 (PDT) References: <69eb1bb4-ff32-9267-84cf-0c36d52e32c1@gmail.com> <87a6y1itry.fsf@gnu.org> From: Jesse Gibbons Message-ID: <197d4953-0c53-eb82-24e9-1dc99d0b6e3b@gmail.com> Date: Mon, 7 Sep 2020 11:13:17 -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: <87a6y1itry.fsf@gnu.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) Thank you for reviewing. On 9/7/20 7:46 AM, Ludovic Courtès wrote: > Hi, > > Jesse Gibbons skribis: > >> The attached patch publicly defines freedink-engine and >> freedink-data. This resolves many of the issues described in >> #43061. This patch, combined with patch #43193(sent earlier today), >> can close #43061. > Now I’m confused: how does it help to make freedink-{engine,data} > public? Other than making guix more consistent in publicly defining game data packages (0ad-data and megaglest-data are public, and I like that -- I could write a good article about why, which I think would be a worthy entry in the guix blog, especially after #43193 is applied), there are 4 reasons for this change: -> freedink-dfarc has problems locating the editor, installed in freedink-engine. I guess we could also fix this by making freedink-engine an input to freedink-dfarc and splicing a reference to it into the default configuration? -> Unless freedink-data is public, `guix build --source freedink-data` fails, and `guix build --sources=all freedink` does not build a source for freedink-data. I think future users who want to alter the freedink data would appreciate the ability to use guix to get the data. Also, it's pointless to use the editor on the installed freedink-data because it's read-only when it's installed. -> Back when I was fixing freedink, I found it difficult to debug without freedink-engine being public, because freedink does nothing with the freedink-engine source. -> 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. > >> >From 583215aced9b557d6f4e54b290e788d33880c03c Mon Sep 17 00:00:00 2001 >> From: Jesse Gibbons >> Date: Wed, 26 Aug 2020 21:38:24 -0600 >> Subject: [PATCH v1 1/1] gnu: publicly define freedink-engine and freedink-data >> >> * gnu/packages/games.scm: (freedink-engine): make public >> (freedink-data): make public > [...] > >> (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. 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. > > Thanks, > Ludo’. -Jesse From unknown Sun Aug 10 09:15:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43194] [PATCH] gnu: publicly define freedink-engine and freedink-data Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Sep 2020 17:27: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: Jesse Gibbons Cc: 43194@debbugs.gnu.org Received: via spool by 43194-submit@debbugs.gnu.org id=B43194.15994995831553 (code B ref 43194); Mon, 07 Sep 2020 17:27:02 +0000 Received: (at 43194) by debbugs.gnu.org; 7 Sep 2020 17:26:23 +0000 Received: from localhost ([127.0.0.1]:50710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFKuN-0000Oz-3W for submit@debbugs.gnu.org; Mon, 07 Sep 2020 13:26:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFKuM-0000Ol-6h for 43194@debbugs.gnu.org; Mon, 07 Sep 2020 13:26:22 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:46355) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFKuG-0005we-W7; Mon, 07 Sep 2020 13:26:17 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=60762 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kFKuG-0002UZ-83; Mon, 07 Sep 2020 13:26:16 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <69eb1bb4-ff32-9267-84cf-0c36d52e32c1@gmail.com> <87a6y1itry.fsf@gnu.org> <197d4953-0c53-eb82-24e9-1dc99d0b6e3b@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 22 Fructidor an 228 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 07 Sep 2020 19:26:10 +0200 In-Reply-To: <197d4953-0c53-eb82-24e9-1dc99d0b6e3b@gmail.com> (Jesse Gibbons's message of "Mon, 7 Sep 2020 11:13:17 -0600") Message-ID: <87y2llfqh9.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Jesse Gibbons skribis: >>> The attached patch publicly defines freedink-engine and >>> freedink-data. This resolves many of the issues described in >>> #43061. This patch, combined with patch #43193(sent earlier today), >>> can close #43061. >> Now I=E2=80=99m confused: how does it help to make freedink-{engine,data} >> public? > Other than making guix more consistent in publicly defining game data > packages (0ad-data and megaglest-data are public, and I like that -- I > could write a good article about why, which I think would be a worthy > entry in the guix blog, especially after #43193 is applied), there are > 4 reasons for this change: > > -> freedink-dfarc has problems locating the editor, installed in > freedink-engine. I guess we could also fix this by making > freedink-engine an input to freedink-dfarc and splicing a reference to > it into the default configuration? > > -> Unless freedink-data is public, `guix build --source freedink-data` > fails, and `guix build --sources=3Dall freedink` does not build a source > for freedink-data. I think future users who want to alter the freedink > data would appreciate the ability to use guix to get the data. Also, > it's pointless to use the editor on the installed freedink-data > because it's read-only when it's installed. > > -> Back when I was fixing freedink, I found it difficult to debug > without freedink-engine being public, because freedink does nothing > with the freedink-engine source. > > -> 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. OK, makes sense=E2=80=94thanks for explaining. >>> >From 583215aced9b557d6f4e54b290e788d33880c03c Mon Sep 17 00:00:00 2001 >>> From: Jesse Gibbons >>> Date: Wed, 26 Aug 2020 21:38:24 -0600 >>> Subject: [PATCH v1 1/1] gnu: publicly define freedink-engine and freedi= nk-data >>> >>> * gnu/packages/games.scm: (freedink-engine): make public >>> (freedink-data): make public >> [...] >> >>> (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. OK. If you send an updated patch, I=E2=80=99ll happily apply it, then! > 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. Thank you, Ludo=E2=80=99. From unknown Sun Aug 10 09:15:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43194] [PATCH] gnu: publicly define freedink-engine and freedink-data Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Sep 2020 15:19:01 +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: Jesse Gibbons Cc: 43194@debbugs.gnu.org Received: via spool by 43194-submit@debbugs.gnu.org id=B43194.160096073721094 (code B ref 43194); Thu, 24 Sep 2020 15:19:01 +0000 Received: (at 43194) by debbugs.gnu.org; 24 Sep 2020 15:18:57 +0000 Received: from localhost ([127.0.0.1]:41278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLT19-0005Ts-0M for submit@debbugs.gnu.org; Thu, 24 Sep 2020 11:18:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLT15-0005Tc-Uw for 43194@debbugs.gnu.org; Thu, 24 Sep 2020 11:18:41 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:34821) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLT10-000477-MP; Thu, 24 Sep 2020 11:18:34 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57470 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kLT0z-0003ss-Gc; Thu, 24 Sep 2020 11:18:34 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <69eb1bb4-ff32-9267-84cf-0c36d52e32c1@gmail.com> <87a6y1itry.fsf@gnu.org> <197d4953-0c53-eb82-24e9-1dc99d0b6e3b@gmail.com> <87y2llfqh9.fsf@gnu.org> Date: Thu, 24 Sep 2020 17:18:31 +0200 In-Reply-To: <87y2llfqh9.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Mon, 07 Sep 2020 19:26:10 +0200") Message-ID: <87zh5f6w54.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Ping! :-) Ludovic Court=C3=A8s skribis: > Hi, > > Jesse Gibbons skribis: > >>>> The attached patch publicly defines freedink-engine and >>>> freedink-data. This resolves many of the issues described in >>>> #43061. This patch, combined with patch #43193(sent earlier today), >>>> can close #43061. >>> Now I=E2=80=99m confused: how does it help to make freedink-{engine,dat= a} >>> public? >> Other than making guix more consistent in publicly defining game data >> packages (0ad-data and megaglest-data are public, and I like that -- I >> could write a good article about why, which I think would be a worthy >> entry in the guix blog, especially after #43193 is applied), there are >> 4 reasons for this change: >> >> -> freedink-dfarc has problems locating the editor, installed in >> freedink-engine. I guess we could also fix this by making >> freedink-engine an input to freedink-dfarc and splicing a reference to >> it into the default configuration? >> >> -> Unless freedink-data is public, `guix build --source freedink-data` >> fails, and `guix build --sources=3Dall freedink` does not build a source >> for freedink-data. I think future users who want to alter the freedink >> data would appreciate the ability to use guix to get the data. Also, >> it's pointless to use the editor on the installed freedink-data >> because it's read-only when it's installed. >> >> -> Back when I was fixing freedink, I found it difficult to debug >> without freedink-engine being public, because freedink does nothing >> with the freedink-engine source. >> >> -> 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. > > OK, makes sense=E2=80=94thanks for explaining. > >>>> >From 583215aced9b557d6f4e54b290e788d33880c03c Mon Sep 17 00:00:00 2001 >>>> From: Jesse Gibbons >>>> Date: Wed, 26 Aug 2020 21:38:24 -0600 >>>> Subject: [PATCH v1 1/1] gnu: publicly define freedink-engine and freed= ink-data >>>> >>>> * gnu/packages/games.scm: (freedink-engine): make public >>>> (freedink-data): make public >>> [...] >>> >>>> (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. > > OK. If you send an updated patch, I=E2=80=99ll happily apply it, then! > >> 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. > > Thank you, > Ludo=E2=80=99. From unknown Sun Aug 10 09:15:10 2025 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-Type: multipart/mixed; boundary="------------A9B01C45E9CD4111FE64BF3E" Content-Language: en-US X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------A9B01C45E9CD4111FE64BF3E Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit 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 --------------A9B01C45E9CD4111FE64BF3E Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-publicly-define-freedink-engine-and-freedink-dat.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-gnu-publicly-define-freedink-engine-and-freedink-dat.pa"; filename*1="tch" >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 --------------A9B01C45E9CD4111FE64BF3E-- From unknown Sun Aug 10 09:15:10 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Jesse Gibbons Subject: bug#43194: closed (Re: [bug#43194] [PATCH] gnu: publicly define freedink-engine and freedink-data) Message-ID: References: <87h7rlizv7.fsf@gnu.org> <69eb1bb4-ff32-9267-84cf-0c36d52e32c1@gmail.com> X-Gnu-PR-Message: they-closed 43194 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 43194@debbugs.gnu.org Date: Fri, 25 Sep 2020 16:30:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1601051402-12930-1" This is a multi-part message in MIME format... ------------=_1601051402-12930-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #43194: [PATCH] gnu: publicly define freedink-engine and freedink-data which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 43194@debbugs.gnu.org. --=20 43194: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D43194 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1601051402-12930-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 43194-done) by debbugs.gnu.org; 25 Sep 2020 16:29:44 +0000 Received: from localhost ([127.0.0.1]:45194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLqbP-0003Lk-Th for submit@debbugs.gnu.org; Fri, 25 Sep 2020 12:29:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLqbO-0003LX-9D for 43194-done@debbugs.gnu.org; Fri, 25 Sep 2020 12:29:42 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40028) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLqbI-0007dk-Vn; Fri, 25 Sep 2020 12:29:36 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=33244 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kLqbG-0003vI-0H; Fri, 25 Sep 2020 12:29:35 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Jesse Gibbons Subject: Re: [bug#43194] [PATCH] gnu: publicly define freedink-engine and freedink-data 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> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 4 =?utf-8?Q?Vend=C3=A9miaire?= an 229 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Fri, 25 Sep 2020 18:29:32 +0200 In-Reply-To: (Jesse Gibbons's message of "Thu, 24 Sep 2020 21:55:01 -0600") Message-ID: <87h7rlizv7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 43194-done Cc: 43194-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Jesse Gibbons skribis: > 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-da= ta > > * gnu/packages/games.scm: (freedink-engine): make public > (freedink-data): make public I tweaked the commit log and applied, thanks! Ludo=E2=80=99. ------------=_1601051402-12930-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 4 Sep 2020 04:33:45 +0000 Received: from localhost ([127.0.0.1]:36899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kE3Q1-0007Zn-Jp for submit@debbugs.gnu.org; Fri, 04 Sep 2020 00:33:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:35294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kE3Q0-0007Zg-N7 for submit@debbugs.gnu.org; Fri, 04 Sep 2020 00:33:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kE3Q0-0005yZ-F0 for guix-patches@gnu.org; Fri, 04 Sep 2020 00:33:44 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:35539) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kE3Py-0001wH-Ro for guix-patches@gnu.org; Fri, 04 Sep 2020 00:33:44 -0400 Received: by mail-pl1-x62f.google.com with SMTP id a8so578325plm.2 for ; Thu, 03 Sep 2020 21:33:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=ZY0MkLKFv+FEhkxx3D1HOdbpNVKnKD8p7OO54IBKPBI=; b=P/joB3AV7EKX8ynv31vKc9M668gWY0cFdZAaWDWFGR6zeYnjK35TiFgkcVh3KyogU4 0qZKB1EK1etQypX1foqonrV2pRkjzqXWhXpXmMvYNFZIBNhLK4rVCngXodnKf72imXit Ahu+FLfVQKwxz0mOVVkmVNVLOXv/Sz0VWVDdTZEP9ev/M/rFqWivrNHhGFguHiQFmn7v etR34hzOzLwVzH/CgZNuFnVHWln5oqIA1OlAnRjl3ZfJ22r9j9EXA20Vu1soy63PpG25 LAMqpP20A8Y9LF31LlltaY8ghRCkPSVEyU80L6NHgkeeVaTmO/bmwPi8odMfd7NCmSym jOiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=ZY0MkLKFv+FEhkxx3D1HOdbpNVKnKD8p7OO54IBKPBI=; b=ofkPtheF6qF9yodOLq9H88lN/6Xct18LRMH4txxUS/GcFZWgA0HmVRCqnK88EPve49 LVpJn8j5h+4BtuWj2nn04xBEnGdkNxQeE4m6qzJwfEi84XLDLS3n4nvBsdGR2zQFqxF1 waLBpVgRZOl7/fi5QBowQpAq9BlGC08wr1RlBHJLtJEsgW4f3Kckqq2Gog7DQaHnb2zM 10lmKuQ8YbHxd1a/ZPJw6NbKJx8YmpMmdhtWzelf6zCMPnr+jw0QbzUxzaHTx7HChqj5 YCioSncMkM3kx3qU68aqbKoROoidavnyjqsL+Z6FCZUQ+j4Jrao/6hemwXl6V98T9ZsZ AJBQ== X-Gm-Message-State: AOAM532LFAo5pX35Aj9WCYZHIrmaC4N7qZAuOme7c5Qs9tJIvsifHV8t LkozX4u5eQN1FKLt05t+JCWiHoofhvadKg== X-Google-Smtp-Source: ABdhPJzwtxX5qL2TNFnZR42+PZKjSgN+N8uUj/5qQJL42i6sV9w0Im4RdqpjXf1DcK6dpxml76WVug== X-Received: by 2002:a17:90a:f998:: with SMTP id cq24mr6583634pjb.9.1599194021277; Thu, 03 Sep 2020 21:33:41 -0700 (PDT) Received: from [192.168.1.25] ([38.141.58.134]) by smtp.gmail.com with ESMTPSA id e1sm4860751pfn.78.2020.09.03.21.33.40 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Sep 2020 21:33:40 -0700 (PDT) To: Guix Patches From: Jesse Gibbons Subject: [PATCH] gnu: publicly define freedink-engine and freedink-data Message-ID: <69eb1bb4-ff32-9267-84cf-0c36d52e32c1@gmail.com> Date: Thu, 3 Sep 2020 22:33:31 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Icedove/68.12.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------EFB72916D015A2FAE05133C6" Content-Language: en-US Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=jgibbons2357@gmail.com; helo=mail-pl1-x62f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) This is a multi-part message in MIME format. --------------EFB72916D015A2FAE05133C6 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit The attached patch publicly defines freedink-engine and freedink-data. This resolves many of the issues described in #43061. This patch, combined with patch #43193(sent earlier today), can close #43061. -Jesse --------------EFB72916D015A2FAE05133C6 Content-Type: text/x-patch; charset=UTF-8; name="v1-0001-gnu-publicly-define-freedink-engine-and-freedink-.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="v1-0001-gnu-publicly-define-freedink-engine-and-freedink-.pa"; filename*1="tch" >From 583215aced9b557d6f4e54b290e788d33880c03c Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Wed, 26 Aug 2020 21:38:24 -0600 Subject: [PATCH v1 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 ccdc47d5c7..7540cf4603 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2859,7 +2859,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") @@ -2911,7 +2911,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") @@ -2963,8 +2963,10 @@ and its numerous D-Mods.") (define-public freedink ;; This is a wrapper that tells the engine where to find the data. - (package (inherit freedink-engine) + (package ;(inherit freedink-engine) (name "freedink") + (version (package-version freedink-engine)) + (source #f) (build-system trivial-build-system) (arguments '(#:builder (begin @@ -2987,7 +2989,13 @@ exec ~a/bin/freedink -refdir ~a/share/dink\n" (inputs `(("engine" ,freedink-engine) ("data" ,freedink-data) ("bash" ,bash))) - (native-inputs '()))) + (native-inputs '()) + (home-page (package-home-page freedink-engine)) + (synopsis (package-synopsis freedink-engine)) + (description (string-append (package-description freedink-engine) +"\n\nThis package provides a wrapper that points the engine to +the upstream \"vanilla\" data.")) + (license license:gpl3+))) (define-public xboard (package -- 2.28.0 --------------EFB72916D015A2FAE05133C6-- ------------=_1601051402-12930-1--