From 933ed97b746e04550d74569af658ab5811476322 Mon Sep 17 00:00:00 2001 From: bbhtt Date: Fri, 18 Aug 2023 20:14:43 +0530 Subject: [PATCH] Add irssi perl-ntype patch for perl>=5.38 Resolves rhbz#2232750 --- irssi-1.4.4-perl-ntype.patch | 64 ++++++++++++++++++++++++++++++++++++ irssi.spec | 10 ++++-- 2 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 irssi-1.4.4-perl-ntype.patch diff --git a/irssi-1.4.4-perl-ntype.patch b/irssi-1.4.4-perl-ntype.patch new file mode 100644 index 0000000..56abc0a --- /dev/null +++ b/irssi-1.4.4-perl-ntype.patch @@ -0,0 +1,64 @@ +From 41cdf31269fc0aafec7b37f6965dcc83e65b9dd4 Mon Sep 17 00:00:00 2001 +From: ailin-nemui +Date: Tue, 18 Jul 2023 22:05:28 +0000 +Subject: [PATCH] Merge pull request #1474 from ailin-nemui/perl5380 + +fix usage of $type in ExtUtils::ParseXS 3.50 + +(cherry picked from commit da49ec62e6cc949d3e5359b88abbd0b038d3e23a) +--- + src/perl/common/typemap | 2 +- + src/perl/irc/typemap | 2 +- + src/perl/textui/typemap | 2 +- + src/perl/ui/typemap | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/perl/common/typemap b/src/perl/common/typemap +index 5b7e0c32..9b6c6668 100644 +--- 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\"); + +diff --git a/src/perl/irc/typemap b/src/perl/irc/typemap +index 9bf87647..c8a9b678 100644 +--- 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\"); + +diff --git a/src/perl/textui/typemap b/src/perl/textui/typemap +index 7710c2d2..e597c586 100644 +--- 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); +diff --git a/src/perl/ui/typemap b/src/perl/ui/typemap +index 4afb273d..98355191 100644 +--- 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\"); + +-- +2.41.0 + diff --git a/irssi.spec b/irssi.spec index b85e9f6..043a342 100644 --- a/irssi.spec +++ b/irssi.spec @@ -9,7 +9,7 @@ Summary: Modular text mode IRC client with Perl scripting Name: irssi Version: 1.4.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://irssi.org/ @@ -41,6 +41,8 @@ Requires: perl(Symbol) # https://github.com/irssi/irssi/issues/1374 Patch0: irssi-1.4.1-botti-perl-link-fix.patch +# https://github.com/irssi/irssi/pull/1474 +Patch1: irssi-1.4.4-perl-ntype.patch %package devel Summary: Development package for irssi @@ -111,6 +113,10 @@ chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch} %changelog +* Thu Aug 18 2023 Boudhayan Bhattacharya - 1.4.4-5 +- Add irssi perl-ntype patch for perl>=5.38 + Resolves rhbz#2232750 + * Thu Jul 20 2023 Fedora Release Engineering - 1.4.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild @@ -459,7 +465,7 @@ chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch} - Release bump * Sun Sep 17 2006 Dams - 0.8.10-6.a -- Bumped release +- Bumped release * Sun Sep 17 2006 Dams - 0.8.10-5.a - Updated to 0.8.10a