From 464a866fca0631c13beb4415ccdf4c5b09ba38b6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 15 Oct 2024 11:49:02 -0500 Subject: [PATCH 01/24] 6.7 --- brltty-6.6-cython3.patch | 20 -------------------- brltty.spec | 16 +++++++--------- sources | 2 +- 3 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 brltty-6.6-cython3.patch diff --git a/brltty-6.6-cython3.patch b/brltty-6.6-cython3.patch deleted file mode 100644 index 9696e2b..0000000 --- a/brltty-6.6-cython3.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- python2/Bindings/Python/brlapi.pyx 2023-07-17 07:55:47.000000000 -0700 -+++ python2/Bindings/Python/brlapi.pyx.new 2023-08-15 09:06:23.675136077 -0700 -@@ -453,6 +453,7 @@ - c_brlapi.brlapi_protocolExceptionInit(self.h) - if self.fd == -1: - c_brlapi.free(self.h) -+ self.h = NULL - raise ConnectionError(self.settings.host, self.settings.auth) - - def closeConnection(self): -@@ -465,7 +466,8 @@ - """Release resources used by the connection""" - if self.fd != -1: - c_brlapi.brlapi__closeConnection(self.h) -- c_brlapi.free(self.h) -+ if self.h != NULL: -+ c_brlapi.free(self.h) - - property host: - """To get authorized to connect, libbrlapi has to tell the BrlAPI server a secret key, for security reasons. This is the path to the file which holds it; it will hence have to be readable by the application.""" diff --git a/brltty.spec b/brltty.spec index 236192b..58599c5 100644 --- a/brltty.spec +++ b/brltty.spec @@ -1,5 +1,5 @@ -%define pkg_version 6.6 -%define api_version 0.8.5 +%define pkg_version 6.7 +%define api_version 0.8.6 # minimal means brltty-minimal subpackage with minimal deps for # braille support in Anaconda installer @@ -36,8 +36,8 @@ %global __requires_exclude ^(%{_privatelibs})$ Name: brltty -Version: 6.6 -Release: 20%{?dist} +Version: 6.7 +Release: 1%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -48,10 +48,6 @@ Source4: brltty.sysusers Patch1: brltty-6.3-loadLibrary.patch # libspeechd.h moved in latest speech-dispatch (NOT sent upstream) Patch2: brltty-6.3-libspeechd.patch -# https://brltty.app/pipermail/brltty/2023-August/020048.html -# thanks to Lukáš Tyrychtr for the diagnosis and initial patch, and -# Samuel Thibault for this improved patch -Patch3: brltty-6.6-cython3.patch Summary: Braille display driver for Linux/Unix BuildRequires: byacc BuildRequires: glibc-kernheaders @@ -259,7 +255,6 @@ mv %{name}-%{version} python2 pushd python2 %patch -P 1 -p1 -b .loadLibrary %patch -P 2 -p1 -b .libspeechd -%patch -P 3 -p1 -b .cython3 # remove packaged binary file rm -f Programs/brltty-ktb @@ -677,6 +672,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Oct 15 2024 Gwyn Ciesla - 6.7-1 +- 6.7 + * Mon Aug 05 2024 Yaakov Selkowitz - 6.6-20 - Use bcond consistently - Disable java and ocaml bindings in RHEL diff --git a/sources b/sources index e4631cd..fe1b3d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (brltty-6.6.tar.xz) = 852bfd9179570be7b0da8b1279f84bdfedc14a319988d9c2eac5a20a9ce8977f31fdee167e8e96bb411184a1d72f4cdc633944c7b3f55bddae411fc71a9e6898 +SHA512 (brltty-6.7.tar.xz) = 68ef75369ce2a23dff17b212aec0844b5e3e416cc730bdf872d68f32b0d8398f86d1e91f076dcb1730543c3d47266a40d7d61842524076d2fd4e82ef95bc34bb From f51e81f5cade0af541b0f3ac98a6bda210c30152 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 15 Oct 2024 13:33:10 -0500 Subject: [PATCH 02/24] BR ncurses-devel --- brltty.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/brltty.spec b/brltty.spec index 58599c5..46e50b8 100644 --- a/brltty.spec +++ b/brltty.spec @@ -70,6 +70,7 @@ BuildRequires: polkit-devel BuildRequires: libicu-devel BuildRequires: doxygen BuildRequires: linuxdoc-tools +BuildRequires: ncurses-devel %if %{with python2} BuildRequires: python2-docutils BuildRequires: python2-setuptools From 3c0d1c7cd966b39ac294035bd6ffc6ea06b6fbce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 9 Dec 2024 18:24:58 +0100 Subject: [PATCH 03/24] Resolves: rhbz#2328699 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Å karvada --- brltty-6.6-path-separator-fix.patch | 13 +++++++++++++ brltty.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 brltty-6.6-path-separator-fix.patch diff --git a/brltty-6.6-path-separator-fix.patch b/brltty-6.6-path-separator-fix.patch new file mode 100644 index 0000000..b975070 --- /dev/null +++ b/brltty-6.6-path-separator-fix.patch @@ -0,0 +1,13 @@ +diff --git a/Bindings/Tcl/bindings.m4 b/Bindings/Tcl/bindings.m4 +index 758f0db..37720cc 100644 +--- a/Bindings/Tcl/bindings.m4 ++++ b/Bindings/Tcl/bindings.m4 +@@ -51,7 +51,7 @@ fi + + ${TCL_OK} && { + test -n "${TCL_PACKAGE_PATH}" && { +- for directory in ${TCL_PACKAGE_PATH} ++ for directory in ${TCL_PACKAGE_PATH/:/ } + do + test `expr "${directory}" : '.*/lib'` -eq 0 || { + TCL_DIR="${directory}" diff --git a/brltty.spec b/brltty.spec index 46e50b8..e28e907 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -48,6 +48,8 @@ Source4: brltty.sysusers Patch1: brltty-6.3-loadLibrary.patch # libspeechd.h moved in latest speech-dispatch (NOT sent upstream) Patch2: brltty-6.3-libspeechd.patch +# sent to upstream mailing list +Patch3: brltty-6.6-path-separator-fix.patch Summary: Braille display driver for Linux/Unix BuildRequires: byacc BuildRequires: glibc-kernheaders @@ -256,6 +258,7 @@ mv %{name}-%{version} python2 pushd python2 %patch -P 1 -p1 -b .loadLibrary %patch -P 2 -p1 -b .libspeechd +%patch -P 3 -p1 -b .path-separator-fix # remove packaged binary file rm -f Programs/brltty-ktb @@ -673,6 +676,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Dec 9 2024 Jaroslav Å karvada - 6.7-2 +- Resolves: rhbz#2328699 + * Tue Oct 15 2024 Gwyn Ciesla - 6.7-1 - 6.7 From 1e8ec0be87189aa92a71e2f00910ab3306178d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 10 Dec 2024 17:40:41 +0100 Subject: [PATCH 04/24] Switched to upstream patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related: rhbz#2328699 Signed-off-by: Jaroslav Å karvada --- brltty-6.6-path-separator-fix.patch | 19 ++++++++++++++++--- brltty.spec | 8 ++++++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/brltty-6.6-path-separator-fix.patch b/brltty-6.6-path-separator-fix.patch index b975070..20f55ec 100644 --- a/brltty-6.6-path-separator-fix.patch +++ b/brltty-6.6-path-separator-fix.patch @@ -1,13 +1,26 @@ diff --git a/Bindings/Tcl/bindings.m4 b/Bindings/Tcl/bindings.m4 -index 758f0db..37720cc 100644 +index edb59a72e..e5563c483 100644 --- a/Bindings/Tcl/bindings.m4 +++ b/Bindings/Tcl/bindings.m4 -@@ -51,7 +51,7 @@ fi +@@ -51,8 +51,20 @@ fi ${TCL_OK} && { test -n "${TCL_PACKAGE_PATH}" && { - for directory in ${TCL_PACKAGE_PATH} -+ for directory in ${TCL_PACKAGE_PATH/:/ } ++ directories="${TCL_PACKAGE_PATH}" ++ ++ test "${directories#*:}" = "${directories}" && { ++ # There's no colon so it's an old-style (pre tcl-) path. ++ # Replace each sequence of one or more spaces with a single colon. ++ directories="${directories// /:}" ++ } ++ ++ while test "${#directories}" -gt 0 do ++ directory="${directories%%:*}" ++ directories="${directories#*:}" ++ test "${#directory}" -eq 0 && continue ++ test `expr "${directory}" : '.*/lib'` -eq 0 || { TCL_DIR="${directory}" + break diff --git a/brltty.spec b/brltty.spec index e28e907..73bb534 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.7 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -48,7 +48,7 @@ Source4: brltty.sysusers Patch1: brltty-6.3-loadLibrary.patch # libspeechd.h moved in latest speech-dispatch (NOT sent upstream) Patch2: brltty-6.3-libspeechd.patch -# sent to upstream mailing list +# https://brltty.app/pipermail/brltty/2024-December/020462.html Patch3: brltty-6.6-path-separator-fix.patch Summary: Braille display driver for Linux/Unix BuildRequires: byacc @@ -676,6 +676,10 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Dec 10 2024 Jaroslav Å karvada - 6.7-3 +- Switched to upstream patch + Related: rhbz#2328699 + * Mon Dec 9 2024 Jaroslav Å karvada - 6.7-2 - Resolves: rhbz#2328699 From e0eb2b451706b372a012a1bff14c600c044df063 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 10 Jan 2025 13:37:49 -0700 Subject: [PATCH 05/24] OCaml 5.3.0 rebuild for Fedora 42 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 73bb534..463c632 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.7 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -676,6 +676,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Fri Jan 10 2025 Jerry James - 6.7-4 +- OCaml 5.3.0 rebuild for Fedora 42 + * Tue Dec 10 2024 Jaroslav Å karvada - 6.7-3 - Switched to upstream patch Related: rhbz#2328699 From f4ebcbda2a1886dc1b39e88a847b5f1c76f3c58c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 14 Jan 2025 15:36:02 -0600 Subject: [PATCH 06/24] use tcl8 --- brltty.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/brltty.spec b/brltty.spec index 463c632..aecfd02 100644 --- a/brltty.spec +++ b/brltty.spec @@ -12,7 +12,7 @@ # disable python2 by default %bcond python2 0 -%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)} +%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh8)} %{!?tcl_sitearch: %global tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}} # with speech dispatcher iff on Fedora: @@ -37,7 +37,7 @@ Name: brltty Version: 6.7 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -176,7 +176,7 @@ which directly accesses a refreshable braille display. %package -n tcl-brlapi Version: %{api_version} Requires: brlapi%{?_isa} = %{api_version}-%{release} -BuildRequires: tcl-devel +BuildRequires: tcl8-devel Summary: Tcl binding for BrlAPI %description -n tcl-brlapi This package provides the Tcl binding for BrlAPI. @@ -276,6 +276,8 @@ cp -a python2 python3 cp -a python2 minimal %endif +find . -type f -name 'configure' | xargs sed -i s/in\ tclsh/in\ tclsh8/g +find . -type f | xargs sed -i s/env\ tclsh/env\ tclsh8/g %build # If MAKEFLAGS=-jN is set it would break local builds. @@ -676,6 +678,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Jan 14 2025 Gwyn Ciesla - 6.7-5 +- Update to use tcl8 compat. + * Fri Jan 10 2025 Jerry James - 6.7-4 - OCaml 5.3.0 rebuild for Fedora 42 From 4acadd2bd9a8b52dcd724fc89a1954e80bf286d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 12:53:47 +0000 Subject: [PATCH 07/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index aecfd02..b2292a1 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.7 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -678,6 +678,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 6.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Jan 14 2025 Gwyn Ciesla - 6.7-5 - Update to use tcl8 compat. From fc0224a2fc45a898f3b55f36423523e7aeb40ad6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 27 Jan 2025 11:11:42 -0600 Subject: [PATCH 08/24] Fix FTBFS --- brltty.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/brltty.spec b/brltty.spec index b2292a1..7545b8f 100644 --- a/brltty.spec +++ b/brltty.spec @@ -12,7 +12,7 @@ # disable python2 by default %bcond python2 0 -%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh8)} +%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)} %{!?tcl_sitearch: %global tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}} # with speech dispatcher iff on Fedora: @@ -176,7 +176,7 @@ which directly accesses a refreshable braille display. %package -n tcl-brlapi Version: %{api_version} Requires: brlapi%{?_isa} = %{api_version}-%{release} -BuildRequires: tcl8-devel +BuildRequires: tcl-devel < 1:9 Summary: Tcl binding for BrlAPI %description -n tcl-brlapi This package provides the Tcl binding for BrlAPI. @@ -276,9 +276,6 @@ cp -a python2 python3 cp -a python2 minimal %endif -find . -type f -name 'configure' | xargs sed -i s/in\ tclsh/in\ tclsh8/g -find . -type f | xargs sed -i s/env\ tclsh/env\ tclsh8/g - %build # If MAKEFLAGS=-jN is set it would break local builds. unset MAKEFLAGS From 052b732df15e9dd54a159af43ac7c5b526c2ebca Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 29 Jan 2025 21:13:14 -0700 Subject: [PATCH 09/24] OCaml 5.2.1 rebuild for Fedora 41 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 236192b..4b9b018 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.6 -Release: 20%{?dist} +Release: 21%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -677,6 +677,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Jan 29 2025 Jerry James - 6.6-21 +- OCaml 5.2.1 rebuild for Fedora 41 + * Mon Aug 05 2024 Yaakov Selkowitz - 6.6-20 - Use bcond consistently - Disable java and ocaml bindings in RHEL From 67993165fe1dff48483d3f7a611f478df73dedda Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 30 Jan 2025 19:52:38 -0500 Subject: [PATCH 10/24] Fix exclusions from main package commit d38d4c43521ffdf921f3696e6ce10a2cac048543 ("Use bcond consistently") included a few substitutions of: - %if %{!JAVA} + %if %{without java} However, while that was the *intended* meaning of the original syntax, it should have been `%if ! %{JAVA}` to have that effect. Instead, it was evaluated the same as `%if %{JAVA}`, so the modules that were supposed to be excluded from the main package (as they are in subpackages) were still being excluded (except on i686 once Java was dropped thereon, but nobody noticed because that's just multilib nowadays). Fixing the syntax though broke the intention, causing the opposite effect. This fixes the exclusions to work as originally intended. --- brltty.spec | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/brltty.spec b/brltty.spec index 7545b8f..a13a005 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.7 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -566,17 +566,23 @@ fi %{_bindir}/brltty-* %exclude %{_bindir}/brltty-minimal %{_libdir}/brltty/ -%if %{without java} -%exclude %{_libdir}/brltty/libbrlttybba.so -%exclude %{_libdir}/brltty/libbrlttybxw.so -%exclude %{_libdir}/brltty/libbrlttyxa2.so -%exclude %{_libdir}/brltty/libbrlttysen.so -%exclude %{_libdir}/brltty/libbrlttyses.so +%if %{with java} %exclude %{_libdir}/brltty/libbrlapi_java.so +%endif +# brlapi subpackage +%exclude %{_libdir}/brltty/libbrlttybba.so +# xw subpackage +%exclude %{_libdir}/brltty/libbrlttybxw.so +# at-spi2 subpackage +%exclude %{_libdir}/brltty/libbrlttyxa2.so +# espeak-ng subpackage +%exclude %{_libdir}/brltty/libbrlttysen.so +%if %{with espeak} +%exclude %{_libdir}/brltty/libbrlttyses.so +%endif %if %{with speech_dispatcher} %exclude %{_libdir}/brltty/libbrlttyssd.so %endif -%endif %license LICENSE-LGPL %doc %{_mandir}/man[15]/brltty.* %{_sysconfdir}/X11/Xsession.d/90xbrlapi @@ -675,6 +681,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Fri Jan 31 2025 Yaakov Selkowitz - 6.7-7 +- Fix exclusions from main package + * Thu Jan 16 2025 Fedora Release Engineering - 6.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b1b54d1b7c908e2b520863a26f2e932c9c6068e6 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 30 Jan 2025 19:52:38 -0500 Subject: [PATCH 11/24] Fix exclusions from main package commit d38d4c43521ffdf921f3696e6ce10a2cac048543 ("Use bcond consistently") included a few substitutions of: - %if %{!JAVA} + %if %{without java} However, while that was the *intended* meaning of the original syntax, it should have been `%if ! %{JAVA}` to have that effect. Instead, it was evaluated the same as `%if %{JAVA}`, so the modules that were supposed to be excluded from the main package (as they are in subpackages) were still being excluded (except on i686 once Java was dropped thereon, but nobody noticed because that's just multilib nowadays). Fixing the syntax though broke the intention, causing the opposite effect. This fixes the exclusions to work as originally intended. --- brltty.spec | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/brltty.spec b/brltty.spec index 4b9b018..581ebef 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.6 -Release: 21%{?dist} +Release: 22%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -568,17 +568,23 @@ fi %{_bindir}/brltty-* %exclude %{_bindir}/brltty-minimal %{_libdir}/brltty/ -%if %{without java} -%exclude %{_libdir}/brltty/libbrlttybba.so -%exclude %{_libdir}/brltty/libbrlttybxw.so -%exclude %{_libdir}/brltty/libbrlttyxa2.so -%exclude %{_libdir}/brltty/libbrlttysen.so -%exclude %{_libdir}/brltty/libbrlttyses.so +%if %{with java} %exclude %{_libdir}/brltty/libbrlapi_java.so +%endif +# brlapi subpackage +%exclude %{_libdir}/brltty/libbrlttybba.so +# xw subpackage +%exclude %{_libdir}/brltty/libbrlttybxw.so +# at-spi2 subpackage +%exclude %{_libdir}/brltty/libbrlttyxa2.so +# espeak-ng subpackage +%exclude %{_libdir}/brltty/libbrlttysen.so +%if %{with espeak} +%exclude %{_libdir}/brltty/libbrlttyses.so +%endif %if %{with speech_dispatcher} %exclude %{_libdir}/brltty/libbrlttyssd.so %endif -%endif %license LICENSE-LGPL %doc %{_mandir}/man[15]/brltty.* %{_sysconfdir}/X11/Xsession.d/90xbrlapi @@ -677,6 +683,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Fri Jan 31 2025 Yaakov Selkowitz - 6.6-22 +- Fix exclusions from main package + * Wed Jan 29 2025 Jerry James - 6.6-21 - OCaml 5.2.1 rebuild for Fedora 41 From bc6bec3c9f095a286ee60e9bbd9395a09b4ce235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 3 Feb 2025 15:09:02 +0100 Subject: [PATCH 12/24] Rebuilt for tcl/tk change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related: rhbz#2337691 Signed-off-by: Jaroslav Å karvada --- brltty.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index a13a005..24abcde 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.7 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -681,6 +681,10 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Feb 3 2025 Jaroslav Å karvada - 6.7-8 +- Rebuilt for tcl/tk change + Related: rhbz#2337691 + * Fri Jan 31 2025 Yaakov Selkowitz - 6.7-7 - Fix exclusions from main package From 2fa6404ec10d8480f92954d41facf81eff6c6236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 3 Feb 2025 18:13:35 +0100 Subject: [PATCH 13/24] Fixed compilation and work with tcl8 compat package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Å karvada --- brltty-6.7-compat-tcl8.patch | 142 +++++++++++++++++++++++++++++++++++ brltty.spec | 5 +- 2 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 brltty-6.7-compat-tcl8.patch diff --git a/brltty-6.7-compat-tcl8.patch b/brltty-6.7-compat-tcl8.patch new file mode 100644 index 0000000..fbe8edc --- /dev/null +++ b/brltty-6.7-compat-tcl8.patch @@ -0,0 +1,142 @@ +diff --git a/Android/Tools/mksettings b/Android/Tools/mksettings +index 37775a3..76c46ae 100755 +--- a/Android/Tools/mksettings ++++ b/Android/Tools/mksettings +@@ -1,4 +1,4 @@ +-#!/usr/bin/env tclsh ++#!/usr/bin/env tclsh8 + ############################################################################### + # BRLTTY - A background process providing access to the console screen (when in + # text mode) for a blind person using a refreshable braille display. +diff --git a/Android/Tools/newstrings b/Android/Tools/newstrings +index e5d040f..e3f8330 100755 +--- a/Android/Tools/newstrings ++++ b/Android/Tools/newstrings +@@ -1,4 +1,4 @@ +-#!/usr/bin/env tclsh ++#!/usr/bin/env tclsh8 + ############################################################################### + # BRLTTY - A background process providing access to the console screen (when in + # text mode) for a blind person using a refreshable braille display. +diff --git a/Android/Tools/rebuild b/Android/Tools/rebuild +index 33fb28d..e0f1b0f 100755 +--- a/Android/Tools/rebuild ++++ b/Android/Tools/rebuild +@@ -1,4 +1,4 @@ +-#!/usr/bin/env tclsh ++#!/usr/bin/env tclsh8 + ############################################################################### + # BRLTTY - A background process providing access to the console screen (when in + # text mode) for a blind person using a refreshable braille display. +diff --git a/Bindings/Tcl/apishell b/Bindings/Tcl/apishell +index c8dd822..0e7bbf3 100755 +--- a/Bindings/Tcl/apishell ++++ b/Bindings/Tcl/apishell +@@ -17,5 +17,5 @@ + ############################################################################### + + . "${0%/*}/../../apitest.sh" +-exec tclsh "${@}" ++exec tclsh8 "${@}" + exit "${?}" +diff --git a/Bindings/Tcl/apitest b/Bindings/Tcl/apitest +index fe21021..483ce91 100755 +--- a/Bindings/Tcl/apitest ++++ b/Bindings/Tcl/apitest +@@ -17,5 +17,5 @@ + ############################################################################### + + . "${0%/*}/../../apitest.sh" +-exec tclsh "${programDirectory}/${programName}.tcl" "${@}" ++exec tclsh8 "${programDirectory}/${programName}.tcl" "${@}" + exit "${?}" +diff --git a/Bindings/Tcl/apitest.tcl b/Bindings/Tcl/apitest.tcl +index b7c0f85..7befb5a 100755 +--- a/Bindings/Tcl/apitest.tcl ++++ b/Bindings/Tcl/apitest.tcl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env tclsh ++#!/usr/bin/env tclsh8 + ############################################################################### + # libbrlapi - A library providing access to braille terminals for applications. + # +diff --git a/Drivers/Speech/GenericSay/commands/AccentSA b/Drivers/Speech/GenericSay/commands/AccentSA +index 38294f8..fa51a03 100755 +--- a/Drivers/Speech/GenericSay/commands/AccentSA ++++ b/Drivers/Speech/GenericSay/commands/AccentSA +@@ -1,4 +1,4 @@ +-#!/usr/bin/env tclsh ++#!/usr/bin/env tclsh8 + ############################################################################### + # BRLTTY - A background process providing access to the console screen (when in + # text mode) for a blind person using a refreshable braille display. +diff --git a/Tools/gendeps b/Tools/gendeps +index 8ccad67..8f2e57e 100755 +--- a/Tools/gendeps ++++ b/Tools/gendeps +@@ -1,4 +1,4 @@ +-#!/usr/bin/env tclsh ++#!/usr/bin/env tclsh8 + ############################################################################### + # BRLTTY - A background process providing access to the console screen (when in + # text mode) for a blind person using a refreshable braille display. +diff --git a/Tools/mkctbchars b/Tools/mkctbchars +index 00ae966..8a85b7a 100755 +--- a/Tools/mkctbchars ++++ b/Tools/mkctbchars +@@ -1,4 +1,4 @@ +-#!/usr/bin/env tclsh ++#!/usr/bin/env tclsh8 + ############################################################################### + # BRLTTY - A background process providing access to the console screen (when in + # text mode) for a blind person using a refreshable braille display. +diff --git a/Tools/tclcmd b/Tools/tclcmd +index 77b90fb..6244086 100755 +--- a/Tools/tclcmd ++++ b/Tools/tclcmd +@@ -1,4 +1,4 @@ +-#!/usr/bin/env tclsh ++#!/usr/bin/env tclsh8 + ############################################################################### + # BRLTTY - A background process providing access to the console screen (when in + # text mode) for a blind person using a refreshable braille display. +diff --git a/Tools/tcltest b/Tools/tcltest +index 0e3a213..2611f05 100755 +--- a/Tools/tcltest ++++ b/Tools/tcltest +@@ -1,4 +1,4 @@ +-#!/usr/bin/env tclsh ++#!/usr/bin/env tclsh8 + ############################################################################### + # BRLTTY - A background process providing access to the console screen (when in + # text mode) for a blind person using a refreshable braille display. +diff --git a/Tools/ttytest b/Tools/ttytest +index 31e1d6e..03140b8 100755 +--- a/Tools/ttytest ++++ b/Tools/ttytest +@@ -1,4 +1,4 @@ +-#!/usr/bin/env tclsh ++#!/usr/bin/env tclsh8 + ############################################################################### + # BRLTTY - A background process providing access to the console screen (when in + # text mode) for a blind person using a refreshable braille display. +diff --git a/Tools/updcsvs b/Tools/updcsvs +index a508e8f..0395ed4 100755 +--- a/Tools/updcsvs ++++ b/Tools/updcsvs +@@ -1,4 +1,4 @@ +-#!/usr/bin/env tclsh ++#!/usr/bin/env tclsh8 + ############################################################################### + # BRLTTY - A background process providing access to the console screen (when in + # text mode) for a blind person using a refreshable braille display. +diff --git a/Tools/updusbdevs b/Tools/updusbdevs +index 13f57bd..e32ebf1 100755 +--- a/Tools/updusbdevs ++++ b/Tools/updusbdevs +@@ -1,4 +1,4 @@ +-#!/usr/bin/env tclsh ++#!/usr/bin/env tclsh8 + ############################################################################### + # BRLTTY - A background process providing access to the console screen (when in + # text mode) for a blind person using a refreshable braille display. diff --git a/brltty.spec b/brltty.spec index 24abcde..1e3cccb 100644 --- a/brltty.spec +++ b/brltty.spec @@ -12,7 +12,7 @@ # disable python2 by default %bcond python2 0 -%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)} +%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh8)} %{!?tcl_sitearch: %global tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}} # with speech dispatcher iff on Fedora: @@ -50,6 +50,8 @@ Patch1: brltty-6.3-loadLibrary.patch Patch2: brltty-6.3-libspeechd.patch # https://brltty.app/pipermail/brltty/2024-December/020462.html Patch3: brltty-6.6-path-separator-fix.patch +# Until tcl-9 is supported by upstream +Patch4: brltty-6.7-compat-tcl8.patch Summary: Braille display driver for Linux/Unix BuildRequires: byacc BuildRequires: glibc-kernheaders @@ -259,6 +261,7 @@ pushd python2 %patch -P 1 -p1 -b .loadLibrary %patch -P 2 -p1 -b .libspeechd %patch -P 3 -p1 -b .path-separator-fix +%patch -P 4 -p1 -b .compat-tcl8 # remove packaged binary file rm -f Programs/brltty-ktb From 13320e9f8630a773c1997073b651542fc998e726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 11 Feb 2025 11:08:24 +0100 Subject: [PATCH 14/24] Built for tcl 9.0 Related: rhbz#2337691 Built for tcl 9.0 Related: rhbz#2337691 Built for tcl 9.0 Related: rhbz#2337691 Built for tcl 9.0 Related: rhbz#2337691 Built for tcl 9.0 Related: rhbz#2337691 Built for tcl 9.0 Related: rhbz#2337691 Built for tcl 9.0 Related: rhbz#2337691 Built for tcl 9.0 Related: rhbz#2337691 Built for tcl 9.0 Related: rhbz#2337691 Built for tcl 9.0 Related: rhbz#2337691 Built for tcl 9.0 Related: rhbz#2337691 Built for tcl 9.0 Related: rhbz#2337691 Built for tcl 9.0 Related: rhbz#2337691 Built for tcl 9.0 Related: rhbz#2337691 Built for tcl 9.0 Related: rhbz#2337691 --- brltty-6.7-compat-tcl8.patch | 142 ----------------- brltty-6.7-tcl9.patch | 165 ++++++++++++++++++++ brltty-6.7-utf8.patch | 286 +++++++++++++++++++++++++++++++++++ brltty.spec | 22 +-- 4 files changed, 464 insertions(+), 151 deletions(-) delete mode 100644 brltty-6.7-compat-tcl8.patch create mode 100644 brltty-6.7-tcl9.patch create mode 100644 brltty-6.7-utf8.patch diff --git a/brltty-6.7-compat-tcl8.patch b/brltty-6.7-compat-tcl8.patch deleted file mode 100644 index fbe8edc..0000000 --- a/brltty-6.7-compat-tcl8.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff --git a/Android/Tools/mksettings b/Android/Tools/mksettings -index 37775a3..76c46ae 100755 ---- a/Android/Tools/mksettings -+++ b/Android/Tools/mksettings -@@ -1,4 +1,4 @@ --#!/usr/bin/env tclsh -+#!/usr/bin/env tclsh8 - ############################################################################### - # BRLTTY - A background process providing access to the console screen (when in - # text mode) for a blind person using a refreshable braille display. -diff --git a/Android/Tools/newstrings b/Android/Tools/newstrings -index e5d040f..e3f8330 100755 ---- a/Android/Tools/newstrings -+++ b/Android/Tools/newstrings -@@ -1,4 +1,4 @@ --#!/usr/bin/env tclsh -+#!/usr/bin/env tclsh8 - ############################################################################### - # BRLTTY - A background process providing access to the console screen (when in - # text mode) for a blind person using a refreshable braille display. -diff --git a/Android/Tools/rebuild b/Android/Tools/rebuild -index 33fb28d..e0f1b0f 100755 ---- a/Android/Tools/rebuild -+++ b/Android/Tools/rebuild -@@ -1,4 +1,4 @@ --#!/usr/bin/env tclsh -+#!/usr/bin/env tclsh8 - ############################################################################### - # BRLTTY - A background process providing access to the console screen (when in - # text mode) for a blind person using a refreshable braille display. -diff --git a/Bindings/Tcl/apishell b/Bindings/Tcl/apishell -index c8dd822..0e7bbf3 100755 ---- a/Bindings/Tcl/apishell -+++ b/Bindings/Tcl/apishell -@@ -17,5 +17,5 @@ - ############################################################################### - - . "${0%/*}/../../apitest.sh" --exec tclsh "${@}" -+exec tclsh8 "${@}" - exit "${?}" -diff --git a/Bindings/Tcl/apitest b/Bindings/Tcl/apitest -index fe21021..483ce91 100755 ---- a/Bindings/Tcl/apitest -+++ b/Bindings/Tcl/apitest -@@ -17,5 +17,5 @@ - ############################################################################### - - . "${0%/*}/../../apitest.sh" --exec tclsh "${programDirectory}/${programName}.tcl" "${@}" -+exec tclsh8 "${programDirectory}/${programName}.tcl" "${@}" - exit "${?}" -diff --git a/Bindings/Tcl/apitest.tcl b/Bindings/Tcl/apitest.tcl -index b7c0f85..7befb5a 100755 ---- a/Bindings/Tcl/apitest.tcl -+++ b/Bindings/Tcl/apitest.tcl -@@ -1,4 +1,4 @@ --#!/usr/bin/env tclsh -+#!/usr/bin/env tclsh8 - ############################################################################### - # libbrlapi - A library providing access to braille terminals for applications. - # -diff --git a/Drivers/Speech/GenericSay/commands/AccentSA b/Drivers/Speech/GenericSay/commands/AccentSA -index 38294f8..fa51a03 100755 ---- a/Drivers/Speech/GenericSay/commands/AccentSA -+++ b/Drivers/Speech/GenericSay/commands/AccentSA -@@ -1,4 +1,4 @@ --#!/usr/bin/env tclsh -+#!/usr/bin/env tclsh8 - ############################################################################### - # BRLTTY - A background process providing access to the console screen (when in - # text mode) for a blind person using a refreshable braille display. -diff --git a/Tools/gendeps b/Tools/gendeps -index 8ccad67..8f2e57e 100755 ---- a/Tools/gendeps -+++ b/Tools/gendeps -@@ -1,4 +1,4 @@ --#!/usr/bin/env tclsh -+#!/usr/bin/env tclsh8 - ############################################################################### - # BRLTTY - A background process providing access to the console screen (when in - # text mode) for a blind person using a refreshable braille display. -diff --git a/Tools/mkctbchars b/Tools/mkctbchars -index 00ae966..8a85b7a 100755 ---- a/Tools/mkctbchars -+++ b/Tools/mkctbchars -@@ -1,4 +1,4 @@ --#!/usr/bin/env tclsh -+#!/usr/bin/env tclsh8 - ############################################################################### - # BRLTTY - A background process providing access to the console screen (when in - # text mode) for a blind person using a refreshable braille display. -diff --git a/Tools/tclcmd b/Tools/tclcmd -index 77b90fb..6244086 100755 ---- a/Tools/tclcmd -+++ b/Tools/tclcmd -@@ -1,4 +1,4 @@ --#!/usr/bin/env tclsh -+#!/usr/bin/env tclsh8 - ############################################################################### - # BRLTTY - A background process providing access to the console screen (when in - # text mode) for a blind person using a refreshable braille display. -diff --git a/Tools/tcltest b/Tools/tcltest -index 0e3a213..2611f05 100755 ---- a/Tools/tcltest -+++ b/Tools/tcltest -@@ -1,4 +1,4 @@ --#!/usr/bin/env tclsh -+#!/usr/bin/env tclsh8 - ############################################################################### - # BRLTTY - A background process providing access to the console screen (when in - # text mode) for a blind person using a refreshable braille display. -diff --git a/Tools/ttytest b/Tools/ttytest -index 31e1d6e..03140b8 100755 ---- a/Tools/ttytest -+++ b/Tools/ttytest -@@ -1,4 +1,4 @@ --#!/usr/bin/env tclsh -+#!/usr/bin/env tclsh8 - ############################################################################### - # BRLTTY - A background process providing access to the console screen (when in - # text mode) for a blind person using a refreshable braille display. -diff --git a/Tools/updcsvs b/Tools/updcsvs -index a508e8f..0395ed4 100755 ---- a/Tools/updcsvs -+++ b/Tools/updcsvs -@@ -1,4 +1,4 @@ --#!/usr/bin/env tclsh -+#!/usr/bin/env tclsh8 - ############################################################################### - # BRLTTY - A background process providing access to the console screen (when in - # text mode) for a blind person using a refreshable braille display. -diff --git a/Tools/updusbdevs b/Tools/updusbdevs -index 13f57bd..e32ebf1 100755 ---- a/Tools/updusbdevs -+++ b/Tools/updusbdevs -@@ -1,4 +1,4 @@ --#!/usr/bin/env tclsh -+#!/usr/bin/env tclsh8 - ############################################################################### - # BRLTTY - A background process providing access to the console screen (when in - # text mode) for a blind person using a refreshable braille display. diff --git a/brltty-6.7-tcl9.patch b/brltty-6.7-tcl9.patch new file mode 100644 index 0000000..de1744c --- /dev/null +++ b/brltty-6.7-tcl9.patch @@ -0,0 +1,165 @@ +From c657726a5e03d53a037632e6068d0c2273950b36 Mon Sep 17 00:00:00 2001 +From: Dave Mielke +Date: Mon, 10 Feb 2025 17:16:00 -0500 +Subject: [PATCH] Changes to support Tcl 9.0. + +--- + Bindings/Tcl/bindings.c | 49 ++++++++++++++++++++++------------------- + 1 file changed, 26 insertions(+), 23 deletions(-) + +diff --git a/Bindings/Tcl/bindings.c b/Bindings/Tcl/bindings.c +index 319a64f19..3310fcf80 100644 +--- a/Bindings/Tcl/bindings.c ++++ b/Bindings/Tcl/bindings.c +@@ -19,12 +19,19 @@ + #include + #include + ++#include "brl_dots.h" ++ + #define BRLAPI_NO_DEPRECATED + #define BRLAPI_NO_SINGLE_SESSION + #include "brlapi.h" + + #include +-#include "brl_dots.h" ++ ++#ifndef TCL_SIZE_MAX ++typedef int Tcl_Size; ++#define TCL_SIZE_MAX ((int)(((unsigned int)-1)>>1)) ++#define TCL_SIZE_MODIFIER "" ++#endif /* TCL_SIZE_MAX */ + + #define allocateMemory(size) ((void *)ckalloc((size))) + #define deallocateMemory(address) ckfree((void *)(address)) +@@ -74,15 +81,11 @@ setStringResult (Tcl_Interp *interp, const char *string, int length) { + Tcl_SetStringObj(Tcl_GetObjResult(interp), string, length); + } + +-static void +-setStringsResult (Tcl_Interp *interp, ...) { +- Tcl_ResetResult(interp); +- +- va_list arguments; +- va_start(arguments, interp); +- Tcl_AppendStringsToObjVA(Tcl_GetObjResult(interp), arguments); +- va_end(arguments); +-} ++#define setStringsResult(interp, ...) \ ++ do { \ ++ Tcl_ResetResult(interp); \ ++ Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), __VA_ARGS__); \ ++ } while (0) + + static void + setByteArrayResult (Tcl_Interp *interp, const unsigned char *bytes, int count) { +@@ -428,7 +431,7 @@ FUNCTION_HANDLER(session, enterTtyModeWithPath) { + END_OPTIONS(2, 0, 0, "") + + Tcl_Obj **elements; +- int count; ++ Tcl_Size count; + + if (options.path) { + TEST_TCL_OK(Tcl_ListObjGetElements(interp, options.path, &count, &elements)); +@@ -650,7 +653,7 @@ FUNCTION_HANDLER(session, parameter) { + + default: { + Tcl_Obj **elements; +- int count; ++ Tcl_Size count; + TEST_TCL_OK(Tcl_ListObjGetElements(interp, value, &count, &elements)); + + if (count) { +@@ -835,7 +838,7 @@ FUNCTION_HANDLER(session, readKey) { + BrlapiSession *session = data; + TEST_FUNCTION_ARGUMENTS(1, 0, ""); + +- int length; ++ Tcl_Size length; + const char *operand = Tcl_GetStringFromObj(objv[2], &length); + if (!operand) return TCL_ERROR; + +@@ -854,7 +857,7 @@ FUNCTION_HANDLER(session, readKeyWithTimeout) { + BrlapiSession *session = data; + TEST_FUNCTION_ARGUMENTS(1, 0, "{infinite | }"); + +- int length; ++ Tcl_Size length; + const char *operand = Tcl_GetStringFromObj(objv[2], &length); + if (!operand) return TCL_ERROR; + int timeout; +@@ -908,7 +911,7 @@ FUNCTION_HANDLER(session, sendRaw) { + BrlapiSession *session = data; + TEST_FUNCTION_ARGUMENTS(1, 0, ""); + +- int count; ++ Tcl_Size count; + const unsigned char *bytes = Tcl_GetByteArrayFromObj(objv[2], &count); + + TEST_BRLAPI_OK(brlapi__sendRaw(session->handle, bytes, count)); +@@ -943,8 +946,8 @@ typedef struct { + Tcl_Obj *textObject; + int textLength; + +- int andLength; +- int orLength; ++ Tcl_Size andLength; ++ Tcl_Size orLength; + + unsigned numericCursor:1; + unsigned numericDisplay:1; +@@ -1240,7 +1243,7 @@ FUNCTION_HANDLER(session, writeDots) { + TEST_TCL_OK(getCellCount(interp, session, &size)); + + unsigned char buffer[size]; +- int count; ++ Tcl_Size count; + const unsigned char *cells = Tcl_GetByteArrayFromObj(objv[2], &count); + + if (count < size) { +@@ -1293,7 +1296,7 @@ changeKeys ( + } + + Tcl_Obj **codeElements; +- int codeCount; ++ Tcl_Size codeCount; + TEST_TCL_OK(Tcl_ListObjGetElements(interp, codeList, &codeCount, &codeElements)); + + if (codeCount) { +@@ -1335,7 +1338,7 @@ changeKeyRanges ( + TEST_FUNCTION_ARGUMENTS(1, 0, ""); + + Tcl_Obj **rangeElements; +- int rangeCount; ++ Tcl_Size rangeCount; + TEST_TCL_OK(Tcl_ListObjGetElements(interp, objv[2], &rangeCount, &rangeElements)); + + if (rangeCount) { +@@ -1344,7 +1347,7 @@ changeKeyRanges ( + for (int rangeIndex=0; rangeIndex"); + + Tcl_Obj **elements; +- int elementCount; ++ Tcl_Size elementCount; + TEST_TCL_OK(Tcl_ListObjGetElements(interp, objv[2], &elementCount, &elements)); + + if (elementCount) { +@@ -1543,7 +1546,7 @@ FUNCTION_HANDLER(general, makeDots) { + BrlDots *cell = &cells[elementIndex]; + *cell = 0; + +- int numberCount; ++ Tcl_Size numberCount; + const char *numbers = Tcl_GetStringFromObj(element, &numberCount); + if (!numbers) return TCL_ERROR; + diff --git a/brltty-6.7-utf8.patch b/brltty-6.7-utf8.patch new file mode 100644 index 0000000..b6259f5 --- /dev/null +++ b/brltty-6.7-utf8.patch @@ -0,0 +1,286 @@ +diff --git a/Drivers/Braille/BrailleLite/README b/Drivers/Braille/BrailleLite/README +index 80c341b..73cc290 100644 +--- a/Drivers/Braille/BrailleLite/README ++++ b/Drivers/Braille/BrailleLite/README +@@ -4,7 +4,7 @@ This is a beta driver for the Blazie Engineering Braille Lite. + written by Nikhil Nair, + with additions from Nicolas Pitre + and Pete De Vasto, +-further modifications by Stéphane Doyon , ++further modifications by Stéphane Doyon , + starting August 2001. + + Both BrailleLite 18 and 40 should work, and there is now code that should +@@ -27,44 +27,44 @@ when the unit is in its internal notetaker mode. + See help.src for a description of the key bindings. + + History: +-Stéphane Doyon, April 2002, version 0.5.10: ++Stéphane Doyon, April 2002, version 0.5.10: + -Act as if kbemu was off in any context other than CMDS_SCREEN (in + particular typing a key won't throw you out of preferences menu + anymore). +-Stéphane Doyon, March 2002, version 0.5.9: ++Stéphane Doyon, March 2002, version 0.5.9: + -Added "kbemu" driver parameter, so can start with kbemu already active. +-Stéphane Doyon, February 2002, version 0.5.8: ++Stéphane Doyon, February 2002, version 0.5.8: + -Added CMD_LEARN, CMD_NXPROMPT/CMD_PRPROMPT and CMD_SIXDOTS. Several + VAL_PASSKEY effects were done through special cases: moved them + back into cmdtrans. Identified special/reserved and free bindings. + Cleaned out some #if 0s. +-Stéphane Doyon, January 2002, version 0.5.7: ++Stéphane Doyon, January 2002, version 0.5.7: + -Added bindings for CR_CUTAPPEND and CR_CUTLINE. Replaced CMD_CUT_BEG, + CMD_CUT_END and CMD_CSRJMP by CR_ equivalents. Added CR_SETMARK and + CR_GOTOMARK. These are a bit nasty: they reuse existing command dot + patterns from within o-chord. Well practically all the patterns are + taken! +-Stéphane Doyon, January 2002, version 0.5.6: ++Stéphane Doyon, January 2002, version 0.5.6: + -Fixed dot combinations with dots 7-8 on BL40 (for typing caps and ctrl). +-Stéphane Doyon, December 2001, version 0.5.5: ++Stéphane Doyon, December 2001, version 0.5.5: + -META is back. Now use VPC modifiers on VALPASSCHAR when TEXTTRANS + not defined. Fixed uppercase that always locked active. Sub-commands + of 35-chord no longer need to be chorded. +-Stéphane Doyon, November 2001, version 0.5.4: ++Stéphane Doyon, November 2001, version 0.5.4: + -Now using new generic VAL_PASS* mechanism for typing in keys, rather + than having the driver itself insert stuff into the console. We + no longer have the META function though, but we have ESCAPE. +-Stéphane Doyon and Dave Mielke, September 2001, version 0.5.3: ++Stéphane Doyon and Dave Mielke, September 2001, version 0.5.3: + -closebrl: don't clear display, use TCSADRAIN. + -Slight API and name changes for BRLTTY 3.0. Commands can no longer be + assumed to be chars, changed type of cmdtrans. + -Fixed binding for switching virtual terminal with o-chord... it was wrong. +-Stéphane Doyon, September 2001, version 0.5.2: ++Stéphane Doyon, September 2001, version 0.5.2: + -Added baudrate parameter. Fixed up initialization, in particular a bug + with use of qbase buffer unitialized. +-Stéphane Doyon, September 2001, version 0.5.1: ++Stéphane Doyon, September 2001, version 0.5.1: + -Added bindings for CMD_BACK and CR_MSGATTRIB. +-Stéphane Doyon, August 2001 ++Stéphane Doyon, August 2001 + -Added a version number, as many people have been playing with this + driver. Arbitrarily started at 0.5. + -Made the help more compact, and remove the duplication of the key +diff --git a/Drivers/Braille/BrailleLite/braille.c b/Drivers/Braille/BrailleLite/braille.c +index 522f573..ca1d05a 100644 +--- a/Drivers/Braille/BrailleLite/braille.c ++++ b/Drivers/Braille/BrailleLite/braille.c +@@ -21,7 +21,7 @@ + * Author: Nikhil Nair + * Copyright (C) 1998 by Nikhil Nair. + * Some additions by: Nicolas Pitre +- * Some modifications copyright 2001 by Stéphane Doyon . ++ * Some modifications copyright 2001 by Stéphane Doyon . + * Some additions by: Dave Mielke + */ + +diff --git a/Drivers/Braille/Libbraille/Makefile.in b/Drivers/Braille/Libbraille/Makefile.in +index f9770db..e563c39 100644 +--- a/Drivers/Braille/Libbraille/Makefile.in ++++ b/Drivers/Braille/Libbraille/Makefile.in +@@ -20,7 +20,7 @@ DRIVER_CODE = lb + DRIVER_NAME = Libbraille + DRIVER_USAGE = Libbraille + DRIVER_VERSION = +-DRIVER_DEVELOPERS = Sébastien Sablé ++DRIVER_DEVELOPERS = Sébastien Sablé + BRL_OBJS = @braille_libraries_lb@ + include $(SRC_TOP)braille.mk + +diff --git a/Drivers/Braille/LogText/README b/Drivers/Braille/LogText/README +index 74615f7..f035e93 100644 +--- a/Drivers/Braille/LogText/README ++++ b/Drivers/Braille/LogText/README +@@ -1,7 +1,7 @@ + This directory contains the BRLTTY driver for the LogText, which is + manufactured by Tactilog of Denmark. It was implemented, and is being + maintained, by Dave Mielke . Thanks to Hans Schou +- for his help and advice, and to Thomas Sørensen ++ for his help and advice, and to Thomas Sørensen + for testing. As a component of BRLTTY, this driver + is released under the terms of the GNU Public License. + +diff --git a/Drivers/Braille/MDV/README b/Drivers/Braille/MDV/README +index b252b48..8ac5705 100644 +--- a/Drivers/Braille/MDV/README ++++ b/Drivers/Braille/MDV/README +@@ -1,6 +1,6 @@ + Braille display driver for MDV displays + +-Written by Stéphane Doyon (s.doyon@videotron.ca) in collaboration with ++Written by Stéphane Doyon (s.doyon@videotron.ca) in collaboration with + Simone Dal Maso . + + This is version 0.8 (August 2000) of this driver. +diff --git a/Drivers/Braille/Papenmeier/braille.c b/Drivers/Braille/Papenmeier/braille.c +index 2a28976..2248ca8 100644 +--- a/Drivers/Braille/Papenmeier/braille.c ++++ b/Drivers/Braille/Papenmeier/braille.c +@@ -17,21 +17,21 @@ + */ + + /* This Driver was written as a project in the +- * HTL W1, Abteilung Elektrotechnik, Wien - Österreich ++ * HTL W1, Abteilung Elektrotechnik, Wien - Österreich + * (Technical High School, Department for electrical engineering, + * Vienna, Austria) http://www.ee.htlw16.ac.at + * by + * Tibor Becker + * Michael Burger + * Herbert Gruber +- * Heimo Schön ++ * Heimo Schön + * Teacher: +- * August Hörandl ++ * August Hörandl + */ + /* + * Support for all Papenmeier Terminal + config file +- * Heimo.Schön +- * August Hörandl ++ * Heimo.Schön ++ * August Hörandl + */ + + #include "prologue.h" +diff --git a/Drivers/Braille/TSI/README b/Drivers/Braille/TSI/README +index eebeb07..5d6a760 100644 +--- a/Drivers/Braille/TSI/README ++++ b/Drivers/Braille/TSI/README +@@ -2,7 +2,7 @@ This is the BRLTTY driver for TSI braille displays, + Version 2.74 April 2004 + + Author and maintainer: +- Stéphane Doyon ++ Stéphane Doyon + E-Mail: s.doyon@videotron.ca + + This driver contains the code to support most of Telesensory Systems' braille +diff --git a/Drivers/Braille/TSI/braille.c b/Drivers/Braille/TSI/braille.c +index 5f56de5..f92543b 100644 +--- a/Drivers/Braille/TSI/braille.c ++++ b/Drivers/Braille/TSI/braille.c +@@ -18,7 +18,7 @@ + + /* TSI/braille.c - Braille display driver for TSI displays + * +- * Written by Stéphane Doyon (s.doyon@videotron.ca) ++ * Written by Stéphane Doyon (s.doyon@videotron.ca) + * + * It attempts full support for Navigator 20/40/80 and Powerbraille 40/65/80. + * It is designed to be compiled into BRLTTY version 3.5. +diff --git a/Drivers/Braille/TSI/braille.h b/Drivers/Braille/TSI/braille.h +index 63d361f..3f3dbc8 100644 +--- a/Drivers/Braille/TSI/braille.h ++++ b/Drivers/Braille/TSI/braille.h +@@ -18,7 +18,7 @@ + + /* TSI/braille.h - Configuration file for the TSI braille + * display driver (brl.c) +- * Written by Stéphane Doyon (s.doyon@videotron.ca) ++ * Written by Stéphane Doyon (s.doyon@videotron.ca) + * + * This file is intended for version 2.2beta3 of the driver. + */ +diff --git a/Drivers/Braille/VideoBraille/README.it b/Drivers/Braille/VideoBraille/README.it +index dcfd6a3..8574c48 100644 +--- a/Drivers/Braille/VideoBraille/README.it ++++ b/Drivers/Braille/VideoBraille/README.it +@@ -1,23 +1,23 @@ + Introduzione + +-Questo è il driver per il display braille Videobraille, distribuito dalla Tiflosoft. ++Questo è il driver per il display braille Videobraille, distribuito dalla Tiflosoft. + Questo driver funziona SOLO con il modello VB 40 e non funziona con l'aggiornamento PRO 9600. +-Potrei eventualmente aggiungere anche il supporto per il modello PRO 9600 se mi fosse richiesto, poiché si tratta solo di qualche breve modifica al codice; non ho implementato ancora il supporto per questo modello semplicemente perché non avrei avuto modo di testarlo. ++Potrei eventualmente aggiungere anche il supporto per il modello PRO 9600 se mi fosse richiesto, poiché si tratta solo di qualche breve modifica al codice; non ho implementato ancora il supporto per questo modello semplicemente perché non avrei avuto modo di testarlo. + + Implementazione + +-Questo driver non è perfetto. Ho riscontrato vari problemi relativi soprattutto alla temporizzazione, e ho dovuto implementare una funzione di scrittura che scrive ogni riga due volte sul display braille, non chiedetermi perché: è solo questione di test. ++Questo driver non è perfetto. Ho riscontrato vari problemi relativi soprattutto alla temporizzazione, e ho dovuto implementare una funzione di scrittura che scrive ogni riga due volte sul display braille, non chiedetermi perché: è solo questione di test. + Per implementare il driver, ho contattato direttamente chi ha progettato questo display (Acquistapace) per ottenere della documentazione. + +-Se volete contattarmi per qualunque problema o suggerimento, il mio indirizzo e-mail è christian_comaschi@libero.it +-Però, prima di contattarmi e scrivere che il driver non funziona, controllate che: +-- la vostra Videobraille non è PRO 9600 (se lo è e volete il driver, chiedete); +-- nel file braille.h LPTPORT è impostato correttamente: 0x378 per LPT1, 0x278 per LPT2,... +-Se tutto è giusto, provate a modificare in braille.h i valori VBDELAY, VBCLOCK e VBREFRESHDELAY: questi valori dipendono dalla velocità del computer, devono quindi essere adattati al vostro processore. Non penso che questo sia un buon modo di impostare i tempi di attesa, ma ho voluto rispettare l'implementazione originale, perché quando ho usato altri tipi di temporizzazione ho riscontrato problemi. ++Se volete contattarmi per qualunque problema o suggerimento, il mio indirizzo e-mail è christian_comaschi@libero.it ++Però, prima di contattarmi e scrivere che il driver non funziona, controllate che: ++- la vostra Videobraille non è PRO 9600 (se lo è e volete il driver, chiedete); ++- nel file braille.h LPTPORT è impostato correttamente: 0x378 per LPT1, 0x278 per LPT2,... ++Se tutto è giusto, provate a modificare in braille.h i valori VBDELAY, VBCLOCK e VBREFRESHDELAY: questi valori dipendono dalla velocità del computer, devono quindi essere adattati al vostro processore. Non penso che questo sia un buon modo di impostare i tempi di attesa, ma ho voluto rispettare l'implementazione originale, perché quando ho usato altri tipi di temporizzazione ho riscontrato problemi. + + Implementazione della funzione taglia/incolla + + Ho aggiornato in seguito il driver per implementare la funzione taglia/incolla in questo modo: si seleziona l'inizio di un blocco tenendo premuto uno dei 40 tastini dell'aggancio cursore e premendo Edit; si contrassegna la fine di un blocco tenendo premuto uno dei 40 tastini e premendo Menu. + Il tastino da premere va selezionato come nella procedura di aggancio cursore. + Quindi, per incollare il testo, basta premere contemporaneamente i tasti Attr e Menu. +-Per questa implementazione ho dovuto inventare le combinazioni dei tasti perché la funzione copia/incolla non esisteva nel driver DOS originale. ++Per questa implementazione ho dovuto inventare le combinazioni dei tasti perché la funzione copia/incolla non esisteva nel driver DOS originale. +diff --git a/Drivers/Braille/Voyager/README b/Drivers/Braille/Voyager/README +index 2a3c6be..87ca6a1 100644 +--- a/Drivers/Braille/Voyager/README ++++ b/Drivers/Braille/Voyager/README +@@ -2,7 +2,7 @@ BRLTTY Driver for the Tieman Voyager Braille Display + This is the user-space-only version of the driver. + Version 0.10 (March 2004) + +-Copyright 2004 by Stéphane Doyon ++Copyright 2004 by Stéphane Doyon + + This is a partial rewrite of the driver which functions entirely from + user-space (whereas the previous driver depended on a kernel driver for +@@ -25,7 +25,7 @@ projects and are so supportive. + Thanks to Andor Demarteau who got this whole + project started and beta-tested all our early buggy attempts. + +-Thanks to Stéphane Dalton who wrote the initial version of the old kernel ++Thanks to Stéphane Dalton who wrote the initial version of the old kernel + driver. Without his initiative this project would not have been a success. + + This rewrite of the driver should allow more flexibility, but is as of yet +diff --git a/Drivers/Braille/Voyager/braille.c b/Drivers/Braille/Voyager/braille.c +index ccb30ee..64f60a0 100644 +--- a/Drivers/Braille/Voyager/braille.c ++++ b/Drivers/Braille/Voyager/braille.c +@@ -18,7 +18,7 @@ + + /* Voyager/braille.c - Braille display driver for Tieman Voyager displays. + * +- * Written by Stéphane Doyon ++ * Written by Stéphane Doyon + * + * It is being tested on Voyager 44, should also support Voyager 70. + * It is designed to be compiled in BRLTTY version 4.1. +diff --git a/Drivers/Speech/ExternalSpeech/README b/Drivers/Speech/ExternalSpeech/README +index d6289d5..c8d606b 100644 +--- a/Drivers/Speech/ExternalSpeech/README ++++ b/Drivers/Speech/ExternalSpeech/README +@@ -1,5 +1,5 @@ + ExternalSpeech +-by Stéphane Doyon ++by Stéphane Doyon + Version 0.7 beta, September 2001 + + This speech driver interfaces with an external program that will handle +diff --git a/Drivers/Speech/ExternalSpeech/speech.c b/Drivers/Speech/ExternalSpeech/speech.c +index b1916d0..0641f93 100644 +--- a/Drivers/Speech/ExternalSpeech/speech.c ++++ b/Drivers/Speech/ExternalSpeech/speech.c +@@ -18,7 +18,7 @@ + + /* ExternalSpeech/speech.c - Speech library (driver) + * For external programs, using my own protocol. Features indexing. +- * Stéphane Doyon ++ * Stéphane Doyon + */ + + #include "prologue.h" diff --git a/brltty.spec b/brltty.spec index 1e3cccb..94bf13b 100644 --- a/brltty.spec +++ b/brltty.spec @@ -12,7 +12,7 @@ # disable python2 by default %bcond python2 0 -%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh8)} +%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)} %{!?tcl_sitearch: %global tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}} # with speech dispatcher iff on Fedora: @@ -37,7 +37,7 @@ Name: brltty Version: 6.7 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -50,8 +50,11 @@ Patch1: brltty-6.3-loadLibrary.patch Patch2: brltty-6.3-libspeechd.patch # https://brltty.app/pipermail/brltty/2024-December/020462.html Patch3: brltty-6.6-path-separator-fix.patch -# Until tcl-9 is supported by upstream -Patch4: brltty-6.7-compat-tcl8.patch +# https://github.com/brltty/brltty/commit/249f36e5da4b60dee33e9207b41c5a3b135a670e +# also required by Tcl 9.0 +Patch4: brltty-6.7-utf8.patch +# https://github.com/brltty/brltty/commit/c657726a5e03d53a037632e6068d0c2273950b36 +Patch5: brltty-6.7-tcl9.patch Summary: Braille display driver for Linux/Unix BuildRequires: byacc BuildRequires: glibc-kernheaders @@ -178,7 +181,7 @@ which directly accesses a refreshable braille display. %package -n tcl-brlapi Version: %{api_version} Requires: brlapi%{?_isa} = %{api_version}-%{release} -BuildRequires: tcl-devel < 1:9 +BuildRequires: tcl-devel Summary: Tcl binding for BrlAPI %description -n tcl-brlapi This package provides the Tcl binding for BrlAPI. @@ -258,10 +261,7 @@ installer. mv %{name}-%{version} python2 pushd python2 -%patch -P 1 -p1 -b .loadLibrary -%patch -P 2 -p1 -b .libspeechd -%patch -P 3 -p1 -b .path-separator-fix -%patch -P 4 -p1 -b .compat-tcl8 +%autopatch -p1 # remove packaged binary file rm -f Programs/brltty-ktb @@ -684,6 +684,10 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Feb 11 2025 Jaroslav Å karvada - 6.7-9 +- Built for tcl 9.0 + Related: rhbz#2337691 + * Mon Feb 3 2025 Jaroslav Å karvada - 6.7-8 - Rebuilt for tcl/tk change Related: rhbz#2337691 From 5ad6d5ca5dbe70d5b3f4010f56119419db401ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:15 +0100 Subject: [PATCH 15/24] Drop call to %sysusers_create_compat After https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers, rpm will handle account creation automatically. --- brltty.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/brltty.spec b/brltty.spec index 94bf13b..2e5ec12 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.7 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -62,7 +62,6 @@ BuildRequires: gcc BuildRequires: bluez-libs-devel BuildRequires: systemd BuildRequires: systemd-rpm-macros -%{?sysusers_requires_compat} BuildRequires: lua-devel BuildRequires: gettext BuildRequires: at-spi2-core-devel @@ -152,7 +151,7 @@ This package provides the eSpeak-NG driver for BRLTTY. %package -n brlapi Version: %{api_version} Summary: Application Programming Interface for BRLTTY -Requires(pre): glibc-common, shadow-utils +Requires(pre): glibc-common Requires(post): coreutils, util-linux %description -n brlapi This package provides the run-time support for the Application @@ -546,8 +545,6 @@ find %{buildroot}%{_datadir} -type d -name 'Java' | xargs rm -rf %postun %systemd_postun_with_restart brltty.service -%pre -n brlapi -%sysusers_create_compat %{SOURCE4} %post -n brlapi if [ ! -e %{_sysconfdir}/brlapi.key ]; then @@ -684,6 +681,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Feb 11 2025 Zbigniew JÄ™drzejewski-Szmek - 6.7-10 +- Drop call to %sysusers_create_compat + * Tue Feb 11 2025 Jaroslav Å karvada - 6.7-9 - Built for tcl 9.0 Related: rhbz#2337691 From 39d0ed7491bef8770071b138b2761e9ca045b549 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:47:35 +0200 Subject: [PATCH 16/24] Rebuilt for Python 3.14 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 2e5ec12..bed4066 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.7 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -681,6 +681,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Jun 02 2025 Python Maint - 6.7-11 +- Rebuilt for Python 3.14 + * Tue Feb 11 2025 Zbigniew JÄ™drzejewski-Szmek - 6.7-10 - Drop call to %sysusers_create_compat From c1bf7a082d8436d41acd67d87ac18ad264920a91 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 7 Jul 2025 09:58:31 -0500 Subject: [PATCH 17/24] 6.8 --- brltty-6.3-libspeechd.patch | 13 -- brltty-6.6-path-separator-fix.patch | 26 --- brltty-6.7-tcl9.patch | 165 ---------------- brltty-6.7-utf8.patch | 286 ---------------------------- brltty-6.8-libspeechd.patch | 11 ++ brltty.spec | 20 +- sources | 2 +- 7 files changed, 20 insertions(+), 503 deletions(-) delete mode 100644 brltty-6.3-libspeechd.patch delete mode 100644 brltty-6.6-path-separator-fix.patch delete mode 100644 brltty-6.7-tcl9.patch delete mode 100644 brltty-6.7-utf8.patch create mode 100644 brltty-6.8-libspeechd.patch diff --git a/brltty-6.3-libspeechd.patch b/brltty-6.3-libspeechd.patch deleted file mode 100644 index 97e1d1f..0000000 --- a/brltty-6.3-libspeechd.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Drivers/Speech/SpeechDispatcher/speech.c b/Drivers/Speech/SpeechDispatcher/speech.c -index cc55007..a2fcc0d 100644 ---- a/Drivers/Speech/SpeechDispatcher/speech.c -+++ b/Drivers/Speech/SpeechDispatcher/speech.c -@@ -35,7 +35,7 @@ typedef enum { - - #include "spk_driver.h" - --#include -+#include - - static SPDConnection *connectionHandle = NULL; - static const char *moduleName; diff --git a/brltty-6.6-path-separator-fix.patch b/brltty-6.6-path-separator-fix.patch deleted file mode 100644 index 20f55ec..0000000 --- a/brltty-6.6-path-separator-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Bindings/Tcl/bindings.m4 b/Bindings/Tcl/bindings.m4 -index edb59a72e..e5563c483 100644 ---- a/Bindings/Tcl/bindings.m4 -+++ b/Bindings/Tcl/bindings.m4 -@@ -51,8 +51,20 @@ fi - - ${TCL_OK} && { - test -n "${TCL_PACKAGE_PATH}" && { -- for directory in ${TCL_PACKAGE_PATH} -+ directories="${TCL_PACKAGE_PATH}" -+ -+ test "${directories#*:}" = "${directories}" && { -+ # There's no colon so it's an old-style (pre tcl-) path. -+ # Replace each sequence of one or more spaces with a single colon. -+ directories="${directories// /:}" -+ } -+ -+ while test "${#directories}" -gt 0 - do -+ directory="${directories%%:*}" -+ directories="${directories#*:}" -+ test "${#directory}" -eq 0 && continue -+ - test `expr "${directory}" : '.*/lib'` -eq 0 || { - TCL_DIR="${directory}" - break diff --git a/brltty-6.7-tcl9.patch b/brltty-6.7-tcl9.patch deleted file mode 100644 index de1744c..0000000 --- a/brltty-6.7-tcl9.patch +++ /dev/null @@ -1,165 +0,0 @@ -From c657726a5e03d53a037632e6068d0c2273950b36 Mon Sep 17 00:00:00 2001 -From: Dave Mielke -Date: Mon, 10 Feb 2025 17:16:00 -0500 -Subject: [PATCH] Changes to support Tcl 9.0. - ---- - Bindings/Tcl/bindings.c | 49 ++++++++++++++++++++++------------------- - 1 file changed, 26 insertions(+), 23 deletions(-) - -diff --git a/Bindings/Tcl/bindings.c b/Bindings/Tcl/bindings.c -index 319a64f19..3310fcf80 100644 ---- a/Bindings/Tcl/bindings.c -+++ b/Bindings/Tcl/bindings.c -@@ -19,12 +19,19 @@ - #include - #include - -+#include "brl_dots.h" -+ - #define BRLAPI_NO_DEPRECATED - #define BRLAPI_NO_SINGLE_SESSION - #include "brlapi.h" - - #include --#include "brl_dots.h" -+ -+#ifndef TCL_SIZE_MAX -+typedef int Tcl_Size; -+#define TCL_SIZE_MAX ((int)(((unsigned int)-1)>>1)) -+#define TCL_SIZE_MODIFIER "" -+#endif /* TCL_SIZE_MAX */ - - #define allocateMemory(size) ((void *)ckalloc((size))) - #define deallocateMemory(address) ckfree((void *)(address)) -@@ -74,15 +81,11 @@ setStringResult (Tcl_Interp *interp, const char *string, int length) { - Tcl_SetStringObj(Tcl_GetObjResult(interp), string, length); - } - --static void --setStringsResult (Tcl_Interp *interp, ...) { -- Tcl_ResetResult(interp); -- -- va_list arguments; -- va_start(arguments, interp); -- Tcl_AppendStringsToObjVA(Tcl_GetObjResult(interp), arguments); -- va_end(arguments); --} -+#define setStringsResult(interp, ...) \ -+ do { \ -+ Tcl_ResetResult(interp); \ -+ Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), __VA_ARGS__); \ -+ } while (0) - - static void - setByteArrayResult (Tcl_Interp *interp, const unsigned char *bytes, int count) { -@@ -428,7 +431,7 @@ FUNCTION_HANDLER(session, enterTtyModeWithPath) { - END_OPTIONS(2, 0, 0, "") - - Tcl_Obj **elements; -- int count; -+ Tcl_Size count; - - if (options.path) { - TEST_TCL_OK(Tcl_ListObjGetElements(interp, options.path, &count, &elements)); -@@ -650,7 +653,7 @@ FUNCTION_HANDLER(session, parameter) { - - default: { - Tcl_Obj **elements; -- int count; -+ Tcl_Size count; - TEST_TCL_OK(Tcl_ListObjGetElements(interp, value, &count, &elements)); - - if (count) { -@@ -835,7 +838,7 @@ FUNCTION_HANDLER(session, readKey) { - BrlapiSession *session = data; - TEST_FUNCTION_ARGUMENTS(1, 0, ""); - -- int length; -+ Tcl_Size length; - const char *operand = Tcl_GetStringFromObj(objv[2], &length); - if (!operand) return TCL_ERROR; - -@@ -854,7 +857,7 @@ FUNCTION_HANDLER(session, readKeyWithTimeout) { - BrlapiSession *session = data; - TEST_FUNCTION_ARGUMENTS(1, 0, "{infinite | }"); - -- int length; -+ Tcl_Size length; - const char *operand = Tcl_GetStringFromObj(objv[2], &length); - if (!operand) return TCL_ERROR; - int timeout; -@@ -908,7 +911,7 @@ FUNCTION_HANDLER(session, sendRaw) { - BrlapiSession *session = data; - TEST_FUNCTION_ARGUMENTS(1, 0, ""); - -- int count; -+ Tcl_Size count; - const unsigned char *bytes = Tcl_GetByteArrayFromObj(objv[2], &count); - - TEST_BRLAPI_OK(brlapi__sendRaw(session->handle, bytes, count)); -@@ -943,8 +946,8 @@ typedef struct { - Tcl_Obj *textObject; - int textLength; - -- int andLength; -- int orLength; -+ Tcl_Size andLength; -+ Tcl_Size orLength; - - unsigned numericCursor:1; - unsigned numericDisplay:1; -@@ -1240,7 +1243,7 @@ FUNCTION_HANDLER(session, writeDots) { - TEST_TCL_OK(getCellCount(interp, session, &size)); - - unsigned char buffer[size]; -- int count; -+ Tcl_Size count; - const unsigned char *cells = Tcl_GetByteArrayFromObj(objv[2], &count); - - if (count < size) { -@@ -1293,7 +1296,7 @@ changeKeys ( - } - - Tcl_Obj **codeElements; -- int codeCount; -+ Tcl_Size codeCount; - TEST_TCL_OK(Tcl_ListObjGetElements(interp, codeList, &codeCount, &codeElements)); - - if (codeCount) { -@@ -1335,7 +1338,7 @@ changeKeyRanges ( - TEST_FUNCTION_ARGUMENTS(1, 0, ""); - - Tcl_Obj **rangeElements; -- int rangeCount; -+ Tcl_Size rangeCount; - TEST_TCL_OK(Tcl_ListObjGetElements(interp, objv[2], &rangeCount, &rangeElements)); - - if (rangeCount) { -@@ -1344,7 +1347,7 @@ changeKeyRanges ( - for (int rangeIndex=0; rangeIndex"); - - Tcl_Obj **elements; -- int elementCount; -+ Tcl_Size elementCount; - TEST_TCL_OK(Tcl_ListObjGetElements(interp, objv[2], &elementCount, &elements)); - - if (elementCount) { -@@ -1543,7 +1546,7 @@ FUNCTION_HANDLER(general, makeDots) { - BrlDots *cell = &cells[elementIndex]; - *cell = 0; - -- int numberCount; -+ Tcl_Size numberCount; - const char *numbers = Tcl_GetStringFromObj(element, &numberCount); - if (!numbers) return TCL_ERROR; - diff --git a/brltty-6.7-utf8.patch b/brltty-6.7-utf8.patch deleted file mode 100644 index b6259f5..0000000 --- a/brltty-6.7-utf8.patch +++ /dev/null @@ -1,286 +0,0 @@ -diff --git a/Drivers/Braille/BrailleLite/README b/Drivers/Braille/BrailleLite/README -index 80c341b..73cc290 100644 ---- a/Drivers/Braille/BrailleLite/README -+++ b/Drivers/Braille/BrailleLite/README -@@ -4,7 +4,7 @@ This is a beta driver for the Blazie Engineering Braille Lite. - written by Nikhil Nair, - with additions from Nicolas Pitre - and Pete De Vasto, --further modifications by Stéphane Doyon , -+further modifications by Stéphane Doyon , - starting August 2001. - - Both BrailleLite 18 and 40 should work, and there is now code that should -@@ -27,44 +27,44 @@ when the unit is in its internal notetaker mode. - See help.src for a description of the key bindings. - - History: --Stéphane Doyon, April 2002, version 0.5.10: -+Stéphane Doyon, April 2002, version 0.5.10: - -Act as if kbemu was off in any context other than CMDS_SCREEN (in - particular typing a key won't throw you out of preferences menu - anymore). --Stéphane Doyon, March 2002, version 0.5.9: -+Stéphane Doyon, March 2002, version 0.5.9: - -Added "kbemu" driver parameter, so can start with kbemu already active. --Stéphane Doyon, February 2002, version 0.5.8: -+Stéphane Doyon, February 2002, version 0.5.8: - -Added CMD_LEARN, CMD_NXPROMPT/CMD_PRPROMPT and CMD_SIXDOTS. Several - VAL_PASSKEY effects were done through special cases: moved them - back into cmdtrans. Identified special/reserved and free bindings. - Cleaned out some #if 0s. --Stéphane Doyon, January 2002, version 0.5.7: -+Stéphane Doyon, January 2002, version 0.5.7: - -Added bindings for CR_CUTAPPEND and CR_CUTLINE. Replaced CMD_CUT_BEG, - CMD_CUT_END and CMD_CSRJMP by CR_ equivalents. Added CR_SETMARK and - CR_GOTOMARK. These are a bit nasty: they reuse existing command dot - patterns from within o-chord. Well practically all the patterns are - taken! --Stéphane Doyon, January 2002, version 0.5.6: -+Stéphane Doyon, January 2002, version 0.5.6: - -Fixed dot combinations with dots 7-8 on BL40 (for typing caps and ctrl). --Stéphane Doyon, December 2001, version 0.5.5: -+Stéphane Doyon, December 2001, version 0.5.5: - -META is back. Now use VPC modifiers on VALPASSCHAR when TEXTTRANS - not defined. Fixed uppercase that always locked active. Sub-commands - of 35-chord no longer need to be chorded. --Stéphane Doyon, November 2001, version 0.5.4: -+Stéphane Doyon, November 2001, version 0.5.4: - -Now using new generic VAL_PASS* mechanism for typing in keys, rather - than having the driver itself insert stuff into the console. We - no longer have the META function though, but we have ESCAPE. --Stéphane Doyon and Dave Mielke, September 2001, version 0.5.3: -+Stéphane Doyon and Dave Mielke, September 2001, version 0.5.3: - -closebrl: don't clear display, use TCSADRAIN. - -Slight API and name changes for BRLTTY 3.0. Commands can no longer be - assumed to be chars, changed type of cmdtrans. - -Fixed binding for switching virtual terminal with o-chord... it was wrong. --Stéphane Doyon, September 2001, version 0.5.2: -+Stéphane Doyon, September 2001, version 0.5.2: - -Added baudrate parameter. Fixed up initialization, in particular a bug - with use of qbase buffer unitialized. --Stéphane Doyon, September 2001, version 0.5.1: -+Stéphane Doyon, September 2001, version 0.5.1: - -Added bindings for CMD_BACK and CR_MSGATTRIB. --Stéphane Doyon, August 2001 -+Stéphane Doyon, August 2001 - -Added a version number, as many people have been playing with this - driver. Arbitrarily started at 0.5. - -Made the help more compact, and remove the duplication of the key -diff --git a/Drivers/Braille/BrailleLite/braille.c b/Drivers/Braille/BrailleLite/braille.c -index 522f573..ca1d05a 100644 ---- a/Drivers/Braille/BrailleLite/braille.c -+++ b/Drivers/Braille/BrailleLite/braille.c -@@ -21,7 +21,7 @@ - * Author: Nikhil Nair - * Copyright (C) 1998 by Nikhil Nair. - * Some additions by: Nicolas Pitre -- * Some modifications copyright 2001 by Stéphane Doyon . -+ * Some modifications copyright 2001 by Stéphane Doyon . - * Some additions by: Dave Mielke - */ - -diff --git a/Drivers/Braille/Libbraille/Makefile.in b/Drivers/Braille/Libbraille/Makefile.in -index f9770db..e563c39 100644 ---- a/Drivers/Braille/Libbraille/Makefile.in -+++ b/Drivers/Braille/Libbraille/Makefile.in -@@ -20,7 +20,7 @@ DRIVER_CODE = lb - DRIVER_NAME = Libbraille - DRIVER_USAGE = Libbraille - DRIVER_VERSION = --DRIVER_DEVELOPERS = Sébastien Sablé -+DRIVER_DEVELOPERS = Sébastien Sablé - BRL_OBJS = @braille_libraries_lb@ - include $(SRC_TOP)braille.mk - -diff --git a/Drivers/Braille/LogText/README b/Drivers/Braille/LogText/README -index 74615f7..f035e93 100644 ---- a/Drivers/Braille/LogText/README -+++ b/Drivers/Braille/LogText/README -@@ -1,7 +1,7 @@ - This directory contains the BRLTTY driver for the LogText, which is - manufactured by Tactilog of Denmark. It was implemented, and is being - maintained, by Dave Mielke . Thanks to Hans Schou -- for his help and advice, and to Thomas Sørensen -+ for his help and advice, and to Thomas Sørensen - for testing. As a component of BRLTTY, this driver - is released under the terms of the GNU Public License. - -diff --git a/Drivers/Braille/MDV/README b/Drivers/Braille/MDV/README -index b252b48..8ac5705 100644 ---- a/Drivers/Braille/MDV/README -+++ b/Drivers/Braille/MDV/README -@@ -1,6 +1,6 @@ - Braille display driver for MDV displays - --Written by Stéphane Doyon (s.doyon@videotron.ca) in collaboration with -+Written by Stéphane Doyon (s.doyon@videotron.ca) in collaboration with - Simone Dal Maso . - - This is version 0.8 (August 2000) of this driver. -diff --git a/Drivers/Braille/Papenmeier/braille.c b/Drivers/Braille/Papenmeier/braille.c -index 2a28976..2248ca8 100644 ---- a/Drivers/Braille/Papenmeier/braille.c -+++ b/Drivers/Braille/Papenmeier/braille.c -@@ -17,21 +17,21 @@ - */ - - /* This Driver was written as a project in the -- * HTL W1, Abteilung Elektrotechnik, Wien - Österreich -+ * HTL W1, Abteilung Elektrotechnik, Wien - Österreich - * (Technical High School, Department for electrical engineering, - * Vienna, Austria) http://www.ee.htlw16.ac.at - * by - * Tibor Becker - * Michael Burger - * Herbert Gruber -- * Heimo Schön -+ * Heimo Schön - * Teacher: -- * August Hörandl -+ * August Hörandl - */ - /* - * Support for all Papenmeier Terminal + config file -- * Heimo.Schön -- * August Hörandl -+ * Heimo.Schön -+ * August Hörandl - */ - - #include "prologue.h" -diff --git a/Drivers/Braille/TSI/README b/Drivers/Braille/TSI/README -index eebeb07..5d6a760 100644 ---- a/Drivers/Braille/TSI/README -+++ b/Drivers/Braille/TSI/README -@@ -2,7 +2,7 @@ This is the BRLTTY driver for TSI braille displays, - Version 2.74 April 2004 - - Author and maintainer: -- Stéphane Doyon -+ Stéphane Doyon - E-Mail: s.doyon@videotron.ca - - This driver contains the code to support most of Telesensory Systems' braille -diff --git a/Drivers/Braille/TSI/braille.c b/Drivers/Braille/TSI/braille.c -index 5f56de5..f92543b 100644 ---- a/Drivers/Braille/TSI/braille.c -+++ b/Drivers/Braille/TSI/braille.c -@@ -18,7 +18,7 @@ - - /* TSI/braille.c - Braille display driver for TSI displays - * -- * Written by Stéphane Doyon (s.doyon@videotron.ca) -+ * Written by Stéphane Doyon (s.doyon@videotron.ca) - * - * It attempts full support for Navigator 20/40/80 and Powerbraille 40/65/80. - * It is designed to be compiled into BRLTTY version 3.5. -diff --git a/Drivers/Braille/TSI/braille.h b/Drivers/Braille/TSI/braille.h -index 63d361f..3f3dbc8 100644 ---- a/Drivers/Braille/TSI/braille.h -+++ b/Drivers/Braille/TSI/braille.h -@@ -18,7 +18,7 @@ - - /* TSI/braille.h - Configuration file for the TSI braille - * display driver (brl.c) -- * Written by Stéphane Doyon (s.doyon@videotron.ca) -+ * Written by Stéphane Doyon (s.doyon@videotron.ca) - * - * This file is intended for version 2.2beta3 of the driver. - */ -diff --git a/Drivers/Braille/VideoBraille/README.it b/Drivers/Braille/VideoBraille/README.it -index dcfd6a3..8574c48 100644 ---- a/Drivers/Braille/VideoBraille/README.it -+++ b/Drivers/Braille/VideoBraille/README.it -@@ -1,23 +1,23 @@ - Introduzione - --Questo è il driver per il display braille Videobraille, distribuito dalla Tiflosoft. -+Questo è il driver per il display braille Videobraille, distribuito dalla Tiflosoft. - Questo driver funziona SOLO con il modello VB 40 e non funziona con l'aggiornamento PRO 9600. --Potrei eventualmente aggiungere anche il supporto per il modello PRO 9600 se mi fosse richiesto, poiché si tratta solo di qualche breve modifica al codice; non ho implementato ancora il supporto per questo modello semplicemente perché non avrei avuto modo di testarlo. -+Potrei eventualmente aggiungere anche il supporto per il modello PRO 9600 se mi fosse richiesto, poiché si tratta solo di qualche breve modifica al codice; non ho implementato ancora il supporto per questo modello semplicemente perché non avrei avuto modo di testarlo. - - Implementazione - --Questo driver non è perfetto. Ho riscontrato vari problemi relativi soprattutto alla temporizzazione, e ho dovuto implementare una funzione di scrittura che scrive ogni riga due volte sul display braille, non chiedetermi perché: è solo questione di test. -+Questo driver non è perfetto. Ho riscontrato vari problemi relativi soprattutto alla temporizzazione, e ho dovuto implementare una funzione di scrittura che scrive ogni riga due volte sul display braille, non chiedetermi perché: è solo questione di test. - Per implementare il driver, ho contattato direttamente chi ha progettato questo display (Acquistapace) per ottenere della documentazione. - --Se volete contattarmi per qualunque problema o suggerimento, il mio indirizzo e-mail è christian_comaschi@libero.it --Però, prima di contattarmi e scrivere che il driver non funziona, controllate che: --- la vostra Videobraille non è PRO 9600 (se lo è e volete il driver, chiedete); --- nel file braille.h LPTPORT è impostato correttamente: 0x378 per LPT1, 0x278 per LPT2,... --Se tutto è giusto, provate a modificare in braille.h i valori VBDELAY, VBCLOCK e VBREFRESHDELAY: questi valori dipendono dalla velocità del computer, devono quindi essere adattati al vostro processore. Non penso che questo sia un buon modo di impostare i tempi di attesa, ma ho voluto rispettare l'implementazione originale, perché quando ho usato altri tipi di temporizzazione ho riscontrato problemi. -+Se volete contattarmi per qualunque problema o suggerimento, il mio indirizzo e-mail è christian_comaschi@libero.it -+Però, prima di contattarmi e scrivere che il driver non funziona, controllate che: -+- la vostra Videobraille non è PRO 9600 (se lo è e volete il driver, chiedete); -+- nel file braille.h LPTPORT è impostato correttamente: 0x378 per LPT1, 0x278 per LPT2,... -+Se tutto è giusto, provate a modificare in braille.h i valori VBDELAY, VBCLOCK e VBREFRESHDELAY: questi valori dipendono dalla velocità del computer, devono quindi essere adattati al vostro processore. Non penso che questo sia un buon modo di impostare i tempi di attesa, ma ho voluto rispettare l'implementazione originale, perché quando ho usato altri tipi di temporizzazione ho riscontrato problemi. - - Implementazione della funzione taglia/incolla - - Ho aggiornato in seguito il driver per implementare la funzione taglia/incolla in questo modo: si seleziona l'inizio di un blocco tenendo premuto uno dei 40 tastini dell'aggancio cursore e premendo Edit; si contrassegna la fine di un blocco tenendo premuto uno dei 40 tastini e premendo Menu. - Il tastino da premere va selezionato come nella procedura di aggancio cursore. - Quindi, per incollare il testo, basta premere contemporaneamente i tasti Attr e Menu. --Per questa implementazione ho dovuto inventare le combinazioni dei tasti perché la funzione copia/incolla non esisteva nel driver DOS originale. -+Per questa implementazione ho dovuto inventare le combinazioni dei tasti perché la funzione copia/incolla non esisteva nel driver DOS originale. -diff --git a/Drivers/Braille/Voyager/README b/Drivers/Braille/Voyager/README -index 2a3c6be..87ca6a1 100644 ---- a/Drivers/Braille/Voyager/README -+++ b/Drivers/Braille/Voyager/README -@@ -2,7 +2,7 @@ BRLTTY Driver for the Tieman Voyager Braille Display - This is the user-space-only version of the driver. - Version 0.10 (March 2004) - --Copyright 2004 by Stéphane Doyon -+Copyright 2004 by Stéphane Doyon - - This is a partial rewrite of the driver which functions entirely from - user-space (whereas the previous driver depended on a kernel driver for -@@ -25,7 +25,7 @@ projects and are so supportive. - Thanks to Andor Demarteau who got this whole - project started and beta-tested all our early buggy attempts. - --Thanks to Stéphane Dalton who wrote the initial version of the old kernel -+Thanks to Stéphane Dalton who wrote the initial version of the old kernel - driver. Without his initiative this project would not have been a success. - - This rewrite of the driver should allow more flexibility, but is as of yet -diff --git a/Drivers/Braille/Voyager/braille.c b/Drivers/Braille/Voyager/braille.c -index ccb30ee..64f60a0 100644 ---- a/Drivers/Braille/Voyager/braille.c -+++ b/Drivers/Braille/Voyager/braille.c -@@ -18,7 +18,7 @@ - - /* Voyager/braille.c - Braille display driver for Tieman Voyager displays. - * -- * Written by Stéphane Doyon -+ * Written by Stéphane Doyon - * - * It is being tested on Voyager 44, should also support Voyager 70. - * It is designed to be compiled in BRLTTY version 4.1. -diff --git a/Drivers/Speech/ExternalSpeech/README b/Drivers/Speech/ExternalSpeech/README -index d6289d5..c8d606b 100644 ---- a/Drivers/Speech/ExternalSpeech/README -+++ b/Drivers/Speech/ExternalSpeech/README -@@ -1,5 +1,5 @@ - ExternalSpeech --by Stéphane Doyon -+by Stéphane Doyon - Version 0.7 beta, September 2001 - - This speech driver interfaces with an external program that will handle -diff --git a/Drivers/Speech/ExternalSpeech/speech.c b/Drivers/Speech/ExternalSpeech/speech.c -index b1916d0..0641f93 100644 ---- a/Drivers/Speech/ExternalSpeech/speech.c -+++ b/Drivers/Speech/ExternalSpeech/speech.c -@@ -18,7 +18,7 @@ - - /* ExternalSpeech/speech.c - Speech library (driver) - * For external programs, using my own protocol. Features indexing. -- * Stéphane Doyon -+ * Stéphane Doyon - */ - - #include "prologue.h" diff --git a/brltty-6.8-libspeechd.patch b/brltty-6.8-libspeechd.patch new file mode 100644 index 0000000..2f4a1d8 --- /dev/null +++ b/brltty-6.8-libspeechd.patch @@ -0,0 +1,11 @@ +--- a/Drivers/Speech/SpeechDispatcher/speech.c~ 2025-05-25 03:58:25.000000000 -0500 ++++ b/Drivers/Speech/SpeechDispatcher/speech.c 2025-07-07 08:58:19.519919859 -0500 +@@ -36,7 +36,7 @@ + + #include "spk_driver.h" + +-#include ++#include + + static SPDConnection *connectionHandle = NULL; + static unsigned int autospawn; diff --git a/brltty.spec b/brltty.spec index bed4066..535a16a 100644 --- a/brltty.spec +++ b/brltty.spec @@ -1,5 +1,5 @@ -%define pkg_version 6.7 -%define api_version 0.8.6 +%define pkg_version 6.8 +%define api_version 0.8.7 # minimal means brltty-minimal subpackage with minimal deps for # braille support in Anaconda installer @@ -36,8 +36,8 @@ %global __requires_exclude ^(%{_privatelibs})$ Name: brltty -Version: 6.7 -Release: 11%{?dist} +Version: 6.8 +Release: 1%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -47,14 +47,7 @@ Source3: brlapi-forbuild.h Source4: brltty.sysusers Patch1: brltty-6.3-loadLibrary.patch # libspeechd.h moved in latest speech-dispatch (NOT sent upstream) -Patch2: brltty-6.3-libspeechd.patch -# https://brltty.app/pipermail/brltty/2024-December/020462.html -Patch3: brltty-6.6-path-separator-fix.patch -# https://github.com/brltty/brltty/commit/249f36e5da4b60dee33e9207b41c5a3b135a670e -# also required by Tcl 9.0 -Patch4: brltty-6.7-utf8.patch -# https://github.com/brltty/brltty/commit/c657726a5e03d53a037632e6068d0c2273950b36 -Patch5: brltty-6.7-tcl9.patch +Patch2: brltty-6.8-libspeechd.patch Summary: Braille display driver for Linux/Unix BuildRequires: byacc BuildRequires: glibc-kernheaders @@ -681,6 +674,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Jul 07 2025 Gwyn Ciesla - 6.8-1 +- 6.8 + * Mon Jun 02 2025 Python Maint - 6.7-11 - Rebuilt for Python 3.14 diff --git a/sources b/sources index fe1b3d7..c63ce6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (brltty-6.7.tar.xz) = 68ef75369ce2a23dff17b212aec0844b5e3e416cc730bdf872d68f32b0d8398f86d1e91f076dcb1730543c3d47266a40d7d61842524076d2fd4e82ef95bc34bb +SHA512 (brltty-6.8.tar.xz) = 08540cdf09eaa1caabd8400cb6e589f99f5f2b8aaaf8c031e5165e9b0605858e90dc9dd72f2095347f4860714214ecf184e3675422df880f1bf06bb4cc6f42ee From 232d14db41c0a034c8ba5b846b0c076b99a2efdc Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 11 Jul 2025 11:10:00 -0600 Subject: [PATCH 18/24] Rebuild to fix OCaml dependencies --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 535a16a..37aa6b6 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.8 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -674,6 +674,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Fri Jul 11 2025 Jerry James - 6.8-2 +- Rebuild to fix OCaml dependencies + * Mon Jul 07 2025 Gwyn Ciesla - 6.8-1 - 6.8 From b80d83d0691b48961e15596be720976c7734648a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:53:30 +0000 Subject: [PATCH 19/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 37aa6b6..8de8429 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.8 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -674,6 +674,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 6.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jul 11 2025 Jerry James - 6.8-2 - Rebuild to fix OCaml dependencies From e72f47fa96b0ab292723ed2f71298a72546db908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 6 Aug 2025 09:52:32 +0200 Subject: [PATCH 20/24] Rebuilt for icu 77.1 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 8de8429..e9337bc 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.8 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -674,6 +674,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Aug 06 2025 FrantiÅ¡ek Zatloukal - 6.8-4 +- Rebuilt for icu 77.1 + * Wed Jul 23 2025 Fedora Release Engineering - 6.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a80e10a13ab660d8f1d203d61a15a981a94e13e3 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 28 Aug 2025 16:31:21 -0500 Subject: [PATCH 21/24] Test migration --- .fmf/version | 1 + plans.fmf | 5 +++++ tests/main.fmf | 2 ++ tests/run_tests.sh | 4 ++++ tests/tests.yml | 17 ----------------- 5 files changed, 12 insertions(+), 17 deletions(-) create mode 100644 .fmf/version create mode 100644 plans.fmf create mode 100644 tests/main.fmf create mode 100644 tests/run_tests.sh delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..d972d2f --- /dev/null +++ b/plans.fmf @@ -0,0 +1,5 @@ +summary: Run all smoke tests +discover: + how: fmf +execute: + how: tmt diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..6189cf3 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,2 @@ +summary: Smoke test +test: ./run_tests.sh diff --git a/tests/run_tests.sh b/tests/run_tests.sh new file mode 100644 index 0000000..9dd745a --- /dev/null +++ b/tests/run_tests.sh @@ -0,0 +1,4 @@ +#!/bin/bash +pushd sanity-test || exit +./runtest.sh +popd || exit diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index b294380..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,17 +0,0 @@ -- hosts: localhost - tags: - - classic - - container - roles: - - role: standard-test-beakerlib - tests: - - sanity-test - required_packages: - - ImageMagick - - Xvfb - - brltty - - nc - - orca - - psmisc - - xorg-x11-utils - From e41e3dbd59231c78e14bbef2fcb715692e4266a2 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 8 Oct 2025 09:23:09 +0200 Subject: [PATCH 22/24] own _libdir/brltty directory in brlapi brlapi can be installed without brltty and %{_libdir}/brltty ends up unowned then. --- brltty.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index e9337bc..f47fea9 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.8 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -621,6 +621,7 @@ fi %{_bindir}/vstp %{_bindir}/eutp %{_bindir}/xbrlapi +%dir %{_libdir}/brltty %{_libdir}/brltty/libbrlttybba.so %{_libdir}/libbrlapi.so.* %ghost %verify(not group) %{_sysconfdir}/brlapi.key @@ -674,6 +675,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Oct 08 2025 Dominik Mierzejewski - 6.8-5 +- own _libdir/brltty directory in brlapi + * Wed Aug 06 2025 FrantiÅ¡ek Zatloukal - 6.8-4 - Rebuilt for icu 77.1 From 3d29fd3f052ae0cb1bd644968546e69e168dd8e5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 Oct 2025 20:30:15 +0100 Subject: [PATCH 23/24] OCaml 5.4.0 rebuild --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index f47fea9..9d9d272 100644 --- a/brltty.spec +++ b/brltty.spec @@ -37,7 +37,7 @@ Name: brltty Version: 6.8 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -675,6 +675,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Oct 13 2025 Richard W.M. Jones - 6.8-6 +- OCaml 5.4.0 rebuild + * Wed Oct 08 2025 Dominik Mierzejewski - 6.8-5 - own _libdir/brltty directory in brlapi From a577144a3b8dc0ed01919a796cf6e503ccf0ecf6 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 12 Jan 2026 15:04:04 -0700 Subject: [PATCH 24/24] Fix a changelog entry --- brltty.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 9d9d272..bbe3610 100644 --- a/brltty.spec +++ b/brltty.spec @@ -687,7 +687,7 @@ fi * Wed Jul 23 2025 Fedora Release Engineering - 6.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Fri Jul 11 2025 Jerry James - 6.8-2 +* Fri Jul 11 2025 Jerry James - 6.8-2 - Rebuild to fix OCaml dependencies * Mon Jul 07 2025 Gwyn Ciesla - 6.8-1