Re: [PR PATCH] [Updated] libunistring: update to 1.1.

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

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

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

https://github.com/mhmdanas/void-packages libunistring-1.1
https://github.com/void-linux/void-packages/pull/43251

libunistring: update to 1.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/43251.patch is attached

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

From 9ae29f7f3e20ff80e55ecc2584acd4470b8e677e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 22:57:41 +0100
Subject: [PATCH 01/12] libunistring: update to 1.1.

---
 common/shlibs                 | 2 +-
 srcpkgs/libunistring/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4af39bae735e..f3664dd2ee4b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1416,7 +1416,7 @@ libgda-ui-5.0.so.4 libgda-5.2.9_4
 libgda-xslt-5.0.so.4 libgda-5.2.9_4
 libamtk-5.so.0 amtk-5.0.0_1
 libdevhelp-3.so.6 devhelp-libs-3.30.0_1
-libunistring.so.2 libunistring-0.9.4_1
+libunistring.so.5 libunistring-1.1_1
 libguile-2.2.so.1 libguile-2.2.7_1
 libopts.so.25 libopts-5.18.4_6
 libanjuta-3.so.0 anjuta-3.8.4_1
diff --git a/srcpkgs/libunistring/template b/srcpkgs/libunistring/template
index 296c327fd895..09d2593c73e3 100644
--- a/srcpkgs/libunistring/template
+++ b/srcpkgs/libunistring/template
@@ -1,14 +1,14 @@
 # Template file for 'libunistring'
 pkgname=libunistring
-version=1.0
+version=1.1
 revision=1
 build_style=gnu-configure
 short_desc="Library for manipulating Unicode strings and C strings"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://www.gnu.org/software/libunistring"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3c0184c0e492d7c208ce31d25dd1d2c58f0c3ed6cbbe032c5b248cddad318544
