all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* bug#27161: COLOSSAL CAVE!
@ 2017-05-31 13:20 ng0
  2017-05-31 18:59 ` ng0
  0 siblings, 1 reply; 5+ messages in thread
From: ng0 @ 2017-05-31 13:20 UTC (permalink / raw)
  To: 27161


[-- Attachment #1.1: Type: text/plain, Size: 204 bytes --]

Have a piece of interactive fiction history:
This adds 'open-adventure', a port of Collosal Cave
just recently released under BSD-2 license.
-- 
ng0
OpenPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588

[-- Attachment #1.2: 0001-gnu-Add-open-adventure.patch --]
[-- Type: text/plain, Size: 4191 bytes --]

From 603186e67720056adc778bc8a623d6f39e758326 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@no-reply.pragmatique.xyz>
Date: Tue, 30 May 2017 13:56:26 +0000
Subject: [PATCH] gnu: Add open-adventure.

* gnu/packages/games.scm (open-adventure): New variable.
---
 gnu/packages/games.scm | 62 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 60d885500..40c2a335a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -17,7 +17,7 @@
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2016, 2017 Rodger Fox <thylakoid@openmailbox.org>
 ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
-;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
+;;; Copyright © 2016, 2017 ng0 <ng0@no-reply.pragmatique.xyz>
 ;;; Copyright © 2016 Albin Söderqvist <albin@fripost.org>
 ;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
@@ -66,6 +66,7 @@
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages docbook)
   #:use-module (gnu packages fltk)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages game-development)
@@ -4272,3 +4273,62 @@ at their peak of economic growth and military prowess.
                    license:lgpl3
                    license:mpl2.0
                    license:zlib))))
+
+(define-public open-adventure
+  (let* ((commit "edc11a1f04663df13baa8178af610f5c91878d8f")
+         (revision "1"))
+    (package
+      (name "open-adventure")
+      (version (string-append "2.5-" revision "." (string-take commit 7)))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.com/esr/open-adventure")
+               (commit commit)))
+         (sha256
+          (base32
+           "1grh5cak2vg3pglmbdax78h03m3d6zczddp6k29acfijvwdcawjf"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(;; https://gitlab.com/esr/open-adventure/issues/4
+         #:parallel-build? #f ;Parallel builds fail.
+         #:make-flags (list "CC=gcc")
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'configure)
+           (add-before 'build 'use-echo
+             (lambda _
+               (substitute* "tests/Makefile"
+                 (("/bin/echo")
+                  (which "echo")))))
+           (add-after 'build 'build-manpage
+             (lambda _
+               (zero? (system* "a2x" "--doctype" "manpage" "--format"
+                               "manpage" "advent.txt"))))
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               ;; There is no 'make install'.
+               (let* ((out (assoc-ref outputs "out"))
+                      (bin (string-append out "/bin"))
+                      (man (string-append out "/share/man/man6")))
+                 (install-file "advent" bin)
+                 (install-file "advent.6" man))
+               #t)))))
+      (native-inputs
+       `(("asciidoc" ,asciidoc)
+         ("docbook-xsl" ,docbook-xsl)))
+      (synopsis "Colossal Cave Adventure")
+      (description
+       "Forward-port of the Crowther/Woods Adventure 2.5 from 1995,
+last version in the main line of Colossal Cave Adventure development
+written by the original authors.  The authors have given permission
+and encouragement for this release.
+This project is called \"Open Adventure\" because it's not at all clear
+how to number Adventure past 2.5 without misleading or causing
+collisions or both.  See the history file for discussion.  The
+original 6-character name on the PDP-10 has been reverted to for the
+executable in order to avoid a collision with the BSD games port of
+the ancestral 1977 version.")
+      (home-page "https://gitlab.com/esr/open-adventure")
+      (license license:bsd-2))))
-- 
2.13.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* bug#27161: COLOSSAL CAVE!
  2017-05-31 13:20 bug#27161: COLOSSAL CAVE! ng0
@ 2017-05-31 18:59 ` ng0
  2017-06-01 10:54   ` ng0
  0 siblings, 1 reply; 5+ messages in thread
