From: yoshiyoshyosh <yoshiyoshyosh@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] chatty: update to 0.25.
Date: Sat, 12 Aug 2023 00:16:38 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45556@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 995 bytes --]
There is a new pull request by yoshiyoshyosh against master on the void-packages repository
https://github.com/yoshiyoshyosh/void-packages chatty
https://github.com/void-linux/void-packages/pull/45556
chatty: update to 0.25.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- with the existence of the `java` alternatives group, I removed the setting of `$PATH` in the binary script. I tested that chatty works and runs on both jre8 and jre17.
- updated the patches to work on latest. the rationale for keeping the `config_dir` patch despite it not being required for the software to work is due to existing setups already using `.config/chatty` as the config dir from previous updates (as the patch has existed since this package's inception), thus preserving compatibility with them.
A patch file from https://github.com/void-linux/void-packages/pull/45556.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chatty-45556.patch --]
[-- Type: text/x-diff, Size: 5006 bytes --]
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() {
next reply other threads:[~2023-08-11 22:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-11 22:16 yoshiyoshyosh [this message]
2023-11-11 2:47 ` github-actions
2023-11-18 16:40 ` yoshiyoshyosh
2024-02-18 1:46 ` github-actions
2024-02-19 4:20 ` yoshiyoshyosh
2024-04-09 6:06 ` [PR PATCH] [Updated] " yoshiyoshyosh
2023-10-15 23:35 [PR PATCH] " rookiejet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45556@inbox.vuxu.org \
--to=yoshiyoshyosh@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).