Re: [PR PATCH] [Updated] loksh: update to 6.7

[renatoaguiar <renatoaguiar@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by renatoaguiar against master on the void-packages repository

https://github.com/renatoaguiar/void-packages loksh
https://github.com/void-linux/void-packages/pull/22216

loksh: update to 6.7


A patch file from https://github.com/void-linux/void-packages/pull/22216.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-loksh-22216.patch --]
[-- Type: text/x-diff, Size: 3844 bytes --]

From 4b5c3d508c12875dfd2ebabf0538451b3176a0f5 Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Fri, 22 May 2020 20:50:09 -0700
Subject: [PATCH] loksh: update to 6.7

---
 srcpkgs/loksh/files/cdefs.patch      |  9 +++++++++
 srcpkgs/loksh/patches/ncursesw.patch | 22 ++++++++++------------
 srcpkgs/loksh/template               | 24 +++++++++++++++++-------
 3 files changed, 36 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/loksh/files/cdefs.patch

diff --git a/srcpkgs/loksh/files/cdefs.patch b/srcpkgs/loksh/files/cdefs.patch
new file mode 100644
index 00000000000..5c5ff75e558
--- /dev/null
+++ b/srcpkgs/loksh/files/cdefs.patch
@@ -0,0 +1,9 @@
+--- include/sys/cdefs.h.orig	2020-05-22 21:05:19.805358049 -0700
++++ include/sys/cdefs.h	2020-05-22 21:05:49.069119627 -0700
+@@ -53,4 +53,6 @@
+ 
+ #endif /* !_SYS_CDEFS_H_ */
+ 
++#ifdef __GLIBC__
+ #include_next <sys/cdefs.h>
++#endif
diff --git a/srcpkgs/loksh/patches/ncursesw.patch b/srcpkgs/loksh/patches/ncursesw.patch
index 852b0acb63f..b0427cb365e 100644
--- a/srcpkgs/loksh/patches/ncursesw.patch
+++ b/srcpkgs/loksh/patches/ncursesw.patch
@@ -1,13 +1,11 @@
---- Makefile.orig	2018-10-18 11:46:33.917801273 -0700
-+++ Makefile	2018-10-18 11:46:38.748833596 -0700
-@@ -9,8 +9,8 @@
- MAN_DIR ?= $(PREFIX)/share/man
- DOC_DIR ?= $(PREFIX)/share/doc/loksh
+--- meson.build.orig	2020-05-22 20:21:50.457744069 -0700
++++ meson.build	2020-05-22 20:46:43.193735356 -0700
+@@ -5,7 +5,7 @@
+ c_args = ['-D_GNU_SOURCE', '-DEMACS', '-DVI', '-Wno-format-security', '-Wno-pointer-sign']
+ deps = []
  
--NCURSES_CFLAGS = $(shell pkg-config --cflags ncurses)
--NCURSES_LDFLAGS = $(shell pkg-config --libs ncurses)
-+NCURSES_CFLAGS = $(shell pkg-config --cflags ncursesw)
-+NCURSES_LDFLAGS = $(shell pkg-config --libs ncursesw)
- 
- OBJECTS = alloc.o c_ksh.o c_sh.o c_test.o c_ulimit.o edit.o emacs.o eval.o \
-           exec.o expr.o history.o io.o jobs.o lex.o mail.o main.o misc.o \
+-ncurses = dependency('ncurses', required: false)
++ncurses = dependency('ncursesw', required: false)
+ if ncurses.found()
+ 	deps += [ncurses]
+ else
diff --git a/srcpkgs/loksh/template b/srcpkgs/loksh/template
index 7af58759a31..a88650ebaa3 100644
--- a/srcpkgs/loksh/template
+++ b/srcpkgs/loksh/template
@@ -1,18 +1,19 @@
 # Template file for 'loksh'
 pkgname=loksh
-version=6.6
+version=6.7
 revision=1
-build_style=gnu-makefile
-make_build_args="HAVE_LIBBSD=1"
-make_install_args="BIN_NAME=loksh"
+_lolibc_commit=f6bbd5bae97e58d0be6ea9fbbe5131853d5b0b70
+build_style=meson
 hostmakedepends="pkg-config"
-makedepends="libbsd-devel ncurses-devel"
+makedepends="ncurses-devel"
 short_desc="Linux port of OpenBSD's ksh"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="custom:Public Domain"
 homepage="https://github.com/dimkr/loksh"
-distfiles="https://github.com/dimkr/loksh/archive/${version}.tar.gz"
-checksum=97a020df82ceebe216c5a306e87360c5e3398d7403347aaff50978446ccb764d
+distfiles="https://github.com/dimkr/loksh/archive/${version}.tar.gz
+ https://github.com/dimkr/lolibc/archive/${_lolibc_commit}.tar.gz>lolibc.tar.gz"
+checksum="5e921bb740348eab670160f92ec0e959ff35b5ae36db9e9ed3a1b6de3e1d7551
+ dec9c7d5759f3df1d4aeda419bd402a916b0c6681b114ea6899db78f20577cae"
 register_shell="/bin/loksh"
 
 alternatives="
@@ -22,9 +23,18 @@ alternatives="
  sh:sh.1:/usr/share/man/man1/loksh-sh.1
 "
 
+post_extract() {
+	patch -d "../lolibc-${_lolibc_commit}" -Np0 -i "${FILESDIR}/cdefs.patch"
+	rmdir subprojects/lolibc
+	ln -s "../../lolibc-${_lolibc_commit}" subprojects/lolibc
+}
+
 post_install() {
 	vlicense LEGAL
 
+	mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/loksh
+	mv ${DESTDIR}/usr/share/man/man1/ksh.1 \
+	   ${DESTDIR}/usr/share/man/man1/loksh.1
 	mv ${DESTDIR}/usr/share/man/man1/sh.1 \
 	   ${DESTDIR}/usr/share/man/man1/loksh-sh.1
 }