[PATCH 1/2] gnu: openttd-opensfx: Update to 1.0.1.

DoneSubmitted by Ron Nazarov.
Details
2 participants
  • Leo Prikler
  • Ron Nazarov
Owner
unassigned
Severity
normal
R
R
Ron Nazarov wrote on 30 Jul 2021 02:48
(address . guix-patches@gnu.org)(name . Ron Nazarov)(address . noisytoot@disroot.org)
20210730004837.21567-1-noisytoot@disroot.org
* gnu/packages/games.scm (openttd-opensfx): Update to 1.0.1.
[license]: Update license to cc-by-sa3.0.
---
gnu/packages/games.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (32 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8c6b5523f1..88293df306 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -62,6 +62,7 @@
 ;;; Copyright © 2021 David Pflug <david@pflug.io>
 ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
 ;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
+;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4423,7 +4424,7 @@ OpenGFX provides you with...
 (define openttd-opensfx
   (package
     (name "openttd-opensfx")
-    (version "0.2.3")
+    (version "1.0.1")
     (source
      (origin
        (method url-fetch)
@@ -4456,7 +4457,7 @@ OpenGFX provides you with...
     (description "OpenSFX is a set of free base sounds for OpenTTD which make
 it possible to play OpenTTD without requiring the proprietary sound files from
 the original Transport Tycoon Deluxe.")
-    (license license:cc-sampling-plus-1.0)))
+    (license license:cc-by-sa3.0)))
 
 (define openttd-openmsx
   (package
-- 
2.32.0
R
R
Ron Nazarov wrote on 30 Jul 2021 02:49
[PATCH 2/2] licenses: Remove CC-Sampling+-1.0.
(address . 49778@debbugs.gnu.org)(name . Ron Nazarov)(address . noisytoot@disroot.org)
20210730004941.22090-1-noisytoot@disroot.org
* guix/licenses.scm (cc-sampling-plus-1.0): Remove variable.
---
guix/licenses.scm | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

Toggle diff (26 lines)
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 3affe1e920..388023e619 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -18,6 +18,7 @@
 ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com>
 ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
+;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -234,11 +235,6 @@ at URI, which may be a file:// URI pointing the package's tree."
            "http://creativecommons.org/licenses/by/2.0/"
            "Creative Commons Attribution 2.0 Generic"))
 
-(define cc-sampling-plus-1.0
-  (license "CC-Sampling+ 1.0"
-           "https://creativecommons.org/licenses/sampling+/1.0"
-           "Creative Commons Sampling Plus 1.0"))
-
 (define cddl1.0
   (license "CDDL 1.0"
            "http://directory.fsf.org/wiki/License:CDDLv1.0"
-- 
2.32.0
R
R
Ron Nazarov wrote on 30 Jul 2021 02:52
(address . 49778@debbugs.gnu.org)
2407626951f07a9acf357048a69082bda1789c25.camel@disroot.org
Reasons for removing CC-Sampling+-1.0:
1. It is nonfree
2. I updated the only package that used it (openttd-opensfx) to a
version that uses CC-BY-SA 3.0 instead (they switched license)
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEYcUo9h8s+tqVJqRbHUPvT0SSJosFAmEDTWEACgkQHUPvT0SS
JoteORAAr5qsFb49d3MEKBOw0QeKo033TQqZXyBIlQBSsgwqPRol0s43IApe0GVL
ntG9H8ZcvDOTjBmqhyOuvnN4221kd2xjsZzK/ObmXzOJmWW3BXGhEQwblKb5Mqh6
Y/NPDa+zz1cDJi6oVxKWANaBa91X3fNQkZL3T8cefHGeE3fCq32fkOJayY8uKAD6
3sU4Cc8iOe2lopf7qY+8xeTtUJsr7o+3gFqiuO0rC1gicYKq0TGUcRSz83XeiZKY
hcba8Ma9JAU5mdG91vIMY5tiogJvOCYbLKf/4+l7nxvXbr4mV/wImvaNzXQ8EEOi
kM0aU8BpQjY/dEfNSwOje+tnFaD8j1ax4tfxbKDUtATnxEocZUKmZCWcv6NvOMfD
9EjxfTQl5nViwrOTS5ARBo2PxEV+VIY9uGCGes9u66U6DMQj7f2SMTsDy7HiT9A/
5oa521qc8nCC9/h3FB1vKLbf38C0yi8H8L22GejpgO9NqgFDevNpxAL6AgmYD/We
Lr/EV5stn3qfHLd267w2itOi7aym+eHZuE/7f74LYrNIOl+owth2HY7oMPBqkB57
GF/Y/h9EitCebwjDbXTziu0cBkFWAFRSJXs7pfHG5E5JxUGUPAR+VaNABKTVI1ms
v637ZG9sfRDHBBtmnJWRrECPwvgB+Aezva82YOJzNvZPV63J5QA=
=AZYB
-----END PGP SIGNATURE-----


L
L
Leo Prikler wrote on 30 Jul 2021 11:50
Re: [bug#49778] [PATCH 1/2] gnu: openttd-opensfx: Update to 1.0.1.
ba765132744cdd65041bfe154d07613e47eb1337.camel@student.tugraz.at
Toggle quote (4 lines)
> Reasons for removing CC-Sampling+-1.0:
> 1. It is nonfree
> 2. I updated the only package that used it (openttd-opensfx) to a
> version that uses CC-BY-SA 3.0 instead (they switched license)
I've pushed both your patches and also updated OpenGFX. There appears
to be a bug in the music player, so I didn't update OpenMSX yet.

Thanks
Closed
?
Your comment

This issue is archived.

To comment on this conversation send email to 49778@debbugs.gnu.org