Updated to 2023-05-12-0617

2 files changed, 6 insertions, 88 deletions

diff --git a/0001-Fix-build-with-gcc13.patch b/0001-Fix-build-with-gcc13.patch
deleted file mode 100644
index d4aacf6..0000000
--- a/0001-Fix-build-with-gcc13.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From f566ae0b4818e4f656711980c81cef45245f8e67 Mon Sep 17 00:00:00 2001
-From: aqua <aqua@iserlohn-fortress.net>
-Date: Sun, 7 May 2023 09:37:40 +0300
-Subject: [PATCH] Fix build with gcc13
-
----
- CMakeLists.txt     | 6 ++----
- src/hash_utils.h   | 1 +
- src/om_direction.h | 3 ++-
- src/units_mass.h   | 1 +
- 4 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dfc1533d737..88783ece7a9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -219,7 +219,7 @@ IF(MSVC)
-     endif()
- ELSE()
-     SET(CATA_WARNINGS
--        "-Werror -Wall -Wextra \
-+        "-Wall -Wextra \
-        -Wformat-signedness \
-        -Wlogical-op \
-        -Wmissing-declarations \
-@@ -230,9 +230,7 @@ ELSE()
-        -Wpedantic \
-        -Wsuggest-override \
-        -Wunused-macros \
--       -Wzero-as-null-pointer-constant \
--       -Wno-unknown-warning-option \
--       -Wno-range-loop-analysis")
-+       -Wzero-as-null-pointer-constant")
-     IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES Windows)
-         SET(CATA_WARNINGS "${CATA_WARNINGS} -Wredundant-decls")
-     ENDIF()
-diff --git a/src/hash_utils.h b/src/hash_utils.h
-index 28241d1570a..1fa418ff518 100644
---- a/src/hash_utils.h
-+++ b/src/hash_utils.h
-@@ -2,6 +2,7 @@
- #ifndef CATA_SRC_HASH_UTILS_H
- #define CATA_SRC_HASH_UTILS_H
- 
-+#include <cstdint>
- #include <functional>
- 
- // Support for hashing standard types.
-diff --git a/src/om_direction.h b/src/om_direction.h
-index 04c4d41d5c5..58c05da6894 100644
---- a/src/om_direction.h
-+++ b/src/om_direction.h
-@@ -2,8 +2,9 @@
- #ifndef CATA_SRC_OM_DIRECTION_H
- #define CATA_SRC_OM_DIRECTION_H
- 
--#include <climits>
- #include <array>
-+#include <climits>
-+#include <cstdint>
- #include <string>
- 
- struct point;
-diff --git a/src/units_mass.h b/src/units_mass.h
-index abf7ee91d0c..2fe1880ba96 100644
---- a/src/units_mass.h
-+++ b/src/units_mass.h
-@@ -3,6 +3,7 @@
- #define CATA_SRC_UNITS_MASS_H
- 
- #include <algorithm>
-+#include <cstdint>
- 
- #include "units_def.h"
- 
--- 
-2.40.1
-
diff --git a/PKGBUILD b/PKGBUILD
index c4fdb67..f1e3b0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,9 +16,9 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202305051323
-_pkgver=2023-05-05-1323
-pkgrel=2
+pkgver=202305120617
+_pkgver=2023-05-12-0617
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -34,8 +34,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-bn-tiles.desktop"
         "icon_128x128.png"
 
-        "0001-Fix-build-with-gcc13.patch"
-
         "revert-01_removed-traits.patch"
         "revert-02_revert-book-revamp.patch"
         "revert-03_generic-nv.patch"
@@ -149,11 +147,10 @@ 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=('9425448b02a6b561a9acfc757f1b23b5a7c052811f39b897bdab3f42ed4493b84325c15265cc668b1bbd1d5ca5f9ca9983fb1e4157657a9079b9829a38ea1865'
+b2sums=('748c90252353f17d232e9ba8ba0b2f8c0098bb32e1e89bd21f1310f6d5a90af89a053f2154562b0e5bcd7711669eddd64dcd10eda75b6739eacfb1f289b9a3ed'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
-        'cac44870cb913e328aa20fdcce66fbc6047918bdef5ba44418e69ed2388448d3e592517ae830480a3c64c119725f71766720076d1c8f3f8c0122796025180898'
         'fdef1f81084e7b08203b8464f37a00e2efc8b11d423c6e6b82e612392d91047160d2bc472b63c836ebc48adee0b4f2b3434c3e07eed5876275b234e69d7f6b9c'
         'b143b75105f875159b7766b316c6e36feeba21bc5151fc11bb85785949e905dd964ec14b818e9424cc94773a001eb406cd5ef50fe1f73aacc7f2f82a3545b7ee'
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
@@ -276,12 +273,11 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-05-05-1323"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-05-12-0617"|' Makefile
 
 
   # # # Hotfixes
-  echo "Applying hotfixes"
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/0001-Fix-build-with-gcc13.patch
+  #echo "Applying hotfixes"
 
 
   # # # Reverts