From cf25e121c016e20d71ac1be096625bef1a382e4c Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 12 Jan 2023 09:08:26 -0800
Subject: Updated to 2022-10-23-1747

---
 PKGBUILD                  | 18 +++++++++---------
 npc-06_lapin-update.patch |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index d2632aa..2357b70 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=202210211508
-_pkgver=2022-10-21-1508
+pkgver=202210231747
+_pkgver=2022-10-23-1747
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -129,7 +129,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=('16f3b34db9ba15fe76bb3a608c79b87c558c80b067c1b844c97892a3219c54d0816d210cdd12c1b109483c7abe30bbc013a25d46fd590bd5d58131234ed0d3e0'
+b2sums=('c7ec9b3fdd4c9879659cba8ab192bb1fe4d87ee6231814211bb42e2fa1a817cf48463ae91163807242943ab8cf859c96edc2494306b26e9b9d717d938f318215'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -167,7 +167,7 @@ b2sums=('16f3b34db9ba15fe76bb3a608c79b87c558c80b067c1b844c97892a3219c54d0816d210
         '613a9d7a7a512cdf7dc1f1121ecaec7272efe740f5494ce425c3781d41a0ec92e044142d82a28c6445416e84699131745c6872c9b33cb5b93528d0197745455a'
         '71bd229c0ee32703e3fc44021939f2909adca148035e6bfac44f35cb68cd8e03c01b477bfb29fe05f568728f27bd5b6311a267338d05cdbd5680af0900324c08'
         'd3d582336519191f73c8cf3c7bbb0a8df8ecbb333d864a32ad4b263daaeb193f771aa4b9cbf00ab929b4296da6db31fd575bdb2b337148147a76e25459f703ad'
-        '17ded8bdfccef7555cc01727984c768ecc601878319bc8cc959cff51b5091335dd43f45cf69ec12dfd478644ccceab48c7a49c3469bbe3eee9ec9b380cfac7fb'
+        '93be2ff64a3217f92b369c067121683083859c7e939535e55f11818dc346d4862a50faa371315ad28ab54c9778c749d7684e8a7d68a18f774be3c2fe7891bd62'
         'd2c149bb48e3152100b02d138471ec107e172f282a05ee4bae321ef0828c758d0cf1f7a6e9bbb02bca14148d59d61f92abcbc5ddb9a7a0b7cba8db9cef22c391'
         'ac1a522d84fcfdea371027d05d486b752f921d03280d3db38766945ddb22c8ece946a2a67cbba656c31486c68a49a557d692e971fd7fd8b220865a3178628674'
         '3bf7da4e2efabe6b050aa357ec74c120e184a0a1bc6d4342fbb03a3c0cd0bae58c9fc1cda5f69ffdcc7e48a34f51f4a18107163f99348d2504096bccfd1766a9'
@@ -237,7 +237,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2022-10-21-1508"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2022-10-23-1747"|' Makefile
 
 
   # # # Hotfixes
@@ -582,15 +582,15 @@ build() {
   # tests "ifdef TILES" so "TILES=0" will enable tiles!
   # DYNAMIC_LINKING appears to be a windows flag?
   # TESTS disabled due to gcc 11.2 bug
-  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1
-  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 TILES=1 SOUND=1
+  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH_HEADER=0
+  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH_HEADER=0 TILES=1 SOUND=1
   ./lang/compile_mo.sh
 }
 
 package_cataclysm-bn() {
   cd "${_pkgname}-${_pkgver}"
 
-  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 install
+  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH_HEADER=0 install
 
   # Docs
   install -d "$pkgdir/usr/share/doc/cataclysm-bn"
@@ -621,7 +621,7 @@ package_cataclysm-bn-tiles() {
   depends=('cataclysm-bn' 'sdl2_image' 'sdl2_ttf' 'freetype2' 'sdl2_mixer')
   cd "${_pkgname}-${_pkgver}"
 
-  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 TILES=1 SOUND=1 install
+  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH_HEADER=0 TILES=1 SOUND=1 install
 
 
   # Icon
diff --git a/npc-06_lapin-update.patch b/npc-06_lapin-update.patch
index 132968a..d568b6e 100644
--- a/npc-06_lapin-update.patch
+++ b/npc-06_lapin-update.patch
@@ -96,7 +96,7 @@
 @@ -153,5 +212,30 @@
        "failure": "It's not a big deal, it isn't that urgent."
      },
-     "end": { "effect": [ { "u_buy_item": "petpack", "count": 1 } ] }
+     "end": { "effect": [ { "u_buy_item": "petpack", "count": 2 } ] }
 +  },
 +  {
 +    "id": "MISSION_Warrener_ISHERWOOD",
-- 
cgit v1.2.1