Switched to upstream provided icon file. And added some missing dependencies.

3 files changed, 10 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ff8b6b8fd9b..8ba51a1c25bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = toppler-git
 	pkgdesc = A reimplementation of the classic jump & run game "Nebulus"
-	pkgver = 1.3+r534.20220206.5e3e581
-	pkgrel = 2
+	pkgver = 1.3+7+r541.20220315.060f7dc
+	pkgrel = 1
 	url = https://gitlab.com/roever/toppler/
 	arch = i686
 	arch = x86_64
@@ -10,19 +10,19 @@ pkgbase = toppler-git
 	makedepends = gimp
 	makedepends = git
 	makedepends = imagemagick
+	makedepends = libpng
 	makedepends = povray
 	depends = gcc-libs
+	depends = sdl2
 	depends = sdl2_mixer
 	depends = zlib
 	optdepends = toppler-upstream-levels: The upstream levels as individual missions that can be played individually, and files that can be loaded into the level editor.
-	provides = toppler=1.3+r534.20220206.5e3e581
+	provides = toppler=1.3+7+r541.20220315.060f7dc
 	conflicts = toppler
 	replaces = toppler-darcs
 	source = toppler::git+https://gitlab.com/roever/toppler.git
 	source = toppler.desktop
-	source = toppler.png
 	sha256sums = SKIP
 	sha256sums = 828b4f8f6901e757de8cce76473caa1064b2db1375330eee370b0eff79909e9a
-	sha256sums = fff858bedef2a563cecf3379326d8fa6d7e2a18351cbbaac02ca0ae8176adedd
 
 pkgname = toppler-git
diff --git a/PKGBUILD b/PKGBUILD
index 04ddbd2a2ffb..8c6d828a14b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 
 _pkgname=toppler
 pkgname="${_pkgname}-git"
-pkgver=1.3+r534.20220206.5e3e581
-pkgrel=2
+pkgver=1.3+7+r541.20220315.060f7dc
+pkgrel=1
 pkgdesc='A reimplementation of the classic jump & run game "Nebulus"'
 arch=('i686' 'x86_64')
 url="https://gitlab.com/roever/toppler/"
 license=('GPL3')
-depends=('gcc-libs' 'sdl2_mixer' 'zlib')
-makedepends=('gettext' 'gimp' 'git' 'imagemagick' 'povray')
+depends=('gcc-libs' 'sdl2' 'sdl2_mixer' 'zlib')
+makedepends=('gettext' 'gimp' 'git' 'imagemagick' 'libpng' 'povray')
 optdepends=(
   "${_pkgname}-upstream-levels: The upstream levels as individual missions that can be played individually, and files that can be loaded into the level editor."
 )
@@ -20,13 +20,11 @@ replaces=("${_pkgname}-darcs")
 source=(
   "${_pkgname}::git+https://gitlab.com/roever/toppler.git"
   "${_pkgname}.desktop"
-  "${_pkgname}.png"  # Taken from legacy http://downloads.sourceforge.net/toppler/toppler-1.1.6.tar.gz and converted to smapper PNG.
 )
 
 sha256sums=(
   'SKIP'
   '828b4f8f6901e757de8cce76473caa1064b2db1375330eee370b0eff79909e9a'
-  'fff858bedef2a563cecf3379326d8fa6d7e2a18351cbbaac02ca0ae8176adedd'
 )
 
 pkgver () {
@@ -53,7 +51,7 @@ package() {
   cd "${srcdir}/${_pkgname}"
   make DESTDIR="${pkgdir}" install
   install -D -v -m644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-  install -Dm644 "${srcdir}/${_pkgname}.png" "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
+  install -Dm644 "dist/${_pkgname}.xpm" "${pkgdir}/usr/share/pixmaps/${_pkgname}.xpm"
   for _docfile in README.md doc/*; do
     install -D -v -m644 "${_docfile}" "${pkgdir}/usr/share/doc/${_pkgname}/${_docfile}"
   done
diff --git a/toppler.png b/toppler.png
deleted file mode 100644
index 640258c02761..000000000000
--- a/toppler.png
+++ /dev/null