[PR PATCH] libedit: update to 20221009.3.1.

[PR PATCH] libedit: update to 20221009.3.1.

[mtboehlke]

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

There is a new pull request by mtboehlke against master on the void-packages repository

https://github.com/mtboehlke/void-packages libedit
https://github.com/void-linux/void-packages/pull/39980

libedit: update to 20221009.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From b109ffe9ddf883bc1a7b7b7ed2b6daa1ba1e483c Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 16 Oct 2022 01:02:59 -0500
Subject: [PATCH] libedit: update to 20221009.3.1.

---
 srcpkgs/libedit/template | 8 ++++----
 srcpkgs/libedit/update   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

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 <orphan@voidlinux.org>"
 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)"

Re: WIP: libedit: update to 20221009.3.1.

[mtboehlke]

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

New comment by mtboehlke on void-packages repository

https://github.com/void-linux/void-packages/pull/39980#issuecomment-1279901253

Comment:
Still need to fix musl build

Re: [PR PATCH] [Updated] WIP: libedit: update to 20221009.3.1.

[mtboehlke]

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

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

https://github.com/mtboehlke/void-packages libedit
https://github.com/void-linux/void-packages/pull/39980

WIP: libedit: update to 20221009.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From b36e2414319f846adc60104f699d1955790c89bd Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
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 for building with musl
---
 srcpkgs/libedit/patches/no-cdefs-include.patch | 12 ++++++++++++
 srcpkgs/libedit/template                       |  8 ++++----
 srcpkgs/libedit/update                         |  2 +-
 3 files changed, 17 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..f27e2e817920
--- /dev/null
+++ b/srcpkgs/libedit/patches/no-cdefs-include.patch
@@ -0,0 +1,12 @@
+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 <sys/cdefs.h>
+ __RCSID("$NetBSD: reallocarr.c,v 1.5 2015/08/20 22:27:49 kamil Exp $");
+ 
+ #include <errno.h>
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 <orphan@voidlinux.org>"
 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 7d1d065d4446a823c6e3a7c563a61efa88dbc0fe Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 16 Oct 2022 02:49:53 -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 <orphan@voidlinux.org>"
 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() {

Re: WIP: libedit: update to 20221009.3.1.

[mtboehlke]

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

New comment by mtboehlke on void-packages repository

https://github.com/void-linux/void-packages/pull/39980#issuecomment-1279901253

Comment:
~Still need to fix musl build~

Re: WIP: libedit: update to 20221009.3.1.

[mtboehlke]

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

New comment by mtboehlke on void-packages repository

https://github.com/void-linux/void-packages/pull/39980#issuecomment-1279917717

Comment:
libedit and editline both package an editline.3 man page.  Other distributions solve this by simply renaming the editline package's page.  Arch Linux goes with editline-troglobit.3, and gentoo uses libeditline.3.  I borrowed the latter, which at least matches the name of the library object.

Re: [PR REVIEW] libedit: update to 20221009.3.1.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39980#discussion_r998549908

Comment:
```suggestion
fixes musl build

diff --git a/src/reallocarr.c b/src/reallocarr.c
```

Re: [PR PATCH] [Updated] libedit: update to 20221009.3.1.

[mtboehlke]

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

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

https://github.com/mtboehlke/void-packages libedit
https://github.com/void-linux/void-packages/pull/39980

libedit: update to 20221009.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From f51414642ac692eac5da1790b1f332074b0b417d Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
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 <sys/cdefs.h>
+ __RCSID("$NetBSD: reallocarr.c,v 1.5 2015/08/20 22:27:49 kamil Exp $");
+ 
+ #include <errno.h>
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 <orphan@voidlinux.org>"
 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 <mtboehlke@gmail.com>
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 <orphan@voidlinux.org>"
 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() {

Re: [PR PATCH] [Merged]: libedit: update to 20221009.3.1.

[classabbyamp]

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

There's a merged pull request on the void-packages repository

libedit: update to 20221009.3.1.
https://github.com/void-linux/void-packages/pull/39980

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Re: [PR REVIEW] libedit: update to 20221009.3.1.

[mtboehlke]

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

New review comment by mtboehlke on void-packages repository

https://github.com/void-linux/void-packages/pull/39980#discussion_r998604610

Comment:
Thanks!