diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
| commit | b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch) | |
| tree | 16fe44748708acacd909d4e2e160a09a7f6d936a /games-action/minetest/files | |
| parent | 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff) | |
gentoo resync : 18.11.2019
Diffstat (limited to 'games-action/minetest/files')
| -rw-r--r-- | games-action/minetest/files/5.1.0-FindJson.patch | 31 | ||||
| -rw-r--r-- | games-action/minetest/files/minetestserver.confd | 2 | ||||
| -rw-r--r-- | games-action/minetest/files/minetestserver.initd | 2 |
3 files changed, 33 insertions, 2 deletions
diff --git a/games-action/minetest/files/5.1.0-FindJson.patch b/games-action/minetest/files/5.1.0-FindJson.patch new file mode 100644 index 000000000000..3d48b0a0924c --- /dev/null +++ b/games-action/minetest/files/5.1.0-FindJson.patch @@ -0,0 +1,31 @@ +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 + diff --git a/games-action/minetest/files/minetestserver.confd b/games-action/minetest/files/minetestserver.confd index ec3d0138cb73..7a6f9b12ff01 100644 --- a/games-action/minetest/files/minetestserver.confd +++ b/games-action/minetest/files/minetestserver.confd @@ -13,4 +13,4 @@ PIDFILE="/var/run/minetest.pid" MINETESTBIN="@BINDIR@/minetestserver" # additional arguments for the server -ARGS="--logfile /var/lib/minetest/minetest-server.log" +ARGS="--logfile /var/log/minetest/minetest-server.log" diff --git a/games-action/minetest/files/minetestserver.initd b/games-action/minetest/files/minetestserver.initd index 1e56ff646517..ffca2e55995f 100644 --- a/games-action/minetest/files/minetestserver.initd +++ b/games-action/minetest/files/minetestserver.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="Minetest dedicated server" |