diff --git a/perl/0006-perl-5.36.0-msys2.patch b/perl/0006-perl-5.36.0-msys2.patch index d0eb7add..b59ad079 100644 --- a/perl/0006-perl-5.36.0-msys2.patch +++ b/perl/0006-perl-5.36.0-msys2.patch @@ -37,13 +37,13 @@ index a774f4a..26d4d61 100644 ;; sunos*) linklibperl="-lperl" -@@ -948,7 +948,7 @@ +@@ -940,7 +940,7 @@ -rm -f perl.third lib*.so.perl.third perl.3log t/perl.third t/perl.3log -rm -f perl.pixie lib*.so.perl.pixie lib*.so.Addrs -rm -f perl.Addrs perl.Counts t/perl.Addrs t/perl.Counts *perl.xok - -rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump + -rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll msys-perl*.dll *.exe.stackdump - -rm -f perl$(EXE_EXT) miniperl$(EXE_EXT) $(LIBPERL) libperl.* microperl + -rm -f perl$(EXE_EXT) miniperl$(EXE_EXT) $(LIBPERL) libperl.* -rm -f config.over diff --git a/Makefile.SH b/Makefile.SH @@ -56,7 +56,7 @@ index e2490da..547bd49 100755 -rm -f *perl.xok - -rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump + -rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll msys-perl*.dll *.exe.stackdump - -rm -f $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl + -rm -f $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.* -rm -f config.arch config.over $(DTRACE_H) @@ -1524,7 +1524,7 @@ case "$targethost" in diff --git a/perl/PKGBUILD b/perl/PKGBUILD index 91b64df1..2ca80abd 100644 --- a/perl/PKGBUILD +++ b/perl/PKGBUILD @@ -2,8 +2,8 @@ pkgbase=perl pkgname=('perl' 'perl-doc' 'perl-devel') -pkgver=5.38.4 -pkgrel=2 +pkgver=5.40.3 +pkgrel=1 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL') @@ -25,7 +25,7 @@ source=(https://www.cpan.org/src/5.0/perl-${pkgver}.tar.xz 0006-perl-5.36.0-msys2.patch 0007-Skip-a-regeneration-check-in-unrelated-git-repositor.patch) options=('makeflags' '!purge' 'emptydirs') -sha256sums=('f6777e856b22460e8091f9524593e93299f421cc23dbd408d3f5ed3328d357a7' +sha256sums=('65f63b4763ab6cb9bb3d5731dd10369e1705be3c59be9847d453eb60b349ab43' '91bf8a45a3f04f51fe0eca146a71e278d41dbde19ba60dabc1e41c4639477c07' '478a52dc440d5ca324f4c95238b39cc8c90d5d7d8d5601fa085ffef79fea04f4' '11ce66bcf4803b0bf27179a32ce53f41bcdfa967c4c0d54ac103dbc4951d18a3' @@ -34,7 +34,7 @@ sha256sums=('f6777e856b22460e8091f9524593e93299f421cc23dbd408d3f5ed3328d357a7' 'a074ce00dabd7876293cf0fa8c8be26029992f51873e33cd2213b6acf60cafbb' '1bf02b601f670cc1c8f65e63ec7a10578f92c8ecd8a5752fe331479bd6115311' 'e05e20b29c950555edfa246d2b9177188a4b265d1887c262f5b272f382696474' - '4214c4f429958334837881c508b4d1c41cdd36f50f2e38458346dfa1fe05ae63' + '9c661e438c935a047770e8f91c810a2f0e074e2f72bf89da27e1b6b979b247a4' '4c44801139321e77a3ade921ce93b114100346ad5b17d03a67b2a92b85ee8a27') prepare() { @@ -64,6 +64,8 @@ _EOF build() { cd ${srcdir}/${pkgname}-${pkgver} + CFLAGS+=" -Wno-int-conversion" + export MSYSTEM=CYGWIN ./Configure -des -Dusethreads \ -Doptimize="${CFLAGS}" \ @@ -190,33 +192,33 @@ package_perl() { # NOTE: This array is automatically generated by `./patchprov`. # If you want to add entries, do so in the next array. # NOTE2: './patchprov' expects this provides= to be hard left -provides=('perl-Archive-Tar=2.40' +provides=('perl-Archive-Tar=3.02_001' 'perl-Attribute-Handlers=1.03' 'perl-AutoLoader=5.74' - 'perl-CPAN-Meta-Requirements=2.140' + 'perl-CPAN-Meta-Requirements=2.143' 'perl-CPAN-Meta-YAML=0.018' 'perl-CPAN-Meta=2.150010' 'perl-CPAN=2.36' 'perl-Carp=1.54' - 'perl-Compress-Raw-Bzip2=2.204_001' - 'perl-Compress-Raw-Zlib=2.204_001' + 'perl-Compress-Raw-Bzip2=2.212' + 'perl-Compress-Raw-Zlib=2.212' 'perl-Config-Perl-V=0.36' - 'perl-DB_File=1.858' - 'perl-Data-Dumper=2.188' - 'perl-Devel-PPPort=3.71' + 'perl-DB_File=1.859' + 'perl-Data-Dumper=2.189' + 'perl-Devel-PPPort=3.72' 'perl-Devel-SelfStubber=1.06' 'perl-Digest-MD5=2.58_01' 'perl-Digest-SHA=6.04' 'perl-Digest=1.20' 'perl-Dumpvalue=1.21' - 'perl-Encode=3.19' + 'perl-Encode=3.21' 'perl-Env=1.06' - 'perl-Exporter=5.77' - 'perl-ExtUtils-CBuilder=0.280238' + 'perl-Exporter=5.78' + 'perl-ExtUtils-CBuilder=0.280240' 'perl-ExtUtils-Constant=0.25' 'perl-ExtUtils-Install=2.22' 'perl-ExtUtils-MakeMaker=7.70' - 'perl-ExtUtils-Manifest=1.73' + 'perl-ExtUtils-Manifest=1.75' 'perl-ExtUtils-PL2Bat=0.005' 'perl-ExtUtils-ParseXS=3.51' 'perl-File-Fetch=1.04' @@ -224,88 +226,89 @@ provides=('perl-Archive-Tar=2.40' 'perl-File-Temp=0.2311' 'perl-Filter-Simple=0.96' 'perl-Filter-Util-Call=1.64' - 'perl-FindBin=1.53' - 'perl-Getopt-Long=2.54' - 'perl-HTTP-Tiny=0.086' + 'perl-FindBin=1.54' + 'perl-Getopt-Long=2.57' + 'perl-HTTP-Tiny=0.088' 'perl-I18N-Collate=1.02' 'perl-I18N-LangTags=0.45' - 'perl-IO-Compress=2.204' - 'perl-IO-Socket-IP=0.41_01' - 'perl-IO-Zlib=1.14' - 'perl-IO=1.52' + 'perl-IO-Compress=2.212' + 'perl-IO-Socket-IP=0.42' + 'perl-IO-Zlib=1.15' + 'perl-IO=1.55' 'perl-IPC-Cmd=1.04' 'perl-IPC-SysV=2.09' 'perl-JSON-PP=4.16' 'perl-Locale-Maketext-Simple=0.21_01' 'perl-Locale-Maketext=1.33' 'perl-MIME-Base64=3.16_01' - 'perl-Math-BigInt-FastCalc=0.5013' - 'perl-Math-BigInt=1.999837' - 'perl-Math-BigRat=0.2624' + 'perl-Math-BigInt-FastCalc=0.5018' + 'perl-Math-BigInt=2.003002' 'perl-Math-Complex=1.62' 'perl-Memoize=1.16' - 'perl-Module-CoreList=5.20231129' + 'perl-Module-CoreList=5.20250803_40' 'perl-Module-Load-Conditional=0.74' 'perl-Module-Load=0.36' 'perl-Module-Loaded=0.08' - 'perl-Module-Metadata=1.000037' + 'perl-Module-Metadata=1.000038' 'perl-NEXT=0.69' 'perl-Net-Ping=2.76' 'perl-Params-Check=0.38' - 'perl-PathTools=3.89' + 'perl-PathTools=3.91' 'perl-Perl-OSType=1.010' 'perl-PerlIO-via-QuotedPrint=0.10' - 'perl-Pod-Checker=1.75' + 'perl-Pod-Checker=1.77' 'perl-Pod-Escapes=1.07' 'perl-Pod-Perldoc=3.2801' - 'perl-Pod-Simple=3.43' + 'perl-Pod-Simple=3.45' 'perl-Pod-Usage=2.03' - 'perl-Safe=2.44' + 'perl-Safe=2.46' 'perl-Scalar-List-Utils=1.63' 'perl-Search-Dict=1.07' - 'perl-SelfLoader=1.26' - 'perl-Socket=2.036' + 'perl-SelfLoader=1.27' + 'perl-Socket=2.038' 'perl-Storable=3.32' 'perl-Sys-Syslog=0.36' 'perl-Term-ANSIColor=5.01' 'perl-Term-Cap=1.18' 'perl-Term-Complete=1.403' 'perl-Term-ReadLine=1.17' - 'perl-Test-Harness=3.44' - 'perl-Test-Simple=1.302194' + 'perl-Term-Table=0.018' + 'perl-Test-Harness=3.48' + 'perl-Test-Simple=1.302199' + 'perl-Test2-Suite=0.000162' 'perl-Test=1.31' 'perl-Text-Abbrev=1.02' 'perl-Text-Balanced=2.06' 'perl-Text-ParseWords=3.31' - 'perl-Text-Tabs=2021.0814' + 'perl-Text-Tabs=2024.001' 'perl-Thread-Queue=3.14' 'perl-Thread-Semaphore=2.13' - 'perl-Tie-File=1.07' + 'perl-Tie-File=1.09' 'perl-Tie-RefHash=1.40' - 'perl-Time-HiRes=1.9775' - 'perl-Time-Local=1.30' + 'perl-Time-HiRes=1.9777' + 'perl-Time-Local=1.35' 'perl-Time-Piece=1.3401_01' 'perl-Unicode-Collate=1.31' 'perl-Unicode-Normalize=1.32' 'perl-Win32=0.59' 'perl-Win32API-File=0.1203_01' 'perl-XSLoader=0.32' - 'perl-autodie=2.36' + 'perl-autodie=2.37' 'perl-autouse=1.11' 'perl-base=2.27' - 'perl-bignum=0.66' + 'perl-bignum=0.67' 'perl-constant=1.33' 'perl-encoding-warnings=0.14' - 'perl-experimental=0.031' + 'perl-experimental=0.032' 'perl-if=0.0610' 'perl-lib=0.65' 'perl-libnet=3.15' 'perl-parent=0.241' - 'perl-perlfaq=5.20210520' + 'perl-perlfaq=5.20240218' 'perl-podlators=5.010' - 'perl-threads-shared=1.68' - 'perl-threads=2.36' - 'perl-version=0.9929') + 'perl-threads-shared=1.69' + 'perl-threads=2.40' + 'perl-version=0.9930') # Add your own provides here provides=(${provides[@]}) replaces=('perl-Scalar-List-Utils') diff --git a/perl/patchprov b/perl/patchprov index ca1b9559..ef9cafb7 100755 --- a/perl/patchprov +++ b/perl/patchprov @@ -95,10 +95,16 @@ sub scrape_verln my($srcpath) = @_; open my $fh, '<', $srcpath or die "open: $!"; while(my $ln = <$fh>){ + # Handle old-style VERSION assignments if($ln =~ s/^.*VERSION *=>? *//){ close $fh; return $ln; } + # Handle new-style package declaration with version + if($ln =~ /^package\s+\S+\s+(v?[\d._]+[^;]*);?\s*$/){ + close $fh; + return $1 . "\n"; # Add newline to match expected format + } } close $fh; err("failed to find VERSION in $srcpath");