Accepting request 1290933 from hardware

- Update to version 6.8:
  + Too many changes; please read ChangeLog
- API version is now 0.8.6. (forwarded request 1290924 from mgorse)

OBS-URL: https://build.opensuse.org/request/show/1290933
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/brltty?expand=0&rev=70

brltty-6.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab11cfc5fbd7ef0ec876ffea7e131e424b2fd004b6158064e1a2e46412825529
-size 3684592

brltty-reproducible-jar-mtime.patch

@@ -0,0 +1,12 @@
+--- brltty-6.6/Bindings/Java/Makefile.in	2024-09-26 17:16:12.903477065 +0200
++++ brltty-6.6/Bindings/Java/Makefile.in	2024-09-26 17:17:37.427440398 +0200
+@@ -52,7 +52,8 @@
+ jar: $(JAVA_JAR_FILE)
+ 
+ $(JAVA_JAR_FILE): classes.made
+-	$(JAR) cfm $@ $(SRC_DIR)/manifest -C classes .
++	$(JAR) --date="$$(date -u -d @$${SOURCE_DATE_EPOCH:-$$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" \
++        --create --file=$@ --manifest=$(SRC_DIR)/manifest -C classes .
+ 
+ JAVAC_LINT_OPTIONS = cast,deprecation,fallthrough,finally,overrides,rawtypes,unchecked
+ 

brltty.changes

