From 7489133fe11c986600760949e24b3b6824158ac4 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 2 Sep 2025 23:04:08 +0200 Subject: [PATCH] package/pocketpy: bump to version 2.1.1 The LICENSE sha256 changed because of a date update (2023 -> 2024), not due to any substantive license modification. Release notes: https://github.com/pocketpy/pocketpy/releases/tag/v2.1.1 Signed-off-by: Dario Binacchi Signed-off-by: Julien Olivain --- package/pocketpy/0001-fix-371.patch | 73 ----------------------------- package/pocketpy/pocketpy.hash | 4 +- package/pocketpy/pocketpy.mk | 2 +- 3 files changed, 3 insertions(+), 76 deletions(-) delete mode 100644 package/pocketpy/0001-fix-371.patch diff --git a/package/pocketpy/0001-fix-371.patch b/package/pocketpy/0001-fix-371.patch deleted file mode 100644 index 6d9e324ba7..0000000000 --- a/package/pocketpy/0001-fix-371.patch +++ /dev/null @@ -1,73 +0,0 @@ -From e2e3bdca6e79ce7be5607397c5f0152c28c7500b Mon Sep 17 00:00:00 2001 -From: blueloveTH -Date: Sat, 7 Jun 2025 02:19:55 +0800 -Subject: [PATCH] fix #371 - -Signed-off-by: Dario Binacchi -Upstream: backport from https://github.com/pocketpy/pocketpy/commit/70e824a6b695e963621664589d1d00aeb182c018 ---- - include/pocketpy/pocketpy.h | 2 +- - src/interpreter/vm.c | 6 ++++-- - src/public/modules.c | 2 +- - 3 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/include/pocketpy/pocketpy.h b/include/pocketpy/pocketpy.h -index a44faa41a922..a6cb4f658f73 100644 ---- a/include/pocketpy/pocketpy.h -+++ b/include/pocketpy/pocketpy.h -@@ -69,7 +69,7 @@ typedef struct py_Callbacks { - /// Used by `print` to output a string. - void (*print)(const char*); - /// Used by `input` to get a character. -- int (*getchar)(); -+ int (*getchr)(); - } py_Callbacks; - - /// Native function signature. -diff --git a/src/interpreter/vm.c b/src/interpreter/vm.c -index 2bae82740ac7..2da28fa80730 100644 ---- a/src/interpreter/vm.c -+++ b/src/interpreter/vm.c -@@ -29,6 +29,8 @@ static char* pk_default_importfile(const char* path) { - - static void pk_default_print(const char* data) { printf("%s", data); } - -+static int pk_default_getchr() { return getchar(); } -+ - static void py_TypeInfo__ctor(py_TypeInfo* self, - py_Name name, - py_Type index, -@@ -67,7 +69,7 @@ void VM__ctor(VM* self) { - - self->callbacks.importfile = pk_default_importfile; - self->callbacks.print = pk_default_print; -- self->callbacks.getchar = getchar; -+ self->callbacks.getchr = pk_default_getchr; - - self->last_retval = *py_NIL(); - self->curr_exception = *py_NIL(); -@@ -810,7 +812,7 @@ int py_replinput(char* buf, int max_size) { - printf(">>> "); - - while(true) { -- int c = pk_current_vm->callbacks.getchar(); -+ int c = pk_current_vm->callbacks.getchr(); - if(c == EOF) return -1; - - if(c == '\n') { -diff --git a/src/public/modules.c b/src/public/modules.c -index 3efb362701e2..cdfd5549461a 100644 ---- a/src/public/modules.c -+++ b/src/public/modules.c -@@ -205,7 +205,7 @@ static bool builtins_input(int argc, py_Ref argv) { - c11_sbuf buf; - c11_sbuf__ctor(&buf); - while(true) { -- int c = pk_current_vm->callbacks.getchar(); -+ int c = pk_current_vm->callbacks.getchr(); - if(c == '\n' || c == '\r') break; - if(c == EOF) break; - c11_sbuf__write_char(&buf, c); --- -2.43.0 - diff --git a/package/pocketpy/pocketpy.hash b/package/pocketpy/pocketpy.hash index aabd5f077a..4032fda442 100644 --- a/package/pocketpy/pocketpy.hash +++ b/package/pocketpy/pocketpy.hash @@ -1,3 +1,3 @@ # locally computed -sha256 5e07994d66311a6b5ac032cc5243aaabe3ab318946971e7fa1cd0614934efc81 pocketpy-2.0.8.tar.gz -sha256 d3a2bf8ca609a75941e980e62c13cf5a21aeaa4a2502822934d282fe7de5d319 LICENSE +sha256 34976a5eb099869b134d93bd4c801cb330bb17466f2b1f4543a5217034a867cd pocketpy-2.1.1.tar.gz +sha256 9dab6fe9086f93847540387be578edc94b6b280004db5ed7c850ccf8f086fd66 LICENSE diff --git a/package/pocketpy/pocketpy.mk b/package/pocketpy/pocketpy.mk index 20a8e9ad1e..74e6b4910d 100644 --- a/package/pocketpy/pocketpy.mk +++ b/package/pocketpy/pocketpy.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCKETPY_VERSION = 2.0.8 +POCKETPY_VERSION = 2.1.1 POCKETPY_SITE = $(call github,pocketpy,pocketpy,v$(POCKETPY_VERSION)) POCKETPY_LICENSE = MIT POCKETPY_LICENSE_FILES = LICENSE