From 199c5f30c16026ce960a72311e65292c4ba3a1c6 Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Fri, 11 Aug 2023 17:05:35 -0500
Subject: [PATCH] chatty: update to 0.25.

---
 srcpkgs/chatty/files/chatty                   |  4 +--
 srcpkgs/chatty/patches/config_dir.patch       | 30 +++++++------------
 .../patches/disable_version_check.patch       | 30 +++++++------------
 srcpkgs/chatty/template                       |  8 ++---
 4 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/srcpkgs/chatty/files/chatty b/srcpkgs/chatty/files/chatty
index a375876885fed..20838b866e129 100644
--- a/srcpkgs/chatty/files/chatty
+++ b/srcpkgs/chatty/files/chatty
@@ -1,4 +1,4 @@
 #!/bin/sh
+
 cd /usr/share/chatty
-export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
-java -jar Chatty.jar "$@"
+exec java -jar Chatty.jar "$@"
diff --git a/srcpkgs/chatty/patches/config_dir.patch b/srcpkgs/chatty/patches/config_dir.patch
index a159acba9c3b1..86c48e8a767b9 100644
--- a/srcpkgs/chatty/patches/config_dir.patch
+++ b/srcpkgs/chatty/patches/config_dir.patch
@@ -1,19 +1,11 @@
-*** a/src/chatty/Chatty.java	2017-12-26 11:56:51.000000000 -0500
---- a/src/chatty/Chatty.java	2018-02-19 04:41:33.348588121 -0500
-***************
-*** 91,97 ****
-       * Custom Settings directory, either the current working directory if the
-       * -cd parameter was used, or the directory specified with the -d parameter.
-       */
-!     private static String settingsDir = null;
-      
-      /**
-       * Parse the commandline arguments and start the actual chat client.
---- 91,97 ----
-       * Custom Settings directory, either the current working directory if the
-       * -cd parameter was used, or the directory specified with the -d parameter.
-       */
-!     private static String settingsDir = System.getProperty("user.home") + File.separator + ".config" + File.separator + "chatty";
-      
-      /**
-       * Parse the commandline arguments and start the actual chat client.
+--- a/src/chatty/Chatty.java
++++ b/src/chatty/Chatty.java
+@@ -212,7 +212,7 @@ public class Chatty {
+     // Paths
+     //--------------------------
+     public enum PathType {
+-        SETTINGS(() -> Paths.get(System.getProperty("user.home"), ".chatty"), null),
++        SETTINGS(() -> Paths.get(System.getProperty("user.home"), ".config/chatty"), null),
+         WORKING(() -> Paths.get(System.getProperty("user.dir")), null),
+         BACKUP(() -> getUserDataDirectory().resolve("backup"), null),
+         IMAGE(() -> getWorkingDirectory().resolve("img"), "imgPath"),
diff --git a/srcpkgs/chatty/patches/disable_version_check.patch b/srcpkgs/chatty/patches/disable_version_check.patch
index 5e689e513cb42..5265dcc1f626a 100644
--- a/srcpkgs/chatty/patches/disable_version_check.patch
+++ b/srcpkgs/chatty/patches/disable_version_check.patch
@@ -1,19 +1,11 @@
-*** a/src/chatty/Chatty.java	2018-02-19 04:22:40.961744905 -0500
---- a/src/chatty/Chatty.java	2018-02-19 04:24:16.080555756 -0500
-***************
-*** 60,66 ****
-       * Enable Version Checker (if you compile and distribute this yourself, you
-       * may want to disable this)
-       */
-!     public static final boolean VERSION_CHECK_ENABLED = true;
-      
-      /**
-       * The regular URL of the textfile where the most recent version is stored.
---- 60,66 ----
-       * Enable Version Checker (if you compile and distribute this yourself, you
-       * may want to disable this)
-       */
-!     public static final boolean VERSION_CHECK_ENABLED = false;
-      
-      /**
-       * The regular URL of the textfile where the most recent version is stored.
+--- a/src/chatty/Chatty.java
++++ b/src/chatty/Chatty.java
+@@ -63,7 +63,7 @@ public class Chatty {
+      * Enable Version Checker (if you compile and distribute this yourself, you
+      * may want to disable this)
+      */
+-    public static final boolean VERSION_CHECK_ENABLED = true;
++    public static final boolean VERSION_CHECK_ENABLED = false;
+     
+     /**
+      * The regular URL of the textfile where the most recent version is stored.
diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template
index 80a7c3d5ea6fc..9f2bfc7a4df10 100644
--- a/srcpkgs/chatty/template
+++ b/srcpkgs/chatty/template
@@ -1,6 +1,6 @@
 # Template file for 'chatty'
 pkgname=chatty
-version=0.22
+version=0.25
 revision=1
 hostmakedepends="gradle openjdk8"
 depends="virtual?java-runtime"
@@ -8,11 +8,11 @@ short_desc="Twitch Chat Client for Desktop"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-3.0-or-later"
 homepage="https://chatty.github.io/"
-distfiles="https://github.com/chatty/chatty/archive/v${version}.tar.gz"
-checksum=4d5f4236bba0190608e825fa5baf11d718650bf83e6571ab83dd9457af9f888c
+distfiles="https://github.com/chatty/chatty/archive/refs/tags/v${version}.tar.gz"
+checksum=44e07701885045e17e6871cb0cc58ff013c561a56b3108d51e770b4cb12c010f
 
 do_build() {
-	gradle shadowJar
+	gradle --no-daemon shadowJar
 }
 
 do_install() {