* [gentoo-commits] repo/gentoo:master commit in: sci-misc/flashdot/, sci-misc/flashdot/files/
@ 2016-02-14 22:46 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2016-02-14 22:46 UTC (permalink / raw
To: gentoo-commits
commit: 805ce1ec2987ad6da051f98368c94a39b7164fe0
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 22:46:03 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 22:46:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=805ce1ec
sci-misc/flashdot: Port to dev-ml/gsl-ocaml
Gentoo-Bug: 574564
Package-Manager: portage-2.2.27
.../flashdot/files/flashdot-1.1.4-gsl-ocaml.patch | 23 ++++++++++++++
sci-misc/flashdot/flashdot-1.1.4-r1.ebuild | 36 ++++++++++++++++++++++
2 files changed, 59 insertions(+)
diff --git a/sci-misc/flashdot/files/flashdot-1.1.4-gsl-ocaml.patch b/sci-misc/flashdot/files/flashdot-1.1.4-gsl-ocaml.patch
new file mode 100644
index 0000000..4e94e5b
--- /dev/null
+++ b/sci-misc/flashdot/files/flashdot-1.1.4-gsl-ocaml.patch
@@ -0,0 +1,23 @@
+Fix errors caused by wrong parameter type:
+* File "mathexpr.ml", line 423, characters 55-56:
+* Error: This expression has type int but an expression was expected of type
+* float
+
+--- flashdot-1.1.4/mathexpr/mathexpr.ml
++++ flashdot-1.1.4/mathexpr/mathexpr.ml
+@@ -419,7 +419,6 @@
+ | "NegativeBinomial" ->
+ let p = float'_of_string (aod cont_type "P" "1.0") in
+ let n = float'_of_string (aod cont_type "N" "1.0") in
+- (*uncomment this for ocamlgsl > 0.5 ::::let n = int_of_float n in::::*)
+ fun () -> foi (Gsl_randist.negative_binomial rng p n)
+ | "Pascal" ->
+ let p = float'_of_string (aod cont_type "P" "1.0") in
+@@ -4094,7 +4093,6 @@
+ | "NegativeBinomialPDF" ->
+ let p = float'_of_string (aod cont_type "P" "1.0") in
+ let n = float'_of_string (aod cont_type "N" "1.0") in
+- (*uncomment this for ocamlgsl > 0.5 ::::let n = int_of_float n in::::*)
+ fun x -> Gsl_randist.negative_binomial_pdf (int_of_float x) p n
+ | "PascalPDF" ->
+ let p = float'_of_string (aod cont_type "P" "1.0") in
diff --git a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
new file mode 100644
index 0000000..66f46d4
--- /dev/null
+++ b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Generator for psychophysical experiments"
+HOMEPAGE="http://www.flashdot.info/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+ https://dev.gentoo.org/~tomka/files/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+ >=dev-lang/ocaml-3.10[ocamlopt?]
+ dev-ml/gsl-ocaml
+ dev-ml/lablgl[glut]
+ dev-ml/ocamlsdl
+ x11-apps/xdpyinfo"
+RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${P}-gsl-ocaml.patch"
+)
+
+src_prepare() {
+ default
+ MAKEOPTS+=" -j1 VERSION=${PV}"
+ use ocamlopt || MAKEOPTS+=" TARGETS=flashdot_bytecode BYTECODENAME=flashdot"
+}
+
+src_install() {
+ emake DESTDIR="${D}" CALLMODE=script install
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/flashdot/, sci-misc/flashdot/files/
@ 2021-04-28 18:52 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2021-04-28 18:52 UTC (permalink / raw
To: gentoo-commits
commit: 7430920ad46eca2df4b62431b3309540ac349168
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 28 18:51:52 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Apr 28 18:51:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7430920a
sci-misc/flashdot: fix new ocaml - but still does not build
Closes: https://bugs.gentoo.org/770799
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch | 11 +++++++++++
sci-misc/flashdot/flashdot-1.1.4-r1.ebuild | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch b/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch
new file mode 100644
index 00000000000..8b00b86d52b
--- /dev/null
+++ b/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch
@@ -0,0 +1,11 @@
+--- a/fls/fls.ml 2021-04-26 16:24:25.363442099 +0200
++++ b/fls/fls.ml 2021-04-26 20:10:54.965405870 +0200
+@@ -750,7 +750,7 @@
+ match input inp s 0 1024 with
+ 0 -> Buffer.contents res
+ | n ->
+- Buffer.add_substring res s 0 n;
++ Buffer.add_subbytes res s 0 n;
+ fill_buff ()
+ in
+ let s = fill_buff () in
diff --git a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
index 97b4fd7fac5..8d31eba9024 100644
--- a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
+++ b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -22,6 +22,7 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${P}-gsl-ocaml.patch"
+ "${FILESDIR}"/${P}-ocaml-4.09.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/flashdot/, sci-misc/flashdot/files/
@ 2022-03-22 11:46 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2022-03-22 11:46 UTC (permalink / raw
To: gentoo-commits
commit: 4875f227f3e4a733d1290d85d275e3225ae05e27
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 11:45:49 2022 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 11:45:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4875f227
sci-misc/flashdot: make it build again
Closes: https://bugs.gentoo.org/641894
Closes: https://bugs.gentoo.org/770799
Closes: https://bugs.gentoo.org/804663
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
.../flashdot/files/flashdot-1.1.4-Makefile.patch | 10 +++++++++
.../flashdot/files/flashdot-1.1.4-ocaml-4.09.patch | 11 ++++++++++
sci-misc/flashdot/flashdot-1.1.4-r1.ebuild | 24 +++++++++++++++++++++-
3 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/sci-misc/flashdot/files/flashdot-1.1.4-Makefile.patch b/sci-misc/flashdot/files/flashdot-1.1.4-Makefile.patch
new file mode 100644
index 000000000000..077367bd2ab0
--- /dev/null
+++ b/sci-misc/flashdot/files/flashdot-1.1.4-Makefile.patch
@@ -0,0 +1,10 @@
+--- a/mathexpr/Makefile 2022-03-22 10:51:43.081062080 +0100
++++ b/mathexpr/Makefile 2022-03-22 10:53:37.226190652 +0100
+@@ -72,6 +72,6 @@
+ # Dependencies
+ depend:
+- $(OCAMLDEP) $(OCAMLINCS) *.mli *.ml > depend
++ $(OCAMLDEP) -I $(XMLLIGHTDIR) $(OCAMLINCSLOCAL) *.mli *.ml > depend
+
+ include depend
+
diff --git a/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch b/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch
index 8b00b86d52b7..285a2c746e20 100644
--- a/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch
+++ b/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch
@@ -9,3 +9,14 @@
fill_buff ()
in
let s = fill_buff () in
+--- a/mathexpr/mathexpr.ml 2022-03-22 12:36:30.252580025 +0100
++++ b/mathexpr/mathexpr.ml 2022-03-22 12:32:10.594137416 +0100
+@@ -2859,7 +2859,7 @@
+ while true do
+ let n = input f strbuf 0 1024 in
+ if n = 0 then raise Exit else
+- Buffer.add_substring resbuf strbuf 0 n
++ Buffer.add_subbytes resbuf strbuf 0 n
+ done;
+ Buffer.contents resbuf
+ with Exit -> Buffer.contents resbuf
diff --git a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
index 8d31eba90241..3266f2b6d7d3 100644
--- a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
+++ b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -22,6 +22,7 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${P}-gsl-ocaml.patch"
+ "${FILESDIR}"/${P}-Makefile.patch
"${FILESDIR}"/${P}-ocaml-4.09.patch
)
@@ -29,6 +30,27 @@ src_prepare() {
default
MAKEOPTS+=" -j1 VERSION=${PV}"
use ocamlopt || MAKEOPTS+=" TARGETS=flashdot_bytecode BYTECODENAME=flashdot"
+ sed -i \
+ -e 's:Gsl_matrix:Gsl.Matrix:g' \
+ -e 's:Gsl_rng:Gsl.Rng:g' \
+ -e 's:Gsl_randist:Gsl.Randist:g' \
+ -e 's:Gsl_sf:Gsl.Sf:g' \
+ -e 's:Gsl_math:Gsl.Math:g' \
+ -e 's:Gsl_vector:Gsl.Vector:g' \
+ -e 's:Gsl_permut:Gsl.Permut:g' \
+ -e 's:Gsl_linalg:Gsl.Linalg:g' \
+ -e 's:Gsl_cdf:Gsl.Cdf:g' \
+ mathexpr/mathexpr.ml \
+ mathexpr/mathexpr.mli \
+ mathexpr/random_rng.ml \
+ mathexpr/sequences.ml \
+ mathexpr/multibin.ml \
+ flashdot.ml \
+ || die
+}
+
+src_configure() {
+ ./configure --prefix=/usr || die
}
src_install() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-22 11:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-28 18:52 [gentoo-commits] repo/gentoo:master commit in: sci-misc/flashdot/, sci-misc/flashdot/files/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2022-03-22 11:46 Alfredo Tupone
2016-02-14 22:46 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox