* [gentoo-commits] repo/gentoo:master commit in: dev-ml/labltk/files/, dev-ml/labltk/
@ 2023-01-21 22:31 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2023-01-21 22:31 UTC (permalink / raw
To: gentoo-commits
commit: d1bcd57413cde95632e1601ebf71f5300eb1e5a8
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 21:30:53 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 22:31:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1bcd574
dev-ml/labltk: add depend on makefile
Closes: https://bugs.gentoo.org/884509
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ml/labltk/files/labltk-8.06.12-shuffle.patch | 12 ++++++++++++
dev-ml/labltk/labltk-8.06.12-r1.ebuild | 3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch b/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch
new file mode 100644
index 000000000000..7d5c94356c5c
--- /dev/null
+++ b/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch
@@ -0,0 +1,12 @@
+--- a/compiler/Makefile 2023-01-21 22:23:29.676828969 +0100
++++ b/compiler/Makefile 2023-01-21 22:24:16.204141261 +0100
+@@ -73,6 +73,9 @@
+ .ml.cmo:
+ $(CAMLCOMP) $(COMPFLAGS) -I ../support $<
+
++maincompile.cmo: copyright.cmo
++maincompile.cmx: copyright.cmx
++
+ depend: parser.ml parser.mli lexer.ml pplex.ml ppyac.ml ppyac.mli
+ $(CAMLDEP) *.mli *.ml > .depend
+
diff --git a/dev-ml/labltk/labltk-8.06.12-r1.ebuild b/dev-ml/labltk/labltk-8.06.12-r1.ebuild
index fd876a1a68e2..a85ce87f404c 100644
--- a/dev-ml/labltk/labltk-8.06.12-r1.ebuild
+++ b/dev-ml/labltk/labltk-8.06.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/findlib.patch"
"${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch
+ "${FILESDIR}"/${P}-shuffle.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/labltk/files/, dev-ml/labltk/
@ 2023-01-25 18:57 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2023-01-25 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 1e690a3e69af330e71274af2914a73278f3cebc9
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 18:56:13 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 18:56:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e690a3e
dev-ml/labltk: fix function without prototype
Closes: https://bugs.gentoo.org/882057
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ml/labltk/files/labltk-8.06.12-c2x.patch | 47 ++++++++++++++++++++++++++++
dev-ml/labltk/labltk-8.06.12-r1.ebuild | 1 +
2 files changed, 48 insertions(+)
diff --git a/dev-ml/labltk/files/labltk-8.06.12-c2x.patch b/dev-ml/labltk/files/labltk-8.06.12-c2x.patch
new file mode 100644
index 000000000000..f495e532d590
--- /dev/null
+++ b/dev-ml/labltk/files/labltk-8.06.12-c2x.patch
@@ -0,0 +1,47 @@
+--- a/support/cltkWait.c 2023-01-25 19:38:41.920494229 +0100
++++ b/support/cltkWait.c 2023-01-25 19:39:51.246347410 +0100
+@@ -44,9 +44,7 @@
+ Tk_Window win;
+ };
+
+-static void WaitVisibilityProc(clientData, eventPtr)
+- ClientData clientData;
+- XEvent *eventPtr; /* Information about event (not used). */
++static void WaitVisibilityProc(ClientData clientData, XEvent *eventPtr)
+ {
+ struct WinCBData *vis = clientData;
+ value cbid = Val_int(vis->cbid);
+--- a/support/cltkImg.c 2023-01-25 19:42:03.647173018 +0100
++++ b/support/cltkImg.c 2023-01-25 19:42:49.290423395 +0100
+@@ -111,9 +111,7 @@
+ return Val_int(0);
+ }
+
+-CAMLprim value camltk_setimgdata_bytecode(argv,argn)
+- value *argv;
+- int argn;
++CAMLprim value camltk_setimgdata_bytecode(value *argv, int argn)
+ {
+ return camltk_setimgdata_native(argv[0], argv[1], argv[2], argv[3],
+ argv[4], argv[5]);
+--- a/support/cltkVar.c 2023-01-25 19:44:11.880066940 +0100
++++ b/support/cltkVar.c 2023-01-25 19:46:16.580018764 +0100
+@@ -74,12 +74,12 @@
+ typedef char *(Tcl_VarTraceProc) _ANSI_ARGS_((ClientData clientData,
+ Tcl_Interp *interp, char *part1, char *part2, int flags));
+ */
+-static char * tracevar(clientdata, interp, name1, name2, flags)
+- ClientData clientdata;
+- Tcl_Interp *interp; /* Interpreter containing variable. */
+- char *name1; /* Name of variable. */
+- char *name2; /* Second part of variable name. */
+- int flags; /* Information about what happened. */
++static char * tracevar(ClientData clientdata, Tcl_Interp *interp,
++ char *name1, char *name2, int flags)
++ /* interp -> Interpreter containing variable. */
++ /* name1 -> Name of variable. */
++ /* name2 -> Second part of variable name. */
++ /* flags -> Information about what happened. */
+ {
+ Tcl_UntraceVar2(interp, name1, name2,
+ TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
diff --git a/dev-ml/labltk/labltk-8.06.12-r1.ebuild b/dev-ml/labltk/labltk-8.06.12-r1.ebuild
index a85ce87f404c..6ec61653cabe 100644
--- a/dev-ml/labltk/labltk-8.06.12-r1.ebuild
+++ b/dev-ml/labltk/labltk-8.06.12-r1.ebuild
@@ -24,6 +24,7 @@ PATCHES=(
"${FILESDIR}/findlib.patch"
"${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch
"${FILESDIR}"/${P}-shuffle.patch
+ "${FILESDIR}"/${P}-c2x.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/labltk/files/, dev-ml/labltk/
@ 2024-06-22 15:15 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2024-06-22 15:15 UTC (permalink / raw
To: gentoo-commits
commit: c7923af66bf150e054320aa05326711c78912b54
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 15:14:15 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 15:14:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7923af6
dev-ml/labltk: add 8.06.14
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ml/labltk/Manifest | 1 +
dev-ml/labltk/files/labltk-8.06.14-findlib.patch | 13 ++++++
dev-ml/labltk/files/labltk-8.06.14-shuffle.patch | 31 ++++++++++++++
dev-ml/labltk/labltk-8.06.14.ebuild | 54 ++++++++++++++++++++++++
4 files changed, 99 insertions(+)
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index a4d9da8b9c5d..885e85da13df 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -2,5 +2,6 @@ DIST labltk-8.06.10-warnings.patch.bz2 4194 BLAKE2B 106e70dac1601a831a46a21a4013
DIST labltk-8.06.10.tar.gz 371871 BLAKE2B da67b13aa0a0c179c2fcefe6b03f68225b6e886a1233de77b9749be32b8efc845cac60244f9a8494241c8c77c7d6991786280c274becb70f5527ad891c3aac69 SHA512 ef797d21adac48ca5ed35d95ad05fee26f9b6c99b0510909f6087abb9580b8efd219ca65b1efddb170b5409567d83eaaac0473898f5f4db3e15ae4f39df364c8
DIST labltk-8.06.11.tar.gz 372194 BLAKE2B ea81662201f6166cd6fb46fe1681ffdab94703dd3e338244079ad2c67df421969618d7fb2ba2b9b5eadb732eeb927c3de03f19fb5b3621c1461924aeb2f347d5 SHA512 a4ad5fa31cbc89066445bc71a0c1c016f7e299b6bf88a5f77d559c805bc78d90651988658c8a300770ca41514ad73272691feaa84179637fcc695c96bbf25dd6
DIST labltk-8.06.12.tar.gz 372215 BLAKE2B 27718ad287954c11c0e77579239ad9ad53f4df308f3af3c482c40504e6426b4366d2c3de3acb36ca39e7fd404964fe5caa53a0b47702a0bc45ae1266765e90a0 SHA512 e1564ab2d8922276bd8ad586b37308d60ca2dd563bac3cdd992d8a6ba4de26e5499350a62a1d4cb2bbb9a5b7aff609b5187aad5fba118eb55d1b4c8355d2979a
+DIST labltk-8.06.14.tar.gz 384755 BLAKE2B f629a887353f78b388400e1e6e8c242f9d3d2f94ffc0bb2d4d0578bf79efee86426c6c3ee409aabded221d8ead0b7c52e4fcbc777381b3da8bdfd6174d42ffbc SHA512 7e2cfbdb44851e48e1cbde62dd185d6f6f6b7b83d9b835e77ca964b97d05daf07b1c4d2224b5e41deba21c4b4ae64f6de9b47694022c5ffe6a67eee51d943fc9
DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d
DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca
diff --git a/dev-ml/labltk/files/labltk-8.06.14-findlib.patch b/dev-ml/labltk/files/labltk-8.06.14-findlib.patch
new file mode 100644
index 000000000000..2cc2b945a226
--- /dev/null
+++ b/dev-ml/labltk/files/labltk-8.06.14-findlib.patch
@@ -0,0 +1,13 @@
+Index: labltk-8.06.0/lib/Makefile
+===================================================================
+--- labltk-8.06.0.orig/lib/Makefile
++++ labltk-8.06.0/lib/Makefile
+@@ -84,7 +84,7 @@ install-script: $(LIBNAME)
+ install-batch:
+ cp labltk.bat $(INSTALLBINDIR)
+
+-ifeq ($USE_FINDLIB,yes)
++ifeq ($(USE_FINDLIB),yes)
+ install:
+ ocamlfind install labltk -add $(LIBNAME).cma $(LIBNAME)top$(EXE)
+ chmod 755 $(INSTALLDIR)/$(LIBNAME)top$(EXE)
diff --git a/dev-ml/labltk/files/labltk-8.06.14-shuffle.patch b/dev-ml/labltk/files/labltk-8.06.14-shuffle.patch
new file mode 100644
index 000000000000..5cf4bc839d02
--- /dev/null
+++ b/dev-ml/labltk/files/labltk-8.06.14-shuffle.patch
@@ -0,0 +1,31 @@
+--- a/compiler/Makefile 2023-01-21 22:23:29.676828969 +0100
++++ b/compiler/Makefile 2023-01-21 22:24:16.204141261 +0100
+@@ -73,6 +73,9 @@
+ .ml.cmo:
+ $(CAMLCOMP) $(COMPFLAGS) -I ../support $<
+
++maincompile.cmo: copyright.cmo
++maincompile.cmx: copyright.cmx
++
+ depend: parser.ml parser.mli lexer.ml pplex.ml ppyac.ml ppyac.mli
+ $(CAMLDEP) *.mli *.ml > .depend
+
+--- a/browser/Makefile 2023-01-25 22:29:40.784044151 +0100
++++ b/browser/Makefile 2023-01-25 22:29:56.579838693 +0100
+@@ -18,3 +18,6 @@
+
+ dummy.ml:
+ cp dummyUnix.ml dummy.ml
++
++shell.cmo : dummy.cmo
++shell.cmx : dummy.cmx
+--- a/browser/Makefile.shared 2024-06-05 10:08:38.886219581 +0200
++++ b/browser/Makefile.shared 2024-06-05 10:06:05.142920155 +0200
+@@ -71,4 +71,7 @@
+
+ shell.cmo: dummy.cmi
+
++dummy.cmi: dummy.ml
++ $(CAMLCOMP) $(INCLUDES) $<
++
+ include .depend
diff --git a/dev-ml/labltk/labltk-8.06.14.ebuild b/dev-ml/labltk/labltk-8.06.14.ebuild
new file mode 100644
index 000000000000..20f88b5c971b
--- /dev/null
+++ b/dev-ml/labltk/labltk-8.06.14.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit findlib toolchain-funcs
+
+DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework"
+HOMEPAGE="https://garrigue.github.io/labltk/"
+SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt X"
+
+RDEPEND="dev-lang/tk:=
+ >=dev-lang/ocaml-4.14:=[ocamlopt?,X(+)?]"
+DEPEND="${RDEPEND}
+ dev-ml/findlib
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-findlib.patch
+ "${FILESDIR}"/${P}-shuffle.patch
+)
+
+src_prepare() {
+ sed -i \
+ -e "s|ranlib|$(tc-getRANLIB)|" \
+ frx/Makefile \
+ || die
+ default
+}
+
+src_configure() {
+ ./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!"
+}
+
+src_compile() {
+ emake -j1 all
+ use ocamlopt && emake -j1 opt
+}
+
+src_install() {
+ findlib_src_preinst
+ dodir /usr/bin
+ emake \
+ INSTALLDIR="${D}/$(ocamlc -where)/labltk" \
+ INSTALLBINDIR="${ED}/usr/bin/" \
+ RANLIB=$(tc-getRANLIB) \
+ install
+ dodoc Changes README.mlTk
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-22 15:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-25 18:57 [gentoo-commits] repo/gentoo:master commit in: dev-ml/labltk/files/, dev-ml/labltk/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2024-06-22 15:15 Alfredo Tupone
2023-01-21 22:31 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox