diff options
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 33 |
1 files changed, 22 insertions, 11 deletions
@@ -13,9 +13,9 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202204211455 -_pkgver=2022-04-21-1455 -pkgrel=2 +pkgver=202205281540 +_pkgver=2022-05-28-1540 +pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -34,7 +34,9 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "revert-02_revert-book-revamp.patch" "revert-03_generic-nv.patch" "revert-04_telescopic-lenses.patch" - "revert_05-No-filth-and-fault-on-uninstalled-bionics-1389.patch" + "revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch" + "revert-06_Obsolete-useless-hub01-basement-1457.patch" + "revert-07_Remove-handload-quality-distinction-1481.patch" "ammo-01_inconsistent-ammo-names.patch" "ammo-02_fix-20x66mm-loudness.patch" @@ -126,7 +128,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz" "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz" ) -b2sums=('cf7aeed14e838465914996f63c53056fd6a5949069a506f27a057ba0c70ebdbf7c22b1052f8c32b9a66c09428c906fffc4f6bddf617639d3d60d8f00ef63a2a3' +b2sums=('eeaad9ef73a917e8901b3e935994fe21064d47e9e4291fea37e611c83e0825c0cca26e0e73b489bd947c2c1f30e73547f43d80da27822c7041f26b6925c2bbb3' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -135,11 +137,13 @@ b2sums=('cf7aeed14e838465914996f63c53056fd6a5949069a506f27a057ba0c70ebdbf7c22b10 '32f7c7090c094bcf87c116ccc4843f63c2f7600f591e26ab7d5a31d7c3abfcc5dec0edf5a9750dba07fe087c3880bbd6d322d0435ebbce06c930bd32c9c814d9' '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a' '1ccdb603f476b642475d95acae66bf85377ad05740d4886e72cecdfb55f1df0b059f4f4dee2dbdb3a976d9e3c23b88972b26e91b15d10f2b53d39e6d167d9668' + '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac' + '1a54b9a3e742061d34409e24fb347c00735cfaf29f945e29881fd2571f3cd57eddc711750dd2fd914da761c26ae3db6810c88cbff493df353b7533244c990637' '207f765e998c5a92db2030e25779c98d57ed50ce6664d94439e4fdb4654466b764723f7b58872a186dea5f7504793efe4d93df2d8390139649a45d32eec06848' '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19' '7fa3cc2cc13171aa395accc061a8582f0254a01377b3d60ded4c8d82c5a4f1af65b8e1b6c4fccf0b5fb9a6de1cd59121aae353e6d374726f058c3718bfb9743f' '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c' - '5373d056122de79bb3348897f08d00fdcfba3f140446894efa8aaddeab34d3f303301e9553853940adfde095bc967bd1f67c4d7066799d5e083fb0af1ff64b31' + '4ebc6160e28b7852b4ae689062a9b92f3ff3f2c7990bfe84ed62ce617d5589d53d375627cf544abb10b41e68b213af1507af39f5148fa4f119abcc15055033d8' '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4' 'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65' 'f3bdbaac5dbe9384571fe5ec14d2d25035f227a977c25349b8188e7343804e3973b898b44c34f9abe9318666294f4fdfe780fd516dcbdb29c4ac52f6d0ed6cad' @@ -198,7 +202,7 @@ b2sums=('cf7aeed14e838465914996f63c53056fd6a5949069a506f27a057ba0c70ebdbf7c22b10 'd05c48c376f23dd7fda2b5249b5985665de8344774f420a95151f7484ab33c38fb78b2ff279cedf762877dca3abd91c4d9e4900547e9c31e7636e1d90cc13d2b' 'e8edef84346ec74a39225665d65f404aeb5db3be12572fc9539f27aec06c54d208a5fdab67c881237866c4e9795b06445d426baf32d9b3a223a0e661de13be0c' 'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596' - 'ec8f713c6fae84f6659f76d4edc0f237766329080e33e65a5affc5d0c37cc7906b0daaaa1f275d89c8ddacb5db0ee16b69222956c9f2c402ce44b55aa040ead0' + 'ce10e7d8457ad71d7bad75c68b32c60f4ea12ddf52407816f27ff05677bc789f6af33dabb734d17fbb5037d58c6041673752f332d2bf676604565f8d60e8078c' 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') prepare() { @@ -216,7 +220,7 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = 2022-04-21-1455|' Makefile + sed -i 's|VERSION = unstable|VERSION = 2022-05-28-1540|' Makefile # # # Hotfixes @@ -224,9 +228,15 @@ prepare() { # # # Reverts + echo "Applying revert patches" + # Revert removal of reloaded ammunition. + patch -NREp1 -i "$srcdir"/revert-07_Remove-handload-quality-distinction-1481.patch - # Revert clean bionics patch - patch -NREp1 -i "$srcdir"/revert_05-No-filth-and-fault-on-uninstalled-bionics-1389.patch + # Revert Hub 01 removal. + patch -NREp1 -i "$srcdir"/revert-06_Obsolete-useless-hub01-basement-1457.patch + + # Revert removal of filthy/faulty bionics patch. + patch -NREp1 -i "$srcdir"/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch # Revert the book changes for now. patch -NREp1 -i "$srcdir"/revert-02_revert-book-revamp.patch @@ -292,6 +302,7 @@ prepare() { # Fix faction food supply being calculated at 288 calories per person instead of 2500. patch -Np1 -i "$srcdir"/faction-03_fix-food-supply-calculations.patch + # # faction camp fixes echo "Applying faction camp fixes" # cur_level is set to -1 on all modern basecamps. Remove the recruiting penalty this legacy variable inadvertently induces. @@ -426,7 +437,7 @@ prepare() { echo "Applying terrain and overmap fixes" # Set t_platform_resin movecost to 2: - # This allows helicopters to land on the the mi-go landing pad. + # This allows helicopters to land on the mi-go landing pad. patch -Np1 -i "$srcdir"/terrain-01_migo-platform-landing-pad.patch # Fix missing floor in the tacoma clinic: |