Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
x11-toolkits/ocaml-lablgtk2: the port had been updated and improved (+)
- Update to the latest version 2.18.13 - Convert that abominable `post-patch' target to static patch and leave only parts of it which matter (visible in the build log) - Fix a typo in the `src/Makefile' to prevent `sourceView2Enums.ml' from being removed as intermediate file Submitted by: naddy (typo fix for gmake 4.4 update) Reported by: portscout
- Loading branch information
Alexey Dokuchaev
authored and
Alexey Dokuchaev
committed
Mar 31, 2023
1 parent
d8b4c43
commit 62173bf
Showing
3 changed files
with
55 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
TIMESTAMP = 1640395411 | ||
SHA256 (garrigue-lablgtk-2.18.12_GH0.tar.gz) = 43b2640b6b6d6ba352fa0c4265695d6e0b5acb8eb1da17290493e99ae6879b18 | ||
SIZE (garrigue-lablgtk-2.18.12_GH0.tar.gz) = 1066997 | ||
TIMESTAMP = 1665042937 | ||
SHA256 (garrigue-lablgtk-2.18.13_GH0.tar.gz) = 7b9e680452458fd351cf8622230d62c3078db528446384268cd0dc37be82143c | ||
SIZE (garrigue-lablgtk-2.18.13_GH0.tar.gz) = 1073083 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
--- src/Makefile.orig 2022-10-06 07:55:37 UTC | ||
+++ src/Makefile | ||
@@ -51,11 +51,8 @@ CUSTOM = -custom | ||
#MLLINK += -cclib -lcamlrund | ||
MLBYTEFLAGS = -g -dtypes | ||
else | ||
-CFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS) | ||
-ifneq ($(TOOLCHAIN),msvc) | ||
-CFLAGS += -O | ||
+CFLAGS += -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS) | ||
endif | ||
-endif | ||
|
||
ifeq ($(THREADS_LIB),system) | ||
THFLAGS = -thread | ||
@@ -165,7 +162,7 @@ GTKSOURCEVIEW2MLOBJS = gtkSourceView2.cmo gSourceView2 | ||
GTKSOURCEVIEW2COBJS = ml_gtksourceview2$(XO) | ||
GTKSOURCEVIEW2MLOBJSENUM = sourceView2Enums.cmo | ||
GTKSOURCEVIEW2PROPS = gtkSourceView2.props | ||
-BEFORE_DEPEND += $(GTKSOURCEVIEW2PROPS:%.props=%Props.ml) $(GTKSOURCEVIEW2PROPS:%.props= o%Props.ml) $(GTKSOURCEVIEWMLOBJSENUM:%.cmo=%.ml) | ||
+BEFORE_DEPEND += $(GTKSOURCEVIEW2PROPS:%.props=%Props.ml) $(GTKSOURCEVIEW2PROPS:%.props= o%Props.ml) $(GTKSOURCEVIEW2MLOBJSENUM:%.cmo=%.ml) | ||
EXTRA_OBJS += $(GTKSOURCEVIEW2MLOBJSENUM) | ||
GTKSOURCEVIEW2ALLMLOBJS = $(GTKSOURCEVIEW2MLOBJSENUM) \ | ||
$(GTKSOURCEVIEW2PROPS:%.props=%Props.cmo) \ | ||
@@ -406,9 +403,9 @@ findlib-install: | ||
mkdir -p "$(DESTDIR)$(FINDLIBDIR)" | ||
@if test -f "$(DESTDIR)$(OCAMLLDCONF)"; then :; else \ | ||
mkdir -p "`dirname $(DESTDIR)$(OCAMLLDCONF)`"; \ | ||
- touch "$(DESTDIR)$(OCAMLLDCONF)"; fi | ||
+ true "$(DESTDIR)$(OCAMLLDCONF)"; fi | ||
$(OCAMLFIND) install -destdir "$(DESTDIR)$(FINDLIBDIR)" \ | ||
- -ldconf "$(DESTDIR)$(OCAMLLDCONF)" \ | ||
+ -ldconf ignore \ | ||
lablgtk2 ../META \ | ||
build.ml \ | ||
$(CLIBS) \ | ||
@@ -447,11 +444,11 @@ findlib-install: | ||
fi` | ||
rm -f lablgtk2 | ||
$(MAKE) lablgtk2 LABLGTKDIR="$(FINDLIBDIR)/lablgtk2" | ||
- cp lablgtk2$(XB) "$(BINDIR)" | ||
+ $(BSD_INSTALL_SCRIPT) lablgtk2$(XB) "$(BINDIR)" | ||
if test -f lablgladecc$(XE); then \ | ||
- cp lablgladecc$(XE) "$(BINDIR)/lablgladecc2$(XE)"; \ | ||
+ $(BSD_INSTALL_SCRIPT) lablgladecc$(XE) "$(BINDIR)/lablgladecc2$(XE)"; \ | ||
fi | ||
- cp gdk_pixbuf_mlsource$(XE) "$(BINDIR)" | ||
+ $(BSD_INSTALL_SCRIPT) gdk_pixbuf_mlsource$(XE) "$(BINDIR)" | ||
$(RANLIB) $(CLIBS:%="$(FLINSTALLDIR)"/%) | ||
@if test -f lablgtk.cmxa; then \ | ||
echo "Execute $(RANLIB) in $(FLINSTALLDIR)"; \ |