[arch-commits] Commit in stone-soup/trunk (PKGBUILD)

[Ivy Foster]

    Date: Sunday, September 27, 2020 @ 23:56:02
  Author: escondida
Revision: 712786

update to 0.25.1; remove some no-longer-necessary workarounds

Modified:
  stone-soup/trunk/PKGBUILD

----------+
 PKGBUILD |   36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-27 22:51:17 UTC (rev 712785)
+++ PKGBUILD	2020-09-27 23:56:02 UTC (rev 712786)
@@ -1,42 +1,26 @@
 # Maintainer: Jakob Gruber <jakob.gruber at gmail.com>
 
 pkgname=stone-soup
-pkgver=0.24.0
-_majorver=0.24
+pkgver=0.25.1
 pkgrel=1
 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting'
 arch=('x86_64')
 url='https://crawl.develz.org/'
 depends=('lua51' 'ncurses' 'sdl2_image' 'sqlite' 'glu' 'freetype2' 'ttf-dejavu' 'python-yaml')
-makedepends=('bison' 'flex' 'gendesk' 'mesa')
+makedepends=('bison' 'flex' 'gendesk' 'mesa' 'pngcrush')
 conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git')
-license=('custom')
+license=(custom GPL2)
 install=stone-soup.install
-source=("https://crawl.develz.org/release/${_majorver}/stone_soup-${pkgver}-nodeps.tar.xz")
+source=("stone-soup-$pkgver.tar.xz::https://github.com/crawl/crawl/releases/download/$pkgver/stone_soup-$pkgver-nodeps.tar.xz")
+md5sums=(067f38e90dface242726e4b1572f1762)
 
-# used by gendesk to create .desktop file
-_exec=('crawl-tiles')
-_name=('Dungeon Crawl Stone Soup')
-
 package() {
-    cd "$srcdir"
     gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
             --exec 'crawl-tiles' --name 'Dungeon Crawl Stone Soup' PKGBUILD
 
     cd "stone_soup-${pkgver}/source"
 
-    # 0.16.0 weirdness
-    sed -i 's|SDL_main.h|SDL2/&|' main.cc
-
-    # git tarball weirdness
-    echo "$pkgver" > util/release_ver
-
-    # adjust makefile to use /usr/bin, owner root:root,
-    # disable setgid on executable
-
-    sed -i 's|bin_prefix    := bin|bin_prefix    := usr/bin|' Makefile
     sed -i 's/INSTALL_UGRP := games:games/INSTALL_UGRP := root:root/' Makefile
-    sed -i 's|MCHMOD := 2755|MCHMOD := 755|' Makefile
 
     # first build and install tiles version
 
@@ -43,8 +27,10 @@
     make DESTDIR="${pkgdir}" \
          SAVEDIR="~/.crawl/" \
          DATADIR="/usr/share/${pkgname}/data" \
-         USE_UNICODE=y \
          TILES=y \
+         EXTERNAL_LDFLAGS=$LDFLAGS \
+         prefix=/usr \
+         bin_prefix=bin \
          install
 
     # rename tiles executable to avoid clashing with console crawl
@@ -56,7 +42,9 @@
     make DESTDIR="${pkgdir}" \
          SAVEDIR="~/.crawl/" \
          DATADIR="/usr/share/${pkgname}/data" \
-         USE_UNICODE=y \
+         EXTERNAL_LDFLAGS=$LDFLAGS \
+         prefix=/usr \
+         bin_prefix=bin \
          install
 
     # install crawl license
@@ -70,6 +58,4 @@
         "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
     install -D -m644 "${srcdir}/${pkgname}.desktop" \
         "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-
 }
-md5sums=('49b1424ec0713e117c84085541a84071')