summaryrefslogtreecommitdiff
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD44
1 files changed, 32 insertions, 12 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 05c95fc..af5cc28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,9 +12,9 @@
pkgbase=cataclysm-dda
pkgname=(cataclysm-dda cataclysm-dda-tiles)
pkgname=cataclysm-dda
-pkgver=0.E.2
+pkgver=0.E.3
_pkgver=0.E-2
-pkgrel=1.57
+pkgrel=1.3
pkgdesc="A post-apocalyptic roguelike."
#url="http://cataclysmrl.blogspot.com/"
#url="http://www.cataclysm.glyphgryph.com/"
@@ -27,8 +27,10 @@ makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle')
source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/archive/$_pkgver.tar.gz"
"cataclysm-dda.desktop"
"cataclysm-dda-tiles.desktop"
- "hotfix-vehicle-heater-cooler-intensity-reduced.patch"
- "hotfix-tacoma-barn-door-position.patch"
+ "0.E.3.patch"
+ "0.F-backport-vehicle-heater-cooler-intensity-reduced.patch"
+ "0.F-backport-tacoma-barn-door-position.patch"
+ "0.F-backport-make-firestation-shelter-wells-npc-drinkable.patch"
"0001-quiverfull-house-correct-stairs.patch"
"0002-ankle-ammo-pouch-is-not-a-backpack.patch"
"0003-inconsistent-ammo-names.patch"
@@ -37,6 +39,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/
"0006-npcs-eat-when-hungry.patch"
"0007-lumbermill-gasoline-not-spilled.patch"
"0008-community-garden-fertilizer-not-spilled.patch"
+ "0009-oxyacetylene-from-oxygen.patch"
+ "0010-ammo-loudness-ap-times-2.patch"
"cataclysm-dda-tileset_undeadpeople-legacy.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-tileset_undeadpeople-legacy.git/snapshot/cataclysm-dda-tileset_undeadpeople-legacy-master.tar.xz"
"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"
@@ -53,8 +57,10 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/
b2sums=('a2aa335a762573a8d41f0d0a908ffa16e5b3156aab29062a5e47a1a45d9d3ff793870c5565c86a4efc528f8b6a429a2e9ca6b3a905d5877a3edb4cd150c50638'
'8cff87d80bf30b86f995f77a97cc1ddb7b809148d100f3c0d74e706fe59eac52de55710fb7aed1abd59836c05f2474c7d68455736aac4f229d1cdf806d7240a1'
'8ffff827ed464af678497da5129eb69d3d1a4c6994bbcc00ef7f7b240cd04e7961c3c0ac52d6940252241406c04e647fac19c9327847afced33988eb15973ba8'
+ '7d5a74fa2edb4c89e664419d818650ec45b6a3efde3617a49737af014b0aa438ff3bdb06b87f6d31ef1851cafdffa5f4c3947f104127d376c6ea4806190676ae'
'3659d59eec3167bdb647cb622f15fe899516980ac92972393589574db23a580368b449812ec75ec74cfb86082a1c12896fc9f26b7c16c36ed9ad8506d41eac67'
'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3'
+ '6c6968f47962f521a0bdf710f4d001f03b0b64002193b43115ee20581990298a066a95c942275496069fe928f99bca5fb7ed395f9e99dee0b3b8e3dcc80aaebc'
'8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa'
'af47a9372ba990bc97d17362c8d89847177e6cbefaa241c23bcdc670ef29d82bf150983f4c730753cabaa77a01f8e966307831cdc192a92237d5f3e8e6599d2b'
'3936f88fab90b344299a62bb5bc836d03b1bb8293d2ca4cbb8a48468497119db2174f2b37a1775c0aed1be07107c4ae815f6308efa633abf76bbd6ba458ff66b'
@@ -63,8 +69,10 @@ b2sums=('a2aa335a762573a8d41f0d0a908ffa16e5b3156aab29062a5e47a1a45d9d3ff793870c5
'b256081baa22b6c0f2a56c4151393146451fe119cd724fc4d883331643e420348e6e6c54c4f32e34d287090e917f9223cac23b6275677e4c3d23cf4b38229904'
'85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8'
'58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501'
+ 'd34d673fe04d4317ef3c1ac3f088b6614f7c20414cfe44aa0ff71bdc932c517c4e6295492f158ced84232af8f54d1672ae56078b156593d58bf8fe7ffc3d475d'
+ '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
'7238e8642bbe469ecf68c577d96a772545f3a8c0917219cc18e952e2bce649a5412f77207103fb6865f4d2f34ae4d3034baf5f8adef160d4cd0402ea2d67c7b7'
- '499145e380d5e02cbe8f6f370ea102d2334d9df8b9bea51f62921b3f16bd5c1d2826470d082d25e56cf3ef0af3614880fae943c009c9bc690fdc78874dabca13'
+ '5747de68a01cb9c3e9654f7a9ef2cd3bf6fe996a92b6908b962fd0ebd97fd2f31d670ef8575f27adc72efa57bfeee396e1c554594bf9ed285d3d4f51c62ce4d1'
'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb'
'7287a10e71580c6924956f18d3f14c21a22bc80f9f40b9e8baa46e7f0c37367cd595879a41fdcd4ca2a27b517a8dfe77c23e71d136154636a14469685987ad99'
'be7eb543443b5b90b539fc2149572544f127951bf281ae8f01aff196b5a3b89abc71e4b34f763ff159fa575a8b070b4f3e2cbd0aece434c98a1a4c327fc8870f'
@@ -73,7 +81,7 @@ b2sums=('a2aa335a762573a8d41f0d0a908ffa16e5b3156aab29062a5e47a1a45d9d3ff793870c5
'0df5b69f4e56d41cdfc8365d2eda8361ec0dd8f474b578c9f90f7764b803fc63adaff1c4d7d2ebfcbd30a5e210a8836a03267531cb328e5629d96ea491e39ef9'
'2bdeb26873ad4ae8c8e202b1f76e411cc30ddf460d593d127ed0babb4466c9cb3848bd9440a668af046a13f3634245333dfc6e628988488bc40eae364b9c849d'
'135e962bcd5f5141c896f3edbad3aac7498f6a1be8ed8d926738e0064968e76437d1b25a794c11b96863c8cf9033b6b2060600f67ae4bba3a72cd32d789496ad'
- 'a074d8c2a5a248568ae063b365b32ca731618053269e641f99d491edffe3123b700c9b155143a623615577b734662eb6b8048014fadf182a6e67ce4834132af6'
+ '0f30448b0a800463acc093423adc7999196e14482b614af041051d0d417dc32d8bc6c1e8889cdacb4825733f6d315724d46823c01ee3484f06f41287cf92e2bc'
'ce6e6c6d90b96d9314d5a5e1faeb278b9b2f322f6dda81b55f688a2fe790188f7a185cb67449105176f9ef6f3fbccf1953182432a53970468a91dbcac073838b')
# official docs say to use lua51
@@ -89,16 +97,22 @@ prepare() {
sed -i 's/-Os/-O3/' Makefile
- # Hotfixes
+ # Apply the 0.E.3 changes that never had a formal release
+ patch -Np1 -i "$srcdir"/0.E.3.patch
+
+
+ # Backports from 0.F
# Fix Vehicle Heater and Cooler to be less severe
- # Included in 0.F
- patch -Np1 -i "$srcdir"/hotfix-vehicle-heater-cooler-intensity-reduced.patch
+ patch -Np1 -i "$srcdir"/0.F-backport-vehicle-heater-cooler-intensity-reduced.patch
# Fix tacoma barn doors being placed in the same spot twice
- # Included in 0.F
- patch -Np1 -i "$srcdir"/hotfix-tacoma-barn-door-position.patch
+ patch -Np1 -i "$srcdir"/0.F-backport-tacoma-barn-door-position.patch
+
+ # Fix npcs unable to drink from firestation and shelter basecamps wells
+ patch -Np1 -i "$srcdir"/0.F-backport-make-firestation-shelter-wells-npc-drinkable.patch
-
+
+ # Various other fixes for bugs I came across
# Fix Quiverfull house to have the correct stairs
patch -Np1 -i "$srcdir"/0001-quiverfull-house-correct-stairs.patch
@@ -122,6 +136,12 @@ prepare() {
# Fix community garden liquid fertilizer being in a pit instead of in the storage tanks
patch -Np1 -i "$srcdir"/0008-community-garden-fertilizer-not-spilled.patch
+
+ # Fix oxyacetylene to be craftable from oxygen tanks
+ patch -Np1 -i "$srcdir"/0009-oxyacetylene-from-oxygen.patch
+
+ # Fix ammo loudness mulitplying by six instead of two
+ patch -Np1 -i "$srcdir"/0010-ammo-loudness-ap-times-2.patch
}
build() {