From: ng0 @ 2017-05-31 18:59 UTC (permalink / raw)
  To: 27161

ng0 transcribed 5.6K bytes:
> Have a piece of interactive fiction history:
> This adds 'open-adventure', a port of Collosal Cave
> just recently released under BSD-2 license.
> -- 
> ng0
> OpenPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588

> From 603186e67720056adc778bc8a623d6f39e758326 Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@no-reply.pragmatique.xyz>
> Date: Tue, 30 May 2017 13:56:26 +0000
> Subject: [PATCH] gnu: Add open-adventure.

I have just received feedback on the bug report, the parallel building
bug might be solved. I'm sending an updated patch soon.

> * gnu/packages/games.scm (open-adventure): New variable.
> ---
>  gnu/packages/games.scm | 62 +++++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 61 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 60d885500..40c2a335a 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -17,7 +17,7 @@
>  ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
>  ;;; Copyright © 2016, 2017 Rodger Fox <thylakoid@openmailbox.org>
>  ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
> -;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
> +;;; Copyright © 2016, 2017 ng0 <ng0@no-reply.pragmatique.xyz>
>  ;;; Copyright © 2016 Albin Söderqvist <albin@fripost.org>
>  ;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
>  ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
> @@ -66,6 +66,7 @@
>    #:use-module (gnu packages avahi)
>    #:use-module (gnu packages boost)
>    #:use-module (gnu packages documentation)
> +  #:use-module (gnu packages docbook)
>    #:use-module (gnu packages fltk)
>    #:use-module (gnu packages fribidi)
>    #:use-module (gnu packages game-development)
> @@ -4272,3 +4273,62 @@ at their peak of economic growth and military prowess.
>                     license:lgpl3
>                     license:mpl2.0
>                     license:zlib))))
> +
> +(define-public open-adventure
> +  (let* ((commit "edc11a1f04663df13baa8178af610f5c91878d8f")
> +         (revision "1"))
> +    (package
> +      (name "open-adventure")
> +      (version (string-append "2.5-" revision "." (string-take commit 7)))
> +      (source
> +       (origin
> +         (method git-fetch)
> +         (uri (git-reference
> +               (url "https://gitlab.com/esr/open-adventure")
> +               (commit commit)))
> +         (sha256
> +          (base32
> +           "1grh5cak2vg3pglmbdax78h03m3d6zczddp6k29acfijvwdcawjf"))))
> +      (build-system gnu-build-system)
> +      (arguments
> +       `(;; https://gitlab.com/esr/open-adventure/issues/4
> +         #:parallel-build? #f ;Parallel builds fail.
> +         #:make-flags (list "CC=gcc")
> +         #:phases
> +         (modify-phases %standard-phases
> +           (delete 'configure)
> +           (add-before 'build 'use-echo
> +             (lambda _
> +               (substitute* "tests/Makefile"
> +                 (("/bin/echo")
> +                  (which "echo")))))
> +           (add-after 'build 'build-manpage
> +             (lambda _
> +               (zero? (system* "a2x" "--doctype" "manpage" "--format"
> +                               "manpage" "advent.txt"))))
> +           (replace 'install
> +             (lambda* (#:key outputs #:allow-other-keys)
> +               ;; There is no 'make install'.
> +               (let* ((out (assoc-ref outputs "out"))
> +                      (bin (string-append out "/bin"))
> +                      (man (string-append out "/share/man/man6")))
> +                 (install-file "advent" bin)
> +                 (install-file "advent.6" man))
> +               #t)))))
> +      (native-inputs
> +       `(("asciidoc" ,asciidoc)
> +         ("docbook-xsl" ,docbook-xsl)))
> +      (synopsis "Colossal Cave Adventure")
> +      (description
> +       "Forward-port of the Crowther/Woods Adventure 2.5 from 1995,
> +last version in the main line of Colossal Cave Adventure development
> +written by the original authors.  The authors have given permission
> +and encouragement for this release.
> +This project is called \"Open Adventure\" because it's not at all clear
> +how to number Adventure past 2.5 without misleading or causing
> +collisions or both.  See the history file for discussion.  The
> +original 6-character name on the PDP-10 has been reverted to for the
> +executable in order to avoid a collision with the BSD games port of
> +the ancestral 1977 version.")
> +      (home-page "https://gitlab.com/esr/open-adventure")
> +      (license license:bsd-2))))
> -- 
> 2.13.0
> 




-- 
ng0
OpenPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588

^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#27161: COLOSSAL CAVE!
  2017-05-31 18:59 ` ng0
@ 2017-06-01 10:54   ` ng0
  2017-06-01 21:30     ` Ricardo Wurmus
  0 siblings, 1 reply; 5+ messages in thread
From: ng0 @ 2017-06-01 10:54 UTC (permalink / raw)
  To: 27161

[-- Attachment #1: Type: text/plain, Size: 461 bytes --]

ng0 transcribed 4.6K bytes:
> ng0 transcribed 5.6K bytes:
> > Have a piece of interactive fiction history:
> > This adds 'open-adventure', a port of Collosal Cave
> > just recently released under BSD-2 license.

> I have just received feedback on the bug report, the parallel building
> bug might be solved. I'm sending an updated patch soon.

This commit is more recent and includes the fix for bug #4.
-- 
ng0
OpenPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588

[-- Attachment #2: 0001-gnu-Add-open-adventure.patch --]
[-- Type: text/plain, Size: 4151 bytes --]

From d4d300a0568a166155ba42810a51cdc49eed286e Mon Sep 17 00:00:00 2001
From: ng0 <ng0@no-reply.pragmatique.xyz>
Date: Tue, 30 May 2017 13:56:26 +0000
Subject: [PATCH] gnu: Add open-adventure.

* gnu/packages/games.scm (open-adventure): New variable.
---
 gnu/packages/games.scm | 61 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 60d885500..ddd1ce9ca 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -17,7 +17,7 @@
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2016, 2017 Rodger Fox <thylakoid@openmailbox.org>
 ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
-;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
+;;; Copyright © 2016, 2017 ng0 <ng0@no-reply.pragmatique.xyz>
 ;;; Copyright © 2016 Albin Söderqvist <albin@fripost.org>
 ;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
@@ -66,6 +66,7 @@
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages docbook)
   #:use-module (gnu packages fltk)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages game-development)
@@ -4272,3 +4273,61 @@ at their peak of economic growth and military prowess.
                    license:lgpl3
                    license:mpl2.0
                    license:zlib))))
+
+(define-public open-adventure
+  (let* ((commit "2483a23690d205f01ecb66165cf4522b541cd991")
+         (revision "1"))
+    (package
+      (name "open-adventure")
+      (version (string-append "2.5-" revision "." (string-take commit 7)))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.com/esr/open-adventure")
+               (commit commit)))
+         (sha256
+          (base32
+           "1gkvkwbq5cl3llfc7nl41van8awn4myx782pg33bxpbx5l9scwb4"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:make-flags (list "CC=gcc")
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'configure)
+           (add-before 'build 'use-echo
+             (lambda _
+               (substitute* "tests/Makefile"
+                 (("/bin/echo")
+                  (which "echo")))))
+           (add-after 'build 'build-manpage
+             (lambda _
+               ;; The '.asc.6' target of the Makefile does not work,
+               ;; we run it manually here.
+               (zero? (system* "a2x" "--doctype" "manpage" "--format"
+                               "manpage" "advent.txt"))))
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               ;; There is no 'make install'.
+               (let* ((out (assoc-ref outputs "out"))
+                      (bin (string-append out "/bin"))
+                      (man (string-append out "/share/man/man6")))
+                 (install-file "advent" bin)
+                 (install-file "advent.6" man))
+               #t)))))
+      (native-inputs
+       `(("asciidoc" ,asciidoc)))
+      (synopsis "Colossal Cave Adventure")
+      (description
+       "Forward-port of the Crowther/Woods Adventure 2.5 from 1995,
+last version in the main line of Colossal Cave Adventure development
+written by the original authors.  The authors have given permission
+and encouragement for this release.
+This project is called \"Open Adventure\" because it's not at all clear
+how to number Adventure past 2.5 without misleading or causing
+collisions or both.  See the history file for discussion.  The
+original 6-character name on the PDP-10 has been reverted to for the
+executable in order to avoid a collision with the BSD games port of
+the ancestral 1977 version.")
+      (home-page "https://gitlab.com/esr/open-adventure")
+      (license license:bsd-2))))
-- 
2.13.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* bug#27161: COLOSSAL CAVE!
  2017-06-01 10:54   ` ng0
@ 2017-06-01 21:30     ` Ricardo Wurmus
  2017-06-01 21:41       ` ng0
  0 siblings, 1 reply; 5+ messages in thread
From: Ricardo Wurmus @ 2017-06-01 21:30 UTC (permalink / raw)
  To: ng0; +Cc: 27161-done


Hi,

ng0 <ng0@pragmatique.xyz> writes:

>> > Have a piece of interactive fiction history:
>> > This adds 'open-adventure', a port of Collosal Cave
>> > just recently released under BSD-2 license.
>
>> I have just received feedback on the bug report, the parallel building
>> bug might be solved. I'm sending an updated patch soon.
>
> This commit is more recent and includes the fix for bug #4.

This didn’t build for me:

--8<---------------cut here---------------start------------->8---
starting phase `build'
gcc     compile.c   -o compile
./compile
./compile
gcc -std=c99 -O  -c database.c
gcc -std=c99 -O  -c database.c
database.c:1465:3: error: expected expression at end of input
   18046, 17007, 17038, 17044, 19010, 19030, 19045, 150022029, 150022031, 150022034, 
   ^
