File susehelp-support-khelpcenter5.patch of Package susehelp

Overview Repositories Revisions Requests Users Attributes Meta

File susehelp-support-khelpcenter5.patch of Package susehelp

--- susehelp.orig/bin/susehelp
+++ susehelp/bin/susehelp
@@ -114,6 +114,7 @@ fi
 # Which help browsers are available?
 GNOME_HELP=$(which 2>/dev/null yelp)
 KDE_HELP=$(which 2>/dev/null khelpcenter)
+KDE5_HELP=$(which 2>/dev/null khelpcenter5)
 
 shlog USE_X: $USE_X
 shlog USE_DESKTOP: $USE_DESKTOP
@@ -129,7 +130,7 @@ if [ "$DOC_HOST" = "localhost" ] && \
     else
         if [ "$USE_DESKTOP" = kde -o "$USE_DESKTOP" = startkde -o -z "$USE_LOCALSERVER" ]; then
             URI=$(echo $URI | sed 's/^ghelp:/help:/')
-            if [ "$KDE_HELP" != "" ]; then
+            if [ "$KDE_HELP" != "" -o "$KDE5_HELP" != "" ]; then
                 susehelp-khelpcenter $URI
                 exit 0
             else

--- susehelp/bin/susehelp-khelpcenter	2009-10-06 16:26:45.000000000 +0200
+++ susehelp.new/bin/susehelp-khelpcenter	2015-04-12 18:55:32.407089821 +0200
@@ -4,15 +4,24 @@
 
 $kdeversion = $ENV{KDE_SESSION_VERSION};
 
-if ($kdeversion == 4) {
+if ($kdeversion == 5) {
+    $kshell = "kshell5";
+    $kdeconfig = "kf5-config";
+    $khelpcenter = "khelpcenter5";
+    $meinproc = "meinproc5";
+} elsif ($kdeversion == 4) {
     $kshell = "kshell4";
     $kdeconfig = "kde4-config";
-} else {
+    $khelpcenter = "khelpcenter";
+    $meinproc = "meinproc4";
+} elsif ($kdeversion == 3) {
     $kshell = "kshell";
     $kdeconfig = "kde-config";
+    $khelpcenter = "khelpcenter";
+    $meinproc = "meinproc";
 }
 
-system "$kshell khelpcenter > /dev/null" if $#ARGV < 0;
+system "$kshell $khelpcenter > /dev/null" if $#ARGV < 0;
 
 foreach $filename (@ARGV) {
 
@@ -32,7 +41,7 @@ foreach $filename (@ARGV) {
 				if (!-f $cache_file) {
 					$orig_file = "/usr/share/gnome/help/$base/$lang/$base.xml";
 					system ("mkdir -m700 -p $cache_dir");
-					system ("meinproc --cache $cache_file $orig_file > /dev/null");
+					system ("$meinproc --cache $cache_file $orig_file > /dev/null");
 				}
 			}
 			$/ = "<";
@@ -56,5 +65,5 @@ foreach $filename (@ARGV) {
 		}
 	}
 
-	system "$kshell khelpcenter $filename > /dev/null";
+	system "$kshell $khelpcenter $filename > /dev/null";
 }

Places

File susehelp-support-khelpcenter5.patch of Package susehelp

Places