9fbe3668e9
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.
46 lines
1.5 KiB
Text
46 lines
1.5 KiB
Text
$NetBSD: patch-aa,v 1.5 2014/11/13 08:30:16 markd Exp $
|
|
|
|
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
|
|
@@ -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//;
|
|
- } elsif ($^O =~ /(openbsd)/i)
|
|
+ } elsif ($^O =~ /(.*bsd)/i)
|
|
{
|
|
# -Bforcearchive is bad news for Tk - we don't want all of libpTk.a in all .so-s.
|
|
$self->{'LDDLFLAGS'} =~ s/-Bforcearchive\s*//g;
|
|
+ } elsif ($^O =~ /(.*dragonfly)/i) {
|
|
+ # -Bforcearchive is bad news for Tk - we don't want all of libpTk.a in all .so-s.
|
|
+ $self->{'LDDLFLAGS'} =~ s/-Bforcearchive\s*//g;
|
|
}
|
|
return $self->MM::const_config;
|
|
}
|