From 86c0a8e199e42bee5b5358c4a822912ef4b7ceac Mon Sep 17 00:00:00 2001 From: Zach van Rijn Date: Fri, 10 Feb 2023 13:56:57 -0600 Subject: user/perl-type-tiny: add patch for 32-bit regression. fixes #964. --- user/perl-type-tiny/APKBUILD | 9 ++++--- user/perl-type-tiny/fix-32-bit-regression.patch | 35 +++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 user/perl-type-tiny/fix-32-bit-regression.patch (limited to 'user') diff --git a/user/perl-type-tiny/APKBUILD b/user/perl-type-tiny/APKBUILD index 33e50a1df..9f8417c03 100644 --- a/user/perl-type-tiny/APKBUILD +++ b/user/perl-type-tiny/APKBUILD @@ -6,7 +6,7 @@ _author=TOBYINK _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} pkgver=2.000001 -pkgrel=0 +pkgrel=1 pkgdesc="Tiny Moo(se) compatible type constraint" url="https://metacpan.org/release/Type-Tiny" arch="noarch" @@ -14,7 +14,9 @@ license="Artistic-1.0-Perl OR GPL-1.0+" depends="perl perl-exporter-tiny" makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz + fix-32-bit-regression.patch + " builddir="$srcdir/$_pkgreal-$pkgver" build() { @@ -31,4 +33,5 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="0805b9de9728883a03078adfc0f499b66a4d715481ac0df7c6fdead2d898116730bf231e5bb7091b0a7096166a8aa8dde2040fa42357fd62904800d20453690e Type-Tiny-2.000001.tar.gz" +sha512sums="0805b9de9728883a03078adfc0f499b66a4d715481ac0df7c6fdead2d898116730bf231e5bb7091b0a7096166a8aa8dde2040fa42357fd62904800d20453690e Type-Tiny-2.000001.tar.gz +da709a491b3ed659bd2b0b26555447e8b4508592c390c848395a376a977489fcb9c8805cc45f2e44235d9d609516a212d53312a7757252a8cbf87da5a85f5f6f fix-32-bit-regression.patch" diff --git a/user/perl-type-tiny/fix-32-bit-regression.patch b/user/perl-type-tiny/fix-32-bit-regression.patch new file mode 100644 index 000000000..4819b1b5f --- /dev/null +++ b/user/perl-type-tiny/fix-32-bit-regression.patch @@ -0,0 +1,35 @@ +Upstream: https://github.com/tobyink/p5-type-tiny/issues/128 + +From 98304a7a34bff67c2b3d36b089f31f3585cc7455 Mon Sep 17 00:00:00 2001 +From: Toby Inkster +Date: Fri, 20 Jan 2023 11:14:37 +0000 +Subject: [PATCH] Bug fix + +--- + lib/Type/Tie.pm | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/lib/Type/Tie.pm b/lib/Type/Tie.pm +index 45b5ec35..61291503 100644 +--- a/lib/Type/Tie.pm ++++ b/lib/Type/Tie.pm +@@ -144,17 +144,16 @@ use Scalar::Util (); + $tmp_clone_types{$refaddr} ||= [ $type, 0 ]; + ++$tmp_clone_types{$refaddr}[1]; + +- return ( pack( 'j', $refaddr ), $o->_REF ); ++ return ( $refaddr, $o->_REF ); + } + + sub STORABLE_thaw { +- my ( $o, $cloning, $packedRefaddr, $o2 ) = @_; ++ my ( $o, $cloning, $refaddr, $o2 ) = @_; + Carp::croak( "Storable::thaw only supported for dclone-ing" ) + unless $cloning; + + $o->_THAW( $o2 ); # implement in child classes + +- my $refaddr = unpack( 'j', $packedRefaddr ); + my $type = $tmp_clone_types{$refaddr}[0]; + --$tmp_clone_types{$refaddr}[1] + or delete $tmp_clone_types{$refaddr}; -- cgit v1.2.3-70-g09d2