Merge changes from/updates to chatty-beta

2 files changed, 24 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 542722ab1016..1c0593acb3f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = chatty
 	pkgdesc = Twitch Chat Client for Desktop
-	pkgver = 0.9.1
-	pkgrel = 4
+	pkgver = 0.9.4
+	pkgrel = 1
 	url = https://chatty.github.io/
 	arch = any
 	license = GPL3
@@ -10,11 +10,11 @@ pkgbase = chatty
 	depends = sh
 	optdepends = streamlink: for watching streams in a custom video player.
 	optdepends = livestreamer: for watching streams in a custom video player.
-	source = chatty-0.9.1-emotefix.tar.gz::https://github.com/chatty/chatty/archive/v0.9.1-emotefix.tar.gz
+	source = chatty-0.9.4.tar.gz::https://github.com/chatty/chatty/archive/v0.9.4.tar.gz
 	source = chatty.desktop
 	source = chatty_script
 	source = disable_version_check.patch
-	sha512sums = a7943f5b0b9eb3e3e0e0809c84e80e04226afae4c4fb4038772502d7500f8033e2939e5f2ec825ad17411db04c587e14a67d2baa304bdcfb349fa1678f06de1c
+	sha512sums = c3ecd738f2fcb6ef143fdb24117b42a0e725c1ed8d2e043fec555b27fb076d0040d9b464adce3dd7e7ca2a5d6a81a7b20dc1ea331061eaddb4a2802419b68c6c
 	sha512sums = 6b18009b4e34a2255cec42fd1e136e437aa528c80c40d9f1ab7379ab9e4a637fbd64860fb51e7e57aa0c74165b42f8d4c1ed6a1ffd061d07a02af1ec5167145e
 	sha512sums = b5ea9a3e77cf5ed006537348371619577aabf86bdb4e90b249c2e3a236b1f1d51920c6af2d2779920a0853cb4f5456fc0a10ad2a788c7c1e5b2649f7f2b756d0
 	sha512sums = 8df69baaf9a0bad68d7c1aac96877b65637c4688d59f9b36f4915b77e2ec9bfa99c67adfe69bca95baee88a585f6f01f5f26eb076079f95bfca9f0ac19180199
diff --git a/PKGBUILD b/PKGBUILD
index 81069546e43e..4930c89e53b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Frederik “Freso” S. Olesen <archlinux@freso.dk>
 # Contributor: Christoph Korn <christoph.korn at posteo dot de>
-pkgname=chatty
-pkgver=0.9.1
-pkgrel=4
+_pkgname=chatty
+pkgname=${_pkgname}
+pkgver=0.9.4
+pkgrel=1
 pkgdesc='Twitch Chat Client for Desktop'
 arch=('any')
 url='https://chatty.github.io/'
@@ -11,39 +12,39 @@ depends=('java-environment' 'sh')
 optdepends=('streamlink: for watching streams in a custom video player.'
             'livestreamer: for watching streams in a custom video player.')
 makedepends=('gradle')
-source=("${pkgname}-${pkgver}-emotefix.tar.gz::https://github.com/chatty/${pkgname}/archive/v${pkgver}-emotefix.tar.gz"
-        "${pkgname}.desktop"
-        "${pkgname}_script"
+source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/chatty/${_pkgname}/archive/v${pkgver}.tar.gz"
+        "${_pkgname}.desktop"
+        "${_pkgname}_script"
         'disable_version_check.patch')
-sha512sums=('a7943f5b0b9eb3e3e0e0809c84e80e04226afae4c4fb4038772502d7500f8033e2939e5f2ec825ad17411db04c587e14a67d2baa304bdcfb349fa1678f06de1c'
+sha512sums=('c3ecd738f2fcb6ef143fdb24117b42a0e725c1ed8d2e043fec555b27fb076d0040d9b464adce3dd7e7ca2a5d6a81a7b20dc1ea331061eaddb4a2802419b68c6c'
             '6b18009b4e34a2255cec42fd1e136e437aa528c80c40d9f1ab7379ab9e4a637fbd64860fb51e7e57aa0c74165b42f8d4c1ed6a1ffd061d07a02af1ec5167145e'
             'b5ea9a3e77cf5ed006537348371619577aabf86bdb4e90b249c2e3a236b1f1d51920c6af2d2779920a0853cb4f5456fc0a10ad2a788c7c1e5b2649f7f2b756d0'
             '8df69baaf9a0bad68d7c1aac96877b65637c4688d59f9b36f4915b77e2ec9bfa99c67adfe69bca95baee88a585f6f01f5f26eb076079f95bfca9f0ac19180199')
 
 prepare() {
-  cd "${pkgname}-${pkgver}-emotefix"
+  cd "${_pkgname}-${pkgver}"
   patch -p1 -i '../disable_version_check.patch'
 }
 
 build() {
-  cd "${pkgname}-${pkgver}-emotefix"
+  cd "${_pkgname}-${pkgver}"
   gradle build
   gradle release
 }
 
 package(){
   mkdir "${srcdir}/Chatty_${pkgver}" && cd "${srcdir}/Chatty_${pkgver}"
-  bsdcpio -i -m --make-directories < "../${pkgname}-${pkgver}-emotefix/build/releases/Chatty_${pkgver}-emotefix.zip"
-  install -Dm644 'Chatty.jar' "${pkgdir}/usr/share/${pkgname}/Chatty.jar"
-  cp -a 'img' 'sounds' "${pkgdir}/usr/share/${pkgname}/"
-  install -Dm644 'readme.txt' "${pkgdir}/usr/share/doc/${pkgname}/readme.txt"
+  bsdcpio -i -m --make-directories < "../${_pkgname}-${pkgver}/build/releases/Chatty_${pkgver}.zip"
+  install -Dm644 'Chatty.jar' "${pkgdir}/usr/share/${_pkgname}/Chatty.jar"
+  cp -a 'img' 'sounds' "${pkgdir}/usr/share/${_pkgname}/"
+  install -Dm644 'readme.txt' "${pkgdir}/usr/share/doc/${_pkgname}/readme.txt"
 
   cd "${srcdir}"
-  install -Dm755 "${pkgname}_script" "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm755 "${_pkgname}_script" "${pkgdir}/usr/bin/${_pkgname}"
+  install -Dm644 "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
 
-  cd "${srcdir}/${pkgname}-${pkgver}-emotefix"
-  install -Dm644 "./src/chatty/gui/app_main_16.png" "${pkgdir}/usr/share/icons/hicolor/16x16/apps/${pkgname}.png"
-  install -Dm644 "./src/chatty/gui/app_main_64.png" "${pkgdir}/usr/share/icons/hicolor/64x64/apps/${pkgname}.png"
-  install -Dm644 "./src/chatty/gui/app_main_128.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${pkgname}.png"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  install -Dm644 "./src/chatty/gui/app_main_16.png" "${pkgdir}/usr/share/icons/hicolor/16x16/apps/${_pkgname}.png"
+  install -Dm644 "./src/chatty/gui/app_main_64.png" "${pkgdir}/usr/share/icons/hicolor/64x64/apps/${_pkgname}.png"
+  install -Dm644 "./src/chatty/gui/app_main_128.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${_pkgname}.png"
 }