From eb1caca3510769bd2d15e1ddd48cca4a27f7bdbe Mon Sep 17 00:00:00 2001 From: FouzR <88454554+FouzR@users.noreply.github.com> Date: Mon, 4 Sep 2023 23:43:34 +0530 Subject: [PATCH 1/6] Update YAFT to v0.0.10 --- package/yaft/package | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/yaft/package b/package/yaft/package index 8bc4e5154..b0aa6da46 100644 --- a/package/yaft/package +++ b/package/yaft/package @@ -5,9 +5,9 @@ pkgnames=(yaft) pkgdesc="Yet another framebuffer terminal" url=https://github.com/timower/rM2-stuff/tree/master/apps/yaft -_tag=0.0.8 +_tag=0.0.10 pkgver=${_tag}-2 -timestamp=2021-05-02T09:23Z +timestamp=2023-08-12T14:31Z maintainer="Mattéo Delabre " license=GPL-3.0 section="admin" @@ -21,7 +21,7 @@ source=( ) sha256sums=( - 718a9fc7a8e26d587bac790fd83ad8242978b59745269b2ff213e04820bf45b8 + 1cd4741a93cde6bd545215eb303e51219fc9901cba1c28b6206b1b5e0871a7b5 SKIP SKIP ) From 173fcf4f729f456fa50dd3c4c1a9e8aa346f65e5 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 4 Sep 2023 12:54:42 -0600 Subject: [PATCH 2/6] Reset package version to -1 --- package/yaft/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yaft/package b/package/yaft/package index b0aa6da46..5ccdf91b5 100644 --- a/package/yaft/package +++ b/package/yaft/package @@ -6,7 +6,7 @@ pkgnames=(yaft) pkgdesc="Yet another framebuffer terminal" url=https://github.com/timower/rM2-stuff/tree/master/apps/yaft _tag=0.0.10 -pkgver=${_tag}-2 +pkgver=${_tag}-1 timestamp=2023-08-12T14:31Z maintainer="Mattéo Delabre " license=GPL-3.0 From dc54fd6c55d95d92446d0dc17f411deb21441951 Mon Sep 17 00:00:00 2001 From: FouzR <88454554+FouzR@users.noreply.github.com> Date: Wed, 6 Sep 2023 10:56:58 +0530 Subject: [PATCH 3/6] Delete package/yaft/bash-l.patch --- package/yaft/bash-l.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 package/yaft/bash-l.patch diff --git a/package/yaft/bash-l.patch b/package/yaft/bash-l.patch deleted file mode 100644 index ad6d27be7..000000000 --- a/package/yaft/bash-l.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/apps/yaft/main.cpp b/apps/yaft/main.cpp -index baa1f56..1d4ee6a 100755 ---- a/apps/yaft/main.cpp -+++ b/apps/yaft/main.cpp -@@ -200,7 +200,7 @@ main(int argc, const char* argv[]) { - extern volatile sig_atomic_t need_redraw; - extern volatile sig_atomic_t child_alive; - extern struct termios termios_orig; -- static const char* shell_args[2] = { shell_cmd, NULL }; -+ static const char* shell_args[3] = { shell_cmd, "-l", NULL }; - - Keyboard keyboard; - From b9e74610f1971e9f2bd95e6c16e54e26aba903f6 Mon Sep 17 00:00:00 2001 From: FouzR <88454554+FouzR@users.noreply.github.com> Date: Wed, 6 Sep 2023 10:57:24 +0530 Subject: [PATCH 4/6] remove bash-l.patch from yaft --- package/yaft/package | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/yaft/package b/package/yaft/package index 5ccdf91b5..795895420 100644 --- a/package/yaft/package +++ b/package/yaft/package @@ -17,18 +17,15 @@ installdepends=(display terminfo) source=( "https://github.com/timower/rM2-stuff/archive/refs/tags/v${_tag}.zip" input.patch - bash-l.patch ) sha256sums=( 1cd4741a93cde6bd545215eb303e51219fc9901cba1c28b6206b1b5e0871a7b5 SKIP - SKIP ) build() { patch -u libs/rMlib/Device.cpp -i input.patch - patch -u apps/yaft/main.cpp -i bash-l.patch mkdir build mkdir install cd build From 742a6ad2893949e71afb6d9c35e7553b942b4b03 Mon Sep 17 00:00:00 2001 From: FouzR <88454554+FouzR@users.noreply.github.com> Date: Fri, 3 Nov 2023 17:30:04 +0000 Subject: [PATCH 5/6] add lines for terminfo(probably?) --- package/yaft/package | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/yaft/package b/package/yaft/package index 795895420..5a6baaedb 100644 --- a/package/yaft/package +++ b/package/yaft/package @@ -34,6 +34,8 @@ build() { cd apps/yaft make make install + cd libs/libYaft + make install } package() { From ae581ca915a369fd414a66c27937a8175546fbfb Mon Sep 17 00:00:00 2001 From: FouzR <88454554+FouzR@users.noreply.github.com> Date: Fri, 3 Nov 2023 22:28:57 +0400 Subject: [PATCH 6/6] Update package --- package/yaft/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yaft/package b/package/yaft/package index 5a6baaedb..a08ab32d0 100644 --- a/package/yaft/package +++ b/package/yaft/package @@ -34,7 +34,7 @@ build() { cd apps/yaft make make install - cd libs/libYaft + cd ../../libs/libYaft make install }