From db764a15bb2ad17adb7fd4616595d1b497fd4375 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Sat, 8 Oct 2022 15:59:57 +0200 Subject: imv: reflect libgrapheme API changes --- wayland/imv/checksums | 1 + ...e-update-libgrapheme-API-to-version-2.0.0.patch | 38 ++++++++++++++++++++++ wayland/imv/sources | 1 + wayland/imv/version | 2 +- 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 wayland/imv/patches/0003-console-update-libgrapheme-API-to-version-2.0.0.patch (limited to 'wayland') diff --git a/wayland/imv/checksums b/wayland/imv/checksums index d99e1e2f..d06aeae5 100644 --- a/wayland/imv/checksums +++ b/wayland/imv/checksums @@ -3,3 +3,4 @@ 3f3775e97c033b812a8a45c1587d6003fff54c99b64102ec366fe2e86f649e9b r52.tar.gz 2ad333e1c8f277be3961bede9696a9c111636f63a8797b17b8780a6fb4c1e483 0001-support-libgrapheme.patch 7f4a255e11eaff0ece1051e27b190e47b4893728fe40d1e4f17ef8c7c17d3863 0002-console-update-libgrapheme-API-to-version-1.patch +d526047a247ec94d7d3eb3ca0fbbf040da86094cce353cf455116c8a9673fd9c 0003-console-update-libgrapheme-API-to-version-2.0.0.patch diff --git a/wayland/imv/patches/0003-console-update-libgrapheme-API-to-version-2.0.0.patch b/wayland/imv/patches/0003-console-update-libgrapheme-API-to-version-2.0.0.patch new file mode 100644 index 00000000..3afdf52d --- /dev/null +++ b/wayland/imv/patches/0003-console-update-libgrapheme-API-to-version-2.0.0.patch @@ -0,0 +1,38 @@ +From 10ddb6571e811be121ed62d5725ddaf40e3923dc Mon Sep 17 00:00:00 2001 +From: Cem Keylan +Date: Fri, 7 Oct 2022 13:03:15 +0200 +Subject: [PATCH] console: update libgrapheme API to version 2.0.0 + +libgrapheme recently saw its second major version which was "refactored +for correctness and conformance"[1]. + +[1]: http://lists.suckless.org/news/2210/0036.html +--- + src/console.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/console.c b/src/console.c +index 9db18e7..22803e1 100644 +--- a/src/console.c ++++ b/src/console.c +@@ -52,7 +52,7 @@ static size_t next_char(char *buffer, size_t position) + return result; + #elif defined(IMV_USE_GRAPHEME) + if (buffer[position] != 0) { +- return position + grapheme_next_character_break(buffer + position, SIZE_MAX); ++ return position + grapheme_next_character_break_utf8(buffer + position, SIZE_MAX); + } else { + return position; + } +@@ -85,7 +85,7 @@ static size_t prev_char(char *buffer, size_t position) + size_t result = 0; + size_t step; + do { +- step = grapheme_next_character_break(buffer + result, SIZE_MAX); ++ step = grapheme_next_character_break_utf8(buffer + result, SIZE_MAX); + if (result + step >= position) + break; + result += step; +-- +2.38.0 + diff --git a/wayland/imv/sources b/wayland/imv/sources index 9031fbaf..ab11aaee 100644 --- a/wayland/imv/sources +++ b/wayland/imv/sources @@ -2,3 +2,4 @@ https://git.sr.ht/~exec64/imv/archive/v4.3.1.tar.gz https://github.com/benhoyt/inih/archive/r52.tar.gz subprojects/inih patches/0001-support-libgrapheme.patch patches/0002-console-update-libgrapheme-API-to-version-1.patch +patches/0003-console-update-libgrapheme-API-to-version-2.0.0.patch diff --git a/wayland/imv/version b/wayland/imv/version index 529d54cc..8e874f46 100644 --- a/wayland/imv/version +++ b/wayland/imv/version @@ -1 +1 @@ -4.3.1 2 +4.3.1 3 -- cgit v1.2.3