diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-07-04 12:08:25 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-07-04 12:08:25 -0700 |
commit | c16ebf7537eb5b74b0b0c3b2260787447ef62253 (patch) | |
tree | 0502c31b60db9dc2192b50e95fab8ffc262f09e5 /PKGBUILD | |
parent | Updated to 2023-06-22-0540 (diff) | |
download | cataclysm-bn-c16ebf7537eb5b74b0b0c3b2260787447ef62253.tar.xz |
Updated to 2023-07-03-0554
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 26 |
1 files changed, 17 insertions, 9 deletions
@@ -16,8 +16,8 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202306230521 -_pkgver=2023-06-22-0540 +pkgver=202307030554 +_pkgver=2023-07-03-0554 pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" @@ -40,6 +40,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "revert-04_telescopic-lenses.patch" "revert-06_Obsolete-useless-hub01-basement-1457.patch" "revert-07_Remove-handload-quality-distinction-1481.patch" + "revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch" "revert-08_undo-rifle-balance-pass.patch" "revert-09_undo-yet-more-ammo-balancing.patch" "revert-10_still-another-ammo-patch-to-undo.patch" @@ -149,7 +150,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=('3652c24ab32e0f3078e9c2fca4698b2202d3e7d68f7ff0a8ea183589994e4fe901332bede4ed78419cb62a6cebf98dcaa2117af486d19e31ff584b2f0099ff99' +b2sums=('6c427b0ce443e2e3f4b24f38974886a630b2704c7e7d4361b60ecec91c76c7b46e707980c05063e6d38a967f6caacd964ba5da1047d7e6decefb3b464f159348' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -158,10 +159,11 @@ b2sums=('3652c24ab32e0f3078e9c2fca4698b2202d3e7d68f7ff0a8ea183589994e4fe901332be 'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe' '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a' '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac' - '8cb60c8d33e1dfdb0b5e4a6f8c5796b78ba3987ad879fd471953f36d7c1c49d10b9b30ab7361c4cb5489b43da9ae48cb5a85531c0f11ffe0ba663f33215a5e52' - '0ac92184f85d8b3dceee4a210b2f7f367aeb14c609d468e87205d0eb630e1b6bad6903b863ea61c3a032b665b2316871b6c70aa8508c604a7237a378fae39d92' + 'ca7b1e96dbd399315b40ca789dad9b5c573a164231834a6a3b8448ab4d98787dc66264e9fc9cf230a06ab58ad4308520f8cadfd79ab8e8a6daf377d98a496490' + 'e6f0c25863074990ac54ec0a8fd05a3458c05bf41b7ebf9ec8e7ca302694b5a2fc89289d1a8818c44f0b879c61c2ecbd9d1defc9fc4a5a5fa0c98910859c8543' + '43d89f815f7c7d7e57463174ad3bfa304a21c93dd34659dfa95824582f482fb97ef70f6d4c83be29b2b10b22c27ff1d19ce4ea1e2a0653fce35d53cdb30fb897' '07dca7e1c81f4eeb4c29f5489b9025f244c9500a336c4b6424b679bd0cee1567b8510ef0dc3e78d7df9263131f352eaa322daff42172d9cd12deb5d9e81883db' - '1950d2cacc8697b3f0602f3eb232744fd0f7de4489b7747089abfa8784ec9e4433db4dcdf925d0bc37686ee14d607dcd5345e3db5b5b155a6208bde8b1706e23' + '7311e7cfaf4c47ac2cc62ec2590c7f5b09b86615400f87f47bc62418d0028dc78ef88380022a70cbdb5e542becee9ad443cbf03e2793443d0e11656e91c0abc5' '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7' '68cc05b6224d873a2a5728e0120ce09e5c45f53f8c7bc03148a0ede00582975d740e42ddad1aa02c58fabf6d25aa649ddf73e3af2b7c98090e840c808e0742c8' 'e79914e7c5388a9fba22b0853e16e1f625f908bcbb5094f3b59fd05ae0195429a4f596a44b782ac9966ebecab3f4135506c68176daca650ece170e350f7e5120' @@ -210,7 +212,7 @@ b2sums=('3652c24ab32e0f3078e9c2fca4698b2202d3e7d68f7ff0a8ea183589994e4fe901332be '9fbf8cf2aaa18c5cccca24783f40503cf7b7c66731f65450cc312e8b29145c56c23d31d19063dccdf3790ec06480d773d7d64de1672f38b7a4740a8aa0fd4f7d' 'abafa39e57cf04396b841833215aca427655dd3b56ebc260b8a57d6376360b31a4b1d4493da76ec4dc0129939ab9e23cada70dd6f49e647f02bce12c81f6451a' 'e6eda6cf4831df11facb124ab80972ddffabc8e2a61f8180275c7a95a8f00917301e9b8912f2418138c9dabd91c979d5d5b5d0b2b4b8eae3891f9c1880a4c526' - '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f' + '8eba2f66280defcc930424d695baff297cff32e91e73f01210bb3f26389ea9e93b4b4d9e2c5a5a048756eff219d51c3fbf3f05690c3c984afcc32c3928df91aa' '80da2c341d8564a47bc460fcdaf9196ac3bb77f0f2ba56bd71089e80e7481728a3ccbdcfcbc3bf70a9c9e5d9d9b01f2ca6615b67c7ab61003808ce00f6545ba3' 'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e' '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8' @@ -240,7 +242,7 @@ b2sums=('3652c24ab32e0f3078e9c2fca4698b2202d3e7d68f7ff0a8ea183589994e4fe901332be 'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f' '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b' 'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e' - 'cd79b05165d9b7b1817f98431b13ddd380df28df5e1e14da9345d6c0c1f78cfe22c6e6b85ca370c7df73cbf852d51e4ebd3d3e0f6c82b8d5dd35ca5a16ad6bfe' + '7d747ca4aff9a6fea8bf4cc5ea9b6c4be65271ee3d3f9dd2ae5ac1b0cf382e252b2f26948adcfa5357fffacd7f96a3adbd914559efb6313a1374704a15f53fa7' '21ad3a1995bd3fa8b5483d92855c6c7b10d2296fc181ccad555343db7e39bf0262ae11d61d6073dffa2b45cb7fdbf616ec204b817bf47789c9a1b8b9e0db2513' 'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596' 'f032ed44a6bc7f5b8dd7a545706c7733c4043ded755c12c622314c3b1f206363d27358f2d765a774f6f32abbdd8c31994b1e075c5307dcf65fc4e7a77081a5c7' @@ -277,7 +279,7 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-06-22-0540"|' Makefile + sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-07-03-0554"|' Makefile # # # Hotfixes @@ -313,10 +315,16 @@ prepare() { # Revert balance pass of rifle ammunition. patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-08_undo-rifle-balance-pass.patch + # Fix the duplication of 4570_bp + echo "Applying revert 7.5" + patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch + # Revert removal of reloaded ammunition. + echo "Applying revert 7" patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-07_Remove-handload-quality-distinction-1481.patch # Revert Hub 01 basement removal. + echo "Applying revert 6" patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-06_Obsolete-useless-hub01-basement-1457.patch # Revert the book changes for now. |