From f51414642ac692eac5da1790b1f332074b0b417d Mon Sep 17 00:00:00 2001 From: Mat Boehlke Date: Sun, 16 Oct 2022 01:02:59 -0500 Subject: [PATCH 1/2] libedit: update to 20221009.3.1. Patch out unnecessary sys/cdefs.h include to fix building with musl --- srcpkgs/libedit/patches/no-cdefs-include.patch | 14 ++++++++++++++ srcpkgs/libedit/template | 8 ++++---- srcpkgs/libedit/update | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/libedit/patches/no-cdefs-include.patch diff --git a/srcpkgs/libedit/patches/no-cdefs-include.patch b/srcpkgs/libedit/patches/no-cdefs-include.patch new file mode 100644 index 000000000000..93f11cdc8013 --- /dev/null +++ b/srcpkgs/libedit/patches/no-cdefs-include.patch @@ -0,0 +1,14 @@ +fixes musl build + +diff --git a/src/reallocarr.c b/src/reallocarr.c +index c637ab4..549573a 100644 +--- a/src/reallocarr.c ++++ b/src/reallocarr.c +@@ -37,7 +37,6 @@ + #include "nbtool_config.h" + #endif + +-#include + __RCSID("$NetBSD: reallocarr.c,v 1.5 2015/08/20 22:27:49 kamil Exp $"); + + #include diff --git a/srcpkgs/libedit/template b/srcpkgs/libedit/template index 84d1bf136a26..1a492c8aaefe 100644 --- a/srcpkgs/libedit/template +++ b/srcpkgs/libedit/template @@ -1,6 +1,6 @@ # Template file for 'libedit' pkgname=libedit -version=20210910.3.1 +version=20221009.3.1 revision=1 _distver="${version%%.*}-${version#*.}" wrksrc="${pkgname}-${_distver}" @@ -9,9 +9,9 @@ makedepends="ncurses-devel" short_desc="Port of the NetBSD Command Line Editor Library" maintainer="Orphaned " license="BSD-3-Clause" -homepage="http://www.thrysoee.dk/editline/" -distfiles="http://www.thrysoee.dk/editline/libedit-${_distver}.tar.gz" -checksum=6792a6a992050762edcca28ff3318cdb7de37dccf7bc30db59fcd7017eed13c5 +homepage="https://www.thrysoee.dk/editline/" +distfiles="https://www.thrysoee.dk/editline/libedit-${_distver}.tar.gz" +checksum=b7b135a5112ce4344c9ac3dff57cc057b2b0e1b912619a36cf1d13fce8e88626 post_install() { vlicense COPYING diff --git a/srcpkgs/libedit/update b/srcpkgs/libedit/update index 6cb34c3a8e09..5e7a8a046b21 100644 --- a/srcpkgs/libedit/update +++ b/srcpkgs/libedit/update @@ -1,2 +1,2 @@ -version=${_datever} +version=${version%%.*} pattern="${pkgname}-\K\d{8}(?=-[\d.]+\.tar)" From 80214a8d2a2ba1d21adfd578156b823aac51f933 Mon Sep 17 00:00:00 2001 From: Mat Boehlke Date: Tue, 18 Oct 2022 13:55:32 -0500 Subject: [PATCH 2/2] editline: avoid file conflict with libedit libedit-devel and editline-devel both package an editline.3 man page To resolve, here editline.3 is renamed to libeditline.3 Conflict free name borrowed from the gentoo package --- srcpkgs/editline/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/editline/template b/srcpkgs/editline/template index 2ea377ce20e0..d7009061ec71 100644 --- a/srcpkgs/editline/template +++ b/srcpkgs/editline/template @@ -1,17 +1,21 @@ # Template file for 'editline' pkgname=editline version=1.17.1 -revision=1 +revision=2 build_style=gnu-configure short_desc="Minimal readline() replacement" maintainer="Orphaned " license="Spencer-94" -homepage="http://troglobit.com/projects/editline/" +homepage="https://troglobit.com/projects/editline/" +changelog="https://raw.githubusercontent.com/troglobit/editline/master/ChangeLog.md" distfiles="https://github.com/troglobit/editline/releases/download/${version}/editline-${version}.tar.xz" checksum=df223b3333a545fddbc67b49ded3d242c66fadf7a04beb3ada20957fcd1ffc0e post_install() { rm -rf ${DESTDIR}/usr/share/doc + + # avoid conflict with libedit + mv ${DESTDIR}/usr/share/man/man3/{,lib}editline.3 } editline-devel_package() {