Fix detection of <term.h> header for ncurses 6.0-10.20170520.

This commit is contained in:
Richard W.M. Jones 2017-06-27 09:45:49 +01:00
parent 5e4bdbacff
commit 44e467d979
2 changed files with 31 additions and 2 deletions

View File

@ -0,0 +1,23 @@
--- ocaml-curses-1.0.3.old/configure.ac 2008-11-17 16:37:40.000000000 +0000
+++ ocaml-curses-1.0.3/configure.ac 2017-06-27 09:43:42.703525886 +0100
@@ -91,17 +91,17 @@
AC_MSG_CHECKING(for term.h)
AC_TRY_COMPILE(
- [#include <term.h>], [TERMINAL __dummy],
+ [#include <term.h>], [TERMINAL *__dummy],
[TERM_H_STRING="<term.h>"
AC_DEFINE(CURSES_TERM_H, <term.h>, [Defined to ncurses term.h file])],
[
AC_TRY_COMPILE(
- [#include <ncurses/term.h>], [TERMINAL __dummy],
+ [#include <ncurses/term.h>], [TERMINAL *__dummy],
[TERM_H_STRING="<ncurses/term.h>"
AC_DEFINE(CURSES_TERM_H, <ncurses/term.h>, [Defined to ncurses term.h file])],
[
AC_TRY_COMPILE(
- [#include <curses/term.h>], [TERMINAL __dummy],
+ [#include <curses/term.h>], [TERMINAL *__dummy],
[TERM_H_STRING="<curses/term.h>"
AC_DEFINE(CURSES_TERM_H, <curses/term.h>, [Defined to ncurses term.h file])],
) ]) ])

View File

@ -2,13 +2,17 @@
Name: ocaml-curses
Version: 1.0.3
Release: 36%{?dist}
Release: 37%{?dist}
Summary: OCaml bindings for ncurses
License: LGPLv2+
URL: http://savannah.nongnu.org/projects/ocaml-tmk/
Source0: http://download.savannah.gnu.org/releases/ocaml-tmk/%{name}-%{version}.tar.gz
# Fix detection of <term.h>. Upstream method relies on using an
# internal ncurses struct.
Patch1: ocaml-curses-1.0.3-fix-term-h-detection.patch
BuildRequires: ocaml >= 4.00.1
BuildRequires: ocaml-findlib-devel >= 1.3.3-3
BuildRequires: ncurses-devel
@ -40,6 +44,7 @@ developing applications that use %{name}.
%prep
%setup -q
%patch1 -p1
autoreconf
@ -87,8 +92,9 @@ ocamlfind install curses META *.cmi *.cma *.a *.so *.mli
%changelog
* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 1.0.3-36
* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 1.0.3-37
- OCaml 4.04.2 rebuild.
- Fix detection of <term.h> header for ncurses 6.0-10.20170520.
* Fri May 12 2017 Richard W.M. Jones <rjones@redhat.com> - 1.0.3-35
- OCaml 4.04.1 rebuild.