diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-08 01:07:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-08 01:07:24 +0100 |
| commit | e3cf2c86fca1750343c1885311f857f185ee4f2d (patch) | |
| tree | d9d1fbc20509d4c90f57fb2d9e1459bc8034c831 /games-fps/freedm-data | |
| parent | f1af93971b7490792d8541bc790e0d8c6d787059 (diff) | |
gentoo resync : 08.09.2019
Diffstat (limited to 'games-fps/freedm-data')
| -rw-r--r-- | games-fps/freedm-data/Manifest | 3 | ||||
| -rw-r--r-- | games-fps/freedm-data/files/freedm-data-0.11.3-Set-DOOMWADPATH.patch | 38 | ||||
| -rw-r--r-- | games-fps/freedm-data/freedm-data-0.11.3-r2.ebuild (renamed from games-fps/freedm-data/freedm-data-0.11.3-r1.ebuild) | 6 |
3 files changed, 45 insertions, 2 deletions
diff --git a/games-fps/freedm-data/Manifest b/games-fps/freedm-data/Manifest index b62a254c9d68..6261a39d776d 100644 --- a/games-fps/freedm-data/Manifest +++ b/games-fps/freedm-data/Manifest @@ -1,4 +1,5 @@ AUX ImageMagick/policy.xml 127 BLAKE2B fc13d41dc99e848f79af5e42c9e0ccd28bd07a69c97174e1c70bc6d58eae44b56495bd2c8698e0651ddeba63bcad7bf698c51aca7d7e932013a80a221b8696c2 SHA512 057f150e101344e3f29c654250353304b668bcb225b563f6b6e252e598123e1a634812d9cbbe7a28c2e271f9ee93d0303e66c23231f51f74fbaaaf6ef8fd1677 +AUX freedm-data-0.11.3-Set-DOOMWADPATH.patch 1334 BLAKE2B 7dde43eba843ee4acbfc88cafeac2472bf81fa32be18ef935293b15ef1fdbcbb46f306c164acbe0b1cf4f6c8d4ddb6e761fe005a67cace5c65846a5c5106011f SHA512 dfd6cb3e4b200e45c618a2d2b34a1b3bb1212845b8b635dc6fc13040c1b1e40b52155fd974faa7e45483b2b257fe5a91e5849b855ea20936dc03d686c9a64cb0 DIST freedoom-0.11.3.tar.gz 17010131 BLAKE2B a0b601575da8516cf9f83466fe2146b708aa3cb21a3df2f7cbcd018a560f65b9b89c85907115050c4985b64eff29a3a9d2cfb7d31e93043e9d3c35fe7749d749 SHA512 51e0d5f7ca7c846c556fcba36b0f9c815090bfc76a80200aebd1526291da16b71145fbe254100cc5ad37ffc044d4380ef07b8bd4bdb811f00b9150e7b34dd636 -EBUILD freedm-data-0.11.3-r1.ebuild 1220 BLAKE2B fadf4a1f5757a51c41a0691cdb4dba3c11e557c937086310a26c244c3164be1096d60f409147cb12a88cb8b9bc671c4e1a93885c124af4cc6f1487453a8bbef8 SHA512 6be1782d8577cea151040186cf402911cf4bacda8f025aae1297784499b6adf4a14927e87e4a503b2355613388ca55d2b3ff28611bd4c0318c1863869ab146fb +EBUILD freedm-data-0.11.3-r2.ebuild 1304 BLAKE2B c0e43fb51c4db08be0ca2f38ca43a5282d25af78ff5398f7abd0d98294e111a77aa304062975958f30b85377662a9ddbc291d39983f63384e626ab1ecf3ea7b2 SHA512 ffba609c9e642e28da1feebaf4d1f468c9d73a088169848692ffcfccbb6c8cdc625a0cb5fc24e854d7095c04dca6db7890de234e4455d1868bd9dbf4aa4f0a6b MISC metadata.xml 1480 BLAKE2B 0755aba8cc597778e420a8142e5febd305e317057870abdaa2f5761e2b45f86c139f63aa096fdb20a5984552d886b47ba7b458ed7f3e971ce4442d03f31e75f9 SHA512 d5847035c6bfa72c3af95a8af203df5909236616726a474dcc33c051de8149f82f4d8c9d1bc8be05b6b05ae1f3a8ec3064f400aa120a6c87d43358ab2e7e20f3 diff --git a/games-fps/freedm-data/files/freedm-data-0.11.3-Set-DOOMWADPATH.patch b/games-fps/freedm-data/files/freedm-data-0.11.3-Set-DOOMWADPATH.patch new file mode 100644 index 000000000000..0998cc45ebd1 --- /dev/null +++ b/games-fps/freedm-data/files/freedm-data-0.11.3-Set-DOOMWADPATH.patch @@ -0,0 +1,38 @@ +From 19b8fe33843b1e431fb0737a57087f58c168952c Mon Sep 17 00:00:00 2001 +From: William Breathitt Gray <vilhelm.gray@gmail.com> +Date: Fri, 6 Sep 2019 16:20:49 +0900 +Subject: [PATCH] dist/freedoom: Set DOOMWADPATH with sensible default value if + unset + +Engines such as Odamex may not have a default search path and simply +search for freedoom1.wad relative to the current directory. This can +cause an unexpected WAD file not found error when executing the freedoom +script. + +This issue is mitigated by setting a default DOOMWADPATH environment +variable with sensible search paths, if it is not already set. All +engines listed in the PORTS variable support the DOOMWADPATH environment +variable, which makes it a simple and convenient way of helping prevent +this error. +--- + dist/freedoom | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/dist/freedoom b/dist/freedoom +index 62e3c4d5..0c0961a5 100755 +--- a/dist/freedoom ++++ b/dist/freedoom +@@ -31,6 +31,10 @@ case "$(basename "$0")" in + ;; + esac + ++if [ -z "$DOOMWADPATH" ]; then ++ export DOOMWADPATH="/usr/share/doom:/usr/share/games/doom:/usr/local/share/doom:/usr/local/share/games/doom" ++fi ++ + if [ -z "$PORT" ] && [ -h "$HOME"/.doomport ]; then + if [ -f "$(readlink -f "$HOME"/.doomport)" ] \ + && [ -x "$(readlink -f "$HOME"/.doomport)" ]; then +-- +2.23.0 + diff --git a/games-fps/freedm-data/freedm-data-0.11.3-r1.ebuild b/games-fps/freedm-data/freedm-data-0.11.3-r2.ebuild index 99ce657c7869..29e3894685d9 100644 --- a/games-fps/freedm-data/freedm-data-0.11.3-r1.ebuild +++ b/games-fps/freedm-data/freedm-data-0.11.3-r2.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) -inherit python-any-r1 xdg +inherit prefix python-any-r1 xdg DESCRIPTION="Game resources for FreeDM" HOMEPAGE="https://freedoom.github.io" @@ -23,6 +23,8 @@ BDEPEND=" S="${WORKDIR}/freedoom-${PV}" +PATCHES="${FILESDIR}/${P}-Set-DOOMWADPATH.patch" + DOOMWADPATH=share/doom python_check_deps() { @@ -36,6 +38,8 @@ src_prepare() { xdg_src_prepare eapply_user + + hprefixify dist/freedoom } src_compile() { |