Skip to content

Commit

Permalink
graphics/ocaml-images: unbreak the build and undeprecate the port
Browse files Browse the repository at this point in the history
OMake's shell-success-null() function had been removed in version
0.10.5: after using $(NULL_DEVICE), it no longer needed a special
name and had replaced shell-success() function.
  • Loading branch information
Alexey Dokuchaev authored and Alexey Dokuchaev committed Nov 27, 2023
1 parent 54b238b commit 1ab547d
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
8 changes: 4 additions & 4 deletions graphics/ocaml-images/Makefile
Expand Up @@ -12,10 +12,6 @@ MAINTAINER= michael.grunewald@laposte.net
COMMENT= Objective Caml image processing library
WWW= http://pauillac.inria.fr/camlimages/

BROKEN= does not build: broken plist
DEPRECATED= Fails to package and marked broken over a year ago
EXPIRATION_DATE=2023-11-30

BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ocaml.m4:lang/ocaml-autoconf
BUILD_DEPENDS+= omake:devel/omake

Expand Down Expand Up @@ -74,6 +70,10 @@ USES+= xorg
USE_XORG= xpm
.endif

post-patch:
@${REINPLACE_CMD} -e 's,shell-success-null,shell-success,' \
${WRKSRC}/OMyMakeroot

do-configure:
@(cd ${WRKSRC} && ${REINPLACE_CMD} ${OMAKESUBS} OMakefile)
(cd ${WRKSRC} && ${OMAKE} ${OMARGS} configure)
Expand Down
11 changes: 11 additions & 0 deletions graphics/ocaml-images/files/patch-src_bitmap.ml
@@ -0,0 +1,11 @@
--- src/bitmap.ml.orig 2011-06-22 18:04:32 UTC
+++ src/bitmap.ml
@@ -186,7 +186,7 @@ module Make(B:Bitdepth) = struct

let swap_out_eldest words =
let sorted =
- Sort.list (fun b1 b2 -> b1.last_used < b2.last_used) !swappable_blocks in
+ List.sort (fun b1 b2 -> compare b1.last_used b2.last_used) !swappable_blocks in
let rec swapper sorted i =
match sorted with
| [] -> ()

0 comments on commit 1ab547d

Please sign in to comment.