From 44e467d9798273c172ff24734eaf843045eb8a50 Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Jun 27 2017 08:46:21 +0000 Subject: Fix detection of header for ncurses 6.0-10.20170520. --- diff --git a/ocaml-curses-1.0.3-fix-term-h-detection.patch b/ocaml-curses-1.0.3-fix-term-h-detection.patch new file mode 100644 index 0000000..fa20ba2 --- /dev/null +++ b/ocaml-curses-1.0.3-fix-term-h-detection.patch @@ -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 ], [TERMINAL __dummy], ++ [#include ], [TERMINAL *__dummy], + [TERM_H_STRING="" + AC_DEFINE(CURSES_TERM_H, , [Defined to ncurses term.h file])], + [ + AC_TRY_COMPILE( +- [#include ], [TERMINAL __dummy], ++ [#include ], [TERMINAL *__dummy], + [TERM_H_STRING="" + AC_DEFINE(CURSES_TERM_H, , [Defined to ncurses term.h file])], + [ + AC_TRY_COMPILE( +- [#include ], [TERMINAL __dummy], ++ [#include ], [TERMINAL *__dummy], + [TERM_H_STRING="" + AC_DEFINE(CURSES_TERM_H, , [Defined to ncurses term.h file])], + ) ]) ]) diff --git a/ocaml-curses.spec b/ocaml-curses.spec index 924da0a..8d9836d 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -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 . 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 - 1.0.3-36 +* Tue Jun 27 2017 Richard W.M. Jones - 1.0.3-37 - OCaml 4.04.2 rebuild. +- Fix detection of header for ncurses 6.0-10.20170520. * Fri May 12 2017 Richard W.M. Jones - 1.0.3-35 - OCaml 4.04.1 rebuild.