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 bf2f084ee582..b0b48de955ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = toppler
 	pkgdesc = A reimplementation of the classic jump & run game "Nebulus"
 	pkgver = 1.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.com/roever/toppler/
 	arch = i686
 	arch = x86_64
@@ -9,16 +9,16 @@ pkgbase = toppler
 	makedepends = gettext
 	makedepends = gimp
 	makedepends = imagemagick
+	makedepends = libpng
 	makedepends = povray
 	depends = gcc-libs
+	depends = sdl2
 	depends = sdl2_mixer
 	depends = zlib
-	optdepends = toppler-levels: The upstream levels as individual missions that can be played individually, and files that can be loaded into the level editor.
+	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.
 	source = https://gitlab.com/roever/toppler/-/archive/v1.3/toppler-v1.3.tar.gz
 	source = toppler.desktop
-	source = toppler.png
 	sha256sums = 383f5e3a8ec880cdde073ef178ce217c98f2885c085d51fefdac46a9f99466cf
 	sha256sums = 828b4f8f6901e757de8cce76473caa1064b2db1375330eee370b0eff79909e9a
-	sha256sums = fff858bedef2a563cecf3379326d8fa6d7e2a18351cbbaac02ca0ae8176adedd
 
 pkgname = toppler
diff --git a/PKGBUILD b/PKGBUILD
index 302aafdc4aea..c4b36d75f894 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,25 +7,23 @@
 
 pkgname=toppler
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 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' 'imagemagick' 'povray')
+depends=('gcc-libs' 'sdl2' 'sdl2_mixer' 'zlib')
+makedepends=('gettext' 'gimp' 'imagemagick' 'libpng' 'povray')
 optdepends=(
-  "${pkgname}-levels: The upstream levels as individual missions that can be played individually, and files that can be loaded into the level editor."
+  "${pkgname}-upstream-levels: The upstream levels as individual missions that can be played individually, and files that can be loaded into the level editor."
 )
 source=(
   "https://gitlab.com/roever/toppler/-/archive/v$pkgver/toppler-v$pkgver.tar.gz"
   "$pkgname.desktop"
-  "$pkgname.png"
-  )
+)
 sha256sums=(
   '383f5e3a8ec880cdde073ef178ce217c98f2885c085d51fefdac46a9f99466cf'
   '828b4f8f6901e757de8cce76473caa1064b2db1375330eee370b0eff79909e9a'
-  'fff858bedef2a563cecf3379326d8fa6d7e2a18351cbbaac02ca0ae8176adedd'
 )
 
 build() {
@@ -37,7 +35,7 @@ package() {
   cd "$pkgname-v$pkgver"
   make DESTDIR="$pkgdir" install
   install -Dm644 "$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