diff options
| author | hiramatsu <hiramatsu@pkgsrc.org> | 2011-10-12 15:51:52 +0000 |
|---|---|---|
| committer | hiramatsu <hiramatsu@pkgsrc.org> | 2011-10-12 15:51:52 +0000 |
| commit | 462bc4e945eefa9b7885c5796eaf2b7f94d8b310 (patch) | |
| tree | 07fc091a2e2468004122431cc992efbcdad5561e /editors/p5-Padre/patches | |
| parent | 0e85b82c8cc325e8dd8e88705d61587ff9b6c3f6 (diff) | |
| download | pkgsrc-462bc4e945eefa9b7885c5796eaf2b7f94d8b310.tar.gz | |
Update p5-Padre to 0.90.
- Improved syntax highlight.
- Reduce memory usage.
- Updated document and translation.
- bug fix.
Diffstat (limited to 'editors/p5-Padre/patches')
| -rw-r--r-- | editors/p5-Padre/patches/patch-aa | 28 | ||||
| -rw-r--r-- | editors/p5-Padre/patches/patch-ab | 8 |
2 files changed, 25 insertions, 11 deletions
diff --git a/editors/p5-Padre/patches/patch-aa b/editors/p5-Padre/patches/patch-aa index 556b68b915c..c3c1de4064c 100644 --- a/editors/p5-Padre/patches/patch-aa +++ b/editors/p5-Padre/patches/patch-aa @@ -1,17 +1,31 @@ -$NetBSD: patch-aa,v 1.2 2010/08/20 07:01:35 sno Exp $ +$NetBSD: patch-aa,v 1.3 2011/10/12 15:51:52 hiramatsu Exp $ Remove special wxPerl handling on MacOS X - pkgsrc' perl can do it self ---- script/padre.orig 2010-08-17 03:55:44.000000000 +0000 +--- script/padre.orig 2011-07-26 12:37:43.000000000 +0000 +++ script/padre -@@ -11,20 +11,6 @@ local $SIG{__DIE__} = +@@ -11,34 +11,6 @@ local $SIG{__DIE__} = ? sub { print STDERR Carp::longmess "\nDIE: @_\n" . ( "-" x 80 ) . "\n" } : $SIG{__DIE__}; -# Must run using wxPerl on OS X. -if ( $^O eq 'darwin' and $^X !~ m{/wxPerl} ) { - require File::Which; -- my $perl = scalar File::Which::which('wxPerl'); +- require File::Basename; +- require File::Spec; +- +- my $this_perl = File::Which::which($^X) || $^X; +- if ( -l $this_perl ) { +- my $link = readlink $this_perl; +- $this_perl = $link if $link; +- } +- +- my $dir = File::Basename::dirname($this_perl); +- my $wx_perl = File::Spec->catfile( $dir, 'wxPerl' ); +- my $perl = +- $wx_perl && -e $wx_perl && -x _ +- ? $wx_perl +- : File::Which::which('wxPerl'); - chomp($perl); - if ( -e $perl ) { - warn "spawning 'wxPerl' interpreter for OS X\n"; @@ -22,6 +36,6 @@ Remove special wxPerl handling on MacOS X - pkgsrc' perl can do it self - exit 0; -} - - # Handle special command line cases early, because options like --home - # MUST be processed before the Padre.pm library is loaded. - require Getopt::Long; + # Disable overlay scrollbar on Linux. + # Done ugly this way to satisfy Perl::Critic (grrr) + local $ENV{LIBOVERLAY_SCROLLBAR} = ( $^O eq 'linux' ) ? 0 : $ENV{LIBOVERLAY_SCROLLBAR}; diff --git a/editors/p5-Padre/patches/patch-ab b/editors/p5-Padre/patches/patch-ab index abffae08797..b48dd6cad8d 100644 --- a/editors/p5-Padre/patches/patch-ab +++ b/editors/p5-Padre/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.2 2010/08/20 07:01:35 sno Exp $ +$NetBSD: patch-ab,v 1.3 2011/10/12 15:51:52 hiramatsu Exp $ Remove special wxPerl handling on MacOS X - pkgsrc' perl can do it self ---- lib/Padre/Perl.pm.orig 2010-02-18 10:09:59.000000000 +0000 +--- lib/Padre/Perl.pm.orig 2011-08-16 10:50:41.000000000 +0000 +++ lib/Padre/Perl.pm -@@ -136,7 +136,7 @@ sub cperl { +@@ -134,7 +134,7 @@ sub cperl { if ( $path =~ s/\b(wxPerl)\z// ) { # Convert to non-GUI @@ -13,7 +13,7 @@ Remove special wxPerl handling on MacOS X - pkgsrc' perl can do it self return "${path}perl"; } else { return "${path}wxPerl"; -@@ -193,7 +193,7 @@ sub wxperl { +@@ -191,7 +191,7 @@ sub wxperl { if ( $path =~ s/\b(perl)\z// ) { # Convert to Wx launcher |