From 29d2a0406497b87b572e798924459fa3ded8932e Mon Sep 17 00:00:00 2001
From: EDllT <47005435+EDLLT@users.noreply.github.com>
Date: Sun, 22 Sep 2024 17:51:30 +0300
Subject: [PATCH] maintainer @termux -> @EDLLT, gettext-latest patch as version

Change maintainer to @EDLLT

future-proof upstream gettext version: gettext-X.Y -> gettext-latest (reverted cargo toml version)

Co-authored-by: Biswapriyo Nath <nathbappai@gmail.com>
Co-authored-by: TomIO <43716232+TomJo2000@users.noreply.github.com>
---
 x11-packages/rnote/build.sh              | 11 ++++-------
 x11-packages/rnote/gettext-rs-crate.diff |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/x11-packages/rnote/build.sh b/x11-packages/rnote/build.sh
index 66baf8f7c4b59a4..2be09131a8682e7 100644
--- a/x11-packages/rnote/build.sh
+++ b/x11-packages/rnote/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE="https://github.com/flxzt/rnote"
 TERMUX_PKG_DESCRIPTION="An infinite canvas vector-based drawing application for handwritten notes"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_MAINTAINER="@termux"
+TERMUX_PKG_MAINTAINER="@EDLLT"
 TERMUX_PKG_VERSION="0.11.0"
 TERMUX_PKG_SRCURL="https://github.com/flxzt/rnote/archive/v${TERMUX_PKG_VERSION}/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=b133d4331963d3c09d3a7477f60fc4c5072471dcbf459379a593ca1724164af4
@@ -11,7 +11,7 @@ TERMUX_PKG_BUILD_DEPENDS="libiconv"
 TERMUX_PKG_PYTHON_BUILD_DEPS="toml2json"
 
 __fetch_gettext_rs() {
-	# This version is relative to gettext-sys provided by the gettext-rs crate
+	# Latest version of gettext-sys, provided by the gettext-rs crate
 	local crate_version
 	crate_version="$(curl -s https://crates.io/api/v1/crates/gettext-sys | jq --raw-output '.crate.max_stable_version')"
 	grep -qP '\d+\.\d+\.\d+' <<< "$crate_version" || {
@@ -23,13 +23,10 @@ __fetch_gettext_rs() {
 		'211773408ab61880b94a0ea680785fc21fad307cd42594d547cf5a056627fcda'                             # SHA256 checksum
 	)
 
-	local gettext_version
-	gettext_version="$(. "$TERMUX_SCRIPTDIR/packages/gettext/build.sh"; echo ${TERMUX_PKG_VERSION})"
-
-	# Fetch latest and greatest gettext from upstream and place it inside gettext-source/gettext-sys
+	# Fetch latest gettext from upstream
 	local -a upstream=(
 		"$(. "$TERMUX_SCRIPTDIR/packages/gettext/build.sh"; echo ${TERMUX_PKG_SRCURL})"   # Upstream URL (from gettext's build script)
-		"$TERMUX_PKG_SRCDIR/gettext-source/gettext-sys/gettext-${gettext_version}.tar.xz" # Local save path
+		"$TERMUX_PKG_SRCDIR/gettext-source/gettext-sys/gettext-latest.tar.xz"             # Local save path
 		"$(. "$TERMUX_SCRIPTDIR/packages/gettext/build.sh"; echo ${TERMUX_PKG_SHA256})"   # SHA256 checksum (from gettext's build script)
 	)
 
diff --git a/x11-packages/rnote/gettext-rs-crate.diff b/x11-packages/rnote/gettext-rs-crate.diff
index 2e6747617fd19e9..9e81a0c7de416ef 100644
--- a/x11-packages/rnote/gettext-rs-crate.diff
+++ b/x11-packages/rnote/gettext-rs-crate.diff
@@ -67,7 +67,7 @@ index 7772f74..42bc167 100644
      cmd.current_dir(&build_dir.join("gettext"))
          .arg("xJf")
 -        .arg(&src.join("gettext-0.21.tar.xz"))
-+        .arg(&src.join("gettext-0.22.5.tar.xz"))
++        .arg(&src.join("gettext-latest.tar.xz"))
          .arg("--strip-components")
          .arg("1");
      if host.contains("windows") {