make services GHNS work with store.kde.org

Summary:
point the knsrc providers file to the new kde store,
and port the servicemenuinstallation/servicemenudeinstallation
scripts to kf5 (they still were based on kde4-config)
BUG:376922

Test Plan:
downloaded some service menus (send to telegram, convert svg)
by the knewstuff ui available in the services page of config dialog
they get installed in the proper folder and work, uninstall works

Reviewers: #dolphin, emmanuelp

Reviewed By: #dolphin, emmanuelp

Subscribers: elvisangelaccio

Differential Revision: https://phabricator.kde.org/D5035

diff --git a/src/settings/services/servicemenu.knsrc b/src/settings/services/servicemenu.knsrc
index 7914f7c63608d9ec4560da6f621ea007370c121b..29364430ebcfc938cd9de6e591c3a4f785580222 100644 (file)
--- a/src/settings/services/servicemenu.knsrc
+++ b/src/settings/services/servicemenu.knsrc
@@ -1,5 +1,6 @@
 [KNewStuff2]
 [KNewStuff2]

-ProvidersUrl=http://download.kde.org/khotnewstuff/servicemenu-providers.xml
+ProvidersUrl=http://download.kde.org/ocs/providers.xml
+Categories=Dolphin Service Menus

 ChecksumPolicy=ifpossible
 SignaturePolicy=ifpossible
 TargetDir=servicemenu-download
 ChecksumPolicy=ifpossible
 SignaturePolicy=ifpossible
 TargetDir=servicemenu-download

diff --git a/src/settings/services/servicemenudeinstallation b/src/settings/services/servicemenudeinstallation
index 24fd7bf10d1f7905249c4448c8c447d2081873d4..5e4234262cc2e88346c33e09f77ac030e383a296 100755 (executable)
--- a/src/settings/services/servicemenudeinstallation
+++ b/src/settings/services/servicemenudeinstallation
@@ -2,7 +2,7 @@
 require 'fileutils'
 archive = ARGV[0]
 if archive[(archive.length - 8)..(archive.length)] == ".desktop"
 require 'fileutils'
 archive = ARGV[0]
 if archive[(archive.length - 8)..(archive.length)] == ".desktop"

-    FileUtils.rm(`kde4-config --localprefix`.strip! + "share/kde4/services/ServiceMenus/" + File.basename(archive))
+    FileUtils.rm(`qtpaths --writable-path GenericDataLocation`.strip!  + "/kservices5/ServiceMenus/" + File.basename(archive))

     exit(0)
 end
 dir = archive + "-dir"
     exit(0)
 end
 dir = archive + "-dir"

diff --git a/src/settings/services/servicemenuinstallation b/src/settings/services/servicemenuinstallation
index ac2cf8f1cc6cc9526b709abe35532d8232f86e7b..36b9debd244c639e0911ff88d4001e020665780a 100755 (executable)
--- a/src/settings/services/servicemenuinstallation
+++ b/src/settings/services/servicemenuinstallation
@@ -2,7 +2,7 @@
 require 'pathname'
 require 'fileutils'
 archive = ARGV[0]
 require 'pathname'
 require 'fileutils'
 archive = ARGV[0]

-$servicedir = `kde4-config --localprefix`.strip! + "share/kde4/services/ServiceMenus/"
+$servicedir = `qtpaths --writable-path GenericDataLocation`.strip!  + "/kservices5/ServiceMenus/"

 FileUtils.mkdir_p($servicedir) if !File.exist?($servicedir)
 if archive[(archive.length - 8)..(archive.length - 1)] == ".desktop"
     puts "Single-File Service-Menu"
 FileUtils.mkdir_p($servicedir) if !File.exist?($servicedir)
 if archive[(archive.length - 8)..(archive.length - 1)] == ".desktop"
     puts "Single-File Service-Menu"