diff options
| -rw-r--r-- | perl/perl-GD/no_ttf_test.diff | 40 | ||||
| -rw-r--r-- | perl/perl-GD/perl-GD.SlackBuild | 47 | ||||
| -rw-r--r-- | perl/perl-GD/perl-GD.info | 8 |
3 files changed, 15 insertions, 80 deletions
diff --git a/perl/perl-GD/no_ttf_test.diff b/perl/perl-GD/no_ttf_test.diff deleted file mode 100644 index 409d15e789525..0000000000000 --- a/perl/perl-GD/no_ttf_test.diff +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur GD-2.56/t/GD.t GD-2.56.patched/t/GD.t ---- GD-2.56/t/GD.t 2014-10-27 21:34:54.000000000 -0400 -+++ GD-2.56.patched/t/GD.t 2016-08-21 18:24:24.469496848 -0400 -@@ -7,8 +7,8 @@ - use FindBin qw($Bin); - use lib "$Bin/../blib/lib","$Bin/../blib/arch","$Bin/../lib"; - use constant FONT=>"$Bin/test_data/Generic.ttf"; --use constant IMAGE_TESTS => 7; --use Test::More tests => 11; -+use constant IMAGE_TESTS => 6; -+use Test::More tests => 10; - use IO::Dir; - - use_ok('GD',':DEFAULT',':cmp'); -@@ -219,25 +219,6 @@ - return $im; - } - --sub test7 { -- my $im = GD::Image->new(400,250); -- if (!$im) { printf("Test7: no image");}; -- my($white,$black,$red,$blue,$yellow) = -- ( -- $im->colorAllocate(255, 255, 255), -- $im->colorAllocate(0, 0, 0), -- $im->colorAllocate(255, 0, 0), -- $im->colorAllocate(0,0,255), -- $im->colorAllocate(255,250,205) -- ); -- -- # Some TTFs -- $im->stringFT($black,FONT,12.0,0.0,20,20,"Hello world!") || warn $@; -- $im->stringFT($red,FONT,14.0,0.0,20,80,"Hello world!") || warn $@; -- $im->stringFT($blue,FONT,30.0,-0.5,60,100,"Goodbye cruel world!") || warn $@; -- return $im; --} -- - sub run_image_regression_tests { - my $suffix = $ENV{GDIMAGETYPE} || 'gd2'; - print STDERR "# Testing using $suffix support.\n"; diff --git a/perl/perl-GD/perl-GD.SlackBuild b/perl/perl-GD/perl-GD.SlackBuild index a27cbe63aa61a..d5b04848d7f6c 100644 --- a/perl/perl-GD/perl-GD.SlackBuild +++ b/perl/perl-GD/perl-GD.SlackBuild @@ -7,7 +7,7 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. PRGNAM=perl-GD -VERSION=${VERSION:-2.56} +VERSION=${VERSION:-2.67} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,44 +55,19 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# the "perl Makefile.PL" method fails to build the shared library, -# probably it's obsolete and the author forgot to remove Makefile.PL -# from the tarball. - -# you might notice this in the build log: +# You might notice this in the build log: # ** WARNING: found gd.h header file in /usr/X11R6/include/gd.h -# this isn't a real issue, since on Slackware /usr/X11R6/include +# This isn't a real issue, since on Slackware /usr/X11R6/include # is just a symlink to /usr/include. -# one of the tests in t/GD.t fails because it's using freetype to render -# text into images, then comparing pixel-for-pixel to reference images. it -# fails because the results are not pixel-exact, probably due to the -# author using a different version of freetype to generate the reference -# images... or even just different compiler flags used for building -# freetype... or even something as dumb as using a different CPU whose -# floating point returns slightly different results from the author's. -# if you modify the test code so it writes its result to a PNG file and -# then eyeball that next to the reference one (t/test_data/t07/7-00.png), -# you'll be hard-pressed to see the difference... but it's there. - -# this patch disables just this one test: -patch -p1 < $CWD/no_ttf_test.diff - -perl Build.PL -./Build -./Build test -./Build install \ - --prefix /usr \ - --installdirs vendor \ - --destdir $PKG \ - --install_path bindoc=/usr/man/man1 \ - --install_path libdoc=/usr/man/man3 - -# this stuff gets erroneously installed to /usr/bin: -rm -f $PKG/usr/bin/README $PKG/usr/bin/*.PLS - -# and this doesn't belong in the package either: -rm -f $PKG/usr/man/man?/*.PLS.* +perl Makefile.PL \ + PREFIX=/usr \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN3DIR=/usr/man/man3 \ + INSTALLVENDORMAN1DIR=/usr/man/man1 +make +make test +make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/perl/perl-GD/perl-GD.info b/perl/perl-GD/perl-GD.info index cebeeb872069e..4e606c0507dfd 100644 --- a/perl/perl-GD/perl-GD.info +++ b/perl/perl-GD/perl-GD.info @@ -1,10 +1,10 @@ PRGNAM="perl-GD" -VERSION="2.56" +VERSION="2.67" HOMEPAGE="https://metacpan.org/pod/GD" -DOWNLOAD="https://cpan.metacpan.org/authors/id/L/LD/LDS/GD-2.56.tar.gz" -MD5SUM="c4b3afd98b2c4ce3c2e1027d101a8f1e" +DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/GD-2.67.tar.gz" +MD5SUM="b9cfc5a677b5e9fa607be1379f789855" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="perl-Module-Build" +REQUIRES="" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" |