From 88867566d3ddce174b16fa8466e0e6be67508588 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 2 Sep 2020 20:44:35 +0100 Subject: [PATCH 01/88] Bump release and rebuild. --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 24e1da2..2a349a8 100644 --- a/brltty.spec +++ b/brltty.spec @@ -33,7 +33,7 @@ Name: brltty Version: %{pkg_version} -Release: 11%{?dist} +Release: 11%{?dist}.1 License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -529,6 +529,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Sep 02 2020 Richard W.M. Jones - 6.1-11.1 +- Bump release and rebuild. + * Tue Sep 01 2020 Richard W.M. Jones - 6.1-11 - OCaml 4.11.1 rebuild From bdffcfe027eb65358337e500461d9fc29e1e3a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 20 Oct 2020 21:00:51 +0200 Subject: [PATCH 02/88] Fixed brlapi.key to pass the RPM verification --- brltty.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/brltty.spec b/brltty.spec index 24e1da2..924b5e7 100644 --- a/brltty.spec +++ b/brltty.spec @@ -33,7 +33,7 @@ Name: brltty Version: %{pkg_version} -Release: 11%{?dist} +Release: 12%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -381,6 +381,7 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a # ghost brlapi.key touch ${RPM_BUILD_ROOT}%{_sysconfdir}/brlapi.key +chmod 0640 ${RPM_BUILD_ROOT}%{_sysconfdir}/brlapi.key # disable xbrlapi gdm autostart, there is already orca rm -f ${RPM_BUILD_ROOT}%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop @@ -483,7 +484,7 @@ fi %{_bindir}/xbrlapi %{_libdir}/brltty/libbrlttybba.so %{_libdir}/libbrlapi.so.* -%ghost %{_sysconfdir}/brlapi.key +%ghost %verify(not group) %{_sysconfdir}/brlapi.key %doc Drivers/Braille/XWindow/README %doc Documents/Manual-BrlAPI/ %doc %{_mandir}/man1/xbrlapi.* @@ -529,6 +530,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Oct 20 2020 Jaroslav Å karvada - 6.1-12 +- Fixed brlapi.key to pass the RPM verification + * Tue Sep 01 2020 Richard W.M. Jones - 6.1-11 - OCaml 4.11.1 rebuild From 0d4c36beb229097090aa42152eb9fbc39cc8b2db Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 03:08:18 +0000 Subject: [PATCH 03/88] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- brltty.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/brltty.spec b/brltty.spec index 924b5e7..60f0bcc 100644 --- a/brltty.spec +++ b/brltty.spec @@ -210,6 +210,7 @@ Version: %{api_version} License: LGPLv2+ Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: ocaml +BuildRequires: make Summary: OCaml binding for BrlAPI %description -n ocaml-brlapi This package provides the OCaml binding for BrlAPI. From 66fe0b96e84095f806ae55d5946ebf9a16a57586 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 01:24:19 +0000 Subject: [PATCH 04/88] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 60f0bcc..80fdb22 100644 --- a/brltty.spec +++ b/brltty.spec @@ -33,7 +33,7 @@ Name: brltty Version: %{pkg_version} -Release: 12%{?dist} +Release: 13%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -531,6 +531,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 6.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Oct 20 2020 Jaroslav Å karvada - 6.1-12 - Fixed brlapi.key to pass the RPM verification From b952485c37f1aae3b6088ca8f33b87ac146711c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 2 Feb 2021 11:16:11 +0100 Subject: [PATCH 05/88] New version Resolves: rhbz#1910328 --- .gitignore | 1 + brltty-6.1-man-options.patch | 14 ----- ...eechd.patch => brltty-6.3-libspeechd.patch | 4 +- ...rary.patch => brltty-6.3-loadLibrary.patch | 16 ++--- brltty.spec | 60 +++++++++++++------ sources | 2 +- 6 files changed, 53 insertions(+), 44 deletions(-) delete mode 100644 brltty-6.1-man-options.patch rename brltty-5.0-libspeechd.patch => brltty-6.3-libspeechd.patch (85%) rename brltty-6.0-loadLibrary.patch => brltty-6.3-loadLibrary.patch (53%) diff --git a/.gitignore b/.gitignore index 4ceffe7..5a6350e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ brltty-4.2.tar.gz /brltty-5.6.tar.xz /brltty-6.0.tar.xz /brltty-6.1.tar.xz +/brltty-6.3.tar.xz diff --git a/brltty-6.1-man-options.patch b/brltty-6.1-man-options.patch deleted file mode 100644 index 7953496..0000000 --- a/brltty-6.1-man-options.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Documents/brltty.1.in b/Documents/brltty.1.in -index 49c392c..59f21bc 100644 ---- a/Documents/brltty.1.in -+++ b/Documents/brltty.1.in -@@ -218,6 +218,9 @@ the first available MIDI output port - \fB\-n\fR (\fB\-\-no\-daemon\fR) - Remain in the foreground (useful for debugging). - .TP -+\fB\-o \fIname\fB=\fIvalue\fB,\fR... (\fB\-\-override\-preference=\fR) -+Explicit preference settings. -+.TP - \fB\-p \fIdevice\fR (\fB\-\-pcm\-device=\fR) - The device to use for digital audio. - For ALSA it's \fIname\fR[\fB:\fIargument\fB,\fR...]. diff --git a/brltty-5.0-libspeechd.patch b/brltty-6.3-libspeechd.patch similarity index 85% rename from brltty-5.0-libspeechd.patch rename to brltty-6.3-libspeechd.patch index 06909e0..97e1d1f 100644 --- a/brltty-5.0-libspeechd.patch +++ b/brltty-6.3-libspeechd.patch @@ -1,8 +1,8 @@ diff --git a/Drivers/Speech/SpeechDispatcher/speech.c b/Drivers/Speech/SpeechDispatcher/speech.c -index d73250a..df92708 100644 +index cc55007..a2fcc0d 100644 --- a/Drivers/Speech/SpeechDispatcher/speech.c +++ b/Drivers/Speech/SpeechDispatcher/speech.c -@@ -34,7 +34,7 @@ typedef enum { +@@ -35,7 +35,7 @@ typedef enum { #include "spk_driver.h" diff --git a/brltty-6.0-loadLibrary.patch b/brltty-6.3-loadLibrary.patch similarity index 53% rename from brltty-6.0-loadLibrary.patch rename to brltty-6.3-loadLibrary.patch index 36072a2..8b64481 100644 --- a/brltty-6.0-loadLibrary.patch +++ b/brltty-6.3-loadLibrary.patch @@ -1,9 +1,9 @@ -diff --git a/Bindings/Java/NativeLibrary.java b/Bindings/Java/NativeLibrary.java -index 5780e34..8383821 100644 ---- a/Bindings/Java/NativeLibrary.java -+++ b/Bindings/Java/NativeLibrary.java -@@ -26,7 +26,15 @@ public class NativeLibrary { - } +diff --git a/Bindings/Java/NativeComponent.java b/Bindings/Java/NativeComponent.java +index 2e6304a..cf6c9b0 100644 +--- a/Bindings/Java/NativeComponent.java ++++ b/Bindings/Java/NativeComponent.java +@@ -23,7 +23,15 @@ public class NativeComponent extends Component { + private native static void initializeNativeData (); static { - System.loadLibrary("brlapi_java"); @@ -16,6 +16,6 @@ index 5780e34..8383821 100644 + throw new UnsatisfiedLinkError("brlapi_java library load failed"); + } + } - new NativeLibrary().initializeNativeData(); + initializeNativeData(); } - } + diff --git a/brltty.spec b/brltty.spec index 80fdb22..4a9413c 100644 --- a/brltty.spec +++ b/brltty.spec @@ -1,5 +1,5 @@ -%define pkg_version 6.1 -%define api_version 0.8.0 +%define pkg_version 6.3 +%define api_version 0.8.2 %if 0%{?rhel} && 0%{?rhel} <= 7 # disable python3 by default @@ -33,17 +33,14 @@ Name: brltty Version: %{pkg_version} -Release: 13%{?dist} +Release: 1%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz Source1: brltty.service -Patch1: brltty-6.0-loadLibrary.patch +Patch1: brltty-6.3-loadLibrary.patch # libspeechd.h moved in latest speech-dispatch (NOT sent upstream) -Patch2: brltty-5.0-libspeechd.patch -# rhbz#1612569 -# patch sent upstream -Patch3: brltty-6.1-man-options.patch +Patch2: brltty-6.3-libspeechd.patch Summary: Braille display driver for Linux/Unix BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel, systemd BuildRequires: gettext, at-spi2-core-devel, alsa-lib-devel @@ -51,8 +48,17 @@ BuildRequires: gettext, at-spi2-core-devel, alsa-lib-devel BuildRequires: espeak-devel %endif BuildRequires: espeak-ng-devel -BuildRequires: /usr/bin/2to3 -BuildRequires: autoconf automake +BuildRequires: autoconf, automake +BuildRequires: polkit-devel +BuildRequires: libicu-devel +BuildRequires: doxygen +BuildRequires: linuxdoc-tools +%if %{with python2} +BuildRequires: python2-docutils +%endif +%if %{with python3} +BuildRequires: python3-docutils +%endif # work around a bug in the install process: Requires(post): coreutils @@ -232,7 +238,6 @@ mv %{name}-%{version} python2 pushd python2 %patch1 -p1 -b .loadLibrary %patch2 -p1 -b .libspeechd -%patch3 -p1 -b .man-options # remove packaged binary file rm -f Programs/brltty-ktb @@ -268,7 +273,7 @@ configure_opts=" \ %if ! %{with_espeak} --without-espeak \ %endif - --with-install-root=$RPM_BUILD_ROOT + --with-install-root=$RPM_BUILD_ROOT \ JAVA_JAR_DIR=%{_jnidir} \ JAVA_JNI_DIR=%{_libdir}/brltty \ JAVA_JNI=yes" @@ -284,6 +289,12 @@ pushd python2 %configure $configure_opts PYTHON=%{__python2} # Parallel build seems broken, thus disabling it make + +# documents +pushd Documents +make +popd + popd PYTHONS="$PYTHONS python2" %endif @@ -294,11 +305,16 @@ pushd python3 ./autogen %configure $configure_opts PYTHON=%{__python3} CYTHON=%{_bindir}/cython make + +# documents +pushd Documents +make +popd + popd PYTHONS="$PYTHONS python3" %endif - for python in $PYTHONS do pushd $python find . -name '*.sgml' | @@ -354,6 +370,11 @@ pushd python3 pushd python2 %endif +# install polkit rules +pushd Authorization/Polkit +make install +popd + install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}" "$RPM_BUILD_ROOT%{_mandir}/man5" install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}" echo ".so man1/brltty.1" > $RPM_BUILD_ROOT%{_mandir}/man5/brltty.conf.5 @@ -388,16 +409,12 @@ chmod 0640 ${RPM_BUILD_ROOT}%{_sysconfdir}/brlapi.key rm -f ${RPM_BUILD_ROOT}%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop # make brltty-config executable -chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/brltty-config +chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/brltty-config.sh # handle locales %find_lang %{name} cp -p %{name}.lang ../ -#Use python 3 for latex-access, BZ 1465657. -/usr/bin/2to3 -wn ${RPM_BUILD_ROOT}/etc/brltty/Contraction/latex-access.ctb -sed -i 's|/usr/bin/python|%{__python3}|g' ${RPM_BUILD_ROOT}/etc/brltty/Contraction/latex-access.ctb - # install dracut module make install-dracut @@ -449,8 +466,8 @@ fi %license LICENSE-LGPL %doc %{_mandir}/man[15]/brltty.* %{_sysconfdir}/X11/Xsession.d/90xbrlapi -#%%{_datadir}/metainfo/org.a11y.brltty.metainfo.xml %{_datadir}/polkit-1/actions/org.a11y.brlapi.policy +%{_datadir}/polkit-1/rules.d/org.a11y.brlapi.rules %if %{with_speech_dispatcher} @@ -496,6 +513,7 @@ fi %{_libdir}/libbrlapi.so %{_includedir}/brltty %{_includedir}/brlapi*.h +%{_libdir}/pkgconfig/brltty.pc %doc %{_mandir}/man3/brlapi_*.3* %doc Documents/BrlAPIref/BrlAPIref/ @@ -531,6 +549,10 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Feb 1 2021 Jaroslav Å karvada - 6.3-1 +- New version + Resolves: rhbz#1910328 + * Tue Jan 26 2021 Fedora Release Engineering - 6.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index eddbcfc..52cdd58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (brltty-6.1.tar.xz) = 030ef60ef7a9a60dc2fba2a64ea0a0868395eee6f2f86876b4e4111e804a05b44f798a154a69a8f5e0f6358130993c360a550f7decac0535450f9cf939231eaf +SHA512 (brltty-6.3.tar.xz) = 8a15ffcc433f97925252d2355841e50a55179072d4cf294488fe52038b5e053ba688b7745716c49f4a20e0a626ecaf4ecd3ae7ca79527747c84c6e8a4d8d84a1 From 4ab95f19e4e3e54faa63b6246122557d94ae1b28 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Mar 2021 13:12:01 +0000 Subject: [PATCH 06/88] OCaml 4.12.0 build --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 4a9413c..552a715 100644 --- a/brltty.spec +++ b/brltty.spec @@ -33,7 +33,7 @@ Name: brltty Version: %{pkg_version} -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -549,6 +549,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Mar 1 13:12:00 GMT 2021 Richard W.M. Jones - 6.3-2 +- OCaml 4.12.0 build + * Mon Feb 1 2021 Jaroslav Å karvada - 6.3-1 - New version Resolves: rhbz#1910328 From 9bbed4233b341cb7ef0dec1ca7a8c777ffe7046f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:14:07 +0100 Subject: [PATCH 07/88] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- brltty.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 552a715..4a8cd76 100644 --- a/brltty.spec +++ b/brltty.spec @@ -33,7 +33,7 @@ Name: brltty Version: %{pkg_version} -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -549,6 +549,10 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Mar 02 2021 Zbigniew JÄ™drzejewski-Szmek - 6.3-3 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Mon Mar 1 13:12:00 GMT 2021 Richard W.M. Jones - 6.3-2 - OCaml 4.12.0 build From 97c8620483d69201321c2c249e1b5e7fcd475855 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 16 Apr 2021 10:19:27 -0500 Subject: [PATCH 08/88] Upstream patch to support Python 3.10. --- ...701a17618939fa0746ff532449f933213a68.patch | 33 +++++++++++++++++++ brltty.spec | 7 +++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 09b9701a17618939fa0746ff532449f933213a68.patch diff --git a/09b9701a17618939fa0746ff532449f933213a68.patch b/09b9701a17618939fa0746ff532449f933213a68.patch new file mode 100644 index 0000000..d5474d8 --- /dev/null +++ b/09b9701a17618939fa0746ff532449f933213a68.patch @@ -0,0 +1,33 @@ +From 09b9701a17618939fa0746ff532449f933213a68 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Thu, 15 Apr 2021 11:32:15 +0200 +Subject: [PATCH] Python modules check: Assert exit code, not empty output + +Distutils is deprecated in Python 3.10+: +https://www.python.org/dev/peps/pep-0632/ + +When importing it, there is a warning: + + DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives + +The configure script falsely assumed this is an error. +Instead, we now check for the exit code, which is more explicit. + +In the long term, we need to migrate away from distutils, this is a stopgap measure only. +--- + Bindings/Python/bindings.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Bindings/Python/bindings.m4 b/Bindings/Python/bindings.m4 +index 784418f0c..ee28525fc 100644 +--- a/Bindings/Python/bindings.m4 ++++ b/Bindings/Python/bindings.m4 +@@ -40,7 +40,7 @@ else + for python_module in sys distutils.sysconfig + do + python_error="`"${PYTHON}" -c "import ${python_module};" 2>&1`" +- if test -n "${python_error}" ++ if test $? -ne 0 + then + AC_MSG_WARN([Python module not found: ${python_module}: ${python_error}]) + PYTHON_OK=false diff --git a/brltty.spec b/brltty.spec index 4a8cd76..1b7c6bf 100644 --- a/brltty.spec +++ b/brltty.spec @@ -33,7 +33,7 @@ Name: brltty Version: %{pkg_version} -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -41,6 +41,7 @@ Source1: brltty.service Patch1: brltty-6.3-loadLibrary.patch # libspeechd.h moved in latest speech-dispatch (NOT sent upstream) Patch2: brltty-6.3-libspeechd.patch +Patch3: 09b9701a17618939fa0746ff532449f933213a68.patch Summary: Braille display driver for Linux/Unix BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel, systemd BuildRequires: gettext, at-spi2-core-devel, alsa-lib-devel @@ -238,6 +239,7 @@ mv %{name}-%{version} python2 pushd python2 %patch1 -p1 -b .loadLibrary %patch2 -p1 -b .libspeechd +%patch3 -p1 -b .py10 # remove packaged binary file rm -f Programs/brltty-ktb @@ -549,6 +551,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Fri Apr 16 2021 Gwyn Ciesla - 6.3-4 +- Upstream patch to support Python 3.10. + * Tue Mar 02 2021 Zbigniew JÄ™drzejewski-Szmek - 6.3-3 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From ce8b3f67c132ca22450c2995ccbac7ddfbfa6304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 13 May 2021 19:52:44 +0200 Subject: [PATCH 09/88] Fixed brlapi multilib --- brlapi-config.h | 9 +++++++++ brlapi-forbuild.h | 9 +++++++++ brltty.spec | 17 ++++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 brlapi-config.h create mode 100644 brlapi-forbuild.h diff --git a/brlapi-config.h b/brlapi-config.h new file mode 100644 index 0000000..c369b45 --- /dev/null +++ b/brlapi-config.h @@ -0,0 +1,9 @@ +#include + +#if __WORDSIZE == 32 +#include "config-32.h" +#elif __WORDSIZE == 64 +#include "config-64.h" +#else +#error "Unknown word size" +#endif diff --git a/brlapi-forbuild.h b/brlapi-forbuild.h new file mode 100644 index 0000000..4f5093e --- /dev/null +++ b/brlapi-forbuild.h @@ -0,0 +1,9 @@ +#include + +#if __WORDSIZE == 32 +#include "forbuild-32.h" +#elif __WORDSIZE == 64 +#include "forbuild-64.h" +#else +#error "Unknown word size" +#endif diff --git a/brltty.spec b/brltty.spec index 1b7c6bf..6de80e7 100644 --- a/brltty.spec +++ b/brltty.spec @@ -33,11 +33,13 @@ Name: brltty Version: %{pkg_version} -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz Source1: brltty.service +Source2: brlapi-config.h +Source3: brlapi-forbuild.h Patch1: brltty-6.3-loadLibrary.patch # libspeechd.h moved in latest speech-dispatch (NOT sent upstream) Patch2: brltty-6.3-libspeechd.patch @@ -413,6 +415,16 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop # make brltty-config executable chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/brltty-config.sh +# fix multilib +pushd ${RPM_BUILD_ROOT}%{_includedir}/brltty +for f in config forbuild +do + mv ./$f.h ./$f-$(getconf LONG_BIT).h +done +install -p -m 0644 %{SOURCE2} ./config.h +install -p -m 0644 %{SOURCE3} ./forbuild.h +popd + # handle locales %find_lang %{name} cp -p %{name}.lang ../ @@ -551,6 +563,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Thu May 13 2021 Jaroslav Å karvada - 6.3-5 +- Fixed brlapi multilib + * Fri Apr 16 2021 Gwyn Ciesla - 6.3-4 - Upstream patch to support Python 3.10. From 387902cb8d235deb3fe1ced6e812b9bbdb8cd4b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 20 May 2021 00:06:01 +0200 Subject: [PATCH 10/88] Added brltty-minimal subpackage for braille support in Anaconda installer Related: rhbz#1584679 --- brltty.spec | 116 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 102 insertions(+), 14 deletions(-) diff --git a/brltty.spec b/brltty.spec index 6de80e7..3e4eb78 100644 --- a/brltty.spec +++ b/brltty.spec @@ -1,6 +1,11 @@ %define pkg_version 6.3 %define api_version 0.8.2 +# minimal means brltty-minimal subpackage with minimal deps for +# braille support in Anaconda installer +# https://bugzilla.redhat.com/show_bug.cgi?id=1584679 +%bcond_without minimal + %if 0%{?rhel} && 0%{?rhel} <= 7 # disable python3 by default %bcond_with python3 @@ -33,7 +38,7 @@ Name: brltty Version: %{pkg_version} -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -62,6 +67,7 @@ BuildRequires: python2-docutils %if %{with python3} BuildRequires: python3-docutils %endif +Conflicts: brltty-minimal # work around a bug in the install process: Requires(post): coreutils @@ -232,6 +238,16 @@ Requires: dracut %description dracut This package provides brltty module for Dracut. +%if %{with minimal} +%package minimal +Summary: Stripped down brltty version for Anaconda installer +Requires: %{name}%{?_isa} = %{pkg_version}-%{release} +Conflicts: brltty +%description minimal +This package provides stripped down brltty version for Anaconda +installer. +%endif + %define version %{pkg_version} %prep @@ -251,6 +267,10 @@ popd # Make it all time, we just gonna ignore python2 or python3 when not needed cp -a python2 python3 +%if %{with minimal} +cp -a python2 minimal +%endif + %build # If MAKEFLAGS=-jN is set it would break local builds. @@ -277,11 +297,32 @@ configure_opts=" \ %if ! %{with_espeak} --without-espeak \ %endif - --with-install-root=$RPM_BUILD_ROOT \ + --with-install-root=%{buildroot} \ JAVA_JAR_DIR=%{_jnidir} \ JAVA_JNI_DIR=%{_libdir}/brltty \ JAVA_JNI=yes" +configure_opts_minimal=" \ + --disable-stripping \ + --without-curses \ + --without-speechd \ + --without-espeak \ + --disable-icu \ + --disable-polkit \ + --disable-java-bindings \ + --disable-ocaml-bindings \ + --disable-python-bindings \ + --disable-tcl-bindings \ + --disable-speech-support \ + --without-pcm-package \ + --without-midi-package \ + --with-install-root=%{buildroot} \ + --with-configuration-file=brltty-minimal.conf \ + --with-drivers-directory=%{_libdir}/brltty-minimal \ + --with-tables-directory=%{_sysconfdir}/brltty-minimal \ + --with-scripts-directory=%{_libexecdir}/brltty-minimal \ + JAVA_JNI=no" + export PYTHONCOERCECLOCALE=0 PYTHONS= @@ -303,6 +344,18 @@ popd PYTHONS="$PYTHONS python2" %endif + +%if %{with minimal} +# ... and then do it again for minimal +pushd minimal +./autogen +%configure $configure_opts_minimal +make + +popd +%endif + + %if %{with python3} # ... and then do it again for the Python 3 module pushd python3 @@ -346,7 +399,7 @@ done %install %if 0%{?with_ocaml} -mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs +mkdir -p %{buildroot}%{_libdir}/ocaml/stublibs %endif %if %{with python2} @@ -358,6 +411,28 @@ make install JAVA_JAR_DIR=%{_jnidir} \ popd %endif + +%if %{with minimal} +# minimal +pushd minimal +make install + +# drop extra drivers +pushd %{buildroot}%{_libdir}/brltty-minimal +rm -f libbrlttybba.so libbrlttybxw.so libbrlttyxa2.so libbrlttysen.so \ + libbrlttyses.so libbrlapi_java.so +popd + +# rename brltty to brltty-minimal +mv %{buildroot}%{_bindir}/brltty %{buildroot}%{_bindir}/brltty-minimal + +# install config +install -d -m 755 "%{buildroot}%{_sysconfdir}" +install -p -m 644 Documents/brltty.conf "%{buildroot}%{_sysconfdir}/brltty-minimal.conf" +popd +%endif + + %if %{with python3} # Python 3 pushd python3 @@ -379,11 +454,11 @@ pushd Authorization/Polkit make install popd -install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}" "$RPM_BUILD_ROOT%{_mandir}/man5" -install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}" -echo ".so man1/brltty.1" > $RPM_BUILD_ROOT%{_mandir}/man5/brltty.conf.5 +install -d -m 755 "%{buildroot}%{_sysconfdir}" "%{buildroot}%{_mandir}/man5" +install -p -m 644 Documents/brltty.conf "%{buildroot}%{_sysconfdir}" +echo ".so man1/brltty.1" > %{buildroot}%{_mandir}/man5/brltty.conf.5 -install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/brltty.service +install -Dpm 644 %{SOURCE1} %{buildroot}%{_unitdir}/brltty.service cp -p LICENSE* ../ @@ -402,21 +477,21 @@ for i in Drivers/Speech/SpeechDispatcher/README \ mkdir -p ../${i%/*} && cp -rp $i ../$i || exit 1 done -# Don't want static lib -rm -rf $RPM_BUILD_ROOT/%{_libdir}/libbrlapi.a +# don't want static lib +rm -rf %{buildroot}/%{_libdir}/libbrlapi.a # ghost brlapi.key -touch ${RPM_BUILD_ROOT}%{_sysconfdir}/brlapi.key -chmod 0640 ${RPM_BUILD_ROOT}%{_sysconfdir}/brlapi.key +touch %{buildroot}%{_sysconfdir}/brlapi.key +chmod 0640 %{buildroot}%{_sysconfdir}/brlapi.key # disable xbrlapi gdm autostart, there is already orca -rm -f ${RPM_BUILD_ROOT}%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop +rm -f %{buildroot}%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop # make brltty-config executable -chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/brltty-config.sh +chmod 755 %{buildroot}%{_bindir}/brltty-config.sh # fix multilib -pushd ${RPM_BUILD_ROOT}%{_includedir}/brltty +pushd %{buildroot}%{_includedir}/brltty for f in config forbuild do mv ./$f.h ./$f-$(getconf LONG_BIT).h @@ -467,6 +542,7 @@ fi %{_unitdir}/brltty.service %{_bindir}/brltty %{_bindir}/brltty-* +%exclude %{_bindir}/brltty-minimal %{_libdir}/brltty/ %exclude %{_libdir}/brltty/libbrlttybba.so %exclude %{_libdir}/brltty/libbrlttybxw.so @@ -483,6 +559,14 @@ fi %{_datadir}/polkit-1/actions/org.a11y.brlapi.policy %{_datadir}/polkit-1/rules.d/org.a11y.brlapi.rules +%if %{with minimal} +%files minimal -f %{name}.lang +%config(noreplace) %{_sysconfdir}/brltty-minimal.conf +%{_sysconfdir}/brltty-minimal/ +%{_bindir}/brltty-minimal +%{_libdir}/brltty-minimal/ +%license LICENSE-LGPL +%endif %if %{with_speech_dispatcher} %files speech-dispatcher @@ -563,6 +647,10 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed May 19 2021 Jaroslav Å karvada - 6.3-6 +- Added brltty-minimal subpackage for braille support in Anaconda installer + Related: rhbz#1584679 + * Thu May 13 2021 Jaroslav Å karvada - 6.3-5 - Fixed brlapi multilib From 0480116dfea6a4b57f03ee8ae88edc16b2971981 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 20 May 2021 00:54:22 +0100 Subject: [PATCH 11/88] Rebuild for ICU 69 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 3e4eb78..4b60b69 100644 --- a/brltty.spec +++ b/brltty.spec @@ -38,7 +38,7 @@ Name: brltty Version: %{pkg_version} -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -647,6 +647,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed May 19 2021 Pete Walter - 6.3-7 +- Rebuild for ICU 69 + * Wed May 19 2021 Jaroslav Å karvada - 6.3-6 - Added brltty-minimal subpackage for braille support in Anaconda installer Related: rhbz#1584679 From 48fd0b421da7e2f835118eaf5b4b8385ac840c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 1 Jun 2021 10:27:13 +0200 Subject: [PATCH 12/88] Fixed requirements for brltty-minimal Related: rhbz#1584679 --- brltty.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/brltty.spec b/brltty.spec index 4b60b69..104c115 100644 --- a/brltty.spec +++ b/brltty.spec @@ -38,7 +38,7 @@ Name: brltty Version: %{pkg_version} -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -241,7 +241,6 @@ This package provides brltty module for Dracut. %if %{with minimal} %package minimal Summary: Stripped down brltty version for Anaconda installer -Requires: %{name}%{?_isa} = %{pkg_version}-%{release} Conflicts: brltty %description minimal This package provides stripped down brltty version for Anaconda @@ -647,6 +646,10 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Jun 1 2021 Jaroslav Å karvada - 6.3-8 +- Fixed requirements for brltty-minimal + Related: rhbz#1584679 + * Wed May 19 2021 Pete Walter - 6.3-7 - Rebuild for ICU 69 From d1781c0afc3038e769ee38400545e55bf7ed5e66 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:00:48 +0200 Subject: [PATCH 13/88] Rebuilt for Python 3.10 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 104c115..056b6c5 100644 --- a/brltty.spec +++ b/brltty.spec @@ -38,7 +38,7 @@ Name: brltty Version: %{pkg_version} -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -646,6 +646,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Fri Jun 04 2021 Python Maint - 6.3-9 +- Rebuilt for Python 3.10 + * Tue Jun 1 2021 Jaroslav Å karvada - 6.3-8 - Fixed requirements for brltty-minimal Related: rhbz#1584679 From 66b5dcfc7feac8a5011f77daa9dcfd8dcfe5a1a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:56:03 +0000 Subject: [PATCH 14/88] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From fd37f4ef2aa8aa17c377c454f1f21455e6ae4352 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:53:21 +0000 Subject: [PATCH 15/88] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 056b6c5..5bbaacc 100644 --- a/brltty.spec +++ b/brltty.spec @@ -38,7 +38,7 @@ Name: brltty Version: %{pkg_version} -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -646,6 +646,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 6.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 6.3-9 - Rebuilt for Python 3.10 From 0b21674243be3897fb8d279eaf54f2c106fd4d56 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 24 Sep 2021 16:37:30 -0500 Subject: [PATCH 16/88] 6.4 --- .gitignore | 1 + ...701a17618939fa0746ff532449f933213a68.patch | 33 ------------------- brltty.spec | 11 ++++--- sources | 2 +- 4 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 09b9701a17618939fa0746ff532449f933213a68.patch diff --git a/.gitignore b/.gitignore index 5a6350e..2f087cc 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ brltty-4.2.tar.gz /brltty-6.0.tar.xz /brltty-6.1.tar.xz /brltty-6.3.tar.xz +/brltty-6.4.tar.xz diff --git a/09b9701a17618939fa0746ff532449f933213a68.patch b/09b9701a17618939fa0746ff532449f933213a68.patch deleted file mode 100644 index d5474d8..0000000 --- a/09b9701a17618939fa0746ff532449f933213a68.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 09b9701a17618939fa0746ff532449f933213a68 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Thu, 15 Apr 2021 11:32:15 +0200 -Subject: [PATCH] Python modules check: Assert exit code, not empty output - -Distutils is deprecated in Python 3.10+: -https://www.python.org/dev/peps/pep-0632/ - -When importing it, there is a warning: - - DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives - -The configure script falsely assumed this is an error. -Instead, we now check for the exit code, which is more explicit. - -In the long term, we need to migrate away from distutils, this is a stopgap measure only. ---- - Bindings/Python/bindings.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Bindings/Python/bindings.m4 b/Bindings/Python/bindings.m4 -index 784418f0c..ee28525fc 100644 ---- a/Bindings/Python/bindings.m4 -+++ b/Bindings/Python/bindings.m4 -@@ -40,7 +40,7 @@ else - for python_module in sys distutils.sysconfig - do - python_error="`"${PYTHON}" -c "import ${python_module};" 2>&1`" -- if test -n "${python_error}" -+ if test $? -ne 0 - then - AC_MSG_WARN([Python module not found: ${python_module}: ${python_error}]) - PYTHON_OK=false diff --git a/brltty.spec b/brltty.spec index 5bbaacc..6f8d548 100644 --- a/brltty.spec +++ b/brltty.spec @@ -1,5 +1,5 @@ -%define pkg_version 6.3 -%define api_version 0.8.2 +%define pkg_version 6.4 +%define api_version 0.8.3 # minimal means brltty-minimal subpackage with minimal deps for # braille support in Anaconda installer @@ -38,7 +38,7 @@ Name: brltty Version: %{pkg_version} -Release: 10%{?dist} +Release: 1%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -48,7 +48,6 @@ Source3: brlapi-forbuild.h Patch1: brltty-6.3-loadLibrary.patch # libspeechd.h moved in latest speech-dispatch (NOT sent upstream) Patch2: brltty-6.3-libspeechd.patch -Patch3: 09b9701a17618939fa0746ff532449f933213a68.patch Summary: Braille display driver for Linux/Unix BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel, systemd BuildRequires: gettext, at-spi2-core-devel, alsa-lib-devel @@ -256,7 +255,6 @@ mv %{name}-%{version} python2 pushd python2 %patch1 -p1 -b .loadLibrary %patch2 -p1 -b .libspeechd -%patch3 -p1 -b .py10 # remove packaged binary file rm -f Programs/brltty-ktb @@ -646,6 +644,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Fri Sep 24 2021 Gwyn Ciesla - 6.4-1 +- 6.4 + * Wed Jul 21 2021 Fedora Release Engineering - 6.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 52cdd58..0a023a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (brltty-6.3.tar.xz) = 8a15ffcc433f97925252d2355841e50a55179072d4cf294488fe52038b5e053ba688b7745716c49f4a20e0a626ecaf4ecd3ae7ca79527747c84c6e8a4d8d84a1 +SHA512 (brltty-6.4.tar.xz) = 384848d05f78732952079d6f5170046927fcb35f400ece71ca897415a793c0aa1047934f8cd5e9e781536fb0b7cb71273283f3bba21e59f082ba8f6f2416352e From 18edea123976c5d7b1b42a573ff535727af92365 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Oct 2021 20:20:40 +0100 Subject: [PATCH 17/88] OCaml 4.13.1 build --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 6f8d548..32cb8d4 100644 --- a/brltty.spec +++ b/brltty.spec @@ -38,7 +38,7 @@ Name: brltty Version: %{pkg_version} -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -644,6 +644,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Oct 04 2021 Richard W.M. Jones - 6.4-2 +- OCaml 4.13.1 build + * Fri Sep 24 2021 Gwyn Ciesla - 6.4-1 - 6.4 From c64e069f8d107789db373a60ae7e5d5cf3b81a8d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 22:36:58 +0000 Subject: [PATCH 18/88] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 32cb8d4..f303ce3 100644 --- a/brltty.spec +++ b/brltty.spec @@ -38,7 +38,7 @@ Name: brltty Version: %{pkg_version} -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -644,6 +644,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Oct 04 2021 Richard W.M. Jones - 6.4-2 - OCaml 4.13.1 build From e83eee0d95df41d4ebe66ace9c753da64ba48629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 20 Jan 2022 19:31:25 +0100 Subject: [PATCH 19/88] Installed /var/lib/brltty directory Related: rhbz#2042412 --- brltty.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index f303ce3..5cc93fe 100644 --- a/brltty.spec +++ b/brltty.spec @@ -38,7 +38,7 @@ Name: brltty Version: %{pkg_version} -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -477,6 +477,9 @@ done # don't want static lib rm -rf %{buildroot}/%{_libdir}/libbrlapi.a +# create /var/lib/brltty directory +mkdir -p %{buildroot}%{_localstatedir}/lib/brltty + # ghost brlapi.key touch %{buildroot}%{_sysconfdir}/brlapi.key chmod 0640 %{buildroot}%{_sysconfdir}/brlapi.key @@ -533,6 +536,7 @@ fi %ldconfig_postun -n brlapi %files -f %{name}.lang +%dir %{_localstatedir}/lib/brltty %config(noreplace) %{_sysconfdir}/brltty.conf %{_sysconfdir}/brltty/ %exclude %{_sysconfdir}/brltty/Initramfs @@ -644,6 +648,10 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Thu Jan 20 2022 Jaroslav Å karvada - 6.4-4 +- Installed /var/lib/brltty directory + Related: rhbz#2042412 + * Wed Jan 19 2022 Fedora Release Engineering - 6.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 31c2d65286fd38d38b386df201c9459fb66e70a7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 4 Feb 2022 11:57:05 +0000 Subject: [PATCH 20/88] OCaml 4.13.1 rebuild to remove package notes --- brltty.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 5cc93fe..1469dfc 100644 --- a/brltty.spec +++ b/brltty.spec @@ -1,3 +1,4 @@ +%undefine _package_note_flags %define pkg_version 6.4 %define api_version 0.8.3 @@ -38,7 +39,7 @@ Name: brltty Version: %{pkg_version} -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -648,6 +649,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Fri Feb 04 2022 Richard W.M. Jones - 6.4-5 +- OCaml 4.13.1 rebuild to remove package notes + * Thu Jan 20 2022 Jaroslav Å karvada - 6.4-4 - Installed /var/lib/brltty directory Related: rhbz#2042412 From 24da57f0ed723e07faae59ae0a78f2883d01d6e5 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 19:46:32 +0100 Subject: [PATCH 21/88] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 1469dfc..22a03c3 100644 --- a/brltty.spec +++ b/brltty.spec @@ -39,7 +39,7 @@ Name: brltty Version: %{pkg_version} -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -649,6 +649,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Sat Feb 05 2022 Jiri Vanek - 6.4-6 +- Rebuilt for java-17-openjdk as system jdk + * Fri Feb 04 2022 Richard W.M. Jones - 6.4-5 - OCaml 4.13.1 rebuild to remove package notes From 9cd576f96bd7aabf8c28c7f705ddacec15488998 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 16:00:00 +0200 Subject: [PATCH 22/88] Rebuilt for Python 3.11 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 22a03c3..69d0b01 100644 --- a/brltty.spec +++ b/brltty.spec @@ -39,7 +39,7 @@ Name: brltty Version: %{pkg_version} -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -649,6 +649,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Jun 13 2022 Python Maint - 6.4-7 +- Rebuilt for Python 3.11 + * Sat Feb 05 2022 Jiri Vanek - 6.4-6 - Rebuilt for java-17-openjdk as system jdk From 025861edcf755c1fe1ec61623ee94c686cdbc3f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 14 Jun 2022 23:06:40 +0200 Subject: [PATCH 23/88] New version Resolves: rhbz#2095460 --- .gitignore | 16 +--------------- brltty.spec | 24 ++++++++++++++++++------ sources | 2 +- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 2f087cc..796fed6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1 @@ -brltty-4.2.tar.gz -/brltty-4.3.tar.gz -/brltty-4.5.tar.gz -/brltty-5.0.tar.xz -/brltty-5.1.tar.xz -/brltty-5.2.tar.xz -/brltty-5.3.tar.xz -/brltty-5.3.1.tar.xz -/brltty-5.4.tar.xz -/brltty-5.5.tar.xz -/brltty-5.6.tar.xz -/brltty-6.0.tar.xz -/brltty-6.1.tar.xz -/brltty-6.3.tar.xz -/brltty-6.4.tar.xz +/brltty-*.tar.xz diff --git a/brltty.spec b/brltty.spec index 69d0b01..023714d 100644 --- a/brltty.spec +++ b/brltty.spec @@ -1,6 +1,6 @@ %undefine _package_note_flags -%define pkg_version 6.4 -%define api_version 0.8.3 +%define pkg_version 6.5 +%define api_version 0.8.4 # minimal means brltty-minimal subpackage with minimal deps for # braille support in Anaconda installer @@ -39,7 +39,7 @@ Name: brltty Version: %{pkg_version} -Release: 7%{?dist} +Release: 1%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -50,22 +50,30 @@ Patch1: brltty-6.3-loadLibrary.patch # libspeechd.h moved in latest speech-dispatch (NOT sent upstream) Patch2: brltty-6.3-libspeechd.patch Summary: Braille display driver for Linux/Unix -BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel, systemd -BuildRequires: gettext, at-spi2-core-devel, alsa-lib-devel +BuildRequires: byacc +BuildRequires: glibc-kernheaders +BuildRequires: bluez-libs-devel +BuildRequires: systemd +BuildRequires: gettext +BuildRequires: at-spi2-core-devel +BuildRequires: alsa-lib-devel %if %{with_espeak} BuildRequires: espeak-devel %endif BuildRequires: espeak-ng-devel -BuildRequires: autoconf, automake +BuildRequires: autoconf +BuildRequires: automake BuildRequires: polkit-devel BuildRequires: libicu-devel BuildRequires: doxygen BuildRequires: linuxdoc-tools %if %{with python2} BuildRequires: python2-docutils +BuildRequires: python2-setuptools %endif %if %{with python3} BuildRequires: python3-docutils +BuildRequires: python3-setuptools %endif Conflicts: brltty-minimal @@ -649,6 +657,10 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Jun 14 2022 Jaroslav Å karvada - 6.5-1 +- New version + Resolves: rhbz#2095460 + * Mon Jun 13 2022 Python Maint - 6.4-7 - Rebuilt for Python 3.11 diff --git a/sources b/sources index 0a023a5..f96c12e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (brltty-6.4.tar.xz) = 384848d05f78732952079d6f5170046927fcb35f400ece71ca897415a793c0aa1047934f8cd5e9e781536fb0b7cb71273283f3bba21e59f082ba8f6f2416352e +SHA512 (brltty-6.5.tar.xz) = bbfbb89b1c3ba5063ad3bc0aa97b859dd23acea1feb79dab20c57dc74ff2f26649942fcecc7030a3f70555596f4d9d35cd05616af2a8e101d4d56b4c471a6ad3 From bf520544e2a4159fb1dc0833922c6f606839f7c7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 16 Jun 2022 02:05:58 +0200 Subject: [PATCH 24/88] Rebuilt for Python 3.11 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 023714d..c24b995 100644 --- a/brltty.spec +++ b/brltty.spec @@ -39,7 +39,7 @@ Name: brltty Version: %{pkg_version} -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -657,6 +657,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Thu Jun 16 2022 Python Maint - 6.5-2 +- Rebuilt for Python 3.11 + * Tue Jun 14 2022 Jaroslav Å karvada - 6.5-1 - New version Resolves: rhbz#2095460 From 6273750210a605a8fa6c490da82de09881140f01 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 18 Jun 2022 14:06:32 +0100 Subject: [PATCH 25/88] OCaml 4.14.0 rebuild --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index c24b995..2f0d40b 100644 --- a/brltty.spec +++ b/brltty.spec @@ -39,7 +39,7 @@ Name: brltty Version: %{pkg_version} -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -657,6 +657,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Sat Jun 18 2022 Richard W.M. Jones - 6.5-3 +- OCaml 4.14.0 rebuild + * Thu Jun 16 2022 Python Maint - 6.5-2 - Rebuilt for Python 3.11 From d9e6be4574b8a0e44742752a6be8c3526fa8b889 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 20 Jun 2022 10:45:37 +0200 Subject: [PATCH 26/88] Rebuilt for Python 3.11 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 2f0d40b..adc99d6 100644 --- a/brltty.spec +++ b/brltty.spec @@ -39,7 +39,7 @@ Name: brltty Version: %{pkg_version} -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -657,6 +657,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Jun 20 2022 Python Maint - 6.5-4 +- Rebuilt for Python 3.11 + * Sat Jun 18 2022 Richard W.M. Jones - 6.5-3 - OCaml 4.14.0 rebuild From 9b34e7e3955c87fa8ae5b8e17e540b775d34eff8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 22:16:32 +0000 Subject: [PATCH 27/88] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index adc99d6..06a3d32 100644 --- a/brltty.spec +++ b/brltty.spec @@ -39,7 +39,7 @@ Name: brltty Version: %{pkg_version} -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -657,6 +657,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 6.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 20 2022 Python Maint - 6.5-4 - Rebuilt for Python 3.11 From 9140180aae3f4a724bd38c4499e2e50d490a5309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Mon, 1 Aug 2022 15:02:25 +0200 Subject: [PATCH 28/88] Rebuilt for ICU 71.1 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 06a3d32..ca2cad7 100644 --- a/brltty.spec +++ b/brltty.spec @@ -39,7 +39,7 @@ Name: brltty Version: %{pkg_version} -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -657,6 +657,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Aug 01 2022 Frantisek Zatloukal - 6.5-6 +- Rebuilt for ICU 71.1 + * Wed Jul 20 2022 Fedora Release Engineering - 6.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 67c232b34c0e1848d64ce2f4633a1e87e3270c64 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 2 Aug 2022 11:11:43 -0500 Subject: [PATCH 29/88] Only build java on supported platforms --- brltty.spec | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/brltty.spec b/brltty.spec index ca2cad7..eb7f505 100644 --- a/brltty.spec +++ b/brltty.spec @@ -32,6 +32,12 @@ %global with_ocaml 1 +%ifarch %{java_arches} +%global JAVA 1 +%else +%global JAVA 0 +%endif + # Filter private libraries %global _privatelibs libbrltty.+\.so.* %global __provides_exclude ^(%{_privatelibs})$ @@ -39,7 +45,7 @@ Name: brltty Version: %{pkg_version} -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -217,6 +223,7 @@ Summary: Python 3 binding for BrlAPI This package provides the Python 3 binding for BrlAPI. %endif +%if %{JAVA} %package -n brlapi-java Version: %{api_version} License: LGPLv2+ @@ -226,6 +233,7 @@ BuildRequires: java-devel Summary: Java binding for BrlAPI %description -n brlapi-java This package provides the Java binding for BrlAPI. +%endif %if 0%{?with_ocaml} %package -n ocaml-brlapi @@ -282,11 +290,13 @@ cp -a python2 minimal # If MAKEFLAGS=-jN is set it would break local builds. unset MAKEFLAGS +%if %{JAVA} # Add the openjdk include directories to CPPFLAGS for i in -I/usr/lib/jvm/java/include{,/linux}; do java_inc="$java_inc $i" done export CPPFLAGS="$java_inc" +%endif export LDFLAGS="%{?build_ldflags}" export CFLAGS="%{optflags} -fno-strict-aliasing $LDFLAGS" @@ -303,10 +313,14 @@ configure_opts=" \ %if ! %{with_espeak} --without-espeak \ %endif +%if %{JAVA} --with-install-root=%{buildroot} \ JAVA_JAR_DIR=%{_jnidir} \ JAVA_JNI_DIR=%{_libdir}/brltty \ JAVA_JNI=yes" +%else + --with-install-root=%{buildroot}" +%endif configure_opts_minimal=" \ --disable-stripping \ @@ -522,6 +536,12 @@ popd rm -f doc/Initramfs/Dracut/README* rmdir doc/Initramfs/Dracut doc/Initramfs + +%if %{!JAVA} +find . -type d -name 'Java' | xargs rm -rf +find %{buildroot}%{_datadir} -type d -name 'Java' | xargs rm -rf +%endif + %post %systemd_post brltty.service @@ -554,6 +574,7 @@ fi %{_bindir}/brltty-* %exclude %{_bindir}/brltty-minimal %{_libdir}/brltty/ +%if %{!JAVA} %exclude %{_libdir}/brltty/libbrlttybba.so %exclude %{_libdir}/brltty/libbrlttybxw.so %exclude %{_libdir}/brltty/libbrlttyxa2.so @@ -563,6 +584,7 @@ fi %if %{with_speech_dispatcher} %exclude %{_libdir}/brltty/libbrlttyssd.so %endif +%endif %license LICENSE-LGPL %doc %{_mandir}/man[15]/brltty.* %{_sysconfdir}/X11/Xsession.d/90xbrlapi @@ -587,7 +609,7 @@ fi %files docs %doc Documents/ChangeLog Documents/TODO %doc Documents/Manual-BRLTTY/ -%doc doc/* +#%doc doc/* %files xw %doc Drivers/Braille/XWindow/README @@ -640,9 +662,11 @@ fi %{python3_sitearch}/Brlapi-%{api_version}-*.egg-info %endif +%if %{JAVA} %files -n brlapi-java %{_libdir}/brltty/libbrlapi_java.so %{_jnidir}/brlapi.jar +%endif %if 0%{?with_ocaml} %files -n ocaml-brlapi @@ -657,6 +681,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Aug 01 2022 Gwyn Ciesla - 6.5-7 +- Build Java only on supported platforms. + * Mon Aug 01 2022 Frantisek Zatloukal - 6.5-6 - Rebuilt for ICU 71.1 From ff62c38c979cc2f38bdd31c05368c4143373b41d Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sat, 31 Dec 2022 02:20:21 +0000 Subject: [PATCH 30/88] Rebuild for ICU 72 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index eb7f505..9f36810 100644 --- a/brltty.spec +++ b/brltty.spec @@ -45,7 +45,7 @@ Name: brltty Version: %{pkg_version} -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ 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 +* Sat Dec 31 2022 Pete Walter - 6.5-8 +- Rebuild for ICU 72 + * Mon Aug 01 2022 Gwyn Ciesla - 6.5-7 - Build Java only on supported platforms. From 7fecff42977a6cab7441a2f6e10d55842149a447 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 23:10:48 +0000 Subject: [PATCH 31/88] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 9f36810..d295f0b 100644 --- a/brltty.spec +++ b/brltty.spec @@ -45,7 +45,7 @@ Name: brltty Version: %{pkg_version} -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ 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 +* Wed Jan 18 2023 Fedora Release Engineering - 6.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Dec 31 2022 Pete Walter - 6.5-8 - Rebuild for ICU 72 From 99b25bcaebc93a8e4cc4812b53c2c6ef1d42f11a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 24 Jan 2023 08:23:52 +0000 Subject: [PATCH 32/88] Rebuild OCaml packages for F38 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index d295f0b..f3e08d0 100644 --- a/brltty.spec +++ b/brltty.spec @@ -45,7 +45,7 @@ Name: brltty Version: %{pkg_version} -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2+ 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 +* Tue Jan 24 2023 Richard W.M. Jones - 6.5-10 +- Rebuild OCaml packages for F38 + * Wed Jan 18 2023 Fedora Release Engineering - 6.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d1dec50f3c41a87d0d8c2e18b197baf18ce3ed9f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 8 Mar 2023 14:47:41 -0600 Subject: [PATCH 33/88] migrated to SPDX license --- brltty.spec | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/brltty.spec b/brltty.spec index f3e08d0..d825453 100644 --- a/brltty.spec +++ b/brltty.spec @@ -45,8 +45,8 @@ Name: brltty Version: %{pkg_version} -Release: 10%{?dist} -License: LGPLv2+ +Release: 11%{?dist} +License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz Source1: brltty.service @@ -101,7 +101,7 @@ Speech Dispatcher, please install also package %{name}-speech-dispatcher. %package speech-dispatcher Summary: Speech Dispatcher driver for BRLTTY -License: LGPLv2+ +License: LGPL-2.0-or-later BuildRequires: speech-dispatcher-devel Requires: %{name}%{?_isa} = %{pkg_version}-%{release} %description speech-dispatcher @@ -110,7 +110,7 @@ This package provides the Speech Dispatcher driver for BRLTTY. %package docs Summary: Documentation for BRLTTY -License: LGPLv2+ +License: LGPL-2.0-or-later Requires: %{name} = %{pkg_version}-%{release} BuildArch: noarch %description docs @@ -118,7 +118,7 @@ This package provides the documentation for BRLTTY. %package xw Summary: XWindow driver for BRLTTY -License: LGPLv2+ +License: LGPL-2.0-or-later BuildRequires: libSM-devel libICE-devel libX11-devel libXaw-devel libXext-devel libXt-devel libXtst-devel Requires: %{name}%{?_isa} = %{pkg_version}-%{release} Requires: xorg-x11-fonts-misc, ucs-miscfixed-fonts @@ -127,7 +127,7 @@ This package provides the XWindow driver for BRLTTY. %package at-spi2 Summary: AtSpi2 driver for BRLTTY -License: LGPLv2+ +License: LGPL-2.0-or-later Requires: %{name}%{?_isa} = %{pkg_version}-%{release} %description at-spi2 This package provides the AtSpi2 driver for BRLTTY. @@ -135,7 +135,7 @@ This package provides the AtSpi2 driver for BRLTTY. %if %{with_espeak} %package espeak Summary: eSpeak driver for BRLTTY -License: LGPLv2+ +License: LGPL-2.0-or-later Requires: %{name}%{?_isa} = %{pkg_version}-%{release} %description espeak This package provides the eSpeak driver for BRLTTY. @@ -143,7 +143,7 @@ This package provides the eSpeak driver for BRLTTY. %package espeak-ng Summary: eSpeak-NG driver for BRLTTY -License: LGPLv2+ +License: LGPL-2.0-or-later Requires: %{name}%{?_isa} = %{pkg_version}-%{release} %if ! %{with_espeak} Obsoletes: brltty-espeak <= 5.6-5 @@ -153,7 +153,7 @@ This package provides the eSpeak-NG driver for BRLTTY. %package -n brlapi Version: %{api_version} -License: LGPLv2+ +License: LGPL-2.0-or-later Summary: Application Programming Interface for BRLTTY Recommends: %{name} = %{pkg_version}-%{release} Requires(pre): glibc-common, shadow-utils @@ -167,7 +167,7 @@ a refreshable braille display. %package -n brlapi-devel Version: %{api_version} -License: LGPLv2+ +License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} Summary: Headers, static archive, and documentation for BrlAPI @@ -185,7 +185,7 @@ which directly accesses a refreshable braille display. %package -n tcl-brlapi Version: %{api_version} -License: LGPLv2+ +License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: tcl-devel Summary: Tcl binding for BrlAPI @@ -196,7 +196,7 @@ This package provides the Tcl binding for BrlAPI. %package -n python2-brlapi %{?python_provide:%python_provide python2-brlapi} Version: %{api_version} -License: LGPLv2+ +License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: Cython BuildRequires: python2-devel @@ -210,7 +210,7 @@ This package provides the Python 2 binding for BrlAPI. %package -n python3-brlapi %{?python_provide:%python_provide python3-brlapi} Version: %{api_version} -License: LGPLv2+ +License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: python3-Cython BuildRequires: python3-devel @@ -226,7 +226,7 @@ This package provides the Python 3 binding for BrlAPI. %if %{JAVA} %package -n brlapi-java Version: %{api_version} -License: LGPLv2+ +License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: jpackage-utils BuildRequires: java-devel @@ -238,7 +238,7 @@ This package provides the Java binding for BrlAPI. %if 0%{?with_ocaml} %package -n ocaml-brlapi Version: %{api_version} -License: LGPLv2+ +License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: ocaml BuildRequires: make @@ -681,6 +681,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Mar 08 2023 Gwyn Ciesla - 6.5-11 +- migrated to SPDX license + * Tue Jan 24 2023 Richard W.M. Jones - 6.5-10 - Rebuild OCaml packages for F38 From 3fc9264781711261f377ce74479773994d40e1f2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 21:33:46 +0200 Subject: [PATCH 34/88] Rebuilt for Python 3.12 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index d825453..b791928 100644 --- a/brltty.spec +++ b/brltty.spec @@ -45,7 +45,7 @@ Name: brltty Version: %{pkg_version} -Release: 11%{?dist} +Release: 12%{?dist} License: LGPL-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 +* Tue Jun 13 2023 Python Maint - 6.5-12 +- Rebuilt for Python 3.12 + * Wed Mar 08 2023 Gwyn Ciesla - 6.5-11 - migrated to SPDX license From 03bc82ea723aacc4e6b8aa11a29498ca8c13be43 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 27 Jun 2023 15:15:22 -0400 Subject: [PATCH 35/88] Fix build with gettext-0.22 Building with gettext-0.22 fails for lack of this header: /usr/bin/msgfmt: input file doesn't contain a header entry with a charset specification Patch submitted upstream: https://github.com/brltty/brltty/pull/420 --- brltty-6.5-gettext.patch | 41 ++++++++++++++++++++++++++++++++++++++++ brltty.spec | 3 +++ 2 files changed, 44 insertions(+) create mode 100644 brltty-6.5-gettext.patch diff --git a/brltty-6.5-gettext.patch b/brltty-6.5-gettext.patch new file mode 100644 index 0000000..b401b13 --- /dev/null +++ b/brltty-6.5-gettext.patch @@ -0,0 +1,41 @@ +Filed upstream as https://github.com/brltty/brltty/pull/420 + +diff --git a/Messages/ru.po b/Messages/ru.po +index 6d8c5a7..1bbc931 100644 +--- a/Messages/ru.po ++++ b/Messages/ru.po +@@ -1,3 +1,34 @@ ++# BRLTTY - A background process providing access to the console screen (when in ++# text mode) for a blind person using a refreshable braille display. ++# ++# Copyright (C) 1995-2022 by The BRLTTY Developers. ++# ++# BRLTTY comes with ABSOLUTELY NO WARRANTY. ++# ++# This is free software, placed under the terms of the ++# GNU Lesser General Public License, as published by the Free Software ++# Foundation; either version 2.1 of the License, or (at your option) any ++# later version. Please see the file LICENSE-LGPL for details. ++# ++# Web Page: http://brltty.app/ ++# ++# This software is maintained by Dave Mielke . ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: brltty 4.5\n" ++"Report-Msgid-Bugs-To: BRLTTY@brltty.app\n" ++"POT-Creation-Date: 2021-01-27 11:47-0500\n" ++"PO-Revision-Date: 2021-02-07 08:18-0500\n" ++"Last-Translator: Маргарита Мельникова \n" ++"Language-Team: Friends of BRLTTY \n" ++"Language: ru\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " ++"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++ + #: Programs/brltty.c:167 + #, c-format + msgid "\"%s\" started as \"%s\"\n" diff --git a/brltty.spec b/brltty.spec index b791928..58146d8 100644 --- a/brltty.spec +++ b/brltty.spec @@ -55,6 +55,8 @@ Source3: brlapi-forbuild.h Patch1: brltty-6.3-loadLibrary.patch # libspeechd.h moved in latest speech-dispatch (NOT sent upstream) Patch2: brltty-6.3-libspeechd.patch +# fix translations with gettext-0.22: https://github.com/brltty/brltty/pull/420 +Patch3: brltty-6.5-gettext.patch Summary: Braille display driver for Linux/Unix BuildRequires: byacc BuildRequires: glibc-kernheaders @@ -272,6 +274,7 @@ mv %{name}-%{version} python2 pushd python2 %patch1 -p1 -b .loadLibrary %patch2 -p1 -b .libspeechd +%patch3 -p1 -b .gettext # remove packaged binary file rm -f Programs/brltty-ktb From 3d875ed07d9d5d9b724adc1eef54f83d2da8fe3f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 27 Jun 2023 15:13:08 -0500 Subject: [PATCH 36/88] Fix build with gettext-0.22 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 58146d8..d44fc49 100644 --- a/brltty.spec +++ b/brltty.spec @@ -45,7 +45,7 @@ Name: brltty Version: %{pkg_version} -Release: 12%{?dist} +Release: 13%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -684,6 +684,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Jun 27 2023 Gwyn Ciesla - 6.5-13 +- Fix build with gettext-0.22 (yselkowitz) + * Tue Jun 13 2023 Python Maint - 6.5-12 - Rebuilt for Python 3.12 From a75870d50e96c030969b5cf493a16087a8d3c0ae Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 10 Jul 2023 14:35:52 -0600 Subject: [PATCH 37/88] OCaml 5.0.0 rebuild Produce debuginfo for the OCaml interface --- brltty.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/brltty.spec b/brltty.spec index d44fc49..f967643 100644 --- a/brltty.spec +++ b/brltty.spec @@ -1,4 +1,3 @@ -%undefine _package_note_flags %define pkg_version 6.5 %define api_version 0.8.4 @@ -45,7 +44,7 @@ Name: brltty Version: %{pkg_version} -Release: 13%{?dist} +Release: 14%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -243,6 +242,7 @@ Version: %{api_version} License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: ocaml +BuildRequires: ocaml-findlib BuildRequires: make Summary: OCaml binding for BrlAPI %description -n ocaml-brlapi @@ -278,6 +278,10 @@ pushd python2 # remove packaged binary file rm -f Programs/brltty-ktb + +# produce debuginfo for the OCaml interface +sed -i 's/@OCAMLC@/& -g/;s/@OCAMLOPT@/& -g/;s/@OCAMLMKLIB@/& -g/' \ + Bindings/OCaml/Makefile.in popd # Make a copy of the source tree for building the Python 3 module @@ -684,6 +688,10 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Jul 10 2023 Jerry James - 6.5-14 +- OCaml 5.0.0 rebuild +- Produce debuginfo for the OCaml interface + * Tue Jun 27 2023 Gwyn Ciesla - 6.5-13 - Fix build with gettext-0.22 (yselkowitz) From 1c0f85264cda77401ea5098e2e78639749fc491e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 11:17:43 +0100 Subject: [PATCH 38/88] ExcludeArch i686 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SPML7CUBSZNI36NLXGVHEG7DNHU3EWOJ/) --- brltty.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/brltty.spec b/brltty.spec index f967643..fd8e294 100644 --- a/brltty.spec +++ b/brltty.spec @@ -244,6 +244,8 @@ Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: ocaml BuildRequires: ocaml-findlib BuildRequires: make +# OCaml packages not built on i686 since OCaml 5 / Fedora 39. +ExcludeArch: %{ix86} Summary: OCaml binding for BrlAPI %description -n ocaml-brlapi This package provides the OCaml binding for BrlAPI. From 395b9638eb256b09422cc602549760da05a5ae9e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 11:21:16 +0100 Subject: [PATCH 39/88] Fix previous commit I think the previous commit would actually do ExcludeArch for all subpackages, obviously not desirable. Instead make this subpackage conditional using %ifnarch. --- brltty.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/brltty.spec b/brltty.spec index fd8e294..f6bf35e 100644 --- a/brltty.spec +++ b/brltty.spec @@ -29,7 +29,10 @@ # with espeak support iff on Fedora: %define with_espeak 0%{?fedora} +# OCaml packages not built on i686 since OCaml 5 / Fedora 39. +%ifnarch %{ix86} %global with_ocaml 1 +%endif %ifarch %{java_arches} %global JAVA 1 @@ -244,8 +247,6 @@ Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: ocaml BuildRequires: ocaml-findlib BuildRequires: make -# OCaml packages not built on i686 since OCaml 5 / Fedora 39. -ExcludeArch: %{ix86} Summary: OCaml binding for BrlAPI %description -n ocaml-brlapi This package provides the OCaml binding for BrlAPI. From 181319e7e266df99f7432d21360e9218881c0ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 11 Jul 2023 22:13:01 +0200 Subject: [PATCH 40/88] Rebuilt for ICU 73.2 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index f6bf35e..33ef5c6 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: %{pkg_version} -Release: 14%{?dist} +Release: 15%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -691,6 +691,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Jul 11 2023 FrantiÅ¡ek Zatloukal - 6.5-15 +- Rebuilt for ICU 73.2 + * Mon Jul 10 2023 Jerry James - 6.5-14 - OCaml 5.0.0 rebuild - Produce debuginfo for the OCaml interface From 2fc5eff95566917adaf92c26e947b81fa8f29b39 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 12 Jul 2023 01:33:51 +0100 Subject: [PATCH 41/88] OCaml 5.0 rebuild for Fedora 39 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 33ef5c6..dbeac14 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: %{pkg_version} -Release: 15%{?dist} +Release: 16%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -691,6 +691,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Jul 12 2023 Richard W.M. Jones - 6.5-16 +- OCaml 5.0 rebuild for Fedora 39 + * Tue Jul 11 2023 FrantiÅ¡ek Zatloukal - 6.5-15 - Rebuilt for ICU 73.2 From fafd51cc0d637bac626665a469d7c42f9e9b427a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 12 Jul 2023 10:59:22 +0200 Subject: [PATCH 42/88] Add BR: gcc --- brltty.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index dbeac14..1f00704 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: %{pkg_version} -Release: 16%{?dist} +Release: 17%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -62,6 +62,7 @@ Patch3: brltty-6.5-gettext.patch Summary: Braille display driver for Linux/Unix BuildRequires: byacc BuildRequires: glibc-kernheaders +BuildRequires: gcc BuildRequires: bluez-libs-devel BuildRequires: systemd BuildRequires: gettext @@ -691,6 +692,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Jul 12 2023 Frantisek Zatloukal - 6.5-17 +- Add BR: gcc (ocaml no longer pulls it indirectly on i686) + * Wed Jul 12 2023 Richard W.M. Jones - 6.5-16 - OCaml 5.0 rebuild for Fedora 39 From 31e78166e4939228ac820f8ffbec956d1de948c3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 12 Jul 2023 10:21:37 +0100 Subject: [PATCH 43/88] OCaml 5.0 rebuild for Fedora 39 --- brltty.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/brltty.spec b/brltty.spec index 1f00704..abd993a 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: %{pkg_version} -Release: 17%{?dist} +Release: 18%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -692,12 +692,12 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Jul 12 2023 Richard W.M. Jones - 6.5-18 +- OCaml 5.0 rebuild for Fedora 39 + * Wed Jul 12 2023 Frantisek Zatloukal - 6.5-17 - Add BR: gcc (ocaml no longer pulls it indirectly on i686) -* Wed Jul 12 2023 Richard W.M. Jones - 6.5-16 -- OCaml 5.0 rebuild for Fedora 39 - * Tue Jul 11 2023 FrantiÅ¡ek Zatloukal - 6.5-15 - Rebuilt for ICU 73.2 From 8e17a87947483181ca7f80c28bdec48062a157e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Thu, 13 Jul 2023 13:27:56 +0200 Subject: [PATCH 44/88] Rebuilt for ICU 73.2 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index abd993a..0608fa0 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: %{pkg_version} -Release: 18%{?dist} +Release: 19%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -692,6 +692,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Thu Jul 13 2023 FrantiÅ¡ek Zatloukal - 6.5-19 +- Rebuilt for ICU 73.2 + * Wed Jul 12 2023 Richard W.M. Jones - 6.5-18 - OCaml 5.0 rebuild for Fedora 39 From bc9ce96d56fd5905c8fc9816e60ff0c4332de853 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:56:29 +0000 Subject: [PATCH 45/88] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 0608fa0..9f05530 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: %{pkg_version} -Release: 19%{?dist} +Release: 20%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -692,6 +692,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 6.5-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jul 13 2023 FrantiÅ¡ek Zatloukal - 6.5-19 - Rebuilt for ICU 73.2 From ac2c52663581e95053f498c45a15181a13c93dc0 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 24 Jul 2023 15:13:37 -0500 Subject: [PATCH 46/88] 6.6 --- brltty-6.5-gettext.patch | 41 ---------------------------------------- brltty.spec | 32 +++++++++++++++---------------- sources | 2 +- 3 files changed, 17 insertions(+), 58 deletions(-) delete mode 100644 brltty-6.5-gettext.patch diff --git a/brltty-6.5-gettext.patch b/brltty-6.5-gettext.patch deleted file mode 100644 index b401b13..0000000 --- a/brltty-6.5-gettext.patch +++ /dev/null @@ -1,41 +0,0 @@ -Filed upstream as https://github.com/brltty/brltty/pull/420 - -diff --git a/Messages/ru.po b/Messages/ru.po -index 6d8c5a7..1bbc931 100644 ---- a/Messages/ru.po -+++ b/Messages/ru.po -@@ -1,3 +1,34 @@ -+# BRLTTY - A background process providing access to the console screen (when in -+# text mode) for a blind person using a refreshable braille display. -+# -+# Copyright (C) 1995-2022 by The BRLTTY Developers. -+# -+# BRLTTY comes with ABSOLUTELY NO WARRANTY. -+# -+# This is free software, placed under the terms of the -+# GNU Lesser General Public License, as published by the Free Software -+# Foundation; either version 2.1 of the License, or (at your option) any -+# later version. Please see the file LICENSE-LGPL for details. -+# -+# Web Page: http://brltty.app/ -+# -+# This software is maintained by Dave Mielke . -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: brltty 4.5\n" -+"Report-Msgid-Bugs-To: BRLTTY@brltty.app\n" -+"POT-Creation-Date: 2021-01-27 11:47-0500\n" -+"PO-Revision-Date: 2021-02-07 08:18-0500\n" -+"Last-Translator: Маргарита Мельникова \n" -+"Language-Team: Friends of BRLTTY \n" -+"Language: ru\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -+ - #: Programs/brltty.c:167 - #, c-format - msgid "\"%s\" started as \"%s\"\n" diff --git a/brltty.spec b/brltty.spec index 9f05530..1ade67b 100644 --- a/brltty.spec +++ b/brltty.spec @@ -1,5 +1,5 @@ -%define pkg_version 6.5 -%define api_version 0.8.4 +%define pkg_version 6.6 +%define api_version 0.8.5 # minimal means brltty-minimal subpackage with minimal deps for # braille support in Anaconda installer @@ -46,8 +46,8 @@ %global __requires_exclude ^(%{_privatelibs})$ Name: brltty -Version: %{pkg_version} -Release: 20%{?dist} +Version: 6.6 +Release: 1%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -57,8 +57,6 @@ Source3: brlapi-forbuild.h Patch1: brltty-6.3-loadLibrary.patch # libspeechd.h moved in latest speech-dispatch (NOT sent upstream) Patch2: brltty-6.3-libspeechd.patch -# fix translations with gettext-0.22: https://github.com/brltty/brltty/pull/420 -Patch3: brltty-6.5-gettext.patch Summary: Braille display driver for Linux/Unix BuildRequires: byacc BuildRequires: glibc-kernheaders @@ -157,7 +155,7 @@ Obsoletes: brltty-espeak <= 5.6-5 This package provides the eSpeak-NG driver for BRLTTY. %package -n brlapi -Version: %{api_version} +Version: 6.6 License: LGPL-2.0-or-later Summary: Application Programming Interface for BRLTTY Recommends: %{name} = %{pkg_version}-%{release} @@ -171,7 +169,7 @@ Install this package if you have an application which directly accesses a refreshable braille display. %package -n brlapi-devel -Version: %{api_version} +Version: 6.6 License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} Summary: Headers, static archive, and documentation for BrlAPI @@ -189,7 +187,7 @@ Install this package if you are developing or maintaining an application which directly accesses a refreshable braille display. %package -n tcl-brlapi -Version: %{api_version} +Version: 6.6 License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: tcl-devel @@ -200,7 +198,7 @@ This package provides the Tcl binding for BrlAPI. %if %{with python2} %package -n python2-brlapi %{?python_provide:%python_provide python2-brlapi} -Version: %{api_version} +Version: 6.6 License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: Cython @@ -214,7 +212,7 @@ This package provides the Python 2 binding for BrlAPI. %if %{with python3} %package -n python3-brlapi %{?python_provide:%python_provide python3-brlapi} -Version: %{api_version} +Version: 6.6 License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: python3-Cython @@ -230,7 +228,7 @@ This package provides the Python 3 binding for BrlAPI. %if %{JAVA} %package -n brlapi-java -Version: %{api_version} +Version: 6.6 License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: jpackage-utils @@ -242,7 +240,7 @@ This package provides the Java binding for BrlAPI. %if 0%{?with_ocaml} %package -n ocaml-brlapi -Version: %{api_version} +Version: 6.6 License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: ocaml @@ -276,9 +274,8 @@ installer. mv %{name}-%{version} python2 pushd python2 -%patch1 -p1 -b .loadLibrary -%patch2 -p1 -b .libspeechd -%patch3 -p1 -b .gettext +%patch -P 1 -p1 -b .loadLibrary +%patch -P 2 -p1 -b .libspeechd # remove packaged binary file rm -f Programs/brltty-ktb @@ -692,6 +689,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Jul 24 2023 Gwyn Ciesla - 6.6-1 +- 6.6 + * Wed Jul 19 2023 Fedora Release Engineering - 6.5-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index f96c12e..e4631cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (brltty-6.5.tar.xz) = bbfbb89b1c3ba5063ad3bc0aa97b859dd23acea1feb79dab20c57dc74ff2f26649942fcecc7030a3f70555596f4d9d35cd05616af2a8e101d4d56b4c471a6ad3 +SHA512 (brltty-6.6.tar.xz) = 852bfd9179570be7b0da8b1279f84bdfedc14a319988d9c2eac5a20a9ce8977f31fdee167e8e96bb411184a1d72f4cdc633944c7b3f55bddae411fc71a9e6898 From da6c95720d8c77de7a96441ba12437a52b576d78 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 25 Jul 2023 08:37:34 -0500 Subject: [PATCH 47/88] Correct apiversioning --- brltty.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/brltty.spec b/brltty.spec index 1ade67b..1f823ae 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -155,7 +155,7 @@ Obsoletes: brltty-espeak <= 5.6-5 This package provides the eSpeak-NG driver for BRLTTY. %package -n brlapi -Version: 6.6 +Version: %{api_version} License: LGPL-2.0-or-later Summary: Application Programming Interface for BRLTTY Recommends: %{name} = %{pkg_version}-%{release} @@ -169,7 +169,7 @@ Install this package if you have an application which directly accesses a refreshable braille display. %package -n brlapi-devel -Version: 6.6 +Version: %{api_version} License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} Summary: Headers, static archive, and documentation for BrlAPI @@ -187,7 +187,7 @@ Install this package if you are developing or maintaining an application which directly accesses a refreshable braille display. %package -n tcl-brlapi -Version: 6.6 +Version: %{api_version} License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: tcl-devel @@ -198,7 +198,7 @@ This package provides the Tcl binding for BrlAPI. %if %{with python2} %package -n python2-brlapi %{?python_provide:%python_provide python2-brlapi} -Version: 6.6 +Version: %{api_version} License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: Cython @@ -212,7 +212,7 @@ This package provides the Python 2 binding for BrlAPI. %if %{with python3} %package -n python3-brlapi %{?python_provide:%python_provide python3-brlapi} -Version: 6.6 +Version: %{api_version} License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: python3-Cython @@ -228,7 +228,7 @@ This package provides the Python 3 binding for BrlAPI. %if %{JAVA} %package -n brlapi-java -Version: 6.6 +Version: %{api_version} License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: jpackage-utils @@ -240,7 +240,7 @@ This package provides the Java binding for BrlAPI. %if 0%{?with_ocaml} %package -n ocaml-brlapi -Version: 6.6 +Version: %{api_version} License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: ocaml @@ -689,6 +689,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Jul 25 2023 Gwyn Ciesla - 6.6-2 +- Correct apiversioning + * Mon Jul 24 2023 Gwyn Ciesla - 6.6-1 - 6.6 From 7aab34811804412559bb733b52ed82b76fbff898 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 14 Aug 2023 09:41:03 -0700 Subject: [PATCH 48/88] Build with Cython 0.29, crashes when built with Cython 3 (#2231865) https://bugzilla.redhat.com/show_bug.cgi?id=2231865 https://brltty.app/pipermail/brltty/2023-August/020039.html --- brltty.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/brltty.spec b/brltty.spec index 1f823ae..cd180aa 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -201,7 +201,8 @@ This package provides the Tcl binding for BrlAPI. Version: %{api_version} License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} -BuildRequires: Cython +# https://brltty.app/pipermail/brltty/2023-August/020039.html +BuildRequires: Cython < 3 BuildRequires: python2-devel BuildRequires: python2-setuptools Summary: Python binding for BrlAPI @@ -215,7 +216,8 @@ This package provides the Python 2 binding for BrlAPI. Version: %{api_version} License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} -BuildRequires: python3-Cython +# https://brltty.app/pipermail/brltty/2023-August/020039.html +BuildRequires: python3-Cython < 3 BuildRequires: python3-devel %if %{without python2} Obsoletes: python2-brlapi < %{api_version}-%{release} @@ -689,6 +691,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Aug 14 2023 Adam Williamson - 6.6-3 +- Build with Cython 0.29, it crashes when built with Cython 3 (#2231865) + * Tue Jul 25 2023 Gwyn Ciesla - 6.6-2 - Correct apiversioning From ee571d6d4793c76970cd5930c3769c0f029dd38f Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 15 Aug 2023 09:35:12 -0700 Subject: [PATCH 49/88] Fix the Cython 3 crash and build with Cython 3 again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to Lukáš Tyrychtr and Samuel Thibault for the diagnosis and fix. --- brltty-6.6-cython3.patch | 20 ++++++++++++++++++++ brltty.spec | 16 +++++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 brltty-6.6-cython3.patch diff --git a/brltty-6.6-cython3.patch b/brltty-6.6-cython3.patch new file mode 100644 index 0000000..9696e2b --- /dev/null +++ b/brltty-6.6-cython3.patch @@ -0,0 +1,20 @@ +--- 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 cd180aa..db9b9c5 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -57,6 +57,10 @@ Source3: brlapi-forbuild.h 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 @@ -201,8 +205,7 @@ This package provides the Tcl binding for BrlAPI. Version: %{api_version} License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} -# https://brltty.app/pipermail/brltty/2023-August/020039.html -BuildRequires: Cython < 3 +BuildRequires: Cython BuildRequires: python2-devel BuildRequires: python2-setuptools Summary: Python binding for BrlAPI @@ -216,8 +219,7 @@ This package provides the Python 2 binding for BrlAPI. Version: %{api_version} License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} -# https://brltty.app/pipermail/brltty/2023-August/020039.html -BuildRequires: python3-Cython < 3 +BuildRequires: python3-Cython BuildRequires: python3-devel %if %{without python2} Obsoletes: python2-brlapi < %{api_version}-%{release} @@ -278,6 +280,7 @@ 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 @@ -691,6 +694,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Aug 15 2023 Adam Williamson - 6.6-4 +- Fix the Cython 3 crash and build with Cython 3 again + * Mon Aug 14 2023 Adam Williamson - 6.6-3 - Build with Cython 0.29, it crashes when built with Cython 3 (#2231865) From 05077bd6c3b69d305fceee8c06d03b83644d1232 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Oct 2023 20:45:58 +0100 Subject: [PATCH 50/88] OCaml 5.1 rebuild for Fedora 40 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index db9b9c5..461990a 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -694,6 +694,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Thu Oct 05 2023 Richard W.M. Jones - 6.6-5 +- OCaml 5.1 rebuild for Fedora 40 + * Tue Aug 15 2023 Adam Williamson - 6.6-4 - Fix the Cython 3 crash and build with Cython 3 again From 669ced9967dccba8cfb0d93bbeb98be2ff1da463 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Dec 2023 18:06:41 +0000 Subject: [PATCH 51/88] OCaml 5.1.1 rebuild for Fedora 40 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 461990a..54a6cb5 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -694,6 +694,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Dec 12 2023 Richard W.M. Jones - 6.6-6 +- OCaml 5.1.1 rebuild for Fedora 40 + * Thu Oct 05 2023 Richard W.M. Jones - 6.6-5 - OCaml 5.1 rebuild for Fedora 40 From 269cb02e42cf33eed8c3f274d803e17b8d367434 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Dec 2023 15:00:40 +0000 Subject: [PATCH 52/88] OCaml 5.1.1 + s390x code gen fix for Fedora 40 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 54a6cb5..95fabb2 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -694,6 +694,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Dec 18 2023 Richard W.M. Jones - 6.6-7 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 + * Tue Dec 12 2023 Richard W.M. Jones - 6.6-6 - OCaml 5.1.1 rebuild for Fedora 40 From 0e18fd05cb83a4155deb9851caf7ec69899c48ec Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Dec 2023 18:43:05 +0000 Subject: [PATCH 53/88] Bump release and rebuild --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 95fabb2..7d8b586 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz @@ -694,6 +694,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Dec 18 2023 Richard W.M. Jones - 6.6-8 +- Bump release and rebuild + * Mon Dec 18 2023 Richard W.M. Jones - 6.6-7 - OCaml 5.1.1 + s390x code gen fix for Fedora 40 From 302820f1598418fc2c343f745d2055f0ab8f6ceb Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 20 Dec 2023 12:52:17 -0600 Subject: [PATCH 54/88] Use sysusers for brlapi group --- brltty.spec | 15 +++++++++++++-- brltty.sysusers | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 brltty.sysusers diff --git a/brltty.spec b/brltty.spec index 7d8b586..ca65c2c 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,13 +47,14 @@ Name: brltty Version: 6.6 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPL-2.0-or-later URL: http://brltty.app/ Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz Source1: brltty.service Source2: brlapi-config.h 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 @@ -67,6 +68,9 @@ BuildRequires: glibc-kernheaders 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 BuildRequires: alsa-lib-devel @@ -549,6 +553,8 @@ popd rm -f doc/Initramfs/Dracut/README* rmdir doc/Initramfs/Dracut doc/Initramfs +# Install group creation file +install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysusersdir}/brltty.conf %if %{!JAVA} find . -type d -name 'Java' | xargs rm -rf @@ -565,7 +571,7 @@ find %{buildroot}%{_datadir} -type d -name 'Java' | xargs rm -rf %systemd_postun_with_restart brltty.service %pre -n brlapi -getent group brlapi >/dev/null || groupadd -r brlapi >/dev/null +%sysusers_create_compat %{SOURCE4} %post -n brlapi if [ ! -e %{_sysconfdir}/brlapi.key ]; then @@ -651,6 +657,8 @@ fi %doc %{_mandir}/man1/xbrlapi.* %doc %{_mandir}/man1/vstp.* %doc %{_mandir}/man1/eutp.* +%{_sysusersdir}/brltty.conf +%{lua_libdir}/brlapi.so %files -n brlapi-devel %{_libdir}/libbrlapi.so @@ -694,6 +702,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Dec 20 2023 Gwyn Ciesla - 6.6-9 +- Migrate group creation to sysusers + * Mon Dec 18 2023 Richard W.M. Jones - 6.6-8 - Bump release and rebuild diff --git a/brltty.sysusers b/brltty.sysusers new file mode 100644 index 0000000..c0220ca --- /dev/null +++ b/brltty.sysusers @@ -0,0 +1,2 @@ +#Type Name ID GECOS Home directory Shell +g brlapi - From 088d011ba3899607f8336472606551c8e15d06d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 17 Jan 2024 12:13:17 +0100 Subject: [PATCH 55/88] Added SPDX licenses found by ScanCode Dropped redundant license tags from subpackages --- brltty.spec | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/brltty.spec b/brltty.spec index ca65c2c..27d0d02 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,8 +47,8 @@ Name: brltty Version: 6.6 -Release: 9%{?dist} -License: LGPL-2.0-or-later +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 Source1: brltty.service @@ -112,7 +112,6 @@ Speech Dispatcher, please install also package %{name}-speech-dispatcher. %package speech-dispatcher Summary: Speech Dispatcher driver for BRLTTY -License: LGPL-2.0-or-later BuildRequires: speech-dispatcher-devel Requires: %{name}%{?_isa} = %{pkg_version}-%{release} %description speech-dispatcher @@ -121,7 +120,6 @@ This package provides the Speech Dispatcher driver for BRLTTY. %package docs Summary: Documentation for BRLTTY -License: LGPL-2.0-or-later Requires: %{name} = %{pkg_version}-%{release} BuildArch: noarch %description docs @@ -129,7 +127,6 @@ This package provides the documentation for BRLTTY. %package xw Summary: XWindow driver for BRLTTY -License: LGPL-2.0-or-later BuildRequires: libSM-devel libICE-devel libX11-devel libXaw-devel libXext-devel libXt-devel libXtst-devel Requires: %{name}%{?_isa} = %{pkg_version}-%{release} Requires: xorg-x11-fonts-misc, ucs-miscfixed-fonts @@ -138,7 +135,6 @@ This package provides the XWindow driver for BRLTTY. %package at-spi2 Summary: AtSpi2 driver for BRLTTY -License: LGPL-2.0-or-later Requires: %{name}%{?_isa} = %{pkg_version}-%{release} %description at-spi2 This package provides the AtSpi2 driver for BRLTTY. @@ -146,7 +142,6 @@ This package provides the AtSpi2 driver for BRLTTY. %if %{with_espeak} %package espeak Summary: eSpeak driver for BRLTTY -License: LGPL-2.0-or-later Requires: %{name}%{?_isa} = %{pkg_version}-%{release} %description espeak This package provides the eSpeak driver for BRLTTY. @@ -154,7 +149,6 @@ This package provides the eSpeak driver for BRLTTY. %package espeak-ng Summary: eSpeak-NG driver for BRLTTY -License: LGPL-2.0-or-later Requires: %{name}%{?_isa} = %{pkg_version}-%{release} %if ! %{with_espeak} Obsoletes: brltty-espeak <= 5.6-5 @@ -164,7 +158,6 @@ This package provides the eSpeak-NG driver for BRLTTY. %package -n brlapi Version: %{api_version} -License: LGPL-2.0-or-later Summary: Application Programming Interface for BRLTTY Recommends: %{name} = %{pkg_version}-%{release} Requires(pre): glibc-common, shadow-utils @@ -178,7 +171,6 @@ a refreshable braille display. %package -n brlapi-devel Version: %{api_version} -License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} Summary: Headers, static archive, and documentation for BrlAPI @@ -196,7 +188,6 @@ which directly accesses a refreshable braille display. %package -n tcl-brlapi Version: %{api_version} -License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: tcl-devel Summary: Tcl binding for BrlAPI @@ -207,7 +198,6 @@ This package provides the Tcl binding for BrlAPI. %package -n python2-brlapi %{?python_provide:%python_provide python2-brlapi} Version: %{api_version} -License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: Cython BuildRequires: python2-devel @@ -221,7 +211,6 @@ This package provides the Python 2 binding for BrlAPI. %package -n python3-brlapi %{?python_provide:%python_provide python3-brlapi} Version: %{api_version} -License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: python3-Cython BuildRequires: python3-devel @@ -237,7 +226,6 @@ This package provides the Python 3 binding for BrlAPI. %if %{JAVA} %package -n brlapi-java Version: %{api_version} -License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: jpackage-utils BuildRequires: java-devel @@ -249,7 +237,6 @@ This package provides the Java binding for BrlAPI. %if 0%{?with_ocaml} %package -n ocaml-brlapi Version: %{api_version} -License: LGPL-2.0-or-later Requires: brlapi%{?_isa} = %{api_version}-%{release} BuildRequires: ocaml BuildRequires: ocaml-findlib @@ -702,6 +689,10 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Jan 17 2024 Jaroslav Å karvada - 6.6-10 +- Added SPDX licenses found by ScanCode +- Dropped redundant license tags from subpackages + * Wed Dec 20 2023 Gwyn Ciesla - 6.6-9 - Migrate group creation to sysusers From d7e4d2766dbc2c161f6f345b2267ae391816f139 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:43:08 +0000 Subject: [PATCH 56/88] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 27d0d02..8f496c9 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -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 @@ -689,6 +689,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 6.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jan 17 2024 Jaroslav Å karvada - 6.6-10 - Added SPDX licenses found by ScanCode - Dropped redundant license tags from subpackages From c70db229570e0cf8a141b88dd93ef488db8d344c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:49:53 +0000 Subject: [PATCH 57/88] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 8f496c9..37819cd 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 11%{?dist} +Release: 12%{?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 @@ -689,6 +689,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 6.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 6.6-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b9e9ca558451635bd1eb4242b504358c17587f1a Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 31 Jan 2024 19:15:24 +0000 Subject: [PATCH 58/88] Rebuild for ICU 74 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 37819cd..b6018f7 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 12%{?dist} +Release: 13%{?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 @@ -689,6 +689,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Jan 31 2024 Pete Walter - 6.6-13 +- Rebuild for ICU 74 + * Tue Jan 23 2024 Fedora Release Engineering - 6.6-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b4ac46c0b069eab70c33bbbf2aab9e5345fca876 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 29 May 2024 17:43:42 +0100 Subject: [PATCH 59/88] OCaml 5.2.0 for Fedora 41 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index b6018f7..22a5d6a 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 13%{?dist} +Release: 14%{?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 @@ -689,6 +689,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed May 29 2024 Richard W.M. Jones - 6.6-14 +- OCaml 5.2.0 for Fedora 41 + * Wed Jan 31 2024 Pete Walter - 6.6-13 - Rebuild for ICU 74 From 887c5f4cc7983aed5699ccbf9f6551c611bc98b5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:48:48 +0200 Subject: [PATCH 60/88] Rebuilt for Python 3.13 --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 22a5d6a..4a32377 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 14%{?dist} +Release: 15%{?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 @@ -689,6 +689,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Fri Jun 07 2024 Python Maint - 6.6-15 +- Rebuilt for Python 3.13 + * Wed May 29 2024 Richard W.M. Jones - 6.6-14 - OCaml 5.2.0 for Fedora 41 From 95904b9139c63f4744ef9a0bb752bed73c9988d4 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 21 Jun 2018 12:32:22 +0200 Subject: [PATCH 61/88] Remove unnecessary dependency from brlapi and brltty-docs to brltty --- brltty.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/brltty.spec b/brltty.spec index 4a32377..d2fd2e3 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 15%{?dist} +Release: 16%{?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 @@ -120,7 +120,6 @@ This package provides the Speech Dispatcher driver for BRLTTY. %package docs Summary: Documentation for BRLTTY -Requires: %{name} = %{pkg_version}-%{release} BuildArch: noarch %description docs This package provides the documentation for BRLTTY. @@ -159,7 +158,6 @@ This package provides the eSpeak-NG driver for BRLTTY. %package -n brlapi Version: %{api_version} Summary: Application Programming Interface for BRLTTY -Recommends: %{name} = %{pkg_version}-%{release} Requires(pre): glibc-common, shadow-utils Requires(post): coreutils, util-linux %description -n brlapi @@ -689,6 +687,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Thu Jun 18 2024 Paolo Bonzini - 6.6-16 +- Remove unnecessary dependency from brlapi and brltty-docs to brltty + * Fri Jun 07 2024 Python Maint - 6.6-15 - Rebuilt for Python 3.13 From 0443cfd17469842af848f73e6aaf9a500cef9272 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 18 Jun 2024 09:07:11 -0500 Subject: [PATCH 62/88] Fix cl --- brltty.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index d2fd2e3..7d1f3bb 100644 --- a/brltty.spec +++ b/brltty.spec @@ -687,7 +687,7 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog -* Thu Jun 18 2024 Paolo Bonzini - 6.6-16 +* Tue Jun 18 2024 Paolo Bonzini - 6.6-16 - Remove unnecessary dependency from brlapi and brltty-docs to brltty * Fri Jun 07 2024 Python Maint - 6.6-15 From 25cf414e1bbce40811b5ae31f0891de3808b3b28 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 12:03:44 +0100 Subject: [PATCH 63/88] OCaml 5.2.0 ppc64le fix --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 7d1f3bb..e6efaf7 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 16%{?dist} +Release: 17%{?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 @@ -687,6 +687,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Jun 19 2024 Richard W.M. Jones - 6.6-17 +- OCaml 5.2.0 ppc64le fix + * Tue Jun 18 2024 Paolo Bonzini - 6.6-16 - Remove unnecessary dependency from brlapi and brltty-docs to brltty From 12003bb333262583c2a8e8f0421b53771fbaa552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 4 Jul 2024 15:39:13 +0200 Subject: [PATCH 64/88] Dropped ucs-miscfixed-fonts requirement, xorg-x11-fonts-misc is enough --- brltty.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/brltty.spec b/brltty.spec index e6efaf7..3bbd80d 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 17%{?dist} +Release: 18%{?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 @@ -128,7 +128,7 @@ This package provides the documentation for BRLTTY. Summary: XWindow driver for BRLTTY BuildRequires: libSM-devel libICE-devel libX11-devel libXaw-devel libXext-devel libXt-devel libXtst-devel Requires: %{name}%{?_isa} = %{pkg_version}-%{release} -Requires: xorg-x11-fonts-misc, ucs-miscfixed-fonts +Requires: xorg-x11-fonts-misc %description xw This package provides the XWindow driver for BRLTTY. @@ -687,6 +687,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Thu Jul 4 2024 Jaroslav Å karvada - 6.6-18 +- Dropped ucs-miscfixed-fonts requirement, xorg-x11-fonts-misc is enough + * Wed Jun 19 2024 Richard W.M. Jones - 6.6-17 - OCaml 5.2.0 ppc64le fix From 77ccd4e483e07f8711324afc1a3b7f1093b7e031 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:37:10 +0000 Subject: [PATCH 65/88] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- brltty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/brltty.spec b/brltty.spec index 3bbd80d..38d5289 100644 --- a/brltty.spec +++ b/brltty.spec @@ -47,7 +47,7 @@ Name: brltty Version: 6.6 -Release: 18%{?dist} +Release: 19%{?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 @@ -687,6 +687,9 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 6.6-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jul 4 2024 Jaroslav Å karvada - 6.6-18 - Dropped ucs-miscfixed-fonts requirement, xorg-x11-fonts-misc is enough From d38d4c43521ffdf921f3696e6ce10a2cac048543 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 5 Aug 2024 17:58:31 -0400 Subject: [PATCH 66/88] Use bcond consistently This fixes the mix of syntaxes currently used to control various features. Also, disable java and ocaml bindings in RHEL, as nothing requires them. --- brltty.spec | 68 ++++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 37 deletions(-) diff --git a/brltty.spec b/brltty.spec index 38d5289..236192b 100644 --- a/brltty.spec +++ b/brltty.spec @@ -4,40 +4,30 @@ # minimal means brltty-minimal subpackage with minimal deps for # braille support in Anaconda installer # https://bugzilla.redhat.com/show_bug.cgi?id=1584679 -%bcond_without minimal +%bcond minimal 1 -%if 0%{?rhel} && 0%{?rhel} <= 7 -# disable python3 by default -%bcond_with python3 -%else -%bcond_without python3 -%endif +# enable python3 by default +%bcond python3 1 -%if 0%{?rhel} > 7 || 0%{?fedora} > 28 # disable python2 by default -%bcond_with python2 -%else -%bcond_without python2 -%endif +%bcond python2 0 %{!?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: -%define with_speech_dispatcher 0%{?fedora} +%bcond speech_dispatcher %{defined fedora} # with espeak support iff on Fedora: -%define with_espeak 0%{?fedora} +%bcond espeak %{defined fedora} # OCaml packages not built on i686 since OCaml 5 / Fedora 39. %ifnarch %{ix86} -%global with_ocaml 1 +%bcond ocaml %{defined fedora} %endif %ifarch %{java_arches} -%global JAVA 1 -%else -%global JAVA 0 +%bcond java %{defined fedora} %endif # Filter private libraries @@ -47,7 +37,7 @@ Name: brltty Version: 6.6 -Release: 19%{?dist} +Release: 20%{?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 @@ -74,7 +64,7 @@ BuildRequires: lua-devel BuildRequires: gettext BuildRequires: at-spi2-core-devel BuildRequires: alsa-lib-devel -%if %{with_espeak} +%if %{with espeak} BuildRequires: espeak-devel %endif BuildRequires: espeak-ng-devel @@ -106,7 +96,7 @@ access to the Linux/Unix console (when in text mode) for a blind person using a refreshable braille display. It drives the braille display and provides complete screen review functionality. -%if %{with_speech_dispatcher} +%if %{with speech_dispatcher} BRLTTY can also work with speech synthesizers; if you want to use it with Speech Dispatcher, please install also package %{name}-speech-dispatcher. @@ -138,7 +128,7 @@ Requires: %{name}%{?_isa} = %{pkg_version}-%{release} %description at-spi2 This package provides the AtSpi2 driver for BRLTTY. -%if %{with_espeak} +%if %{with espeak} %package espeak Summary: eSpeak driver for BRLTTY Requires: %{name}%{?_isa} = %{pkg_version}-%{release} @@ -149,7 +139,7 @@ This package provides the eSpeak driver for BRLTTY. %package espeak-ng Summary: eSpeak-NG driver for BRLTTY Requires: %{name}%{?_isa} = %{pkg_version}-%{release} -%if ! %{with_espeak} +%if %{without espeak} Obsoletes: brltty-espeak <= 5.6-5 %endif %description espeak-ng @@ -221,7 +211,7 @@ Summary: Python 3 binding for BrlAPI This package provides the Python 3 binding for BrlAPI. %endif -%if %{JAVA} +%if %{with java} %package -n brlapi-java Version: %{api_version} Requires: brlapi%{?_isa} = %{api_version}-%{release} @@ -232,7 +222,7 @@ Summary: Java binding for BrlAPI This package provides the Java binding for BrlAPI. %endif -%if 0%{?with_ocaml} +%if %{with ocaml} %package -n ocaml-brlapi Version: %{api_version} Requires: brlapi%{?_isa} = %{api_version}-%{release} @@ -292,7 +282,7 @@ cp -a python2 minimal # If MAKEFLAGS=-jN is set it would break local builds. unset MAKEFLAGS -%if %{JAVA} +%if %{with java} # Add the openjdk include directories to CPPFLAGS for i in -I/usr/lib/jvm/java/include{,/linux}; do java_inc="$java_inc $i" @@ -309,13 +299,13 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing $LDFLAGS" configure_opts=" \ --disable-stripping \ --without-curses \ -%if %{with_speech_dispatcher} +%if %{with speech_dispatcher} --with-speechd=%{_prefix} \ %endif -%if ! %{with_espeak} +%if %{without espeak} --without-espeak \ %endif -%if %{JAVA} +%if %{with java} --with-install-root=%{buildroot} \ JAVA_JAR_DIR=%{_jnidir} \ JAVA_JNI_DIR=%{_libdir}/brltty \ @@ -420,7 +410,7 @@ for python in $PYTHONS done %install -%if 0%{?with_ocaml} +%if %{with ocaml} mkdir -p %{buildroot}%{_libdir}/ocaml/stublibs %endif @@ -541,7 +531,7 @@ rmdir doc/Initramfs/Dracut doc/Initramfs # Install group creation file install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysusersdir}/brltty.conf -%if %{!JAVA} +%if %{without java} find . -type d -name 'Java' | xargs rm -rf find %{buildroot}%{_datadir} -type d -name 'Java' | xargs rm -rf %endif @@ -578,14 +568,14 @@ fi %{_bindir}/brltty-* %exclude %{_bindir}/brltty-minimal %{_libdir}/brltty/ -%if %{!JAVA} +%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 %exclude %{_libdir}/brltty/libbrlapi_java.so -%if %{with_speech_dispatcher} +%if %{with speech_dispatcher} %exclude %{_libdir}/brltty/libbrlttyssd.so %endif %endif @@ -604,7 +594,7 @@ fi %license LICENSE-LGPL %endif -%if %{with_speech_dispatcher} +%if %{with speech_dispatcher} %files speech-dispatcher %doc Drivers/Speech/SpeechDispatcher/README %{_libdir}/brltty/libbrlttyssd.so @@ -622,7 +612,7 @@ fi %files at-spi2 %{_libdir}/brltty/libbrlttyxa2.so -%if %{with_espeak} +%if %{with espeak} %files espeak %{_libdir}/brltty/libbrlttyses.so %endif @@ -668,13 +658,13 @@ fi %{python3_sitearch}/Brlapi-%{api_version}-*.egg-info %endif -%if %{JAVA} +%if %{with java} %files -n brlapi-java %{_libdir}/brltty/libbrlapi_java.so %{_jnidir}/brlapi.jar %endif -%if 0%{?with_ocaml} +%if %{with ocaml} %files -n ocaml-brlapi %{_libdir}/ocaml/brlapi/ %{_libdir}/ocaml/stublibs/ @@ -687,6 +677,10 @@ fi %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline %changelog +* Mon Aug 05 2024 Yaakov Selkowitz - 6.6-20 +- Use bcond consistently +- Disable java and ocaml bindings in RHEL + * Wed Jul 17 2024 Fedora Release Engineering - 6.6-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 464a866fca0631c13beb4415ccdf4c5b09ba38b6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 15 Oct 2024 11:49:02 -0500 Subject: [PATCH 67/88] 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 68/88] 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 69/88] 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 70/88] 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 71/88] 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 72/88] 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 73/88] 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 74/88] 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 67993165fe1dff48483d3f7a611f478df73dedda Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 30 Jan 2025 19:52:38 -0500 Subject: [PATCH 75/88] 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 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 76/88] 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 77/88] 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 78/88] 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 79/88] 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 80/88] 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 81/88] 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 82/88] 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 83/88] 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 84/88] 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 85/88] 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 86/88] 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 87/88] 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 88/88] 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