Re: [PR PATCH] [Updated] gettext: update to 0.22.

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

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

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

https://github.com/mhmdanas/void-packages gettext-0.21.1
https://github.com/void-linux/void-packages/pull/42451

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

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

@Gottox

<!--
#### 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/42451.patch is attached

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

From d46345f027e70b1a71d79fd871df961895a5d495 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 25 Feb 2023 21:05:21 +0000
Subject: [PATCH 1/3] gettext: update to 0.22.

---
 common/shlibs                                 |  4 +-
 srcpkgs/fcitx/template                        |  2 +-
 srcpkgs/gettext/patches/automake-1.16.4.patch | 52 -------------------
 srcpkgs/gettext/template                      | 16 +++---
 srcpkgs/gtranslator/template                  |  2 +-
 5 files changed, 11 insertions(+), 65 deletions(-)
 delete mode 100644 srcpkgs/gettext/patches/automake-1.16.4.patch

diff --git a/common/shlibs b/common/shlibs
index ff764f4118284..e5bce307ec4f9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -192,8 +192,8 @@ libxfce4panel-2.0.so.4 libxfce4panel-4.18.0_1
 libgdbm.so.6 gdbm-1.16_1
 libgdbm_compat.so.4 gdbm-1.10_1_1
 libintl.so.8 gettext-libs-0.19.2_1
-libgettextlib-0.21.so gettext-0.21_3
-libgettextsrc-0.21.so gettext-0.21_3
+libgettextlib-0.22.so gettext-0.22_1
+libgettextsrc-0.22.so gettext-0.22_1
 libtextstyle.so.0 gettext-0.21_3
 libgettextpo.so.0 gettext-0.21_3
 libattr.so.1 attr-2.4.43_1
diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template
index 18db7e8fad328..ab9172b3e9cd1 100644
--- a/srcpkgs/fcitx/template
+++ b/srcpkgs/fcitx/template
@@ -1,7 +1,7 @@
 # Template file for 'fcitx'
 pkgname=fcitx
 version=4.2.9.9
-revision=1
+revision=2
 build_style=cmake
 build_helper=gir
 configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
