Skip to content

Commit f656ba7

Browse files
committed
perl: Update to 5.40.3
Note: Term-Table and Test2-Suite are included in perl core now Adjust patchprov to handle modern package syntax when extracting package names/versions. perl/0006-perl-5.36.0-msys2.patch: refresh
1 parent 24213e3 commit f656ba7

File tree

3 files changed

+58
-49
lines changed

3 files changed

+58
-49
lines changed

perl/0006-perl-5.36.0-msys2.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ index a774f4a..26d4d61 100644
3737
;;
3838
sunos*)
3939
linklibperl="-lperl"
40-
@@ -948,7 +948,7 @@
40+
@@ -940,7 +940,7 @@
4141
-rm -f perl.third lib*.so.perl.third perl.3log t/perl.third t/perl.3log
4242
-rm -f perl.pixie lib*.so.perl.pixie lib*.so.Addrs
4343
-rm -f perl.Addrs perl.Counts t/perl.Addrs t/perl.Counts *perl.xok
4444
- -rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump
4545
+ -rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll msys-perl*.dll *.exe.stackdump
46-
-rm -f perl$(EXE_EXT) miniperl$(EXE_EXT) $(LIBPERL) libperl.* microperl
46+
-rm -f perl$(EXE_EXT) miniperl$(EXE_EXT) $(LIBPERL) libperl.*
4747
-rm -f config.over
4848

4949
diff --git a/Makefile.SH b/Makefile.SH
@@ -56,7 +56,7 @@ index e2490da..547bd49 100755
5656
-rm -f *perl.xok
5757
- -rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump
5858
+ -rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll msys-perl*.dll *.exe.stackdump
59-
-rm -f $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl
59+
-rm -f $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.*
6060
-rm -f config.arch config.over $(DTRACE_H)
6161

6262
@@ -1524,7 +1524,7 @@ case "$targethost" in

