commit: b8ca9cd6b4ee822270b2cb53dd10e3df334fe505
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 12:58:40 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 12:59:14 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ca9cd6
app-misc/geneweb: build with newer camlp5
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
.../geneweb/files/geneweb-7.0.1_alpha2-camlp5.patch | 20 ++++++++++++++++++++
...pha2-r2.ebuild => geneweb-7.0.1_alpha2-r3.ebuild} | 4 ++--
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/app-misc/geneweb/files/geneweb-7.0.1_alpha2-camlp5.patch
b/app-misc/geneweb/files/geneweb-7.0.1_alpha2-camlp5.patch
new file mode 100644
index 000000000000..6ba4b4238760
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-7.0.1_alpha2-camlp5.patch
@@ -0,0 +1,20 @@
+--- a/bin/ged2gwb/dune.in 2025-03-12 08:45:52.250610591 +0100
++++ b/bin/ged2gwb/dune.in 2025-03-12 08:46:33.553114512 +0100
+@@ -2,6 +2,6 @@
+ (name ged2gwb)
+ (public_name geneweb.ged2gwb)
+ (modules ged2gwb)
+- (preprocess (action (run camlp5o pr_o.cmo pa_extend.cmo q_MLast.cmo
%{input-file})))
++ (preprocess (action (run camlp5o o_keywords.cmo pr_o.cmo pa_extend.cmo
q_MLast.cmo %{input-file})))
+ (libraries camlp5 unix str %%%GWDB_PKG%%% %%%SOSA_PKG%%% geneweb)
+ )
+--- a/bin/ged2gwb/ged2gwb.ml 2025-03-13 13:44:01.734882122 +0100
++++ b/bin/ged2gwb/ged2gwb.ml 2025-03-13 13:46:15.738227429 +0100
+@@ -466,6 +466,7 @@
+ ; Token.tok_match = tparse
+ ; Token.tok_text = (fun _ -> "<tok>")
+ ; Token.tok_comm = None
++ ; Token.kwds = Hashtbl.create 301
+ }
+
+ type 'a range =
diff --git a/app-misc/geneweb/geneweb-7.0.1_alpha2-r2.ebuild
b/app-misc/geneweb/geneweb-7.0.1_alpha2-r3.ebuild
similarity index 96%
rename from app-misc/geneweb/geneweb-7.0.1_alpha2-r2.ebuild
rename to app-misc/geneweb/geneweb-7.0.1_alpha2-r3.ebuild
index 269b117f05f2..e4f263275889 100644
--- a/app-misc/geneweb/geneweb-7.0.1_alpha2-r2.ebuild
+++ b/app-misc/geneweb/geneweb-7.0.1_alpha2-r3.ebuild
@@ -25,8 +25,7 @@ DEPEND="
acct-group/geneweb
acct-user/geneweb
dev-ml/calendars:=
- >=dev-ml/camlp5-8:=[ocamlopt?]
- <dev-ml/camlp5-8.03
+ >=dev-ml/camlp5-8.03.00:=[ocamlopt?]
dev-ml/camlp-streams:=
dev-ml/jingoo:=
dev-ml/markup:=
@@ -51,6 +50,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-nogwrepl.patch
+ "${FILESDIR}"/${P}-camlp5.patch
)
src_prepare() {
