Compare commits

..

No commits in common. "rawhide" and "f40" have entirely different histories.

7 changed files with 28 additions and 74 deletions

2
.gitignore vendored
View file

@ -8,5 +8,3 @@
/labltk-8.06.11.tar.gz
/labltk-8.06.12.tar.gz
/labltk-8.06.13.tar.gz
/labltk-8.06.14.tar.gz
/labltk-8.06.15.tar.gz

View file

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

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

@ -1,24 +1,16 @@
# This breaks basic usage of the package:
# ocamlfind ocamlopt -package labltk tktest.ml -linkpkg -o tktest
# gcc: fatal error: environment variable RPM_ARCH not defined
%undefine _package_note_flags
# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
ExcludeArch: %{ix86}
%global giturl https://github.com/garrigue/labltk
Name: ocaml-labltk
Version: 8.06.15
Release: 4%{?dist}
Version: 8.06.13
Release: 10%{?dist}
Summary: Tcl/Tk interface for OCaml
License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
URL: https://garrigue.github.io/labltk/
VCS: git:%{giturl}.git
Source0: %{giturl}/archive/%{version}/labltk-%{version}.tar.gz
Source0: https://github.com/garrigue/labltk/archive/%{version}/labltk-%{version}.tar.gz
# This adds debugging (-g) everywhere.
Patch1: labltk-8.06.11-enable-debugging.patch
@ -26,6 +18,9 @@ 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
# Avoid implicit int because it was removed from the C language
Patch3: ocaml-labltk-configure-c99.patch
BuildRequires: make
BuildRequires: ocaml
BuildRequires: ocaml-ocamldoc
@ -134,38 +129,6 @@ sed 's/8\.06\.6/%{version}/' support/META > \
%changelog
* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 8.06.15-4
- OCaml 5.4.0 rebuild
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.15-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jul 11 2025 Jerry James <loganjerry@gmail.com> - 8.06.15-2
- Rebuild to fix OCaml dependencies
* Mon Feb 03 2025 Richard W.M. Jones <rjones@redhat.com> - 8.06.15-1
- New upstream version 8.06.15
- Includes Tcl 9 support (RHBZ#2337740)
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Jan 9 2025 Jerry James <loganjerry@gmail.com> - 8.06.14-2
- OCaml 5.3.0 rebuild for Fedora 42
* Thu Aug 1 2024 Jerry James <loganjerry@gmail.com> - 8.06.14-1
- Version 8.06.14
- Drop upstreamed patch to avoid implicit int in configure
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.13-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 8.06.13-12
- OCaml 5.2.0 ppc64le fix
* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 8.06.13-11
- OCaml 5.2.0 for Fedora 41
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.13-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

View file

@ -1 +1 @@
SHA512 (labltk-8.06.15.tar.gz) = 67feb7f51be2a837050dc0b94a4cd185f05db240cdbb1188d5787465dd2abed98b17244c66893ad18ef912fbbe960b90a3e116a9f283a6277b6a747043780e24
SHA512 (labltk-8.06.13.tar.gz) = bc31f360902b2dac573683d5be148ed1437ab94ba08447bb1f649f1f62ebe94956c3fc98ca6136887528084828402b224e982e9d367d8814708114ade92749c1

View file

@ -1,9 +0,0 @@
#!/bin/bash -
set -e
set -x
# Compile trivial tk program.
echo 'ignore (Tk.opentk ())' > tktest.ml
ocamlfind ocamlopt -package labltk tktest.ml -linkpkg -o tktest
# Unfortunately we can't run this as we won't have an X server available.
#./tktest

View file

@ -1,13 +0,0 @@
- hosts: localhost
roles:
- role: standard-test-basic
tags:
- classic
required_packages:
- ocaml
- ocaml-findlib
- ocaml-labltk-devel
tests:
- simple:
dir: .
run: ./basic-test.sh