diff options
| author | B. Watson <urchlay@slackware.uk> | 2024-08-19 15:48:38 -0400 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-08-24 11:55:25 +0700 |
| commit | 8e7cbadb97bf4f1fe83244e99c38358612774ad5 (patch) | |
| tree | 2ee7d14968b33a23cee7725467802c81b619275f /perl | |
| parent | 16f5c46319bf8692dd8797924bc0d44a6d634808 (diff) | |
perl/perl-image-bmp: Fix 32-bit build failure.
Signed-off-by: B. Watson <urchlay@slackware.uk>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/perl-image-bmp/32bitfix.diff | 15 | ||||
| -rw-r--r-- | perl/perl-image-bmp/perl-image-bmp.SlackBuild | 7 |
2 files changed, 21 insertions, 1 deletions
diff --git a/perl/perl-image-bmp/32bitfix.diff b/perl/perl-image-bmp/32bitfix.diff new file mode 100644 index 000000000000..69231c9c5ee1 --- /dev/null +++ b/perl/perl-image-bmp/32bitfix.diff @@ -0,0 +1,15 @@ +diff -Naur Image-BMP-1.26/lib/Image/BMP.pm Image-BMP-1.26.patched/lib/Image/BMP.pm +--- Image-BMP-1.26/lib/Image/BMP.pm 2024-02-06 19:37:00.000000000 -0500 ++++ Image-BMP-1.26.patched/lib/Image/BMP.pm 2024-08-19 15:45:02.250718304 -0400 +@@ -382,7 +382,10 @@ + $bmp->{YpixelsPerM} = read_bmp($bmp,4); + $bmp->{ColorsUsed} = read_bmp($bmp,4); + $bmp->{ColorsImportant} = read_bmp($bmp,4); +- $bmp->{ColorsUsed} = 1<<$bmp->{BitCount} if $bmp->{ColorsUsed} == 0; ++ { ++ use bigint; ++ $bmp->{ColorsUsed} = 1<<$bmp->{BitCount} if $bmp->{ColorsUsed} == 0; ++ } + + $bmp->_debug(1,"Image: $bmp->{BitCount}/$bmp->{ColorsUsed} colors. Geometry: $bmp->{Width}x$bmp->{Height} $bmp->{ImageSize} [comp: $compStr ($bmp->{Compression})]\n"); + diff --git a/perl/perl-image-bmp/perl-image-bmp.SlackBuild b/perl/perl-image-bmp/perl-image-bmp.SlackBuild index a919c0fb92b9..894db2537641 100644 --- a/perl/perl-image-bmp/perl-image-bmp.SlackBuild +++ b/perl/perl-image-bmp/perl-image-bmp.SlackBuild @@ -6,13 +6,14 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20240819 bkw: BUILD=2, fix 32-bit build failure. # 20240814 bkw: update for v1.26. cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-image-bmp VERSION=${VERSION:-1.26} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -41,6 +42,10 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +# This patch is for v1.26, and was sent to upstream on 20240819. Hope +# it ends up in the next release. +patch -p1 < $CWD/32bitfix.diff + perl Makefile.PL \ PREFIX=/usr \ INSTALLDIRS=vendor \ |