[gentoo-commits] repo/gentoo:master commit in: x11-misc/xpad/files/, x11-misc/xpad/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xpad/files/, x11-misc/xpad/

[Joonas Niilola]

commit:     a33580053c93a5528b80d8f7a3165248845f201d
Author:     Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Thu Jan  2 21:10:06 2025 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 17:29:25 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3358005

x11-misc/xpad: 5.8.0-r1: require gettext version

Patch configure.ac to use gettext version 21, instead
of allowing it to use newer versions of gettext.

Closes: https://bugs.gentoo.org/945976
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39953
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 x11-misc/xpad/files/xpad-5.8.0-gettext.patch | 16 ++++++++++++++++
 x11-misc/xpad/xpad-5.8.0-r1.ebuild           |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/x11-misc/xpad/files/xpad-5.8.0-gettext.patch b/x11-misc/xpad/files/xpad-5.8.0-gettext.patch
new file mode 100644
index 000000000000..e923b8a6ddc1
--- /dev/null
+++ b/x11-misc/xpad/files/xpad-5.8.0-gettext.patch
@@ -0,0 +1,16 @@
+Require specific gettext version, as otherwise using
+>=sys-devel/gettext-0.23 may lead to a build error due
+to misaligned gettext versions.
+https://bugs.gentoo.org/945976
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -52,7 +52,7 @@ AC_TYPE_SIZE_T
+ # i18n / text translations
+ # The choice for version of gettext is only based on what was installed on the developers desktop (2021).
+ # If another version is more convenient, go for it.
+-AM_GNU_GETTEXT_VERSION([0.21])
++AM_GNU_GETTEXT_REQUIRE_VERSION([0.21])
+ AM_GNU_GETTEXT([external])
+ 
+ GETTEXT_PACKAGE="$PACKAGE"

diff --git a/x11-misc/xpad/xpad-5.8.0-r1.ebuild b/x11-misc/xpad/xpad-5.8.0-r1.ebuild
index 1f09ce2c5800..e45f0ca3ec5c 100644
--- a/x11-misc/xpad/xpad-5.8.0-r1.ebuild
+++ b/x11-misc/xpad/xpad-5.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,6 +29,8 @@ BDEPEND=">=dev-util/intltool-0.31
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=("${FILESDIR}"/${PN}-5.8.0-gettext.patch)
+
 src_prepare() {
 	default