diff --git a/ocaml-labltk-configure-c99.patch b/ocaml-labltk-configure-c99.patch new file mode 100644 index 0000000..05f60b2 --- /dev/null +++ b/ocaml-labltk-configure-c99.patch @@ -0,0 +1,21 @@ +Avoid implicit int because it was removed from the language. Future +compilers will not support implicit ints by default, leading to +compilation failures. + +Submitted upstream: + +diff --git a/config/auto-aux/tclversion.c b/config/auto-aux/tclversion.c +index 4608ee9f91a51e88..4c703c58284f3aa3 100644 +--- a/config/auto-aux/tclversion.c ++++ b/config/auto-aux/tclversion.c +@@ -18,7 +18,9 @@ + #include + #include + +-main () ++int ++main (void) + { + puts(TCL_VERSION); ++ return 0; + } diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec index eeec469..476a7e3 100644 --- a/ocaml-labltk.spec +++ b/ocaml-labltk.spec @@ -7,7 +7,7 @@ Name: ocaml-labltk Version: 8.06.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tcl/Tk interface for OCaml @@ -21,6 +21,7 @@ Patch1: labltk-8.06.11-enable-debugging.patch # Resolve an issue with ./configure and Tcl detection. Patch2: labltk-8.06.12-use-fpic-configure.patch +Patch3: ocaml-labltk-configure-c99.patch BuildRequires: make BuildRequires: ocaml @@ -50,6 +51,7 @@ This package contains the development files. %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Remove version control files which might get copied into documentation. find -name .gitignore -delete @@ -121,6 +123,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk %changelog +* Sat Apr 15 2023 Florian Weimer - 8.06.12-4 +- Port configure stage to C99 + * Tue Jan 24 2023 Richard W.M. Jones - 8.06.12-3 - Rebuild OCaml packages for F38