From d462976880e311e8cf122099b43e1293f58544e9 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 13 Apr 2024 10:48:17 -0700
Subject: Backport: -dried rice negative calories fix -vsync toggle support
 -Several Necropolis fixes

---
 PKGBUILD | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index 76cb6ce..9a438a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _pkgname=Cataclysm-BN
 pkgver=0.6.0
 #pkgver=202310040030
 #_pkgver=2023-10-04-0030
-pkgrel=3
+pkgrel=4
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -36,6 +36,13 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "cataclysm-bn-tiles.desktop"
         "icon_128x128.png"
 
+        "hotfix-01_fix-negative-calories-when-creating-dry-rice-4373.patch"
+        "hotfix-02_perf-disable-vsync-by-default-4414.patch"
+        "hotfix-03_fix-enable-vsync-by-default-4433.patch"
+        "hotfix-04_fix-mapgen-fix-for-level-0-of-the-Necropolis-4380.patch"
+        "hotfix-05_fix-more-fix-for-level-0-of-the-Necropolis-4387.patch"
+        "hotfix-06_fix-more-fix-for-level-0-of-the-Necropolis-2-4426.patch"
+
         "revert-01_removed-traits.patch"
         "revert-02_revert-book-revamp.patch"
         "revert-03_generic-nv.patch"
@@ -162,6 +169,12 @@ b2sums=('1a311f72d159194d8737b75a484d015caf75a1920b1e9eaa0bdbcd9c0bb8aceda1f59a5
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
+        '211eb5f17622546e41b21a6df3a54a777773fa092cad6818fece68975ceade9064f61735d44736f6b5fe4a320fc03855532b69ae9de6652806c1468c6979caf9'
+        '4d8996d5a29b539c9dfd6a970d4a6c51faf4739038ebaf40bfc8ad066219fc1605be028fb5c00588d73d0a8c930b3c867db0ce1c3174df172d1551901b428e4a'
+        'e2cb955fe450bd9a06b82abf755dae72d8012e454c43ad69d1654a67d0c304769817087a03604da21b9f478bdc8365c95fee3d746a58a7bd007f652e9902d244'
+        'a22b8b17d97b09d622ca777743224a164be5b7be3e7f763aa8b94eebc2a5447d5d7875587562987faacd68613628093bf215c38ad5544a8d48a2b4e8bca7c587'
+        '2acab6e5fb1c51f6b09ee13893917c9876f0009f9c8537d93f13563b461b9855722d3c1dc55803aee5922a9283da41656ec62dbf30cf6d265e858fd397762067'
+        'bc6b14d6000412cea47bbe1bf3a4a56f06c13afcffd555cfe93d99e5d3b16ce66b0cb2458cd211dcf097974870b78876c2f3f056eb8f9304c4c85b2655dfe831'
         'fdef1f81084e7b08203b8464f37a00e2efc8b11d423c6e6b82e612392d91047160d2bc472b63c836ebc48adee0b4f2b3434c3e07eed5876275b234e69d7f6b9c'
         '2b42190f1d7189a38b3424efe64fd1b3921919a4f6fc872462ef684587de94b900e93f159597ab3e6f576268fed3e6966cddc3fa7250e1b746095fd7a2cbf6e9'
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
@@ -303,6 +316,18 @@ prepare() {
   # # # Hotfixes
   echo "Applying hotfixes"
 
+  # Fix dried rice having negative calories
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-01_fix-negative-calories-when-creating-dry-rice-4373.patch
+
+  # Allow disabling vsync and enable vsync by default as disabling it causes problems for some users
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-02_perf-disable-vsync-by-default-4414.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-03_fix-enable-vsync-by-default-4433.patch
+
+  # Backport some fixes for the Necropolis
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-04_fix-mapgen-fix-for-level-0-of-the-Necropolis-4380.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-05_fix-more-fix-for-level-0-of-the-Necropolis-4387.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-06_fix-more-fix-for-level-0-of-the-Necropolis-2-4426.patch
+
 
   # # Adjust default mods
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-20_fix-default-mods.patch
-- 
cgit v1.2.1