From 15e302bafef9497ba81672cb6d28074c9ee22a95 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sun, 13 Dec 2020 13:12:57 -0800 Subject: Updated to official 0.E.3 release Fix npc inability to install Soporific Inducer Fix npc inability to install Gasoline Fuel Cell --- PKGBUILD | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index a0ecedd..4087f4c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,8 +12,8 @@ pkgbase=cataclysm-dda pkgname=(cataclysm-dda cataclysm-dda-tiles) pkgname=cataclysm-dda pkgver=0.E.3 -_pkgver=0.E-2 -pkgrel=1.7 +_pkgver=0.E-3 +pkgrel=1.9 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -26,7 +26,6 @@ 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" - "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" @@ -40,14 +39,15 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/ "0008-community-garden-fertilizer-not-spilled.patch" "0009-oxyacetylene-from-oxygen.patch" "0010-ammo-loudness-ap-times-2.patch" + "0011-npc-can-use-soporific.patch" + "0012-npc-can-use-gas-fuel.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" ) -b2sums=('a2aa335a762573a8d41f0d0a908ffa16e5b3156aab29062a5e47a1a45d9d3ff793870c5565c86a4efc528f8b6a429a2e9ca6b3a905d5877a3edb4cd150c50638' +b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0dd45e3d81a46b908b08e07b58a11a42ece4dd306f3e282805da121299f' '8cff87d80bf30b86f995f77a97cc1ddb7b809148d100f3c0d74e706fe59eac52de55710fb7aed1abd59836c05f2474c7d68455736aac4f229d1cdf806d7240a1' '8ffff827ed464af678497da5129eb69d3d1a4c6994bbcc00ef7f7b240cd04e7961c3c0ac52d6940252241406c04e647fac19c9327847afced33988eb15973ba8' - '7d5a74fa2edb4c89e664419d818650ec45b6a3efde3617a49737af014b0aa438ff3bdb06b87f6d31ef1851cafdffa5f4c3947f104127d376c6ea4806190676ae' '3659d59eec3167bdb647cb622f15fe899516980ac92972393589574db23a580368b449812ec75ec74cfb86082a1c12896fc9f26b7c16c36ed9ad8506d41eac67' 'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3' '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc' @@ -61,14 +61,12 @@ b2sums=('a2aa335a762573a8d41f0d0a908ffa16e5b3156aab29062a5e47a1a45d9d3ff793870c5 '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501' 'd34d673fe04d4317ef3c1ac3f088b6614f7c20414cfe44aa0ff71bdc932c517c4e6295492f158ced84232af8f54d1672ae56078b156593d58bf8fe7ffc3d475d' '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34' + '9cf47504583e16ba2a826bf9431f83ffd57121becb7980bbfb6996929a6bbb5a872cd2c310c4e1d457d59205b0abac306291722aba27ab7fa5a0bf45314d8b56' + '20fbcff9879bdc06a40f56289396a03a9d6fad8aaa7ade0154c6397c0e842d0d4e12aa05fa305153bab0cffdaea670cc91882b8def07f5f422bf010c7fbbc806' '7238e8642bbe469ecf68c577d96a772545f3a8c0917219cc18e952e2bce649a5412f77207103fb6865f4d2f34ae4d3034baf5f8adef160d4cd0402ea2d67c7b7' '5747de68a01cb9c3e9654f7a9ef2cd3bf6fe996a92b6908b962fd0ebd97fd2f31d670ef8575f27adc72efa57bfeee396e1c554594bf9ed285d3d4f51c62ce4d1' 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') -# official docs say to use lua51 -# but makefile supports lua52? -# lua53 works, but git HEAD detects/uses lua51? - prepare() { cd "Cataclysm-DDA-$_pkgver" sed -i 's/-Werror//' Makefile @@ -78,10 +76,6 @@ prepare() { sed -i 's/-Os/-O3/' Makefile - # 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 patch -Np1 -i "$srcdir"/0.F-backport-vehicle-heater-cooler-intensity-reduced.patch @@ -123,6 +117,12 @@ prepare() { # Fix ammo loudness mulitplying by six instead of two patch -Np1 -i "$srcdir"/0010-ammo-loudness-ap-times-2.patch + + # Fix npc not being able to install soporific inducer + patch -Np1 -i "$srcdir"/0011-npc-can-use-soporific.patch + + # Fix npc not being able to install gasoline fuel cell + patch -Np1 -i "$srcdir"/0012-npc-can-use-gas-fuel.patch } build() { -- cgit v1.2.1