diff options
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | foods-06_sealed-foods-not-full.patch | 59 | ||||
| -rw-r--r-- | hotfix-07_build-fix-some-build-errors-on-fedora-4979.patch | 51 |
3 files changed, 119 insertions, 4 deletions
@@ -18,7 +18,7 @@ _pkgname=Cataclysm-BN pkgver=0.6.0 #pkgver=202310040030 #_pkgver=2023-10-04-0030 -pkgrel=4 +pkgrel=6 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -42,6 +42,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B "hotfix-04_fix-mapgen-fix-for-level-0-of-the-Necropolis-4380.patch" "hotfix-05_fix-more-fix-for-level-0-of-the-Necropolis-4387.patch" "hotfix-06_fix-more-fix-for-level-0-of-the-Necropolis-2-4426.patch" + "hotfix-07_build-fix-some-build-errors-on-fedora-4979.patch" "revert-01_removed-traits.patch" "revert-02_revert-book-revamp.patch" @@ -175,6 +176,7 @@ b2sums=('1a311f72d159194d8737b75a484d015caf75a1920b1e9eaa0bdbcd9c0bb8aceda1f59a5 'a22b8b17d97b09d622ca777743224a164be5b7be3e7f763aa8b94eebc2a5447d5d7875587562987faacd68613628093bf215c38ad5544a8d48a2b4e8bca7c587' '2acab6e5fb1c51f6b09ee13893917c9876f0009f9c8537d93f13563b461b9855722d3c1dc55803aee5922a9283da41656ec62dbf30cf6d265e858fd397762067' 'bc6b14d6000412cea47bbe1bf3a4a56f06c13afcffd555cfe93d99e5d3b16ce66b0cb2458cd211dcf097974870b78876c2f3f056eb8f9304c4c85b2655dfe831' + '745001b2e39dae0c177badacc0a811057f9cae713a467ccc576332395995493050c98563dc26363507b282db8b164c94b333e0b56cb52a6121b07960c151136a' 'fdef1f81084e7b08203b8464f37a00e2efc8b11d423c6e6b82e612392d91047160d2bc472b63c836ebc48adee0b4f2b3434c3e07eed5876275b234e69d7f6b9c' '2b42190f1d7189a38b3424efe64fd1b3921919a4f6fc872462ef684587de94b900e93f159597ab3e6f576268fed3e6966cddc3fa7250e1b746095fd7a2cbf6e9' 'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe' @@ -214,7 +216,7 @@ b2sums=('1a311f72d159194d8737b75a484d015caf75a1920b1e9eaa0bdbcd9c0bb8aceda1f59a5 '7da2d555f4b21da6704675400dc97367ff3e6bb60213d86c972b6740f074bcef98482ad7f759ddbee09f67d0ee8687c26c425d697ab586a784385971aec72bb0' 'c3b8dcce2fe41c8d9dab2d35d56304f426e06f9a6a220fcb2f413ac4aa32c7f466e2001cc7bf0bbf6127aeef55c837bb344f08afbb392f202c4ad8ce83a592a9' 'e85003201457633ab56789aef908ad4e8f9ed4728fc2bceb0344b851bf65f13264dfe9459afd4c1ba69c0d89f83e841f4829dcf6b0f8fb456bc9f2176c66ca87' - '7b4369a2535029e214af7f51f7d6292d91989249374c9969a140f8954dedca2a2c04f626ac0bcf33f9ea8ab1710fadcc79034156405249b885b01e5c53be2188' + '3029c13a4506a7fe9444da8a263298c0c988b9544df3f05348c8ecf770f3e92fd4e2673dd7e80478f6883fdd54b97ed93eaa72371e85373f145b0799f4e291b5' '3480ccaa4bc7c64e17d2f7904b39d98c8a3557a4af7d811c8860fa77d3b78055343fd7e4442ce6d1a11e8528496df2cdce03749d0ed046ed8b2cb94a4fd11dde' '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46' '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c' @@ -234,7 +236,7 @@ b2sums=('1a311f72d159194d8737b75a484d015caf75a1920b1e9eaa0bdbcd9c0bb8aceda1f59a5 '4a914e5120c223e6c1e221c692a1da7e67c13c2afbe273c54e214f7c4391805a13ee21fab5441104976caa5ee2eb8bdaccec89349b4e2eb823060e198f28d15a' '246a189a0002e755bbed91257c324d0f34bab724f38a31bad1d5eb8bc5b126ecb3a0af8f69a6d0f5f084930c670d2747942beabab0b684f7f66a13044dec394a' '739d0a1acbf6cdd1c6e78cac75a792d475b140219ffbf8c44d4db9fa82dc93f0822763be14c81afe69ab167a611a5d89fceb3df39d28b191835e14628c369140' - '21130b85c325a5789e8fa60b9cd69c889d41153c20b6a3d38465a43e57c37e35ec4f0319aafb1611c333108f066520370d8423111b208d200d62f7aecd626f27' + '50d4022cfac2d651f9e9746dc3590a63aab38ea11ae098abe04a7d509873c560e6999113dcffa64a0545e2ea25deb99edc9ae05fa00ecfb5984a4c155cd942d7' 'd5fcf6d5c7984d08cd6992809b3259f90196af5e8e4953754c04f722fea06ae995e1d51fbbea8cb462b7f896026c709928252413dbda4cec553684a6d2b5fca8' '0449ffab9ecf7183253cfb56c7bf489ca6f0a2002f96caa37f2cdb9c77e51e7f8561589e5179496cfb6760b1e8c34a5aefcce4fe0790cab81db3409582a2c835' 'abafa39e57cf04396b841833215aca427655dd3b56ebc260b8a57d6376360b31a4b1d4493da76ec4dc0129939ab9e23cada70dd6f49e647f02bce12c81f6451a' @@ -328,6 +330,9 @@ prepare() { patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-05_fix-more-fix-for-level-0-of-the-Necropolis-4387.patch patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-06_fix-more-fix-for-level-0-of-the-Necropolis-2-4426.patch + # Fix building with gcc14 + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-07_build-fix-some-build-errors-on-fedora-4979.patch + # # Adjust default mods patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-20_fix-default-mods.patch @@ -493,7 +498,7 @@ prepare() { # Fruit slices were several times as valuable as canned fruit. patch -Np1 --no-backup-if-mismatch -i "$srcdir"/foods-05_fix-missing-price-postapoc.patch - # Fix several sealed foods spawning only half full: + # Fix several sealed foods spawning partially full: # And one spawning double-full. patch -Np1 --no-backup-if-mismatch -i "$srcdir"/foods-06_sealed-foods-not-full.patch diff --git a/foods-06_sealed-foods-not-full.patch b/foods-06_sealed-foods-not-full.patch index b186449..707a1b7 100644 --- a/foods-06_sealed-foods-not-full.patch +++ b/foods-06_sealed-foods-not-full.patch @@ -1,3 +1,50 @@ +--- a/data/json/itemgroups/Food/food.json ++++ b/data/json/itemgroups/Food/food.json +@@ -12,14 +12,14 @@ + { "item": "veggy_pickled", "prob": 50, "charges": 2, "container-item": "jar_glass_sealed" }, + { "item": "jar_sauerkraut_pickled", "prob": 5 }, + { "item": "meat_pickled", "prob": 20, "charges": 2, "container-item": "jar_glass_sealed" }, +- { "item": "potted_meat", "prob": 20, "charges": 2, "container-item": "jar_glass_sealed" }, ++ { "item": "potted_meat", "prob": 20, "charges": 4, "container-item": "jar_glass_sealed" }, + { "item": "fish_pickled", "prob": 30, "charges": 2, "container-item": "jar_glass_sealed" }, + { "item": "meat_canned", "prob": 20, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "veggy_canned", "prob": 40, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "apple_canned", "prob": 30, "charges": 24, "container-item": "jar_3l_glass_sealed" }, + { "item": "can_tomato", "prob": 40, "charges": 24, "container-item": "jar_3l_glass_sealed" }, + { "item": "meat_pickled", "prob": 10, "charges": 12, "container-item": "jar_3l_glass_sealed" }, +- { "item": "potted_meat", "prob": 10, "charges": 12, "container-item": "jar_3l_glass_sealed" }, ++ { "item": "potted_meat", "prob": 10, "charges": 24, "container-item": "jar_3l_glass_sealed" }, + { "item": "veggy_pickled", "prob": 20, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "fish_pickled", "prob": 40, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "lobster_pickled", "prob": 20, "charges": 12, "container-item": "jar_3l_glass_sealed" }, +@@ -253,7 +253,7 @@ + { "item": "dry_lentils", "prob": 40 }, + { "item": "dry_rice", "prob": 40 }, + { "item": "meat_pickled", "prob": 6, "charges": 2, "container-item": "jar_glass_sealed" }, +- { "item": "potted_meat", "prob": 6, "charges": 2, "container-item": "jar_glass_sealed" }, ++ { "item": "potted_meat", "prob": 6, "charges": 4, "container-item": "jar_glass_sealed" }, + { "item": "meat_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "veggy_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "apple_canned", "prob": 4, "charges": 24, "container-item": "jar_3l_glass_sealed" }, +@@ -261,7 +261,7 @@ + { "item": "can_tomato", "prob": 4, "charges": 24, "container-item": "jar_3l_glass_sealed" }, + { "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "meat_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, +- { "item": "potted_meat", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, ++ { "item": "potted_meat", "prob": 4, "charges": 24, "container-item": "jar_3l_glass_sealed" }, + { "item": "veggy_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "sauce_red", "prob": 4, "charges": 48, "container-item": "jar_3l_glass_sealed" }, +@@ -674,7 +674,7 @@ + { "item": "hotdogs_frozen", "prob": 20, "charges": [ 5, 10 ] }, + { "item": "lunchmeat", "prob": 30 }, + { "item": "meat_pickled", "prob": 3, "charges": [ 1, 2 ], "container-item": "jar_glass" }, +- { "item": "potted_meat", "prob": 2, "charges": [ 1, 2 ], "container-item": "jar_glass" }, ++ { "item": "potted_meat", "prob": 2, "charges": [ 1, 4 ], "container-item": "jar_glass" }, + { "item": "tofu", "prob": 15 } + ] + }, + --- a/data/json/itemgroups/SUS/domestic.json +++ b/data/json/itemgroups/SUS/domestic.json @@ -148,7 +148,7 @@ @@ -29,3 +76,15 @@ { "item": "kompot", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, { "group": "big_canned_food", "prob": 4 } ] + +--- a/data/json/itemgroups/stashes.json ++++ b/data/json/itemgroups/stashes.json +@@ -31,7 +31,7 @@ + [ "lutefisk", 1 ], + [ "pemmican", 10 ], + { "item": "meat_pickled", "prob": 20, "charges": 2, "container-item": "jar_glass_sealed" }, +- { "item": "potted_meat", "prob": 20, "charges": 2, "container-item": "jar_glass_sealed" } ++ { "item": "potted_meat", "prob": 20, "charges": 4, "container-item": "jar_glass_sealed" } + ] + }, + { diff --git a/hotfix-07_build-fix-some-build-errors-on-fedora-4979.patch b/hotfix-07_build-fix-some-build-errors-on-fedora-4979.patch new file mode 100644 index 0000000..d2146d0 --- /dev/null +++ b/hotfix-07_build-fix-some-build-errors-on-fedora-4979.patch @@ -0,0 +1,51 @@ +From abfe66bd28456752b8395b43a364f8f88610e5bf Mon Sep 17 00:00:00 2001 +From: scarf <greenscarf005@gmail.com> +Date: Mon, 22 Jul 2024 02:33:30 +0900 +Subject: [PATCH] build: fix some build errors on fedora (#4979) + +* build: fix template-id-cdtor error on gcc 14 + +related: https://github.com/project-chip/connectedhomeip/issues/33493 + +* build: use explicit `std::replace` from `<algorithm>` +--- + src/cata_arena.h | 8 ++++---- + src/safe_reference.h | 1 + + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/cata_arena.h b/src/cata_arena.h +index 7eeec9a0c01..c1aee051719 100644 +--- a/src/cata_arena.h ++++ b/src/cata_arena.h +@@ -37,12 +37,12 @@ class cata_arena + return true; + } + +- cata_arena<T>() = default; +- cata_arena<T>( const cata_arena<T> & ) = delete; +- cata_arena<T>( cata_arena<T> && ) = delete; +- ++ cata_arena() = default; + + public: ++ cata_arena( const cata_arena<T> & ) = delete; ++ cata_arena( cata_arena<T> && ) = delete; ++ + using value_type = T; + + static void mark_for_destruction( T *alloc ) { +diff --git a/src/safe_reference.h b/src/safe_reference.h +index 552aeb6e300..201d0a9500e 100644 +--- a/src/safe_reference.h ++++ b/src/safe_reference.h +@@ -48,6 +48,7 @@ + */ + + #include <memory> ++#include <algorithm> + #include <unordered_map> + + #include "debug.h" +-- +2.43.0 + |