Florian Weimer 2023-04-15 20:15:36 +02:00
parent 1e9a023b3b
commit db01d66028
2 changed files with 27 additions and 1 deletions

View File

@ -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: <https://github.com/garrigue/labltk/pull/21>
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 <tcl.h>
#include <tk.h>
-main ()
+int
+main (void)
{
puts(TCL_VERSION);
+ return 0;
}

View File

@ -7,7 +7,7 @@
Name: ocaml-labltk Name: ocaml-labltk
Version: 8.06.12 Version: 8.06.12
Release: 3%{?dist} Release: 4%{?dist}
Summary: Tcl/Tk interface for OCaml 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. # Resolve an issue with ./configure and Tcl detection.
Patch2: labltk-8.06.12-use-fpic-configure.patch Patch2: labltk-8.06.12-use-fpic-configure.patch
Patch3: ocaml-labltk-configure-c99.patch
BuildRequires: make BuildRequires: make
BuildRequires: ocaml BuildRequires: ocaml
@ -50,6 +51,7 @@ This package contains the development files.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
# Remove version control files which might get copied into documentation. # Remove version control files which might get copied into documentation.
find -name .gitignore -delete find -name .gitignore -delete
@ -121,6 +123,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
%changelog %changelog
* Sat Apr 15 2023 Florian Weimer <fweimer@redhat.com> - 8.06.12-4
- Port configure stage to C99
* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 8.06.12-3 * Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 8.06.12-3
- Rebuild OCaml packages for F38 - Rebuild OCaml packages for F38