From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id bY7lAjKpIWChdAAA0tVLHw (envelope-from ) for ; Mon, 08 Feb 2021 21:12:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id ELrEOTGpIWDuHgAAB5/wlQ (envelope-from ) for ; Mon, 08 Feb 2021 21:12:17 +0000 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 5CBB19403D5 for ; Mon, 8 Feb 2021 21:12:17 +0000 (UTC) Received: from localhost ([::1]:34118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9DpQ-0007Ao-Ab for larch@yhetil.org; Mon, 08 Feb 2021 16:12:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l98le-0000p9-LO for guix-patches@gnu.org; Mon, 08 Feb 2021 10:48:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40184) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l98le-0003DD-E5 for guix-patches@gnu.org; Mon, 08 Feb 2021 10:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l98le-0002fU-Cc for guix-patches@gnu.org; Mon, 08 Feb 2021 10:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46378] [PATCH] gnu: Add instead. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Feb 2021 15:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46378 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: polyakov@liltechdude.xyz, 46378@debbugs.gnu.org Cc: Dmitry Polyakov Received: via spool by 46378-submit@debbugs.gnu.org id=B46378.161279923610183 (code B ref 46378); Mon, 08 Feb 2021 15:48:02 +0000 Received: (at 46378) by debbugs.gnu.org; 8 Feb 2021 15:47:16 +0000 Received: from localhost ([127.0.0.1]:51725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l98kf-0002de-8l for submit@debbugs.gnu.org; Mon, 08 Feb 2021 10:47:16 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:14887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l98kb-0002dU-QA for 46378@debbugs.gnu.org; Mon, 08 Feb 2021 10:46:59 -0500 Received: from nijino.local (217-149-173-242.nat.highway.telekom.at [217.149.173.242]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DZ9PV6yrcz1LLyX; Mon, 8 Feb 2021 16:46:54 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4DZ9PV6yrcz1LLyX DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1612799215; bh=QysCpty31Hu8gSQygghM4jTod+d3FxekyF4P4fMwv+w=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=P/v7acCB659t0cwrVFh/Pq6uyg0M18J1JjhrD41D5L80GGzBIZaqaB3RAK81FeQMi hSwptmf6MU9Q7v7I+bGof50al5LtPLfemTj0Jxs75OBGKhBSuSnUI7dcKlsYEDVi7b sKlaIaIfOtHePITcSeja46pP52CGbKR9EEmMjSh4= Message-ID: <6398b29a976e3e804e224268fd58afd26326b35b.camel@student.tugraz.at> From: Leo Prikler Date: Mon, 08 Feb 2021 16:46:54 +0100 In-Reply-To: <20210208141120.9184-1-polyakov@liltechdude.xyz> References: <20210208141120.9184-1-polyakov@liltechdude.xyz> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUGAntiSpamFlag: ham X-TUG-Spam-Score: 3.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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.26 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b="P/v7acCB"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 5CBB19403D5 X-Spam-Score: -1.26 X-Migadu-Scanner: scn1.migadu.com X-TUID: 9b5vrLWWKCKc Hello Dmitry, the patch now applies with "git apply", but not "git am", which makes it difficult to sign off. I can however rewrite the commit on your behalf if that is what you want. Am Montag, den 08.02.2021, 09:11 -0500 schrieb polyakov@liltechdude.xyz: > * gnu/local.mk (instead): New variable. This is not what happens in local.mk. In local.mk you register your patch in dist_patch_DATA. The new variable goes to game- development.scm. > * gnu/packages/patches/instead-use-games-path.patch: > Patch for engine that enable set game directory > location in environment. "New file." is okay here. > --- > gnu/local.mk | 2 + > gnu/packages/game-development.scm | 53 > +++++++++++++++++++ > .../patches/instead-use-games-path.patch | 28 ++++++++++ > 3 files changed, 83 insertions(+) > create mode 100644 gnu/packages/patches/instead-use-games-path.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index b9b4b66..923231f 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -40,6 +40,7 @@ > # Copyright © 2020 Malte Frank Gerdes > # Copyright © 2020 Vinicius Monego > # Copyright © 2021 Björn Höfling > +# Copyright © 2021 Dmitry Polyakov > # > # This file is part of GNU Guix. > # > @@ -1187,6 +1188,7 @@ dist_patch_DATA = > \ > %D%/packages/patches/ilmbase-fix-tests.patch > \ > %D%/packages/patches/inetutils-hurd.patch \ > %D%/packages/patches/inkscape-poppler-0.76.patch \ > + %D%/packages/patches/instead-use-games-path.patch \ > %D%/packages/patches/intel-xed-fix-nondeterminism.patch \ > %D%/packages/patches/intltool-perl-compatibility.patch \ > %D%/packages/patches/iputils-libcap-compat.patch \ > diff --git a/gnu/packages/game-development.scm b/gnu/packages/game- > development.scm > index 92c3da9..018d946 100644 > --- a/gnu/packages/game-development.scm > +++ b/gnu/packages/game-development.scm > @@ -20,6 +20,7 @@ > ;;; Copyright © 2020 Nicolas Goaziou > ;;; Copyright © 2020 Timotej Lazar > ;;; Copyright © 2020 Giacomo Leidi > +;;; Copyright © 2021 Dmitry Polyakov > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -1961,6 +1962,58 @@ all modern computing platforms. Each library > component is fairly independent > of the others") > (license license:lgpl2.0+))) > > +(define-public instead > + (package > + (name "instead") > + (version "3.3.2") > + (build-system cmake-build-system) > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/instead-hub/instead") > + (commit version))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > "014wfz5z5x72rhnakczpgfyw8s6bq510bxfmn4gv66jahkh4b65f")) > + (patches > + (search-patches > + "instead-use-games-path.patch")))) > + (arguments > + '(#:configure-flags > + (list (string-append > + "-DLUA_INCLUDE_DIR=" > + (assoc-ref %build-inputs "luajit") "/include/luajit- > 2.1/") > + "-DWITH_LUAJIT=1" > + "-DWITH_GTK3=1") > + #:tests? #f)) > + (native-inputs > + `(("pkg-config" ,pkg-config))) > + (inputs > + `(("sdl2-images" ,sdl2-image) > + ("sdl2-ttf" ,sdl2-ttf) > + ("lua" ,lua) > + ("sdl2-mixer" ,sdl2-mixer) > + ("luajit" ,luajit) > + ("gtk+",gtk+))) > + (home-page "https://instead3.syscall.ru/") > + (synopsis "Text adventure interpreter") > + (description "The interpreter of STEAD (Simple Text Adventures) > allows one > +to play games that combine visual novels, text adventures and > classic quests > +of 1990-s. The STEAD games features are: > +@enumerate > +@item Very simple source code of the stories. (based on LUA); > +@item Graphical game interface; > +@item Supports music and images; > +@item Theme support - a game may change the interface look; > +@end enumerate") > + (license (list license:gpl2 license:zlib)) > + (native-search-paths > + (list (search-path-specification > + (variable "INSTEAD_GAMES_PATH") > + (separator #f) ;single entry > + (files '("share/instead/games"))))))) > + LGTM, but the description could do with a few improvements. "This package allows to" is somewhat of an anti-pattern. On a related note "The interpreter of STEAD" is probably better worded as "The STEAD interpreter" and "The STEAD games features" could be "STEAD games feature" or something along those lines. Items should probably not end in semicolons. > +From: Dmitry Polyakov > +Date: Wed, 3 Feb 2021 14:33:37 -0500 > +Subject: [PATCH] add support to get game directory location from > environent Should be "Add support for INSTEAD_GAMES_PATH" followed by two newlines followed by a rationale as for why this patch is required. Regards, Leo