From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:700:3204::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 4IDqMfMliGXT2gAAkFu2QA (envelope-from ) for ; Sun, 24 Dec 2023 13:37:07 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 0KpLKvMliGU0VQEAe85BDQ (envelope-from ) for ; Sun, 24 Dec 2023 13:37:07 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=h2rLKdDT; 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=1703421427; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=7wCwHjGLTsBygTcjZfQmiIGOigNJXSBbMv/gWlIYpfk=; b=erucW9X9dszyw2ZRZRzcTi9AaR/vmprZ01uc5n5Ef+AN+6Ohc9zxJzwEzTmFqjTLEiFJFC Xy/DFcoL2vkNxjOVpe/ZeXshYUNWbzWN+MQV8AofAqxrtJVBZRMIXc7ivovQUo/uiP5JRj uxVxRRRqvf67GXlMtAyMIImWvQFmaVsF1W7ePMkJSb2qnVJVLJ9jju5+FzYsuQJRdG0V// swmhVIkkyRuYGc+UabZEJzYLe5gMPILLR0cwciv6Wfavv+uIQvbZhV6T/StDXY1SSuwkjW RvOpopMnVkh3PJhyWMGZngkC4oaFQqXXkavGM6bkCcMJh5icO8wuxTz8nffRpQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1703421427; a=rsa-sha256; cv=none; b=cxdpATu1hjmLFRG7rGyNVq+ITVl6QnHahTj+fWyczo9/VgvDsrNba80TO5ge/gRCItPcya y/8C6K13uCL9TY1aFm/Y3eRNYK2ELYMneL+w05hIeiBAg4K2JwmlGJWlTBd+jy8UPnenkV eVsDHC4DmNN36KN0STPaut50kB+x3a/y+OFfAS3lW/Eotu9Eb9q1rCx2RL5mtIpZj6pH6v 4hLHsFZnsu79FP/vda8RXWRIi0n8qMun6GcrTQFyHR7Kb+L+SHXEDxlARqEV1nhFyFACto Yb50PbxCfxpr179/eJ6QU6YQUy7PRTaGFQHEbos1UK4WynkKL3XhgQcXntB6sA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=h2rLKdDT; 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 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 2185759014 for ; Sun, 24 Dec 2023 13:37:07 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rHNj1-0006av-Dn; Sun, 24 Dec 2023 07:36:59 -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 1rHNiz-0006Zi-85 for guix-patches@gnu.org; Sun, 24 Dec 2023 07:36:57 -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 1rHNiy-0004lk-Up for guix-patches@gnu.org; Sun, 24 Dec 2023 07:36:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rHNj4-0000ZJ-FE for guix-patches@gnu.org; Sun, 24 Dec 2023 07:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67950] [PATCH 1/3] gnu: Add inform. Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Dec 2023 12:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67950 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler , 67950@debbugs.gnu.org Received: via spool by 67950-submit@debbugs.gnu.org id=B67950.17034213622098 (code B ref 67950); Sun, 24 Dec 2023 12:37:02 +0000 Received: (at 67950) by debbugs.gnu.org; 24 Dec 2023 12:36:02 +0000 Received: from localhost ([127.0.0.1]:51775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHNi5-0000Xe-CH for submit@debbugs.gnu.org; Sun, 24 Dec 2023 07:36:02 -0500 Received: from layka.disroot.org ([178.21.23.139]:52434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHNi2-0000XV-IR for 67950@debbugs.gnu.org; Sun, 24 Dec 2023 07:36:00 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2957C41749; Sun, 24 Dec 2023 13:35:51 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WyfDZbOm1fAa; Sun, 24 Dec 2023 13:35:49 +0100 (CET) Message-ID: <43dd408f-b5dc-ebc1-8390-fb1bc5e8fb0f@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1703421349; bh=2e8mly+UtLEUucQ5TrJANorNZ/ZGnVtMyS+mHf00Ksw=; h=Date:Subject:To:References:From:In-Reply-To; b=h2rLKdDTR9tR48F0nix5gGLx1fTDE49lXk6cTgreA9edfW2FmgBRaO3TXK14ZH6FV sfoRjHuJRard/GnzINMAu5TdXcS7CNFkpTiZLCiQ2/s0wfLuS7UnydgQV2fywNHTSf xVEbiYfU1J6x5PxrDyG8jXC67Dqx+ByO14lgPZYm1rGRixfLt01YV/lVeM+dgr3dSf ZJKmDG7uA4s1zNwMhXqS0F402Iz1R3Qk17shhWouVU+aom5IOfwIEh7YMXvCcyScql kDlnzOElunwoZVj6xILqB4BOih9ARyIp1HldSKDM5qHXkUQU1c8pA9NfRDfaEE7X0S bnqFaW1QOR/Uw== Date: Sun, 24 Dec 2023 20:35:24 +0800 MIME-Version: 1.0 Content-Language: en-US References: <04b73bc96f78b83b0b945880f2689edd9ddca353.camel@gmail.com> In-Reply-To: <04b73bc96f78b83b0b945880f2689edd9ddca353.camel@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches From: Adam Faiz 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.21 X-Spam-Score: -5.21 X-Migadu-Queue-Id: 2185759014 X-Migadu-Scanner: mx11.migadu.com X-TUID: UR9RTXxiMh9+ On 12/23/23 01:05, Liliana Marie Prikler wrote: > Am Donnerstag, dem 21.12.2023 um 18:40 +0800 schrieb Adam Faiz: >> From 7e5c86c9e60ba200f14c0fd8ef8e555c0dabcbc1 Mon Sep 17 00:00:00 >> 2001 >> Message-ID: >> <7e5c86c9e60ba200f14c0fd8ef8e555c0dabcbc1.1703154486.git.adam.faiz@di >> sroot.org> >> In-Reply-To: >> References: >> From: AwesomeAdam54321 >> Date: Thu, 21 Dec 2023 18:15:41 +0800 >> Subject: [PATCH 1/3] gnu: Add inform. >> >> * gnu/packages/patches/inform-add-makefile.patch: New file. >> * gnu/local.mk (dist_patch_DATA): Register it here. >> * gnu/packages/game-development.scm (inform): New variable. >> --- >>  gnu/local.mk                                  |   1 + >>  gnu/packages/game-development.scm             |  25 ++++ >>  .../patches/inform-add-makefile.patch         | 109 >> ++++++++++++++++++ >>  3 files changed, 135 insertions(+) >>  create mode 100644 gnu/packages/patches/inform-add-makefile.patch >> >> diff --git a/gnu/local.mk b/gnu/local.mk >> index f7aec83e8a..1bc955ce1f 100644 >> --- a/gnu/local.mk >> +++ b/gnu/local.mk >> @@ -1449,6 +1449,7 @@ dist_patch_DATA >> =                                         \ >>    %D%/packages/patches/imagemagick-ReadDCMImage-fix.patch      \ >>    %D%/packages/patches/imagemagick-ReadDCMPixels-fix.patch     \ >>    %D%/packages/patches/imagemagick-WriteTHUMBNAILImage- >> fix.patch       \ >> +  %D%/packages/patches/inform-add-makefile.patch               \ >>    %D%/packages/patches/inkscape-poppler-compat.patch           \ >>    %D%/packages/patches/instead-use-games-path.patch            \ >>    %D%/packages/patches/intltool-perl-compatibility.patch       \ >> diff --git a/gnu/packages/game-development.scm b/gnu/packages/game- >> development.scm >> index a2d7c5ea63..0c467de23f 100644 >> --- a/gnu/packages/game-development.scm >> +++ b/gnu/packages/game-development.scm >> @@ -2771,6 +2771,31 @@ (define-public ioquake3 >>  people base their games, ports to new platforms, and other >> projects.") >>        (license license:gpl2)))) >>   >> +(define-public inform >> +  (package >> +    (name "inform") >> +    (version "6.41") >> +    (source >> +     (origin >> +       (method git-fetch) >> +       (uri (git-reference >> +             (url "https://jxself.org/git/inform.git") >> +             (commit (string-append "v" version)))) >> +       (file-name (git-file-name name version)) >> +       (sha256 >> +        (base32 >> "1g2misbp4lacaqa96wk0ad59ybr2dvjnhjsrz98byx4i99s2m2nr")) >> +       (patches >> +        (search-patches >> +         "inform-add-makefile.patch")))) >> +    (build-system gnu-build-system) >> +    (native-inputs (list autoconf automake)) >> +    (synopsis "The Inform 6 compiler") >> +    (description >> +     "This is an Inform 6 compiler that has been modified slightly >> to work better >> +when the Inform standard library is in a non-standard location.") >> +    (home-page "https://jxself.org/git/inform.git") >> +    (license license:gpl3+))) >> + >>  (define-public instead >>    (package >>      (name "instead") >> diff --git a/gnu/packages/patches/inform-add-makefile.patch >> b/gnu/packages/patches/inform-add-makefile.patch >> new file mode 100644 >> index 0000000000..497d40979e >> --- /dev/null >> +++ b/gnu/packages/patches/inform-add-makefile.patch >> @@ -0,0 +1,109 @@ >> +From b2332ab850dc260be8892ad5a4148b335c6b193b Mon Sep 17 00:00:00 >> 2001 >> +From: AwesomeAdam54321 >> +Date: Wed, 20 Dec 2023 22:38:41 +0800 >> +Subject: [PATCH] Implement a Makefile for Inform. >> + >> +--- >> + Makefile.am     | 17 +++++++++++++++++ >> + configure.ac    | 40 ++++++++++++++++++++++++++++++++++++++++ >> + src/Makefile.am | 17 +++++++++++++++++ >> + 3 files changed, 74 insertions(+) >> + create mode 100644 Makefile.am >> + create mode 100644 configure.ac >> + create mode 100644 src/Makefile.am >> + >> +diff --git a/Makefile.am b/Makefile.am >> +new file mode 100644 >> +index 0000000..fb99417 >> +--- /dev/null >> ++++ b/Makefile.am >> +@@ -0,0 +1,17 @@ >> ++# This file is part of Inform. >> ++# >> ++# Inform is free software: you can redistribute it and/or modify it >> ++# under the terms of the GNU General Public License as published by >> ++# theFree Software Foundation, either version 3 of the License, or >> ++#(at your option) any later version. >> ++# >> ++# Inform is distributed in the hope that it will be useful, but >> ++# WITHOUT ANY WARRANTY; without even the implied warranty of >> ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> ++# General Public License for more details. >> ++# >> ++# You should have received a copy of the GNU General Public License >> ++# along with Inform. If not, see https://gnu.org/licenses/ >> ++ >> ++AUTOMAKE_OPTIONS = foreign >> ++SUBDIRS = src >> +diff --git a/configure.ac b/configure.ac >> +new file mode 100644 >> +index 0000000..0ff8ced >> +--- /dev/null >> ++++ b/configure.ac >> +@@ -0,0 +1,40 @@ >> ++# Process this file with autoconf to produce a configure script. >> ++# >> ++# This file is part of Inform. >> ++# >> ++# Inform is free software: you can redistribute it and/or modify it >> ++# under the terms of the GNU General Public License as published by >> ++# theFree Software Foundation, either version 3 of the License, or >> ++#(at your option) any later version. >> ++# >> ++# Inform is distributed in the hope that it will be useful, but >> ++# WITHOUT ANY WARRANTY; without even the implied warranty of >> ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> ++# General Public License for more details. >> ++# >> ++# You should have received a copy of the GNU General Public License >> ++# along with Inform. If not, see https://gnu.org/licenses/ >> ++ >> ++AC_INIT([inform], [6.41], [j@jxself.org]) >> ++AM_INIT_AUTOMAKE([foreign]) >> ++AC_OUTPUT(Makefile src/Makefile) >> ++ >> ++# Checks for programs. >> ++AC_PROG_CC >> ++ >> ++# Checks for libraries. >> ++ >> ++# Checks for header files. >> ++AC_CHECK_HEADERS([limits.h stdlib.h string.h unistd.h]) >> ++ >> ++# Checks for typedefs, structures, and compiler characteristics. >> ++AC_CHECK_HEADER_STDBOOL >> ++AC_TYPE_SIZE_T >> ++ >> ++# Checks for library functions. >> ++AC_FUNC_ERROR_AT_LINE >> ++AC_FUNC_MALLOC >> ++AC_FUNC_REALLOC >> ++AC_CHECK_FUNCS([memmove memset realpath strchr strtol]) >> ++ >> ++AC_OUTPUT >> +diff --git a/src/Makefile.am b/src/Makefile.am >> +new file mode 100644 >> +index 0000000..b548944 >> +--- /dev/null >> ++++ b/src/Makefile.am >> +@@ -0,0 +1,17 @@ >> ++# This file is part of Inform. >> ++# >> ++# Inform is free software: you can redistribute it and/or modify it >> ++# under the terms of the GNU General Public License as published by >> ++# theFree Software Foundation, either version 3 of the License, or >> ++#(at your option) any later version. >> ++# >> ++# Inform is distributed in the hope that it will be useful, but >> ++# WITHOUT ANY WARRANTY; without even the implied warranty of >> ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> ++# General Public License for more details. >> ++# >> ++# You should have received a copy of the GNU General Public License >> ++# along with Inform. If not, see https://gnu.org/licenses/ >> ++ >> ++bin_PROGRAMS = inform >> ++inform_SOURCES = arrays.c asm.c bpatch.c chars.c directs.c errors.c >> expressc.c expressp.c files.c header.h inform.c lexer.c memory.c >> objects.c states.c symbols.c syntax.c tables.c text.c veneer.c >> verbs.c >> +-- >> +2.41.0 >> + > You might want to suggest this patch to upstream. If not, you can do > something similar by using copy-build-system and a build phase that > reads something along the lines of > (apply invoke (gcc-for-target) "-o" "inform" > (find-files "src" "\\.c$")) > Cheers Thanks, I already sent this patch upstream, but I haven't gotten a response yet. I'll send a V2 of this patch series using your copy-build-system with a build phase idea.