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
This commit is contained in:
Ailin Nemui 2023-07-19 15:03:17 +00:00 committed by Git OBS Bridge
parent d9ddbaef58
commit 4c03a09da1
3 changed files with 72 additions and 0 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jul 19 14:23:43 UTC 2023 - Ailin Nemui <ailin.nemui@gmail.com>
- 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 <ailin.nemui@gmail.com> Fri Mar 31 04:43:43 UTC 2023 - Ailin Nemui <ailin.nemui@gmail.com>

View File

@ -29,6 +29,7 @@ Source2: irssi.png
Source3: https://github.com/irssi/irssi/releases/download/%{version}/irssi-%{version}.tar.xz.asc Source3: https://github.com/irssi/irssi/releases/download/%{version}/irssi-%{version}.tar.xz.asc
# https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 # https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1
Source4: %{name}.keyring Source4: %{name}.keyring
Patch0: https://github.com/irssi/irssi/releases/download/%{version}/perl-ntype.patch
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: meson BuildRequires: meson
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
@ -72,6 +73,7 @@ compile plugins for the irssi package.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
%meson \ %meson \

64
perl-ntype.patch Normal file
View File

@ -0,0 +1,64 @@
From 41cdf31269fc0aafec7b37f6965dcc83e65b9dd4 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
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