From 4c03a09da183fd85aea3983dbd24e8d0fe3cc34f341e150461359cb42d0f9935 Mon Sep 17 00:00:00 2001 From: Ailin Nemui Date: Wed, 19 Jul 2023 15:03:17 +0000 Subject: [PATCH] Accepting request 1099542 from home:ailin_nemui:branches:server:irc - add perl-ntype.patch, fixes broken scripting during run-time with perl 5.37 and later (#1474) OBS-URL: https://build.opensuse.org/request/show/1099542 OBS-URL: https://build.opensuse.org/package/show/server:irc/irssi?expand=0&rev=139 --- irssi.changes | 6 +++++ irssi.spec | 2 ++ perl-ntype.patch | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 perl-ntype.patch diff --git a/irssi.changes b/irssi.changes index 4fe49ab..0b64c32 100644 --- a/irssi.changes +++ b/irssi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 19 14:23:43 UTC 2023 - Ailin Nemui + +- add perl-ntype.patch, fixes broken scripting during run-time + with perl 5.37 and later (#1474) + ------------------------------------------------------------------- Fri Mar 31 04:43:43 UTC 2023 - Ailin Nemui diff --git a/irssi.spec b/irssi.spec index 514547a..298950b 100644 --- a/irssi.spec +++ b/irssi.spec @@ -29,6 +29,7 @@ Source2: irssi.png Source3: https://github.com/irssi/irssi/releases/download/%{version}/irssi-%{version}.tar.xz.asc # https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 Source4: %{name}.keyring +Patch0: https://github.com/irssi/irssi/releases/download/%{version}/perl-ntype.patch BuildRequires: glib2-devel BuildRequires: meson BuildRequires: ncurses-devel @@ -72,6 +73,7 @@ compile plugins for the irssi package. %prep %setup -q +%patch0 -p1 %build %meson \ diff --git a/perl-ntype.patch b/perl-ntype.patch new file mode 100644 index 0000000..e674a1d --- /dev/null +++ b/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 +