kapsh
/
hasufell-repository
forked from hasufell/hasufell-repository
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

media-sound/gmusicbrowser: fix perl-5.24 compatibility

This commit is contained in:
Julian Ospald 2016-10-28 20:01:09 +02:00
parent 7f120e5e26
commit fc28301f09
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/media-sound/gmusicbrowser/files/853840eb9dad0b59ad2dac5d303f5929b2f09f21.patch Normal file
View File

@ -0,0 +1,36 @@
From 853840eb9dad0b59ad2dac5d303f5929b2f09f21 Mon Sep 17 00:00:00 2001
From: Octavio Ruiz <tacvbo@tacvbo.net>
Date: Mon, 30 May 2016 19:18:44 +0200
Subject: [PATCH] remove 2 superfluous "my", fix error with perl 5.24
---
gmusicbrowser.pl | 2 +-
gmusicbrowser_list.pm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gmusicbrowser.pl b/gmusicbrowser.pl
index bbf16d7..18fab6a 100755
--- a/gmusicbrowser.pl
+++ b/gmusicbrowser.pl
@@ -9020,7 +9020,7 @@ sub Set
($cmd,my $pattern)= split /:/,$cmd,2;
$pattern='' unless defined $pattern;
- my ($basecmd,my $prop)= Songs::filter_properties($field,"$cmd:$pattern");
+ my ($basecmd, $prop)= Songs::filter_properties($field,"$cmd:$pattern");
if (!$prop)
{ $cmd= Songs::Field_property($field,'default_filter');
($basecmd,$prop)= Songs::filter_properties($field,$cmd);
diff --git a/gmusicbrowser_list.pm b/gmusicbrowser_list.pm
index 76d2f86..26d21ae 100644
--- a/gmusicbrowser_list.pm
+++ b/gmusicbrowser_list.pm
@@ -8052,7 +8052,7 @@ sub Make
unless ($notnow)
{ #warn "$key ---found in ($code,@deps)\n";
if (ref $code)
- { my ($func,my @keys)=@$code; #warn " -> ($func, @keys)\n";
+ { my ($func, @keys)=@$code; #warn " -> ($func, @keys)\n";
my $out=join ',',map "'$_'", @keys;
my $in= join ',',map "'$_'", @deps; $in=~s#\?##g;
$out= @keys>1 ? "\@var{$out}" : "\$var{$out}";

6
packages/media-sound/gmusicbrowser/gmusicbrowser-1.1.15.exheres-0 → packages/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r1.exheres-0
View File

@ -46,11 +46,17 @@ DEPENDENCIES="
# dev-perl/Gtk2-Notify (for Notify plugin)
# dev-perl/gnome2-wnck (for Titlebar plugin)
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/853840eb9dad0b59ad2dac5d303f5929b2f09f21.patch
)
src_prepare() {
edo sed -i \
-e "s|\$FindBin::RealBin\,'\.\.'|'/usr'|" \
-e "s|\$FindBin::RealBin\.SLASH\.'\.\.'|SLASH\.'usr'|" \
gmusicbrowser.pl
default
}
src_install() {