From deb20fa5b30f963d7f2453b1e3196e3529feb01a Mon Sep 17 00:00:00 2001 From: markd Date: Thu, 13 Nov 2014 08:30:16 +0000 Subject: Update to Tk-804.032 Also add patch from development version to fix: Workaround behaviour change in ExtUtils::MakeMaker 6.99_10 (PERL value is now quoted), which caused build failures (RT #100044). Tk-804.032 release (2014-01-26) ------------------ This is basically the same like Tk-804.031_503. Tk-804.031_503 release (2013-12-07) ---------------------- Fixes Regain compatibility for perl < 5.8.9 (SvIV_nomg is not available with earlier perls). Tests wm-time.t more robust against GNOME Shell slowness. Tk-804.031_502 release (2013-12-01) ---------------------- Fixes Enable libpng configure for all Solaris architectures. Documentation Update INSTALL, README-ActiveState.txt, and README-Strawberry.txt documents. Tk-804.031_501 release (2013-11-18) ---------------------- Fixes Fix gamma setting for PNG images (was only broken in 804.031_500). Fix clang compilation error (was only broken in 804.031_500). Tests Some tests are now more robust. Tk-804.031_500 release (2013-11-17) ---------------------- Fixes 88210: fix compilation for perl 5.19.0+ ("undef bool"). 90077: floating number issue with -textvariable variables. 89621: avoid segfaults during global destruction (by Gisle Aas). 87016: compatibility for libpng 1.6.x. 86988: use cflags/libs information from pkg-config zlib. 89261: split Tk/ColorEditor.pm into three .pm files. 71718: fix compilation issue with 64bit Strawberry Perl (Tk_Cursor). Fail gracefully if no font could be allocated. ptksh: storing the history works now also under Windows. Better handling if libpng's configure fails. Documentation Changes to README.linux (dependency requirements, fontconfig) and README.cygwin. Document special Tk::Table behavior regarding -takefocus => 0. Tests New test files (eventGenerate.t, sv.t) and new test cases (eventGenerate in optmenu.t). More test tweaks (e.g. skip some tests if the required fixed font is unavailable, see with_fixed_font in TkTest.pm, workaround some fvwm2 problems in wm-tcl.t, protect from haning wm-time.t). checked_test_harness() skips testing if no font could be allocated. No test request user positioning windows anymore (for old window managers like twm). Configuration file for travis-ci. --- x11/p5-Tk/Makefile | 5 ++--- x11/p5-Tk/distinfo | 13 ++++++------- x11/p5-Tk/patches/patch-aa | 33 ++++++++++++++++++++++++++++++--- x11/p5-Tk/patches/patch-ad | 22 ++++++++-------------- x11/p5-Tk/patches/patch-pTK_Lang.h | 17 ----------------- 5 files changed, 46 insertions(+), 44 deletions(-) delete mode 100644 x11/p5-Tk/patches/patch-pTK_Lang.h (limited to 'x11') diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile index e1830cabd26..f42856f588c 100644 --- a/x11/p5-Tk/Makefile +++ b/x11/p5-Tk/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.85 2014/10/09 14:07:15 wiz Exp $ +# $NetBSD: Makefile,v 1.86 2014/11/13 08:30:16 markd Exp $ -DISTNAME= Tk-804.031 +DISTNAME= Tk-804.032 PKGNAME= p5-${DISTNAME} -PKGREVISION= 1 CATEGORIES= x11 tk perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Tk/} diff --git a/x11/p5-Tk/distinfo b/x11/p5-Tk/distinfo index 68931ca538e..9271884fd84 100644 --- a/x11/p5-Tk/distinfo +++ b/x11/p5-Tk/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.21 2014/05/31 09:54:23 tron Exp $ +$NetBSD: distinfo,v 1.22 2014/11/13 08:30:16 markd Exp $ -SHA1 (Tk-804.031.tar.gz) = f2e9db4f2ae7f45be04471cc738239c08be7aa48 -RMD160 (Tk-804.031.tar.gz) = 442b13da904881406e9965468eab1c7b084523ce -Size (Tk-804.031.tar.gz) = 6932339 bytes -SHA1 (patch-aa) = 863ab22dcad8c20d8e84e840f11fa41964eb051b +SHA1 (Tk-804.032.tar.gz) = 031818e80effe164772b9ca83c02f7d188efaa14 +RMD160 (Tk-804.032.tar.gz) = c66b3ada23f985dd002ba093f20d044b5afcc1dc +Size (Tk-804.032.tar.gz) = 6933200 bytes +SHA1 (patch-aa) = 6bfff2aa899da00783c339aa207bd72c08b2b789 SHA1 (patch-ac) = 8918f9a9dfd884ed8d7b76b0615e266ffa392a44 -SHA1 (patch-ad) = b1a659fe92cdab86d8ff7b04937de9f0c25b080a +SHA1 (patch-ad) = 09e322a0adf7c8abf98d2ed202c1f52e6bca97f6 SHA1 (patch-ah) = 1b75be678e1bb31a182b3f9dcb9063bf4fc086a1 SHA1 (patch-ai) = f6ef20cb48f3ee08335a6410e873f3b5aa277b20 SHA1 (patch-aj) = ba3dfe1e7b7a19af1240b37186ab69d857d925f4 -SHA1 (patch-pTK_Lang.h) = fab9547c8d8786fe7eebb12f9ad3aaec2e4c08e2 diff --git a/x11/p5-Tk/patches/patch-aa b/x11/p5-Tk/patches/patch-aa index 58e1e9a5697..1257e78178e 100644 --- a/x11/p5-Tk/patches/patch-aa +++ b/x11/p5-Tk/patches/patch-aa @@ -1,8 +1,35 @@ -$NetBSD: patch-aa,v 1.4 2010/09/12 12:59:47 wiz Exp $ +$NetBSD: patch-aa,v 1.5 2014/11/13 08:30:16 markd Exp $ ---- Tk/MMutil.pm.orig 2010-05-12 23:29:42.000000000 +0000 +Workaround behaviour change in ExtUtils::MakeMaker 6.99_10 (PERL +value is now quoted), which caused build failures (RT #100044). + +--- Tk/MMutil.pm.orig 2013-11-15 23:50:03.000000000 +0000 +++ Tk/MMutil.pm -@@ -313,10 +313,13 @@ sub const_config +@@ -115,19 +115,15 @@ sub mTk_CHO + $self->{O_FILES} = [grep s/\.c(pp|xx|c)?$/$self->{OBJ_EXT}/i, @o_files] ; + $self->{'MTK'} = $mTk; + my $tk = installed_tk(); +- my $perl = $self->{'PERL'}; +- if ($IsWin32 && !-f $perl && -f "$perl.exe") +- { +- print "perl=$perl X=$^X\n"; +- $perl = "$perl.exe"; +- $self->{'PERL'} = $perl; +- } ++ my $perl = $^X; + foreach my $file (sort keys %$mTk) + { + unless (-f $file && -M $file < -M $mTk->{$file}) + { + warn "Extracting $file\n"; +- system($perl,"$tk/pTk/Tcl-pTk",$mTk->{$file},$file); ++ my @cmd = ($perl,"$tk/pTk/Tcl-pTk",$mTk->{$file},$file); ++ system @cmd; ++ die "The command '@cmd' failed with $?" if $? != 0; + } + } + } +@@ -313,10 +309,13 @@ sub const_config # } $self->{'LDFLAGS'} =~ s/-flat_namespace//; $self->{'LDFLAGS'} =~ s/-undefined\s+suppress//; diff --git a/x11/p5-Tk/patches/patch-ad b/x11/p5-Tk/patches/patch-ad index 47f7ab5ffc5..d94240c3183 100644 --- a/x11/p5-Tk/patches/patch-ad +++ b/x11/p5-Tk/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.5 2013/05/31 20:13:24 adam Exp $ +$NetBSD: patch-ad,v 1.6 2014/11/13 08:30:16 markd Exp $ ---- PNG/Makefile.PL.orig 2013-05-21 13:25:13.000000000 +0000 +--- PNG/Makefile.PL.orig 2013-11-18 09:04:04.000000000 +0000 +++ PNG/Makefile.PL @@ -2,7 +2,6 @@ use strict; @@ -10,28 +10,22 @@ $NetBSD: patch-ad,v 1.5 2013/05/31 20:13:24 adam Exp $ use File::Copy; my $l = $Config::Config{'lib_ext'}; -@@ -27,8 +26,6 @@ if ($? == 0) { - $libpng_libs = '-lpng -lz -lm'; +@@ -53,8 +52,6 @@ my $all_libs; + $all_libs = "$libpng_libs $zlib_libs"; } -if ($Tk::MMtry::VERSION ge '4.007' && -- try_run("config/has_png.c",[$libpng_cflags],[$libpng_libs])) +- try_run("config/has_png.c",[$all_cflags],[$all_libs])) { + warn "Using system's -lpng\n"; Tk::MMutil::TkExtMakefile( - NAME => 'Tk::PNG', -@@ -40,55 +37,6 @@ if ($Tk::MMtry::VERSION ge '4.007' && - LIBS => [$libpng_libs], +@@ -67,49 +64,6 @@ if ($Tk::MMtry::VERSION ge '4.007' && + LIBS => [$all_libs], ); } -else - { - my $ok = 1; -- foreach my $file ("libpng/Makefile.PL","zlib/Makefile.PL") -- { -- next unless -f $file; -- chmod(0666,$file); -- unlink($file); -- } - unless (copy("Makefile.libpng.maybe","libpng/Makefile.PL")) - { - warn "Cannot copy Makefile.libpng.maybe => libpng/Makefile.PL ($!)"; diff --git a/x11/p5-Tk/patches/patch-pTK_Lang.h b/x11/p5-Tk/patches/patch-pTK_Lang.h deleted file mode 100644 index 462f4696a3f..00000000000 --- a/x11/p5-Tk/patches/patch-pTK_Lang.h +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-pTK_Lang.h,v 1.1 2014/05/31 09:54:23 tron Exp $ - -Fix build with Perl 5.20.0 and newer. - ---- pTk/Lang.h.orig 2010-05-29 10:56:05.000000000 +0100 -+++ pTk/Lang.h 2014-05-31 10:50:03.000000000 +0100 -@@ -4,10 +4,6 @@ - #define STATIC_BUILD - - --#ifdef bool --#undef bool --#endif -- - #include "tkConfig.h" - #define TCL_NO_DEPRECATED - -- cgit v1.2.3