perl/PKGBUILD

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
pkgbase=perl
44
pkgname=('perl' 'perl-doc' 'perl-devel')
5-
pkgver=5.38.4
6-
pkgrel=2
5+
pkgver=5.40.3
6+
pkgrel=1
77
pkgdesc="A highly capable, feature-rich programming language"
88
arch=(i686 x86_64)
99
license=('GPL')
@@ -25,7 +25,7 @@ source=(https://www.cpan.org/src/5.0/perl-${pkgver}.tar.xz
2525
0006-perl-5.36.0-msys2.patch
2626
0007-Skip-a-regeneration-check-in-unrelated-git-repositor.patch)
2727
options=('makeflags' '!purge' 'emptydirs')
28-
sha256sums=('f6777e856b22460e8091f9524593e93299f421cc23dbd408d3f5ed3328d357a7'
28+
sha256sums=('65f63b4763ab6cb9bb3d5731dd10369e1705be3c59be9847d453eb60b349ab43'
2929
'91bf8a45a3f04f51fe0eca146a71e278d41dbde19ba60dabc1e41c4639477c07'
3030
'478a52dc440d5ca324f4c95238b39cc8c90d5d7d8d5601fa085ffef79fea04f4'
3131
'11ce66bcf4803b0bf27179a32ce53f41bcdfa967c4c0d54ac103dbc4951d18a3'
@@ -34,7 +34,7 @@ sha256sums=('f6777e856b22460e8091f9524593e93299f421cc23dbd408d3f5ed3328d357a7'
3434
'a074ce00dabd7876293cf0fa8c8be26029992f51873e33cd2213b6acf60cafbb'
3535
'1bf02b601f670cc1c8f65e63ec7a10578f92c8ecd8a5752fe331479bd6115311'
3636
'e05e20b29c950555edfa246d2b9177188a4b265d1887c262f5b272f382696474'
37-
'4214c4f429958334837881c508b4d1c41cdd36f50f2e38458346dfa1fe05ae63'
37+
'9c661e438c935a047770e8f91c810a2f0e074e2f72bf89da27e1b6b979b247a4'
3838
'4c44801139321e77a3ade921ce93b114100346ad5b17d03a67b2a92b85ee8a27')
3939

4040
prepare() {
@@ -64,6 +64,8 @@ _EOF
6464
build() {
6565
cd ${srcdir}/${pkgname}-${pkgver}
6666

67+
CFLAGS+=" -Wno-int-conversion"
68+
6769
export MSYSTEM=CYGWIN
6870
./Configure -des -Dusethreads \
6971
-Doptimize="${CFLAGS}" \
@@ -190,122 +192,123 @@ package_perl() {
190192
# NOTE: This array is automatically generated by `./patchprov`.
191193
# If you want to add entries, do so in the next array.
192194
# NOTE2: './patchprov' expects this provides= to be hard left
193-
provides=('perl-Archive-Tar=2.40'
195+
provides=('perl-Archive-Tar=3.02_001'
194196
'perl-Attribute-Handlers=1.03'
195197
'perl-AutoLoader=5.74'
196-
'perl-CPAN-Meta-Requirements=2.140'
198+
'perl-CPAN-Meta-Requirements=2.143'
197199
'perl-CPAN-Meta-YAML=0.018'
198200
'perl-CPAN-Meta=2.150010'
199201
'perl-CPAN=2.36'
200202
'perl-Carp=1.54'
201-
'perl-Compress-Raw-Bzip2=2.204_001'
202-
'perl-Compress-Raw-Zlib=2.204_001'
203+
'perl-Compress-Raw-Bzip2=2.212'
204+
'perl-Compress-Raw-Zlib=2.212'
203205
'perl-Config-Perl-V=0.36'
204-
'perl-DB_File=1.858'
205-
'perl-Data-Dumper=2.188'
206-
'perl-Devel-PPPort=3.71'
206+
'perl-DB_File=1.859'
207+
'perl-Data-Dumper=2.189'
208+
'perl-Devel-PPPort=3.72'
207209
'perl-Devel-SelfStubber=1.06'
208210
'perl-Digest-MD5=2.58_01'
209211
'perl-Digest-SHA=6.04'
210212
'perl-Digest=1.20'
211213
'perl-Dumpvalue=1.21'
212-
'perl-Encode=3.19'
214+
'perl-Encode=3.21'
213215
'perl-Env=1.06'
214-
'perl-Exporter=5.77'
215-
'perl-ExtUtils-CBuilder=0.280238'
216+
'perl-Exporter=5.78'
217+
'perl-ExtUtils-CBuilder=0.280240'
216218
'perl-ExtUtils-Constant=0.25'
217219
'perl-ExtUtils-Install=2.22'
218220
'perl-ExtUtils-MakeMaker=7.70'
219-
'perl-ExtUtils-Manifest=1.73'
221+
'perl-ExtUtils-Manifest=1.75'
220222
'perl-ExtUtils-PL2Bat=0.005'
221223
'perl-ExtUtils-ParseXS=3.51'
222224
'perl-File-Fetch=1.04'
223225
'perl-File-Path=2.18'
224226
'perl-File-Temp=0.2311'
225227
'perl-Filter-Simple=0.96'
226228
'perl-Filter-Util-Call=1.64'
227-
'perl-FindBin=1.53'
228-
'perl-Getopt-Long=2.54'
229-
'perl-HTTP-Tiny=0.086'
229+
'perl-FindBin=1.54'
230+
'perl-Getopt-Long=2.57'
231+
'perl-HTTP-Tiny=0.088'
230232
'perl-I18N-Collate=1.02'
231233
'perl-I18N-LangTags=0.45'
232-
'perl-IO-Compress=2.204'
233-
'perl-IO-Socket-IP=0.41_01'
234-
'perl-IO-Zlib=1.14'
235-
'perl-IO=1.52'
234+
'perl-IO-Compress=2.212'
235+
'perl-IO-Socket-IP=0.42'
236+
'perl-IO-Zlib=1.15'
237+
'perl-IO=1.55'
236238
'perl-IPC-Cmd=1.04'
237239
'perl-IPC-SysV=2.09'
238240
'perl-JSON-PP=4.16'
239241
'perl-Locale-Maketext-Simple=0.21_01'
240242
'perl-Locale-Maketext=1.33'
241243
'perl-MIME-Base64=3.16_01'
242-
'perl-Math-BigInt-FastCalc=0.5013'
243-
'perl-Math-BigInt=1.999837'
244-
'perl-Math-BigRat=0.2624'
244+
'perl-Math-BigInt-FastCalc=0.5018'
245+
'perl-Math-BigInt=2.003002'
245246
'perl-Math-Complex=1.62'
246247
'perl-Memoize=1.16'
247-
'perl-Module-CoreList=5.20231129'
248+
'perl-Module-CoreList=5.20250803_40'
248249
'perl-Module-Load-Conditional=0.74'
249250
'perl-Module-Load=0.36'
250251
'perl-Module-Loaded=0.08'
251-
'perl-Module-Metadata=1.000037'
252+
'perl-Module-Metadata=1.000038'
252253
'perl-NEXT=0.69'
253254
'perl-Net-Ping=2.76'
254255
'perl-Params-Check=0.38'
255-
'perl-PathTools=3.89'
256+
'perl-PathTools=3.91'
256257
'perl-Perl-OSType=1.010'
257258
'perl-PerlIO-via-QuotedPrint=0.10'
258-
'perl-Pod-Checker=1.75'
259+
'perl-Pod-Checker=1.77'
259260
'perl-Pod-Escapes=1.07'
260261
'perl-Pod-Perldoc=3.2801'
261-
'perl-Pod-Simple=3.43'
262+
'perl-Pod-Simple=3.45'
262263
'perl-Pod-Usage=2.03'
263-
'perl-Safe=2.44'
264+
'perl-Safe=2.46'
264265
'perl-Scalar-List-Utils=1.63'
265266
'perl-Search-Dict=1.07'
266-
'perl-SelfLoader=1.26'
267-
'perl-Socket=2.036'
267+
'perl-SelfLoader=1.27'
268+
'perl-Socket=2.038'
268269
'perl-Storable=3.32'
269270
'perl-Sys-Syslog=0.36'
270271
'perl-Term-ANSIColor=5.01'
271272
'perl-Term-Cap=1.18'
272273
'perl-Term-Complete=1.403'
273274
'perl-Term-ReadLine=1.17'
274-
'perl-Test-Harness=3.44'
275-
'perl-Test-Simple=1.302194'
275+
'perl-Term-Table=0.018'
276+
'perl-Test-Harness=3.48'
277+
'perl-Test-Simple=1.302199'
278+
'perl-Test2-Suite=0.000162'
276279
'perl-Test=1.31'
277280
'perl-Text-Abbrev=1.02'
278281
'perl-Text-Balanced=2.06'
279282
'perl-Text-ParseWords=3.31'
280-
'perl-Text-Tabs=2021.0814'
283+
'perl-Text-Tabs=2024.001'
281284
'perl-Thread-Queue=3.14'
282285
'perl-Thread-Semaphore=2.13'
283-
'perl-Tie-File=1.07'
286+
'perl-Tie-File=1.09'
284287
'perl-Tie-RefHash=1.40'
285-
'perl-Time-HiRes=1.9775'
286-
'perl-Time-Local=1.30'
288+
'perl-Time-HiRes=1.9777'
289+
'perl-Time-Local=1.35'
287290
'perl-Time-Piece=1.3401_01'
288291
'perl-Unicode-Collate=1.31'
289292
'perl-Unicode-Normalize=1.32'
290293
'perl-Win32=0.59'
291294
'perl-Win32API-File=0.1203_01'
292295
'perl-XSLoader=0.32'
293-
'perl-autodie=2.36'
296+
'perl-autodie=2.37'
294297
'perl-autouse=1.11'
295298
'perl-base=2.27'
296-
'perl-bignum=0.66'
299+
'perl-bignum=0.67'
297300
'perl-constant=1.33'
298301
'perl-encoding-warnings=0.14'
299-
'perl-experimental=0.031'
302+
'perl-experimental=0.032'
300303
'perl-if=0.0610'
301304
'perl-lib=0.65'
302305
'perl-libnet=3.15'
303306
'perl-parent=0.241'
304-
'perl-perlfaq=5.20210520'
307+
'perl-perlfaq=5.20240218'
305308
'perl-podlators=5.010'
306-
'perl-threads-shared=1.68'
307-
'perl-threads=2.36'
308-
'perl-version=0.9929')
309+
'perl-threads-shared=1.69'
310+
'perl-threads=2.40'
311+
'perl-version=0.9930')
309312
# Add your own provides here
310313
provides=(${provides[@]})
311314
replaces=('perl-Scalar-List-Utils')

perl/patchprov

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,16 @@ sub scrape_verln
9595
my($srcpath) = @_;
9696
open my $fh, '<', $srcpath or die "open: $!";
9797
while(my $ln = <$fh>){
98+
# Handle old-style VERSION assignments
9899
if($ln =~ s/^.*VERSION *=>? *//){
99100
close $fh;
100101
return $ln;
101102
}
103+
# Handle new-style package declaration with version
104+
if($ln =~ /^package\s+\S+\s+(v?[\d._]+[^;]*);?\s*$/){
105+
close $fh;
106+
return $1 . "\n"; # Add newline to match expected format
107+
}
102108
}
103109
close $fh;
104110
err("failed to find VERSION in $srcpath");

0 commit comments

Comments
 (0)