From 9cfeeeb8296ea367120549d223ce87debda4702f Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Wed, 6 Jan 2021 05:55:38 -0800
Subject: Rebuild for 22 casing fix Fix lto

---
 0013-22-casings-can-stack.patch | 17 +++++++++++++++++
 PKGBUILD                        | 14 ++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 0013-22-casings-can-stack.patch

diff --git a/0013-22-casings-can-stack.patch b/0013-22-casings-can-stack.patch
new file mode 100644
index 0000000..4085863
--- /dev/null
+++ b/0013-22-casings-can-stack.patch
@@ -0,0 +1,17 @@
+--- a/data/json/items/generic/casing.json
++++ b/data/json/items/generic/casins.json
+@@ -32,13 +32,9 @@
+   { 
+     "id": "22_casing_new",
++    "copy-from": "casing",
+     "type": "GENERIC",
+-    "category": "spare_parts",
+-    "price": 100,
+     "name": { "str": "unused .22 casing" },
+-    "symbol": "=",
+-    "color": "yellow",
+     "description": "An unfired, like-new .22 round casing, with the primer still intact.",
+-    "material": [ "powder", "brass" ],
+     "volume": "3 ml",
+     "weight": "1 g"
+   },
diff --git a/PKGBUILD b/PKGBUILD
index 4087f4c..951e74d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=(cataclysm-dda cataclysm-dda-tiles)
 pkgname=cataclysm-dda
 pkgver=0.E.3
 _pkgver=0.E-3
-pkgrel=1.9
+pkgrel=1.10
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -41,6 +41,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/
         "0010-ammo-loudness-ap-times-2.patch"
         "0011-npc-can-use-soporific.patch"
         "0012-npc-can-use-gas-fuel.patch"
+        "0013-22-casings-can-stack.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"
@@ -63,6 +64,7 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         '9cf47504583e16ba2a826bf9431f83ffd57121becb7980bbfb6996929a6bbb5a872cd2c310c4e1d457d59205b0abac306291722aba27ab7fa5a0bf45314d8b56'
         '20fbcff9879bdc06a40f56289396a03a9d6fad8aaa7ade0154c6397c0e842d0d4e12aa05fa305153bab0cffdaea670cc91882b8def07f5f422bf010c7fbbc806'
+        'dd36b2b64e4999c0f188c837dae1f9c76d537a08b1c5996827a4d3028b688fe023be3711380189ed5c05316b17d6ab3e59669114ec699a3a0ee32808394ad12c'
         '7238e8642bbe469ecf68c577d96a772545f3a8c0917219cc18e952e2bce649a5412f77207103fb6865f4d2f34ae4d3034baf5f8adef160d4cd0402ea2d67c7b7'
         '5747de68a01cb9c3e9654f7a9ef2cd3bf6fe996a92b6908b962fd0ebd97fd2f31d670ef8575f27adc72efa57bfeee396e1c554594bf9ed285d3d4f51c62ce4d1'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -122,14 +124,18 @@ prepare() {
   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
+  patch -Np1 -i "$srcdir"/0012-npc-can-use-gas-fuel.patch
+
+  # Fix .22 casings not stacking when every other casing stacks
+  patch -Np1 -i "$srcdir"/0013-22-casings-can-stack.patch
+
 }
 
 build() {
   cd "Cataclysm-DDA-$_pkgver"
 
-  export CFLAGS="$CFLAGS -O3 -flto=4 -fPIE"
-  export CXXFLAGS="$CXXFLAGS -O3 -flto=4 -fPIE"
+  export CFLAGS="$CFLAGS -O3 -flto=auto -fPIE"
+  export CXXFLAGS="$CXXFLAGS -O3 -flto=auto -fPIE"
   export LDFLAGS="$LDFLAGS,-pie"
 
   # tests "ifdef TILES" so "TILES=0" will enable tiles!
-- 
cgit v1.2.1