diff --git a/.gitignore b/.gitignore index 0812165..384c449 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /XS-Parse-Keyword-0.10.tar.gz /XS-Parse-Keyword-0.11.tar.gz /XS-Parse-Keyword-0.12.tar.gz +/XS-Parse-Keyword-0.13.tar.gz diff --git a/XS-Parse-Keyword-0.12-Bump-ABI-version.patch b/XS-Parse-Keyword-0.12-Bump-ABI-version.patch deleted file mode 100644 index 04cd449..0000000 --- a/XS-Parse-Keyword-0.12-Bump-ABI-version.patch +++ /dev/null @@ -1,70 +0,0 @@ -From fdc0155eb495a0082bf9815d34bc46a240b8c97b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 17 Aug 2021 09:28:45 +0200 -Subject: [PATCH] Bump ABI version -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Struct XSParseKeywordPieceType changed size in XS-Parse-Keyword-0.12. - -CPAN RT#138708. - -Signed-off-by: Petr Písař ---- - XSParseKeyword.h | 4 ++-- - lib/XS/Parse/Keyword.xs | 8 ++++---- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/XSParseKeyword.h b/XSParseKeyword.h -index d114bb9..a614da3 100644 ---- a/XSParseKeyword.h -+++ b/XSParseKeyword.h -@@ -1,7 +1,7 @@ - #ifndef __XS_PARSE_KEYWORD_H__ - #define __XS_PARSE_KEYWORD_H__ - --#define XSPARSEKEYWORD_ABI_VERSION 1 -+#define XSPARSEKEYWORD_ABI_VERSION 2 - - struct XSParseKeywordPieceType; - struct XSParseKeywordPieceType { -@@ -215,7 +215,7 @@ static void S_boot_xs_parse_keyword(pTHX_ double ver) { - abi_ver); - - register_xs_parse_keyword_func = INT2PTR(void (*)(pTHX_ const char *, const struct XSParseKeywordHooks *, void *), -- SvUV(*hv_fetchs(PL_modglobal, "XS::Parse::Keyword/register()@1", 0))); -+ SvUV(*hv_fetchs(PL_modglobal, "XS::Parse::Keyword/register()@2", 0))); - } - - #endif -diff --git a/lib/XS/Parse/Keyword.xs b/lib/XS/Parse/Keyword.xs -index d512f4f..3e57e01 100644 ---- a/lib/XS/Parse/Keyword.xs -+++ b/lib/XS/Parse/Keyword.xs -@@ -738,9 +738,9 @@ static void reg(pTHX_ const char *kwname, int apiver, const struct XSParseKeywor - } - } - --static void IMPL_register_v1(pTHX_ const char *kwname, const struct XSParseKeywordHooks *hooks, void *hookdata) -+static void IMPL_register_v2(pTHX_ const char *kwname, const struct XSParseKeywordHooks *hooks, void *hookdata) - { -- reg(aTHX_ kwname, 1, hooks, hookdata); -+ reg(aTHX_ kwname, 2, hooks, hookdata); - } - - static int (*next_keyword_plugin)(pTHX_ char *, STRLEN, OP **); -@@ -793,8 +793,8 @@ BOOT: - - /* newer versions */ - sv_setiv(*hv_fetchs(PL_modglobal, "XS::Parse::Keyword/ABIVERSION_MIN", 1), XSPARSEKEYWORD_ABI_VERSION); -- sv_setiv(*hv_fetchs(PL_modglobal, "XS::Parse::Keyword/ABIVERSION_MAX", 1), 1); -+ sv_setiv(*hv_fetchs(PL_modglobal, "XS::Parse::Keyword/ABIVERSION_MAX", 1), 2); - -- sv_setuv(*hv_fetchs(PL_modglobal, "XS::Parse::Keyword/register()@1", 1), PTR2UV(&IMPL_register_v1)); -+ sv_setuv(*hv_fetchs(PL_modglobal, "XS::Parse::Keyword/register()@2", 1), PTR2UV(&IMPL_register_v2)); - - wrap_keyword_plugin(&my_keyword_plugin, &next_keyword_plugin); --- -2.31.1 - diff --git a/perl-XS-Parse-Keyword.spec b/perl-XS-Parse-Keyword.spec index 6d5aa77..74f1b72 100644 --- a/perl-XS-Parse-Keyword.spec +++ b/perl-XS-Parse-Keyword.spec @@ -2,16 +2,13 @@ %bcond_without perl_XS_Parse_Keyword_enables_optional_test Name: perl-XS-Parse-Keyword -Version: 0.12 -Release: 2%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: XS functions to assist in parsing keyword syntax License: GPL+ or Artistic URL: https://metacpan.org/release/XS-Parse-Keyword Source0: https://cpan.metacpan.org/authors/id/P/PE/PEVANS/XS-Parse-Keyword-%{version}.tar.gz Source1: macros.perl-XS-Parse-Keyword -# Bump ABI because XSParseKeywordPieceType changed size in 0.12, -# bug #1994077, CPAN RT#138708, proposed to the upstream. -Patch0: XS-Parse-Keyword-0.12-Bump-ABI-version.patch BuildRequires: coreutils BuildRequires: perl-devel BuildRequires: perl-generators @@ -131,6 +128,9 @@ export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print %{_libexecdir}/%{name} %changelog +* Thu Aug 26 2021 Jitka Plesnikova - 0.13-1 +- 0.13 bump + * Tue Aug 17 2021 Petr Pisar - 0.12-2 - Bump ABI because XSParseKeywordPieceType changed size (bug #1994077) diff --git a/sources b/sources index 7f3db2d..b777892 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (XS-Parse-Keyword-0.12.tar.gz) = 96384a750689c345ab70f1511db008a4b5b6c34a19b2f0abe7a18678c7c50861c78f00654f70d7fb133220696c21d2d1284a04f746a9acea4719034f99f359ca +SHA512 (XS-Parse-Keyword-0.13.tar.gz) = edd177bbab945c4aaf92b040b2691550b3ab48b8a6938ba1cd754a1e1fe25d111b9c7f4df3aa3f4931c3950cb065dfa92fbdfe5e56cdbd7e5af2c9c622471b94