+distfiles="${GNU_SITE}/libunistring/libunistring-${version}.tar.gz"
+checksum=a2252beeec830ac444b9f68d6b38ad883db19919db35b52222cf827c385bdb6a
 
 libunistring-devel_package() {
 	short_desc+=" - development files"

From e5bf50e6270e94018d098d953494e6b7191ed7e5 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 22:58:29 +0100
Subject: [PATCH 02/12] gnunet: revbump for libunistring-1.1.

---
 srcpkgs/gnunet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index a8a6dabe66ba..164d7f54cfd1 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=4
+revision=5
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"

From 987b86cb8ea4b0c7b94355cae602d468ca1cc73e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 22:58:29 +0100
Subject: [PATCH 03/12] gnutls: revbump for libunistring-1.1.

---
 srcpkgs/gnutls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index f135514b90b0..9b0a76b4bddc 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,7 +1,7 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.7.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-guile --disable-static
  --disable-valgrind-tests --disable-rpath

From 6fe38204ca041fe0fa82d5b0e64452ce446d1db5 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 22:58:29 +0100
Subject: [PATCH 04/12] guile: revbump for libunistring-1.1.

---
 srcpkgs/guile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index f0f917b1c4ee..5ec734b66f74 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,7 +1,7 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.2.7
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --disable-error-on-warning"
 hostmakedepends="pkg-config texinfo"

From 980055cdc659ec1f9b1a29d38a6c290667dc6b2a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 22:58:30 +0100
Subject: [PATCH 05/12] lagrange: revbump for libunistring-1.1.

---
 srcpkgs/lagrange/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 674bc6e91f87..55ae4a0ce505 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,7 +1,7 @@
 # Template file for 'lagrange'
 pkgname=lagrange
 version=1.15.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DTFDN_ENABLE_SSE41=NO"
 hostmakedepends="pkg-config zip"

From 5a920a2cedce7af9f96784c94a038d51304278f7 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 22:58:30 +0100
Subject: [PATCH 06/12] libidn2: revbump for libunistring-1.1.

---
 srcpkgs/libidn2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libidn2/template b/srcpkgs/libidn2/template
index ef8d4fc0bb33..200bef2487b7 100644
--- a/srcpkgs/libidn2/template
+++ b/srcpkgs/libidn2/template
@@ -1,7 +1,7 @@
 # Template file for 'libidn2'
 pkgname=libidn2
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext-devel libtool pkg-config gtk-doc"
 makedepends="libunistring-devel"

From ef96dfd64f67bf4be270b023916f95c84963b12d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 22:58:30 +0100
Subject: [PATCH 07/12] libratbag: revbump for libunistring-1.1.

---
 srcpkgs/libratbag/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libratbag/template b/srcpkgs/libratbag/template
index bd7e4bf18053..881546e6fa46 100644
--- a/srcpkgs/libratbag/template
+++ b/srcpkgs/libratbag/template
@@ -1,7 +1,7 @@
 # Template file for 'libratbag'
 pkgname=libratbag
 version=0.17
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtests=false -Dsystemd-unit-dir=''
  -Dsystemd=false -Db_ndebug=false"

From 251c2c7777e88ec5f7e4c295f3785ee1a0621c6d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 22:58:31 +0100
Subject: [PATCH 08/12] libt3widget: revbump for libunistring-1.1.

---
 srcpkgs/libt3widget/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libt3widget/template b/srcpkgs/libt3widget/template
index b52ee18ad516..f17e46756bad 100644
--- a/srcpkgs/libt3widget/template
+++ b/srcpkgs/libt3widget/template
@@ -1,11 +1,11 @@
 # Template file for 'libt3widget'
 pkgname=libt3widget
 version=1.2.2
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr"
-hostmakedepends="pkg-config gettext"
-makedepends="libtool gettext-devel libtranscript-devel libunistring-devel
+hostmakedepends="pkg-config gettext libtool"
+makedepends="gettext-devel libtranscript-devel libunistring-devel
  libt3config-devel libt3window-devel libt3key-devel ncurses-libtinfo-devel
  pcre2-devel libxcb-devel gpm-devel"
 short_desc="Tilde Terminal Toolkit's widget libary"
@@ -15,8 +15,6 @@ homepage="https://os.ghalkes.nl/t3/libt3widget.html"
 distfiles="https://os.ghalkes.nl/dist/libt3widget-${version}.tar.bz2"
 checksum=9eb7e1d0ccdfc917f18ba1785a2edb4faa6b0af8b460653d962abf91136ddf1c
 
-export LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool
-
 libt3widget-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From dc74fab6c1ba22cb1bcee1ca8bd096b2723c7381 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 22:58:31 +0100
Subject: [PATCH 09/12] libt3window: revbump for libunistring-1.1.

---
 srcpkgs/libt3window/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libt3window/template b/srcpkgs/libt3window/template
index c7a441003fe5..d185a4ffab7e 100644
--- a/srcpkgs/libt3window/template
+++ b/srcpkgs/libt3window/template
@@ -1,11 +1,11 @@
 # Template file for 'libt3window'
 pkgname=libt3window
 version=0.4.1
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr"
-hostmakedepends="pkg-config gettext"
-makedepends="libtool gettext-devel ncurses-libtinfo-devel libtranscript-devel
+hostmakedepends="pkg-config gettext libtool"
+makedepends="gettext-devel ncurses-libtinfo-devel libtranscript-devel
  libunistring-devel"
 short_desc="Tilde Terminal Toolkit's window library"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
@@ -14,8 +14,6 @@ homepage="https://os.ghalkes.nl/t3/libt3window.html"
 distfiles="https://os.ghalkes.nl/dist/libt3window-${version}.tar.bz2"
 checksum=4c14d3f4f946637fd6c3fa23ef7511fa505880946e151406d5e16f645d24e792
 
-export LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool
-
 libt3window-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${source}_${revision}"

From 651a369144fd504630a6e2041c5319b4aedf2647 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 22:58:31 +0100
Subject: [PATCH 10/12] notcurses: revbump for libunistring-1.1.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 6dd8a091319f..9fba1f2ea4b2 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,12 +1,12 @@
 # Template file for 'notcurses'
 pkgname=notcurses
 version=3.0.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
 hostmakedepends="pkg-config $(vopt_if man pandoc)"
 makedepends="libunistring-devel ffmpeg-devel ncurses-libtinfo-devel qrcodegen-devel doctest-devel
- libdeflate-devel"
+ libdeflate-devel gnutls-devel"
 depends="ncurses-base"
 short_desc="Blingful character graphics/TUI library"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 8e1660543855585789f3d5a165a54057c2db5e1f Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 22:58:32 +0100
Subject: [PATCH 11/12] sssd: revbump for libunistring-1.1.

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index ed1bfeea048e..691e1b958a5e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.8.2
-revision=1
+revision=2
 # upstream explicitly hardcodes to use glibc:
 # https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
 archs="~*-musl"

From 9c4708a93b6f9cd0806a5823201f9b72ebb2e16a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 22:58:32 +0100
Subject: [PATCH 12/12] tilde: revbump for libunistring-1.1.

---
 srcpkgs/tilde/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilde/template b/srcpkgs/tilde/template
index b9d7065585b8..20ff3e6aae64 100644
--- a/srcpkgs/tilde/template
+++ b/srcpkgs/tilde/template
@@ -1,7 +1,7 @@
 # Template file for 'tilde'
 pkgname=tilde
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr"
 hostmakedepends="pkg-config gettext"