Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lablgtk: Bump to 3.1.4. #4692

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 3 additions & 26 deletions libs/lablgtk/BUILD
Original file line number Diff line number Diff line change
@@ -1,29 +1,6 @@
autoupdate -f &&
export OCAMLPATH="$(camlp5 -where)"&&
export GTKCFLAGS+=" -fcommon"
#autoreconf -fi &&
export OCAMLPATH="$(ocamlfind printconf destdir)"

OPTS+=" --prefix=/usr \
--disable-gtktest \
--without-gl \
--with-threads=system \
--without-gnomeui \
--without-gnomecanvas \
--without-panel \
--without-glade \
--without-gtkspell \
--without-gtksourceview \
--without-gtksourceview2" &&

sed -e "s|-O|$CFLAGS|" \
-e "s|-shared|& -ccopt \"$LDFLAGS\"|" \
-e "s|(CAMLMKLIB)|& -ldopt \"$LDFLAGS\"|" \
-i src/Makefile &&

default_config &&

make world &&
make opt CFLAGS="${CFLAGS}" &&
LABLGTK_EXTRA_FLAGS=-fcommon dune build -p lablgtk3&&

prepare_install &&
make install
dune install --prefix="/usr" --libdir="$(ocamlfind printconf destdir)"
7 changes: 6 additions & 1 deletion libs/lablgtk/DEPENDS
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
depends camlp4
depends ocaml
depends dune
depends findlib
depends camlp-streams
depends ocaml-cairo
depends gtksourceview3

optional_depends librsvg "" "--without-rsvg" "for librsvg support"
6 changes: 3 additions & 3 deletions libs/lablgtk/DETAILS
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
MODULE=lablgtk
VERSION=2.18.13
VERSION=3.1.4
SOURCE=$MODULE-$VERSION.tar.gz
SOURCE_URL_FULL=https://github.com/garrigue/lablgtk/archive/refs/tags/$VERSION.tar.gz
SOURCE_VFY=sha256:7b9e680452458fd351cf8622230d62c3078db528446384268cd0dc37be82143c
SOURCE_VFY=sha256:fa23251e1b089a9b91feea11f3c77420ec9e5412221b02daf898bf542b51f7bd
WEB_SITE=http://lablgtk.forge.ocamlcore.org/
ENTERED=20050109
UPDATED=20220514
UPDATED=20241210
SHORT="Objective Caml interface to gtk+"
PSAFE=no
cat << EOF
Expand Down
39 changes: 39 additions & 0 deletions libs/lablgtk/patch.d/0001-fix-178.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From c5419e79bc0d16bb9e9a8be539aa5737e8c481e4 Mon Sep 17 00:00:00 2001
From: Jacques Garrigue <[email protected]>
Date: Sun, 24 Mar 2024 20:37:36 +0900
Subject: [PATCH] fix #178

---
CHANGES.md | 3 +++
src/ml_gtk.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index cc36573d..ab5cb920 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,8 @@
LablGTK changes log

+2024.03.24 [Jacques]
+ * fix pointer incompatibility in ml_gtk_style_context_list_classes (#178)
+
## In Lablgtk-3.1.4

2024.01.31 [Jacques]
diff --git a/src/ml_gtk.c b/src/ml_gtk.c
index deb1b4c7..0dcc104e 100644
--- a/src/ml_gtk.c
+++ b/src/ml_gtk.c
@@ -233,7 +233,7 @@ ML_2 (gtk_style_context_add_class, GtkStyleContext_val, String_val, Unit)
ML_2 (gtk_style_context_remove_class, GtkStyleContext_val, String_val, Unit)
ML_2 (gtk_style_context_has_class, GtkStyleContext_val, String_val, Val_bool)
CAMLprim value ml_gtk_style_context_list_classes(value ctx)
-{ return Val_GList(gtk_style_context_list_classes(GtkStyleContext_val(ctx)), Val_string); }
+{ return Val_GList(gtk_style_context_list_classes(GtkStyleContext_val(ctx)), (value_in)Val_string); }

/* gtkdata.h */

--
2.45.1

76 changes: 0 additions & 76 deletions libs/lablgtk/patch.d/01-lablgtk-2.18.12-cflags.patch

This file was deleted.

20 changes: 0 additions & 20 deletions libs/lablgtk/patch.d/02-lablgtk-2.18.12-Makefile.patch

This file was deleted.

11 changes: 0 additions & 11 deletions libs/lablgtk/patch.d/03-lablgtk-2.18.12-depend.patch

This file was deleted.