unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#30693] Xonotic
@ 2018-03-03 23:34 ng0
  2018-03-07 13:00 ` Ludovic Courtès
  2018-05-25 14:41 ` Rutger Helling
  0 siblings, 2 replies; 13+ messages in thread
From: ng0 @ 2018-03-03 23:34 UTC (permalink / raw)
  To: 30693


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

This adds xonotic. I'm not sure about the "x11" license part.
In general it works.

-- 
A88C8ADD129828D7EAC02E52E22F9BBFEE348588
https://n0.is/~ng0

[-- Attachment #1.2: 0001-gnu-Add-xonotic.patch --]
[-- Type: text/plain, Size: 11991 bytes --]

From 8b3cbb663b9c59ceec99cdef9c16e13edeae86aa Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Sat, 3 Mar 2018 23:27:13 +0000
Subject: [PATCH] gnu: Add xonotic.

* gnu/packages/games.scm (xonotic, xonotic-data): New variables.
---
 gnu/packages/games.scm | 242 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 242 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 5917bbd69..992bae83a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -90,6 +90,7 @@
   #:use-module (gnu packages haskell)
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages music)
+  #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
   #:use-module (gnu packages ncurses)
@@ -4846,3 +4847,244 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.")
                    (license:non-copyleft ; modified dumb
                     "file://dumb/licence.txt"
                     "Dumb license, explicitly GPL compatible.")))))
