Re: [PR PATCH] [Updated] taisei 1.4.1 version bump

[aryalaadi <aryalaadi@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

There is an updated pull request by aryalaadi against master on the void-packages repository

https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348

taisei 1.4.1 version bump
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 9548 bytes --]

From 5cd236d25ba0076502b1fffc097bf42467a60005 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH 1/3] taisei 1.4.1 version bump

---
 srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
 srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
 srcpkgs/taisei/template               |  8 +--
 3 files changed, 4 insertions(+), 156 deletions(-)
 delete mode 100644 srcpkgs/taisei/patches/openssl1.patch
 delete mode 100644 srcpkgs/taisei/patches/openssl2.patch

diff --git a/srcpkgs/taisei/patches/openssl1.patch b/srcpkgs/taisei/patches/openssl1.patch
deleted file mode 100644
index 2a804bb7710fb8..00000000000000
--- a/srcpkgs/taisei/patches/openssl1.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/src/util/sha256.c b/src/util/sha256.c
-index 15f4491ee..e01e32279 100644
---- a/src/util/sha256.c
-+++ b/src/util/sha256.c
-@@ -119,7 +119,7 @@ static void sha256_init(SHA256State *ctx)
- 	ctx->state[7] = 0x5be0cd19;
- }
- 
--SHA256State* sha256_new(void) {
-+SHA256State *sha256_new(void) {
- 	SHA256State *ctx = calloc(1, sizeof(*ctx));
- 	sha256_init(ctx);
- 	return ctx;
-@@ -129,8 +129,7 @@ void sha256_free(SHA256State *ctx) {
- 	free(ctx);
- }
- 
--void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len)
--{
-+void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len) {
- 	sha256_word_t i;
- 
- 	for (i = 0; i < len; ++i) {
-@@ -144,8 +143,7 @@ void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len)
- 	}
- }
- 
--void sha256_final(SHA256State *ctx, sha256_byte_t hash[], size_t hashlen)
--{
-+void sha256_final(SHA256State *ctx, sha256_byte_t hash[], size_t hashlen) {
- 	assert(hashlen >= SHA256_BLOCK_SIZE);
- 
- 	sha256_word_t i;
-@@ -201,8 +199,8 @@ void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SI
- 	sha256_final(&ctx, hash, hashlen);
- }
- 
--void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen) {
--	assert(hashlen >= SHA256_BLOCK_SIZE * 2 + 1);
-+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
-+	assert(hashlen >= SHA256_HEXDIGEST_SIZE);
- 
- 	uint8_t digest[SHA256_BLOCK_SIZE];
- 	sha256_digest(data, len, digest, sizeof(digest));
-diff --git a/src/util/sha256.h b/src/util/sha256.h
-index 191246c91..f501e2d98 100644
---- a/src/util/sha256.h
-+++ b/src/util/sha256.h
-@@ -11,16 +11,19 @@
- 
- #include "taisei.h"
- 
--#define SHA256_BLOCK_SIZE 32
-+enum {
-+	SHA256_BLOCK_SIZE = 32,
-+	SHA256_HEXDIGEST_SIZE = SHA256_BLOCK_SIZE * 2 + 1,
-+};
- 
- typedef struct SHA256State SHA256State;
- 
--SHA256State* sha256_new(void) attr_returns_allocated;
-+SHA256State *sha256_new(void) attr_returns_allocated;
- void sha256_update(SHA256State *state, const uint8_t *data, size_t len) attr_nonnull(1, 2);
- void sha256_final(SHA256State *state, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) attr_nonnull(1, 2);
- void sha256_free(SHA256State *state);
- 
- void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen);
--void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen);
-+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen);
- 
- #endif // IGUARD_util_sha256_h
-diff --git a/src/util/sha256_openssl.c b/src/util/sha256_openssl.c
-index b6f8e9039..0dc06e740 100644
---- a/src/util/sha256_openssl.c
-+++ b/src/util/sha256_openssl.c
-@@ -17,7 +17,7 @@ struct SHA256State {
- 	SHA256_CTX context;
- };
- 
--SHA256State* sha256_new(void) {
-+SHA256State *sha256_new(void) {
- 	SHA256State *st = calloc(1, sizeof(*st));
- 	SHA256_Init(&st->context);
- 	return st;
-@@ -45,8 +45,8 @@ void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SI
- 	SHA256_Final(hash, &ctx);
- }
- 
--void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen) {
--	assert(hashlen >= SHA256_BLOCK_SIZE * 2 + 1);
-+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
-+	assert(hashlen >= SHA256_HEXDIGEST_SIZE);
- 
- 	uint8_t digest[SHA256_BLOCK_SIZE];
- 	sha256_digest(data, len, digest, sizeof(digest));
diff --git a/srcpkgs/taisei/patches/openssl2.patch b/srcpkgs/taisei/patches/openssl2.patch
deleted file mode 100644
index c1b9f411badc6a..00000000000000
--- a/srcpkgs/taisei/patches/openssl2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/src/util/sha256_openssl.c b/src/util/sha256_openssl.c
-index 0dc06e740..c73d8e7fb 100644
---- a/src/util/sha256_openssl.c
-+++ b/src/util/sha256_openssl.c
-@@ -11,38 +11,34 @@
- #include "sha256.h"
- #include "util.h"
- 
--#include <openssl/sha.h>
--
--struct SHA256State {
--	SHA256_CTX context;
--};
-+#include <openssl/evp.h>
- 
- SHA256State *sha256_new(void) {
--	SHA256State *st = calloc(1, sizeof(*st));
--	SHA256_Init(&st->context);
--	return st;
-+	EVP_MD_CTX *ctx = EVP_MD_CTX_new();
-+	EVP_DigestInit(ctx, EVP_sha256());
-+	return (SHA256State*)ctx;
- }
- 
--void sha256_free(SHA256State *ctx) {
--	free(ctx);
-+void sha256_free(SHA256State *st) {
-+	EVP_MD_CTX_free((EVP_MD_CTX*)st);
- }
- 
--void sha256_update(SHA256State *ctx, const uint8_t *data, size_t len) {
--    SHA256_Update(&ctx->context, data, len);
-+void sha256_update(SHA256State *st, const uint8_t *data, size_t len) {
-+	EVP_DigestUpdate((EVP_MD_CTX*)st, data, len);
- }
- 
--void sha256_final(SHA256State *ctx, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
-+void sha256_final(SHA256State *st, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
- 	assert(hashlen >= SHA256_BLOCK_SIZE);
--	SHA256_Final(hash, &ctx->context);
-+	EVP_DigestFinalXOF((EVP_MD_CTX*)st, hash, hashlen);
- }
- 
- void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
- 	assert(hashlen >= SHA256_BLOCK_SIZE);
- 
--	SHA256_CTX ctx;
--	SHA256_Init(&ctx);
--	SHA256_Update(&ctx, data, len);
--	SHA256_Final(hash, &ctx);
-+	SHA256State *st = sha256_new();
-+	sha256_update(st, data, len);
-+	sha256_final(st, hash, hashlen);
-+	sha256_free(st);
- }
- 
- void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 52d2834a7166fe..09652556cbe219 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,9 +1,9 @@
 # Template file for 'taisei'
 pkgname=taisei
-version=1.3.2
+version=1.4.1
 revision=2
 build_style=meson
-hostmakedepends="pkg-config python3-docutils"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
 makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
  opusfile-devel"
 depends="${pkgname}-data"
@@ -11,8 +11,8 @@ short_desc="Free and open-source Touhou Project clone and fangame"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://taisei-project.org"
-distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-v${version}.tar.xz"
-checksum=dbc05f1b5c31981d8711130ac283355b7bfad403895f4096a6bb7e9a3d73a3bc
+distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-${version}.tar.xz"
+checksum=98a4fcea296e7bd3ef21c23adf065500ee5e41cbc66e6cf611168a20cd539a01  
 
 post_install() {
 	vlicense COPYING

From 3874fe76de28c3823c2d7626ce6dcdfc42147fe2 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 25 Mar 2024 22:19:27 +0545
Subject: [PATCH 2/3] lint issues

---
 srcpkgs/taisei/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 09652556cbe219..1991e370400b9f 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,17 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.4.1
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config python3-docutils python3-zstandard"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm opusfile-devel"
 depends="${pkgname}-data"
 short_desc="Free and open-source Touhou Project clone and fangame"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://taisei-project.org"
 distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-${version}.tar.xz"
-checksum=98a4fcea296e7bd3ef21c23adf065500ee5e41cbc66e6cf611168a20cd539a01  
+checksum=98a4fcea296e7bd3ef21c23adf065500ee5e41cbc66e6cf611168a20cd539a01
 
 post_install() {
 	vlicense COPYING

From 1ad3e241ee24f1ff344d9135a140c889c22261d7 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 25 Mar 2024 22:35:16 +0545
Subject: [PATCH 3/3] short_desc

---
 srcpkgs/taisei/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 1991e370400b9f..f11019fe561713 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -2,6 +2,7 @@
 pkgname=taisei
 version=1.4.1
 revision=1
+short_desc="A free and open-source Touhou Project fangame"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils python3-zstandard"
 makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm opusfile-devel"