make: *** [Makefile:38: database.h] Error 1
make: *** Waiting for unfinished jobs....
phase `build' failed after 0.9 seconds
--8<---------------cut here---------------end--------------->8---

I had to disable parallel builds.  I made a couple of changes and pushed
it with commit dec63df4f.

Thanks!

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#27161: COLOSSAL CAVE!
  2017-06-01 21:30     ` Ricardo Wurmus
@ 2017-06-01 21:41       ` ng0
  0 siblings, 0 replies; 5+ messages in thread
From: ng0 @ 2017-06-01 21:41 UTC (permalink / raw)
  To: Ricardo Wurmus; +Cc: 27161-done

[-- Attachment #1: Type: text/plain, Size: 1581 bytes --]

Ricardo Wurmus transcribed 1.1K bytes:
> 
> Hi,
> 
> ng0 <ng0@pragmatique.xyz> writes:
> 
> >> > Have a piece of interactive fiction history:
> >> > This adds 'open-adventure', a port of Collosal Cave
> >> > just recently released under BSD-2 license.
> >
> >> I have just received feedback on the bug report, the parallel building
> >> bug might be solved. I'm sending an updated patch soon.
> >
> > This commit is more recent and includes the fix for bug #4.
> 
> This didn’t build for me:
> 
> --8<---------------cut here---------------start------------->8---
> starting phase `build'
> gcc     compile.c   -o compile
> ./compile
> ./compile
> gcc -std=c99 -O  -c database.c
> gcc -std=c99 -O  -c database.c
> database.c:1465:3: error: expected expression at end of input
>    18046, 17007, 17038, 17044, 19010, 19030, 19045, 150022029, 150022031, 150022034, 
>    ^
> make: *** [Makefile:38: database.h] Error 1
> make: *** Waiting for unfinished jobs....
> phase `build' failed after 0.9 seconds
> --8<---------------cut here---------------end--------------->8---
> 
> I had to disable parallel builds.  I made a couple of changes and pushed
> it with commit dec63df4f.

Strange... For me it worked. So maybe bug number 4 upstream isn't fixed yet.
Builds here happen with 8+ processes in parallel I think
and with 6 or more the bug was visible.

> Thanks!
> 
> -- 
> Ricardo
> 
> GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
> https://elephly.net
> 
> 

-- 
ng0
OpenPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-06-01 21:42 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-31 13:20 bug#27161: COLOSSAL CAVE! ng0
2017-05-31 18:59 ` ng0
2017-06-01 10:54   ` ng0
2017-06-01 21:30     ` Ricardo Wurmus
2017-06-01 21:41       ` ng0

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.