@@ -1,3 +1,58 @@
+-------------------------------------------------------------------
+Sun Jul  6 23:07:54 UTC 2025 - Michael Gorse <mgorse@suse.com>
+
+- Update to version 6.8:
+  + Too many changes; please read ChangeLog
+- API version is now 0.8.6.
+
+-------------------------------------------------------------------
+Wed May 21 17:21:57 UTC 2025 - Michael Gorse <mgorse@suse.com>
+
+- Drop libbraille plugin. Libbraille is unmaintained and unlikely
+  to be used nowadays, and it links against an old version of
+  libusb (jsc#PED-10531).
+
+-------------------------------------------------------------------
+Mon May  5 17:11:57 UTC 2025 - Michael Gorse <mgorse@suse.com>
+
+- Set umask to generate brlapi.key with correct permissions; avoid
+  having the file temporarily world-readable (bsc#1235438).
+
+-------------------------------------------------------------------
+Thu Oct 17 18:22:43 UTC 2024 - Michael Gorse <mgorse@suse.com>
+
+- Update to version 6.7:
+  + Too many changes; please read ChangeLog
+- Drop e6707d5e.patch: fixed upstream.
+- API version is now 0.8.6.
+
+-------------------------------------------------------------------
+Thu Sep 26 15:29:27 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * brltty-reproducible-jar-mtime.patch
+    + Use SOURCE_DATE_EPOCH for reproducible jar mtime
+    + Applied if building with Java >= 17
+
+-------------------------------------------------------------------
+Wed Sep 25 10:26:16 UTC 2024 - Reinhard Max <max@suse.com>
+
+- For the correct generation of pkgIndex.tcl it is required that
+  libbrlapi_tcl can runtime-link to libbrlapi at install time.
+  Set LD_LIBRARY_PATH to allow that.
+
+-------------------------------------------------------------------
+Tue Sep 24 13:27:31 UTC 2024 - Reinhard Max <max@suse.com>
+
+- Work around a syntactic change to TCL_PACKAGE_PATH to fix build
+  with Tcl 8.6.15.
+
+-------------------------------------------------------------------
+Mon Jun 10 22:17:14 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- Add %python3_fix_shebang_path to fix binaries dependency on
+  /usr/bin/python3
+
 -------------------------------------------------------------------
 Wed Dec 13 11:10:22 UTC 2023 - Matthias Gerstner <matthias.gerstner@suse.com>
 

brltty.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package brltty
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,12 @@
 
 
 %global _lto_cflags %_lto_cflags -ffat-lto-objects
-%define api_version 0.8.5
+%define api_version 0.8.7
 %define sover 0_8
 %define soname libbrlapi%{sover}
 Name:           brltty
-Version:        6.6
+Version:        6.8
 Release:        0
-# FIXME libbraille driver when libbraille is in factory
 Summary:        Braille display driver for Linux/Unix
 License:        LGPL-2.1-or-later
 Group:          System/Daemons
@@ -33,7 +32,7 @@ Source0:        https://brltty.app/archive/%name-%version.tar.xz
 Source1:        README.SUSE
 Source2:        %name.rpmlintrc
 Patch0:         brltty-udev-dir.patch
-Patch1:         https://github.com/brltty/brltty/commit/e6707d5e.patch
+Patch2:         brltty-reproducible-jar-mtime.patch
 
 Requires(pre):  system-user-brltty = %version-%release
 
@@ -45,12 +44,11 @@ BuildRequires:  gettext
 BuildRequires:  gpm-devel
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  jpackage-utils
-BuildRequires:  libbraille-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  ocaml
 BuildRequires:  ocaml-rpm-macros >= 20231101
 BuildRequires:  pkg-config
-BuildRequires:  python-rpm-macros
+BuildRequires:  python-rpm-macros > 20240101
 BuildRequires:  python3
 BuildRequires:  python3-Cython
 BuildRequires:  python3-devel
@@ -106,20 +104,6 @@ complete screen review functionality.
 
 This package contains the BrlAPI braille driver.
 
-%package driver-libbraille
-Summary:        Libbraille driver for BRLTTY
-Group:          System/Daemons
-Requires:       %name = %version
-Supplements:    (brltty and libbraille)
-
-%description driver-libbraille
-BRLTTY is a background process (daemon) which provides 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.
-
-This package contains the libbraille braille driver.
-
 %package driver-espeak
 Summary:        ESpeak driver for BRLTTY
 Group:          System/Daemons
@@ -319,7 +303,12 @@ System user for the Braille display driver for Linux/Unix
 %lang_package
 
 %prep
-%autosetup -p1
+%setup
+%patch -P 0 -p1
+# The "--date" option was added into jar in OpenJDK 17
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0}
+%patch -P 2 -p1
+%endif
 
 %build
 %sysusers_generate_pre Autostart/Systemd/sysusers system-user-brltty %name.conf
@@ -338,11 +327,13 @@ export PYTHON=/usr/bin/python3
 %configure CPPFLAGS="$java_inc" \
         --with-tables-directory=%_datadir/%name \
         --disable-stripping
-make
+make TCL_DIR=%tcl_archdir
 
 %install
+# For the correct generation of pkgIndex.tcl
+export LD_LIBRARY_PATH=$PWD/Programs
 sed -i "s=/usr/libexec/brltty-systemd-wrapper=%_libexecdir/brltty-systemd-wrapper=" Autostart/Systemd/brltty@.service
-%make_install install-systemd install-udev install-polkit INSTALL_ROOT="%buildroot"
+%make_install install-systemd install-udev install-polkit INSTALL_ROOT="%buildroot" TCL_DIR=%tcl_archdir
 for exe in %buildroot%_bindir/*
 do
 	sed -i~ '1{s@%_bindir/env[[:blank:]]\+@%_bindir/@}' "${exe}"
@@ -380,6 +371,8 @@ rm -f %buildroot%_datadir/gdm/greeter/autostart/xbrlapi.desktop
 install -Dm0644 Autostart/AppStream/org.a11y.brltty.metainfo.xml \
                 %buildroot%_datadir/metainfo/org.a11y.brltty.metainfo.xml
 
+%python3_fix_shebang_path %{buildroot}%{_datadir}/brltty/Contraction/latex-access.ctb
+
 %fdupes -s %buildroot%_mandir
 %fdupes -s %buildroot
 
@@ -387,9 +380,8 @@ install -Dm0644 Autostart/AppStream/org.a11y.brltty.metainfo.xml \
 
 %post -n %{soname}
 if [ ! -e %_sysconfdir/brlapi.key ]; then
- mcookie > %_sysconfdir/brlapi.key
+ umask 027 && mcookie > %_sysconfdir/brlapi.key
  chgrp brlapi %_sysconfdir/brlapi.key
- chmod 0640 %_sysconfdir/brlapi.key
 fi
 /sbin/ldconfig
 
@@ -491,9 +483,6 @@ rm -f %_localstatedir/adm/update-messages/%name-%version-%release-something
 %doc Drivers/Braille/BrlAPI/README
 %_libdir/brltty/libbrlttybba.so
 
-%files driver-libbraille
-%_libdir/brltty/libbrlttyblb.so
-
 %files driver-espeak
 %doc Drivers/Speech/eSpeak/README
 %_libdir/brltty/libbrlttyses.so

e6707d5e.patch

@@ -1,44 +0,0 @@
-From e6707d5e094dc36db4319ce4d052a6ad568a5d26 Mon Sep 17 00:00:00 2001
-From: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Tue, 15 Aug 2023 16:29:13 +0200
-Subject: [PATCH] brlapi: Fix python crash on connection error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From Lukáš Tyrychtr:
-“
-Cython 3.0 started using the new Python object finalization APIs from PEP 442
-”
-
-This means that __del__ gets called even when raising an exception from
-__init__, while it was not before. To cope with both behaviors, we can
-set self.h to NULL to determine whether it still exists or not.
-
-Thanks Lukáš Tyrychtr for the investigation and patch draft!
----
- Bindings/Python/brlapi.pyx | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Bindings/Python/brlapi.pyx b/Bindings/Python/brlapi.pyx
-index 0136895eaf..af62cc9be0 100644
---- a/Bindings/Python/brlapi.pyx
-+++ b/Bindings/Python/brlapi.pyx
-@@ -453,6 +453,7 @@ cdef class Connection:
- 		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 @@ cdef class Connection:
- 		"""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."""