From 640dc23ed112edb180949cff067276124347ad9a Mon Sep 17 00:00:00 2001
From: Yuriy Chumak <yuriy.chumak@mail.com>
Date: Tue, 29 Oct 2024 19:09:10 +0200
Subject: [PATCH] ol: update to 2.6.

---
 srcpkgs/ol/patches/http.patch  | 13 -------------
 srcpkgs/ol/patches/ppcxx.patch | 15 ---------------
 srcpkgs/ol/patches/xxd.patch   | 24 ------------------------
 srcpkgs/ol/template            | 14 +++++++-------
 4 files changed, 7 insertions(+), 59 deletions(-)
 delete mode 100644 srcpkgs/ol/patches/http.patch
 delete mode 100644 srcpkgs/ol/patches/ppcxx.patch
 delete mode 100644 srcpkgs/ol/patches/xxd.patch

diff --git a/srcpkgs/ol/patches/http.patch b/srcpkgs/ol/patches/http.patch
deleted file mode 100644
index 672ae727334269..00000000000000
--- a/srcpkgs/ol/patches/http.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libraries/http/server b/libraries/http/server
-index 47127b8f..a51bd17f 100644
---- a/libraries/http/server
-+++ b/libraries/http/server
-@@ -148,7 +148,7 @@
-             (display "<folder> ")
-             ; list folder:
-             (define Out (pipe))
--            (define Pid (system (list "/bin/sh" "-c" (string-append
-+            (define Pid (execvp (list "/bin/sh" "-c" (string-append
-                            "ls -lah " filename)) #f Out))
- 
-             (send "HTTP/1.0 200 OK\n"
diff --git a/srcpkgs/ol/patches/ppcxx.patch b/srcpkgs/ol/patches/ppcxx.patch
deleted file mode 100644
index 5d0e1f66e4abbb..00000000000000
--- a/srcpkgs/ol/patches/ppcxx.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/extensions/ffi.c b/extensions/ffi.c
-index c6a16d79..02e5c268 100644
---- a/extensions/ffi.c
-+++ b/extensions/ffi.c
-@@ -2670,9 +2670,9 @@ word* OLVM_ffi(olvm_t* this, word arguments)
- 							j = l;
- 					}
- 					else { // в регистр с плавающей запятой
-+#if (__x86_64__ && (__unix__ || __APPLE__))
- 						// move from ptr to the ad
- 						*(int64_t*)&ad[d++] = args[j];
--#if (__x86_64__ && (__unix__ || __APPLE__))						
- 						fpmask |= 1;
- #endif
- 					}
diff --git a/srcpkgs/ol/patches/xxd.patch b/srcpkgs/ol/patches/xxd.patch
deleted file mode 100644
index 518caea411fa34..00000000000000
--- a/srcpkgs/ol/patches/xxd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/GNUmakefile b/GNUmakefile
-index 218cc40b..1306f92c 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -49,19 +49,7 @@ includes/ol/vm.h: src/olvm.c
- 
- tmp/repl.c: repl
- # vim
--ifneq ($(shell which xxd),)
- 	xxd --include repl >tmp/repl.c
--else
--# coreutils
--ifneq ($(shell which od),)
--	od -An -vtx1 repl| tr -d '\n'| sed \
--	   -e 's/^ /0x/' -e 's/ /,0x/g' \
--	   -e 's/^/unsigned char repl[] = {/' \
--	   -e 's/$$/};/'> $@
--else
--	$(error "You must have 'od' (coreutils) or 'xxd' (vim) tool installed.")
--endif
--endif
- 
- # or
- #	echo '(display "unsigned char repl[] = {") (lfor-each (lambda (x) (for-each display (list x ","))) (file->bytestream "repl")) (display "0};")'| ./vm repl> tmp/repl.c
diff --git a/srcpkgs/ol/template b/srcpkgs/ol/template
index 8b966dcbd291ba..2848c92cd3ae27 100644
--- a/srcpkgs/ol/template
+++ b/srcpkgs/ol/template
@@ -1,10 +1,10 @@
 # Template file for 'ol'
 pkgname=ol
-version=2.5.1
+version=2.6
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
-make_build_args="HAS_SOCKETS=1 HAS_DLOPEN=1 OLVM_FFI=1"
+make_build_args="HAVE_SOCKETS=1 HAVE_DLOPEN=1 OLVM_FFI=1"
 hostmakedepends="xxd"
 short_desc="Purely functional dialect of Lisp"
 maintainer="rc-05 <rc23@email.it>"
@@ -12,10 +12,10 @@ license="LGPL-3.0-or-later, MIT"
 homepage="https://yuriy-chumak.github.io/ol/"
 changelog="https://raw.githubusercontent.com/yuriy-chumak/ol/master/doc/CHANGELOG.md"
 distfiles="
- https://github.com/yuriy-chumak/ol/archive/${version}.tar.gz
+ https://github.com/yuriy-chumak/ol/archive/refs/tags/${version}.tar.gz
  https://github.com/yuriy-chumak/libol-opengl/archive/refs/tags/${version}.tar.gz>libopengl-${version}.tar.gz"
-checksum="d9fe66bd15cf9c9c30bf45b97e5825c2101b518fc27c671c08a95798eec3c510
- 5ccb4e056319e16e3825a7c05d8aa456ce0e87a3111597a2177cc63a67978ffb"
+checksum="c5506de4005a63039dc96962322ae94bf6c33eeaf63dcc03b07b1e8cc3a4d8f3
+ 386bceb757896bcbe4252b0a1a6e2e7d6dc643129210abf35b203e67b2c5d7fb"
 
 if [[ "$XBPS_TARGET_WORDSIZE" -eq 32 ]]; then
 	make_check_args="HAS_64CDEFS=0"
@@ -24,11 +24,11 @@ else
 fi
 
 post_extract() {
+	shopt -s dotglob
 	# collect project files:
 	mv -v ol-${version}/* .
-	mv -v ol-${version}/.* .
 	rmdir ol-${version}
-	# move OpenGL submodule to the proper location:
+	# move the OpenGL submodule to the proper location:
 	mv -v libol-opengl-${version}/* ./libraries/OpenGL/
 	rmdir libol-opengl-${version}
 }