Unverified Commit c28af594 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

cataclysm-dda-git: remove incompatible patches, bump git (#330693)

parents 0a17c072 83851c6b

pkgs/games/cataclysm-dda/git.nix

+4 −17
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
, tiles ? true, Cocoa

, debug ? false

, useXdgDir ? false

, version ? "2022-08-20"

, rev ? "f65b2bc4c6dea24bd9a993b8df146e5698e7e36f"

, sha256 ? "sha256-00Tp9OmsM39PYwAJXKKRS9zmn7KsGQ9s1eVmEqghkpw="

, version ? "2024-07-28"

, rev ? "bfeb1fffc4179fed242a042f24b1c97f6cfaff3d"

, sha256 ? "sha256-IodXEA+pWfDdR9huRXieP3+J3WZJO19C8PUPT18dFBw="

}:



let
@@ -24,20 +24,7 @@ let 


    patches = [

      # Unconditionally look for translation files in $out/share/locale

      ./locale-path.patch

      # Fixes for failing build with GCC 13, remove on updating next release after 0.G

      (fetchpatch {

        url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-dangling-reference-warning.patch";

        hash = "sha256-9nPbyz49IYBOVHqr7jzCIyS8z/SQgpK4EjEz1fruIPE=";

      })

      (fetchpatch {

        url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-cstdint.patch";

        hash = "sha256-8IBW2OzAHVgEJZoViQ490n37sl31hA55ePuqDL/lil0=";

      })

      (fetchpatch {

        url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-keyword-requires.patch";

        hash = "sha256-8yvHh0YKC7AC/qzia7AZAfMewMC0RiSepMXpOkMXRd8=";

      })

      ./locale-path-git.patch

    ];



    makeFlags = common.makeFlags ++ [

pkgs/games/cataclysm-dda/locale-path-git.patch

0 → 100644
+17 −0
Original line number Diff line number Diff line 
diff --git a/src/translations.cpp b/src/translations.cpp

--- a/src/translations.cpp

+++ b/src/translations.cpp

@@ -52,13 +52,11 @@ std::string locale_dir()

 #define CATA_IS_ON_BSD

 #endif



-#if !defined(__ANDROID__) && ((defined(__linux__) || defined(CATA_IS_ON_BSD) || (defined(MACOSX) && !defined(TILES))))

     if( !PATH_INFO::base_path().empty() ) {

         loc_dir = PATH_INFO::base_path() + "share/locale";

     } else {

         loc_dir = PATH_INFO::langdir();

     }

-#endif

 #endif // LOCALIZE

     return loc_dir;

 }