[PATCH] gnu: flightgear: Update to 2020.3.2

  • Done
  • quality assurance status badge
Details
4 participants
  • Barnabas Beres
  • Efraim Flashner
  • Tobias Geerinckx-Rice
  • phodina
Owner
unassigned
Submitted by
Barnabas Beres
Severity
normal
B
B
Barnabas Beres wrote on 11 Nov 2020 12:28
(address . guix-patches@gnu.org)(name . Barnabas Beres)(address . beresbarnus03@gmail.com)
20201111112857.5360-1-beresbarnus03@gmail.com
* gnu/packages/games.scm (simgear): Update to 2020.3.2
* gnu/packages/games.scm (flightgear): Update to 2020.3.2

---
gnu/packages/games.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index b94c5e32f3..2133d66a03 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -8801,7 +8801,7 @@ levels to unlock.")
(define simgear
(package
(name "simgear")
- (version "2018.3.5")
+ (version "2020.3.2")
(source
(origin
(method url-fetch)
--
2.29.2
T
T
Tobias Geerinckx-Rice wrote on 11 Nov 2020 16:38
(name . Barnabas Beres)(address . beresbarnus03@gmail.com)
878sb7j442.fsf@nckx
Barnabas,

Thank you!

Barnabas Beres ???
Toggle quote (3 lines)
> * gnu/packages/games.scm (simgear): Update to 2020.3.2
> * gnu/packages/games.scm (flightgear): Update to 2020.3.2

Unfortunately, this patch is incomplete: you'd expect at least one
hash change, and in this case 3 (simgear, flightgear, and its
data).

Unfortunatelier, I updated Flightgear to 2020.3.2 when it came out
(patch below) but haven't been able to test it yet, so it's been
rotting away on my hard drive.

Have you successfully flown the new version?

It adds yet another a third-party library but I kept is as it's
been ‘modified’ according to the README. I didn't compare the
code.

Kind regards,

T G-R
From 4926806b4acc86382cb80195d07cc731c8bb91d3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 7 Nov 2020 23:24:29 +0100
Subject: [PATCH] gnu: simgear, flightgear: Update to 2020.3.2.

* gnu/packages/games.scm (simgear, flightgear): Update to 2020.3.2.
---
gnu/packages/games.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

Toggle diff (47 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 439e369fe4..217e2507fd 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -8803,7 +8803,7 @@ levels to unlock.")
(define simgear
(package
(name "simgear")
- (version "2018.3.5")
+ (version "2020.3.2")
(source
(origin
(method url-fetch)
@@ -8811,7 +8811,7 @@ levels to unlock.")
(version-major+minor version) "/"
"simgear-" version ".tar.bz2"))
(sha256
- (base32 "1vkqm66r1205k3hdjmx5wmx5kvmsb0dgfzrs8n5gqnxj8szs42dl"))))
+ (base32 "0kkxanfhdw16phb3b890ywbfnswzjfl5mi2ikjjhz3fwz6rx6i09"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@@ -8847,11 +8847,11 @@ and also provides the base for the FlightGear Flight Simulator.")
(version-major+minor version) "/"
"flightgear-" version ".tar.bz2"))
(sha256
- (base32 "0ya3vb539kwi1qrifqhsj5j3k4w6s06hrllp2vdzxf6id7cgf0hc"))
+ (base32 "056cvrb6qwn9p64nigm3d6md86fcqv00691a4a0r0ppqhslbr6xd"))
(modules '((guix build utils)))
(snippet
'(begin
- ;; There are some bundled libraries.
+ ;; There are some bundled libraries, not all of them listed here.
(for-each delete-file-recursively
'("3rdparty/sqlite3/"))
#t))))
@@ -8920,7 +8920,7 @@ and also provides the base for the FlightGear Flight Simulator.")
"FlightGear-" version "-data.tar.bz2"))
(sha256
(base32
- "04fv9za5zlyxlyfh6jx78y42l3jazvzl9dq2y6rzxqlcc9g5swhk"))))))
+ "0bpr1nidcdc0p7a8z8rnvsisp6jy7ick5m9npdx6z2b0gj7ikcsq"))))))
(home-page "https://home.flightgear.org/")
(synopsis "Flight simulator")
(description "The goal of the FlightGear project is to create a
--
2.29.2
-----BEGIN PGP SIGNATURE-----

iIMEARYKACsWIQT12iAyS4c9C3o4dnINsP+IT1VteQUCX6wFbQ0cbWVAdG9iaWFz
LmdyAAoJEA2w/4hPVW157JMBAKcoFJFwgJ2PZV4Du/VnSl9Fx4drJIN3zSEKsZ+O
TF2QAQDsOoQRcWhY3Pc8QeGXgy/e0rc+gmuxG06iTW03IWizBw==
=A2qa
-----END PGP SIGNATURE-----

B
B
Barnabás Béres wrote on 12 Nov 2020 09:01
(address . 44573@debbugs.gnu.org)
CAOcmTtcjyG-3TZhhnJfrFWfY2tQ_fkcqJWLTguhenMXJCzGdug@mail.gmail.com
Thanks for adding the good hashes!
Attachment: file
P
P
phodina wrote on 3 Nov 2021 15:17
(name . 44573@debbugs.gnu.org)(address . 44573@debbugs.gnu.org)
0Xai0wDy_u8gL-R1XvmQ6mkErZHn6xLOyU8_2OLia3mkRGqzrx6tG0g5_0xyuTISbRFjfyYhTZS9wBX8TZUEn5DYnChr1cLpq1uBSiPfjTk=@protonmail.com
Hi,

here's the patch for the latest version of flightgear.

Flight works, though I have to work on my pilot skills :-D

Toggle snippet (51 lines)
* gnu/packages/games.scm (simgear, flightgear): Update to 2020.3.11.
(flightgear-data): Update uri.

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 42753dc1a4..6ada83bdd0 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9261,7 +9261,7 @@ (define-public marble-marcher
(define simgear
(package
(name "simgear")
- (version "2018.3.5")
+ (version "2020.3.11")
(source
(origin
(method url-fetch)
@@ -9269,7 +9269,7 @@ (define simgear
(version-major+minor version) "/"
"simgear-" version ".tar.bz2"))
(sha256
- (base32 "1vkqm66r1205k3hdjmx5wmx5kvmsb0dgfzrs8n5gqnxj8szs42dl"))))
+ (base32 "0g2g3n3sb6kdimvcrn9kvlhyyrp5c6lx20fgzz8l609v5aygr3dv"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@@ -9305,7 +9305,7 @@ (define-public flightgear
(version-major+minor version) "/"
"flightgear-" version ".tar.bz2"))
(sha256
- (base32 "0ya3vb539kwi1qrifqhsj5j3k4w6s06hrllp2vdzxf6id7cgf0hc"))
+ (base32 "15sar94x13j2y1m6adgmz2q1m1i9bzj3sxqla6y3m9vyf33hc9zy"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -9375,10 +9375,10 @@ (define-public flightgear
(method url-fetch)
(uri (string-append "mirror://sourceforge/flightgear/release-"
(version-major+minor version) "/"
- "FlightGear-" version "-data.tar.bz2"))
+ "FlightGear-" version "-data.txz"))
(sha256
(base32
- "04fv9za5zlyxlyfh6jx78y42l3jazvzl9dq2y6rzxqlcc9g5swhk"))))))
+ "0n5mw9vw1snab16c1y3i9ylkiv54az57bs2mvpq20hhg5hdiagqj"))))))
(home-page "https://home.flightgear.org/")
(synopsis "Flight simulator")
(description "The goal of the FlightGear project is to create a
--
2.33.1
E
E
Efraim Flashner wrote on 3 Nov 2021 23:09
Re: [bug#44573] logo [PATCH] gnu: flightgear: Update to 2020.3.2
(name . phodina)(address . phodina@protonmail.com)(address . 44573-done@debbugs.gnu.org)
YYMIj2D7ktpjGL9s@3900XT
On Wed, Nov 03, 2021 at 02:17:39PM +0000, phodina via Guix-patches via wrote:
Toggle quote (6 lines)
> Hi,
>
> here's the patch for the latest version of flightgear.
>
> Flight works, though I have to work on my pilot skills :-D

Thanks. Patch pushed.

Toggle quote (55 lines)
> --8<---------------cut here---------------start------------->8---
>
> * gnu/packages/games.scm (simgear, flightgear): Update to 2020.3.11.
> (flightgear-data): Update uri.
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 42753dc1a4..6ada83bdd0 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -9261,7 +9261,7 @@ (define-public marble-marcher
> (define simgear
> (package
> (name "simgear")
> - (version "2018.3.5")
> + (version "2020.3.11")
> (source
> (origin
> (method url-fetch)
> @@ -9269,7 +9269,7 @@ (define simgear
> (version-major+minor version) "/"
> "simgear-" version ".tar.bz2"))
> (sha256
> - (base32 "1vkqm66r1205k3hdjmx5wmx5kvmsb0dgfzrs8n5gqnxj8szs42dl"))))
> + (base32 "0g2g3n3sb6kdimvcrn9kvlhyyrp5c6lx20fgzz8l609v5aygr3dv"))))
> (build-system cmake-build-system)
> (arguments
> `(#:phases
> @@ -9305,7 +9305,7 @@ (define-public flightgear
> (version-major+minor version) "/"
> "flightgear-" version ".tar.bz2"))
> (sha256
> - (base32 "0ya3vb539kwi1qrifqhsj5j3k4w6s06hrllp2vdzxf6id7cgf0hc"))
> + (base32 "15sar94x13j2y1m6adgmz2q1m1i9bzj3sxqla6y3m9vyf33hc9zy"))
> (modules '((guix build utils)))
> (snippet
> '(begin
> @@ -9375,10 +9375,10 @@ (define-public flightgear
> (method url-fetch)
> (uri (string-append "mirror://sourceforge/flightgear/release-"
> (version-major+minor version) "/"
> - "FlightGear-" version "-data.tar.bz2"))
> + "FlightGear-" version "-data.txz"))
> (sha256
> (base32
> - "04fv9za5zlyxlyfh6jx78y42l3jazvzl9dq2y6rzxqlcc9g5swhk"))))))
> + "0n5mw9vw1snab16c1y3i9ylkiv54az57bs2mvpq20hhg5hdiagqj"))))))
> (home-page "https://home.flightgear.org/")
> (synopsis "Flight simulator")
> (description "The goal of the FlightGear project is to create a
> --
> 2.33.1
>
>
>

--
Efraim Flashner <efraim@flashner.co.il> ????? ?????
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmGDCI8ACgkQQarn3Mo9
g1GIsRAAotsybBJX2fNSQ4q5nYQy0OxMEA6xd/1dsWHdjdgDpTP74m0y+AuKeAYc
o3MG9MJAWVGYaKebYfszTCAwvOzHHVakbrgsI31s8zOZ1+yjconxxs9kj4D82vVC
CCNgJAMGGpiz2UETMEElPm8TYmboCRt/UaGo1YmxYZzdR3UW1UujNbEd/9wMDb44
8Cpb/yqkMpbQJ1UCHM31S+qNzGJmihzWMpWVwIf0CfhjQd4elHE5KML50PCY64nP
gsu9HM8Qm8P0XeHiA1+1+4H2QL999fT6+hB3eBQCQzAXEC0zxrAx7Uf7WYQyHwh0
UOBanetLNCIOGx61hpPWABT7UohvIFWzhMRq6u+/NgReYzstFa8sfsF4vnC4xlNH
J9Jz4jzJAGQC5rFnBBDRYHji2318Oawos4zuS/TUl8U3C7d63wN9onn28L6z2Y53
S/W8ClsWCyMTfmMmCdG7Yl/BzkT7sjJKfKSuFiTmm46Yx2a2NnurvVWfu1BRTonU
DthoeTJhgDa5rgY+jEQKDrNWpnRnQfWkvHxs3XMHqWz5aU1MR2RVy6ImIm4uBKsb
LyCPGmS+AfNZsIW2K9xUZHgcL3w+pcqqxIhUwgOX6LI3v67MhhuYeywhtK/GrO1b
smYOfQ6b8G1ZwvGMzNKOsLESWX6lHmbUmSsQT8gPx1DurXtxayk=
=SCO2
-----END PGP SIGNATURE-----


Closed
?