+
+(define xonotic-data
+  (package
+    (name "xonotic-data")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://dl.xonotic.org/xonotic-"
+                           version ".zip"))
+       (file-name (string-append name "-" version ".zip"))
+       (sha256
+        (base32
+         "1mcs6l4clvn7ibfq3q69k2p0z6ww75rxvnngamdq5ic6yhq74bx2"))))
+    (build-system trivial-build-system)
+    (native-inputs
+     `(("unzip" ,unzip)))
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+         (let* ((out (assoc-ref %outputs "out"))
+                (xonotic (string-append out "/share/xonotic"))
+                (source (assoc-ref %build-inputs "source"))
+                (unzip (string-append (assoc-ref %build-inputs "unzip") "/bin/unzip")))
+           (copy-file source (string-append ,name "-" ,version ".zip"))
+           (zero? (system* unzip (string-append ,name "-" ,version ".zip")))
+           (mkdir-p out)
+           (mkdir-p xonotic)
+           (chdir "Xonotic")
+           (copy-recursively "data"
+                             (string-append xonotic "/data"))
+           (copy-recursively "server"
+                             (string-append xonotic "/server"))
+           (install-file "key_0.d0pk" xonotic)))))
+    (home-page "http://xonotic.org")
+    (synopsis "Data files for Xonotic")
+    (description
+     "Xonotic-data provides the data files required by the game Xonotic.")
+    (license (list license:gpl2+
+                   license:x11)))) ; server/rcon.pl
+
+(define-public xonotic
+  (package
+    (name "xonotic")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://dl.xonotic.org/xonotic-"
+                           version "-source.zip"))
+       (file-name (string-append name "-" version ".zip"))
+       (sha256
+        (base32
+         "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags (list (string-append "--prefix="
+                                              (assoc-ref %outputs "out"))
+                               "--disable-rijndael")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'make-darkplaces
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (sharedir (string-append out "/share/xonotic/")))
+               (invoke "make" "-C" "source/darkplaces"
+                       (string-append "DP_FS_BASEDIR="
+                                      sharedir)
+                       "DP_LINK_TO_LIBJPEG=1"
+                       "DP_SOUND_API=ALSA"
+                       "CC=gcc"
+                       "-f" "makefile"
+                       "cl-release")
+               (invoke "make" "-C" "source/darkplaces"
+                       (string-append "DP_FS_BASEDIR="
+                                      sharedir)
+                       "DP_LINK_TO_LIBJPEG=1"
+                       "DP_SOUND_API=ALSA"
+                       "CC=gcc"
+                       "-f" "makefile"
+                       "sdl-release")
+               (invoke "make" "-C" "source/darkplaces"
+                       (string-append "DP_FS_BASEDIR="
+                                      sharedir)
+                       "DP_LINK_TO_LIBJPEG=1"
+                       "DP_SOUND_API=ALSA"
+                       "CC=gcc"
+                       "-f" "makefile"
+                       "sv-release"))))
+         (add-before 'configure 'bootstrap
+           (lambda _
+             (chdir "source/d0_blind_id")
+             (invoke "sh" "autogen.sh")))
+         (add-after 'build 'install-desktop-entry
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Add .desktop files for the 2 variants and the symlink
+             (let* ((output (assoc-ref outputs "out"))
+                    (apps (string-append output "/share/applications")))
+               (mkdir-p apps)
+               (with-output-to-file
+                   (string-append apps "/xonotic-glx.desktop")
+                 (lambda _
+                   (format #t
+                           "[Desktop Entry]~@
+                     Name=xonotic-glx~@
+                     Comment=Xonotic glx~@
+                     Exec=~a/bin/xonotic-glx~@
+                     TryExec=~@*~a/bin/xonotic-glx~@
+                     Icon=~@
+                     Type=Application~%"
+                           output)))
+               (with-output-to-file
+                   (string-append apps "/xonotic-sdl.desktop")
+                 (lambda _
+                   (format #t
+                           "[Desktop Entry]~@
+                     Name=xonotic-sdl~@
+                     Comment=Xonotic sdl~@
+                     Exec=~a/bin/xonotic-sdl~@
+                     TryExec=~@*~a/bin/xonotic-sdl~@
+                     Icon=~@
+                     Type=Application~%"
+                           output)))
+               (with-output-to-file
+                   (string-append apps "/xonotic.desktop")
+                 (lambda _
+                   (format #t
+                           "[Desktop Entry]~@
+                     Name=xonotic~@
+                     Comment=Xonotic~@
+                     Exec=~a/bin/xonotic-glx~@
+                     TryExec=~@*~a/bin/xonotic~@
+                     Icon=~@
+                     Type=Application~%"
+                           output)))
+               #t)))
+         (add-after 'install-desktop-entry 'install-icons
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (with-directory-excursion "../../misc/logos/icons_png/"
+                 (for-each
+                  (lambda (file)
+                    (let* ((size (string-filter char-numeric? file))
+                           (icons (string-append out "/share/icons/hicolor/"
+                                                 size "x" size "/apps")))
+                      (mkdir-p icons)
+                      (copy-file file (string-append icons "/xonotic.png"))))
+                  '("xonotic_16.png" "xonotic_22.png" "xonotic_24.png"
+                    "xonotic_32.png" "xonotic_48.png" "xonotic_64.png"
+                    "xonotic_128.png" "xonotic_256.png" "xonotic_512.png"))))))
+         (add-after 'install-icons 'install-binaries
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (define (install src dst)
+                 (let ((dst (string-append out dst)))
+                   (mkdir-p (dirname dst))
+                   (copy-file src dst)))
+               (mkdir-p (string-append out "/bin"))
+               (install "../darkplaces/darkplaces-dedicated"
+                        "/bin/xonotic-dedicated")
+               (install "../darkplaces/darkplaces-glx"
+                        "/bin/xonotic-glx")
+               (install "../darkplaces/darkplaces-sdl"
+                        "/bin/xonotic-sdl")
+               ;; Provide a default xonotic executable, defaulting to SDL.
+               (symlink (string-append out "/bin/xonotic-sdl")
+                        (string-append out "/bin/xonotic"))
+               #t)))
+         (add-after 'install-binaries 'install-data
+           (lambda* (#:key outputs inputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (data (assoc-ref inputs "xonotic-data")))
+               (copy-recursively (string-append data "/share/xonotic")
+                                 (string-append out "/share/xonotic"))
+               #t)))
+         (add-after 'install-binaries 'wrap-binaries
+           (lambda* (#:key outputs inputs #:allow-other-keys)
+             ;; Curl and libvorbis need to be wrapped so that we get
+             ;; sound and networking.
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin/xonotic"))
+                    (bin-sdl (string-append out "/bin/xonotic-sdl"))
+                    (bin-glx (string-append out "/bin/xonotic-glx"))
+                    (bin-dedicated (string-append out "/bin/xonotic-dedicated"))
+                    (curl (assoc-ref inputs "curl"))
+                    (vorbis (assoc-ref inputs "libvorbis")))
+               (wrap-program bin
+                 `("LD_LIBRARY_PATH" ":" prefix
+                   (,(string-append curl "/lib:" vorbis "/lib"))))
+               (wrap-program bin-sdl
+                 `("LD_LIBRARY_PATH" ":" prefix
+                   (,(string-append curl "/lib:" vorbis "/lib"))))
+               (wrap-program bin-glx
+                 `("LD_LIBRARY_PATH" ":" prefix
+                   (,(string-append curl "/lib:" vorbis "/lib"))))
+               (wrap-program bin-dedicated
+                 `("LD_LIBRARY_PATH" ":" prefix
+                   (,(string-append curl "/lib:" vorbis "/lib"))))
+               #t))))))
+    (inputs
+     `(("xonotic-data" ,xonotic-data)
+       ("alsa-lib" ,alsa-lib)
+       ("curl" ,curl)
+       ("libjpeg" ,libjpeg)
+       ("libmodplug" ,libmodplug)
+       ("libvorbis" ,libvorbis)
+       ("libogg" ,libogg)
+       ("libxpm" ,libxpm)
+       ("libxxf86dga" ,libxxf86dga)
+       ("libxxf86vm" ,libxxf86vm)
+       ("libx11" ,libx11)
+       ("libxext" ,libxext)
+       ("libxau" ,libxau)
+       ("libxdmcp" ,libxdmcp)
+       ("mesa" ,mesa)
+       ("glu" ,glu)
+       ("freetype" ,freetype)
+       ("sdl2" ,sdl2)
+       ("libpng" ,libpng)
+       ("hicolor-icon-theme" ,hicolor-icon-theme)))
+    (native-inputs
+     `(("unzip" ,unzip)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("pkg-config" ,pkg-config)
+       ("libtool" ,libtool)
+       ("gmp" ,gmp)))
+    (home-page "http://xonotic.org")
+    (synopsis "Fast-paced first-person shooter game")
+    (description
+     "Xonotic is a free, fast-paced first-person shooter.
+The project is geared towards providing addictive arena shooter
+gameplay which is all spawned and driven by the community itself.
+Xonotic is a direct successor of the Nexuiz project with years of
+development between them, and it aims to become the best possible
+open-source FPS of its kind.")
+    (license (list license:gpl2+
+                   license:bsd-3 ; /source/d0_blind_id folder and others
+                   license:x11))))
-- 
2.16.2


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

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

* [bug#30693] Xonotic
  2018-03-03 23:34 [bug#30693] Xonotic ng0
@ 2018-03-07 13:00 ` Ludovic Courtès
  2018-03-07 13:19   ` ng0
  2018-05-25 14:41 ` Rutger Helling
  1 sibling, 1 reply; 13+ messages in thread
From: Ludovic Courtès @ 2018-03-07 13:00 UTC (permalink / raw)
  To: ng0; +Cc: 30693

Hi ng0,

ng0 <ng0@n0.is> skribis:

> This adds xonotic. I'm not sure about the "x11" license part.

Rather than hope that Someone™ will check the license, could you take a
look and let us know?  :-)

