mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
885f452df1
Commit [1] has made ncurses a requirement for building the package.
The added patches fix the following build errors:
/usr/bin/install -c -d ../../../lib
buildroot/output/host/bin/arm-buildroot-linux-gnueabihf-gcc -shared -Wl,-export-dynamic -o ../../../lib/libbrlttyxfv.so screen.o -ltinfo
buildroot/output/host/lib/gcc/arm-buildroot-linux-gnueabihf/14.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: cannot find -ltinfo: No such file or directory
collect2: error: ld returned 1 exit status
./unicode.c: In function ‘getTransliteratedCharacter’:
./unicode.c:349:27: error: initialization of ‘iconv_t’ {aka ‘long int’} from ‘void *’ makes integer from pointer without a cast [-Wint-conversion]
349 | static iconv_t handle = NULL;
| ^~~~
Update README hash:
- v6.8:
- Update the copyright from 2024 to 2025.
- v6.7:
- Update the supported braille devices lists.
- Add support for the HIMS eMotion.
- Add support for HT's Activator Pro models.
- Add support for the KGS Next Touch 40.
- Change the copyright from 2023 to 2024.
- Document that HT's Basic Braille Plus models are supported.
Release notes:
https://github.com/brltty/brltty/blob/BRLTTY-6.8/Documents/ChangeLog
[1] 8f7d65569e
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
73 lines
2.4 KiB
Diff
73 lines
2.4 KiB
Diff
From 229a5c4319ef32ab837c7029d3a565c4673fdbf7 Mon Sep 17 00:00:00 2001
|
||
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
||
Date: Mon, 3 Nov 2025 11:39:53 +0100
|
||
Subject: [PATCH] =?UTF-8?q?Fix=20initialization=20of=20=E2=80=98iconv=5Ft?=
|
||
=?UTF-8?q?=E2=80=99=20with=20GCC=2014.x=20and=20uClibc?=
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
The patch fixes the following error raised by the compilation of brltty
|
||
with the combination of GCC 14.x and uClibc.
|
||
|
||
./unicode.c:349:27: error: initialization of ‘iconv_t’ {aka ‘long int’} from ‘void *’ makes integer from pointer without a cast [-Wint-conversion]
|
||
349 | static iconv_t handle = NULL;
|
||
| ^~~~
|
||
make[3]: *** [Makefile:366: unicode.o] Error 1
|
||
|
||
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
||
Upstream: https://github.com/brltty/brltty/pull/504
|
||
---
|
||
Drivers/Braille/TTY/braille.c | 7 ++++---
|
||
Programs/unicode.c | 2 +-
|
||
2 files changed, 5 insertions(+), 4 deletions(-)
|
||
|
||
diff --git a/Drivers/Braille/TTY/braille.c b/Drivers/Braille/TTY/braille.c
|
||
index c8cba4999459..a2080532bc53 100644
|
||
--- a/Drivers/Braille/TTY/braille.c
|
||
+++ b/Drivers/Braille/TTY/braille.c
|
||
@@ -30,7 +30,8 @@
|
||
|
||
#ifdef HAVE_ICONV_H
|
||
#include <iconv.h>
|
||
-static iconv_t conversionDescriptor = NULL;
|
||
+#define ICONV_NULL ((iconv_t)-1)
|
||
+static iconv_t conversionDescriptor = ICONV_NULL;
|
||
#endif /* HAVE_ICONV_H */
|
||
|
||
#include "log.h"
|
||
@@ -211,7 +212,7 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) {
|
||
logSystemError("iconv_open");
|
||
}
|
||
|
||
- conversionDescriptor = NULL;
|
||
+ conversionDescriptor = ICONV_NULL;
|
||
#endif /* HAVE_ICONV_H */
|
||
|
||
return 0;
|
||
@@ -240,7 +241,7 @@ brl_destruct (BrailleDisplay *brl) {
|
||
#ifdef HAVE_ICONV_H
|
||
if (conversionDescriptor) {
|
||
iconv_close(conversionDescriptor);
|
||
- conversionDescriptor = NULL;
|
||
+ conversionDescriptor = ICONV_NULL;
|
||
}
|
||
#endif /* HAVE_ICONV_H */
|
||
}
|
||
diff --git a/Programs/unicode.c b/Programs/unicode.c
|
||
index 45e43be292c7..cbdcb4382291 100644
|
||
--- a/Programs/unicode.c
|
||
+++ b/Programs/unicode.c
|
||
@@ -346,7 +346,7 @@ getBaseCharacter (wchar_t character) {
|
||
wchar_t
|
||
getTransliteratedCharacter (wchar_t character) {
|
||
#ifdef HAVE_ICONV_H
|
||
- static iconv_t handle = NULL;
|
||
+ static iconv_t handle = (iconv_t)-1;
|
||
if (!handle) handle = iconv_open("ASCII//TRANSLIT", "WCHAR_T");
|
||
|
||
if (handle != (iconv_t)-1) {
|
||
--
|
||
2.43.0
|
||
|