diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2018-11-02 01:21:12 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-11-02 08:59:43 +0100 |
| commit | 190c4fa1486b1dc8cf82ea8ba06de852489d4e13 (patch) | |
| tree | 4ad1e2c745dbea071aa3aaaeda5082c7cf839f10 /source/kde | |
| parent | 94c93fbaaa5eb59e73beaf5ca5284a484ce77bd4 (diff) | |
| download | current-190c4fa1486b1dc8cf82ea8ba06de852489d4e13.tar.gz current-190c4fa1486b1dc8cf82ea8ba06de852489d4e13.tar.xz | |
Fri Nov 2 01:21:12 UTC 201820181102012112
kde/kde-runtime-4.14.3-x86_64-8.txz: Rebuilt.
Applied upstream patch to fix info and man page display.
Thanks to igadoter and lougavulin.
l/gegl-0.4.12-x86_64-1.txz: Upgraded.
n/bind-9.12.3-x86_64-1.txz: Upgraded.
x/mesa-18.2.4-x86_64-1.txz: Upgraded.
extra/pure-alsa-system/kde-runtime-4.14.3-x86_64-8_alsa.txz: Rebuilt.
Applied upstream patch to fix info and man page display.
Thanks to igadoter and lougavulin.
Diffstat (limited to 'source/kde')
| -rw-r--r-- | source/kde/build/kde-runtime | 2 | ||||
| -rw-r--r-- | source/kde/patch/kde-runtime.patch | 1 | ||||
| -rw-r--r-- | source/kde/patch/kde-runtime/kde-runtime.fix.konqueror.manpage.infopage.display.diff | 20 |
3 files changed, 22 insertions, 1 deletions
diff --git a/source/kde/build/kde-runtime b/source/kde/build/kde-runtime index 7f8f011eb..45a4fb75d 100644 --- a/source/kde/build/kde-runtime +++ b/source/kde/build/kde-runtime @@ -1 +1 @@ -7 +8 diff --git a/source/kde/patch/kde-runtime.patch b/source/kde/patch/kde-runtime.patch index ec5000ce7..3cdd393cf 100644 --- a/source/kde/patch/kde-runtime.patch +++ b/source/kde/patch/kde-runtime.patch @@ -1,2 +1,3 @@ zcat $CWD/patch/kde-runtime/kde-runtime-4.14.3.nm.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +zcat $CWD/patch/kde-runtime/kde-runtime.fix.konqueror.manpage.infopage.display.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/patch/kde-runtime/kde-runtime.fix.konqueror.manpage.infopage.display.diff b/source/kde/patch/kde-runtime/kde-runtime.fix.konqueror.manpage.infopage.display.diff new file mode 100644 index 000000000..0f9ae9a23 --- /dev/null +++ b/source/kde/patch/kde-runtime/kde-runtime.fix.konqueror.manpage.infopage.display.diff @@ -0,0 +1,20 @@ +--- ./kioslave/info/kde-info2html.orig 2014-10-31 00:50:20.000000000 +0100 ++++ ./kioslave/info/kde-info2html 2018-11-01 18:30:29.718723253 +0100 +@@ -172,7 +172,7 @@ + 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); +@@ -430,7 +430,7 @@ + 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"; |