From e8dd4cd0f74b1e0c0578a8a38391f3e65292f27c Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sat, 6 May 2023 10:06:55 -0700 Subject: Updated to 2023-05-05-1323 Build with gcc12 until the build errors with gcc13 are fixed. --- PKGBUILD | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index df01d00..18facae 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,8 +15,8 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202305020922 -_pkgver=2023-05-02-0922 +pkgver=202305051323 +_pkgver=2023-05-05-1323 pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" @@ -27,7 +27,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') +makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle' 'gcc12') 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" @@ -146,7 +146,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=('03aeb0e3e2cb3d9a245a406b07ecd035d6993abdc9826e3a94399de085908ea083fc4f8bb4092437ff5661658c7a0f693a1c126b74c4fa8fcf6b7032f0b177ff' +b2sums=('9425448b02a6b561a9acfc757f1b23b5a7c052811f39b897bdab3f42ed4493b84325c15265cc668b1bbd1d5ca5f9ca9983fb1e4157657a9079b9829a38ea1865' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -272,7 +272,7 @@ 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-02-0922"|' Makefile + sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-05-05-1323"|' Makefile # # # Hotfixes @@ -662,6 +662,12 @@ prepare() { build() { cd "${_pkgname}-${_pkgver}" + export CC=gcc-12 + export CXX=g++-12 + export AR=gcc-ar-12 + export NM=gcc-nm-12 + export RANLIB=gcc-ranlib-12 + #export CFLAGS="$CFLAGS -fPIE" export CXXFLAGS="$CXXFLAGS -fPIE" export LDFLAGS="$LDFLAGS,-pie" -- cgit v1.2.1