Skip to content

Commit

Permalink
kde-apps/kdebase-kioslaves: Add Perl 5.22.0 fix
Browse files Browse the repository at this point in the history
Taken from 16.08 branch.

Package-Manager: portage-2.2.28
  • Loading branch information
a17r authored and kensington committed Jul 27, 2016
1 parent 00a2feb commit 9ece040
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
commit 36139181fff43c227023f4c03c1e1a31e1be9dda
Author: Tomáš Trnka <[email protected]>
Date: Thu Jul 21 21:34:53 2016 +0200

info: remove extra defined(@array)

Such syntax is long deprecated and a fatal error in Perl 5.22.0 [1].

This commit is the KDE4 equivalent of kio-extras.git commit
af92d6180d479d1e56bc549bbda30a3036687182.

BUG: 359015

[1] http://perldoc.perl.org/perl5220delta.html

diff --git a/kioslave/info/kde-info2html b/kioslave/info/kde-info2html
index 8dcc28f..0f217ae 100755
--- a/kioslave/info/kde-info2html
+++ b/kioslave/info/kde-info2html
@@ -171,7 +171,7 @@ sub FileNotFound {
next if $looking && !/\* Menu/;
$looking = 0;
my @item = &ParseMenuItem($_,'dir');
- if (!defined(@item)) { next }
+ if (!@item) { next }
my ($MenuLinkTag, $MenuLinkFile, $MenuLinkRef, $MenuLinkText) = @item;
if ($MenuLinkRef eq $FileName) {
&Redirect($MenuLinkFile, $MenuLinkTag);
@@ -429,7 +429,7 @@ sub ParseMenuItem {
sub MenuItem2HTML {
my ($Line, $BaseInfoFile) = @_;
my @parse_results = &ParseMenuItem($Line, $BaseInfoFile);
- if (!defined (@parse_results)) { return $Line; }
+ if (!@parse_results) { return $Line; }
my ($MenuLinkTag, $MenuLinkFile, $MenuLinkRef, $MenuLinkText) = @parse_results;
#-- produce a HTML line
return "<tr class=\"infomenutr\"><td class=\"infomenutd\" style=\"width:30%\"><ul><li><a href=\"info:/$MenuLinkFile/$MenuLinkTag\">$MenuLinkRef</a></ul></td><td class=\"infomenutd\">$MenuLinkText";
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ KMEXTRA="
kdeeject
"

PATCHES=( "${FILESDIR}/${P}-webkit.patch" )
PATCHES=(
"${FILESDIR}/${P}-webkit.patch"
"${FILESDIR}/${P}-perl-5.22.patch"
)

src_configure() {
local mycmakeargs=(
Expand Down

0 comments on commit 9ece040

Please sign in to comment.