diff --git a/srcpkgs/perl/patches/multiplicity.patch b/srcpkgs/perl/patches/multiplicity.patch deleted file mode 100644 index 976f9d38804..00000000000 --- a/srcpkgs/perl/patches/multiplicity.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a31a5cddd6c52fd21976b9cbff303b966c4a3122 Mon Sep 17 00:00:00 2001 -From: Alex Suykov -Date: Tue, 7 Jun 2022 17:50:03 +0300 -Subject: [PATCH] enable multiplicity whenever ithreads are enabled - ---- - cnf/configure_misc.sh | 1 - - cnf/configure_thrd.sh | 3 +++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/cnf/configure_misc.sh b/cnf/configure_misc.sh -index 77d73b4..33b1834 100644 ---- a/cnf/configure_misc.sh -+++ b/cnf/configure_misc.sh -@@ -62,7 +62,6 @@ define usekernprocpathname 'undef' - define uselongdouble 'undef' - define usemallocwrap 'define' - define usemorebits 'undef' --define usemultiplicity 'undef' - define usemymalloc 'n' - define usenamedanoncv 'undef' - define usenm 'false' -diff --git a/cnf/configure_thrd.sh b/cnf/configure_thrd.sh -index 6e63b68..8874a1d 100644 ---- a/cnf/configure_thrd.sh -+++ b/cnf/configure_thrd.sh -@@ -14,9 +14,12 @@ if [ "$usethreads" = 'define' ]; then - define use5005threads 'undef' - result 'yes, ithreads' - fi -+ -+ define usemultiplicity "$useithreads" - else - define useithreads 'undef' - define use5005threads 'undef' -+ define usemultiplicity 'undef' - result 'no' - msg "Disabling thread-related stuff" - fi diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template index 3f897f995e7..d507855d3d1 100644 --- a/srcpkgs/perl/template +++ b/srcpkgs/perl/template @@ -1,8 +1,8 @@ # Template file for 'perl' pkgname=perl -version=5.36.0 +version=5.36.1 revision=1 -_perl_cross_version=1.4 +_perl_cross_version=1.4.1 build_style=gnu-configure hostmakedepends="less" makedepends="zlib-devel bzip2-devel gdbm-devel db-devel" @@ -14,13 +14,14 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://www.perl.org" distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz" -checksum="e26085af8ac396f62add8a533c3a0ea8c8497d836f0689347ac5abd7b7a4e00a - be9d9f9f7148edff7a2f9695ba3cb7e3975eff6b25a9a81dd311725fd757aa91" +checksum="68203665d8ece02988fc77dc92fccbb297a83a4bb4b8d07558442f978da54cc1 + 3e14bb4f28c83586c668c5f9f6b4e57b138b4ec2fae0271086e29d4e352670ca" skip_extraction=perl-cross-${_perl_cross_version}.tar.gz -# Before updating this package to a new major version, run ${FILESDIR}/provides.pl -# against ${wrksrc} to find the list of built in packages. +# Before updating this package to a new major version, run +# ${FILESDIR}/update-perl-provides.pl ${wrksrc} perl/template +# to find the list of built in packages. provides="perl-Archive-Tar-2.40_1 perl-Attribute-Handlers-1.02_1 @@ -76,7 +77,7 @@ provides="perl-Archive-Tar-2.40_1 perl-Math-BigRat-0.2621_1 perl-Math-Complex-1.59.02_1 perl-Memoize-1.03.01_1 - perl-Module-CoreList-5.20220520_1 + perl-Module-CoreList-5.20230423_1 perl-Module-Load-0.36_1 perl-Module-Load-Conditional-0.74_1 perl-Module-Loaded-0.08_1