Definitions in (guix licenses) contain URLs to the full license texts,
if in doubt.

TIA,
Ludo’.

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

* [bug#30693] Xonotic
  2018-03-07 13:00 ` Ludovic Courtès
@ 2018-03-07 13:19   ` ng0
  2018-03-07 15:28     ` Ludovic Courtès
  0 siblings, 1 reply; 13+ messages in thread
From: ng0 @ 2018-03-07 13:19 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: ng0, 30693

Ludovic Courtès transcribed 316 bytes:
> Hi ng0,
> 
> ng0 <ng0@n0.is> skribis:
> 
> > This adds xonotic. I'm not sure about the "x11" license part.
> 
> Rather than hope that Someone™ will check the license, could you take a
> look and let us know?  :-)
> 
> Definitions in (guix licenses) contain URLs to the full license texts,
> if in doubt.
> 
> TIA,
> Ludo’.

I just compared "server/rcon.pl" to the text of X11 license
and all that's missing is:


Except as contained in this notice, the name of the X Consortium shall
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from the X Consortium.

X Window System is a trademark of X Consortium, Inc.



So I'd say this is x11-style and not x11, is this correct?



According to "COPYING", I also need to add gpl3 to the gpl2.
They state that all contributions are gpl2+, do I have to state
gpl3 then?

I (or: the tool I used) missed some licenses, so I'll have to
send a new version of the patches.
-- 
A88C8ADD129828D7EAC02E52E22F9BBFEE348588
https://n0.is/~ng0

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

* [bug#30693] Xonotic
  2018-03-07 13:19   ` ng0
@ 2018-03-07 15:28     ` Ludovic Courtès
  0 siblings, 0 replies; 13+ messages in thread
From: Ludovic Courtès @ 2018-03-07 15:28 UTC (permalink / raw)
  To: ng0; +Cc: 30693

ng0 <ng0@n0.is> skribis:

> Ludovic Courtès transcribed 316 bytes:
>> Hi ng0,
>> 
>> ng0 <ng0@n0.is> skribis:
>> 
>> > This adds xonotic. I'm not sure about the "x11" license part.
>> 
>> Rather than hope that Someone™ will check the license, could you take a
>> look and let us know?  :-)
>> 
>> Definitions in (guix licenses) contain URLs to the full license texts,
>> if in doubt.
>> 
>> TIA,
>> Ludo’.
>
> I just compared "server/rcon.pl" to the text of X11 license
> and all that's missing is:
>
>
> Except as contained in this notice, the name of the X Consortium shall
> not be used in advertising or otherwise to promote the sale, use or
> other dealings in this Software without prior written authorization
> from the X Consortium.
>
> X Window System is a trademark of X Consortium, Inc.

Did you compare with <http://directory.fsf.org/wiki/License:Expat> as
well?

> So I'd say this is x11-style and not x11, is this correct?

If it’s neither X11 nor Expat, ‘x11-style’ looks like the right choice,
yes.

> According to "COPYING", I also need to add gpl3 to the gpl2.
> They state that all contributions are gpl2+, do I have to state
> gpl3 then?

Please check source file headers.  Do they say “GPL version 2 or any
later version”, do they say “GPL version 2”, etc.?

Thanks,
Ludo’.

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

* [bug#30693] Xonotic
  2018-03-03 23:34 [bug#30693] Xonotic ng0
  2018-03-07 13:00 ` Ludovic Courtès
@ 2018-05-25 14:41 ` Rutger Helling
  2018-05-25 16:52   ` Nils Gillmann
  2018-05-26 22:22   ` Ludovic Courtès
  1 sibling, 2 replies; 13+ messages in thread
From: Rutger Helling @ 2018-05-25 14:41 UTC (permalink / raw)
  To: ludo, ng0, 30693

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

This patch has been open for quite a while! Which is a shame because it
works well.

The license talked about seems to be GPL2+, see this commit:

https://github.com/xonotic/xonotic/commit/12105b36a21e7472f72933b6dd409465b5133396

They recently changed it to GPL3+, but this current release in the
patch is still GPL2+.

Is it alright if I make those changes in the licenses and push?

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

* [bug#30693] Xonotic
  2018-05-25 14:41 ` Rutger Helling
@ 2018-05-25 16:52   ` Nils Gillmann
  2018-05-26 16:25     ` bug#30693: Xonotic Rutger Helling
  2018-05-26 22:22   ` Ludovic Courtès
  1 sibling, 1 reply; 13+ messages in thread
From: Nils Gillmann @ 2018-05-25 16:52 UTC (permalink / raw)
  To: Rutger Helling; +Cc: ng0, 30693

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

Rutger Helling transcribed 1.1K bytes:
> This patch has been open for quite a while! Which is a shame because it
> works well.
> 
> The license talked about seems to be GPL2+, see this commit:
> 
> https://github.com/xonotic/xonotic/commit/12105b36a21e7472f72933b6dd409465b5133396
> 
> They recently changed it to GPL3+, but this current release in the
> patch is still GPL2+.
> 
> Is it alright if I make those changes in the licenses and push?

The software would still be GPL2+. Only when we use the new one
it will be GPL3+.

As long as you keep my copyright and add yours its fine for me
(I worked some time to get this working).

Offtopic:
Did you open a new issue number to reference the old number?
I was able to see threading in notmuch but not in my actual
email client.

Ontopic:
I continued working on this in a version which only applies to
my work. A friend reported to me that there are issues with
one or two of the 3 possible runtime modes which should be
fixed.

Offtopic:
I've had some patches open waiting for months (after 3 months
I stopped counting), so for now I only submit what's necessary
and still (freshly) applies.
FYI, the vim-build-system is working just fine and
I'm integrating it in my part of the software already. It just
seems like we have no people at all interested (or with time
on their hands) to review Vim related code.
This is no critique on work done by mostly volunteers, but we
could do better. It's not criticism because I have no constructive
ideas how it could be managed better.

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

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

* bug#30693: Xonotic
  2018-05-25 16:52   ` Nils Gillmann
@ 2018-05-26 16:25     ` Rutger Helling
  2018-05-26 18:43       ` [bug#30693] Xonotic Charlie Ritter
  0 siblings, 1 reply; 13+ messages in thread
From: Rutger Helling @ 2018-05-26 16:25 UTC (permalink / raw)
  To: Nils Gillmann; +Cc: 30693-done

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

I pushed the patch with two minor changes (licenses, invoke instead of
system for xonotic-data). Thanks again!

I didn't open a new bug, no.

I agree it's a shame about patches sometimes being in limbo for so
long. I don't see a solution other than to try to get more people
involved in Guix.

On Fri, 25 May 2018 16:52:54 +0000
Nils Gillmann <ng0@n0.is> wrote:

> Rutger Helling transcribed 1.1K bytes:
> > This patch has been open for quite a while! Which is a shame
> > because it works well.
> > 
> > The license talked about seems to be GPL2+, see this commit:
> > 
> > https://github.com/xonotic/xonotic/commit/12105b36a21e7472f72933b6dd409465b5133396
> > 
> > They recently changed it to GPL3+, but this current release in the
> > patch is still GPL2+.
> > 
> > Is it alright if I make those changes in the licenses and push?  
> 
> The software would still be GPL2+. Only when we use the new one
> it will be GPL3+.
> 
> As long as you keep my copyright and add yours its fine for me
> (I worked some time to get this working).
> 
> Offtopic:
> Did you open a new issue number to reference the old number?
> I was able to see threading in notmuch but not in my actual
> email client.
> 
> Ontopic:
> I continued working on this in a version which only applies to
> my work. A friend reported to me that there are issues with
> one or two of the 3 possible runtime modes which should be
> fixed.
> 
> Offtopic:
> I've had some patches open waiting for months (after 3 months
> I stopped counting), so for now I only submit what's necessary
> and still (freshly) applies.
> FYI, the vim-build-system is working just fine and
> I'm integrating it in my part of the software already. It just
> seems like we have no people at all interested (or with time
> on their hands) to review Vim related code.
> This is no critique on work done by mostly volunteers, but we
> could do better. It's not criticism because I have no constructive
> ideas how it could be managed better.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

* [bug#30693] Xonotic
  2018-05-26 16:25     ` bug#30693: Xonotic Rutger Helling
@ 2018-05-26 18:43       ` Charlie Ritter
  0 siblings, 0 replies; 13+ messages in thread
From: Charlie Ritter @ 2018-05-26 18:43 UTC (permalink / raw)
  To: Rutger Helling; +Cc: Nils Gillmann, 30693-done


Rutger Helling writes:

> I pushed the patch with two minor changes (licenses, invoke instead of
> system for xonotic-data). Thanks again!
>
> I didn't open a new bug, no.
>
> I agree it's a shame about patches sometimes being in limbo for so
> long. I don't see a solution other than to try to get more people
> involved in Guix.
>
> On Fri, 25 May 2018 16:52:54 +0000
> Nils Gillmann <ng0@n0.is> wrote:
>
>> Rutger Helling transcribed 1.1K bytes:
>> > This patch has been open for quite a while! Which is a shame
>> > because it works well.
>> >
>> > The license talked about seems to be GPL2+, see this commit:
>> >
>> > https://github.com/xonotic/xonotic/commit/12105b36a21e7472f72933b6dd409465b5133396
>> >
>> > They recently changed it to GPL3+, but this current release in the
>> > patch is still GPL2+.
>> >
>> > Is it alright if I make those changes in the licenses and push?
>>
>> The software would still be GPL2+. Only when we use the new one
>> it will be GPL3+.
>>
>> As long as you keep my copyright and add yours its fine for me
>> (I worked some time to get this working).
>>
>> Offtopic:
>> Did you open a new issue number to reference the old number?
>> I was able to see threading in notmuch but not in my actual
>> email client.
>>
>> Ontopic:
>> I continued working on this in a version which only applies to
>> my work. A friend reported to me that there are issues with
>> one or two of the 3 possible runtime modes which should be
>> fixed.
>>
>> Offtopic:
>> I've had some patches open waiting for months (after 3 months
>> I stopped counting), so for now I only submit what's necessary
>> and still (freshly) applies.
>> FYI, the vim-build-system is working just fine and
>> I'm integrating it in my part of the software already. It just
>> seems like we have no people at all interested (or with time
>> on their hands) to review Vim related code.
>> This is no critique on work done by mostly volunteers, but we
>> could do better. It's not criticism because I have no constructive
>> ideas how it could be managed better.

Yay!  Good work!

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

* [bug#30693] Xonotic
  2018-05-25 14:41 ` Rutger Helling
  2018-05-25 16:52   ` Nils Gillmann
@ 2018-05-26 22:22   ` Ludovic Courtès
  2018-05-26 23:21     ` Nils Gillmann
  1 sibling, 1 reply; 13+ messages in thread
From: Ludovic Courtès @ 2018-05-26 22:22 UTC (permalink / raw)
  To: Rutger Helling; +Cc: ng0, 30693

Hello Rutger & Nils,

Thanks for taking care of this!

One minor issue: ‘x11-style’ is a procedure, not a <license> object,
hence:

  $ ./pre-inst-env guix lint xonotic
  gnu/packages/games.scm:5153:13: xonotic@0.8.2: invalid license field

‘x11-style’ takes a URI as an argument.  I’d fix it myself but I’m not
sure what needs to go there.  Could you take a look?  Perhaps ng0 knows
why ‘x11-style’ is listed?

Thanks in advance,
Ludo’.

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

* [bug#30693] Xonotic
  2018-05-26 22:22   ` Ludovic Courtès
@ 2018-05-26 23:21     ` Nils Gillmann
  2018-05-27  8:31       ` Rutger Helling
  2018-05-27 13:06       ` Ludovic Courtès
  0 siblings, 2 replies; 13+ messages in thread
From: Nils Gillmann @ 2018-05-26 23:21 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: ng0, Rutger Helling, 30693

Ludovic Courtès transcribed 514 bytes:
> Hello Rutger & Nils,
> 
> Thanks for taking care of this!
> 
> One minor issue: ‘x11-style’ is a procedure, not a <license> object,
> hence:
> 
>   $ ./pre-inst-env guix lint xonotic
>   gnu/packages/games.scm:5153:13: xonotic@0.8.2: invalid license field
> 
> ‘x11-style’ takes a URI as an argument.  I’d fix it myself but I’m not
> sure what needs to go there.  Could you take a look?  Perhaps ng0 knows
> why ‘x11-style’ is listed?
> 
> Thanks in advance,
> Ludo’.

Sorry, no idea. My original patch has x11 instead of x11-style.
As I already wrote, from my perspective this was far from ready for merge,
but basic functionality is there (it works in one mode) and it passed
one review.
I think I changed some bits after moving it out of gnu/packages, but I
haven't read the package definition in a while.

Definitely wasn't me who put x11 instead of x11-style there.

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

* [bug#30693] Xonotic
  2018-05-26 23:21     ` Nils Gillmann
@ 2018-05-27  8:31       ` Rutger Helling
  2018-05-27 13:04         ` Ludovic Courtès
  2018-05-27 13:06       ` Ludovic Courtès
  1 sibling, 1 reply; 13+ messages in thread
From: Rutger Helling @ 2018-05-27  8:31 UTC (permalink / raw)
  To: Nils Gillmann; +Cc: 30693

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

Sorry about that! I changed it to x11-style, but didn't add any URIs.
I've fixed the licenses to refer to the correct file (rcon.pl).

On Sat, 26 May 2018 23:21:24 +0000
Nils Gillmann <ng0@n0.is> wrote:

> Ludovic Courtès transcribed 514 bytes:
> > Hello Rutger & Nils,
> > 
> > Thanks for taking care of this!
> > 
> > One minor issue: ‘x11-style’ is a procedure, not a <license> object,
> > hence:
> > 
> >   $ ./pre-inst-env guix lint xonotic
> >   gnu/packages/games.scm:5153:13: xonotic@0.8.2: invalid license
> > field
> > 
> > ‘x11-style’ takes a URI as an argument.  I’d fix it myself but I’m
> > not sure what needs to go there.  Could you take a look?  Perhaps
> > ng0 knows why ‘x11-style’ is listed?
> > 
> > Thanks in advance,
> > Ludo’.  
> 
> Sorry, no idea. My original patch has x11 instead of x11-style.
> As I already wrote, from my perspective this was far from ready for
> merge, but basic functionality is there (it works in one mode) and it
> passed one review.
> I think I changed some bits after moving it out of gnu/packages, but I
> haven't read the package definition in a while.
> 
> Definitely wasn't me who put x11 instead of x11-style there.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

* [bug#30693] Xonotic
  2018-05-27  8:31       ` Rutger Helling
@ 2018-05-27 13:04         ` Ludovic Courtès
  0 siblings, 0 replies; 13+ messages in thread
From: Ludovic Courtès @ 2018-05-27 13:04 UTC (permalink / raw)
  To: Rutger Helling; +Cc: Nils Gillmann, 30693

Hi!

Rutger Helling <rhelling@mykolab.com> skribis:

> Sorry about that! I changed it to x11-style, but didn't add any URIs.
> I've fixed the licenses to refer to the correct file (rcon.pl).

Alright, thanks for the quick fix!

Ludo’.

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

* [bug#30693] Xonotic
  2018-05-26 23:21     ` Nils Gillmann
  2018-05-27  8:31       ` Rutger Helling
@ 2018-05-27 13:06       ` Ludovic Courtès
  1 sibling, 0 replies; 13+ messages in thread
From: Ludovic Courtès @ 2018-05-27 13:06 UTC (permalink / raw)
  To: Nils Gillmann; +Cc: Rutger Helling, 30693

Hi!

Nils Gillmann <ng0@n0.is> skribis:

> Definitely wasn't me who put x11 instead of x11-style there.

Just to be clear: I wasn’t looking for someone to blame (why blame
people who do the work?!), but rather for a solution.  :-)

Ludo’.

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

end of thread, other threads:[~2018-05-27 13:07 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-03 23:34 [bug#30693] Xonotic ng0
2018-03-07 13:00 ` Ludovic Courtès
2018-03-07 13:19   ` ng0
2018-03-07 15:28     ` Ludovic Courtès
2018-05-25 14:41 ` Rutger Helling
2018-05-25 16:52   ` Nils Gillmann
2018-05-26 16:25     ` bug#30693: Xonotic Rutger Helling
2018-05-26 18:43       ` [bug#30693] Xonotic Charlie Ritter
2018-05-26 22:22   ` Ludovic Courtès
2018-05-26 23:21     ` Nils Gillmann
2018-05-27  8:31       ` Rutger Helling
2018-05-27 13:04         ` Ludovic Courtès
2018-05-27 13:06       ` Ludovic Courtès

Code repositories for project(s) associated with this public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).