angband: update to 4.1.0

2 files changed, 20 insertions, 38 deletions

diff --git a/libre/angband/PKGBUILD b/libre/angband/PKGBUILD
index aa3bb3915..61f0c2778 100644
--- a/libre/angband/PKGBUILD
+++ b/libre/angband/PKGBUILD
@@ -6,12 +6,13 @@
 # Contributor (Arch): Callan Barrett <wizzomafizzo@gmail.com>
 # Contributor (Arch): Christian Schmidt <xmucknertx@googlemail.com>
 # Contributor (Arch): Sebastian Sareyko <public@nooms.de>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
-# Contributor: Márcio Silva <coadde@hyperbola.info>
+# Contributor: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
+# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 
 pkgname=angband
 _pkgname=$pkgname-libre
-pkgver=4.0.5
+pkgver=4.1.0
 pkgrel=1.parabola1
 pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien, without nonfree artwork and sound effects"
 arch=('i686' 'x86_64' 'armv7h')
@@ -25,7 +26,7 @@ mksource=("http://rephial.org/downloads/${pkgver:0:3}/${pkgname}-${pkgver}.tar.g
 source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" 'libre.patch')
 
 mksource() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-master"
 
   # remove nonfree stuff from source
   rm -v lib/sounds/*.mp3
@@ -33,7 +34,7 @@ mksource() {
 }
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-master"
 
   # Fix detection of ncurses config script for ncurses 6.0
   sed -i 's/ncursesw5-config/ncursesw6-config/g' acinclude.m4
@@ -43,7 +44,10 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-master"
+
+  # ld fix for 4.1.0-1.parabola1
+  sed -i 's/-Wl,-r/& -no-pie/' src/Makefile
 
   ./autogen.sh
 
@@ -61,7 +65,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-master"
 
   make DESTDIR="${pkgdir}" install
 
@@ -69,6 +73,6 @@ package() {
   install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
 
-mkmd5sums=('82d28d0e51b167fb2b66603e310d9def')
-md5sums=('5cd4afb6d2b7fbf11db34f03121cf7e3'
-         '06d123697d06a8a08f5367fae3c38137')
+mksha256sums=('ea52266e52b66d6bf2ab3728b3bc6c7c3875130973430021e31bf56000c0df8b')
+sha256sums=('07a50b78ff06acee720a0ca11597c69a133aeac6b479dcf2b0101e8402c4b522'
+            'fa1524d1a3c5768b9090630d16393274fe007f87f3c0a00c4ffb5fc66e84fee9')
diff --git a/libre/angband/libre.patch b/libre/angband/libre.patch
index 1a41cb6ab..429906cae 100644
--- a/libre/angband/libre.patch
+++ b/libre/angband/libre.patch
@@ -170,31 +170,9 @@ diff -Nur angband-4.0.0.orig/lib/sounds/Makefile angband-4.0.0/lib/sounds/Makefi
  PACKAGE = sounds
  
 diff -Nur angband-4.0.0.orig/lib/sounds/sound.cfg angband-4.0.0/lib/sounds/sound.cfg
---- angband-4.0.0.orig/lib/sounds/sound.cfg	2015-06-29 17:19:11.000000000 -0300
-+++ angband-4.0.0/lib/sounds/sound.cfg	2015-07-02 01:25:08.074947841 -0300
-@@ -9,21 +9,6 @@
- # hit = hit.mp3 hit1.mp3
- #
- 
--#
--# This is the Dubtrain Angband Sound config list, v.3.1.0 - February 24th, 2009
--#
--# Licensed under a Creative Commons non-commercial agreement
--#
--# Inspired by the original Craig's Angband Sound Patch.
--#
--# But with all new sounds.
--#
--# contact angband@dubtrain.com
--#
--# download zipped archive at www.dubtrain.com/angband
--#
--#
--
- [Sound]
- 
- #
-@@ -31,484 +16,484 @@
+--- angband-4.0.0.orig/lib/sounds/sound.cfg	2017-09-14 17:19:11.000000000 -0300
++++ angband-4.0.0/lib/sounds/sound.cfg	2017-09-14 18:25:08.074947841 -0300
+@@ -31,484 +31,484 @@
  #
  
  # Town during the day.
@@ -548,9 +526,9 @@ diff -Nur angband-4.0.0.orig/lib/sounds/sound.cfg angband-4.0.0/lib/sounds/sound
 -notice = id_bad_hmm.mp3
 +notice =
  
- # You notice something about your equipment or inventory.
--pseudo_id = id_good_hmm.mp3
-+pseudo_id =
+ # You learn a rune.
+-rune = id_good_hmm.mp3
++rune =
  
  # You successfully cast a spell.
 -cast_spell = plm_spell1.mp3 plm_spell2.mp3 plm_spell3.mp3