diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 32 |
1 files changed, 8 insertions, 24 deletions
@@ -13,9 +13,9 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202206212053 -_pkgver=2022-06-21-2053 -pkgrel=2 +pkgver=202207062051 +_pkgver=2022-07-06-2051 +pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -25,7 +25,7 @@ arch=('x86_64' 'aarch64') license=("CCPL:by-sa") options=(lto) depends=('ncurses' 'hicolor-icon-theme' 'gettext') -makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle' 'gcc11') +makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle') source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/cbn-experimental-$_pkgver.tar.gz" "cataclysm-bn.desktop" "cataclysm-bn-tiles.desktop" @@ -90,8 +90,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "recipes-01_4570-dragon-can-be-dismantled.patch" - "sound-01_fix-broken-smash-fail.patch" - "terrain-01_migo-platform-landing-pad.patch" "terrain-03_tacoma-clinic-add-missing-floor.patch" "terrain-04_lumbermill-gasoline-not-spilled.patch" @@ -129,7 +127,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=('4c6e445bf339b8c094e1003eceedcc35885c9a5dc9139ddfaddcf149bc8edf8fc11ba2a0d057373051d59362f75fc67802f11877b988a952f958dc103d746d23' +b2sums=('a8f9d5453737070e5c012a0c741fc648b2a09fc9d64c308ec8a6739ca3dd1badc71daa74208b2c5574a03e0e5b1b21918df2714fafc6a13dc80d7c6497c89125' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -174,7 +172,6 @@ b2sums=('4c6e445bf339b8c094e1003eceedcc35885c9a5dc9139ddfaddcf149bc8edf8fc11ba2a '9bb382d203bfb6534b38ce54e53046f4a25a08b53620453f04b71b72b6994d55e9348306d9ea1186180dbce25811fdfce938f7b6e45286e523540fb3c22ab9bc' 'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e' '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f' - 'ee51e67633252dc7af9117891dc1ece1bfa5f5660bdf665404747a756a828affcd072fa114e3911355bc38a2b6ce9e1e1156c5e5f4d33a3655750e08b2a4e6ae' '0b34beb3afa14605d73d84f1d75bf8182ff0fcb2396e82d06e170cf0dc0d30386071959bd1be3553182c37bb5661a81cf6be8c4e0a14e4df0b01889cfe7edaf1' 'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e' '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8' @@ -201,9 +198,9 @@ b2sums=('4c6e445bf339b8c094e1003eceedcc35885c9a5dc9139ddfaddcf149bc8edf8fc11ba2a '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b' 'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e' 'd05c48c376f23dd7fda2b5249b5985665de8344774f420a95151f7484ab33c38fb78b2ff279cedf762877dca3abd91c4d9e4900547e9c31e7636e1d90cc13d2b' - '2544ca15718f7bd9d166bb4db81041143df252f16a56f8b2ccec286af5881fef223942d4f7f3d896359d3fbf0a41aab1a2829ae1c7b109bb8258194f64813061' + '98dc920e6a9593e63e5d0ef761a55ec38f2520dc2e92e632ca5b570e2abebe53a04f200f277740f15819c3e597601d3c14048ed58d00ac92f19c2908a8b63044' 'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596' - 'ce10e7d8457ad71d7bad75c68b32c60f4ea12ddf52407816f27ff05677bc789f6af33dabb734d17fbb5037d58c6041673752f332d2bf676604565f8d60e8078c' + 'ab67483296320c0b577f5a68a2058ca49ea2350346c21c47bb29871589a59096330859993fd7cfcd7e0e7389727b15519f196c5a58dee9f7acca721302265ff1' 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') prepare() { @@ -224,7 +221,7 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = 2022-06-21-2053|' Makefile + sed -i 's|VERSION = unstable|VERSION = 2022-07-06-2051|' Makefile # # # Hotfixes @@ -431,12 +428,6 @@ prepare() { patch -Np1 -i "$srcdir"/recipes-01_4570-dragon-can-be-dismantled.patch - - echo "Applying sound fixes" - # Fix smash_fail not detecting variant type since gcc 11.2 - patch -Np1 -i "$srcdir"/sound-01_fix-broken-smash-fail.patch - - # # terrain and overmap fixes echo "Applying terrain and overmap fixes" @@ -558,13 +549,6 @@ build() { export CXXFLAGS="$CXXFLAGS -fPIE" export LDFLAGS="$LDFLAGS,-pie" - # Use gcc11 until game-breaking liquid segfaults are fixed. - export CC=gcc-11 - export CXX=g++-11 - export AR=gcc-ar-11 - export NM=gcc-nm-11 - export RANLIB=gcc-ranlib-11 - # 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 |