rpms/brltty
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add fix for OCaml 4.04 (thanks: Jaroslav Škarvada).

Browse Source
This commit is contained in:
Richard W.M. Jones 2016-11-08 11:13:54 +00:00
parent 152e55c0bf
commit 5af3e75d48
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
brltty-ocaml-4-04-fix.patch Normal file
View File

@ -0,0 +1,18 @@
--- a/Bindings/OCaml/brlapi_stubs.c
+++ a/Bindings/OCaml/brlapi_stubs.c
@@ -144,6 +144,7 @@ CAMLprim value brlapiml_errorCode_of_error(value camlError)
/* Raises the Brlapi_error exception */
static void raise_brlapi_error(void)
{
+ CAMLparam0();
static value *exception = NULL;
CAMLlocal1(res);
if (exception==NULL) exception = caml_named_value("Brlapi_error");
@@ -157,6 +158,7 @@ static void raise_brlapi_error(void)
/* Raises Brlapi_exception */
static void BRLAPI_STDCALL raise_brlapi_exception(int err, brlapi_packetType_t type, const void *packet, size_t size)
{
+ CAMLparam0();
static value *exception = NULL;
int i;
CAMLlocal2(str, res);

8
brltty.spec
View File

@ -22,7 +22,7 @@
Name: brltty Name: brltty
Version: %{pkg_version} Version: %{pkg_version}
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://mielke.cc/brltty/ URL: http://mielke.cc/brltty/
@ -31,6 +31,8 @@ Source1: brltty.service
Patch1: brltty-loadLibrary.patch Patch1: brltty-loadLibrary.patch
# libspeechd.h moved in latest speech-dispatch (NOT sent upstream) # libspeechd.h moved in latest speech-dispatch (NOT sent upstream)
Patch2: brltty-5.0-libspeechd.patch Patch2: brltty-5.0-libspeechd.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1392147
Patch3: brltty-ocaml-4-04-fix.patch
Summary: Braille display driver for Linux/Unix Summary: Braille display driver for Linux/Unix
BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel, systemd BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel, systemd
BuildRequires: gettext, at-spi2-core-devel, espeak-devel BuildRequires: gettext, at-spi2-core-devel, espeak-devel
@ -197,6 +199,7 @@ This package provides the OCaml binding for BrlAPI.
%setup -q %setup -q
%patch1 -p1 -b .loadLibrary %patch1 -p1 -b .loadLibrary
%patch2 -p1 -b .libspeechd %patch2 -p1 -b .libspeechd
%patch3 -p1 -b .ocaml-4-04
# remove packaged binary file # remove packaged binary file
rm -f Programs/brltty-ktb rm -f Programs/brltty-ktb
@ -417,6 +420,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Nov 08 2016 Richard W.M. Jones <rjones@redhat.com> - 5.4-4
- Add fix for OCaml 4.04 (thanks: Jaroslav Škarvada).
* Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 5.4-3 * Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 5.4-3
- Rebuild for OCaml 4.04.0. - Rebuild for OCaml 4.04.0.