diff options
| -rwxr-xr-x | wayland/imv/build | 4 | ||||
| -rw-r--r-- | wayland/imv/checksums | 3 | ||||
| -rw-r--r-- | wayland/imv/patches/0001-support-libgrapheme.patch (renamed from wayland/imv/patches/support-libgrapheme.patch) | 0 | ||||
| -rw-r--r-- | wayland/imv/patches/0002-console-update-libgrapheme-API-to-version-1.patch | 39 | ||||
| -rw-r--r-- | wayland/imv/sources | 3 | ||||
| -rw-r--r-- | wayland/imv/version | 2 |
6 files changed, 47 insertions, 4 deletions
diff --git a/wayland/imv/build b/wayland/imv/build index 1d28baa4..4ca5d07e 100755 --- a/wayland/imv/build +++ b/wayland/imv/build @@ -1,6 +1,8 @@ #!/bin/sh -e -patch -p1 < support-libgrapheme.patch +for patch in *.patch; do + [ -f "$patch" ] && patch -p1 < "$patch" +done export DESTDIR="$1" diff --git a/wayland/imv/checksums b/wayland/imv/checksums index 576594d6..d99e1e2f 100644 --- a/wayland/imv/checksums +++ b/wayland/imv/checksums @@ -1,4 +1,5 @@ %BLAKE3 154ed94c58e3c97ca1d9d8c9dbf1bd86e8661be07454822048eaa80886ddeffd v4.3.1.tar.gz 3f3775e97c033b812a8a45c1587d6003fff54c99b64102ec366fe2e86f649e9b r52.tar.gz -2ad333e1c8f277be3961bede9696a9c111636f63a8797b17b8780a6fb4c1e483 support-libgrapheme.patch +2ad333e1c8f277be3961bede9696a9c111636f63a8797b17b8780a6fb4c1e483 0001-support-libgrapheme.patch +7f4a255e11eaff0ece1051e27b190e47b4893728fe40d1e4f17ef8c7c17d3863 0002-console-update-libgrapheme-API-to-version-1.patch diff --git a/wayland/imv/patches/support-libgrapheme.patch b/wayland/imv/patches/0001-support-libgrapheme.patch index 693a8921..693a8921 100644 --- a/wayland/imv/patches/support-libgrapheme.patch +++ b/wayland/imv/patches/0001-support-libgrapheme.patch diff --git a/wayland/imv/patches/0002-console-update-libgrapheme-API-to-version-1.patch b/wayland/imv/patches/0002-console-update-libgrapheme-API-to-version-1.patch new file mode 100644 index 00000000..d92eaef2 --- /dev/null +++ b/wayland/imv/patches/0002-console-update-libgrapheme-API-to-version-1.patch @@ -0,0 +1,39 @@ +From 3e76c68e6de460e0b49402962eee47555e2711ce Mon Sep 17 00:00:00 2001 +From: Cem Keylan <cem@ckyln.com> +Date: Wed, 22 Dec 2021 18:45:43 +0100 +Subject: [PATCH imv] console: update libgrapheme API to version 1 + +--- +libgrapheme has recently seen its first release, along with some API +changes. I have updated the functions to match the current API. The +dedicated page for the library is now on +<https://libs.suckless.org/libgrapheme>. + + src/console.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/console.c b/src/console.c +index 323383f..9db18e7 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_bytelen(buffer + position); ++ return position + grapheme_next_character_break(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_bytelen(buffer + result); ++ step = grapheme_next_character_break(buffer + result, SIZE_MAX); + if (result + step >= position) + break; + result += step; +-- +2.34.1 + diff --git a/wayland/imv/sources b/wayland/imv/sources index f0a9793e..9031fbaf 100644 --- a/wayland/imv/sources +++ b/wayland/imv/sources @@ -1,3 +1,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/support-libgrapheme.patch +patches/0001-support-libgrapheme.patch +patches/0002-console-update-libgrapheme-API-to-version-1.patch diff --git a/wayland/imv/version b/wayland/imv/version index bbb23c33..529d54cc 100644 --- a/wayland/imv/version +++ b/wayland/imv/version @@ -1 +1 @@ -4.3.1 1 +4.3.1 2 |