Compare commits
22 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a577144a3b | ||
|
|
3d29fd3f05 | ||
|
|
e41e3dbd59 | ||
|
|
a80e10a13a | ||
|
|
e72f47fa96 | ||
|
|
b80d83d069 | ||
|
|
232d14db41 | ||
|
|
c1bf7a082d | ||
|
|
39d0ed7491 | ||
|
|
5ad6d5ca5d | ||
|
|
13320e9f86 | ||
|
|
2fa6404ec1 | ||
|
|
bc6bec3c9f | ||
|
|
67993165fe | ||
|
|
fc0224a2fc | ||
|
|
4acadd2bd9 | ||
|
|
f4ebcbda2a | ||
|
|
e0eb2b4517 | ||
|
|
1e8ec0be87 | ||
|
|
3c0d1c7cd9 | ||
|
|
f51e81f5ca | ||
|
|
464a866fca |
10 changed files with 84 additions and 71 deletions
1
.fmf/version
Normal file
1
.fmf/version
Normal file
|
|
@ -0,0 +1 @@
|
|||
1
|
||||
|
|
@ -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 <libspeechd.h>
|
||||
+#include <speech-dispatcher/libspeechd.h>
|
||||
|
||||
static SPDConnection *connectionHandle = NULL;
|
||||
static const char *moduleName;
|
||||
|
|
@ -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."""
|
||||
11
brltty-6.8-libspeechd.patch
Normal file
11
brltty-6.8-libspeechd.patch
Normal file
|
|
@ -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 <libspeechd.h>
|
||||
+#include <speech-dispatcher/libspeechd.h>
|
||||
|
||||
static SPDConnection *connectionHandle = NULL;
|
||||
static unsigned int autospawn;
|
||||
80
brltty.spec
80
brltty.spec
|
|
@ -1,5 +1,5 @@
|
|||
%define pkg_version 6.6
|
||||
%define api_version 0.8.5
|
||||
%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.6
|
||||
Release: 22%{?dist}
|
||||
Version: 6.8
|
||||
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
|
||||
|
|
@ -47,11 +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/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
|
||||
Patch2: brltty-6.8-libspeechd.patch
|
||||
Summary: Braille display driver for Linux/Unix
|
||||
BuildRequires: byacc
|
||||
BuildRequires: glibc-kernheaders
|
||||
|
|
@ -59,7 +55,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
|
||||
|
|
@ -74,6 +69,7 @@ BuildRequires: polkit-devel
|
|||
BuildRequires: libicu-devel
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: linuxdoc-tools
|
||||
BuildRequires: ncurses-devel
|
||||
%if %{with python2}
|
||||
BuildRequires: python2-docutils
|
||||
BuildRequires: python2-setuptools
|
||||
|
|
@ -148,7 +144,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
|
||||
|
|
@ -257,9 +253,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 .cython3
|
||||
%autopatch -p1
|
||||
|
||||
# remove packaged binary file
|
||||
rm -f Programs/brltty-ktb
|
||||
|
|
@ -277,7 +271,6 @@ cp -a python2 python3
|
|||
cp -a python2 minimal
|
||||
%endif
|
||||
|
||||
|
||||
%build
|
||||
# If MAKEFLAGS=-jN is set it would break local builds.
|
||||
unset MAKEFLAGS
|
||||
|
|
@ -545,8 +538,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
|
||||
|
|
@ -630,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
|
||||
|
|
@ -683,11 +675,59 @@ fi
|
|||
%config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline
|
||||
|
||||
%changelog
|
||||
* Fri Jan 31 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 6.6-22
|
||||
* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 6.8-6
|
||||
- OCaml 5.4.0 rebuild
|
||||
|
||||
* Wed Oct 08 2025 Dominik Mierzejewski <dominik@greysector.net> - 6.8-5
|
||||
- own _libdir/brltty directory in brlapi
|
||||
|
||||
* Wed Aug 06 2025 František Zatloukal <fzatlouk@redhat.com> - 6.8-4
|
||||
- Rebuilt for icu 77.1
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.8-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Fri Jul 11 2025 Jerry James <loganjerry@gmail.com> - 6.8-2
|
||||
- Rebuild to fix OCaml dependencies
|
||||
|
||||
* Mon Jul 07 2025 Gwyn Ciesla <gwync@protonmail.com> - 6.8-1
|
||||
- 6.8
|
||||
|
||||
* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 6.7-11
|
||||
- Rebuilt for Python 3.14
|
||||
|
||||
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.7-10
|
||||
- Drop call to %sysusers_create_compat
|
||||
|
||||
* Tue Feb 11 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 6.7-9
|
||||
- Built for tcl 9.0
|
||||
Related: rhbz#2337691
|
||||
|
||||
* Mon Feb 3 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 6.7-8
|
||||
- Rebuilt for tcl/tk change
|
||||
Related: rhbz#2337691
|
||||
|
||||
* Fri Jan 31 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 6.7-7
|
||||
- Fix exclusions from main package
|
||||
|
||||
* Wed Jan 29 2025 Jerry James <loganjerry@gmail.com> - 6.6-21
|
||||
- OCaml 5.2.1 rebuild for Fedora 41
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.7-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Tue Jan 14 2025 Gwyn Ciesla <gwync@protonmail.com> - 6.7-5
|
||||
- Update to use tcl8 compat.
|
||||
|
||||
* Fri Jan 10 2025 Jerry James <loganjerry@gmail.com> - 6.7-4
|
||||
- OCaml 5.3.0 rebuild for Fedora 42
|
||||
|
||||
* Tue Dec 10 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 6.7-3
|
||||
- Switched to upstream patch
|
||||
Related: rhbz#2328699
|
||||
|
||||
* Mon Dec 9 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 6.7-2
|
||||
- Resolves: rhbz#2328699
|
||||
|
||||
* Tue Oct 15 2024 Gwyn Ciesla <gwync@protonmail.com> - 6.7-1
|
||||
- 6.7
|
||||
|
||||
* Mon Aug 05 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 6.6-20
|
||||
- Use bcond consistently
|
||||
|
|
|
|||
5
plans.fmf
Normal file
5
plans.fmf
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
summary: Run all smoke tests
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (brltty-6.6.tar.xz) = 852bfd9179570be7b0da8b1279f84bdfedc14a319988d9c2eac5a20a9ce8977f31fdee167e8e96bb411184a1d72f4cdc633944c7b3f55bddae411fc71a9e6898
|
||||
SHA512 (brltty-6.8.tar.xz) = 08540cdf09eaa1caabd8400cb6e589f99f5f2b8aaaf8c031e5165e9b0605858e90dc9dd72f2095347f4860714214ecf184e3675422df880f1bf06bb4cc6f42ee
|
||||
|
|
|
|||
2
tests/main.fmf
Normal file
2
tests/main.fmf
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
summary: Smoke test
|
||||
test: ./run_tests.sh
|
||||
4
tests/run_tests.sh
Normal file
4
tests/run_tests.sh
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/bash
|
||||
pushd sanity-test || exit
|
||||
./runtest.sh
|
||||
popd || exit
|
||||
|
|
@ -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
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue