diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2020-02-22 22:09:03 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2020-02-22 22:09:43 +0000 |
| commit | 6051083a35f39976b4200bdb69f0c6c0d38ea1b3 (patch) | |
| tree | f7aceb31b74c4e051dc044b54a13423a4f755e19 /games-action/minetest/files | |
| parent | games-action/minetest: Version bump to 5.1.1 (diff) | |
| download | gentoo-6051083a35f39976b4200bdb69f0c6c0d38ea1b3.tar.gz gentoo-6051083a35f39976b4200bdb69f0c6c0d38ea1b3.tar.bz2 gentoo-6051083a35f39976b4200bdb69f0c6c0d38ea1b3.zip | |
games-action/minetest: Drop old 5.1.0-r1
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'games-action/minetest/files')
| -rw-r--r-- | games-action/minetest/files/5.1.0-FindJson.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/games-action/minetest/files/5.1.0-FindJson.patch b/games-action/minetest/files/5.1.0-FindJson.patch deleted file mode 100644 index 3d48b0a0924c..000000000000 --- a/games-action/minetest/files/5.1.0-FindJson.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 706b6aad06a112f55105f08b6acd130b276a06ca Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray <vilhelm.gray@gmail.com> -Date: Sat, 16 Nov 2019 13:14:24 -0500 -Subject: [PATCH] Fix find_path for newer jsoncpp installations - -The upstream JsonCpp project has renamed the `json/features.h` file to -`json/json_features.h`. This patch fixes the JsonCpp installation search -by looking for `json/allocator.h` which has not been renamed on newer -versions of JsonCpp. - -Fixes: https://github.com/minetest/minetest/issues/9119 ---- - cmake/Modules/FindJson.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake -index 26339a29..53ddf459 100644 ---- a/cmake/Modules/FindJson.cmake -+++ b/cmake/Modules/FindJson.cmake -@@ -8,7 +8,7 @@ option(ENABLE_SYSTEM_JSONCPP "Enable using a system-wide JSONCPP. May cause seg - - if(ENABLE_SYSTEM_JSONCPP) - find_library(JSON_LIBRARY NAMES jsoncpp) -- find_path(JSON_INCLUDE_DIR json/features.h PATH_SUFFIXES jsoncpp) -+ find_path(JSON_INCLUDE_DIR json/allocator.h PATH_SUFFIXES jsoncpp) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(JSONCPP DEFAULT_MSG JSON_LIBRARY JSON_INCLUDE_DIR) --- -2.24.0 - |