[gentoo-commits] repo/gentoo:master commit in: net-irc/irssi/files/, net-irc/irssi/

["Sam James" <sam@gentoo.org>]

commit:     ff77eb3bccbb3e458eb5ecfd5ffec7903acd27a3
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Thu Jul  6 16:19:37 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul  6 20:59:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff77eb3b

net-irc/irssi: Fix usage of $type in ExtUtils::ParseXS 3.50

With recent dev-lang/perl upgrade, some of the scripts are failing to
load. This patch taken from upstream should fix that.

Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31781
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...irssi-1.4.4-fix-usage-of-type-in-ExtUtils.patch | 43 ++++++++++++++++++++++
 .../{irssi-9999.ebuild => irssi-1.4.4-r1.ebuild}   |  4 ++
 net-irc/irssi/irssi-9999.ebuild                    |  4 ++
 3 files changed, 51 insertions(+)

diff --git a/net-irc/irssi/files/irssi-1.4.4-fix-usage-of-type-in-ExtUtils.patch b/net-irc/irssi/files/irssi-1.4.4-fix-usage-of-type-in-ExtUtils.patch
new file mode 100644
index 000000000000..517618e15098
--- /dev/null
+++ b/net-irc/irssi/files/irssi-1.4.4-fix-usage-of-type-in-ExtUtils.patch
@@ -0,0 +1,43 @@
+https://patch-diff.githubusercontent.com/raw/irssi/irssi/pull/1474.patch
+From: Ailin Nemui <ailin@d5421s.localdomain>
+Date: Tue, 4 Jul 2023 10:27:09 +0200
+Subject: [PATCH] fix usage of $type in ExtUtils::ParseXS 3.50
+
+--- a/src/perl/common/typemap
++++ b/src/perl/common/typemap
+@@ -28,5 +28,5 @@ T_IrssiObj
+ 	$arg = iobject_bless((SERVER_REC *)$var);
+ 
+ T_PlainObj
+-	$arg = plain_bless($var, \"$type\");
++	$arg = plain_bless($var, \"$ntype\");
+ 
+--- a/src/perl/irc/typemap
++++ b/src/perl/irc/typemap
+@@ -36,5 +36,5 @@ T_DccObj
+ 	$arg = simple_iobject_bless((DCC_REC *)$var);
+ 
+ T_PlainObj
+-	$arg = plain_bless($var, \"$type\");
++	$arg = plain_bless($var, \"$ntype\");
+ 
+--- a/src/perl/textui/typemap
++++ b/src/perl/textui/typemap
+@@ -18,7 +18,7 @@ T_BufferLineWrapper
+ OUTPUT
+ 
+ T_PlainObj
+-	$arg = plain_bless($var, \"$type\");
++	$arg = plain_bless($var, \"$ntype\");
+ 
+ T_BufferLineWrapper
+ 	$arg = perl_buffer_line_bless($var);
+--- a/src/perl/ui/typemap
++++ b/src/perl/ui/typemap
+@@ -13,5 +13,5 @@ T_PlainObj
+ OUTPUT
+ 
+ T_PlainObj
+-	$arg = plain_bless($var, \"$type\");
++	$arg = plain_bless($var, \"$ntype\");
+ 

diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-1.4.4-r1.ebuild
similarity index 95%
copy from net-irc/irssi/irssi-9999.ebuild
copy to net-irc/irssi/irssi-1.4.4-r1.ebuild
index 40772b5198b3..0a53a51c01ca 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-1.4.4-r1.ebuild
@@ -39,6 +39,10 @@ BDEPEND="dev-lang/perl
 	virtual/pkgconfig"
 RDEPEND+=" selinux? ( sec-policy/selinux-irc )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-usage-of-type-in-ExtUtils.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}

diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 40772b5198b3..c5cc0db2269a 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -39,6 +39,10 @@ BDEPEND="dev-lang/perl
 	virtual/pkgconfig"
 RDEPEND+=" selinux? ( sec-policy/selinux-irc )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-usage-of-\$type-in-ExtUtils.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}