Commit in angband/trunk (PKGBUILD)

[George Rawlinson]

    Date: Friday, January 20, 2023 @ 22:46:15
  Author: grawlinson
Revision: 1387185

upgpkg: angband 4.2.4-2: FS#68628

Modified:
  angband/trunk/PKGBUILD

----------+
 PKGBUILD |   63 ++++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 50 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-01-20 22:36:17 UTC (rev 1387184)
+++ PKGBUILD    2023-01-20 22:46:15 UTC (rev 1387185)
@@ -10,28 +10,48 @@
 
 pkgname=angband
 pkgver=4.2.4
-pkgrel=1
-pkgdesc="A roguelike dungeon exploration game based on the writings of JRR 
Tolkien"
+pkgrel=2
+pkgdesc='A roguelike dungeon exploration game based on the writings of JRR 
Tolkien'
 arch=('x86_64')
-url="https://rephial.org/";
+url='https://rephial.org/'
 license=('GPL2' 'custom')
-depends=('sdl2' 'sdl2_ttf' 'sdl2_image' 'sdl2_mixer' 'ncurses' 
'xorg-fonts-misc')
-makedepends=('python-docutils')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/angband/angband/archive/$pkgver.tar.gz";)
-sha512sums=('5b47cfa95f779aa3f1e89f02f203b8eafd2dc1376b7aab1b62e37122fb83640d1de25f39817863a74c246d7de35bb3f26868f5f5e8906e92788a6dd74a85a4c5')
-b2sums=('97c19f23aff3aa1e9aedcbe33da0e9806f923c251e80dde54492d62dc5d54c58943483ea3b0da1913043deef9d3d52f89bdc3dced0870142f06c6ab6edc33615')
+depends=(
+  'sdl2'
+  'sdl2_ttf'
+  'sdl2_image'
+  'sdl2_mixer'
+  'ncurses'
+  'xorg-fonts-misc'
+  'xorg-mkfontscale'
+  'hicolor-icon-theme'
+)
+makedepends=('git' 'python-docutils')
+_commit='ae4c7293778346b4307583911537c2db4401397f'
+source=("$pkgname::git+https://github.com/angband/angband#commit=$_commit";)
+b2sums=('SKIP')
 
+pkgver() {
+  cd "$pkgname"
+
+  git describe --tags | sed 's/^v//'
+}
+
+prepare() {
+  cd "$pkgname"
+
+  # fix icons & desktop files
+  git cherry-pick --no-commit 167668321504e2a585882487842f032cc5956507
+}
+
 build() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname"
 
-  autoreconf -vfi
+  ./autogen.sh
 
   ./configure \
     --prefix=/usr \
     --bindir=/usr/bin \
     --sysconfdir=/usr/share/angband \
-    --with-configpath=/usr/share/angband \
-    --with-libpath=/usr/share/angband \
     --enable-sdl2 \
     --enable-sdl2-mixer
 
@@ -39,9 +59,26 @@
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname"
 
   make DESTDIR="$pkgdir" install
 
+  # license
   install -vDm644 docs/copying.rst 
"$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+
+  # see above cherry pick in prepare()
+  # hopefully the following is fixed by next release
+  pushd "$pkgdir/usr/share/angband/icons"
+  # application icons
+  for i in 16 32 128 256 512; do
+    install -vDm644 "att-${i}.png" 
"$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
+  done
+
+  # desktop files
+  install -vDm644 -t "$pkgdir/usr/share/applications" 
angband-{x11,sdl2}.desktop
+
+  # metainfo
+  install -vDm644 -t "$pkgdir/usr/share/metainfo" angband.metainfo.xml
+  popd
 }