Richard W.M. Jones
parent
f897bfaf0f
commit
bbab508ca2
|
|
@ -4,3 +4,4 @@ ocaml-gettext-0.3.3.tar.gz
|
|||
/0.3.7.tar.gz
|
||||
/ocaml-gettext-0.3.8-3aecf8e5350f.tar.gz
|
||||
/v0.4.1.tar.gz
|
||||
/v0.4.2.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,86 +0,0 @@
|
|||
From 4bd5f21dd6b033bf8c0f1f9549255629325b86eb Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Wed, 22 Apr 2020 10:17:03 +0100
|
||||
Subject: [PATCH] xgettext: Ignore extra Loc.t parameter of Pconst_string.
|
||||
|
||||
---
|
||||
src/bin/ocaml-xgettext/xgettext.ml | 22 +++++++++++-----------
|
||||
1 file changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/src/bin/ocaml-xgettext/xgettext.ml b/src/bin/ocaml-xgettext/xgettext.ml
|
||||
index 3b42ac1..92ab016 100644
|
||||
--- a/src/bin/ocaml-xgettext/xgettext.ml
|
||||
+++ b/src/bin/ocaml-xgettext/xgettext.ml
|
||||
@@ -121,7 +121,7 @@ let visit_expr (iterator : Ast_iterator.iterator) expr =
|
||||
| Pexp_apply
|
||||
( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ },
|
||||
( Asttypes.Nolabel,
|
||||
- { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } )
|
||||
+ { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } )
|
||||
:: _ )
|
||||
when is_like lid [ "s_"; "f_" ] ->
|
||||
(* Add a singular / default domain string *)
|
||||
@@ -129,9 +129,9 @@ let visit_expr (iterator : Ast_iterator.iterator) expr =
|
||||
| Pexp_apply
|
||||
( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ },
|
||||
( Asttypes.Nolabel,
|
||||
- { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } )
|
||||
+ { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } )
|
||||
:: ( Asttypes.Nolabel,
|
||||
- { pexp_desc = Pexp_constant (Pconst_string (plural, _)); _ } )
|
||||
+ { pexp_desc = Pexp_constant (Pconst_string (plural, _, _)); _ } )
|
||||
:: _ )
|
||||
when is_like lid [ "sn_"; "fn_" ] ->
|
||||
(* Add a plural / default domain string *)
|
||||
@@ -140,7 +140,7 @@ let visit_expr (iterator : Ast_iterator.iterator) expr =
|
||||
( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ },
|
||||
_
|
||||
:: ( Asttypes.Nolabel,
|
||||
- { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } )
|
||||
+ { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } )
|
||||
:: _ )
|
||||
when is_like lid [ "gettext"; "fgettext" ] ->
|
||||
(* Add a singular / default domain string *)
|
||||
@@ -149,9 +149,9 @@ let visit_expr (iterator : Ast_iterator.iterator) expr =
|
||||
( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ },
|
||||
_
|
||||
:: ( Asttypes.Nolabel,
|
||||
- { pexp_desc = Pexp_constant (Pconst_string (domain, _)); _ } )
|
||||
+ { pexp_desc = Pexp_constant (Pconst_string (domain, _, _)); _ } )
|
||||
:: ( Asttypes.Nolabel,
|
||||
- { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ }
|
||||
+ { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ }
|
||||
)
|
||||
:: _ )
|
||||
when is_like lid [ "dgettext"; "fdgettext"; "dcgettext"; "fdcgettext" ] ->
|
||||
@@ -161,9 +161,9 @@ let visit_expr (iterator : Ast_iterator.iterator) expr =
|
||||
( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ },
|
||||
_
|
||||
:: ( Asttypes.Nolabel,
|
||||
- { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } )
|
||||
+ { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } )
|
||||
:: ( Asttypes.Nolabel,
|
||||
- { pexp_desc = Pexp_constant (Pconst_string (plural, _)); _ } )
|
||||
+ { pexp_desc = Pexp_constant (Pconst_string (plural, _, _)); _ } )
|
||||
:: _ )
|
||||
when is_like lid [ "ngettext"; "fngettext" ] ->
|
||||
(* Add a plural / default domain string *)
|
||||
@@ -172,12 +172,12 @@ let visit_expr (iterator : Ast_iterator.iterator) expr =
|
||||
( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ },
|
||||
_
|
||||
:: ( Asttypes.Nolabel,
|
||||
- { pexp_desc = Pexp_constant (Pconst_string (domain, _)); _ } )
|
||||
+ { pexp_desc = Pexp_constant (Pconst_string (domain, _, _)); _ } )
|
||||
:: ( Asttypes.Nolabel,
|
||||
- { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ }
|
||||
+ { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ }
|
||||
)
|
||||
:: ( Asttypes.Nolabel,
|
||||
- { pexp_desc = Pexp_constant (Pconst_string (plural, _)); _ }
|
||||
+ { pexp_desc = Pexp_constant (Pconst_string (plural, _, _)); _ }
|
||||
)
|
||||
:: _ )
|
||||
when is_like lid [ "dngettext"; "fdngettext"; "dcngettext"; "fdcngettext" ]
|
||||
--
|
||||
2.24.1
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
||||
|
||||
Name: ocaml-gettext
|
||||
Version: 0.4.1
|
||||
Release: 9%{?dist}
|
||||
Version: 0.4.2
|
||||
Release: 1%{?dist}
|
||||
Summary: OCaml library for i18n
|
||||
|
||||
License: LGPLv2+ with exceptions
|
||||
|
|
@ -10,11 +10,7 @@ URL: https://github.com/gildor478/ocaml-gettext
|
|||
|
||||
Source0: https://github.com/gildor478/%{name}/archive/v%{version}.tar.gz
|
||||
|
||||
# https://github.com/gildor478/ocaml-gettext/issues/8
|
||||
# Pconst_string added extra Loc.t parameter which we must ignore.
|
||||
Patch1: 0001-xgettext-Ignore-extra-Loc.t-parameter-of-Pconst_stri.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: make
|
||||
BuildRequires: ocaml >= 4.00.1
|
||||
BuildRequires: ocaml-findlib-devel >= 1.3.3-3
|
||||
BuildRequires: ocaml-compiler-libs
|
||||
|
|
@ -183,6 +179,10 @@ rm -rf $RPM_BUILD_ROOT/usr/doc
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Mar 2 23:22:35 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 0.4.2-1
|
||||
- New upstream version 4.2
|
||||
- Remove patch now upstream.
|
||||
|
||||
* Mon Mar 1 23:22:35 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 0.4.1-9
|
||||
- OCaml 4.12.0 build
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (v0.4.1.tar.gz) = 52a48cdd00e16dcf3c191d400930e88c144c119eb730bfa825ad269f9a6785d5833f13cb32da3de544a12bfff104da78adec27a8172425f4b8fce6d05821ec31
|
||||
SHA512 (v0.4.2.tar.gz) = fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
|
||||
|
|
|
|||
Loading…
Reference in New Issue