Trying to fix the icons

2 files changed, 47 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5570c0bc237..7450ce7b4ed5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = infra-arcana
 	pkgdesc = Roguelike game inspired by H.P. Lovecraft
 	pkgver = 22.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://sites.google.com/site/infraarcana/home
 	install = infra-arcana.install
 	arch = i686
 	arch = x86_64
 	license = custom:Infra Arcana License
+	makedepends = icoutils
 	depends = sdl2_image
 	depends = sdl2_mixer
 	depends = hicolor-icon-theme
diff --git a/PKGBUILD b/PKGBUILD
index 4212088ab3c0..09174fdb20de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 #Maintainer: zayatura <zayatura@tutanota.com>
 pkgname=infra-arcana
 pkgver=22.0.0
-pkgrel=1
+pkgrel=2
 epoch=
 pkgdesc="Roguelike game inspired by H.P. Lovecraft"
 arch=('i686' 'x86_64')
 url="https://sites.google.com/site/infraarcana/home"
 license=('custom:Infra Arcana License')
 groups=()
-makedepends=()
+makedepends=(icoutils)
 depends=('sdl2_image' 'sdl2_mixer' 'hicolor-icon-theme')
 conflicts=('infra-arcana-git')
 
@@ -24,41 +24,60 @@ sha256sums=('776a083044ad877f2c5fca5fcf73b92f286629df73dff6ae77720b3831c0148c'
          'c7738445681a33b5a1ca95528c0d3a6131bd867d6ce76f3b64677cee846a83c3'
          'fc7f7ab24e2e5adc8958842b27925ad97037b82fc8e722f4aaf14573f3308c82')
 
+prepare() {
+  icotool -x -o . icon_v$pkgver.ico
+}
+
 package() {
   cd $srcdir/ia_linux_x64_v$pkgver
   
   #install licenses
   install -DTm644 "./LICENSE.txt"\
-          "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
   install -DTm644 "./LICENSE-FONT-SPECIAL-ELITE.txt" \
-          "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-FONT-SPECIAL-ELITE.txt"
-        install -DTm644 "./LICENSE-AUDIO.txt"\
-          "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-AUDIO.txt"
-        install -DTm644 "./LICENSE-FONT-DEJAVU.txt"\
-          "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-FONT-DEJAVU.txt"
-        install -DTm644 "./LICENSE-FONTS.txt"\
-          "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-FONTS.txt"
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-FONT-SPECIAL-ELITE.txt"
+  install -DTm644 "./LICENSE-AUDIO.txt"\
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-AUDIO.txt"
+  install -DTm644 "./LICENSE-FONT-DEJAVU.txt"\
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-FONT-DEJAVU.txt"
+  install -DTm644 "./LICENSE-FONTS.txt"\
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-FONTS.txt"
+
   #install docs
   install -DTm644 "./contact.txt" \
-          "${pkgdir}/usr/share/doc/${pkgname}/contact.txt"
+    "${pkgdir}/usr/share/doc/${pkgname}/contact.txt"
   install -DTm644 "./credits.txt" \
-          "${pkgdir}/usr/share/doc/${pkgname}/credits.txt"
+    "${pkgdir}/usr/share/doc/${pkgname}/credits.txt"
   install -DTm644 "./release_history.txt" \
-          "${pkgdir}/usr/share/doc/${pkgname}/release_history.txt"
+    "${pkgdir}/usr/share/doc/${pkgname}/release_history.txt"
+
   # copy data
-        mkdir -p "${pkgdir}/opt/${pkgname}/"
-        cp -R ./audio "${pkgdir}/opt/${pkgname}/"
-        cp -R ./data "${pkgdir}/opt/${pkgname}/"
-        cp -R ./gfx "${pkgdir}/opt/${pkgname}/"
-        cp ./manual.txt "${pkgdir}/opt/${pkgname}/"
+  mkdir -p "${pkgdir}/opt/${pkgname}/"
+  cp -R ./audio "${pkgdir}/opt/${pkgname}/"
+  cp -R ./data "${pkgdir}/opt/${pkgname}/"
+  cp -R ./gfx "${pkgdir}/opt/${pkgname}/"
+  cp ./manual.txt "${pkgdir}/opt/${pkgname}/"
+
   # copy main binary
   cp ./ia "${pkgdir}/opt/${pkgname}/"
-        # this shell script is required as the compiled binary relies on
-        # relative references
-        install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-        #install icon
-        install -Dm644 "${srcdir}/icon_v$pkgver.ico" \
-          "$pkgdir/usr/share/icons/hicolor/128x128/apps/${pkgname}.png"
-        install -Dm644 "${srcdir}/${pkgname}.desktop" \
-          "$pkgdir/usr/share/applications/${pkgname}.desktop"
+  # this shell script is required as the compiled binary relies on
+  # relative references
+  install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+
+  #install icons
+  install -Dm644 "${srcdir}/icon_v${pkgver}_1_16x16x32.png" \
+    "$pkgdir/usr/share/icons/hicolor/16x16/apps/${pkgname}.png"
+  install -Dm644 "${srcdir}/icon_v${pkgver}_2_32x32x32.png" \
+    "$pkgdir/usr/share/icons/hicolor/32x32/apps/${pkgname}.png"
+  install -Dm644 "${srcdir}/icon_v${pkgver}_3_48x48x32.png" \
+    "$pkgdir/usr/share/icons/hicolor/48x48/apps/${pkgname}.png"
+  install -Dm644 "${srcdir}/icon_v${pkgver}_4_64x64x32.png" \
+    "$pkgdir/usr/share/icons/hicolor/64x64/apps/${pkgname}.png"
+  install -Dm644 "${srcdir}/icon_v${pkgver}_5_128x128x32.png" \
+    "$pkgdir/usr/share/icons/hicolor/128x128/apps/${pkgname}.png"
+  install -Dm644 "${srcdir}/icon_v${pkgver}_6_256x256x32.png" \
+    "$pkgdir/usr/share/icons/hicolor/256x256/apps/${pkgname}.png"
+  # install the .desktop file
+  install -Dm644 "${srcdir}/${pkgname}.desktop" \
+    "$pkgdir/usr/share/applications/${pkgname}.desktop"
 }