| 1 |
commit: 9ece040654b7bceef9dba5e7bc0ab3323941fdc0 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jul 26 15:49:10 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 27 15:55:39 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ece0406 |
| 7 |
|
| 8 |
kde-apps/kdebase-kioslaves: Add Perl 5.22.0 fix |
| 9 |
|
| 10 |
Taken from 16.08 branch. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
|
| 14 |
.../kdebase-kioslaves-16.04.3-perl-5.22.patch | 37 ++++++++++++++++++++++ |
| 15 |
.../kdebase-kioslaves-16.04.3-r1.ebuild | 5 ++- |
| 16 |
2 files changed, 41 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/kde-apps/kdebase-kioslaves/files/kdebase-kioslaves-16.04.3-perl-5.22.patch b/kde-apps/kdebase-kioslaves/files/kdebase-kioslaves-16.04.3-perl-5.22.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..487f408 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-apps/kdebase-kioslaves/files/kdebase-kioslaves-16.04.3-perl-5.22.patch |
| 23 |
@@ -0,0 +1,37 @@ |
| 24 |
+commit 36139181fff43c227023f4c03c1e1a31e1be9dda |
| 25 |
+Author: Tomáš Trnka <tomastrnka@×××.com> |
| 26 |
+Date: Thu Jul 21 21:34:53 2016 +0200 |
| 27 |
+ |
| 28 |
+ info: remove extra defined(@array) |
| 29 |
+ |
| 30 |
+ Such syntax is long deprecated and a fatal error in Perl 5.22.0 [1]. |
| 31 |
+ |
| 32 |
+ This commit is the KDE4 equivalent of kio-extras.git commit |
| 33 |
+ af92d6180d479d1e56bc549bbda30a3036687182. |
| 34 |
+ |
| 35 |
+ BUG: 359015 |
| 36 |
+ |
| 37 |
+ [1] http://perldoc.perl.org/perl5220delta.html |
| 38 |
+ |
| 39 |
+diff --git a/kioslave/info/kde-info2html b/kioslave/info/kde-info2html |
| 40 |
+index 8dcc28f..0f217ae 100755 |
| 41 |
+--- a/kioslave/info/kde-info2html |
| 42 |
++++ b/kioslave/info/kde-info2html |
| 43 |
+@@ -171,7 +171,7 @@ sub FileNotFound { |
| 44 |
+ next if $looking && !/\* Menu/; |
| 45 |
+ $looking = 0; |
| 46 |
+ my @item = &ParseMenuItem($_,'dir'); |
| 47 |
+- if (!defined(@item)) { next } |
| 48 |
++ if (!@item) { next } |
| 49 |
+ my ($MenuLinkTag, $MenuLinkFile, $MenuLinkRef, $MenuLinkText) = @item; |
| 50 |
+ if ($MenuLinkRef eq $FileName) { |
| 51 |
+ &Redirect($MenuLinkFile, $MenuLinkTag); |
| 52 |
+@@ -429,7 +429,7 @@ sub ParseMenuItem { |
| 53 |
+ sub MenuItem2HTML { |
| 54 |
+ my ($Line, $BaseInfoFile) = @_; |
| 55 |
+ my @parse_results = &ParseMenuItem($Line, $BaseInfoFile); |
| 56 |
+- if (!defined (@parse_results)) { return $Line; } |
| 57 |
++ if (!@parse_results) { return $Line; } |
| 58 |
+ my ($MenuLinkTag, $MenuLinkFile, $MenuLinkRef, $MenuLinkText) = @parse_results; |
| 59 |
+ #-- produce a HTML line |
| 60 |
+ 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"; |
| 61 |
|
| 62 |
diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r1.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r1.ebuild |
| 63 |
index ba3a176..84d9b45 100644 |
| 64 |
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r1.ebuild |
| 65 |
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r1.ebuild |
| 66 |
@@ -38,7 +38,10 @@ KMEXTRA=" |
| 67 |
kdeeject |
| 68 |
" |
| 69 |
|
| 70 |
-PATCHES=( "${FILESDIR}/${P}-webkit.patch" ) |
| 71 |
+PATCHES=( |
| 72 |
+ "${FILESDIR}/${P}-webkit.patch" |
| 73 |
+ "${FILESDIR}/${P}-perl-5.22.patch" |
| 74 |
+) |
| 75 |
|
| 76 |
src_configure() { |
| 77 |
local mycmakeargs=( |
Archives