diff --git a/srcpkgs/gettext/patches/automake-1.16.4.patch b/srcpkgs/gettext/patches/automake-1.16.4.patch
deleted file mode 100644
index 9de0e0b1208f8..0000000000000
--- a/srcpkgs/gettext/patches/automake-1.16.4.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From d1836dbbd6a90b4c0ab79bc5292c023f08b49511 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Sun, 8 Aug 2021 02:08:43 +0200
-Subject: [PATCH] libtextstyle: Make gl_INIT_PACKAGE work with Automake >=
- 1.16.4.
-
-Reported and analyzed by Nicole Mazzuca <mazzucan@outlook.com> in
-<https://lists.gnu.org/archive/html/bug-libunistring/2021-08/msg00002.html>.
-
-* m4/init-package-version.m4 (gl_INIT_PACKAGE): Use a new macro gl_INIT_EMPTY.
-(gl_INIT_DUMMY): Expand to empty in two steps, via a new macro gl_INIT_DUMMY2.
----
- libtextstyle/m4/init-package-version.m4 | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/libtextstyle/m4/init-package-version.m4 b/libtextstyle/m4/init-package-version.m4
-index f131a844f..a26b1ab88 100644
---- a/libtextstyle/m4/init-package-version.m4
-+++ b/libtextstyle/m4/init-package-version.m4
-@@ -1,5 +1,5 @@
--# init-package-version.m4 serial 1 (gettext-0.18)
--dnl Copyright (C) 1992-2009 Free Software Foundation, Inc.
-+# init-package-version.m4 serial 2
-+dnl Copyright (C) 1992-2021 Free Software Foundation, Inc.
- dnl This file is free software, distributed under the terms of the GNU
- dnl General Public License.  As a special exception to the GNU General
- dnl Public License, this file may be distributed as part of a program
-@@ -77,7 +77,7 @@ AC_DEFUN([gl_INIT_PACKAGE],
-             m4_bpatsubst(m4_dquote(
-                 m4_defn([AM_INIT_AUTOMAKE])),
-               [AC_PACKAGE_NAME], [gl_INIT_DUMMY])),
--          [AC_PACKAGE_TARNAME], [gl_INIT_DUMMY])),
-+          [AC_PACKAGE_TARNAME], [gl_INIT_EMPTY])),
-       [AC_PACKAGE_VERSION], [gl_INIT_DUMMY])
-     [AC_SUBST([PACKAGE], [$1])
-      AC_SUBST([VERSION], [$2])
-@@ -85,7 +85,11 @@ AC_DEFUN([gl_INIT_PACKAGE],
-   m4_define([AM_INIT_AUTOMAKE],
-     m4_defn([gl_RPL_INIT_AUTOMAKE]))
- ])
--m4_define([gl_INIT_DUMMY], [])
-+m4_define([gl_INIT_EMPTY], [])
-+dnl Automake 1.16.4 no longer accepts an empty value for gl_INIT_DUMMY.
-+dnl But a macro that later expands to empty works.
-+m4_define([gl_INIT_DUMMY], [gl_INIT_DUMMY2])
-+m4_define([gl_INIT_DUMMY2], [])
- AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [
-   m4_ifval([$2],
-     [m4_fatal([After gl_INIT_PACKAGE, the two-argument form of AM_INIT_AUTOMAKE cannot be used.])])
--- 
-2.17.1
-
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 2ab568366d26a..ec29943bbff8d 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
 # Template file for 'gettext'
 pkgname=gettext
-version=0.21
-revision=4
+version=0.22
+revision=1
 build_style=gnu-configure
 configure_args="--disable-java --disable-native-java --disable-csharp
  --disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
@@ -14,14 +14,14 @@ configure_args="--disable-java --disable-native-java --disable-csharp
 # Either:
 # - Have xz in hostmakedepends; or
 # - Let gettext-devel depends on bzip2
-hostmakedepends="xz automake libtool"
+hostmakedepends="xz libtool"
 short_desc="Internationalized Message Handling Library and tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gettext/"
 changelog="https://git.savannah.gnu.org/cgit/gettext.git/plain/NEWS"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12
+distfiles="${GNU_SITE}/gettext/gettext-${version}.tar.lz"
+checksum=24e2669b23abf26f9afdbbc3055edeb33879fb36454de80e8e4aadb3dbbe0b96
 
 subpackages="gettext-devel-examples gettext-devel gettext-devel-tools"
 unset _intl_lib
@@ -36,10 +36,6 @@ else
 	conflicts="gettext-libs>=0"
 fi
 
-pre_configure() {
-	autoreconf -fi
-}
-
 post_install() {
 	# don't overwrite musl's header
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -48,6 +44,7 @@ post_install() {
 	fi
 }
 
+
 gettext-devel-examples_package() {
 	short_desc+=" - examples for development"
 	pkg_install() {
@@ -56,6 +53,7 @@ gettext-devel-examples_package() {
 }
 
 gettext-devel_package() {
+	conflicts="gettext-libs>=0"
 	depends="${sourcepkg}>=${version}_${revision}
 	 gettext-devel-tools>=${version}_${revision}"
 	if [ -n "${_intl_lib}" ]; then
diff --git a/srcpkgs/gtranslator/template b/srcpkgs/gtranslator/template
index 9f5b702461df2..95df38fe0e21a 100644
--- a/srcpkgs/gtranslator/template
+++ b/srcpkgs/gtranslator/template
@@ -1,7 +1,7 @@
 # Template file for 'gtranslator'
 pkgname=gtranslator
 version=40.0
-revision=1
+revision=3
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel itstool"
 makedepends="gettext-devel libglib-devel libdazzle-devel libsoup-devel

From c6e6fc6ca1b67c0836221879e069bd2646edfa1d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 27 Jul 2023 19:37:30 +0100
Subject: [PATCH 2/3] gettext-tiny: mark as conflicting with
 gettext-devel-tools.

---
 srcpkgs/gettext-tiny/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gettext-tiny/template b/srcpkgs/gettext-tiny/template
index 184bc4d0458ec..a3cefc59fcf76 100644
--- a/srcpkgs/gettext-tiny/template
+++ b/srcpkgs/gettext-tiny/template
@@ -1,7 +1,7 @@
 # Template file for 'gettext-tiny'
 pkgname=gettext-tiny
 version=0.3.2
-revision=1
+revision=2
 short_desc="Tiny Internationalized Message Handling Library and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -9,7 +9,7 @@ homepage="https://github.com/rofl0r/gettext-tiny"
 distfiles="https://github.com/rofl0r/${pkgname}/archive/v${version}.tar.gz"
 checksum=29cc165e27e83d2bb3760118c2368eadab550830d962d758e51bd36eb860f383
 
-conflicts="gettext>=0"
+conflicts="gettext>=0 gettext-devel-tools>=0"
 
 do_build() {
 	make ${makejobs} prefix=/usr
@@ -21,7 +21,7 @@ do_install() {
 }
 
 gettext-tiny-devel_package() {
-	conflicts="glibc-devel>=0 musl-devel>=0"
+	conflicts="glibc-devel>=0 musl-devel>=0 gettext-devel-tools>=0"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From a9960a7de26c65b35e4ee07b4873830cf987674b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 27 Jul 2023 19:38:34 +0100
Subject: [PATCH 3/3] fcitx: revbump for gettext-0.22.

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

diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template
index ab9172b3e9cd1..feaf9619a6e63 100644
--- a/srcpkgs/fcitx/template
+++ b/srcpkgs/fcitx/template
@@ -1,7 +1,7 @@
 # Template file for 'fcitx'
 pkgname=fcitx
 version=4.2.9.9
-revision=2
+revision=3
 build_style=cmake
 build_helper=gir
 configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF