From c012b79655ae847d30821ca181733cae77bb4894 Mon Sep 17 00:00:00 2001
From: Patrick Norton <patrick.147.norton@gmail.com>
Date: Mon, 17 Nov 2025 08:25:01 -0500
Subject: [PATCH] gnu: flightgear: Update to 2024.1.3.

* gnu/packages/games.scm (simgear): Update to 2024.1.3.
[source]: Switch to git-fetch.
[arguments]<#:test-exclude>: Exclude additional failing tests.
[inputs]: Add c-ares.
(flightgear): Update to 2024.1.3.
[source]: Switch to git-fetch.
[arguments]<#:phases>{fix-namespace}: New phase.
[inputs]: Add c-ares, curl, qtquickcontrols2-5 and qtwayland-5.
Remove qtbase-5.

Change-Id: Ic4215fbec038bf3c6a8d0eb096ef21a086d5ad46
Signed-off-by: Andreas Enge <andreas@enge.fr>
---
 gnu/packages/games.scm | 47 +++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 38e7a3cf3b391b3ffe82e6c997ad7c6559f3be9f..8cb60c0510e2f05363ff74d36fc50db4bc6c463f 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10903,15 +10903,19 @@ levels to unlock.")
 (define simgear
   (package
     (name "simgear")
-    (version "2020.3.18")
+    (version "2024.1.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "mirror://sourceforge/flightgear/release-"
-                           (version-major+minor version) "/"
-                           "simgear-" version ".tar.bz2"))
+       (method git-fetch)
+       ;; (uri (string-append "mirror://sourceforge/flightgear/release-"
+       ;;                     (version-major+minor version) "/"
+       ;;                     "simgear-" version ".tar.bz2"))
+       (uri (git-reference
+              (url "https://gitlab.com/flightgear/simgear")
+              (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1jin6rbz4s83x4k91lbdw5gb0vrc8frbmwpc55wl0wmiaqjwzhbc"))
+        (base32 "1gjx1yylrsqhzp2g6am6wljriyf4cmsbvkqihxqbak93abzg0dnp"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -10922,9 +10926,10 @@ levels to unlock.")
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags (list "-DSYSTEM_EXPAT=ON")
-       #:test-exclude "(http|dns)"))
+       #:test-exclude "(http|dns|repository|catalog)"))
     (inputs
      `(("boost" ,boost)
+       ("c-ares" ,c-ares)
        ("curl" ,curl)
        ("expat" ,expat)
        ("mesa" ,mesa)
@@ -10945,12 +10950,13 @@ and also provides the base for the FlightGear Flight Simulator.")
     (version (package-version simgear))
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "mirror://sourceforge/flightgear/release-"
-                           (version-major+minor version) "/"
-                           "flightgear-" version ".tar.bz2"))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://gitlab.com/flightgear/flightgear")
+              (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "0dyyi1v97w3mdwsv9kdd194inz1461wqv3zy3wyai0n17wdf7a1r"))
+        (base32 "1w4zsqfhn2fg2qh37b91z2q5r611mgqv5yj669ms5h0p0ddxp1lv"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -10976,6 +10982,16 @@ and also provides the base for the FlightGear Flight Simulator.")
                       (string-append "// " all))
                      (("CPPUNIT_TEST\\(testFinalLegCourse\\);" all)
                       (string-append "// " all)))))
+               (add-after 'unpack 'fix-namespace
+                 (lambda _
+                   (substitute*
+                       "test_suite/unit_tests/Main/test_timeManager.cxx"
+                     (("using namespace flightgear;" all)
+                      (string-append all "\nusing namespace std::string_literals;")))
+                   (substitute*
+                       "test_suite/unit_tests/Instrumentation/test_commRadio.cxx"
+                     (("#include <Main/locale.hxx>" all)
+                      (string-append all "\nusing namespace std::string_literals;")))))
                (add-after 'build 'build-test-suite
                  (lambda* args
                    ((assoc-ref %standard-phases 'build)
@@ -10994,6 +11010,8 @@ and also provides the base for the FlightGear Flight Simulator.")
                  (assoc-ref %standard-phases 'check)))))
     (inputs
      (list boost
+           c-ares
+           curl
            dbus
            eudev
            freeglut
@@ -11003,9 +11021,10 @@ and also provides the base for the FlightGear Flight Simulator.")
            openal
            openscenegraph
            plib
-           qtbase-5
            qtdeclarative-5
+           qtquickcontrols2-5
            qtsvg-5
+           qtwayland-5
            simgear
            speexdsp
            sqlite
@@ -11022,7 +11041,7 @@ and also provides the base for the FlightGear Flight Simulator.")
                                "FlightGear-" version "-data.txz"))
            (sha256
             (base32
-             "0f2jn2br27ahf5gggx70zcp80wrylahw7nbqdcx7ml9qphg6rjak"))))))
+             "1xp2c6gfbch4c59w7w1zblqw5casn8ch52j094kmv11mjfwdds60"))))))
     (home-page "https://www.flightgear.org/")
     (synopsis "Flight simulator")
     (description "The goal of the FlightGear project is to create a