From 5af3e75d48fe623820e1def3bb46b03faa810e6e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 8 Nov 2016 11:13:54 +0000
Subject: [PATCH] =?UTF-8?q?Add=20fix=20for=20OCaml=204.04=20(thanks:=20Jar?=
 =?UTF-8?q?oslav=20=C5=A0karvada).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 brltty-ocaml-4-04-fix.patch | 18 ++++++++++++++++++
 brltty.spec                 |  8 +++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 brltty-ocaml-4-04-fix.patch

diff --git a/brltty-ocaml-4-04-fix.patch b/brltty-ocaml-4-04-fix.patch
new file mode 100644
index 0000000..3f16fed
--- /dev/null
+++ b/brltty-ocaml-4-04-fix.patch
@@ -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);
diff --git a/brltty.spec b/brltty.spec
index a2a8e21..c717688 100644
--- a/brltty.spec
+++ b/brltty.spec
@@ -22,7 +22,7 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
@@ -31,6 +31,8 @@ Source1: brltty.service
 Patch1: brltty-loadLibrary.patch
 # libspeechd.h moved in latest speech-dispatch (NOT sent upstream)
 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
 BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel, systemd
 BuildRequires: gettext, at-spi2-core-devel, espeak-devel
@@ -197,6 +199,7 @@ This package provides the OCaml binding for BrlAPI.
 %setup -q
 %patch1 -p1 -b .loadLibrary
 %patch2 -p1 -b .libspeechd
+%patch3 -p1 -b .ocaml-4-04
 
 # remove packaged binary file
 rm -f Programs/brltty-ktb
@@ -417,6 +420,9 @@ fi
 %endif
 
 %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
 - Rebuild for OCaml 4.04.0.