From patchwork Thu Dec 21 10:40:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 57946 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 97E4927BBEA; Thu, 21 Dec 2023 10:45:05 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3095527BBE2 for ; Thu, 21 Dec 2023 10:45:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGGVA-0006FC-Gt; Thu, 21 Dec 2023 05:42:04 -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 1rGGV4-0005uk-Rj for guix-patches@gnu.org; Thu, 21 Dec 2023 05:41:59 -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 1rGGV4-0006C2-GM for guix-patches@gnu.org; Thu, 21 Dec 2023 05:41:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rGGV8-0000ut-2s for guix-patches@gnu.org; Thu, 21 Dec 2023 05:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67950] [PATCH 1/3] gnu: Add inform. References: In-Reply-To: Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Dec 2023 10:42: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: 67950@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 67950-submit@debbugs.gnu.org id=B67950.17031552813476 (code B ref 67950); Thu, 21 Dec 2023 10:42:02 +0000 Received: (at 67950) by debbugs.gnu.org; 21 Dec 2023 10:41:21 +0000 Received: from localhost ([127.0.0.1]:42479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGGUT-0000tx-0L for submit@debbugs.gnu.org; Thu, 21 Dec 2023 05:41:21 -0500 Received: from layka.disroot.org ([178.21.23.139]:60786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGGUO-0000tk-AG for 67950@debbugs.gnu.org; Thu, 21 Dec 2023 05:41:19 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 370B041537; Thu, 21 Dec 2023 11:41:10 +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 Uf8HfKFbuOij; Thu, 21 Dec 2023 11:41:08 +0100 (CET) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1703155268; bh=LKUTaexdybagVk2ZtpN22YOMBDDktxbGtJ8CbwlBFC8=; h=Date:To:Cc:From:Subject; b=D1YMDH4oufFv89ebWH6zJjvtTdNNv8v509KxG8/43Trwjsyh3gGOgrD+GZOd/8b7p BnS9r7W5ksPEu5GihsU2ed505Q21H8Dnyhvq9iwYOopQqvu6JxdPUstZcMeqaq4Vsr wReEdlrXZjgCzuMgXo2VWcof12w4NWHeRDhuj6ZYi9k6hoRFy7hkox2AarrtOZrCXH eLGGTxUCzhU7qOAcNPRXae3XFDueA+0Ux7Q/SGlfEp5skYjYW5DrMKuqhwF5P9jDwk by8LXYGd6Nf2O1ANrV8zCOb5yAFB4ckxG+8f+qNLLXWGoQCbdxJtPdfK2gdprwfR/H jk1aN13Dap9pA== Date: Thu, 21 Dec 2023 18:40:45 +0800 MIME-Version: 1.0 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: , Reply-to: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From 7e5c86c9e60ba200f14c0fd8ef8e555c0dabcbc1 Mon Sep 17 00:00:00 2001 Message-ID: <7e5c86c9e60ba200f14c0fd8ef8e555c0dabcbc1.1703154486.git.adam.faiz@disroot.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 +