From 3c46f9d20efff525017ea458f2a4574c944be8f3 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sun, 18 Jul 2021 21:09:41 -0700
Subject: PKGBUILD

---
 PKGBUILD | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 3626605..519d509 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202106271806
-_pkgver=2021-06-27-1806
+pkgver=202107181757
+_pkgver=2021-07-18-1757
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -34,6 +34,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "0.F_backport-tacoma-barn-door-position.patch"
         "0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch"
         "0.F_backport-inhaler-mission-no-autofail.patch"
+        "0.F_backport-radio-can-use-ups.patch"
 
         "0001-quiverfull-house-correct-stairs.patch"
         "0002-ankle-ammo-pouch-is-not-a-backpack.patch"
@@ -55,6 +56,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "0018-rehide-redacted.patch"
         "0019-derelict-shed-is-s.patch"
         "0020-hk46-is-milspec.patch"
+        "0021-foldable-bottle-is-container.patch"
 
         "jc_ammo-loudness-ap-times-2.patch"
         "jc_allow-bio-firestarter-on-smoker.patch"
@@ -71,7 +73,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=('3c2c3e850aa96f383bf49382f5e83dad324dd89ad2e8d5230c07d772a31ffaa0f40bb273cab41b97f8eed45588c3111d098585b676166128e3aaff79b8312175'
+b2sums=('092f07a8349d287f9b98467cdb8b200a81cfd8c289351a5a69a05873db57b265d808755ea1a570f76377c968a66f79a3e4df8155f1b79d40d69bf603bcb166a9'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -79,9 +81,10 @@ b2sums=('3c2c3e850aa96f383bf49382f5e83dad324dd89ad2e8d5230c07d772a31ffaa0f40bb27
         'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3'
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
         '9e2c26bf0e2bb4fd60de8cad1f9c05f329d99a56c64189bc2747915c48d208b63038d45a90f7a1c8e8bb0ac33461f217acf7e57f752f0acff117e2062459e9bb'
+        '51b1324506179f7fadd8bc187eb8db939494483597b0b7b63909cec66f4e94b27888ccfa926bbd2ff8b0e80108ecc373118c202a177fc2ebd4f5231f87f09a83'
         '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa'
         '025213998583972e7551bd7bd7376ab65857e28d4338fab60ae792a6b3bd48983aec77e5143baaa63d4f3feb7cd590c4bded529c410e4d18f2b8c5813f25daa3'
-        'ade420aa80816ebcf19485bb4617352a1654c8e436babc3e51290757432e44dd69da3a4403c1e9dab816b2d2d0db70a86504f707e9d3696a192ecef30622fc9b'
+        '57e830004122ad835f84fd45c0965b7801b7355dcfef22c4e83969460f181d86110a7e37cc87a196238aa745ac8c9db99f97cf87edf7ef0fd8cfd16cf38d22cc'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
         '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8'
         '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501'
@@ -99,6 +102,7 @@ b2sums=('3c2c3e850aa96f383bf49382f5e83dad324dd89ad2e8d5230c07d772a31ffaa0f40bb27
         '651de880cefd51665d854414c451cc80a33ed8f34e7559a95514abd81a2f58348c37dd75f272468eefd56562ba8c99093a6dd9af3ea57796a9db15164a40eda3'
         '7e41fc3a95073008ca2d71c2266d6d1a17af7803d493b447d40b15a86184c8ce3728b8d3d36765d408b1c46633d1bfa980d878cbac2e04b51ef518d44dfb7295'
         '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46'
+        '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         'edfccb4ccb70e174648101d68432ea14ee1e7cc9304d4545dddb65184eeafb708a898cc90778e44cf7464c82c9d350209e5ad262c50a50fa0b8ae3a22fca9ff9'
         '8e9bf6ff4bafc6397c6631392aaddd2866537943ae3bbdb95282945acba385d66f6d9879fd283eeafbb8df4e927f3ecc061fb36ecb5d38dbddecd2fd9c735e56'
@@ -107,9 +111,9 @@ b2sums=('3c2c3e850aa96f383bf49382f5e83dad324dd89ad2e8d5230c07d772a31ffaa0f40bb27
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
         'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9'
         '0dc275d5e1aa79b2cf73f7e997ea2b602690787ae15e3abdd3b9195bb409d511c74d4f7dca4bf1753a9afb4618f04cb462769c24999357dea62593a379411f42'
-        '5cb907c38f28a16306ba885aa9b61f16239817039c5c00f73f5215577b0bd197747a7b8c80b5fa857d5f91567cf861a1e0822dfd74033c4db700de872f9133ba'
-        '59d69127a79d1c9f09dd324903ed0b4793991ae1d3f45f01c4710e329cd222fafbf252a29275345072c370245931c3e897a586044a46a83c13225a288bc96993'
-        '8fc23de05cc0d4ea63e921dd5c575ee83715753d2f2d0b9f0d503cb14a3263af4970fa5fb19a9b8387414b501f3dc4b8b6c91db4c929f9543556a7973a84a3b1'
+        '8ebe9659ecf69f449ef18857fdece2e814be98e426a925cc61e07ed382962f3ec17bdbccbcdada59571b5a0ce9bc4e5b438e9904db9b3af832e8c9468244081e'
+        'ba0bd9be874e134914334a5baaef843162003adc0253dae32f1a052da6da59e108808852f51b05350ae6ae074f8d15d88cfcf93f49174c47b924f0f9d7fbd206'
+        '7efe8626da0a61d4d40eded2573c1a276f54baa10914c20e07645a83ccc7c2ccb1f0f49a88042fb6fdc36166d9c8bb5442d37bd7ccecf5e9388efda834ec61e5'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
 
 prepare() {
@@ -124,11 +128,10 @@ prepare() {
   sed -i 's|TARGET_NAME = cataclysm|TARGET_NAME = cataclysm-bn|' Makefile
   sed -i 's|cataclysm.a|cataclysm-bn.a|' Makefile
   sed -i 's|cataclysm.a|cataclysm-bn.a|' tests/Makefile
-  sed -i 's|cataclysm-dda|cataclysm-bn|' lang/CMakeLists.txt
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2021-06-27-1806|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2021-07-18-1757|' Makefile
 
 
   # gcc11 support
@@ -148,6 +151,9 @@ prepare() {
   # Fix npcs with the inhaler mission instantly dying upon mission acceptance
   patch -Np1 -i "$srcdir"/0.F_backport-inhaler-mission-no-autofail.patch
 
+  # Fix radio, e-ink reader music, tactical tonfa not working with UPS
+  patch -Np1 -i "$srcdir"/0.F_backport-radio-can-use-ups.patch
+
 
   # Various other fixes for bugs I came across
   # Fix Quiverfull house to have the correct stairs that modify json
@@ -211,6 +217,9 @@ prepare() {
   # Stop police and SWAT carrying 4.6mm magazines despite having no compatible weapons
   patch -Np1 -i "$srcdir"/0020-hk46-is-milspec.patch
 
+  # Mark the foldable plastic bottle and steel water bottle as containers
+  patch -Np1 -i "$srcdir"/0021-foldable-bottle-is-container.patch
+
 
   # Various other fixes for bugs I came across that modify src
   # Fix ammo loudness mulitplying by six instead of two
-- 
cgit v1.2.1