Compare commits

...
Sign in to create a new pull request.

3 commits

Author SHA1 Message Date
Jerry James
9d4fef37f2 Fix a changelog entry 2026-01-13 17:00:39 -07:00
Richard W.M. Jones
ae93d1cd1a Add downstream patch to fix build for OCaml 5.4 2025-10-15 09:27:18 +01:00
Richard W.M. Jones
638fbe8df7 OCaml 5.4.0 rebuild 2025-10-14 09:34:32 +01:00
2 changed files with 37 additions and 2 deletions

View file

@ -0,0 +1,27 @@
From 5d521981e39dcaeada6bbe7b15c5432d6de5d33c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 15 Oct 2025 09:24:18 +0100
Subject: [PATCH] xgettext: Fix type for OCaml 5.4
Fixes: https://github.com/gildor478/ocaml-gettext/issues/40
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
---
src/bin/ocaml-xgettext/xgettext.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/ocaml-xgettext/xgettext.ml b/src/bin/ocaml-xgettext/xgettext.ml
index 8f54efc..aa12aed 100644
--- a/src/bin/ocaml-xgettext/xgettext.ml
+++ b/src/bin/ocaml-xgettext/xgettext.ml
@@ -112,7 +112,7 @@ let rec is_like lid = function
| [] -> false
| func :: functions -> (
match lid with
- | (Lident f | Ldot (_, f)) when f = func -> true
+ | (Lident f | Ldot (_, {txt = f; _})) when f = func -> true
| _ -> is_like lid functions )
let visit_expr (iterator : Ast_iterator.iterator) expr =
--
2.50.1

View file

@ -12,7 +12,7 @@ ExcludeArch: %{ix86}
Name: ocaml-gettext
Version: 0.5.0
Release: 6%{?dist}
Release: 7%{?dist}
Summary: OCaml library for i18n
License: LGPL-2.1-or-later with OCaml-LGPL-linking-exception
@ -26,6 +26,11 @@ Source0: %{url}/archive/v%{version}.tar.gz
# https://github.com/gildor478/ocaml-gettext/pull/37
Patch: https://github.com/gildor478/ocaml-gettext/pull/37.patch
# Fix for OCaml >= 5.4
# https://github.com/gildor478/ocaml-gettext/issues/40
# https://github.com/gildor478/ocaml-gettext/pull/41
Patch: 0001-xgettext-Fix-type-for-OCaml-5.4.patch
BuildRequires: ocaml >= 4.03.0
BuildRequires: ocaml-fileutils-devel >= 0.6.6-1
BuildRequires: ocaml-dune >= 1.11.0
@ -158,13 +163,16 @@ cat .ofiles-gettext-stub-devel >> .ofiles-gettext-devel
%changelog
* Tue Oct 14 2025 Richard W.M. Jones <rjones@redhat.com> - 0.5.0-7
- OCaml 5.4.0 rebuild
* Fri Aug 22 2025 Jerry James <loganjerry@gmail.com> - 0.5.0-6
- Rebuild for ocaml-dune 3.20.0
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sat Jul 12 2025 Jerry James <loganjerry@gmail.com> - 0.5.0-4
* Sat Jul 12 2025 Jerry James <loganjerry@gmail.com> - 0.5.0-4
- Rebuild to fix OCaml dependencies
* Thu Apr 03 2025 Richard W.M. Jones <rjones@redhat.com> - 0.5.0-3