[packages/libbraille] Rel 6
arekm
arekm at pld-linux.org
Tue Mar 10 16:42:33 CET 2026
commit 100d559028520b64b172b7fd03486339662649e2
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Mar 10 16:42:27 2026 +0100
Rel 6
baum-io-types.patch | 38 ++++++++++++++++++++++++++++++++++++++
doc-latex2html-tmpdir.patch | 6 ++++++
libbraille.spec | 23 +++++++++++++++--------
python-include-detect.patch | 13 +++++++++++++
4 files changed, 72 insertions(+), 8 deletions(-)
---
diff --git a/libbraille.spec b/libbraille.spec
index 31da2b8..cefa252 100644
--- a/libbraille.spec
+++ b/libbraille.spec
@@ -8,13 +8,16 @@ Summary: Library to easily access Braille displays and terminals
Summary(pl.UTF-8): Biblioteka łatwego dostępu do wyświetlaczy i terminali Braille'a
Name: libbraille
Version: 0.19.0
-Release: 5
+Release: 6
License: LGPL v2.1
Group: Libraries
Source0: http://downloads.sourceforge.net/libbraille/%{name}-%{version}.tar.gz
# Source0-md5: 80198ae147d726f6b743f5a984fa7bd1
Patch0: %{name}-link.patch
Patch1: %{name}-java.patch
+Patch2: baum-io-types.patch
+Patch3: doc-latex2html-tmpdir.patch
+Patch4: python-include-detect.patch
URL: http://libbraille.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -109,6 +112,9 @@ Wiązania Pythona do biblioteki libbraille.
%setup -q
%patch -P0 -p1
%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
# shared library should use shared libltdl
%{__sed} -i -e 's/^AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' configure.ac
@@ -121,9 +127,10 @@ Wiązania Pythona do biblioteki libbraille.
%{__automake}
%configure \
--disable-ltdl-install \
- %{?with_apidocs:--enable-doc} \
- %{?with_java:--enable-java --with-javainc=%{_jvmdir}/java/include --with-javaincnative=%{_jvmdir}/java/include} \
- %{?with_python:--enable-python}
+ %{__enable_disable apidocs doc} \
+ %{__enable_disable java} \
+ %{?with_java:--with-javainc=%{_jvmdir}/java/include --with-javaincnative=%{_jvmdir}/java/include} \
+ %{__enable_disable python}
# parallel build fails on docs
%{__make} -j1
@@ -143,8 +150,7 @@ install -D java/jbraille.jar $RPM_BUILD_ROOT%{_javadir}/jbraille.jar
%endif
%if %{with python}
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/_braille.{a,la}
-%py_postclean
+%{__rm} -f $RPM_BUILD_ROOT%{py3_sitedir}/_braille.{a,la}
%endif
%clean
@@ -218,6 +224,7 @@ rm -rf $RPM_BUILD_ROOT
%if %{with python}
%files -n python-libbraille
%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/_braille.so
-%{py_sitescriptdir}/braille.py[co]
+%attr(755,root,root) %{py3_sitedir}/_braille.so
+%{py3_sitescriptdir}/braille.py
+%{py3_sitescriptdir}/__pycache__/braille.*.py[co]
%endif
diff --git a/baum-io-types.patch b/baum-io-types.patch
new file mode 100644
index 0000000..402c170
--- /dev/null
+++ b/baum-io-types.patch
@@ -0,0 +1,38 @@
+diff --git a/backend/baum/brl.c b/backend/baum/brl.c
+index d129ec5..f1ca40b 100644
+--- a/backend/baum/brl.c
++++ b/backend/baum/brl.c
+@@ -28,9 +28,9 @@
+
+ static char (*drvinit_func) (brli_term *term, const char *pathname);
+ static char (*drvclose_func) (brli_term *term);
+-static int (*write_func) (brli_term *term, char *bytes, int size);
+-static int (*read_byte_func) (brli_term *term, char *byte, int timeout);
+-static int (*read_bytes_func) (brli_term *term, char *bytes, int size, int timeout);
++static int (*write_func) (brli_term *term, const unsigned char *bytes, int size);
++static int (*read_byte_func) (brli_term *term, unsigned char *byte, int timeout);
++static int (*read_bytes_func) (brli_term *term, unsigned char *bytes, int size, int timeout);
+
+ #define ESCAPE 0x1B
+ #define TSP_DATA_SIZE 5
+@@ -303,9 +303,9 @@ usb_read_bytes (brli_term *term, unsigned char *data, int length, int timeout)
+ }
+
+ static int
+-usb_write (brli_term *term, char *bytes, int size)
++usb_write (brli_term *term, const unsigned char *bytes, int size)
+ {
+- return usb_bulk_write (term->usbhandle, 0x2, bytes, size, 0);
++ return usb_bulk_write (term->usbhandle, 0x2, (char *)bytes, size, 0);
+ }
+
+ #endif /* HAVE_USB_H */
+@@ -384,7 +384,7 @@ serial_read_bytes (brli_term *term, unsigned char *data, int length, int timeou
+ }
+
+ static int
+-serial_write (brli_term *term, char *bytes, int size)
++serial_write (brli_term *term, const unsigned char *bytes, int size)
+ {
+ return brli_swrite(term, bytes, size);
+ }
diff --git a/doc-latex2html-tmpdir.patch b/doc-latex2html-tmpdir.patch
new file mode 100644
index 0000000..50996ad
--- /dev/null
+++ b/doc-latex2html-tmpdir.patch
@@ -0,0 +1,6 @@
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -17 +17 @@ tutorial.html: tutorial.tex
+- latex2html -no_subdir -no_navigation -split 0 -split +0 -link 0 -toc_depth 4 -info 0 -up_url ../doc.php -ascii_mode -up_title "Libbraille documentation" -address "Copyright 2004 Sébastien Sablé <sable at users.sourceforge.net> - `date +%Y-%m-%d`<br><a href=\"http://sourceforge.net\"><img id="srcforge" src=\"http://sourceforge.net/sflogo.php?group_id=17127&type=1\" style=\"width: 88px; height: 31px;\" alt=\"SourceForge Logo\"></a>" tutorial.tex
++ latex2html -tmp /tmp -no_subdir -no_navigation -split 0 -split +0 -link 0 -toc_depth 4 -info 0 -up_url ../doc.php -ascii_mode -up_title "Libbraille documentation" -address "Copyright 2004 Sébastien Sablé <sable at users.sourceforge.net> - `date +%Y-%m-%d`<br><a href=\"http://sourceforge.net\"><img id="srcforge" src=\"http://sourceforge.net/sflogo.php?group_id=17127&type=1\" style=\"width: 88px; height: 31px;\" alt=\"SourceForge Logo\"></a>" tutorial.tex
diff --git a/python-include-detect.patch b/python-include-detect.patch
new file mode 100644
index 0000000..19942b7
--- /dev/null
+++ b/python-include-detect.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 0990c17..5235f31 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -167,7 +167,7 @@ if test x$enable_python = xyes; then
+ [Select path for python headers]),
+ pythoninc=${withval},
+ AC_MSG_CHECKING(for Python include dir)
+- pythoninc=`$PYTHON -c "import $dmod; print $dmod.get_python_inc()"`
++ pythoninc=`$PYTHON -c "import $dmod; import sys; sys.stdout.write($dmod.get_python_inc())"`
+ AC_MSG_RESULT($pythoninc)
+ )
+ PY_CFLAGS="-I$pythoninc"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libbraille.git/commitdiff/100d559028520b64b172b7fd03486339662649e2
More information about the pld-cvs-commit
mailing list